From 97ec6cc4253288e2eb86c69e542c1ebca4253196 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 29 Dec 2022 13:52:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 2 +- .../st/returns/service/impl/InAndOutRetrunServiceImpl.java | 4 ++-- lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) 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..f112180c0 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 @@ -160,7 +160,7 @@ LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn WHERE - 1=1 + sub.status = '2' OPTION 输入.iostorinv_id <> "" iosdtl.iostorinv_id = 输入.iostorinv_id ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 5cb49cec7..680f9938c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -984,9 +984,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst); jo_mst.put("upload_mes", "1"); - jo_mst.put("is_upload", "1"); - WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst); } + jo_mst.put("is_upload", "1"); + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst); } // 改切出库 diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue index 0ab41e779..ec1831a40 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue @@ -506,6 +506,9 @@ export default { date_of_production: [ { required: true, message: '制造完成日期不能为空', trigger: 'blur' } ], + sale_order_name: [ + { required: true, message: '销售订单及行号不能为空', trigger: 'blur' } + ], is_un_plan_production: [ { required: true, message: '计划外分切的子卷不能为空', trigger: 'blur' } ], From 25782d442fcb2d49116e06b89e1800a8e4d2a2b9 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 29 Dec 2022 14:18:22 +0800 Subject: [PATCH 2/3] =?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 | 6 +++++- 1 file changed, 5 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 5e762fd0f..fe16ce6ec 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 @@ -2873,7 +2873,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String box_no = json.getString("box_no"); String sub_box_no = ""; if (ObjectUtil.isNotEmpty(box_no)) { - sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length()); + try { + sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length()); + } catch (Exception e) { + sub_box_no = box_no; + } } HashMap mapFL = new HashMap<>(); From 3e2f71595a709d30db771c46f0ebbd4ecbe12c44 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 29 Dec 2022 14:19:49 +0800 Subject: [PATCH 3/3] =?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 | 6 +++++- 1 file changed, 5 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 fe16ce6ec..5c0aad69b 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 @@ -2924,7 +2924,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String box_no = json.getString("box_no"); String sub_box_no = ""; if (ObjectUtil.isNotEmpty(box_no)) { - sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length()); + try { + sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length()); + } catch (Exception e) { + sub_box_no = box_no; + } } HashMap mapFL = new HashMap<>();