From d812e2b4fd56313caf7861b32e576ce8d4950bbb Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Thu, 10 Oct 2024 17:24:09 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../board/service/dao/mapper/BoardMapper.java | 4 - .../ext/service/impl/AcsToWmsServiceImpl.java | 6 - .../wms/pda/service/impl/PdaServiceImpl.java | 21 +- .../controller/PdmBdWorkorderController.java | 66 --- .../PdmBdWorkorderDetailController.java | 39 -- .../pdm/controller/PointDetailController.java | 57 --- .../pdm/service/IPdmBdWorkorderService.java | 57 --- .../wms/pdm/service/dao/PdmBdWorkorder.java | 126 ----- .../pdm/service/dao/PdmBdWorkorderDetail.java | 25 - .../nl/wms/pdm/service/dao/PointDetail.java | 11 - .../wms/pdm/service/dao/PointDetailAdd.java | 14 - .../mapper/PdmBdWorkorderDetailMapper.java | 13 - .../dao/mapper/PdmBdWorkorderDetailMapper.xml | 10 - .../dao/mapper/PdmBdWorkorderMapper.java | 15 - .../dao/mapper/PdmBdWorkorderMapper.xml | 32 -- .../pdm/service/dto/PdmBdWorkorderDto.java | 99 ---- .../pdm/service/dto/PdmBdWorkorderQuery.java | 20 - .../impl/PdmBdWorkorderServiceImpl.java | 124 ----- .../sch/data/service/MaterialDataService.java | 7 - .../dao/mapper/MaterialDataMapper.java | 3 - .../service/impl/MaterialDataServiceImpl.java | 16 - ...chBaseVehiclematerialgroupServiceImpl.java | 4 - .../controller/MaterialController.java | 6 +- .../material/service/IMaterialService.java | 9 +- .../service/impl/MaterialServiceImpl.java | 36 +- .../point/service/ISchBasePointService.java | 6 - .../sch/point/service/dao/SchBasePoint.java | 62 +-- .../service/dao/mapper/SchBasePointMapper.xml | 24 +- .../sch/point/service/dto/PointLeftDto.java | 6 +- .../point/service/dto/SchBasePointDto.java | 91 ++-- .../point/service/dto/SchBasePointQuery.java | 1 - .../service/impl/SchBasePointServiceImpl.java | 23 +- .../service/impl/ReportServiceImpl.java | 8 - .../controller/SchBaseTaskController.java | 15 - .../sch/task/service/ISchBaseTaskService.java | 8 - .../wms/sch/task/service/dao/SchBaseTask.java | 4 +- .../service/impl/SchBaseTaskServiceImpl.java | 79 +--- .../nl/wms/sch/task_manage/AbstractTask.java | 126 +++-- .../sch/task_manage/AutoCommitWorkOrder.java | 37 -- .../task_manage/AutoCreateWorkOrderTask.java | 34 -- .../sch/task_manage/enums/PointTypeEnum.java | 22 + .../sch/task_manage/task/tasks/POINTTask.java | 11 +- .../sch/task_manage/task/tasks/XGRKTask.java | 446 ++++++++++++++++++ .../sch/task_manage/task/tasks/YCLCKTask.java | 15 +- .../sch/task_manage/task/tasks/YCLRKTask.java | 21 +- .../task/tasks/mapper/PointMapper.java | 21 +- .../task/tasks/mapper/PointMapper.xml | 82 +++- .../controller/WorkorderController.java | 89 ---- .../workorder/service/IWorkorderService.java | 77 --- .../sch/workorder/service/dao/Workorder.java | 47 -- .../service/dao/mapper/WorkorderMapper.java | 21 - .../service/dao/mapper/WorkorderMapper.xml | 114 ----- .../workorder/service/dto/WorkorderDto.java | 27 -- .../workorder/service/dto/WorkorderQuery.java | 28 -- .../service/impl/WorkorderServiceImpl.java | 354 -------------- .../test/java/org/nl/point/PointCreate.java | 156 ------ .../views/wms/sch/interactivelog/index.vue | 183 ------- .../schBaseAcsandlmsinteractivelog.js | 27 -- .../src/views/wms/sch/point/index.vue | 149 +----- 59 files changed, 745 insertions(+), 2489 deletions(-) delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderController.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderDetailController.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorderDetail.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetail.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.xml delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderQuery.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCommitWorkOrder.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateWorkOrderTask.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointTypeEnum.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/XGRKTask.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/WorkorderController.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/IWorkorderService.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/Workorder.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.xml delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderDto.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderQuery.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java delete mode 100644 lms/nladmin-system/nlsso-server/src/test/java/org/nl/point/PointCreate.java delete mode 100644 lms/nladmin-ui/src/views/wms/sch/interactivelog/index.vue delete mode 100644 lms/nladmin-ui/src/views/wms/sch/interactivelog/schBaseAcsandlmsinteractivelog.js diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java index e7d00d9..d104b09 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/mapper/BoardMapper.java @@ -1,12 +1,8 @@ package org.nl.wms.board.service.dao.mapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Select; import org.nl.wms.board.service.dao.dto.*; -import org.nl.wms.pdm.service.dao.PointDetail; - import java.util.List; -import java.util.logging.Handler; public interface BoardMapper { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java index 88b5df0..ab0c536 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java @@ -14,15 +14,12 @@ import org.nl.common.utils.SecurityUtils; import org.nl.system.service.notice.ISysNoticeService; import org.nl.wms.ext.service.AcsToWmsService; import org.nl.wms.ext.service.dto.to.BaseResponse; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.AbstractTask; import org.nl.wms.sch.task_manage.GeneralDefinition; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum; import org.nl.wms.sch.task_manage.task.TaskFactory; import org.nl.wms.sch.task_manage.task.core.TaskStatus; @@ -32,7 +29,6 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import java.lang.reflect.Method; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -59,8 +55,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { private ISysNoticeService noticeService; @Autowired private RedisUtils redisUtils; - @Autowired - private MaterialMapper materialMapper; // 初始化反射方法 @PostConstruct diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index 42838b2..605834f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -1,7 +1,6 @@ package org.nl.wms.pda.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,17 +11,15 @@ import org.nl.common.utils.SecurityUtils; import org.nl.wms.ext.service.AcsToWmsService; import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.pda.service.PdaService; -import org.nl.wms.pda.service.dao.mapper.PdaMapper; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; +import org.nl.wms.sch.material.service.dao.MesInMaterial; +import org.nl.wms.sch.material.service.dao.mapper.MesInMaterialMapper; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; -import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; @@ -52,7 +49,7 @@ public class PdaServiceImpl implements PdaService { @Autowired private PointMapper pointMapper; @Autowired - private MaterialMapper materialMapper; + private MesInMaterialMapper materialMapper; @Autowired private SchBaseVehiclematerialgroupMapper vehiclematerialgroupMapper; @Override @@ -161,9 +158,8 @@ public class PdaServiceImpl implements PdaService { schBasePoint.setVehicle_code(""); pointService.update(schBasePoint); } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("palletSN",motherTray); - updateWrapper.set("group_bind_material_status",GroupBindMaterialStatusEnum.UNBOUND.getValue()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("pallet_sn",motherTray); materialMapper.update(null,updateWrapper); } return PdaResponseVo.pdaResultOk("组盘解绑成功"); @@ -185,10 +181,9 @@ public class PdaServiceImpl implements PdaService { result = PdaResponseVo.pdaResultError("新子托盘号不能为空!"); return result; } - List materialList = materialMapper.selectList(new LambdaQueryWrapper() - .eq(Material::getPalletSN,new_sub_tray) - .le(Material::getReturn_status, "1") - .eq(Material::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue())); + List materialList = materialMapper.selectList(new LambdaQueryWrapper() + .eq(MesInMaterial::getPallet_sn,new_sub_tray) + .le(MesInMaterial::getReturn_status, "1")); if (ObjectUtil.isEmpty(materialList)) { result = PdaResponseVo.pdaResultError("新子托盘号无组盘入库单据信息!"); return result; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderController.java deleted file mode 100644 index a603c79..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderController.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.nl.wms.pdm.controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.base.TableDataInfo; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.service.IPdmBdWorkorderService; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Set; -/** -* @author lyd -* @date 2023-05-05 -**/ -@Slf4j -@RestController -@Api(tags = "工单管理管理") -@RequestMapping("/api/pdmBdWorkorder") -public class PdmBdWorkorderController { - - @Autowired - private IPdmBdWorkorderService pdmBdWorkorderService; - - @GetMapping - @Log("查询工单管理") - @ApiOperation("查询工单管理") - //@SaCheckPermission("@el.check('pdmBdWorkorder:list')") - public ResponseEntity query(PdmBdWorkorderQuery query, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryAll(query,page)),HttpStatus.OK); - } - - @PostMapping - @Log("新增工单管理") - @ApiOperation("新增工单管理") - //@SaCheckPermission("@el.check('pdmBdWorkorder:add')") - public ResponseEntity create(@Validated @RequestBody PdmBdWorkorder entity){ - pdmBdWorkorderService.create(entity); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改工单管理") - @ApiOperation("修改工单管理") - //@SaCheckPermission("@el.check('pdmBdWorkorder:edit')") - public ResponseEntity update(@Validated @RequestBody PdmBdWorkorder entity){ - pdmBdWorkorderService.update(entity); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除工单管理") - @ApiOperation("删除工单管理") - //@SaCheckPermission("@el.check('pdmBdWorkorder:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Set ids) { - pdmBdWorkorderService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderDetailController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderDetailController.java deleted file mode 100644 index 6de1df6..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderDetailController.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.nl.wms.pdm.controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.base.TableDataInfo; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.service.IPdmBdWorkorderService; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.pdm.service.dao.PdmBdWorkorderDetail; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Set; - - -@Slf4j -@RestController -@Api(tags = "工单详情管理") -@RequestMapping("/api/pdmBdWorkorderDetail") -public class PdmBdWorkorderDetailController { - - @Autowired - private IPdmBdWorkorderService pdmBdWorkorderService; - - @GetMapping - @Log("查询工单详情管理") - @ApiOperation("查询工单详情管理") - //@SaCheckPermission("@el.check('pdmBdWorkorder:list')") - public ResponseEntity query(PdmBdWorkorderQuery query, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryAllDetail(query,page)),HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java deleted file mode 100644 index efcc3be..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.nl.wms.pdm.controller; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.base.TableDataInfo; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.pda.service.PdaService; -import org.nl.wms.pdm.service.IPdmBdWorkorderService; -import org.nl.wms.pdm.service.dao.PointDetailAdd; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - - -@Slf4j -@RestController -@Api(tags = "工单详情管理") -@RequestMapping("/api/pointDetail") -public class PointDetailController { - - @Autowired - private IPdmBdWorkorderService pdmBdWorkorderService; - @Autowired - private PdaService pdaService; - - @GetMapping - @Log("根据物料查询点位库存") - @ApiOperation("根据物料查询点位库存") - //@SaCheckPermission("@el.check('pdmBdWorkorder:list')") - public ResponseEntity query(String productname, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryPointDetail(productname,page)),HttpStatus.OK); - } - - @PostMapping("/add") - @Log("批量新增原材料出库任务") - @ApiOperation("批量新增原材料出库任务") - //@SaCheckPermission("@el.check('pdmBdWorkorder:list')") - public ResponseEntity add(@RequestBody PointDetailAdd pointDetailAdd){ - log.info("批量新增原材料出库任务："+pointDetailAdd.toString()); - for(String point_code:pointDetailAdd.getPointCodes()){ - JSONObject param=new JSONObject(); - param.put("start_point",point_code); - param.put("time",pointDetailAdd.getTime()); - param.put("mode",pointDetailAdd.getMode()); - param.put("workorder_code",pointDetailAdd.getWorkorder_code()); - param.put("batch", DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss")); - pdaService.yclck(param); - } - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java deleted file mode 100644 index 283cce4..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.nl.wms.pdm.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.pdm.service.dao.PdmBdWorkorderDetail; -import org.nl.wms.pdm.service.dao.PointDetail; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; - -import java.util.Set; - -/** -* @description 服务接口 -* @author lyd -* @date 2023-05-05 -**/ -public interface IPdmBdWorkorderService extends IService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ - IPage queryAll(PdmBdWorkorderQuery whereJson, PageQuery pageable); - - /** - * 创建 - * @param entity / - */ - void create(PdmBdWorkorder entity); - - /** - * 编辑 - * @param entity / - */ - void update(PdmBdWorkorder entity); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Set ids); - - /** - * 创建 - * @param entity / - */ - void createDetail(PdmBdWorkorderDetail entity); - - IPage queryAllDetail(PdmBdWorkorderQuery query, PageQuery page); - - IPage queryPointDetail(String productname, PageQuery page); - - void updateState(String workorder_code,String workorder_status); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java deleted file mode 100644 index 88c893e..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.nl.wms.pdm.service.dao; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author lyd -* @date 2023-05-05 -**/ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("pdm_bd_workorder") -public class PdmBdWorkorder implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "workorder_id", type = IdType.NONE) - @ApiModelProperty(value = "工单标识") - private String workorder_id; - - @ApiModelProperty(value = "工单编号") - private String workorder_code; - - @ApiModelProperty(value = "计划数量") - private BigDecimal plan_qty; - - @ApiModelProperty(value = "实际数量") - private BigDecimal real_qty; - - @ApiModelProperty(value = "物料标识") - private String material_id; - - @ApiModelProperty(value = "载具类型") - private String vehicle_type; - - @ApiModelProperty(value = "计划开始时间") - private String planproducestart_date; - - @ApiModelProperty(value = "计划结束时间") - private String planproduceend_date; - - @ApiModelProperty(value = "实际开始时间") - private String realproducestart_date; - - @ApiModelProperty(value = "实际结束时间") - private String realproduceend_date; - - @ApiModelProperty(value = "回温时间(小时)") - private Integer standing_time; - - @ApiModelProperty(value = "点位编码") - private String point_code; - - @ApiModelProperty(value = "点位名称") - private String point_name; - - @ApiModelProperty(value = "区域编码") - private String region_code; - - @ApiModelProperty(value = "区域名称") - private String region_name; - - @ApiModelProperty(value = "工单状态") - private String workorder_status; - - @ApiModelProperty(value = "是否需要AGV搬运") - private Boolean is_needmove; - - @ApiModelProperty(value = "工单类型") - private String workorder_type; - - @ApiModelProperty(value = "回传MES状态") - private String passback_status; - - @ApiModelProperty(value = "车间编码") - private String workshop_code; - - @ApiModelProperty(value = "外部标识") - private String ext_id; - - @ApiModelProperty(value = "额外信息") - private String ext_data; - - @ApiModelProperty(value = "是否删除") - private Boolean is_delete; - - @ApiModelProperty(value = "创建人") - private String create_id; - - @ApiModelProperty(value = "创建人") - private String create_name; - - @ApiModelProperty(value = "创建时间") - private String create_time; - - @ApiModelProperty(value = "修改人") - private String update_id; - - @ApiModelProperty(value = "修改人") - private String update_name; - - @ApiModelProperty(value = "修改时间") - private String update_time; - - @ApiModelProperty(value = "是否加急") - private Boolean is_urgent; - - @TableField(exist = false) - private String material_name; - - @TableField(exist = false) - private String material_code; - - @TableField(exist = false) - private String material_spec; - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorderDetail.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorderDetail.java deleted file mode 100644 index 530ef36..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorderDetail.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.nl.wms.pdm.service.dao; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; - -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("pmd_bd_workorder_detail") -public class PdmBdWorkorderDetail extends QPMES098RequestBodyItem2 implements Serializable { - /** 工单编号 */ - private String workorder_code; - /** 实际数量 */ - private BigDecimal real_qty; - - public void copyFrom(QPMES098RequestBodyItem2 source){ - BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); - } - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetail.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetail.java deleted file mode 100644 index 8248961..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetail.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.nl.wms.pdm.service.dao; - -import lombok.Data; - -@Data -public class PointDetail { - private String point_code; - private String productName; - private String PalletSN; - private String qty; -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java deleted file mode 100644 index f535769..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.nl.wms.pdm.service.dao; - -import lombok.Data; - -import java.util.List; - -@Data -public class PointDetailAdd { - private List pointCodes; - private String mode; - private String time; - private String workorder_code; - private String status; -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.java deleted file mode 100644 index d2fcdff..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nl.wms.pdm.service.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.pdm.service.dao.PdmBdWorkorderDetail; -import org.nl.wms.pdm.service.dao.PointDetail; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; - -public interface PdmBdWorkorderDetailMapper extends BaseMapper { - - IPage selectPointDetail(IPage pages, String productname); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.xml deleted file mode 100644 index 49aba64..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.java deleted file mode 100644 index 10fd966..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nl.wms.pdm.service.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; - -/** -* @author lyd -* @date 2023-05-05 -**/ -public interface PdmBdWorkorderMapper extends BaseMapper { - - IPage selectPageLeftJoin(IPage pages, PdmBdWorkorderQuery query); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml deleted file mode 100644 index bc0fe33..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java deleted file mode 100644 index 183e2da..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.nl.wms.pdm.service.dto; - -import lombok.Data; -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author lyd -* @date 2023-05-05 -**/ -@Data -public class PdmBdWorkorderDto implements Serializable { - - /** 工单标识 */ - private String workorder_id; - - /** 工单编号 */ - private String workorder_code; - - - /** 计划数量 */ - private BigDecimal plan_qty; - - /** 实际数量 */ - private BigDecimal real_qty; - - /** 物料标识 */ - private String material_id; - - /** 载具类型 */ - private String vehicle_type; - - /** 计划开始时间 */ - private String planproducestart_date; - - /** 计划结束时间 */ - private String planproduceend_date; - - /** 实际开始时间 */ - private String realproducestart_date; - - /** 实际结束时间 */ - private String realproduceend_date; - - /** 回温时间(小时) */ - private BigDecimal standing_time; - - /** 点位编码 */ - private String point_code; - - /** 点位名称 */ - private String point_name; - - /** 区域编码 */ - private String region_code; - - /** 区域名称 */ - private String region_name; - - /** 工单状态 */ - private String workorder_status; - - /** 是否需要AGV搬运 */ - private String is_needmove; - - /** 工单类型 */ - private String workorder_type; - - /** 回传MES状态 */ - private String passback_status; - - /** 车间编码 */ - private String workshop_code; - - /** 外部标识 */ - private String ext_id; - - /** 是否删除 */ - private Boolean is_delete; - - /** 创建人 */ - private String create_id; - - /** 创建人 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private String update_id; - - /** 修改人 */ - private String update_name; - - /** 修改时间 */ - private String update_time; -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderQuery.java deleted file mode 100644 index 375c115..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderQuery.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.wms.pdm.service.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** -* @author lyd -* @date 2023-05-05 -**/ -@Data -public class PdmBdWorkorderQuery implements Serializable { - private String workorder_code; - private String point_code; - private String begin_time; - private String end_time; - private List more_order_status; - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java deleted file mode 100644 index 64fa352..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.nl.wms.pdm.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.CodeUtil; -import org.nl.common.utils.SecurityUtils; -import org.nl.system.service.coderule.dao.SysCodeRuleDetail; -import org.nl.wms.pdm.service.IPdmBdWorkorderService; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.pdm.service.dao.PdmBdWorkorderDetail; -import org.nl.wms.pdm.service.dao.PointDetail; -import org.nl.wms.pdm.service.dao.mapper.PdmBdWorkorderDetailMapper; -import org.nl.wms.pdm.service.dao.mapper.PdmBdWorkorderMapper; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Set; - -/** -* @description 服务实现 -* @author lyd -* @date 2023-05-05 -**/ -@Slf4j -@Service -public class PdmBdWorkorderServiceImpl extends ServiceImpl implements IPdmBdWorkorderService { - - @Autowired - private PdmBdWorkorderMapper pdmBdWorkorderMapper; - @Autowired - private PdmBdWorkorderDetailMapper pdmBdWorkorderDetailMapper; - - @Override - public IPage queryAll(PdmBdWorkorderQuery query, PageQuery page){ - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - pages = pdmBdWorkorderMapper.selectPageLeftJoin(pages, query); - return pages; - } - - @Override - public void create(PdmBdWorkorder entity) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - // 点位编码和点位名称为父点位 - - entity.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr()); - if(ObjectUtil.isEmpty(entity.getWorkorder_code())) { - entity.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER")); - } - entity.setCreate_id(currentUserId); - entity.setCreate_name(nickName); - entity.setCreate_time(now); - entity.setUpdate_id(currentUserId); - entity.setUpdate_name(nickName); - entity.setUpdate_time(now); - pdmBdWorkorderMapper.insert(entity); - } - - @Override - public void update(PdmBdWorkorder entity) { - PdmBdWorkorder dto = pdmBdWorkorderMapper.selectById(entity.getWorkorder_id()); - if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - entity.setUpdate_id(currentUserId); - entity.setUpdate_name(nickName); - entity.setUpdate_time(now); - - pdmBdWorkorderMapper.updateById(entity); - } - - @Override - public void deleteAll(Set ids) { - // 真删除 - pdmBdWorkorderMapper.deleteBatchIds(ids); - } - - @Override - public void createDetail(PdmBdWorkorderDetail entity) { - pdmBdWorkorderDetailMapper.insert(entity); - } - @Override - public IPage queryAllDetail(PdmBdWorkorderQuery query, PageQuery page){ - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PdmBdWorkorderDetail::getWorkorder_code,query.getWorkorder_code()); - pages = pdmBdWorkorderDetailMapper.selectPage(pages,wrapper); - return pages; - } - - @Override - public IPage queryPointDetail(String productname, PageQuery page){ - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - pages = pdmBdWorkorderDetailMapper.selectPointDetail(pages, productname); - return pages; - } - - @Override - public void updateState(String workorder_code,String workorder_status) { -// PdmBdWorkorder entity=getOne(new LambdaQueryWrapper() -// .eq(PdmBdWorkorder::getWorkorder_code, workorder_code)); -// if(ObjectUtil.isNotEmpty(entity)) { -// entity.setWorkorder_status(workorder_status); -// pdmBdWorkorderMapper.updateById(entity); -// } - pdmBdWorkorderMapper.delete(new LambdaQueryWrapper().eq(PdmBdWorkorder::getWorkorder_code, workorder_code)); - pdmBdWorkorderDetailMapper.delete(new LambdaQueryWrapper().eq(PdmBdWorkorderDetail::getWorkorder_code, workorder_code)); - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/MaterialDataService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/MaterialDataService.java index 53b1004..b4e3415 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/MaterialDataService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/MaterialDataService.java @@ -6,12 +6,6 @@ import org.nl.common.domain.query.PageQuery; import org.nl.wms.sch.data.service.dto.MaterialDataDto; import org.nl.wms.sch.data.service.dto.MaterialDataRequest; import org.nl.wms.sch.data.service.dto.MaterialDataResponse; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.report.service.dto.ReportDto; -import org.nl.wms.sch.report.service.dto.ReportQuery; -import org.springframework.data.domain.Pageable; -import java.util.Map; -import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; @@ -25,7 +19,6 @@ public interface MaterialDataService extends IService { /** * 查询数据分页 * @param whereJson 条件 - * @param page 分页参数 * @return Map */ IPage queryAll(MaterialDataRequest whereJson, PageQuery pageable); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.java index 60bf71f..2172e15 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.java @@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.wms.sch.data.service.dto.MaterialDataDto; import org.nl.wms.sch.data.service.dto.MaterialDataRequest; import org.nl.wms.sch.data.service.dto.MaterialDataResponse; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.report.service.dto.ReportDto; -import org.nl.wms.sch.report.service.dto.ReportQuery; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/impl/MaterialDataServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/impl/MaterialDataServiceImpl.java index 9b3c26f..b7b134a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/impl/MaterialDataServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/impl/MaterialDataServiceImpl.java @@ -6,33 +6,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.nl.common.domain.query.PageQuery; -import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; import org.nl.wms.sch.data.service.MaterialDataService; import org.nl.wms.sch.data.service.dao.mapper.MaterialDataMapper; import org.nl.wms.sch.data.service.dto.MaterialDataDto; import org.nl.wms.sch.data.service.dto.MaterialDataRequest; import org.nl.wms.sch.data.service.dto.MaterialDataResponse; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; -import org.nl.wms.sch.report.service.dto.ReportDto; -import org.nl.wms.sch.report.service.dto.ReportQuery; -import org.nl.wms.sch.report.service.dto.YlDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import org.springframework.data.domain.Pageable; - import java.io.IOException; import java.util.*; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import cn.hutool.core.util.ObjectUtil; import javax.servlet.http.HttpServletResponse; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java index 8b24d8e..c9c5dd2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java @@ -4,21 +4,17 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; -import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; -import org.nl.wms.sch.workorder.service.dao.Workorder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialController.java index 1337922..f3e3587 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/controller/MaterialController.java @@ -1,6 +1,5 @@ package org.nl.wms.sch.material.controller; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -8,7 +7,7 @@ import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; import org.nl.wms.sch.material.service.IMaterialService; -import org.nl.wms.sch.material.service.dao.Material; +import org.nl.wms.sch.material.service.dao.MesInMaterial; import org.nl.wms.sch.material.service.dto.MaterialQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -17,7 +16,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -49,7 +47,7 @@ public class MaterialController { @Log("新增组盘信息管理") @ApiOperation("新增组盘信息管理") //@SaCheckPermission("@el.check('material:add')") - public ResponseEntity create(@Validated @RequestBody Material entity){ + public ResponseEntity create(@Validated @RequestBody MesInMaterial entity){ materialService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/IMaterialService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/IMaterialService.java index e446114..b8a337d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/IMaterialService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/IMaterialService.java @@ -1,16 +1,15 @@ package org.nl.wms.sch.material.service; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.sch.material.service.dao.Material; +import org.nl.wms.sch.material.service.dao.MesInMaterial; import org.nl.wms.sch.material.service.dto.MaterialQuery; import java.util.Set; -public interface IMaterialService extends IService { +public interface IMaterialService extends IService { /** * 查询数据分页 @@ -18,13 +17,13 @@ public interface IMaterialService extends IService { * @param pageable 分页参数 * @return IPage */ - IPage queryAll(MaterialQuery whereJson, PageQuery pageable); + IPage queryAll(MaterialQuery whereJson, PageQuery pageable); /** * 创建 * @param entity / */ - void create(Material entity); + void create(MesInMaterial entity); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java index a4d8785..632e04a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java @@ -1,7 +1,5 @@ package org.nl.wms.sch.material.service.impl; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -9,41 +7,39 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; -import org.nl.common.utils.SecurityUtils; import org.nl.wms.sch.material.service.IMaterialService; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; +import org.nl.wms.sch.material.service.dao.MesInMaterial; +import org.nl.wms.sch.material.service.dao.mapper.MesInMaterialMapper; import org.nl.wms.sch.material.service.dto.MaterialQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.Set; @Slf4j @Service -public class MaterialServiceImpl extends ServiceImpl implements IMaterialService { +public class MaterialServiceImpl extends ServiceImpl implements IMaterialService { @Autowired - private MaterialMapper materialMapper; + private MesInMaterialMapper materialMapper; @Override - public IPage queryAll(MaterialQuery whereJson, PageQuery page){ - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(whereJson.getPalletSN()),Material::getPalletSN,whereJson.getPalletSN()); - wrapper.like(StringUtils.isNotBlank(whereJson.getLotSN()),Material::getLotSN,whereJson.getLotSN()); - wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()),Material::getProductName,whereJson.getProductName()); - wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()),Material::getSupplierCode,whereJson.getSupplierCode()); - wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()),Material::getProductDescription,whereJson.getProductDescription()); - wrapper.eq(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),Material::getGroup_bind_material_status,whereJson.getGroup_bind_material_status()); - wrapper.eq(StringUtils.isNotBlank(whereJson.getReturn_status()),Material::getReturn_status,whereJson.getReturn_status()); - wrapper.orderByDesc(Material::getCreate_time); + public IPage queryAll(MaterialQuery whereJson, PageQuery page){ + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + /*wrapper.like(StringUtils.isNotBlank(whereJson.getPalletSN()),MesInMaterial::getPalletSN,whereJson.getPalletSN()); + wrapper.like(StringUtils.isNotBlank(whereJson.getLotSN()),MesInMaterial::getLotSN,whereJson.getLotSN()); + wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()),MesInMaterial::getProductName,whereJson.getProductName()); + wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()),MesInMaterial::getSupplierCode,whereJson.getSupplierCode()); + wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()),MesInMaterial::getProductDescription,whereJson.getProductDescription()); + wrapper.eq(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),MesInMaterial::getGroup_bind_material_status,whereJson.getGroup_bind_material_status());*/ + wrapper.eq(StringUtils.isNotBlank(whereJson.getReturn_status()),MesInMaterial::getReturn_status,whereJson.getReturn_status()); + wrapper.orderByDesc(MesInMaterial::getCreate_time); pages = materialMapper.selectPage(pages, wrapper); return pages; } @Override - public void create(Material entity) { + public void create(MesInMaterial entity) { materialMapper.insert(entity); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java index 7115f44..a26f56e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java @@ -78,10 +78,4 @@ public interface ISchBasePointService extends IService { */ List getPointsByRegionCodes(String RegionCodes); - /** - * 更改固化室点位状态 - * @param jsonObject - */ - void updateStatus(JSONObject jsonObject); - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java index ddad9a1..63ac6f2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java @@ -45,12 +45,6 @@ public class SchBasePoint implements Serializable { @ApiModelProperty(value = "点位状态") private String point_status; - @ApiModelProperty(value = "允许的物料类型") - private String can_material_type; - - @ApiModelProperty(value = "允许的载具类型") - private String can_vehicle_type; - @ApiModelProperty(value = "载具允许最大数量") private Integer vehicle_max_qty; @@ -66,8 +60,8 @@ public class SchBasePoint implements Serializable { @ApiModelProperty(value = "载具数量") private Integer vehicle_qty; - @ApiModelProperty(value = "块") - private Integer block_num; + @ApiModelProperty(value = "是否存储货位") + private String is_storage; @ApiModelProperty(value = "排") private Integer row_num; @@ -78,18 +72,15 @@ public class SchBasePoint implements Serializable { @ApiModelProperty(value = "层") private Integer layer_num; + @ApiModelProperty(value = "货位高度") + private BigDecimal point_height; + @ApiModelProperty(value = "入库顺序") private Integer in_order_seq; @ApiModelProperty(value = "出库顺序") private Integer out_order_seq; - @ApiModelProperty(value = "入空载具顺序") - private Integer in_empty_seq; - - @ApiModelProperty(value = "出空载具顺序") - private Integer out_empty_seq; - @ApiModelProperty(value = "父点位编码") private String parent_point_code; @@ -99,15 +90,9 @@ public class SchBasePoint implements Serializable { @ApiModelProperty(value = "在执行的任务标识") private String ing_task_code; - @ApiModelProperty(value = "是否创建工单") - private Boolean is_has_workder; - @ApiModelProperty(value = "车间编码") private String workshop_code; - @ApiModelProperty(value = "是否自动") - private Boolean is_auto; - @ApiModelProperty(value = "备注") private String remark; @@ -132,42 +117,19 @@ public class SchBasePoint implements Serializable { @ApiModelProperty(value = "修改时间") private String update_time; - @ApiModelProperty(value = "允许存放的载具数据") - @TableField(exist = false) - private List can_vehicle_types; - - @TableField(exist = false) - private String point_type_name; - - @TableField(exist = false) - private String point_status_name; - - // 组盘标识 - @TableField(exist = false) - private String group_id; - - @ApiModelProperty(value = "取货等待点") - private String start_wait_point; - - @ApiModelProperty(value = "放货等待点") - private String next_wait_point; - - - @ApiModelProperty(value = "回温时间(小时)") - private Integer standing_time; - @ApiModelProperty(value = "物料重量") private BigDecimal material_weight; + + @ApiModelProperty(value = "物料高度") + private BigDecimal material_height; + @ApiModelProperty(value = "批次") private String pcsn; + @ApiModelProperty(value = "是否呆滞物料") + private String is_stragnant; + @ApiModelProperty(value = "入库时间") private String instorage_time; - -// @ApiModelProperty(value = "物料名称") -// private String product_description; -// -// @ApiModelProperty(value = "供应商名称") -// private String supplier_name; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index 724ccfb..8730834 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -15,28 +15,9 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/PointLeftDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/PointLeftDto.java index 180c2a9..c3c348d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/PointLeftDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/PointLeftDto.java @@ -6,9 +6,11 @@ import java.io.Serializable; @Data public class PointLeftDto implements Serializable { - /** 点位编码 */ + /** 当前排 */ private Integer row_num; - /** 点位名称 */ + /** 当前排剩余空位数量 */ private Integer left_num; + /** 当前排已分配数量 */ + private Integer now_num; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java index d9889e5..756d5c7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java @@ -2,11 +2,8 @@ package org.nl.wms.sch.point.service.dto; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @description / @@ -17,46 +14,72 @@ import java.util.List; public class SchBasePointDto implements Serializable { private String point_code; + private String point_name; + private String region_code; + private String region_name; + private String point_type; + private String point_status; - private String can_material_type; - private String can_vehicle_type; + private Integer vehicle_max_qty; + private String vehicle_type; + private String vehicle_code; - private Integer vehicle_qty; - private Integer block_num; - private Integer row_num; - private Integer col_num; - private Integer layer_num; - private Integer in_order_seq; - private Integer out_order_seq; - private Integer in_empty_seq; - private Integer out_empty_seq; - private String parent_point_code; - private String ext_point_code; - private String ing_task_code; - private Boolean is_has_workder; - private String workshop_code; - private Boolean is_auto; - private String remark; - private Boolean is_used; - private String create_id; - private String create_name; - private String create_time; - private String update_id; - private String update_name; - private String update_time; - private String start_wait_point; - private String next_wait_point; + private String vehicle_code2; - private Integer standing_time; + + private Integer vehicle_qty; + + private String is_storage; + + private Integer row_num; + + private Integer col_num; + + private Integer layer_num; + + private BigDecimal point_height; + + private Integer in_order_seq; + + private Integer out_order_seq; + + private String parent_point_code; + + private String ext_point_code; + + private String ing_task_code; + + private String workshop_code; + + private String remark; + + private Boolean is_used; + + private String create_id; + + private String create_name; + + private String create_time; + + private String update_id; + + private String update_name; + + private String update_time; + private BigDecimal material_weight; - private String instorage_time; + + private BigDecimal material_height; + private String pcsn; - private String moname; - private String status; + + private String is_stragnant; + + private String instorage_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java index 21f922f..f3224fa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java @@ -25,5 +25,4 @@ public class SchBasePointQuery implements Serializable { private Boolean lock_type; - private Integer status; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 49a3357..70adf8f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -72,10 +72,6 @@ public class SchBasePointServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); lam.eq(SchBasePoint::getPoint_code,entity.getPoint_code()); SchBasePoint old_point = this.getOne(lam); @@ -146,7 +141,6 @@ public class SchBasePointServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.like("point_code","GHS"+device_code.substring(device_code.length()-2)); - updateWrapper.set("point_status",state); - pointMapper.update(null,updateWrapper); - } - } - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java index 8043ea1..780753f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java @@ -2,9 +2,7 @@ package org.nl.wms.sch.report.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -13,10 +11,6 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; import org.nl.wms.ext.service.AcsToWmsService; import org.nl.wms.ext.service.dto.to.BaseResponse; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.report.service.IReportService; @@ -24,8 +18,6 @@ import org.nl.wms.sch.report.service.dao.mapper.ReportMapper; import org.nl.wms.sch.report.service.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.nl.common.utils.PageUtil; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java index 6416140..f44ae3b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java @@ -1,15 +1,12 @@ package org.nl.wms.sch.task.controller; import cn.dev33.satoken.annotation.SaIgnore; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.service.dao.PointDetailAdd; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.springframework.beans.factory.annotation.Autowired; @@ -18,8 +15,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import sun.security.krb5.internal.PAData; - import java.util.Map; import java.util.Set; /** @@ -99,14 +94,4 @@ public class SchBaseTaskController { return new ResponseEntity<>(HttpStatus.OK); } - @PostMapping("/move2") - @Log("管理端一键移库") - @ApiOperation("管理端一键移库") - @SaIgnore - //@PreAuthorize("@el.check('task:list')") - public ResponseEntity move2(@RequestBody PointDetailAdd pointDetailAdd) { - schBaseTaskService.move2(pointDetailAdd); - return new ResponseEntity<>(HttpStatus.OK); - } - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java index 0fb0544..d0d1226 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pdm.service.dao.PointDetailAdd; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.task.core.TaskStatus; @@ -112,11 +111,4 @@ public interface ISchBaseTaskService extends IService { * @return */ void move(); - - /** - * 管理端一键移库 - * - * @return - */ - void move2(PointDetailAdd pointDetailAdd); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java index 5db1dab..c26b646 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java @@ -73,10 +73,10 @@ public class SchBaseTask implements Serializable { @ApiModelProperty(value = "任务组标识") - private Long task_group_id; + private String task_group_id; @ApiModelProperty(value = "任务组顺序号") - private BigDecimal task_group_seq; + private Integer task_group_seq; @ApiModelProperty(value = "任务完成类型") private String finished_type; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java index ee13b9e..5a76675 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -16,7 +16,6 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.wms.ext.service.AcsToWmsService; import org.nl.wms.ext.service.dto.to.BaseResponse; -import org.nl.wms.pdm.service.dao.PointDetailAdd; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; @@ -134,9 +133,11 @@ public class SchBaseTaskServiceImpl extends ServiceImpl slam.eq(SchBaseTask::getPoint_code1, point_code2) .or() - .eq(SchBaseTask::getPoint_code2, point_code2)) - .eq(SchBaseTask::getIs_delete, false) - .gt(point_code2.startsWith("DKT"),SchBaseTask::getTask_status, TaskStatus.APPLY.getCode()); + .eq(SchBaseTask::getPoint_code2, point_code2) + .or() + .eq(SchBaseTask::getPoint_code3, point_code2) + ) + .eq(SchBaseTask::getIs_delete, false); Integer schBaseTasks = schBaseTaskMapper.selectCount(lam); return schBaseTasks; } @@ -345,74 +346,4 @@ public class SchBaseTaskServiceImpl extends ServiceImpl schBasePointList = schBasePointService.list(new LambdaQueryWrapper() - .eq(SchBasePoint::getIs_used, true) - .eq(SchBasePoint::getRegion_code, "HW") - .isNotNull(SchBasePoint::getVehicle_code2) - .ne(SchBasePoint::getVehicle_code2, "") - .and(slam -> slam.isNull(SchBasePoint::getIng_task_code) - .or() - .eq(SchBasePoint::getIng_task_code, "") - )); - List nextList = schBasePointService.list(new LambdaQueryWrapper() - .eq(SchBasePoint::getRegion_code, "HWK") - .eq(SchBasePoint::getIs_used, true) - .eq(SchBasePoint::getVehicle_qty, 0) - .and(slam -> slam.isNull(SchBasePoint::getVehicle_code2) - .or() - .eq(SchBasePoint::getVehicle_code2, "")) - .and(slam -> slam.isNull(SchBasePoint::getIng_task_code) - .or() - .eq(SchBasePoint::getIng_task_code, ""))); - for (SchBasePoint schBasePoint : schBasePointList) { - if(nextList.size()==0){ - log.info("快速回温区无可用点位，取消后续循环"); - return; - } - JSONObject param = new JSONObject(); - SchBasePoint nexSchBasePoint = nextList.get(0); - param.put("start_point", schBasePoint.getPoint_code()); - param.put("next_point", nexSchBasePoint.getPoint_code()); - param.put("create_mode","1"); - param.put("request_medthod_code", "POINTTask"); - param.put("request_medthod_name", "点对点任务"); - param.put("vehicle_code",schBasePoint.getVehicle_code()); - param.put("vehicle_code2",schBasePoint.getVehicle_code2()); - param.put("device_code", schBasePoint.getPoint_code()); - param.put("time", time); - - BaseResponse baseResponse= acsToWmsService.pdaApply(param); - Integer resultCode = baseResponse.getCode(); - if(resultCode.equals(200)){ - Map parameters = baseResponse.getParameters(); - //设置初始值 - schBasePoint.setIng_task_code("1"); - nexSchBasePoint.setIng_task_code("1"); - if(ObjectUtil.isNotNull(parameters)){ - String task_code = parameters.get("task_code"); - if(ObjectUtil.isNotEmpty(task_code)){ - schBasePoint.setIng_task_code(task_code); - nexSchBasePoint.setIng_task_code(task_code); - } - } - //发起任务时先把点位占用，防止发起重复任务 - pointService.update(schBasePoint); - pointService.update(nexSchBasePoint); - nextList.remove(0); - }else{ - log.info(baseResponse.toString()); - } - } - } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index babab9f..030ecc2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -1,32 +1,26 @@ package org.nl.wms.sch.task_manage; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; -import org.nl.config.SpringContextHolder; import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.dao.Param; -import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.ext.service.dto.to.BaseResponse; -import org.nl.wms.ext.service.dto.to.wms.AcsResponse; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; +import org.nl.wms.sch.material.service.dao.MesInMaterial; +import org.nl.wms.sch.material.service.dao.mapper.MesInMaterialMapper; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.ISchBaseTaskconfigService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.sch.task_manage.enums.TaskDirectionEnum; import org.nl.wms.sch.task_manage.task.AcsUtil; import org.nl.wms.sch.task_manage.task.core.TaskStatus; -import org.nl.wms.sch.workorder.service.IWorkorderService; -import org.nl.wms.sch.workorder.service.dao.Workorder; -import org.nl.wms.sch.workorder.service.dao.mapper.WorkorderMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -48,11 +42,7 @@ public abstract class AbstractTask { @Autowired private ISchBasePointService pointService; @Autowired - private IWorkorderService workorderService; - @Autowired - private WorkorderMapper workorderMapper; - @Autowired - private MaterialMapper materialMapper; + private MesInMaterialMapper materialMapper; @Autowired private ISysParamService paramService; /** @@ -181,47 +171,33 @@ public abstract class AbstractTask { String next_point = param.getString("next_point"); // 目的点 String config_code = param.getString("config_code"); String sub_tray = param.getString("vehicle_code2");//子托盘 + Double height = param.getDouble("height"); if(ObjectUtil.isNotEmpty(sub_tray)) { sub_tray = sub_tray.trim(); } - // 1、校验数据 - SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() - .eq(SchBaseTaskconfig::getConfig_code, config_code)); - Assert.notNull(taskConfig, "找不到配置文件，请确认[" + config_code + "]配置是否存在！"); - //输送线相关任务不做处理 - if(apply_point_code.startsWith("SSX")){ - //输送线入库任务,校验入库单是否存在载具号 - if("YCLRKTask".equals(config_code)){ - //子托盘非空 - if(ObjectUtil.isNotEmpty(sub_tray)) { - Assert.isFalse(sub_tray.contains(";"), - "该任务申请子托盘["+param.getString("vehicle_code2")+"]存在串读，无法申请任务!"); - }else{ - Assert.isFalse(ObjectUtil.isEmpty(sub_tray), - "该任务申请子托盘["+param.getString("vehicle_code2")+"]为空，无法申请任务!"); - } - //判断是否校验mes组盘记录 - Param isConnectAcs = paramService.findByCode(GeneralDefinition.IS_RETURN_MES); - Assert.notNull(isConnectAcs, "找不到配置文件，请确认系统参数[is_return_mes]配置是否存在！"); - String isReturn = isConnectAcs.getValue(); - if("1".equals(isReturn)){ - //若不是缓存区托盘，校验mes接口组盘记录 - if(!sub_tray.startsWith("YBHC")){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Material::getPalletSN,sub_tray); - wrapper.eq(Material::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue()); - Integer list_size = materialMapper.selectCount(wrapper); - Assert.isFalse(list_size<=0, - "该任务申请子托盘["+sub_tray+"]异常，无原材料入库单据信息!"); - } - } - } + //子托盘非空 + if(ObjectUtil.isNotEmpty(sub_tray)) { + Assert.isFalse(sub_tray.contains(";"), + "该任务申请子托盘["+param.getString("vehicle_code2")+"]存在串读，无法申请任务!"); }else{ - //判断该申请点位是否存在起点或终点的未完成任务 - Integer apply_point_lists = taskService.findUnFinishTasksByPoint_code2("",apply_point_code); - Assert.isFalse(apply_point_lists>0, - "该任务申请点位["+apply_point_code+"]已存在未完成的任务，无法申请任务!"); + Assert.isFalse(ObjectUtil.isEmpty(sub_tray), + "该任务申请子托盘["+param.getString("vehicle_code2")+"]为空，无法申请任务!"); } + if(ObjectUtil.isEmpty(height)){ + Assert.isFalse(ObjectUtil.isEmpty(sub_tray), + "该任务申请子托盘["+param.getString("vehicle_code2")+"无高度信号，无法申请任务!"); + } + if(height>2.0){ + //若校验不通过，三色灯提示红色报警，后续由人工介入处理 + Assert.isFalse(ObjectUtil.isEmpty(sub_tray), + "该任务申请子托盘["+param.getString("vehicle_code2")+"超高，无法申请任务!"); + }else{//若校验通过，三色灯提示绿色信号 + + } + //判断该申请点位是否存在起点或终点的未完成任务 + Integer apply_point_lists = taskService.findUnFinishTasksByPoint_code2("",apply_point_code); + Assert.isFalse(apply_point_lists>0, + "该任务申请点位["+apply_point_code+"]已存在未完成的任务，无法申请任务!"); //子托盘非空 if(ObjectUtil.isNotEmpty(sub_tray)) { //判断该子托盘是否存在未完成任务 @@ -229,6 +205,12 @@ public abstract class AbstractTask { Assert.isFalse(sub_tray_lists>0, "该任务申请子托盘["+sub_tray+"]已存在未完成的任务，无法申请任务!"); } + + // 1、查询任务配置信息 + SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() + .eq(SchBaseTaskconfig::getConfig_code, config_code)); + Assert.notNull(taskConfig, "找不到配置文件，请确认[" + config_code + "]配置是否存在！"); + // 最大可创建任务数 Integer tcmn = taskConfig.getTask_create_max_num(); // 获取申请的任务 @@ -246,13 +228,11 @@ public abstract class AbstractTask { if(ObjectUtil.isEmpty(nextSchBasePoint)) { throw new BadRequestException(next_point+"点位信息异常,请检查输入的点位!" ); } - if(!next_point.startsWith("DKT")){ - if (nextSchBasePoint.getVehicle_qty() > 0 - || ObjectUtil.isNotEmpty(nextSchBasePoint.getVehicle_code2()) - || ObjectUtil.isNotEmpty(nextSchBasePoint.getIng_task_code())) { - // 消息通知 - throw new BadRequestException(next_point+"点位已存在载具或任务信息!" ); - } + if (nextSchBasePoint.getVehicle_qty() > 0 + || ObjectUtil.isNotEmpty(nextSchBasePoint.getVehicle_code2()) + || ObjectUtil.isNotEmpty(nextSchBasePoint.getIng_task_code())) { + // 消息通知 + throw new BadRequestException(next_point+"点位已存在载具或任务信息!" ); } } // 判断是否校验工单 @@ -265,25 +245,31 @@ public abstract class AbstractTask { if(ObjectUtil.isEmpty(pointObj.getVehicle_code2())) { throw new BadRequestException("点位:" + apply_point_code+ "上无托盘信息!"); } - List works = workorderMapper.selectList(new LambdaQueryWrapper() - .eq(Workorder::getPalletSN, pointObj.getVehicle_code2()) - .le(Workorder::getStatus, 1)); - if(works.size()<=0){ - throw new BadRequestException("点位:" + apply_point_code+ "上托盘:"+pointObj.getVehicle_code2()+"无可出库工单信息!"); + //点位上载具和申请任务不一致 + if(!sub_tray.equals(pointObj.getVehicle_code2())) { + throw new BadRequestException("点位:" + apply_point_code+ "上托盘信息:"+pointObj.getVehicle_code2()+"与任务申请托盘:"+sub_tray+"不一致，请检查库存！"); + } + //判断是否校验mes组盘记录 + Param isConnectAcs = paramService.findByCode(GeneralDefinition.IS_RETURN_MES); + Assert.notNull(isConnectAcs, "找不到配置文件，请确认系统参数[is_return_mes]配置是否存在！"); + String isReturn = isConnectAcs.getValue(); + if("1".equals(isReturn)){ + //若不是缓存区托盘，校验mes接口组盘记录 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MesInMaterial::getPallet_sn,sub_tray); + Integer list_size = materialMapper.selectCount(wrapper); + Assert.isFalse(list_size<=0, + "该任务申请子托盘["+sub_tray+"]异常，无入库组盘信息!"); } - - //设置载具信息 - param.put("vehicle_code2",pointObj.getVehicle_code2()); - param.put("vehicle_code",pointObj.getVehicle_code()); //更新对应载具工单状态为已生成任务，不可在工单页面取消 //pdm_bd_workorder_two任务生成时，status改为2 - workorderService.updateByPda(pointObj.getVehicle_code2(),"2",param.getString("mode")); + //workorderService.updateByPda(pointObj.getVehicle_code2(),"2",param.getString("mode")); } // 校验是否需要自动agv - if (!pointObj.getIs_auto()) { + /* if (!pointObj.getIs_auto()) { // 如果不需要自动，则不创建任务 return "1"; - } + }*/ // 2、创建申请任务 task.setAcs_trace_id(param.getString("acs_trace_id")); //设置任务类型 @@ -314,6 +300,8 @@ public abstract class AbstractTask { task.setCreate_name(nickName); task.setUpdate_id(currentUserId); task.setUpdate_name(nickName); + //设置任务组id + task.setTask_group_id(IdUtil.getSnowflake(1, 1).nextIdStr()); String task_code =taskService.create(task); return task_code; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCommitWorkOrder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCommitWorkOrder.java deleted file mode 100644 index 37da5fe..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCommitWorkOrder.java +++ /dev/null @@ -1,37 +0,0 @@ - -package org.nl.wms.sch.task_manage; - -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.sch.workorder.service.IWorkorderService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - - -@Slf4j -@Component -public class AutoCommitWorkOrder { - - @Autowired - private IWorkorderService workorderService; - - @SneakyThrows - public void run() { - log.info("定时任务AutoCommitWorkOrder开始执行:"); - this.doExecute(); - log.info("定时任务AutoCommitWorkOrder执行结束:"); - } - - - /** - * 根据工单情况自动提交并生成工单出库任务 - */ - private void doExecute() { - //根据工单情况自动提交 - workorderService.batchCommitAndCreateOrder(); - //并生成工单出库任务 - workorderService.batchCreateTask(); - } - -} - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateWorkOrderTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateWorkOrderTask.java deleted file mode 100644 index 4443264..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateWorkOrderTask.java +++ /dev/null @@ -1,34 +0,0 @@ - -package org.nl.wms.sch.task_manage; - -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.sch.workorder.service.IWorkorderService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - - -@Slf4j -@Component -public class AutoCreateWorkOrderTask { - - @Autowired - private IWorkorderService workorderService; - - @SneakyThrows - public void run() { - log.info("定时任务AutoCreateWorkOrderTask开始执行:"); - this.doExecute(); - log.info("定时任务AutoCreateWorkOrderTask执行结束:"); - } - - - /** - * 根据工单下发情况自动生成工单出库任务 - */ - private void doExecute() { - workorderService.batchCreateTask(); - } - -} - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointTypeEnum.java new file mode 100644 index 0000000..c320a30 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointTypeEnum.java @@ -0,0 +1,22 @@ +package org.nl.wms.sch.task_manage.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @Author: zds + * @Description: + * @Date: 2023/5/25 + */ +@Getter +@AllArgsConstructor +public enum PointTypeEnum { + + IN_POINT("1", "入库点位"), + OUT_POINT("2", "出库点位"), + STORAGE_POINT("3", "正常存储点位"), + TRANSFER_POINT("4", "中转点位"); + + private final String code; + private final String label; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java index 13ca8ea..0dd1b4f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java @@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.nl.common.exception.BadRequestException; -import org.nl.system.service.param.ISysParamService; -import org.nl.system.service.param.dao.Param; import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; @@ -25,7 +23,6 @@ import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.sch.task_manage.task.TaskType; import org.nl.wms.sch.task_manage.task.core.TaskStatus; -import org.nl.wms.sch.workorder.service.IWorkorderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -53,8 +50,6 @@ public class POINTTask extends AbstractTask { @Autowired private ISchBaseTaskconfigService taskConfigService; @Autowired - private IWorkorderService workorderService; - @Autowired private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; @Override @@ -135,7 +130,7 @@ public class POINTTask extends AbstractTask { //去回温库的任务，更细工单表 if(nextSchBasePoint.getPoint_code().contains("XHW")){ //pdm_bd_workorder_two任务完成时，status改为2出库中 - workorderService.update(schBasePoint.getVehicle_code2(),"2"); + // workorderService.update(schBasePoint.getVehicle_code2(),"2"); } now_num++; }else{ @@ -246,7 +241,7 @@ public class POINTTask extends AbstractTask { //工单出库任务更新工单记录 if(endPointObj.getRegion_code().contains("HW")){ //pdm_bd_workorder_two任务完成时，status改为3 - workorderService.update(vehicleCode2,"3"); + //workorderService.update(vehicleCode2,"3"); } } // 终点解锁 @@ -284,7 +279,7 @@ public class POINTTask extends AbstractTask { //去回温库的任务，更细工单表 if(endPointObj.getPoint_code().contains("XHW")){ //pdm_bd_workorder_two任务完成时，status改为1出库中 - workorderService.update(endPointObj.getVehicle_code2(),"1"); + // workorderService.update(endPointObj.getVehicle_code2(),"1"); } } // 起点解锁 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/XGRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/XGRKTask.java new file mode 100644 index 0000000..ef6f798 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/XGRKTask.java @@ -0,0 +1,446 @@ +package org.nl.wms.sch.task_manage.task.tasks; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.exception.BadRequestException; +import org.nl.system.service.param.ISysParamService; +import org.nl.system.service.param.dao.Param; +import org.nl.wms.ext.service.dto.to.BaseResponse; +import org.nl.wms.mes.domain.Head; +import org.nl.wms.mes.domain.QPMES062Request; +import org.nl.wms.mes.domain.QPMES062RequestBody; +import org.nl.wms.sch.data.service.dao.mapper.MaterialDataMapper; +import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; +import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; +import org.nl.wms.sch.material.service.dao.MesInMaterial; +import org.nl.wms.sch.material.service.dao.mapper.MesInMaterialMapper; +import org.nl.wms.sch.point.service.ISchBasePointService; +import org.nl.wms.sch.point.service.dao.SchBasePoint; +import org.nl.wms.sch.point.service.dto.PointLeftDto; +import org.nl.wms.sch.task.service.ISchBaseTaskService; +import org.nl.wms.sch.task.service.ISchBaseTaskconfigService; +import org.nl.wms.sch.task.service.dao.SchBaseTask; +import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; +import org.nl.wms.sch.task_manage.AbstractTask; +import org.nl.wms.sch.task_manage.GeneralDefinition; +import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; +import org.nl.wms.sch.task_manage.enums.GroupStatusEnum; +import org.nl.wms.sch.task_manage.enums.PointTypeEnum; +import org.nl.wms.sch.task_manage.task.TaskType; +import org.nl.wms.sch.task_manage.task.core.TaskStatus; +import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; +import org.nl.wms.util.PointUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author: zds + * @Description: 西阁楼入库区任务配置 + * @Date: 2024/1/24 + */ +@Slf4j +@Component +@TaskType("XGRKTask") +@Lazy +public class XGRKTask extends AbstractTask { + private static String TASK_CONFIG_CODE = "XGRKTask"; + /** + * 入口 + */ + private static String ENTRANCE = "1"; + @Autowired + private ISchBasePointService pointService; + @Autowired + private ISchBaseTaskService taskService; + @Autowired + private ISchBaseTaskconfigService taskConfigService; + @Autowired + private ISysParamService paramService; + @Autowired + private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; + @Autowired + private PointMapper pointMapper; + @Autowired + private MesInMaterialMapper materialMapper; + @Autowired + private MaterialDataMapper materialDataMapper; + + @Override + protected void create() throws BadRequestException { + // 获取任务 + List tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY); + // 配置信息 + SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() + .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); + // 获取任务配置最大下发任务数 + Integer tcmn = taskConfig.getTask_issue_max_num(); + // 获取执行中的任务 + List unFinishTasksByTaskConfig = taskService.findCreateTasksByTaskConfig(TASK_CONFIG_CODE); + //执行中任务数量小于最大可生成任务数 + if(unFinishTasksByTaskConfig.size() < tcmn){ + Integer now_num = unFinishTasksByTaskConfig.size(); + for (SchBaseTask task : tasks) { + if(now_num < tcmn){ + //若终点不为空，说明是4、5层的中转任务 + String point_code2 = task.getPoint_code2(); + //若不是4、5层的第二条任务 + if(ObjectUtil.isEmpty(point_code2)){ + // 获取参数 + JSONObject extGroupData = ObjectUtil.isNotEmpty(task.getExt_group_data()) + ? JSONObject.parseObject(task.getExt_group_data()) + : null; + SchBasePoint point = findNextPoint(extGroupData.getString("sub_tray"),extGroupData.getDouble("height")); + if (ObjectUtil.isEmpty(point)) { + task.setRemark("未找到所需点位!"); + taskService.update(task); + // 消息通知 + log.info("入库未找到当前符合条件的点位！"); + continue; + }else{ + // 获取任务 + Integer taskList = taskService.findUnFinishTasksByPoint_code2(task.getTask_code(),point.getPoint_code()); + if(taskList>0){ + task.setRemark("分配终点点位"+point.getPoint_code()+"已存在未完成任务!"); + taskService.update(task); + // 消息通知 + log.info("分配终点点位"+point.getPoint_code()+"已存在未完成任务!"); + continue; + } + } + //层号 + Integer layer_num = point.getLayer_num(); + SchBasePoint point2 = null; + if(layer_num > 3){ + //查找2层中转点 + point2 = pointMapper.findPointByCondition2(point.getRegion_code(),point.getRow_num(),PointTypeEnum.TRANSFER_POINT.getCode()); + if (ObjectUtil.isEmpty(point2)) { + task.setRemark("未找到所需中转点位!"); + taskService.update(task); + // 消息通知 + log.info("入库未找到当前符合条件的中转点位！"); + continue; + } + } + //复制对象 + SchBaseTask acs_task = BeanUtil.copyProperties(task,SchBaseTask.class); + if(layer_num > 3){ + //设置中转点 + acs_task.setPoint_code2(point2.getPoint_code()); + //设置货位终点 + acs_task.setPoint_code3(point.getPoint_code()); + }else{ + //设置货位终点 + acs_task.setPoint_code2(point.getPoint_code()); + } + acs_task.setVehicle_code(extGroupData.getString("mother_tray")); + acs_task.setVehicle_code2(extGroupData.getString("sub_tray")); + //下发 + JSONObject result = this.renotifyAcs(acs_task); + String status = result.getString("status"); + //下发成功 + if("200".equals(status)){ + // 设置终点并修改创建成功状态 + task.setTask_status(TaskStatus.CREATED.getCode()); + task.setRemark("下发"); + if(layer_num > 3){ + //设置中转点 + task.setPoint_code2(point2.getPoint_code()); + //设置货位终点 + task.setPoint_code3(point.getPoint_code()); + }else{ + //设置货位终点 + task.setPoint_code2(point.getPoint_code()); + } + task.setVehicle_code(extGroupData.getString("mother_tray")); + task.setVehicle_code2(extGroupData.getString("sub_tray")); + taskService.update(task); + + //发起任务时先把点位占用，防止发起重复任务 + point.setIng_task_code(task.getTask_code()); + pointService.update(point); + if(layer_num > 3){ + point2.setIng_task_code(task.getTask_code()); + pointService.update(point2); + } + now_num++; + }else{ + task.setRemark("下发acs失败:"+result.toString()); + taskService.update(task); + } + } + else{//若是4、5层的中转任务 + //查询4、5层点位信息 + SchBasePoint point = pointService.getById(point_code2); + if (ObjectUtil.isEmpty(point)) { + task.setRemark("目标点位信息异常，查询失败!"); + taskService.update(task); + // 消息通知 + log.info("入库未找到当前符合条件的点位！"); + continue; + }else{ + // 获取任务 + Integer taskList = taskService.findUnFinishTasksByPoint_code2(task.getTask_code(),point.getPoint_code()); + if(taskList>0){ + task.setRemark("分配终点点位"+point.getPoint_code()+"已存在未完成任务!"); + taskService.update(task); + // 消息通知 + log.info("分配终点点位"+point.getPoint_code()+"已存在未完成任务!"); + continue; + } + } + //下发 + JSONObject result = this.renotifyAcs(task); + String status = result.getString("status"); + //下发成功 + if("200".equals(status)){ + // 设置终点并修改创建成功状态 + task.setTask_status(TaskStatus.CREATED.getCode()); + task.setRemark("下发"); + taskService.update(task); + + //发起任务时先把点位占用，防止发起重复任务 + point.setIng_task_code(task.getTask_code()); + pointService.update(point); + now_num++; + }else{ + task.setRemark("下发acs失败:"+result.toString()); + taskService.update(task); + } + } + } + } + } + } + + /** + * 判断目标点位 + * + * @return + */ + private SchBasePoint findNextPoint(String sub_tray,Double height) { + //1、优先从中间库存区查找 + String regionCode = "ZJK"; + SchBasePoint point = getSchBasePointByYL(regionCode,height); + if (ObjectUtil.isNotEmpty(point)){ + return point; + }else {//2、中间存区未找到，则去东西阁楼库区 + regionCode="XGK"; + point = getSchBasePointByYL(regionCode,height); + if (ObjectUtil.isNotEmpty(point)){ + return point; + }else {//2、中间存区未找到，则去东西阁楼库区 + regionCode="DGK"; + return getSchBasePointByYL(regionCode,height); + } + } + } + + /** + * 根据区域编码和货物高度查找合适的点位 + * 规则：根据启用的原料区的排号顺序分配 + * @param regionCode + * @return + */ + private SchBasePoint getSchBasePointByYL(String regionCode,Double height) { + List rowList = new ArrayList(); + //根据库区和高度，查询有空位，且按 当前已入库载具数量、排号升序 + if(height == 1.2){ + rowList = pointMapper.findPointRowByCondition(regionCode,0,1.2); + if(rowList.size() == 0){ + rowList = pointMapper.findPointRowByCondition(regionCode,0,1.8); + if(rowList.size() == 0){ + rowList = pointMapper.findPointRowByCondition(regionCode,0,2.0); + } + } + }else if(height == 1.8){ + rowList = pointMapper.findPointRowByCondition(regionCode,0,1.8); + if(rowList.size() == 0){ + rowList = pointMapper.findPointRowByCondition(regionCode,0,2.0); + } + }else if(height == 2.0){ + rowList = pointMapper.findPointRowByCondition(regionCode,0,2.0); + } + //若存在满足条件的排号 + if(rowList.size() > 0){ + Integer row = rowList.get(0).getRow_num(); + //分配入库点位，按层数又低到高、列号由小到大 + SchBasePoint point = pointMapper.findPointByCondition2(regionCode,row, PointTypeEnum.STORAGE_POINT.getCode()); + if(ObjectUtil.isNotEmpty(point)){ + return point; + } + } + return null; + } + + @Override + protected void updateStatus(String task_code, TaskStatus status) { + // 校验任务 + SchBaseTask taskObj = taskService.getById(task_code); + if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) { + throw new BadRequestException("该任务已完成!"); + } + if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) { + throw new BadRequestException("该任务已取消!"); + } + // 获取参数 + JSONObject extGroupData = ObjectUtil.isNotEmpty(taskObj.getExt_group_data()) + ? JSONObject.parseObject(taskObj.getExt_group_data()) + : null; + String startPoint = taskObj.getPoint_code1(); // 获取起点 + String endPoint = taskObj.getPoint_code2(); // 获取终点 + String point_code3 = taskObj.getPoint_code3(); // 获取终点 + SchBasePoint startPointObj = pointService.getById(startPoint); + SchBasePoint endPointObj = pointService.getById(endPoint); + SchBasePoint pointObj3 = null; + if(ObjectUtil.isNotEmpty(point_code3)){ + pointObj3 = pointService.getById(point_code3); + } + // 根据传来的类型去对任务进行操作 + if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); + taskObj.setRemark("执行中"); + taskService.update(taskObj); + } + else if (status.equals(TaskStatus.FINISHED)) { // 完成 + // 起点清空 + if (ObjectUtil.isNotEmpty(startPointObj)) { + PointUtils.clearPoint(startPointObj); + } + //更新终点 + endPointObj.setUpdate_time(DateUtil.now()); + endPointObj.setVehicle_code(taskObj.getVehicle_code()); + endPointObj.setVehicle_code2(taskObj.getVehicle_code2()); + endPointObj.setVehicle_qty(1); + endPointObj.setInstorage_time(DateUtil.now()); + if (ObjectUtil.isNotEmpty(pointObj3)) { + //复制对象 + SchBaseTask acs_task = BeanUtil.copyProperties(taskObj,SchBaseTask.class); + //设置任务状态为 申请状态(当前任务参数不全，不具备下发条件) + acs_task.setTask_status(TaskStatus.APPLY.getCode()); + acs_task.setPoint_code1(taskObj.getPoint_code2()); + acs_task.setPoint_code2(taskObj.getPoint_code3()); + acs_task.setPoint_code3(""); + acs_task.setTask_group_seq(2); + //创建中转指令 + String task_code_new =taskService.create(acs_task); + //更新终点任务号 + endPointObj.setIng_task_code(task_code_new); + pointObj3.setIng_task_code(task_code_new); + pointService.update(pointObj3); + }else{ + // 终点解锁 + endPointObj.setIng_task_code(""); + } + pointService.update(endPointObj); + + taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setRemark("任务完成"); + taskService.update(taskObj); + //如果是两点任务，回传mes + if(ObjectUtil.isEmpty(pointObj3)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MesInMaterial::getPallet_sn,taskObj.getVehicle_code2()); + //回传状态为0的 + wrapper.eq(MesInMaterial::getReturn_status,"0"); + List materialList= materialMapper.selectList(wrapper); + + try { + //输送线到原材料库的任务完成，反馈MES接口。逻辑可以去掉。 + if(ObjectUtil.isNotEmpty(materialList)) { + String url = "http://192.168.9.124/sitAppWebApi/PDSToWMS/Api/QPMES062"; + QPMES062Request qpmes062Request = new QPMES062Request(); + Head head=new Head(); + head.setDest_system("WMS"); + head.setIntf_id("QPMES062"); + head.setSrc_msgid(IdUtil.simpleUUID()); + head.setSrc_system("LMS"); + qpmes062Request.setHead(head); + List qpmes062RequestBodyList=new ArrayList<>(); + for(MesInMaterial material:materialList) { + QPMES062RequestBody qpmes062RequestBody = new QPMES062RequestBody(); + qpmes062RequestBody.setOrder_code(material.getOrder_code()); + qpmes062RequestBody.setBatch(material.getBatch()); + qpmes062RequestBody.setPallet_sn(material.getPallet_sn()); + qpmes062RequestBody.setProduct_description(material.getProduct_description()); + qpmes062RequestBody.setProduct_name(material.getProduct_name()); + qpmes062RequestBody.setQty(material.getQty()); + qpmes062RequestBody.setSpecification(material.getSpecification()); + //设置外部系统仓位标识 + qpmes062RequestBody.setStrcut_code(endPointObj.getExt_point_code()); + qpmes062RequestBodyList.add(qpmes062RequestBody); + } + qpmes062Request.setBody(qpmes062RequestBodyList); + log.info("开始调用QPMES062服务，入参{}", JSON.toJSONString(qpmes062Request)); + String resultMsg = HttpRequest.post(url) + .body(JSON.toJSONString(qpmes062Request)) + .execute().body(); + log.info("QPMES062服务调用成功，反馈{}",resultMsg); + JSONObject result = JSONObject.parseObject(resultMsg); + String code = result.getString("code"); + if("0".equals(code)){ + //更新接口表 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(MesInMaterial::getPallet_sn,taskObj.getVehicle_code2()); + //回传状态为0的 + updateWrapper.eq(MesInMaterial::getReturn_status,"0"); + updateWrapper.set(MesInMaterial::getReturn_status,"1"); + materialMapper.update(null,updateWrapper); + } + }else{ + log.error("当前子托盘:"+taskObj.getVehicle_code2()+"不存在需要回传的物料信息，请确认！"); + } + }catch (Exception e){ + log.error("入库上报MES失败{}",e.getMessage(),e); + } + } + } + else if (status.equals(TaskStatus.CANCELED)) { // 取消 + // 终点解锁 + if (ObjectUtil.isNotEmpty(endPointObj)) { + endPointObj.setIng_task_code(""); + //任务取消把原先占用的位置释放 + pointService.update(endPointObj); + } + if (ObjectUtil.isNotEmpty(pointObj3)) { + pointObj3.setIng_task_code(""); + //任务取消把原先占用的位置释放 + pointService.update(pointObj3); + } + taskObj.setRemark("任务取消"); + taskObj.setTask_status(TaskStatus.CANCELED.getCode()); + taskService.update(taskObj); + } + + } + + @Override + public void forceFinish(String task_code) { + this.updateStatus(task_code, TaskStatus.FINISHED); + } + + @Override + public void cancel(String task_code) { + this.updateStatus(task_code, TaskStatus.CANCELED); + } + + @Override + protected void feedbackTaskState(JSONObject param, SchBaseTask schBaseTask, BaseResponse result) { + //该场景无需重算等待点 + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index ae14fcf..a6c1eac 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -12,7 +12,7 @@ import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.sch.data.service.dao.mapper.MaterialDataMapper; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; +import org.nl.wms.sch.material.service.dao.mapper.MesInMaterialMapper; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; @@ -25,7 +25,6 @@ import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.sch.task_manage.task.TaskType; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; -import org.nl.wms.sch.workorder.service.IWorkorderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -53,13 +52,11 @@ public class YCLCKTask extends AbstractTask { @Autowired private ISchBaseTaskconfigService taskConfigService; @Autowired - private IWorkorderService workorderService; - @Autowired private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; @Autowired private PointMapper pointMapper; @Autowired - private MaterialMapper materialMapper; + private MesInMaterialMapper materialMapper; @Autowired private MaterialDataMapper materialDataMapper; @Autowired @@ -136,7 +133,7 @@ public class YCLCKTask extends AbstractTask { point.setIng_task_code(task.getTask_code()); pointService.update(point); //pdm_bd_workorder_two任务下发时，status改为2 - workorderService.update(schBasePoint.getVehicle_code2(),"2"); + //workorderService.update(schBasePoint.getVehicle_code2(),"2"); now_num++; }else{ task.setRemark("下发acs失败:"+result.toString()); @@ -251,9 +248,7 @@ public class YCLCKTask extends AbstractTask { endPointObj.setVehicle_qty(1); endPointObj.setUpdate_time(DateUtil.now()); if(ObjectUtil.isEmpty(extGroupData.getString("time"))){ - endPointObj.setStanding_time(1); }else{ - endPointObj.setStanding_time(Integer.valueOf(extGroupData.getString("time"))); } if(ObjectUtil.isNotEmpty(extGroupData.getString("batch"))){ endPointObj.setPcsn(extGroupData.getString("batch")); @@ -272,7 +267,7 @@ public class YCLCKTask extends AbstractTask { taskObj.setGroup_id(ObjectUtil.isNotEmpty(one)?one.getGroup_id():null); taskObj.setRemark("任务完成"); //pdm_bd_workorder_two任务完成时，status改为3 - workorderService.update(vehicleCode2,"3"); + //workorderService.update(vehicleCode2,"3"); /* List materialList = materialMapper.selectList(new LambdaQueryWrapper() .eq(Material::getPalletSN, taskObj.getVehicle_code2()) @@ -377,7 +372,7 @@ public class YCLCKTask extends AbstractTask { String vehicleCode2 = taskObj.getVehicle_code2(); //pdm_bd_workorder_two任务取消时，status改为1 if(ObjectUtil.isNotEmpty(vehicleCode2)){ - workorderService.update(vehicleCode2,"1"); + // workorderService.update(vehicleCode2,"1"); } } taskService.update(taskObj); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java index 8393285..8fedb82 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java @@ -19,13 +19,12 @@ import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.mes.domain.Head; import org.nl.wms.mes.domain.QPMES062Request; import org.nl.wms.mes.domain.QPMES062RequestBody; -import org.nl.wms.pdm.service.IPdmBdWorkorderService; import org.nl.wms.sch.data.service.dao.mapper.MaterialDataMapper; import org.nl.wms.sch.data.service.dto.MaterialDataDto; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; +import org.nl.wms.sch.material.service.dao.MesInMaterial; +import org.nl.wms.sch.material.service.dao.mapper.MesInMaterialMapper; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.point.service.dto.PointLeftDto; @@ -77,7 +76,7 @@ public class YCLRKTask extends AbstractTask { @Autowired private PointMapper pointMapper; @Autowired - private MaterialMapper materialMapper; + private MesInMaterialMapper materialMapper; @Autowired private MaterialDataMapper materialDataMapper; @@ -200,7 +199,7 @@ public class YCLRKTask extends AbstractTask { * @return */ private SchBasePoint getSchBasePointByYL(String regionCode) { - List rowist = pointMapper.findPointRowByCondition(regionCode,0); + /* List rowist = pointMapper.findPointRowByCondition(regionCode,0,0.0); if(ObjectUtil.isNotEmpty(rowist)){ Map map = new HashMap(); for (PointLeftDto pointLeft : rowist) { @@ -230,7 +229,7 @@ public class YCLRKTask extends AbstractTask { tryTime = tryTime -1; } } - } + }*/ return null; } @@ -242,7 +241,7 @@ public class YCLRKTask extends AbstractTask { * @return */ private SchBasePoint getSchBasePointByYLHC(String regionCode) { - List rowist = pointMapper.findPointRowByCondition(regionCode,0); + /*List rowist = pointMapper.findPointRowByCondition(regionCode,0,0.0); if(ObjectUtil.isNotEmpty(rowist)){ Map map = new HashMap(); for (PointLeftDto pointLeft : rowist) { @@ -272,7 +271,7 @@ public class YCLRKTask extends AbstractTask { tryTime = tryTime -1; } } - } + }*/ return null; } @@ -315,12 +314,12 @@ public class YCLRKTask extends AbstractTask { pointService.update(endPointObj); // 要把数据存到组盘表 -> 改造公共方法，返回id //组盘表需要关联外部mes晶棒数据，一对多 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); //wrapper.eq(Material::getPalletSN,taskObj.getVehicle_code2()); //wrapper.eq(Material::getGroup_bind_material_status,GroupBindMaterialStatusEnum.BOUND.getValue()); //回传状态为0的 - wrapper.eq(Material::getReturn_status,"0"); - List materialList= materialMapper.selectList(wrapper); + wrapper.eq(MesInMaterial::getReturn_status,"0"); + List materialList= materialMapper.selectList(wrapper); SchBaseVehiclematerialgroup groupEntity = getSchBaseVehiclematerialgroup(taskObj, endPoint, endPointObj); groupEntity.setVehicle_code(taskObj.getVehicle_code()); groupEntity.setVehicle_type("0"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java index 58eb861..13bfa14 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java @@ -7,7 +7,7 @@ import org.nl.wms.sch.point.service.dto.PointLeftDto; import java.util.List; /** - * @Author: psh + * @Author: zds * @Description: * @Date: 2023/10/9 */ @@ -16,9 +16,22 @@ public interface PointMapper extends BaseMapper { List findPointByCondition(String regionCode,String point_status,Integer vehicle_qty); - List findPointRowByCondition(String regionCode, Integer vehicle_qty); + List findPointRowByCondition(String regionCode, Integer vehicle_qty,Double height); - SchBasePoint findPointByCondition2(String regionCode,Integer row_num); + /** + * 根据库区、排号，按列从大到小 + * @param regionCode + * @param row_num + * @return + */ + SchBasePoint findPointByCondition2Desc(String regionCode,Integer row_num,String point_type); + /** + * 根据库区、排号，按列从小到大 + * @param regionCode + * @param row_num + * @return + */ + SchBasePoint findPointByCondition2(String regionCode,Integer row_num,String point_type); List findPointByParentPoint(String pointCode); @@ -28,6 +41,4 @@ public interface PointMapper extends BaseMapper { void updatePointType(String device_code,String point_type); void updatePointVehicleQty(String device_code,String state); - - List queryByMes(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml index 255458d..1b1f7b4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml @@ -27,18 +27,65 @@ + + - SELECT - p.region_code AS WhaCode, - p.point_code AS WhlCode, - p.vehicle_code AS ParentPalletSN, - p.vehicle_code2 AS PalletSN, - p.material_weight AS Qty, - DATE_FORMAT( p.update_time, '%Y-%m-%d' ) AS WorkDate - FROM - sch_base_point p - WHERE - p.region_code IN ( 'YL', 'YLHC', 'HW', 'HWK' ); - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/WorkorderController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/WorkorderController.java deleted file mode 100644 index d6cf625..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/controller/WorkorderController.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.nl.wms.sch.workorder.controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.base.TableDataInfo; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.pdm.service.dao.PointDetailAdd; -import org.nl.wms.sch.workorder.service.IWorkorderService; -import org.nl.wms.sch.workorder.service.dao.Workorder; -import org.nl.wms.sch.workorder.service.dto.WorkorderQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Set; - -/** -* @author lyd -* @date 2023-05-16 -**/ -@Slf4j -@RestController -@Api(tags = "托盘出库工单管理") -@RequestMapping("/api/workorder") -public class WorkorderController { - - @Autowired - private IWorkorderService workorderService; - - @GetMapping - @Log("查询托盘出库工单") - @ApiOperation("查询托盘出库工单") - //@SaCheckPermission("@el.check('material:list')") - public ResponseEntity query(WorkorderQuery whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(workorderService.queryAll(whereJson,page)),HttpStatus.OK); - } - - @PostMapping - @Log("新增托盘出库工单") - @ApiOperation("新增托盘出库工单") - //@SaCheckPermission("@el.check('material:add')") - public ResponseEntity create(@Validated @RequestBody Workorder entity){ - workorderService.create(entity); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - - - @Log("删除托盘出库工单") - @ApiOperation("删除托盘出库工单") - //@SaCheckPermission("@el.check('material:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Set ids) { - workorderService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/batchChange") - @Log("批量更新工单状态") - @ApiOperation("批量更新工单状态") - public ResponseEntity batchChange(@RequestBody PointDetailAdd pointDetailAdd){ - log.info("批量新增原材料出库任务："+pointDetailAdd.toString()); - workorderService.batchChange(pointDetailAdd); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/batchCreate") - @Log("批量生成移库任务") - @ApiOperation("批量生成移库任务") - public ResponseEntity batchCreate(@RequestBody PointDetailAdd pointDetailAdd){ - log.info("批量生成移库任务："+pointDetailAdd.toString()); - workorderService.batchCreate(pointDetailAdd); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/batchCreate2") - @Log("批量生成移库任务") - @ApiOperation("批量生成移库任务") - public ResponseEntity batchCreate2(@RequestBody PointDetailAdd pointDetailAdd){ - log.info("批量生成移库任务："+pointDetailAdd.toString()); - workorderService.batchCreate2(pointDetailAdd); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/IWorkorderService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/IWorkorderService.java deleted file mode 100644 index 62e2d0a..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/IWorkorderService.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.nl.wms.sch.workorder.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.common.domain.query.PageQuery; -import org.nl.wms.pdm.service.dao.PointDetailAdd; -import org.nl.wms.sch.workorder.service.dao.Workorder; -import org.nl.wms.sch.workorder.service.dto.WorkorderQuery; - -import java.util.Set; - - -public interface IWorkorderService extends IService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ - IPage queryAll(WorkorderQuery whereJson, PageQuery pageable); - - /** - * 创建 - * @param entity / - */ - void create(Workorder entity); - - /** - * - * @param palletSN - * @param status - */ - public void update(String palletSN,String status); - - /** - * - * @param palletSN - * @param status - * @param mode - */ - public void updateByPda(String palletSN,String status,String mode); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Set ids); - - /** - * 批量更新工单状态 - * @param pointDetailAdd - */ - void batchChange( PointDetailAdd pointDetailAdd); - - /** - * 批量生成移库任务 - * @param pointDetailAdd - */ - void batchCreate( PointDetailAdd pointDetailAdd); - - /** - * 批量生成移库任务 - * @param pointDetailAdd - */ - void batchCreate2( PointDetailAdd pointDetailAdd); - - /** - * 批量生成工单出库任务 - */ - void batchCreateTask(); - - /** - * 批量提交并生成工单出库任务 - */ - void batchCommitAndCreateOrder(); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/Workorder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/Workorder.java deleted file mode 100644 index b751600..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/Workorder.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.nl.wms.sch.workorder.service.dao; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.nl.wms.mes.domain.QPMES068RequestBody; - -import java.io.Serializable; -import java.util.Date; - -@Data -@EqualsAndHashCode(callSuper = false) -@ToString -@TableName("pdm_bd_workorder_two") -public class Workorder implements Serializable { - private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "出库单号") - private String somtOrderNo; - @ApiModelProperty(value = "生产工单") - private String moname; - @ApiModelProperty(value = "托号") - private String palletSN; - @ApiModelProperty(value = "晶棒号") - private String lotSN; - @ApiModelProperty(value = "物料编码") - private String productName; - @ApiModelProperty(value = "物料描述") - private String productDescription; - @ApiModelProperty(value = "客户编码") - private String supplierCode; - @ApiModelProperty(value = "客户名称") - private String supplierName; - @ApiModelProperty(value = "入库类型0-新建，1-已出库") - private Integer status; - @ApiModelProperty(value = "创建时间") - private Date createTime; - @ApiModelProperty(value = "回温模式") - private String mode; - - public void copyFrom(QPMES068RequestBody source){ - BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.java deleted file mode 100644 index 49427a9..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.sch.workorder.service.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.sch.report.service.dto.ReportQuery; -import org.nl.wms.sch.report.service.dto.YCLKCDto; -import org.nl.wms.sch.workorder.service.dao.Workorder; - -import java.util.List; - -/** -* @author lyd -* @date 2023-05-16 -**/ -public interface WorkorderMapper extends BaseMapper { - - void batchChange(List pointCodes,String mode,String status); - - List getYlOutDetail(); - - List getYlOutDetailByStatus(); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.xml deleted file mode 100644 index 012dd04..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dao/mapper/WorkorderMapper.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - UPDATE pdm_bd_workorder_two - SET status = #{status}, - mode = #{mode} - - palletSN IN - - #{code} - - and status != #{status} - - - - - - - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderDto.java deleted file mode 100644 index a8dacd8..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.nl.wms.sch.workorder.service.dto; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class WorkorderDto implements Serializable { - //出库单号 - private String somtOrderNo; - //生产工单 - private String moname; - //托号 - private String palletSN; - //晶棒号 - private String lotSN; - //物料编码 - private String productName; - //物料描述 - private String productDescription; - //客户编码 - private String supplierCode; - //客户名称 - private String supplierName; - //回温模式 - private String mode; -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderQuery.java deleted file mode 100644 index bd38d95..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/dto/WorkorderQuery.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.wms.sch.workorder.service.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class WorkorderQuery implements Serializable { - //托盘号 - private String palletSN; - //物料条码号 - private String lotSN; - //物料名称 - private String productName; - //供应商编码 - private String productDescription; - //供应商名称 - private String supplierCode; - //绑定状态 - private String status; - //生产工单 - private String moname; - //出库单号 - private String somtOrderNo; - //回温模式 - private String mode; -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java deleted file mode 100644 index d81c431..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java +++ /dev/null @@ -1,354 +0,0 @@ -package org.nl.wms.sch.workorder.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.domain.query.PageQuery; -import org.nl.wms.ext.service.AcsToWmsService; -import org.nl.wms.ext.service.dto.to.BaseResponse; -import org.nl.wms.pda.service.PdaService; -import org.nl.wms.pda.service.dao.vo.PdaResponseVo; -import org.nl.wms.pdm.service.dao.PointDetailAdd; -import org.nl.wms.sch.point.service.ISchBasePointService; -import org.nl.wms.sch.point.service.dao.SchBasePoint; -import org.nl.wms.sch.report.service.dto.YCLKCDto; -import org.nl.wms.sch.task.service.ISchBaseTaskService; -import org.nl.wms.sch.task.service.ISchBaseTaskconfigService; -import org.nl.wms.sch.task.service.dao.SchBaseTask; -import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; -import org.nl.wms.sch.task_manage.task.core.TaskStatus; -import org.nl.wms.sch.workorder.service.IWorkorderService; -import org.nl.wms.sch.workorder.service.dao.Workorder; -import org.nl.wms.sch.workorder.service.dao.mapper.WorkorderMapper; -import org.nl.wms.sch.workorder.service.dto.WorkorderQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -@Slf4j -@Service -public class WorkorderServiceImpl extends ServiceImpl implements IWorkorderService { - - @Autowired - private WorkorderMapper workorderMapper; - @Autowired - private ISchBaseTaskconfigService taskConfigService; - @Autowired - private ISchBaseTaskService taskService; - @Autowired - private PdaService pdaService; - @Autowired - private ISchBasePointService schBasePointService; - @Autowired - private AcsToWmsService acsToWmsService; - @Autowired - private ISchBasePointService pointService; - - @Override - public IPage queryAll(WorkorderQuery whereJson, PageQuery page){ - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(whereJson.getMoname()), Workorder::getMoname,whereJson.getMoname()); - wrapper.like(StringUtils.isNotBlank(whereJson.getSomtOrderNo()), Workorder::getSomtOrderNo,whereJson.getSomtOrderNo()); - wrapper.like(StringUtils.isNotBlank(whereJson.getPalletSN()), Workorder::getPalletSN,whereJson.getPalletSN()); - wrapper.like(StringUtils.isNotBlank(whereJson.getLotSN()), Workorder::getLotSN,whereJson.getLotSN()); - wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()), Workorder::getProductName,whereJson.getProductName()); - wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()), Workorder::getSupplierCode,whereJson.getSupplierCode()); - wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()), Workorder::getProductDescription,whereJson.getProductDescription()); - wrapper.eq(StringUtils.isNotBlank(whereJson.getStatus()), Workorder::getStatus,whereJson.getStatus()); - wrapper.orderByDesc(Workorder::getCreateTime); - pages = workorderMapper.selectPage(pages, wrapper); - return pages; - } - - @Override - public void create(Workorder entity) { - workorderMapper.insert(entity); - } - - @Override - public void update(String palletSN,String status){ - if(ObjectUtil.isNotEmpty(palletSN)){ - //更新已生成任务后的工单状态 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("palletSN",palletSN); - //更新大于等于1的记录 - updateWrapper.ge("status","1"); - updateWrapper.set("status",status); - workorderMapper.update(null,updateWrapper); - } - } - - @Override - public void updateByPda(String palletSN,String status,String mode){ - if(ObjectUtil.isNotEmpty(palletSN)){ - //更新已生成任务后的工单状态 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("palletSN",palletSN); - //更新小于等于1的记录 - updateWrapper.le("status","1"); - updateWrapper.set("status",status); - updateWrapper.set("mode",mode); - workorderMapper.update(null,updateWrapper); - } - } - - @Override - public void deleteAll(Set ids) { - // 真删除 - workorderMapper.deleteBatchIds(ids); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void batchChange( PointDetailAdd pointDetailAdd){ - //载具号集合 - List pointCodes = pointDetailAdd.getPointCodes(); - //是否快速回温 - String mode = pointDetailAdd.getMode(); - //下发状态 - String status = pointDetailAdd.getStatus(); - //更新工单状态和回温模式 - workorderMapper.batchChange(pointCodes,mode,status); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void batchCreate( PointDetailAdd pointDetailAdd){ - log.info("管理端发起一键移库！"); - //点位集合 - List pointCodes = pointDetailAdd.getPointCodes(); - //下发状态 - String status = pointDetailAdd.getStatus(); - //查询是否有目的空点位 - List nextList = schBasePointService.list(new LambdaQueryWrapper() - .eq(SchBasePoint::getRegion_code, "YL") - .eq(SchBasePoint::getIs_used, true) - .eq(SchBasePoint::getVehicle_qty, 0) - .and(slam -> slam.isNull(SchBasePoint::getVehicle_code2) - .or() - .eq(SchBasePoint::getVehicle_code2, "")) - .and(slam -> slam.isNull(SchBasePoint::getIng_task_code) - .or() - .eq(SchBasePoint::getIng_task_code, ""))); - if("1".equals(status)){ - for(String pointCode : pointCodes){ - if(nextList.size()==0){ - log.info("原料库存区无可用点位，取消后续循环"); - return; - } - //查询当前点位最新信息 - SchBasePoint schBasePoint =schBasePointService.getOne(new LambdaQueryWrapper() - .eq(SchBasePoint::getIs_used, true) - .eq(SchBasePoint::getRegion_code, "YLHC") - .eq(SchBasePoint::getPoint_code, pointCode) - .isNotNull(SchBasePoint::getVehicle_code2) - .ne(SchBasePoint::getVehicle_code2, "") - .notLike(SchBasePoint::getVehicle_code2, "YBHC") - .and(slam -> slam.isNull(SchBasePoint::getIng_task_code) - .or() - .eq(SchBasePoint::getIng_task_code, "") - )); - if(ObjectUtil.isNull(schBasePoint)){ - log.info("移库点位异常:"+pointCode); - continue; - } - SchBasePoint nexSchBasePoint = nextList.get(0); - JSONObject param = new JSONObject(); - param.put("start_point", schBasePoint.getPoint_code()); - param.put("next_point", nexSchBasePoint.getPoint_code()); - param.put("create_mode","1"); - param.put("request_medthod_code", "POINTTask"); - param.put("request_medthod_name", "点对点任务"); - param.put("vehicle_code",schBasePoint.getVehicle_code()); - param.put("vehicle_code2",schBasePoint.getVehicle_code2()); - param.put("device_code", schBasePoint.getPoint_code()); - - BaseResponse baseResponse= acsToWmsService.pdaApply(param); - Integer resultCode = baseResponse.getCode(); - if(resultCode.equals(200)){ - Map parameters = baseResponse.getParameters(); - //设置初始值 - schBasePoint.setIng_task_code("1"); - nexSchBasePoint.setIng_task_code("1"); - if(ObjectUtil.isNotNull(parameters)){ - String task_code = parameters.get("task_code"); - if(ObjectUtil.isNotEmpty(task_code)){ - schBasePoint.setIng_task_code(task_code); - nexSchBasePoint.setIng_task_code(task_code); - } - } - //发起任务时先把点位占用，防止发起重复任务 - pointService.update(schBasePoint); - pointService.update(nexSchBasePoint); - nextList.remove(0); - }else{ - log.info(baseResponse.toString()); - } - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void batchCreate2( PointDetailAdd pointDetailAdd){ - log.info("管理端发起一键移库！"); - //点位集合 - List pointCodes = pointDetailAdd.getPointCodes(); - //下发状态 - String status = pointDetailAdd.getStatus(); - String time = pointDetailAdd.getTime(); - //查询是否有目的空点位 - List nextList = schBasePointService.list(new LambdaQueryWrapper() - .eq(SchBasePoint::getRegion_code, "HWK") - .eq(SchBasePoint::getIs_used, true) - .eq(SchBasePoint::getVehicle_qty, 0) - .and(slam -> slam.isNull(SchBasePoint::getVehicle_code2) - .or() - .eq(SchBasePoint::getVehicle_code2, "")) - .and(slam -> slam.isNull(SchBasePoint::getIng_task_code) - .or() - .eq(SchBasePoint::getIng_task_code, ""))); - if("1".equals(status)){ - for(String pointCode : pointCodes){ - if(nextList.size()==0){ - log.info("快速回温区无可用点位，取消后续循环"); - return; - } - //查询当前点位最新信息 - SchBasePoint schBasePoint =schBasePointService.getOne(new LambdaQueryWrapper() - .eq(SchBasePoint::getIs_used, true) - .eq(SchBasePoint::getRegion_code, "HW") - .eq(SchBasePoint::getPoint_code, pointCode) - .isNotNull(SchBasePoint::getVehicle_code2) - .ne(SchBasePoint::getVehicle_code2, "") - .and(slam -> slam.isNull(SchBasePoint::getIng_task_code) - .or() - .eq(SchBasePoint::getIng_task_code, "") - )); - if(ObjectUtil.isNull(schBasePoint)){ - log.info("移库点位异常:"+pointCode); - continue; - } - SchBasePoint nexSchBasePoint = nextList.get(0); - JSONObject param = new JSONObject(); - param.put("start_point", schBasePoint.getPoint_code()); - param.put("next_point", nexSchBasePoint.getPoint_code()); - param.put("create_mode","1"); - param.put("request_medthod_code", "POINTTask"); - param.put("request_medthod_name", "点对点任务"); - param.put("vehicle_code",schBasePoint.getVehicle_code()); - param.put("vehicle_code2",schBasePoint.getVehicle_code2()); - param.put("device_code", schBasePoint.getPoint_code()); - param.put("time", time); - - BaseResponse baseResponse= acsToWmsService.pdaApply(param); - Integer resultCode = baseResponse.getCode(); - if(resultCode.equals(200)){ - Map parameters = baseResponse.getParameters(); - //设置初始值 - schBasePoint.setIng_task_code("1"); - nexSchBasePoint.setIng_task_code("1"); - if(ObjectUtil.isNotNull(parameters)){ - String task_code = parameters.get("task_code"); - if(ObjectUtil.isNotEmpty(task_code)){ - schBasePoint.setIng_task_code(task_code); - nexSchBasePoint.setIng_task_code(task_code); - } - } - //发起任务时先把点位占用，防止发起重复任务 - pointService.update(schBasePoint); - pointService.update(nexSchBasePoint); - nextList.remove(0); - }else{ - log.info(baseResponse.toString()); - } - } - } - } - - @Override - //@Transactional(rollbackFor = Exception.class) - public void batchCreateTask(){ - String config_code = "YCLCKTask"; - //查询可生成任务的工单 - List list = workorderMapper.getYlOutDetail(); - if(list.size()>0){ - // 查询任务配置信息 - SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() - .eq(SchBaseTaskconfig::getConfig_code, config_code)); - Assert.notNull(taskConfig, "找不到任务配置文件，请确认YCLCKTask配置是否存在！"); - // 获取任务配置最大生成任务数 - Integer tcmn = taskConfig.getTask_create_max_num(); - // 获取申请的任务 - List unFinishTasksByTaskConfig = taskService.findTasksByTaskStatus(config_code, TaskStatus.APPLY); - JSONObject param=new JSONObject(); - for(YCLKCDto workorder : list){ - //子载具 - String vehicle_code2 = workorder.getSubTray(); - //母载具 - String vehicle_code = workorder.getMotherTray(); - //载具所在点位 - String point_code = workorder.getPointCode(); - //是否快速回温 - String mode = workorder.getMode(); - //申请任务数量小于最大可生成任务数 - if(unFinishTasksByTaskConfig.size() < tcmn){ - //设置出库任务参数 - param.put("start_point",point_code); - param.put("mode",mode); - param.put("create_mode","1"); - param.put("vehicle_code",vehicle_code); - param.put("vehicle_code2", vehicle_code2); - param.put("workorder_code", workorder.getMoname()); - param.put("batch", DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss")); - param.put("user_id","1"); - param.put("person_name", "管理员"); - param.put("request_medthod_code", "YCLCKTask"); - param.put("request_medthod_name", "原材料出库"); - param.put("device_code",param.getString("start_point")); - BaseResponse baseResponse=acsToWmsService.pdaApply(param); - Integer resultCode = baseResponse.getCode(); - if(resultCode.equals(200)){ - //更新对应载具工单状态为已生成任务，不可在工单页面取消 - //pdm_bd_workorder_two任务生成时，status改为2 - this.update(vehicle_code2,"2"); - tcmn--; - }else{ - log.info(baseResponse.toString()); - continue; - } - }else{ - break; - } - } - } - } - - @Override - //@Transactional(rollbackFor = Exception.class) - public void batchCommitAndCreateOrder(){ - //查询可下发的工单 - List list = workorderMapper.getYlOutDetailByStatus(); - if(list.size()>0){ - //载具号集合 - List pointCodes = list.stream().map(YCLKCDto::getSubTray).collect(Collectors.toList()); - //更新工单状态和回温模式 - workorderMapper.batchChange(pointCodes,"0","1"); - } - } -} diff --git a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/point/PointCreate.java b/lms/nladmin-system/nlsso-server/src/test/java/org/nl/point/PointCreate.java deleted file mode 100644 index 02e4210..0000000 --- a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/point/PointCreate.java +++ /dev/null @@ -1,156 +0,0 @@ -package org.nl.point; - -import cn.hutool.core.date.DateUtil; -import org.junit.jupiter.api.Test; -import org.nl.wms.sch.point.service.ISchBasePointService; -import org.nl.wms.sch.point.service.dao.SchBasePoint; -import org.nl.wms.sch.region.service.ISchBaseRegionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: lyd - * @Description: 创建点位 - * @Date: 2023/6/15 - */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class PointCreate { - - @Autowired - private ISchBasePointService pointService; - @Autowired - private ISchBaseRegionService regionService; - @Test - void test01() { - // 创建YJ01-08 - List pointList = new ArrayList<>(); - for (int i = 3; i <= 8; i++) { - String pointName = "压机0"; - String pointCode = "YJ0"; - pointName = pointName + i; - pointCode = pointCode + i; - SchBasePoint point = new SchBasePoint(); - point.setPoint_code(pointCode); - point.setPoint_name(pointName); - point.setRegion_code("YZ"); - point.setRegion_name("压制区域"); - point.setPoint_type("1"); - point.setParent_point_code(pointCode); - point.setIs_has_workder(true); - point.setIs_auto(true); - pointList.add(point); - } - pointService.saveBatch(pointList); - } - - @Test - void test02() { // 压机接料位 - // 创建YJ01JLW01 - List pointList = new ArrayList<>(); - for (int i = 3; i <= 8; i++) { - String pointName = "压机0"; - String pointCode = "YJ0"; - pointName = pointName + i; - pointCode = pointCode + i; - for (int j = 1; j <= 2; j++) { - String jlw = "JLW0"; - String jlw2 = "接料位0"; - jlw = jlw + j; - jlw2 = jlw2 + j; - SchBasePoint point = new SchBasePoint(); - point.setPoint_code(pointCode + jlw); - point.setPoint_name(pointName + jlw2); - point.setRegion_code("YZ"); - point.setRegion_name("压制区域"); - point.setPoint_type("2"); - point.setParent_point_code(pointCode); - point.setIs_has_workder(false); - point.setIs_auto(true); - pointList.add(point); - } - } - pointService.saveBatch(pointList); - } - - @Test - void test03() { // 料盅睏料线区域 - // 创建LZKL01 - 32 - List pointList = new ArrayList<>(); - for (int i = 1; i <= 12; i++) {// 3台 - String pointName = "睏料位"; - String pointCode = "KLW"; - if (i < 10) { - pointName = pointName + "0" + i; - pointCode = pointCode + "0" + i; - } else { - pointName = pointName + i; - pointCode = pointCode + i; - } - SchBasePoint point = new SchBasePoint(); - point.setPoint_code(pointCode); - point.setPoint_name(pointName); - point.setRegion_code("LZKLX"); - point.setRegion_name("料盅睏料线区域"); - point.setParent_point_code(pointCode); - point.setIs_has_workder(false); - point.setIs_auto(true); - pointList.add(point); - } - pointService.saveBatch(pointList); - } - - - @Test - void test04() { // 缓存库位区域 - List pointList = new ArrayList<>(); - int count = 1; - for (int i = 1; i <= 2; i++) { - for (int j = 1; j <= 29; j++) { - for (int k = 1; k <= 3; k++) { - String code = "HCHJ"; - String name = "缓存货架"; - if (count < 10) { - code = code + "00" + count; - name = name + "00" + count; - } else if (count >= 10 && count < 100) { - code = code + "0" + count; - name = name + "0" + count; - } else { - code = code + count; - name = name + count; - } - SchBasePoint point = new SchBasePoint(); - point.setPoint_code(code); - point.setPoint_name(name); - point.setRegion_code("GTPHC"); - point.setRegion_name("钢托盘缓存区域"); - point.setPoint_status("1"); - point.setCan_vehicle_type("2"); - point.setVehicle_max_qty(1); - point.setBlock_num(1); - point.setRow_num(i); - point.setCol_num(j); - point.setLayer_num(k); - point.setIn_order_seq(count); - point.setOut_order_seq(count); - point.setIn_empty_seq(count); - point.setOut_empty_seq(count); - point.setParent_point_code(code); - point.setCreate_id("1"); - point.setCreate_name("管理员"); - point.setCreate_time(DateUtil.now()); - point.setIs_has_workder(false); - point.setIs_auto(true); - point.setIs_used(true); - pointList.add(point); - count++; - } - } - } - pointService.saveBatch(pointList); - } -} diff --git a/lms/nladmin-ui/src/views/wms/sch/interactivelog/index.vue b/lms/nladmin-ui/src/views/wms/sch/interactivelog/index.vue deleted file mode 100644 index ce56fbc..0000000 --- a/lms/nladmin-ui/src/views/wms/sch/interactivelog/index.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/sch/interactivelog/schBaseAcsandlmsinteractivelog.js b/lms/nladmin-ui/src/views/wms/sch/interactivelog/schBaseAcsandlmsinteractivelog.js deleted file mode 100644 index 98b04fd..0000000 --- a/lms/nladmin-ui/src/views/wms/sch/interactivelog/schBaseAcsandlmsinteractivelog.js +++ /dev/null @@ -1,27 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/schBaseAcsandlmsinteractivelog', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/schBaseAcsandlmsinteractivelog/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/schBaseAcsandlmsinteractivelog', - method: 'put', - data - }) -} - -export default { add, edit, del } diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 7bae133..327439c 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -3,29 +3,6 @@
- - - - - - - - -
- 取消 - 确认 -
- - - - - - - + - + @@ -196,9 +157,6 @@ /> - - - @@ -211,11 +169,8 @@ - - {{ item.label }} - - - {{ item.label }} + + @@ -243,13 +198,11 @@ - - - - + + @@ -268,16 +221,8 @@ style="display: inline" :data="scope.row" :permission="permission" + :is-visiable-del="false" /> - - 异常出库 - @@ -285,7 +230,6 @@
-
@@ -299,7 +243,6 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop' import ViewDialog from '@/views/wms/sch/point/ViewDialog.vue' -import PointDialog from '@/views/wms/sch/point/PointDialog.vue' const defaultForm = { point_code: null, @@ -308,8 +251,6 @@ const defaultForm = { region_name: null, point_type: null, point_status: null, - can_material_type: null, - can_vehicle_type: null, vehicle_max_qty: null, vehicle_type: null, vehicle_code: null, @@ -320,22 +261,16 @@ const defaultForm = { layer_num: null, in_order_seq: null, out_order_seq: null, - in_empty_seq: null, - out_empty_seq: null, - parent_point_code: null, ext_point_code: null, ing_task_code: null, - is_has_workder: 'false', workshop_code: null, - is_auto: 'true', remark: null, - is_used: 'true', - can_vehicle_types: null + is_used: 'true' } export default { name: 'SchBasePoint', - dicts: ['vehicle_type', 'TrueOrFalse', 'reason', 'work_order_two_status'], - components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation }, + dicts: ['vehicle_type', 'TrueOrFalse', 'reason'], + components: { ViewDialog, pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ @@ -377,9 +312,6 @@ export default { region_code: [ { required: true, message: '区域类型不能为空', trigger: 'blur' } ] - }, reasonDialogVisible: false, - reasonForm: { - reason: '' }, workShopList: [], regionList: [], @@ -400,10 +332,10 @@ export default { return true }, [CRUD.HOOK.beforeToCU]() { - console.log('1beforeToCU'+this.form.is_has_workder.toString()) + console.log('1beforeToCU' + this.form.is_has_workder.toString()) this.form.is_has_workder = 'false' this.form.is_auto = this.form.is_auto.toString() - console.log('2beforeToCU'+this.form.is_has_workder) + console.log('2beforeToCU' + this.form.is_has_workder) }, [CRUD.HOOK.afterToCU]() { if (this.form.region_code) { @@ -417,18 +349,15 @@ export default { const status = row.status if (column.property === 'status') { - if (status == '0') { + if (status === '0') { return 'background: #FFBA00' - } else if (status == '1') { + } else if (status === '1') { return 'background: #13ce66' - }else if (status == '2') { + } else if (status === '2') { return 'background: #13ce66' } } }, - format_work_order_two_status(row, column) { - return this.dict.label.work_order_two_status[row.status] - }, getWorkShopList() { // 获取车间列表 crudMdBaseWorkShop.getWorkShopList().then(res => { this.workShopList = res @@ -466,8 +395,7 @@ export default { } }) }, - regionChange(item){ - //console.log('当前选中', item) + regionChange(item) { this.form.region_name = item.region_name }, changeUsed(data, flag) { // 更改启用状态 @@ -479,62 +407,17 @@ export default { this.crud.toQuery() }) }, - showQtyButton(vehicle_qty, region_code) { - if (vehicle_qty === 1 && (region_code === 'YL' || region_code === 'YLHC')) { - return true - } - return false - }, toView(row) { if (row) { this.$refs.viewDialog.setParentData(row) } }, - tableChanged(row) { - this.form.parent_point_code = row.map(point => point.point_code).join(',') - }, - getParentPoint() { - this.pointDialog = true - }, handleClear() { this.crud.query.region_code = null this.crud.query.point_type = null this.crud.query.point_status = null this.hand() }, - openReasonDialog(row) { - // 打开选择原因的对话框 - this.reasonDialogVisible = true - // 这里可以将row存储到data中，以便在提交时使用 - this.selectedRow = row - }, - closeReasonDialog() { - // 关闭选择原因的对话框 - this.reasonDialogVisible = false - this.$refs['reasonForm'].resetFields() - }, - submitReason() { - // 提交选择的原因到后端接口 - const data = { - reason: this.reasonForm.reason, - device_code: this.selectedRow.point_code - } - // 调用后端接口提交数据 - // 这里假设使用axios库发送POST请求 - this.$axios - .post('/api/schBasePoint/outbound', data) - .then(response => { - // 处理后端返回的数据 - //console.log('提交成功', response) - this.$message.success('提交成功') - this.closeReasonDialog() - }) - .catch(error => { - // 处理错误情况 - console.error('提交失败,废包材位有货', error) - this.$message.error('提交失败,废包材位有货') - }) - }, mysubmit() { // 弹出输入回温时间和回温模式的对话框 this.$confirm('当前货位信息发生变更，请确认货位信息与实际一致', '提示', {