From 95959bbd8efb3dea7e6e6947499ad22135710e98 Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Mon, 8 Apr 2024 09:25:07 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=89=8B=E6=8C=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pda/controller/PdaController.java | 24 +- .../org/nl/wms/pda/service/PdaService.java | 7 +- .../wms/pda/service/dao/mapper/PdaMapper.java | 6 +- .../wms/pda/service/dao/mapper/PdaMapper.xml | 290 +++++++++--------- .../wms/pda/service/impl/PdaServiceImpl.java | 14 +- .../dao/SchBaseVehiclematerialgroup.java | 2 + ...chBaseVehiclematerialgroupServiceImpl.java | 25 +- .../task_manage/task/tasks/hn/CBJMLTask.java | 26 +- .../task_manage/task/tasks/hn/CBJQLTask.java | 10 - .../task_manage/task/tasks/hn/HNMLTask.java | 2 + .../task_manage/task/tasks/hn/HNQKTask.java | 1 + .../task_manage/task/tasks/yz/YZQLTask.java | 5 +- .../task/tasks/yz/YZSLWHKTask.java | 5 +- .../task/tasks/yz/mapper/YZMapper.xml | 1 + .../views/wms/pdm/workerorder/mixedOrder.vue | 22 +- 15 files changed, 229 insertions(+), 211 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java index 1ca45d1..a3c8bc4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java @@ -50,11 +50,18 @@ public class PdaController { // return new ResponseEntity<>(pdaService.orderFinish(req), HttpStatus.OK); // } - @PostMapping("/shelfInfo") - @Log("查询货架上料盅信息") - @ApiOperation("查询货架上料盅信息") - public ResponseEntity shelfInfo() { - return new ResponseEntity<>(pdaService.shelfInfo(), HttpStatus.OK); + @PostMapping("/unpackShelfInfo") + @Log("查询货架上未拆包料盅信息") + @ApiOperation("查询货架上未拆包料盅信息") + public ResponseEntity unpackShelfInfo() { + return new ResponseEntity<>(pdaService.unpackShelfInfo(), HttpStatus.OK); + } + + @PostMapping("/getCbjPoint") + @Log("查询拆包机点位") + @ApiOperation("查询拆包机点位") + public ResponseEntity getCbjPoint() { + return new ResponseEntity<>(pdaService.getCbjPoint(), HttpStatus.OK); } @PostMapping("/cbjqlTask") @@ -78,6 +85,13 @@ public class PdaController { return new ResponseEntity<>(pdaService.cbjqkTask(req), HttpStatus.OK); } + @PostMapping("/packShelfInfo") + @Log("查询货架上已拆包料盅信息") + @ApiOperation("查询货架上已拆包料盅信息") + public ResponseEntity packShelfInfo() { + return new ResponseEntity<>(pdaService.packShelfInfo(), HttpStatus.OK); + } + @PostMapping("/yzqlTask") @Log("困料货架点对点到布料机上料位") @ApiOperation("困料货架点对点到布料机上料位") diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java index 73eced1..d00f48a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java @@ -67,8 +67,8 @@ public interface PdaService { List pressPointList(); -// PdaResponseVo orderFinish(TaskReq req); - List shelfInfo(); + //查询货架上未拆包料盅信息 + List unpackShelfInfo(); PdaResponseVo cbjqlTask(TaskReq req); @@ -94,4 +94,7 @@ public interface PdaService { List getYjslwPointList(); + List getCbjPoint(); + + List packShelfInfo(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java index 32b831f..157eb62 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java @@ -80,5 +80,9 @@ public interface PdaMapper { List getYjslwPointList(); - List selectShelfInfo(); + List selectUnpackShelfInfo(); + + List getCbjPointList(); + + List selectPackShelfInfo(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml index 0ae3d31..75cdc4d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml @@ -3,187 +3,168 @@ - select p.point_code as pointCode, m.material_code as materialCode, g.instorage_time as instorageTime from sch_base_point p left join sch_base_vehiclematerialgroup g on p.point_code = g.point_code @@ -192,6 +173,27 @@ and p.is_used = '1' and p.point_status = '3' and p.point_code not like 'CBJ%' + and g.unpack = '0' + order by g.point_code + + + + 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 ddcbd76..4cd6514 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 @@ -391,8 +391,8 @@ public class PdaServiceImpl implements PdaService { } @Override - public List shelfInfo() { - return pdaMapper.selectShelfInfo(); + public List unpackShelfInfo() { + return pdaMapper.selectUnpackShelfInfo(); } // @Override @@ -538,6 +538,16 @@ public class PdaServiceImpl implements PdaService { return pdaMapper.getYjslwPointList(); } + @Override + public List getCbjPoint() { + return pdaMapper.getCbjPointList(); + } + + @Override + public List packShelfInfo() { + return pdaMapper.selectPackShelfInfo(); + } + /** * 保存组盘信息 * @param shelfSaveDto diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java index 55b732f..fc5e74d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java @@ -152,6 +152,8 @@ public class SchBaseVehiclematerialgroup implements Serializable { private String out_kiln_time; @ApiModelProperty(value = "入窑时间") private String into_kiln_time; + @ApiModelProperty(value = "是否已拆包(0 否,1 是)") + private String unpack; @TableField(exist = false) 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 b2a5835..bf31e52 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 @@ -37,10 +37,10 @@ import java.util.Set; import java.util.function.Consumer; /** -* @description 服务实现 -* @author lyd -* @date 2023-05-16 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-05-16 + **/ @Slf4j @Service public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl implements ISchBaseVehiclematerialgroupService { @@ -55,7 +55,7 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl queryAll(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page){ + public IPage queryAll(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page) { IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pages = vehiclematerialgroupMapper.selectPageLeftJoin(pages, whereJson); return pages; @@ -67,7 +67,7 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl lambda = new QueryWrapper().lambda(); lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, barCode) - .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,GroupBindMaterialStatusEnum.BOUND.getValue()) + .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue()) .eq(SchBaseVehiclematerialgroup::getIs_delete, false); return vehiclematerialgroupMapper.selectOne(lambda); } @@ -164,8 +164,13 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl lambda = new QueryWrapper().lambda(); lambda.eq(SchBaseVehiclematerialgroup::getPoint_code, pointCode) - .eq(SchBaseVehiclematerialgroup::getIs_delete, false); - return vehiclematerialgroupMapper.selectOne(lambda); + .eq(SchBaseVehiclematerialgroup::getIs_delete, false) + .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.UNBOUND.getValue()) + .orderByDesc(SchBaseVehiclematerialgroup::getUpdate_time); + List schBaseVehiclematerialgroups = vehiclematerialgroupMapper.selectList(lambda); + if (schBaseVehiclematerialgroups.isEmpty()) { + return null; + } + return schBaseVehiclematerialgroups.get(0); } - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java index d0c83a6..1a5d092 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJMLTask.java @@ -192,32 +192,10 @@ public class CBJMLTask extends AbstractTask { groupEntity.setPoint_name(endPointObj.getPoint_name()); groupEntity.setMove_way(groupEntity.getMove_way() + " -> " + endPointObj.getPoint_code()); groupEntity.setTask_code(taskObj.getTask_code()); + //改为已拆包 + groupEntity.setUnpack("1"); TaskUtils.setGroupUpdateByType(groupEntity, taskFinishedType); vehiclematerialgroupService.updateById(groupEntity); - // 更新工单上的实际重量 - // 更新混碾工单 - PdmBdWorkorder workOrderObj = workorderService.getByCode(groupEntity.getWorkorder_code()); - workOrderObj.setReal_weight(workOrderObj.getReal_weight().add(groupEntity.getMaterial_weight())); - TaskUtils.setWorkOrderUpdateByType(workOrderObj, taskFinishedType); - workorderService.updateById(workOrderObj); - // 如果终点是布料机，那就是需要将压机工单对应（新、旧）料的真实值相加 - if (RegionConstant.PRESSED_AREA.equals(endPointObj.getRegion_code())) { - PdmBdWorkorder productionTask = workorderService.getDeviceDockingProductionTask(endPoint); - switch (endPointObj.getPoint_type()) { - case PointTypeConstant.NEW_MATERIAL_POINT: - productionTask.setReal_new_weight(productionTask.getReal_new_weight() - .add(groupEntity.getMaterial_weight())); - break; - case PointTypeConstant.OLD_MATERIAL_POINT: - productionTask.setReal_old_weight(productionTask.getReal_old_weight() - .add(groupEntity.getMaterial_weight())); - break; - default: - throw new BadRequestException("点位区域配置错误!"); - } - TaskUtils.setWorkOrderUpdateByType(productionTask, taskFinishedType); - workorderService.updateById(productionTask); - } // 清空起点 PointUtils.setUpdateByType(startPointObj, taskFinishedType); PointUtils.clearPoint(startPointObj); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQLTask.java index b63e0de..fd4fd2e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/CBJQLTask.java @@ -104,15 +104,8 @@ public class CBJQLTask extends AbstractTask { @Override protected void createCompletion(SchBaseTask task) { - // 配置信息 -// SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() -// .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); TaskUtils.setUpdateByAcs(task); - // 料盅 task.setVehicle_type(GeneralDefinition.MATERIAL_CUP); -// List startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(",")) -// .collect(Collectors.toList()); - // 找起点 String requestParam = task.getRequest_param(); JSONObject extGroupData = JSONObject.parseObject(requestParam); SchBasePoint point = pointService.selectById(extGroupData.getString("start_point")); @@ -122,15 +115,12 @@ public class CBJQLTask extends AbstractTask { TASK_CONFIG_CODE + task.getPoint_code2(), NoticeTypeEnum.WARN.getCode()); throw new BadRequestException(ExceptionConstant.NEED_POINT_NOT_FOUND); } - // 找到了会把组盘标识传过来 - // 设置起点并修改创建成功状态 task.setPoint_code1(point.getPoint_code()); task.setTask_status(TaskStatus.CREATED.getCode()); task.setVehicle_code(point.getVehicle_code()); task.setGroup_id(point.getGroup_id()); task.setRemark(""); taskService.save(task); - point.setIng_task_code(task.getTask_code()); PointUtils.setUpdateByAcs(point); pointService.updateById(point); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java index e96431a..b996367 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java @@ -159,6 +159,7 @@ public class HNMLTask extends AbstractTask { .eq(SchBasePoint::getIng_task_code, "")) .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode()) .eq(SchBasePoint::getIs_used, true) + .notLike(SchBasePoint::getPoint_code,"CBJ%") .orderByAsc(SchBasePoint::getUpdate_time) .orderByAsc(SchBasePoint::getIn_order_seq) .orderByAsc(SchBasePoint::getPoint_code)); @@ -315,6 +316,7 @@ public class HNMLTask extends AbstractTask { groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); groupEntity.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); groupEntity.setIs_delete(false); + groupEntity.setUnpack("0");//未拆包 vehiclematerialgroupService.save(groupEntity); return groupEntity.getGroup_id(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java index ccefebe..2a30173 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java @@ -133,6 +133,7 @@ public class HNQKTask extends AbstractTask { .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住 .or() .eq(SchBasePoint::getIng_task_code, "")) + .notLike(SchBasePoint::getPoint_code,"CBJ%") .orderByAsc(SchBasePoint::getUpdate_time) .orderByAsc(SchBasePoint::getIn_order_seq); List schBasePoints = pointService.list(lam); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java index c69eedf..7094992 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java @@ -236,11 +236,14 @@ public class YZQLTask extends AbstractTask { public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String startPoint = taskObj.getPoint_code1(); SchBasePoint startPointObj = pointService.getById(startPoint); + SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2()); // 除了解锁需要将组盘表中的物料绑定载具设置为已解绑 // 起点设置空位 // 任务上有载具编码 -> 获取当前载具编码的组盘信息 SchBaseVehiclematerialgroup groupObj = vehiclematerialgroupService.getById(taskObj.getGroup_id()); - // 将载具设置为已解绑 + // 将载具设置为已解绑 修改点位未 + groupObj.setPoint_code(endPointObj.getPoint_code()); + groupObj.setPoint_name(endPointObj.getPoint_name()); groupObj.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); TaskUtils.setGroupUpdateByType(groupObj, taskFinishedType); vehiclematerialgroupService.update(groupObj); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java index ebe3ea2..d85d813 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLWHKTask.java @@ -195,6 +195,7 @@ public class YZSLWHKTask extends AbstractTask { PointUtils.clearPoint(startPoint); String endPoint = taskObj.getPoint_code2(); // 获取终点 SchBasePoint endPointObj = pointService.getById(endPoint); + //查询该点位已解绑的组盘信息 SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getByPointCode(pointCode1); if (null == groupInfo) { throw new BadRequestException("未查询到上料位组盘信息"); @@ -203,7 +204,9 @@ public class YZSLWHKTask extends AbstractTask { if (ObjectUtil.isNotEmpty(endPoint)) { // SimpleDateFormat dateFormat = new SimpleDateFormat("yy-"); // String format = dateFormat.format(DateUtil.now()); - groupInfo.setInstorage_time(DateUtil.now()); +// groupInfo.setInstorage_time(DateUtil.now()); + groupInfo.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); + groupInfo.setSource_vehicle_code(pointCode1); groupInfo.setPoint_code(endPoint); groupInfo.setMove_way(groupInfo.getMove_way() + "->" + startPoint.getPoint_code()+"->"+ endPoint); groupInfo.setPoint_name(endPointObj.getPoint_name()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml index 30f4cc7..566a334 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml @@ -22,6 +22,7 @@ WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL) AND p.point_status = '3' AND vg.group_id IS NOT NULL AND vg.redundance_material_code = #{materialCode} AND TIMESTAMPDIFF(MINUTE, vg.instorage_time, NOW()) >= vg.standing_time + and vg.unpack='1' AND p.region_code IN #{code} diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/mixedOrder.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/mixedOrder.vue index e985a58..bfed6a4 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/mixedOrder.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/mixedOrder.vue @@ -72,17 +72,17 @@ > 开工 - - 任务下发 - + + + + + + + + + + +