rev:发货单、调拨单EXCEL修改；返检出库删除包装关系BUG修改

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -3732,7 +3732,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             String struct_code = json.getString("struct_code");
             String vehicle_code = json.getString("storagevehicle_code");
 
-            JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06','07') and vehicle_code = '"+vehicle_code+"'").uniqueResult(0);
+            JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06','07') and vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
 
             if (ObjectUtil.isNotEmpty(jsonTask1)) {
 
@@ -4217,7 +4217,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             JSONObject dtl_jo = WQLObject.getWQLObject("st_ivt_iostorinvdtl").query("iostorinvdtl_id = '" + dis.getString("iostorinvdtl_id") + "'").uniqueResult(0);
             // 更新子卷包装关系表 状态 - 3
             JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and package_box_sn = '" + dis.getString("box_no") + "' and status = '2'").uniqueResult(0);
-            if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn"));
+            if (ObjectUtil.isEmpty(jsonSub))
+                throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn"));
             // 如果是拆分入库则将包装关系改为生成状态
             if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009"))) {
                 jsonSub.put("status", "0");
@@ -4347,12 +4348,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 String sect_code = dis_row.getString("sect_code");
                 //如果是虚拟区的出库，直接把包装关系删除；如果为立库的包装关系，将解绑删除标识置为1。当发货区解绑时，删除包装关系
                 String pcsn = dis_row.getString("pcsn");
-                if (sect_code.equals("XN01")){
-                    WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("container_name = '"+pcsn+"'");
-                }else {
-                    HashMap<String,String> map = new HashMap<>();
-                    map.put("need_delete","1");
-                    WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map,"container_name = '"+pcsn+"'");
+                if (sect_code.equals("XN01")) {
+                    WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("container_name = '" + pcsn + "'");
+                } else {
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("need_delete", "1");
+                    WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "container_name = '" + pcsn + "'");
                 }
 
             }
@@ -4641,6 +4642,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
         //出库明细表
         WQLObject wo_dtl = WQLObject.getWQLObject("st_ivt_iostorinvdtl");
+        //出库主表
+        WQLObject wo_mst = WQLObject.getWQLObject("st_ivt_iostorinv");
         //任务表
         WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
         String task_id = whereJson.getString("task_id");
@@ -4668,6 +4671,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         JSONObject dtljo = wo_dis.query("task_id='" + task_id + "'").uniqueResult(0);
         whereJson.put("iostorinv_id", dtljo.getString("iostorinv_id"));
 
+        JSONObject mst_jo = wo_mst.query("iostorinv_id = '" + dtljo.getString("iostorinv_id") + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(mst_jo)) {
+            throw new BadRequestException("未查询到对应的出库单据！");
+        } else {
+            if (mst_jo.getString("bill_type").equals("1003") || mst_jo.getString("bill_type").equals("1006")){
+                HashMap<String, String> map = new HashMap<>();
+                map.put("need_delete", "1");
+                WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "package_box_sn = '" + task.getString("vehicle_code") + "'");
+            }
+        }
+
         HashMap<String, String> map = new HashMap<>();
         map.put("task_status", TaskStatusEnum.FINISHED.getCode());
         map.put("finished_type", "01");

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

@@ -122,6 +122,9 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
             Map<String, Object> mp = new LinkedHashMap<>();
 
             mp.put("仓库", json.getString("stor_name"));
+            if (ObjectUtil.isNotEmpty(bill_type) && bill_type.equals("1004")){
+                mp.put("移入仓库", json.getString("in_stor_name"));
+            }
             mp.put("库区", json.getString("sect_name"));
             mp.put("交货单号", json.getString("vbeln"));
             mp.put("物流公司", json.getString("cust_name"));

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

@@ -68,13 +68,15 @@
                 sub.thickness,
                 sub.mass_per_unit_area,
                 mst.input_optname,
-                mst.remark
+                mst.remark,
+                stor.stor_name AS in_stor_name
             FROM
                 st_ivt_iostorinvdis dis
                 LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
                 LEFT JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id
                 LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
                 LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
+                LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = mst.out_stor_id
                 LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no
             WHERE
                 mst.io_type = '1'

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

@@ -82,7 +82,6 @@
                 sub.box_width,
                 sub.box_high,
                 sub.remark,
-
                 (90 - DATEDIFF(NOW(),sub.date_of_production)) AS sid_day
             FROM
                 st_ivt_structivt ivt