root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one

Browse Source
This commit is contained in:
yanps
2024-04-22 13:36:45 +08:00
parent c48f46040a ad066d6988
commit fdea9372cb
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -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 + "被锁定且未下发任务,无法生成任务！");

8
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -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 + "被锁定请等待下发任务并等待任务完成!");

2
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -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