From 8f305eb3a19e87892461582509bf8a3d573b9980 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 27 Jan 2023 11:35:42 +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 --- .../st/outbill/service/impl/CheckOutBillServiceImpl.java | 4 +++- lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue | 2 +- lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) 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 d8758aacc..6bce26285 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 @@ -262,7 +262,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { rows.add(jsonObject); } } - + map.remove("tableData"); String currentUserId = SecurityUtils.getCurrentUserId(); @@ -2541,6 +2541,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { .process() .getResultJSONArray(0); + if (ObjectUtil.isEmpty(allRowArr)) throw new BadRequestException("当前没有可设置的分配明细"); + for (int i = 0; i < allRowArr.size(); i++) { // 调用当前排处理方法 JSONObject jsonRow = allRowArr.getJSONObject(i); diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue index d6c682c72..42ca9b641 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue @@ -360,7 +360,7 @@ export default { // 将明细变成不可编辑 for (let i = 0; i < this.form.tableData.length; i++) { const row = this.form.tableData[i] - row.edit = true + row.edit = false this.form.tableData.splice(i, 1, row) } }) diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index dfb7e11bb..50714880e 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -628,9 +628,11 @@ export default { return } this.loadingSetAllPoint = true - this.currentRow.point_code = this.form2.point_code - this.currentRow.iostorinv_id = this.mstrow.iostorinv_id - checkoutbill.allSetPoint(this.currentRow).then(res => { + const data = { + 'point_code': this.form2.point_code, + 'iostorinv_id': this.mstrow.iostorinv_id + } + checkoutbill.allSetPoint(data).then(res => { this.queryTableDdis(this.currentRow.iostorinvdtl_id) this.crud.notify('设置成功!', CRUD.NOTIFICATION_TYPE.INFO) this.loadingSetAllPoint = false