From 4289789946d2713ba408f07d6f6d00b9f0cd3c63 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sun, 19 Feb 2023 21:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/sch/tasks/SendOutTask.java | 2 ++ .../nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java | 3 ++- .../java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java index c5ae64ea0..4c49d19d8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java @@ -73,6 +73,8 @@ public class SendOutTask extends AbstractAcsTask { JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0); jsonPoint2.put("lock_type", "1"); + jsonPoint2.put("vehicle_code", ""); + jsonPoint2.put("point_status", "1"); pointTab.update(jsonPoint2); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index f4823bccf..e7fb0d120 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -292,7 +292,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { storPublicService.IOStor(jo, "31"); //锁定起点点位、仓位 JSONObject from_start = new JSONObject(); - from_start.put("lock_type", "03"); + from_start.put("lock_type", "6"); from_start.put("struct_id", jo.getString("turnout_struct_id")); from_start.put("inv_type", jo_mst.getString("bill_type")); from_start.put("inv_id", jo_mst.getString("moveinv_id")); @@ -303,6 +303,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { storPublicService.updateStructAndPoint(from_start); //锁定终点点位、仓位 from_start.put("struct_id", turnin_struct_id); + from_start.put("lock_type", "7"); storPublicService.updateStructAndPoint(from_start); } ret.put("total_qty", total_qty); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java index 0db85a0de..6366d4651 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java @@ -89,7 +89,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { if(TaskStatusEnum.EXECUTING.getCode().equals(status)){ map.put("work_status","02"); wo_dtl.update(map,"task_id='"+task_id+"'"); - map.put("task_status","03"); + map.put("task_status",TaskStatusEnum.EXECUTING.getCode()); map.put("update_optid",currentUserId+""); map.put("update_optname",nickName); map.put("update_time",now);