From da5026069b8189c86c381a099057031029657865 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 2 Dec 2022 13:41:20 +0800 Subject: [PATCH 1/2] =?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 --- lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue | 3 ++- lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue index 089e78d3c..b7477e0b4 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue @@ -80,6 +80,7 @@ import CRUD, { header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' import crudSectattr from '@/views/wms/basedata/st/sect/sectattr' +import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' export default { name: 'AddDtl', @@ -132,7 +133,7 @@ export default { }, methods: { open() { - crudSectattr.getSect({ is_productstore: '1' }).then(res => { + crudUserStor.getSect({ 'stor_id': '' }).then(res => { this.sects = res.content }) this.crud.toQuery() diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue index baf1b2ede..889a442e7 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue @@ -94,6 +94,7 @@ import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' import crudSectattr from '@/views/wms/basedata/st/sect/sectattr' import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor' +import crudUserStor from '@/views/wms/basedata/st/userStor/userStor' export default { name: 'AddDtl', @@ -147,7 +148,7 @@ export default { }, methods: { open() { - crudSectattr.getSect({ is_materialstore: '1' }).then(res => { + crudUserStor.getSect({ 'stor_id': '' }).then(res => { this.sects = res.content }) this.crud.toQuery() From 0274838fab06e0f9414f8b2b23852e605b221604 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 2 Dec 2022 15:40:03 +0800 Subject: [PATCH 2/2] =?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 --- .../nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql | 2 +- .../st/outbill/service/impl/CheckOutBillServiceImpl.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql index f2bb4f63c..02a888458 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql @@ -68,7 +68,7 @@ IF 输入.flag = "2" QUERY SELECT - cust_name AS value, + cust_code AS value, cust_name AS label FROM MD_CS_TransportationBase 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 b761ce62b..7ecc4d13d 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 @@ -2280,6 +2280,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); + // 1.查询此任务是否有任务组 + // 2.有任务组：按照执行顺序下发 } @Override @@ -2522,6 +2524,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { WQLObject dtlTab = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); // 出入库明细表 WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配明细 WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表 + WQLObject tranTab = WQLObject.getWQLObject("MD_CS_TransportationBase"); // 物流公司表 JSONObject jsonMst = mstTab.query("iostorinv_id = '" + MapUtil.getStr(whereJson, "iostorinv_id") + "'").uniqueResult(0); String cust_code = jsonMst.getString("cust_code"); @@ -2561,7 +2564,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { oneMap.put("receiver", jsonMst.getString("receiver")); // 收货人 oneMap.put("receiptaddress", jsonMst.getString("receiptaddress")); // 收货地址 oneMap.put("receiptphone", jsonMst.getString("receiptphone")); // 收货人联系电话 - oneMap.put("logisticscompany", jsonMst.getString("logisticscompany")); // 物流公司 + // 物流公司 + JSONObject jsonTran = tranTab.query("cust_code = '" + jsonMst.getString("trans_code") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonTran)) { + oneMap.put("logisticscompany", jsonTran.getString("cust_name")); + } oneMap.put("drivername", jsonMst.getString("drivername")); // 司机 oneMap.put("carno", jsonMst.getString("carno")); // 车牌号 oneMap.put("driverphone", jsonMst.getString("driverphone")); // 司机联系电话