From 81951b0437500ddda05a2d89257b7a98cc596a0b Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 18 Sep 2024 11:11:49 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1.=E6=8E=A5=E5=8F=A3=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BF=A1=E6=81=AF2.=E4=BA=8C=E6=9C=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=9C=A8=E7=AE=B1=E8=A7=84=E6=A0=BC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/TwoExcepionalMoveTask.java | 1 + .../impl/StIvtIostorinvOutServiceImpl.java | 70 +++++++++++++++++++ .../util/impl/OutBoxManageServiceImpl.java | 1 + .../impl/OutVehicleManageServiceImpl.java | 1 + .../impl/InAndOutRetrunServiceImpl.java | 54 +++++++------- 5 files changed, 103 insertions(+), 24 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java index d6f8e7d69..d58df1392 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java @@ -152,6 +152,7 @@ public class TwoExcepionalMoveTask extends AbstractAcsTask { json.put("task_group_id", form.getLongValue("task_group_id")); json.put("point_code1", form.getString("start_device_code")); json.put("point_code2", form.getString("next_device_code")); + json.put("car_no", form.getString("car_no")); json.put("handle_class", this.getClass().getName()); json.put("create_id", SecurityUtils.getCurrentUserId()); json.put("create_name", SecurityUtils.getCurrentUsername()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 058794585..83a7c070c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -14,7 +14,9 @@ import org.nl.b_lms.pdm_manage.enums.SUBEnum; import org.nl.b_lms.sch.tasks.TwoOutExceptionalTask; import org.nl.b_lms.sch.tasks.TwoOutTask; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; +import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService; import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService; @@ -103,12 +105,24 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl arr = new ArrayList<>(); TranUtil.openTransaction((req, allTransactionConsumer) -> { + // 校验是否有木箱规格没有维护 + boxCheck(whereJson.getString("iostorinv_id")); + // 查询此明细所有未生成的分配明细 List disDaoList = stIvtIostorinvdisMapper.getNotCreateDis(whereJson); @@ -2036,4 +2053,57 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl listDis = iStIvtIostorinvdisService.list( + new QueryWrapper().lambda() + .eq(StIvtIostorinvdis::getIostorinv_id, iostorinv_id) + ); + + List collectBox = listDis.stream() + .map(StIvtIostorinvdis::getBox_no) + .distinct() + .collect(Collectors.toList()); + + // 查询木箱信息 + List listBoxInfo = iBstIvtBoxinfoService.list( + new QueryWrapper().lambda() + .in(BstIvtBoxinfo::getBox_no, collectBox) + ); + + List collectBoxType = listBoxInfo.stream() + .map(BstIvtBoxinfo::getMaterial_code) + .distinct() + .collect(Collectors.toList()); + + // 查询木箱类型信息 + List listBoxType = iMdpbBoxtypeService.list( + new QueryWrapper().lambda() + .in(MdpbBoxtype::getBox_type, collectBoxType) + ); + + // 校验是否都维护了数据 + List boxTypeList = listBoxType.stream() + .filter(row -> ObjectUtil.isEmpty(row.getLash_num()) || + ObjectUtil.isEmpty(row.getLash_num_one()) || + ObjectUtil.isEmpty(row.getLash_num_tow()) || + ObjectUtil.isEmpty(row.getNeed_lash_one()) || + ObjectUtil.isEmpty(row.getNeed_lash_two()) || + ObjectUtil.isEmpty(row.getExpend_width()) + ) + .collect(Collectors.toList()); + + if (ObjectUtil.isNotEmpty(boxTypeList)) { + String message = boxTypeList.stream() + .map(MdpbBoxtype::getBox_type) + .collect(Collectors.joining("','")); + + throw new BadRequestException("请先维护规格类型为【"+message+"】的木箱规格类型信息!"); + } + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java index e697c7b6b..450ed20c5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java @@ -207,6 +207,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { taskParam.put("start_device_code", jsonAttrNow.getString("struct_code")); taskParam.put("next_device_code", IOSEnum.OUT_POINT.code(jsonAttrNow.getString("row_num"))); taskParam.put("task_type", "010712"); + taskParam.put("car_no", "此货位LMS系统未有库存，请待出至【CK2001】点位后确认实物并重新手工入回库!"); taskParam.put("vehicle_code",IOSEnum.IS_NOTANDYES.code("否")); TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java index 894ea76b3..749c739b9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java @@ -191,6 +191,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService { taskParam.put("start_device_code", jsonAttrNow.getString("struct_code")); taskParam.put("next_device_code", IOSEnum.OUT_POINT.code(jsonAttrNow.getString("row_num"))); taskParam.put("task_type", "010712"); + taskParam.put("car_no", "此货位LMS系统未有库存，请待出至【CK2001】点位后确认实物并重新手工入回库!"); taskParam.put("vehicle_code",IOSEnum.IS_NOTANDYES.code("否")); TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index e76859df4..3e97c416c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -215,7 +215,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { details.add(jsonParamDtl); } param.put("Details", details); - new LmsToMesServiceImpl().lmsPackage(param); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).lmsPackage(param); } jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -241,7 +241,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { details.add(jsonParamDtl); } param.put("Details", details); - new LmsToMesServiceImpl().lmsUnPackage(param); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).lmsUnPackage(param); } jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -275,7 +275,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { details.add(jsonParamDtl); } param.put("Details", details); - new LmsToMesServiceImpl().lmsUnPackage(param); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).lmsUnPackage(param); } jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -311,7 +311,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramMesMst.put("item", paramArr); // 调用接口回传 - new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).childRollFGOutboundComplete(paramMesMst); jo_mst.put("upload_mes", "1"); if ("1".equals(jo_mst.getString("upload_sap"))) { @@ -349,7 +349,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramMesMst.put("item", paramArr); // 调用接口回传 - new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).childRollFGOutboundComplete(paramMesMst); jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -388,7 +388,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { details.add(jsonParamDtl); } param.put("Details", details); - new LmsToMesServiceImpl().lmsUnPackage(param); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).lmsUnPackage(param); } jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -444,7 +444,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 仓库编码 param.put("WareHouse", jsonStor.getString("ext_id")); - new LmsToMesServiceImpl().ChildScrapUpdate(param); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).ChildScrapUpdate(param); // 更新分配回传成功 JSONObject jsonUpdate = new JSONObject(); @@ -572,7 +572,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("HEAD", paramSapMstArr); // 调用接口回传 - new LmsToSapServiceImpl().returnDelivery(param); + SpringContextHolder.getBean(LmsToSapServiceImpl.class).returnDelivery(param); jo_mst.put("upload_sap", "1"); jo_mst.put("is_upload", "1"); @@ -646,7 +646,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { if (ObjectUtil.isNotEmpty(vbeln)) { try { // 调用接口回传 - new LmsToSapServiceImpl().returnDelivery(param); + SpringContextHolder.getBean(LmsToSapServiceImpl.class).returnDelivery(param); } catch (Exception e) { throw new BadRequestException("回传sap失败：" + e.getMessage()); } @@ -720,7 +720,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("HEAD", paramSapMstArr); // 调用接口回传 - new LmsToSapServiceImpl().returnDelivery(param); + SpringContextHolder.getBean(LmsToSapServiceImpl.class).returnDelivery(param); jo_mst.put("upload_sap", "1"); if ("1".equals(jo_mst.getString("upload_mes")) || "0".equals(is_productstore)) { @@ -777,7 +777,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("ZZCX", out_mst.getString("car_type")); // 调用接口回传 - new LmsToSapServiceImpl().returnOutDtl(param); + SpringContextHolder.getBean(LmsToSapServiceImpl.class).returnOutDtl(param); jo_mst.put("upload_sap", "1"); jo_mst.put("is_upload", "1"); @@ -912,7 +912,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { if (ObjectUtil.isNotEmpty(vbeln)) { try { // 调用接口回传 - new LmsToSapServiceImpl().returnDelivery(param); + SpringContextHolder.getBean(LmsToSapServiceImpl.class).returnDelivery(param); } catch (Exception e) { throw new BadRequestException("回传sap失败：" + e.getMessage()); } @@ -1092,7 +1092,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject param = new JSONObject(); param.put("HEAD", paramSapMstArr); // 调用接口回传 - new LmsToSapServiceImpl().returnDelivery(param); + LmsToSapServiceImpl bean = SpringContextHolder.getBean(LmsToSapServiceImpl.class); + bean.returnDelivery(param); jo_mst.put("upload_sap", "1"); jo_mst.put("is_upload", "1"); @@ -1146,7 +1147,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("ZZCX", out_mst.getString("car_type")); // 调用接口回传 - new LmsToSapServiceImpl().returnOutDtl(param); + LmsToSapServiceImpl bean = SpringContextHolder.getBean(LmsToSapServiceImpl.class); + bean.returnOutDtl(param); jo_mst.put("upload_sap", "1"); jo_mst.put("is_upload", "1"); @@ -1172,7 +1174,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { details.add(jsonParamDtl); } param.put("Details", details); - new LmsToMesServiceImpl().lmsPackage(param); + LmsToMesServiceImpl bean = SpringContextHolder.getBean(LmsToMesServiceImpl.class); + bean.lmsPackage(param); } jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -1245,7 +1248,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { if (ObjectUtil.isNotEmpty(vbeln)) { try { // 调用接口回传 - new LmsToSapServiceImpl().returnDelivery(param); + LmsToSapServiceImpl bean = SpringContextHolder.getBean(LmsToSapServiceImpl.class); + bean.returnDelivery(param); } catch (Exception e) { throw new BadRequestException("回传sap失败：" + e.getMessage()); } @@ -1270,7 +1274,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { details.add(jsonParamDtl); } param.put("Details", details); - new LmsToMesServiceImpl().lmsUnPackage(param); + LmsToMesServiceImpl bean = SpringContextHolder.getBean(LmsToMesServiceImpl.class); + bean.lmsUnPackage(param); } jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -1346,7 +1351,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("HEAD", paramSapMstArr); // 调用接口回传 - new LmsToSapServiceImpl().returnDelivery(param); + LmsToSapServiceImpl bean = SpringContextHolder.getBean(LmsToSapServiceImpl.class); + bean.returnDelivery(param); jo_mst.put("upload_sap", "1"); WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst); @@ -1377,7 +1383,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramMesMst.put("item", paramArr); // 调用接口回传 - new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).childRollFGOutboundComplete(paramMesMst); jo_mst.put("upload_mes", "1"); // } @@ -1467,7 +1473,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramMesMst.put("item", paramArr); // 调用接口回传 - new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).childRollFGOutboundComplete(paramMesMst); jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -1505,7 +1511,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { details.add(jsonParamDtl); } param.put("Details", details); - new LmsToMesServiceImpl().lmsUnPackage(param); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).lmsUnPackage(param); } jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -1539,7 +1545,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { details.add(jsonParamDtl); } param.put("Details", details); - new LmsToMesServiceImpl().lmsUnPackage(param); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).lmsUnPackage(param); } jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1"); @@ -1612,7 +1618,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { if (ObjectUtil.isNotEmpty(vbeln)) { try { // 调用接口回传 - new LmsToSapServiceImpl().returnDelivery(param); + SpringContextHolder.getBean(LmsToSapServiceImpl.class).returnDelivery(param); } catch (Exception e) { throw new BadRequestException("回传sap失败：" + e.getMessage()); } @@ -1667,7 +1673,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 仓库编码 param.put("WareHouse", jsonStor.getString("ext_id")); - new LmsToMesServiceImpl().ChildScrapUpdate(param); + SpringContextHolder.getBean(LmsToMesServiceImpl.class).ChildScrapUpdate(param); // 更新分配回传成功 JSONObject jsonUpdate = new JSONObject();