From 663a9a750605caabf6c4f6a3c9e5bc12835b9972 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 30 Nov 2023 17:53:54 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E5=87=BA=E5=BA=93=E5=88=86=E9=85=8D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AB=99=E7=82=B9=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java | 2 +- lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 e539a0aed..5f38e11d6 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 @@ -2702,7 +2702,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { + "' and row_num = '" + jsonRow.getString("row_num") + "' and is_used = '1' and is_delete = '0' and lock_type not in ('1','6','3')").getResultJSONArray(0); if (ObjectUtil.isNotEmpty(structArr)) { - throw new BadRequestException(jsonRow.getString("block_num") + "区-" + jsonRow.getString("row_num") + "排有未完成的入库任务！"); + throw new BadRequestException("有其他任务正在执行中，请稍后在试!"); } } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index a04a0825c..928ae3ab1 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -268,6 +268,8 @@ export default { crudUserStor.getSect({ 'stor_id': '' }).then(res => { this.sects = res.content }) + this.crud.query.ivt_status = 'canuse_qty' + this.crud.toQuery() }, methods: { // 取两位小数点