rev：导出维护字段销售订单、行号

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql

@@ -461,7 +461,8 @@
                         attr.col_num,
                         attr.layer_num,
                         attr.block_num,
-                        attr.placement_type
+                        attr.placement_type,
+                        sub.sale_order_name
                     FROM
                         ST_IVT_IOStorInvDis dis
                     LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = dis.iostorinv_id

lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java

@@ -820,6 +820,11 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
             map.put("箱号", json.getString("box_no"));
             map.put("重量", json.getString("real_qty"));
             map.put("仓位", json.getString("struct_code"));
+            if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
+                throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
+            }
+            map.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+            map.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
 
             String statusName = "";
             if (StrUtil.equals(json.getString("work_status"), "00")) {

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

@@ -275,7 +275,11 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 Map<String, Object> mp = new LinkedHashMap<>();
                 mp.put("日期", (json.getString("confirm_time_class").substring(0,10)).replace("-","/"));
                 mp.put("班次", json.getString("classes"));
-                mp.put("销售订单", json.getString("sale_order_name"));
+                if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
+                    throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
+                }
+                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
                 mp.put("客户编码", json.getString("customer_name"));
                 mp.put("规格", json.getString("thickness_request"));
                 mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard")));
@@ -320,7 +324,11 @@ 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("sale_order_name"));
+                if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
+                    throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!");
+                }
+                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
                 mp.put("生产日期", json.getString("date_of_production").replace("-","/"));
                 mp.put("箱号", json.getString("box_no"));
                 mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim());
@@ -402,7 +410,11 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 Map<String, Object> mp = new LinkedHashMap<>();
                 mp.put("日期", (json.getString("confirm_time_class").substring(0,10)).replace("-","/"));
                 mp.put("班次", json.getString("classes"));
-                mp.put("销售订单", json.getString("sale_order_name"));
+                if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
+                    throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
+                }
+                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
                 mp.put("客户编码", json.getString("customer_name"));
                 mp.put("规格", json.getString("thickness_request"));
                 mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard")));
@@ -447,7 +459,11 @@ 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("sale_order_name"));
+                if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
+                    throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!");
+                }
+                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
                 mp.put("生产日期", json.getString("date_of_production").replace("-","/"));
                 mp.put("箱号", json.getString("box_no"));
                 mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim());

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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.FileUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -182,7 +183,11 @@ 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"));
+            if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
+                throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
+            }
+            mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+            mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
             mp.put("出库日期", json.getString("input_time"));
             mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width")));
             mp.put("产品厚度", json.getString("thickness"));
@@ -245,7 +250,11 @@ 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"));
+            if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
+                throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
+            }
+            mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+            mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
             mp.put("出库日期", json.getString("input_time"));
             mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width")));
             mp.put("产品厚度", json.getString("thickness"));

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

@@ -200,7 +200,8 @@ export default {
           'stor_id': this.crud.query.stor_id,
           'bill_types': this.crud.query.bill_types,
           'with': this.crud.query.with,
-          'customer_name': this.crud.query.customer_name
+          'customer_name': this.crud.query.customer_name,
+          'pcsn': this.crud.query.pcsn
         }
         if (this.crud.query.createTime !== undefined) {
           data.begin_time = this.crud.query.createTime[0]