Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql

@@ -204,7 +204,8 @@
                 case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then plan.FRP_material end AS paper_code,
                 case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then plan.FRP_description end AS paper_name,
                 sub.thickness_request,
-                sub.box_weight
+                sub.box_weight,
+                sub.sales_owner
             FROM
                 ST_IVT_StructIvt ivt
                 LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
@@ -213,6 +214,7 @@
                 LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
                 LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id
                 LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND attr.storagevehicle_code = sub.package_box_sn
+                LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
                 LEFT JOIN (SELECT
                 	container_name,
                 	MAX(paper_tube_or_FRP) AS paper_tube_or_FRP,

lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java

@@ -431,6 +431,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                     mp.put("行号", "");
                 }
                 mp.put("客户编码", json.getString("customer_name"));
+                mp.put("客户名称", json.getString("cust_name"));
                 mp.put("业务员", json.getString("sales_owner"));
                 mp.put("规格", json.getString("thickness_request"));
                 mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard")));
@@ -476,6 +477,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 mp.put("班次", json.getString("classes"));
                 mp.put("库区", json.getString("sect_name"));
                 mp.put("客户编码", json.getString("customer_name"));
+                mp.put("客户名称", json.getString("cust_name"));
                 mp.put("业务员", json.getString("sales_owner"));
                 if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
                     throw new BadRequestException("箱号" + json.getString("box_no") + "销售订单为空!");

lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java

@@ -187,6 +187,7 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService {
             mp.put("箱内子卷数量", json.getString("quanlity_in_box"));
             mp.put("客户编码", json.getString("customer_name"));
             mp.put("客户名称", json.getString("customer_description"));
+            mp.put("业务员", json.getString("sales_owner"));
             mp.put("销售订单及行号", json.getString("sale_order_name"));
             mp.put("子卷号", json.getString("pcsn"));
             mp.put("sap批次", json.getString("sap_pcsn"));

lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql

@@ -645,6 +645,7 @@
                         dis.qty_unit_name,
                         sub.customer_name,
                         cust.sales_owner,
+                        cust.cust_name,
                         sub.quanlity_in_box,
                         sub.customer_description,
                         sub.sale_order_name,
@@ -840,6 +841,7 @@
                         mst.iostorinv_id,
                         dis.box_no,
                         MAX(cust.sales_owner) AS sales_owner,
+                        MAX(cust.cust_name) AS cust_name,
                         MAX(sub.customer_name) AS customer_name,
                         MAX(sub.sale_order_name) AS sale_order_name,
                         MAX(sub.date_of_production) AS date_of_production,

lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql

@@ -84,11 +84,13 @@
                 sub.box_width,
                 sub.box_high,
                 sub.remark,
-                DATEDIFF( NOW(), ivt.instorage_time ) AS sid_day
+                DATEDIFF( NOW(), ivt.instorage_time ) AS sid_day,
+                cust.sales_owner
             FROM
                 st_ivt_structivt ivt
                 LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
                 LEFT JOIN pdm_bi_subpackagerelation sub ON ivt.pcsn = sub.container_name
+                LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
             WHERE
                 1 = 1
 

lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue

@@ -197,6 +197,7 @@
         <el-table-column show-overflow-tooltip prop="quanlity_in_box" label="箱内子卷数量" :min-width="flexWidth('quanlity_in_box',crud.data,'箱内子卷数量')" />
         <el-table-column show-overflow-tooltip prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
         <el-table-column show-overflow-tooltip prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
+        <el-table-column show-overflow-tooltip prop="sales_owner" label="业务员" :min-width="flexWidth('sales_owner',crud.data,'业务员')" />
         <el-table-column show-overflow-tooltip prop="sale_order_name" label="销售订单及行号" :min-width="flexWidth('sale_order_name',crud.data,'销售订单及行号')" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')" />
         <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')" />