From 3d45258e77a20415874d34ffd4af223cd91e4be9 Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Mon, 9 Mar 2026 16:58:10 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=A0=AA=E6=B4=B2=E4=B8=AD=E9=92=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MesToWmsServiceImpl.java | 2 +- .../controller/PdaIosOutController.java | 8 ++++ .../ios_manage/service/PdaIosInService.java | 2 +- .../ios_manage/service/PdaIosOutService.java | 8 ++++ .../service/impl/PdaIosInServiceImpl.java | 6 +-- .../service/impl/PdaIosOutServiceImpl.java | 47 +++++++++++++++++++ .../inAndOut/service/IInBillService.java | 7 ++- .../service/impl/InBillServiceImpl.java | 4 +- 8 files changed, 77 insertions(+), 7 deletions(-) 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 b39d6f1..7dcd850 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 @@ -547,7 +547,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { param.put("stor_id", sectattr.getStor_id()); param.put("supp_code", groupPlate.getSupp_code()); param.put("supp_name", groupPlate.getSupp_name()); - pdaIosInService.zwConfirmReturnMaterial(param); + return MesResponse.requestParamOk(pdaIosInService.zwConfirmReturnMaterial(param)); } else if ("2".equals(dto.getTask_type())) { //退空桶 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java index ba9be93..5fb9525 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosOutController.java @@ -143,6 +143,14 @@ public class PdaIosOutController { return new ResponseEntity<>(pdaIosOutService.getMaterialSuppByVehicleCode(whereJson), HttpStatus.OK); } + + @PostMapping("/getMaterialSuppByDeviceCode") + @Log("PDA根据点位获取载具中物料信息") + public ResponseEntity getMaterialSuppByDeviceCode(@RequestBody JSONObject whereJson) { + assertNotBlankJson(whereJson, "请求参数不能为空", "device_code"); + return new ResponseEntity<>(pdaIosOutService.getMaterialSuppByDeviceCode(whereJson), HttpStatus.OK); + } + @PostMapping("/getStructivtByMaterialAndSectCode") @Log("根据库区、物料信息获取库存信息") public ResponseEntity getStructivtByMaterialAndSectCode(@RequestBody JSONObject whereJson) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java index 3e974df..7ddb486 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosInService.java @@ -215,7 +215,7 @@ public interface PdaIosInService { * } * @return PdaResponse */ - PdaResponse zwConfirmReturnMaterial(JSONObject whereJson); + String zwConfirmReturnMaterial(JSONObject whereJson); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosOutService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosOutService.java index 4f9de60..03151e2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosOutService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/PdaIosOutService.java @@ -132,6 +132,14 @@ public interface PdaIosOutService { */ PdaResponse getMaterialSuppByVehicleCode(JSONObject whereJson); + + /** + * PDA根据点位获取料桶号 + * + * @return PdaResponse + */ + PdaResponse getMaterialSuppByDeviceCode(JSONObject whereJson); + /** * 查询组盘信息通过载具编号 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index 6f80b05..7f866df 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -609,7 +609,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { */ @Override @Transactional - public PdaResponse zwConfirmReturnMaterial(JSONObject whereJson) { + public String zwConfirmReturnMaterial(JSONObject whereJson) { // 生成回库任务 whereJson.put("config_code", IOSConstant.BACK_IN_TASK); whereJson.put("Priority", TaskEnum.ACS_PRIORITY.code("1")); @@ -638,7 +638,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { Map jsonDtl = organizeDivData(whereJson); jsonDtl.put("stragegy_type",StatusEnum.IOBILL_TYPE_IN.code("余料入库")); // 调用分配，默认自动分配库位 - iRawAssistIStorService.divStruct(new JSONObject(jsonDtl)); + String struct_code = iRawAssistIStorService.divStruct(new JSONObject(jsonDtl)); // 下发任务 sendTask(whereJson); //更新组盘表状态 @@ -647,7 +647,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { .set(GroupPlate::getQty,whereJson.getString("qty")) .eq(GroupPlate::getGroup_id, whereJson.getString("group_id"))); - return PdaResponse.requestOk(); + return struct_code; } @Override diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index 6a85240..9c00ccb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -501,6 +501,53 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { return PdaResponse.requestParamOk(outJson); } + @Override + public PdaResponse getMaterialSuppByDeviceCode(JSONObject whereJson) { + String device_code =whereJson.getString("device_code"); + //1、查询点位 + SchBasePoint schBasePoint = iSchBasePointService.getPointByCode(device_code); + if(null == schBasePoint){ + throw new BadRequestException("点位不存在"); + } + + if (StringUtils.isBlank(schBasePoint.getVehicle_code())) { + throw new BadRequestException("机台" + device_code + "上不存在料桶，请核对!"); + } + + + //查找状态为入库状态的组盘表 + List groupPlateList = iMdPbGroupPlateService.list(new QueryWrapper().lambda() + .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库")) + .ne(GroupPlate::getPcsn, "空托盘入库") + .eq(GroupPlate::getStoragevehicle_code, schBasePoint.getVehicle_code()) + .orderByDesc(GroupPlate::getCreate_time) + ); + + if (CollectionUtils.isEmpty(groupPlateList)) { + throw new BadRequestException("机台" + device_code + "上载具组盘信息不存在，请核对！"); + } + + JSONObject outJson = new JSONObject(); + + //根据物料id获取物料名称等信息 + + MdMeMaterialbase materialbase = iMdMeMaterialbaseService.getByCode(groupPlateList.get(0).getMaterial_id(), false); + if (materialbase != null) { + outJson.put("material_code", materialbase.getMaterial_code()); + outJson.put("material_name", materialbase.getMaterial_name()); + outJson.put("material_spec", materialbase.getMaterial_spec()); + outJson.put("material_model", materialbase.getMaterial_model()); + } + + outJson.put("vehicle_code", schBasePoint.getVehicle_code()); + outJson.put("supp_code", groupPlateList.get(0).getSupp_code()); + outJson.put("supp_name", groupPlateList.get(0).getSupp_name()); + outJson.put("pscn", groupPlateList.get(0).getPcsn()); + + return PdaResponse.requestParamOk(outJson); + } + + @Override public PdaResponse getStructivtByMaterialAndSectCode(JSONObject whereJson) { return PdaResponse.requestParamOk(mdPbStoragevehicleextMapper.queryAll(whereJson)); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/IInBillService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/IInBillService.java index 1a07a75..808793a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/IInBillService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/IInBillService.java @@ -38,7 +38,12 @@ public interface IInBillService extends IService { List getIODtl(Map whereJson); - void divStruct(JSONObject whereJson); + /** + * 库位分配，返回分配的库位 + * @param whereJson + * @return + */ + String divStruct(JSONObject whereJson); void zwInDivStruct(JSONObject whereJson); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java index 7d78feb..9f39b1c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java @@ -340,7 +340,7 @@ public class InBillServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) - public void divStruct(JSONObject param) { + public String divStruct(JSONObject param) { Assert.noNullElements(new Object[]{param.getString("stor_code"), param.getString("sect_code")}, "参数异常"); ArrayList rows = (ArrayList) param.get("tableMater"); JSONObject mst = JSONObject.parseObject(JSON.toJSONString(param)); @@ -448,6 +448,8 @@ public class InBillServiceImpl extends ServiceImpl i ios.setUpdate_time(now); ios.setBill_status(disCount > 0 ? IOSEnum.BILL_STATUS.code("分配中") : IOSEnum.BILL_STATUS.code("分配完")); ioStorInvMapper.updateById(ios); + + return struct_code; } @Override