From a9a7303a6dfc6e707c5e36615b5eee94c57a25a5 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 28 Dec 2022 15:34:39 +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 --- .../service/impl/CheckOutBillServiceImpl.java | 3 ++ .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 5 +++ .../src/views/wms/st/inAndOutReturn/index.vue | 17 ++++---- .../src/views/wms/st/outbill/index.vue | 39 +++++++++++++++---- 4 files changed, 49 insertions(+), 15 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 2e7c0cf53..f2906203d 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 @@ -75,6 +75,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { if (StrUtil.isNotEmpty(map.get("io_type"))) { map.put("io_type", map.get("io_type")); } + if (StrUtil.isNotEmpty(map.get("is_upload"))) { + map.put("is_upload", map.get("is_upload")); + } if (StrUtil.isNotEmpty(map.get("pcsn"))) { map.put("pcsn", "%" + map.get("pcsn") + "%"); } 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 474abd25d..00d004d59 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 @@ -49,6 +49,7 @@ 输入.sap_pcsn TYPEAS s_string 输入.cust_code TYPEAS s_string 输入.package_box_sn TYPEAS s_string + 输入.is_upload TYPEAS s_string 输入.in_stor_id TYPEAS f_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -108,6 +109,10 @@ dis.pcsn like 输入.pcsn ENDOPTION + OPTION 输入.is_upload <> "" + ios.is_upload = 输入.is_upload + ENDOPTION + OPTION 输入.io_type <> "" ios.io_type = 输入.io_type ENDOPTION diff --git a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue index 3130c4006..83601b058 100644 --- a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue @@ -220,18 +220,21 @@ @selection-change="crud.selectionChangeHandler" > - - - - + + + + - - + + + + + - - diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index 8d10b6df1..424c59bd0 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -128,6 +128,23 @@ @keyup.enter.native="crud.toQuery" /> + + + + + {{ scope.row.bill_code }} - - + + - - - - + + + + + @@ -290,7 +308,7 @@ export default { }, mixins: [presenter(), header(), crud()], // 数据字典 - dicts: ['io_bill_status', 'ST_CREATE_MODE', 'ST_INV_OUT_TYPE'], + dicts: ['io_bill_status', 'ST_CREATE_MODE', 'ST_INV_OUT_TYPE', 'is_upload'], data() { return { height: document.documentElement.clientHeight - 180 + 'px;', @@ -424,6 +442,13 @@ export default { this.openParamMoney = row this.openMoneyDialog = true }, + formatIsUpload(row) { + if (row.is_upload === '0') { + return '否' + } else if (row.is_upload === '1') { + return '是' + } + }, printExcel(jo) { if (jo.shd_dtl_num === '') { return this.crud.notify('客户为空！', CRUD.NOTIFICATION_TYPE.INFO)