From ad066d69888da7a6001e43496fd1ea0e244136e4 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 22 Apr 2024 13:33:57 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1.=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=962.=E6=8A=A5=E9=94=99=EF=BC=9Axx=E8=B4=A7=E4=BD=8D?= =?UTF-8?q?=E9=98=BB=E6=8C=A1=20-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instor/service/impl/HandMoveStorServiceImpl.java | 11 ++++++----- .../outbill/service/impl/CheckOutBillServiceImpl.java | 8 ++++---- .../nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) 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 39d0373ae..5f4fe2fd1 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 @@ -1401,7 +1401,8 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); + } throw new BadRequestException("仓位：" + error + "被锁定且未下发任务,无法生成任务！"); @@ -1428,7 +1429,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); } throw new BadRequestException("仓位：" + error + "被锁定且未下发任务,无法生成任务！"); @@ -1454,7 +1455,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); } throw new BadRequestException("仓位：" + error + "被锁定且未下发任务,无法生成任务！"); @@ -1484,7 +1485,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); } throw new BadRequestException("仓位：" + error + "被锁定且未下发任务,无法生成任务！"); @@ -1515,7 +1516,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); } throw new BadRequestException("仓位：" + error + "被锁定且未下发任务,无法生成任务！"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index c6bcf40fe..272599cea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -2776,7 +2776,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); } throw new BadRequestException("仓位：" + error + "被锁定请等待下发任务并等待任务完成"); @@ -2810,7 +2810,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); } throw new BadRequestException("仓位：" + error + "被锁定请等待下发任务并等待任务完成"); @@ -3229,7 +3229,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); } throw new BadRequestException("仓位：" + error + "被锁定请等待下发任务并等待任务完成"); @@ -3260,7 +3260,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int k = 0; k < numArr.size(); k++) { JSONObject json = numArr.getJSONObject(k); - error += json.getString("struct_code") + ","; + error += json.getString("struct_code") + ", 锁定单据号："+json.getString("inv_code"); } throw new BadRequestException("仓位：" + error + "被锁定请等待下发任务并等待任务完成!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index 7a3c9cb0f..def387727 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -1196,7 +1196,7 @@ AND task_status IN ('07') AND is_delete = '0' AND task_type = '010503' - AND DATEDIFF( NOW(), LEFT(update_time,10) ) <= 2 + AND TIMESTAMPDIFF(HOUR,update_time,NOW()) <= 3 ENDSELECT ENDQUERY