From 97dfd2ae8fdf866c30b30c5d1dfecbe30cf52ad6 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 23 Dec 2022 09:22:51 +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 | 9 +++++++- .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 10 +++++++-- .../org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql | 4 ++-- .../src/views/wms/st/outbill/DivDialog.vue | 22 ++++++++++++++++++- 4 files changed, 39 insertions(+), 6 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 2bd7108f6..8273e550a 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 @@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.text.StrBuilder; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.impl.ParamServiceImpl; @@ -2751,7 +2752,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { oneMap.put("page",pageNow+ "/" + MapUtil.getStr(whereJson,"pageNum")); oneMap.put("consignee", jsonMst.getString("consignee")); // 收货单位 oneMap.put("receiver", jsonMst.getString("receiver")); // 收货人 - oneMap.put("receiptaddress", jsonMst.getString("receiptaddress")); // 收货地址 + String receiptaddress = jsonMst.getString("receiptaddress"); + /* StrBuilder strBuilder = new StrBuilder(receiptaddress); + + if (receiptaddress.length() > 10) { + strBuilder.insert(11,"\n"); + }*/ + oneMap.put("receiptaddress", receiptaddress); // 收货地址 oneMap.put("receiptphone", jsonMst.getString("receiptphone")); // 收货人联系电话 // 物流公司 JSONObject jsonTran = tranTab.query("cust_code = '" + jsonMst.getString("trans_code") + "'").uniqueResult(0); 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 eaa958ccb..56a4315d0 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 @@ -343,13 +343,19 @@ task.task_status, task.task_type, point2.point_code, - sub.sap_pcsn + sub.sap_pcsn, + attr.out_order_seq, + attr.row_num, + attr.col_num, + attr.layer_num, + attr.block_num FROM ST_IVT_IOStorInvDis dis LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = dis.iostorinv_id LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id LEFT JOIN SCH_BASE_Task task ON task.task_id = dis.task_id LEFT JOIN SCH_BASE_Point point2 ON point2.point_id = dis.point_id + LEFT JOIN st_ivt_structattr attr ON attr.struct_id = dis.struct_id LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn WHERE 1 = 1 @@ -375,7 +381,7 @@ dis.work_status <= 输入.bill_status ENDOPTION - order by dis.struct_code ASC + order by attr.row_num,attr.out_order_seq ASC ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql index 16d0762d7..8a13a055d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql @@ -84,7 +84,7 @@ st_ivt_structattr sa3 WHERE IFNULL( sa3.storagevehicle_code, '' ) <> '' - AND AND sa3.lock_type = '1' + AND sa3.lock_type = '1' ) c WHERE c.block_num = a.block_num @@ -137,7 +137,7 @@ st_ivt_structattr sa2 WHERE IFNULL( sa2.storagevehicle_code, '' ) <> '' - AND AND sa2.lock_type = '1' + AND sa2.lock_type = '1' ) b WHERE b.block_num = a.block_num 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 5fcf2bdce..c301c3b9f 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -482,13 +482,33 @@ export default { }, setPoint() { if (this.form2.point_code === '') { - this.crud.notify('请先选择检验站点！', CRUD.NOTIFICATION_TYPE.INFO) + this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO) return } if (this.currentDis.point_code) { this.crud.notify('站点已设置！', CRUD.NOTIFICATION_TYPE.INFO) return } + if (this.currentDis.work_status !== '00') { + this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO) + return + } + // 根据此仓位的 ‘相同块、相同排、相同层’ 判断上一个任务是否生成 + const tab = this.tabledis + for (let i = 0; i < tab.length; i++) { + debugger + const item = tab[i] + if (this.currentDis.block_num === item.block_num && this.currentDis.row_num === item.row_num && this.currentDis.layer_num === item.layer_num) { + const out_order_seq = parseInt(this.currentDis.out_order_seq) - 1 + if (parseInt(item.out_order_seq) === out_order_seq) { + if (item.work_status === '00') { + this.crud.notify('请先生成上一个任务：' + item.struct_code, CRUD.NOTIFICATION_TYPE.INFO) + return + } + } + } + } + if (this.currentDis.iostorinvdis_id !== null) { this.currentDis.point_code = this.form2.point_code checkoutbill.setPoint(this.currentDis).then(res => {