rev：返检/改切出库回传删除子卷包装关系，成品入库报表新增查询条件

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

@@ -252,11 +252,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
                     for (int j = 0; j < disArr.size(); j++) {
                         JSONObject json = disArr.getJSONObject(j);
-                        //查询对应的包装关系有没有删除没有删除，进行提示
+                        // 删除对应的包装关系
-                        JSONArray box_size = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + json.getString("box_no") + "'").getResultJSONArray(0);
+                        WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("package_box_sn = '"+json.getString("box_no") +"'");
-                        if (box_size.size() > 0) {
-                            throw new BadRequestException("木箱：" + json.getString("box_no") + "对应的包装关系未删除！");
-                        }
                     }
                     for (int j = 0; j < disArr.size(); j++) {
                         JSONObject param = new JSONObject();
@@ -363,11 +360,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
                     for (int j = 0; j < disArr.size(); j++) {
                         JSONObject json = disArr.getJSONObject(j);
-                        //查询对应的包装关系有没有删除没有删除，进行提示
+
-                        JSONArray box_size = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + json.getString("box_no") + "'").getResultJSONArray(0);
+                        // 删除对应的包装关系
-                        if (box_size.size() > 0) {
+                        WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("package_box_sn = '"+json.getString("box_no") +"'");
-                            throw new BadRequestException("木箱：" + json.getString("box_no") + "对应的包装关系未删除！");
-                        }
                     }
                     for (int j = 0; j < disArr.size(); j++) {
                         JSONObject param = new JSONObject();
@@ -1478,11 +1473,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
                 for (int j = 0; j < disArr.size(); j++) {
                     JSONObject json = disArr.getJSONObject(j);
-                    //查询对应的包装关系有没有删除没有删除，进行提示
+                    // 删除对应的包装关系
-                    JSONArray box_size = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + json.getString("box_no") + "'").getResultJSONArray(0);
+                    WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("package_box_sn = '"+json.getString("box_no") +"'");
-                    if (box_size.size() > 0) {
-                        throw new BadRequestException("木箱：" + json.getString("box_no") + "对应的包装关系未删除！");
-                    }
                 }
                 for (int j = 0; j < disArr.size(); j++) {
                     JSONObject param = new JSONObject();
@@ -1515,11 +1507,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
                 for (int j = 0; j < disArr.size(); j++) {
                     JSONObject json = disArr.getJSONObject(j);
-                    //查询对应的包装关系有没有删除没有删除，进行提示
+                    // 删除对应的包装关系
-                    JSONArray box_size = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + json.getString("box_no") + "'").getResultJSONArray(0);
+                    WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("package_box_sn = '"+json.getString("box_no") +"'");
-                    if (box_size.size() > 0) {
-                        throw new BadRequestException("木箱：" + json.getString("box_no") + "对应的包装关系未删除！");
-                    }
                 }
                 for (int j = 0; j < disArr.size(); j++) {
                     JSONObject param = new JSONObject();

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

@@ -116,6 +116,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
         String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name");
         String is_all = MapUtil.getStr(whereJson, "is_all");
         String pcsn = MapUtil.getStr(whereJson, "pcsn");
+        String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
         String thickness_request = MapUtil.getStr(whereJson, "thickness_request");
 
         JSONObject map = new JSONObject();
@@ -132,6 +133,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
         map.put("sale_order_name", sale_order_name);
         map.put("classes", classes);
         map.put("thickness_request", thickness_request);
+        map.put("sap_pcsn", sap_pcsn);
 
         // 处理时间
         if (ObjectUtil.isNotEmpty(begin_time) && ObjectUtil.isNotEmpty(end_time)) {
@@ -363,6 +365,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
         String classes = MapUtil.getStr(map, "classes");
         String sale_order_name = MapUtil.getStr(map, "sale_order_name");
         String pcsn = MapUtil.getStr(map, "pcsn");
+        String sap_pcsn = MapUtil.getStr(map, "sap_pcsn");
         String is_all = MapUtil.getStr(map, "is_all");
         String thickness_request = MapUtil.getStr(map, "thickness_request");
 
@@ -380,6 +383,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
         mapParam.put("is_virtual", is_virtual);
         mapParam.put("classes", classes);
         mapParam.put("thickness_request", thickness_request);
+        mapParam.put("sap_pcsn", sap_pcsn);
 
         // 处理时间
         if (ObjectUtil.isNotEmpty(begin_time) && ObjectUtil.isNotEmpty(end_time)) {
@@ -447,6 +451,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 }
                 mp.put("毛重合计", NumberUtil.round(StrUtil.isEmpty(json.getString("box_weight")) ? "0" : json.getString("box_weight"), 1));
                 mp.put("小卷号", json.getString("pcsn"));
+                mp.put("sap批次号", json.getString("sap_pcsn"));
                 mp.put("净重（KG）", NumberUtil.round(StrUtil.isEmpty(json.getString("net_weight")) ? "0" : json.getString("net_weight"), 1));
                 mp.put("卷数", json.getString("quanlity_in_box"));
                 mp.put("品级", "A");

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

@@ -113,6 +113,8 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
         }
 
         JSONObject json = WQL.getWO("ST_IVT_OUTBILLQUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC,dis.box_no");
+        // 查询此子卷转单之前的销售订单号
+
         return json;
     }
 

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

@@ -24,6 +24,7 @@
 	输入.is_virtual			                TYPEAS s_string
 	输入.classes			                    TYPEAS s_string
 	输入.thickness_request			        TYPEAS s_string
+	输入.sap_pcsn			                TYPEAS s_string
 	输入.areas			                    TYPEAS f_string
 
 
@@ -791,6 +792,10 @@
                            sub.sale_order_name = 输入.sale_order_name
                        ENDOPTION
 
+                       OPTION 输入.sap_pcsn <> ""
+                           sub.sap_pcsn = 输入.sap_pcsn
+                       ENDOPTION
+
                        OPTION 输入.bill_type = "0007"
                             sub.sub_type = '2'
                       ENDOPTION

lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue

@@ -84,6 +84,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="sap批次">
+            <label slot="label">sap批次:</label>
+            <el-input
+              v-model="query.sap_pcsn"
+              size="mini"
+              clearable
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item  label="订单行号">
             <el-input
               v-model="query.sale_order_name"