From b1aeeec7d9392f4657342095f281e60c37889f78 Mon Sep 17 00:00:00 2001 From: zhengxuming Date: Tue, 5 Aug 2025 17:57:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=A9=BA=E8=BD=BD=E5=85=B7=E5=85=A5?= =?UTF-8?q?=E5=BA=93/=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PdaIosInController.java | 2 +- .../service/impl/PdaIosInServiceImpl.java | 34 ++++++++++++++++--- .../service/impl/PdaIosOutServiceImpl.java | 2 +- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java index 27840d3..1199e47 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java @@ -176,7 +176,7 @@ public class PdaIosInController { @PostMapping("vehicleInConfirm") @Log("空载具入库") public ResponseEntity vehicleInConfirm(@RequestBody JSONObject whereJson) { - assertNotBlankJson(whereJson, "请求参数不能为空", "sect_code", "vehicle_code", "site_code"); + assertNotBlankJson(whereJson, "请求参数不能为空", "sect_code", "vehicle_code"); return new ResponseEntity<>(pdaIosInService.vehicleInConfirm(whereJson), HttpStatus.OK); } } 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 bd9c757..20e2e22 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 @@ -403,11 +403,35 @@ public class PdaIosInServiceImpl implements PdaIosInService { } whereJson.put("stor_id",sectattr.getStor_id()); whereJson.put("qty", 1); - String materialCode = StatusEnum.VEHICLE_TYPE.code("空托盘"); - whereJson.put("material_id", iMdMeMaterialbaseService.getByCode(materialCode,false).getMaterial_id()); - whereJson.put("material_code", materialCode); - whereJson.put("pcsn","空托盘入库"); + //得到当前点位的载具编号 + List schBasePointList = iSchBasePointService.list(new LambdaQueryWrapper() + .eq(SchBasePoint::getVehicle_code, whereJson.getString("vehicle_code"))); + if(CollectionUtils.isEmpty(schBasePointList)){ + throw new BadRequestException("载具不在点位上"); + } + if(schBasePointList.size()>1){ + throw new BadRequestException("存在重复点位，请确认"); + } + whereJson.put("site_code",schBasePointList.get(0).getPoint_code()); + + MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getByCode(whereJson.getString("vehicle_code")); + if (ObjectUtil.isEmpty(vehicleDao) || StringUtils.isBlank(vehicleDao.getStoragevehicle_name())) { + throw new BadRequestException("载具信息有误!"); + } + + if (vehicleDao.getStoragevehicle_name().contains("托盘")) { + String materialCode = StatusEnum.VEHICLE_TYPE.code("空托盘"); + whereJson.put("material_id", iMdMeMaterialbaseService.getByCode(materialCode, false).getMaterial_id()); + whereJson.put("material_code", materialCode); + whereJson.put("pcsn", "空托盘入库"); + } else { + String materialCode = StatusEnum.VEHICLE_TYPE.code("空料桶"); + whereJson.put("material_id", iMdMeMaterialbaseService.getByCode(materialCode, false).getMaterial_id()); + whereJson.put("material_code", materialCode); + whereJson.put("pcsn", "空料桶入库"); + } + //组盘 groupPlate(whereJson); // 生成空载具入库任务 @@ -503,7 +527,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { } else { //空载具入库 whereJson.put("qty", 1); - String materialCode = "1".equals(whereJson.getString("material_id")) ? StatusEnum.VEHICLE_TYPE.code("空托盘") : StatusEnum.VEHICLE_TYPE.code("空料箱"); + String materialCode = "1".equals(whereJson.getString("material_id")) ? StatusEnum.VEHICLE_TYPE.code("空托盘") : StatusEnum.VEHICLE_TYPE.code("空料桶"); whereJson.put("material_id", materialCode); //组盘 groupPlate(whereJson); 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 63219da..1f18e35 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 @@ -248,7 +248,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { if (qty > 6) { throw new BadRequestException("一次性只能输入小于7以内的载具数量"); } - queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空料箱")); + queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空料桶")); } else { queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空托盘")); }