From 43cefb6a83dd61587fc2c5f89aa4822d25b6c77c Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 18 Jul 2024 14:48:21 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E8=BD=BD=E5=85=B7=E7=89=A9=E6=96=99?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0is=5Fdelete=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=87=BA=E5=BA=93=E5=90=8E=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/service/dao/MdMeMaterialbase.java | 5 ----- .../decisioner/impl/base/FIFORuleHandler.java | 2 +- .../task/handler/impl/ConveyorOutStorageTask.java | 3 ++- .../task/handler/impl/GroupDickInStorageTask.java | 5 ++++- .../task/handler/impl/InStorageTask.java | 3 ++- .../task/handler/impl/MoveStorageTask.java | 3 ++- .../task/handler/impl/OutStorageTask.java | 3 ++- .../task/handler/impl/PickStorageTask.java | 3 ++- .../task/handler/impl/ToPickPlatformTask.java | 3 ++- .../service/dao/mapper/xml/MdPbVehicleivtMapper.xml | 2 +- .../controller/PalletStIvtIostorinvController.java | 2 +- .../palletio/service/PalletIostorinvService.java | 12 ++++++++---- .../checkStorage/service/CheckStorageService.java | 8 ++++++-- .../iostor/impl/StIvtIostorinvServiceImpl.java | 1 + .../wms/stor_manage/move/service/MovingService.java | 5 ++++- .../wms/stor_manage/pick/service/PickingService.java | 5 ++++- .../service/dao/mapper/xml/StIvtStructattrMapper.xml | 4 +++- 17 files changed, 45 insertions(+), 24 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java index 505ef647..95f0c417 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/MdMeMaterialbase.java @@ -159,11 +159,6 @@ public class MdMeMaterialbase implements Serializable { */ private Boolean is_used; - /** - * 是否删除 - */ - private Boolean is_delete; - /** * 外部标识 */ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java index 11255e5b..d524ea2f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java @@ -70,6 +70,7 @@ public class FIFORuleHandler extends Decisioner0){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ConveyorOutStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ConveyorOutStorageTask.java index 454277b2..6aa94b82 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ConveyorOutStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ConveyorOutStorageTask.java @@ -88,7 +88,8 @@ public class ConveyorOutStorageTask extends AbstractTask { taskService.create(task); iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() .set(MdPbVehicleMater::getTask_code,task.getTask_code()) - .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code()) + .eq(MdPbVehicleMater::getIs_delete,false)); return (JSONObject) JSON.toJSON(task); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java index 576e2abe..6f5b9bf1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java @@ -85,7 +85,10 @@ public class GroupDickInStorageTask extends AbstractTask { }else { BussEventMulticaster.Publish( new FlowStartEvent("md_group", - (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper().set("proc_inst_id",proc_inst_id).eq("vehicle_code",vehicle_code)) + (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("proc_inst_id",proc_inst_id) + .eq("vehicle_code",vehicle_code) + .eq("is_delete",false)) ,new JSONObject(MapOf.of("start_point", point_code1))) .build("md_group_dick",mst.getId(),mst.getSource_form_type(),mst.getSource_form_id(), mstJ) .build("md_pb_vehicleMater",item) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java index deb181ca..469768a0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java @@ -71,7 +71,8 @@ public class InStorageTask extends AbstractTask { iSchBaseTaskService.create(task); iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() .set(MdPbVehicleMater::getTask_code,task.getTask_code()) - .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code()) + .eq(MdPbVehicleMater::getIs_delete,false)); return (JSONObject) JSON.toJSON(task); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java index 351c984f..8766760e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/MoveStorageTask.java @@ -77,7 +77,8 @@ public class MoveStorageTask extends AbstractTask { taskService.save(task); iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() .set(MdPbVehicleMater::getTask_code,task.getTask_code()) - .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code()) + .eq(MdPbVehicleMater::getIs_delete,false)); //TODO:是否下发 Boolean isSend = from.getBoolean("is_send"); if (isSend){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java index db910479..79d9dca7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java @@ -85,7 +85,8 @@ public class OutStorageTask extends AbstractTask { taskService.save(task); iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() .set(MdPbVehicleMater::getTask_code,task.getTask_code()) - .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code()) + .eq(MdPbVehicleMater::getIs_delete,false)); //TODO:是否下发 Boolean isSend = from.getBoolean("is_send"); if (isSend){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PickStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PickStorageTask.java index e6fd2dd1..ce3da499 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PickStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PickStorageTask.java @@ -73,7 +73,8 @@ public class PickStorageTask extends AbstractTask { iSchBaseTaskService.save(task); iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() .set(MdPbVehicleMater::getTask_code,task.getTask_code()) - .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code()) + .eq(MdPbVehicleMater::getIs_delete,false)); //TODO:是否下发 Boolean isSend = from.getBoolean("is_send"); if (isSend){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java index 0b4a1753..e4d6e285 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/ToPickPlatformTask.java @@ -93,7 +93,8 @@ public class ToPickPlatformTask extends AbstractTask { Lask_Point = target_point; iMdPbVehicleMaterService.update(new LambdaUpdateWrapper() .set(MdPbVehicleMater::getTask_code,task.getTask_code()) - .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code())); + .eq(MdPbVehicleMater::getVehicle_code,task.getVehicle_code()) + .eq(MdPbVehicleMater::getIs_delete,false)); //TODO:是否下发 Boolean isSend = from.getBoolean("is_send"); if (isSend){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml index 9a0278a5..185fc421 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml @@ -22,7 +22,7 @@ select md_pb_vehicleMater.*,material_code,material_name,material_spec from md_pb_vehicleMater left join md_me_materialbase on md_pb_vehicleMater.material_id = md_me_materialbase.material_id - where vehicle_code = #{vehicle_code} + where vehicle_code = #{vehicle_code} and is_delete = false diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/controller/PalletStIvtIostorinvController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/controller/PalletStIvtIostorinvController.java index eea89fbe..adbf28c9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/controller/PalletStIvtIostorinvController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/controller/PalletStIvtIostorinvController.java @@ -49,7 +49,7 @@ public class PalletStIvtIostorinvController { @Log("手持托盘出库") public ResponseEntity outStorage(@RequestBody JSONObject form) { palletIostorinvService.outStorage(form); - return new ResponseEntity<>(HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java index 4187d032..bf8b38f9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java @@ -71,14 +71,17 @@ public class PalletIostorinvService { //触发流程 BussEventMulticaster.Publish( new FlowStartEvent("pallet_in", - (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper().set("proc_inst_id",proc_inst_id).eq("vehicle_code",vehicle_code)) + (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("proc_inst_id",proc_inst_id) + .eq("vehicle_code",vehicle_code) + .eq("is_delete",false)) ,null) .build("md_pb_vehicleMater",vehicleMater.getId(),null,null, (JSONObject) JSONObject.toJSON(vehicleMater)) ); }; public void outStorage(JSONObject form){ - Assert.notNull(form, "参数不能为空"); + Assert.noNullElements(new Object[]{form,form.getString("material_id"),form.getInteger("qty"),form.getString("target_point")}, "参数不能为空"); //触发流程 JSONObject flowData = new JSONObject(); flowData.put("material_id",form.getString("material_id")); @@ -97,7 +100,7 @@ public class PalletIostorinvService { , "order_by", "ABS(qty-#{plan_qty}) asc,update_time asc") ); if (vechielDtos.size() { iMdPbVehicleMaterService.update(new UpdateWrapper() .set("proc_inst_id",proc_inst_id) - .eq("vehicle_code",vehicle)); + .eq("vehicle_code",vehicle) + .eq("is_delete",false)); } ,auxParam) .build("st_ivt_iostorinv",null,null,null, flowData) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java index bf6a992e..d0ad4c9f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java @@ -118,7 +118,10 @@ public class CheckStorageService { dto.setT(mstJ); dto.setItem(packageT(mstJ,"id")); FlowStartEvent startEvent = new FlowStartEvent("st_ivt_check", - (proc_inst_id, empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper().set("proc_inst_id", proc_inst_id).eq("vehicle_code", empPlace)) + (proc_inst_id, empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("proc_inst_id", proc_inst_id) + .eq("vehicle_code", empPlace) + .eq("is_delete",false)) , null); startEvent.setDto(dto); startEvent.setCallback(proc_inst_id->{ @@ -164,7 +167,8 @@ public class CheckStorageService { for (PmFormData dtl : dtls) { iMdPbVehicleMaterService.update(new UpdateWrapper() .set("qty",dtl.getForm_data().getBigDecimal("change_qty")) - .eq("vehicle_code",dtl.getVehicle_code())); + .eq("vehicle_code",dtl.getVehicle_code()) + .eq("is_delete",false)); } for (PmFormData dtl : dtls) { FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMap.get(dtl.getVehicle_code()), null, null); 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 42f180ad..b946f638 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 @@ -259,6 +259,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl iMdPbVehicleMaterService.update(new UpdateWrapper() .set("proc_inst_id", proc_inst_id) + .eq("is_delete",false) .in("vehicle_code", innerVehicle == null ? vechiles : ListOf.of(innerVehicle))) //传递全局参数：出库分配出库点用 , iostorinv.getForm_data()) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/service/MovingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/service/MovingService.java index 771d6608..a1f62502 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/service/MovingService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/move/service/MovingService.java @@ -128,7 +128,10 @@ public class MovingService { dto.setT(mstJ); dto.setItem(packageT(mstJ,"id")); FlowStartEvent startEvent = new FlowStartEvent("st_ivt_move", - (proc_inst_id, empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper().set("proc_inst_id", proc_inst_id).eq("vehicle_code", empPlace)) + (proc_inst_id, empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("proc_inst_id", proc_inst_id) + .eq("is_delete",false) + .eq("vehicle_code", empPlace)) , null); startEvent.setDto(dto); startEvent.setCallback(proc_inst_id->{ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java index d850b231..e02ff207 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java @@ -177,7 +177,9 @@ public class PickingService { pickingService.disGroup(mst); //只有透传才有vehicle_code参数否则只有inst_id FlowContinueEvent continueEvent = new FlowContinueEvent(mst.getProc_inst_id(), (PermeateFunction) (inst_id, vehicle_code) -> iMdPbVehicleMaterService.update(new UpdateWrapper() - .set("proc_inst_id",inst_id).eq("vehicle_code",vehicle_code)), null) + .set("proc_inst_id",inst_id) + .eq("is_delete",false) + .eq("vehicle_code",vehicle_code)), null) .setDto(dto); continueEvent.setCallback(emp->{ iFormDataService.update(new UpdateWrapper() @@ -204,6 +206,7 @@ public class PickingService { .set("update_time", DateUtil.now()) .set("update_name", SecurityUtils.getCurrentNickName()) .set("qty", data.getQty()) + .eq("is_delete",false) .eq("vehicle_code", vehicle_code)); } else { 组盘: diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml index fa6e6c16..60fade53 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml @@ -73,7 +73,8 @@ st_ivt_structattr LEFT JOIN md_pb_vehicleMater ON st_ivt_structattr.vehicle_code = md_pb_vehicleMater.vehicle_code WHERE - material_id = #{material_id} + md_pb_vehicleMater.is_delete = false + AND material_id = #{material_id} AND pcsn = #{pcsn} AND st_ivt_structattr.stor_code = #{stor_code} @@ -127,6 +128,7 @@ left join md_me_materialbase material on vm.material_id = material.material_id struct.vehicle_code is not null + and vm.is_delete = false and (struct.struct_code LIKE '%${query.search}%' or struct.struct_name LIKE '%${query.search}%')