From e1aa85bcb644306576c9fa29de79907b53c62b2a Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 13 Oct 2023 16:14:36 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 11 ++++++++--- .../service/impl/InBillQueryServiceImpl.java | 2 ++ .../service/impl/OutBillQueryServiceImpl.java | 4 ++-- .../src/views/wms/st/outbill/index.vue | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+), 5 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 9a1c43722..3c7e0c98d 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 @@ -257,12 +257,13 @@ mb.material_name, mb.material_spec, mb.material_model, - sub.sap_pcsn + (case when IFNULL(record.sap_pcsn,'') = '' then sub.sap_pcsn else record.sap_pcsn end) AS sap_pcsn FROM ST_IVT_IOStorInvDtl iosdtl LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id 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 AND sub.package_box_sn = iosdtl.box_no + LEFT JOIN pdm_bi_subpackagerelationrecord record ON record.container_name = iosdtl.pcsn AND ios.bill_code = record.bill_code WHERE 1=1 OPTION 输入.iostorinv_id <> "" @@ -745,14 +746,16 @@ task.task_code, task.task_type, task.task_status, - sub.sap_pcsn, + (case when IFNULL(record.sap_pcsn,'') = '' then sub.sap_pcsn else record.sap_pcsn end) AS sap_pcsn, md.class_name task_type_name FROM st_ivt_iostorinvdis dis LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id LEFT JOIN sch_base_point point ON dis.point_id = point.point_id + LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = dis.iostorinv_id LEFT JOIN sch_base_task task ON dis.task_id = task.task_id LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name + LEFT JOIN pdm_bi_subpackagerelationrecord record ON record.container_name = dis.pcsn AND ios.bill_code = record.bill_code LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code WHERE 1=1 @@ -786,14 +789,16 @@ task.task_code, task.task_type, task.task_status, - sub.sap_pcsn, + (case when IFNULL(record.sap_pcsn,'') = '' then sub.sap_pcsn else record.sap_pcsn end) AS sap_pcsn md.class_name task_type_name FROM st_ivt_iostorinvdis dis LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id LEFT JOIN sch_base_point point ON dis.point_id = point.point_id + LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = dis.iostorinv_id LEFT JOIN sch_base_task task ON dis.task_id = task.task_id LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name AND sub.package_box_sn = dis.box_no + LEFT JOIN pdm_bi_subpackagerelationrecord record ON record.container_name = dis.pcsn AND ios.bill_code = record.bill_code LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code WHERE 1=1 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 5201eb944..a5f585793 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -295,6 +295,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { mp.put("品级", "A"); mp.put("小卷号", json.getString("pcsn")); mp.put("箱号", json.getString("box_no")); + mp.put("销售订单及行号", json.getString("sale_order_name")); mp.put("母卷号", json.getString("parent_container_name")); mp.put("基重（g/m³）（面密度）", NumberUtil.round(StrUtil.isEmpty(json.getString("mass_per_unit_area")) ? "0" : json.getString("mass_per_unit_area"), 1)); mp.put("居中度（mm）", "±1"); @@ -421,6 +422,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { mp.put("卷数", json.getString("quanlity_in_box")); mp.put("品级", "A"); mp.put("箱号", json.getString("box_no")); + mp.put("销售订单及行号", json.getString("sale_order_name")); mp.put("母卷号", json.getString("parent_container_name")); mp.put("基重（g/m³）（面密度）", NumberUtil.round(StrUtil.isEmpty(json.getString("mass_per_unit_area")) ? "0" : json.getString("mass_per_unit_area"), 1)); mp.put("居中度（mm）", "±1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index b5c5d321c..7a07f384d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -182,7 +182,7 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { mp.put("单位", json.getString("qty_unit_name")); mp.put("客户编码", json.getString("customer_name")); mp.put("发货客户名称", json.getString("customer_description")); - mp.put("销售订单", json.getString("sale_order_name")); + mp.put("销售订单及行号", json.getString("sale_order_name")); mp.put("出库日期", json.getString("input_time")); mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width"))); mp.put("产品厚度", json.getString("thickness")); @@ -245,7 +245,7 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { mp.put("单位", json.getString("qty_unit_name")); mp.put("客户编码", json.getString("customer_name")); mp.put("发货客户名称", json.getString("customer_description")); - mp.put("销售订单", json.getString("sale_order_name")); + mp.put("销售订单及行号", json.getString("sale_order_name")); mp.put("出库日期", json.getString("input_time")); mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width"))); mp.put("产品厚度", json.getString("thickness")); 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 748a7d293..64a0b62f5 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -205,6 +205,18 @@ > 强制确认 + + 业务强制确认 +