From 3e55f8b6aac440a2a46539363f48bdffd7d5b697 Mon Sep 17 00:00:00 2001 From: zhengxuming Date: Thu, 7 Aug 2025 16:49:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8D=95=E7=8B=AC=E4=B8=8A=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/util/tasks/zw/DownEmptyUpFullTask.java | 6 ++++++ .../service/util/tasks/zw/SeparateMaterialTask.java | 1 + .../inAndOut/service/impl/OutBillServiceImpl.java | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java index a5cb1fa..555c90c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/DownEmptyUpFullTask.java @@ -182,6 +182,7 @@ public class DownEmptyUpFullTask extends AbstractTask { pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getPoint_status, "3") + .set(SchBasePoint::getVehicle_qty, 1) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) @@ -190,6 +191,7 @@ public class DownEmptyUpFullTask extends AbstractTask { pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, null) .set(SchBasePoint::getPoint_status, "1") + .set(SchBasePoint::getVehicle_qty, 0) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) @@ -198,6 +200,7 @@ public class DownEmptyUpFullTask extends AbstractTask { pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code2()) .set(SchBasePoint::getPoint_status, "2") + .set(SchBasePoint::getVehicle_qty, 1) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) @@ -210,6 +213,7 @@ public class DownEmptyUpFullTask extends AbstractTask { pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, null) .set(SchBasePoint::getPoint_status, "1") + .set(SchBasePoint::getVehicle_qty, 0) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) @@ -218,6 +222,7 @@ public class DownEmptyUpFullTask extends AbstractTask { pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getPoint_status, "3") + .set(SchBasePoint::getVehicle_qty, 1) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) @@ -226,6 +231,7 @@ public class DownEmptyUpFullTask extends AbstractTask { pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code2()) .set(SchBasePoint::getPoint_status, "1") + .set(SchBasePoint::getVehicle_qty, 0) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java index 7aacec8..175091a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/SeparateMaterialTask.java @@ -171,6 +171,7 @@ public class SeparateMaterialTask extends AbstractTask { pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getPoint_status, "2") + .set(SchBasePoint::getVehicle_qty, 1) .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java index 8d0944c..3fc4053 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java @@ -1037,7 +1037,7 @@ public class OutBillServiceImpl extends ServiceImpl i task_form.put("task_type", "DownEmptyUpFullTask"); task_form.put("order_id", whereJson.getString("order_id")); task_form.put("task_code", whereJson.getString("task_code")); - task_form.put("point_code1", whereJson.getString("point_code1")); + task_form.put("point_code1", whereJson.getString("point_code")); task_form.put("point_code2", whereJson.getString("point_code2")); task_form.put("point_code3", whereJson.getString("point_code3")); task_form.put("point_code4", whereJson.getString("point_code4")); @@ -1057,7 +1057,7 @@ public class OutBillServiceImpl extends ServiceImpl i task_form2.put("point_code1", whereJson.getString("point_code2")); task_form2.put("point_code2", whereJson.getString("point_code3")); task_form2.put("point_code3", whereJson.getString("point_code4")); - task_form2.put("point_code4", whereJson.getString("point_code1")); + task_form2.put("point_code4", whereJson.getString("point_code")); task_form.put("vehicle_code", ioStorInvDis.getStoragevehicle_code()); task_form.put("vehicle_code2",point3.getVehicle_code()); task_form2.put("group_id", whereJson.getString("group_id"));