From d3382c4a16dfa1a07debde50b64358b3266ac9f3 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 18 Nov 2025 14:33:21 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E6=96=99=E6=A1=B6=E7=BB=84=E7=9B=98?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=91=E5=AE=9A=E4=BB=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IStructattrService.java | 2 +- .../mapper/MdPbStoragevehicleinfoMapper.xml | 16 ++++++---- .../service/impl/StructattrServiceImpl.java | 4 +-- .../service/impl/MesToWmsServiceImpl.java | 32 +++++++++---------- .../controller/PdaJBController.java | 5 +++ .../sch_manage/service/PdaJBService.java | 2 ++ .../service/impl/PdaJBServiceImpl.java | 15 +++++++++ 7 files changed, 51 insertions(+), 25 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java index 9be7c5e..d646611 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java @@ -127,5 +127,5 @@ public interface IStructattrService extends IService { * @param vehicleCode 仓位编码 * @return Structattr */ - Structattr getByVehicleCode(String vehicleCode); + Structattr getByVehicleCode(String vehicleCode, boolean flag); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml index fd6cf7e..9aa9d2e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml @@ -4,11 +4,15 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index 89115c8..42ce41d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -463,12 +463,12 @@ public class StructattrServiceImpl extends ServiceImpl().lambda() .eq(Structattr::getStoragevehicle_code, vehicleCode) ); - if (ObjectUtil.isEmpty(one)) { + if (ObjectUtil.isEmpty(one) && flag) { throw new BadRequestException("此载具不在仓位上【" + vehicleCode + "】"); } return one; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java index cebef54..8da07fb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java @@ -182,7 +182,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { .eq(SchBaseTask::getExt_task_code, dto.getTask_code())); if (CollectionUtils.isNotEmpty(taskList)) { - throw new BadRequestException("task_code" + dto.getTask_code() + "已存在，请勿重复提交！"); + throw new BadRequestException("MES提供的任务号：" + dto.getTask_code() + "已存在，请勿重复提交！"); } //根据料桶号去载具表匹配料桶类型 @@ -304,21 +304,6 @@ public class MesToWmsServiceImpl implements MesToWmsService { return MesResponse.requestOk(); } else if ("2".equals(dto.getTask_type())) { - if (StringUtils.isBlank(outPoint.getVehicle_code())) { - throw new BadRequestException("设备【" + pointCode + "】不存在料桶，请核对！"); - } - - //下空桶上满料 4个点 需要拆成2个任务，组装成一组 - log.info("下空桶上满料叫料，请求参数：【{}】", JSONObject.toJSONString(dto)); - - //点位作业位生产完后，满料状态->空料状态 - pointService.update(new LambdaUpdateWrapper() - .set(SchBasePoint::getPoint_status, "2") - .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) - .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) - .set(SchBasePoint::getUpdate_time, DateUtil.now()) - .eq(SchBasePoint::getPoint_code, outPoint.getPoint_code())); - SchBasePoint queryPoint = new SchBasePoint(); queryPoint.setPoint_type("2"); queryPoint.setParent_point_code(outPoint.getPoint_code()); @@ -346,6 +331,21 @@ public class MesToWmsServiceImpl implements MesToWmsService { throw new BadRequestException("该点位存在正在执行的任务，请核对！"); } + if (StringUtils.isBlank(outPoint.getVehicle_code())) { + throw new BadRequestException("设备【" + pointCode + "】不存在料桶，请核对！"); + } + + //下空桶上满料 4个点 需要拆成2个任务，组装成一组 + log.info("下空桶上满料叫料，请求参数：【{}】", JSONObject.toJSONString(dto)); + + //点位作业位生产完后，满料状态->空料状态 + pointService.update(new LambdaUpdateWrapper() + .set(SchBasePoint::getPoint_status, "2") + .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) + .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) + .set(SchBasePoint::getUpdate_time, DateUtil.now()) + .eq(SchBasePoint::getPoint_code, outPoint.getPoint_code())); + MdMeMaterialbase materialbase = materialbaseService.getByCode(groupPlate.getMaterial_code(), false); if (ObjectUtil.isEmpty(materialbase)) { throw new BadRequestException("物料【" + groupPlate.getMaterial_code() + "】不存在！"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java index c2b5cb6..4b6ba4d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java @@ -121,4 +121,9 @@ public class PdaJBController { public ResponseEntity vehicleList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaJBService.vehicleList(whereJson), HttpStatus.OK); } + @PostMapping("/groupAndBind") + @SaIgnore + public ResponseEntity groupAndBind(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaJBService.groupAndBind(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java index 7835bb4..db4b850 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java @@ -64,4 +64,6 @@ public interface PdaJBService { PdaResponse suppList(JSONObject param); PdaResponse vehicleList(JSONObject param); + + PdaResponse groupAndBind(JSONObject param); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java index ffb7d70..5bfbd3f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java @@ -443,6 +443,13 @@ public class PdaJBServiceImpl implements PdaJBService { if (ObjectUtil.isEmpty(structattr)) { throw new BadRequestException("仓位：" + pointCode + " 不存在！"); } + + Structattr byVehicleCode = iStructattrService.getByVehicleCode(vehicleCode, false); + if (ObjectUtil.isNotEmpty(byVehicleCode)) { + throw new BadRequestException(pointCode.equals(byVehicleCode.getStruct_code()) + ? "该料桶已经绑定！" : "该料桶已经绑定在" + byVehicleCode.getStruct_code()); + } + // 获取组盘信息 GroupPlate groupPlate = groupplateService.getOne(new LambdaQueryWrapper() .eq(GroupPlate::getStoragevehicle_code, vehicleCode) @@ -828,6 +835,14 @@ public class PdaJBServiceImpl implements PdaJBService { return PdaResponse.requestParamOk(selectList); } + @Override + public PdaResponse groupAndBind(JSONObject param) { + // vehicle_code、material_id、pcsn、supp_code、supp_name、single_weight、point_code + combination(param); + confirmSet(param); + return PdaResponse.requestOk("操作成功！"); + } + private Map buildTaskData(String pointCode, String workorderId, String invId) { Map jsonMst = new HashMap<>(); // ru库点