From 234380f834f848a246d5d95f21f173c448b4785a Mon Sep 17 00:00:00 2001 From: zhangzq Date: Mon, 20 Jan 2025 17:29:52 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=85=A5=E9=98=BB=E6=8C=A1=EF=BC=9A1109?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SchBaseTaskServiceImpl.java | 5 +- .../service/IMdPbVehicleMaterService.java | 2 +- .../impl/MdPbVehicleMaterServiceImpl.java | 3 +- .../iostorage/IOStorageController.java | 58 ++++++++++--------- .../impl/StIvtIostorinvServiceImpl.java | 2 +- .../src/main/resources/logback-spring.xml | 2 +- 6 files changed, 39 insertions(+), 33 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index 2090dfef..cfb244cd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java @@ -142,9 +142,10 @@ public class SchBaseTaskServiceImpl extends ServiceImpl() + List list = iMdPbVehicleMaterService.list(new QueryWrapper() .eq("vehicle_code", task.getVehicle_code()) - .eq("is_delete",false)); + .eq("is_delete", false)); + list.get(0) if (vehicleMater != null && !StringUtils.isEmpty(vehicleMater.getProc_inst_id())) { FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMater.getProc_inst_id(), null, null); BussEventMulticaster.Publish(continueEvent); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java index 3d128b46..a76e559f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java @@ -28,7 +28,7 @@ public interface IMdPbVehicleMaterService extends IService { * @param vehicle_code * @return */ - Map getVehicleCode2Id(String...vehicle_code); + Map getVehicleCode2Id(String material_id,String...vehicle_code); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java index 486722b2..aa0b47da 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java @@ -43,10 +43,11 @@ public class MdPbVehicleMaterServiceImpl extends ServiceImpl getVehicleCode2Id(String... vehicle_code) { + public Map getVehicleCode2Id(String material_id,String... vehicle_code) { if (vehicle_code!=null){ List list = this.list(new QueryWrapper() .in("vehicle_code", vehicle_code) + .eq("material_id", material_id) .eq("is_delete", false)); Map collect = list.stream().collect(HashMap::new, (map, vehicle) -> map.put(vehicle.getVehicle_code(), vehicle.getId()), HashMap::putAll); return collect; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java index 733f80f7..57c0f51e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java @@ -26,6 +26,7 @@ import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -61,10 +62,10 @@ public class IOStorageController { @Log("手持出库出库确认") public ResponseEntity outStorage(@RequestBody JSONObject form) { String vehicle_code = form.getString("vehicle_code"); - MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(new QueryWrapper() + List ones = iMdPbVehicleMaterService.list(new QueryWrapper() .eq("vehicle_code", vehicle_code) .eq("is_delete", false)); - if (one != null) { + if (!CollectionUtils.isEmpty(ones)) { //校验料箱是否还存在库存 RedissonUtils.lock(() -> { QueryWrapper query = new QueryWrapper() @@ -77,35 +78,38 @@ public class IOStorageController { } }, StatusEnum.STRATEGY_TYPE.code("出库") + vehicle_code, 5); //流程校验 - String proc_inst_id = one.getProc_inst_id(); - if (!StringUtils.isEmpty(proc_inst_id)) { - String parent_id = iActRuExecutionService.getParentByChild(proc_inst_id); - ActRuExecution ruExecution = iActRuExecutionService.getOne(new QueryWrapper() - .eq("proc_inst_id", parent_id) - .lt("status", StatusEnum.FLOW_STATUS.code("完成"))); - if (ruExecution != null) { - throw new BadRequestException(String.format("当前载具%s业务流程%s未完成", vehicle_code, parent_id)); + for (MdPbVehicleMater one : ones) { + String proc_inst_id = one.getProc_inst_id(); + if (!StringUtils.isEmpty(proc_inst_id)) { + String parent_id = iActRuExecutionService.getParentByChild(proc_inst_id); + ActRuExecution ruExecution = iActRuExecutionService.getOne(new QueryWrapper() + .eq("proc_inst_id", parent_id) + .lt("status", StatusEnum.FLOW_STATUS.code("完成"))); + if (ruExecution != null) { + throw new BadRequestException(String.format("当前载具%s业务流程%s未完成", vehicle_code, parent_id)); + } } - } - //单据校验"针对托盘库做条件判断 - if (vehicle_code.contains("T")){ - if (one.getNeed_pick() && one.getQty().compareTo(BigDecimal.ZERO)>0){ - throw new BadRequestException(one.getRemark()); + //单据校验"针对托盘库做条件判断 + if (vehicle_code.contains("T")){ + if (one.getNeed_pick() && one.getQty().compareTo(BigDecimal.ZERO)>0){ + throw new BadRequestException(one.getRemark()); + } } - } - iMdPbVehicleMaterService.update(new UpdateWrapper() - .set("is_delete",true) - .set("proc_inst_id",null) - .set("update_time", DateUtil.now()) - .set("update_name", SecurityUtils.getCurrentNickName()) - .eq("id",one.getId())); - if (StringUtils.isNotEmpty(one.getGroup_id())){ - iMdGruopDickService.update(new UpdateWrapper() - .set("status", StatusEnum.FORM_STATUS.code("完成")) + iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("is_delete",true) + .set("proc_inst_id",null) .set("update_time", DateUtil.now()) - .eq("id", one.getGroup_id()) - ); + .set("update_name", SecurityUtils.getCurrentNickName()) + .eq("id",one.getId())); + if (StringUtils.isNotEmpty(one.getGroup_id())){ + iMdGruopDickService.update(new UpdateWrapper() + .set("status", StatusEnum.FORM_STATUS.code("完成")) + .set("update_time", DateUtil.now()) + .eq("id", one.getGroup_id()) + ); + } } + } return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java index 92d11e30..efd60937 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java @@ -280,7 +280,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl stringMap = iMdPbVehicleMaterService.getVehicleCode2Id(vehicle_code.split(",")); + Map stringMap = iMdPbVehicleMaterService.getVehicleCode2Id(form.getString("material_id"),vehicle_code.split(",")); if (!StringUtils.isEmpty(form.getString("id"))){ iStIvtIostorinvDtlService.update(new UpdateWrapper() .set("vehicle_code", vehicle_code) diff --git a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml index d0b15fcc..a067c4d8 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -98,7 +98,7 @@ - +