rev:出入库报表相关修改

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java

@@ -74,6 +74,14 @@ public class SectattrController {
         return new ResponseEntity<>(sectattrService.getSect(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/getStorSect")
+    @Log("查询指定仓库库区")
+    @ApiOperation("查询指定仓库库区")
+    //@PreAuthorize("@el.check('materialtype:list')")
+    public ResponseEntity<Object> getStorSect(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(sectattrService.getStorSect(whereJson), HttpStatus.OK);
+    }
+
     @PutMapping("/changeActive")
     @Log("修改库区状态")
     @ApiOperation("修改库区状态")

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java

@@ -65,6 +65,8 @@ public interface SectattrService {
 
     JSONObject getSect(Map whereJson);
 
+    JSONObject getStorSect(JSONObject whereJson);
+
     /**
      * 改变启用状态
      * @param json

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java

@@ -1,4 +1,3 @@
-
 package org.nl.wms.basedata.st.service.impl;
 
 
@@ -227,6 +226,22 @@ public class SectattrServiceImpl implements SectattrService {
         return jo;
     }
 
+    @Override
+    public JSONObject getStorSect(JSONObject whereJson) {
+        JSONArray rows = WQLObject.getWQLObject("st_ivt_sectattr").query("stor_id = '1582991156504039424' AND sect_type_attr = '09'").getResultJSONArray(0);
+        JSONArray ja = new JSONArray();
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject row = rows.getJSONObject(i);
+            JSONObject jo = new JSONObject();
+            jo.put("value", row.getString("sect_id"));
+            jo.put("text", row.getString("sect_name"));
+            ja.add(jo);
+        }
+        JSONObject result = new JSONObject();
+        result.put("data", ja);
+        return result;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void changeActive(JSONObject json) {

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java

@@ -281,6 +281,9 @@ public class StructivtServiceImpl implements StructivtService {
             mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox"));
             mp.put("客户要求规格幅宽", json.getString("width_standard"));
             mp.put("物料标准厚度", json.getString("thickness_request"));
+            mp.put("管件类型", json.getString("paper_type"));
+            mp.put("管件编码", json.getString("paper_code"));
+            mp.put("管件描述", json.getString("paper_name"));
             list.add(mp);
         }
         FileUtil.downloadExcel(list, response);

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

@@ -69,6 +69,9 @@
                 sub.sap_pcsn,
                 sub.package_box_sn,
                 sub.sale_order_name,
+                case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type,
+                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.box_weight
                 FROM
                     ST_IVT_StructIvt ivt
@@ -78,6 +81,20 @@
                     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 (SELECT
+                    	container_name,
+                    	MAX(paper_tube_or_FRP) AS paper_tube_or_FRP,
+                    	MAX(paper_tube_material) AS paper_tube_material,
+                    	MAX(paper_tube_description) AS paper_tube_description,
+                    	MAX(paper_tube_model) AS paper_tube_model,
+                    	MAX(FRP_material) AS FRP_material,
+                    	MAX(FRP_description) AS FRP_description,
+                    	MAX(FRP_model) AS FRP_model
+                    FROM
+                    	pdm_bi_slittingproductionplan plan1
+                    	WHERE
+                    	plan1.is_delete = '0'
+                    	GROUP BY container_name) plan ON plan.container_name = sub.container_name
 
             WHERE
                  1 = 1
@@ -197,6 +214,9 @@
                 sub.isUnPackBox,
                 sub.isRePrintPackageBoxLabel,
                 sub.width_standard,
+                case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type,
+                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
             FROM
@@ -207,6 +227,20 @@
                 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 (SELECT
+                	container_name,
+                	MAX(paper_tube_or_FRP) AS paper_tube_or_FRP,
+                	MAX(paper_tube_material) AS paper_tube_material,
+                	MAX(paper_tube_description) AS paper_tube_description,
+                	MAX(paper_tube_model) AS paper_tube_model,
+                	MAX(FRP_material) AS FRP_material,
+                	MAX(FRP_description) AS FRP_description,
+                	MAX(FRP_model) AS FRP_model
+                FROM
+                	pdm_bi_slittingproductionplan plan1
+                	WHERE
+                	plan1.is_delete = '0'
+                	GROUP BY container_name) plan ON plan.container_name = sub.container_name
             WHERE
                  1 = 1
                  and attr.stor_id in 输入.in_stor_id

lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java

@@ -372,7 +372,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                     //创建退货入库单
                     jsonMst.put("bill_type", "0002");
                     jsonMst.put("biz_date", DateUtil.now());
-                    jsonMst.put("bill_status", "30");
+                    jsonMst.put("bill_status", "10");
                     rawAssistIStorService.insertDtl(jsonMst);
                 }
             }

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java

@@ -231,8 +231,10 @@ public class ProductInstorServiceImpl implements ProductInstorService {
 
                     String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
                     //直接分配虚拟区货位，并确认
-                    JSONObject struct = WQL.getWO("PDA_ST_01").addParam("flag", "3").addParam("stor_id", stor.getString("stor_id")).process().uniqueResult(0);
+                    JSONObject struct = WQL.getWO("PDA_ST_01").addParam("flag", "3").addParam("stor_id", stor.getString("stor_id")).addParam("sect_id", whereJson.getString("sect_id")).process().uniqueResult(0);
-
+                    if (ObjectUtil.isEmpty(struct)){
+                        throw new BadRequestException("当前没有可用的空仓位进行入库！");
+                    }
                     HashMap<String, String> dis_map = new HashMap();
                     dis_map.put("sect_id", struct.getString("sect_id"));
                     dis_map.put("sect_code", struct.getString("sect_code"));

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql

@@ -17,6 +17,7 @@
 	输入.box_no					        TYPEAS s_string
 	输入.point_code					    TYPEAS s_string
 	输入.stor_id					        TYPEAS s_string
+	输入.sect_id					        TYPEAS s_string
 
 
 [临时表]
@@ -117,6 +118,7 @@
             	se.sect_type_attr = '09'
             	AND sa.lock_type = '1'
             	AND sa.stor_id = 输入.stor_id
+            	AND sa.sect_id = 输入.sect_id
             	AND sa.is_delete = '0'
             	AND IFNULL( storagevehicle_code, '' ) = ''
             ORDER BY

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java

@@ -87,6 +87,9 @@ public class InbillServiceImpl {
     public void confirmDis(JSONObject form) {
         WQLObject dis_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
         WQLObject dtl_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl");
+        WQLObject mst_table = WQLObject.getWQLObject("st_ivt_iostorinv");
+        WQLObject sub_table = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
+        WQLObject sub_record = WQLObject.getWQLObject("pdm_bi_subpackagerelationrecord");
         String task_id = form.getString("task_id");
 
         if (StrUtil.isEmpty(task_id)) {
@@ -101,6 +104,17 @@ public class InbillServiceImpl {
             dis_row.put("real_qty", dis_row.getString("plan_qty"));
             dis_table.update(dis_row);
 
+            String pcsn = dis_row.getString("pcsn");
+            JSONObject sub_jo = sub_table.query("container_name = '"+pcsn+"'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(sub_jo)){
+                throw new BadRequestException("未查询到子卷号为："+pcsn+"对应的包装关系！");
+            }
+            JSONObject mst_jo = mst_table.query("iostorinv_id = '" + dis_row.getString("iostorinv_id") + "'").uniqueResult(0);
+            sub_jo.put("io_code",mst_jo.getString("bill_code"));
+            sub_jo.put("insert_time",DateUtil.now());
+            sub_jo.put("record_id",IdUtil.getSnowflake(1, 1));
+            sub_record.insert(sub_jo);
+
             //回写明细表实际数量
             JSONObject dtl_row = dtl_table.query("iostorinvdtl_id = '" + dis_row.getString("iostorinvdtl_id") + "'").uniqueResult(0);
             double real_qty = NumberUtil.add(dtl_row.getDoubleValue("real_qty"), dis_row.getDoubleValue("real_qty"));

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java

@@ -183,6 +183,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             row.put("iostorinv_id", iostorinv_id);
             row.put("seq_no", (i + 1) + "");
             JSONObject material = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + row.get("product_name") + "'").uniqueResult(0);
+            if(ObjectUtil.isEmpty(material)){
+                throw new BadRequestException("LMS系统不存在物料：【"+row.get("product_name")+"】,请确认物料是否正确，或SAP系统是否推送到LMS系统");
+            }
             row.put("material_id", material.getString("material_id"));
             row.put("pcsn", row.get("container_name"));
             row.put("bill_status", "10");
@@ -353,6 +356,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             row.put("iostorinv_id", iostorinv_id);
             row.put("seq_no", (i + 1) + "");
             JSONObject material = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + row.get("product_name") + "'").uniqueResult(0);
+            if(ObjectUtil.isEmpty(material)){
+                throw new BadRequestException("LMS系统不存在物料：【"+row.get("product_name")+"】,请确认物料是否正确，或SAP系统是否推送到LMS系统");
+            }
             row.put("material_id", material.getString("material_id"));
             row.put("pcsn", row.get("container_name"));
             row.put("bill_status", "10");

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

@@ -144,6 +144,18 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(map.get("package_box_sn"))) {
             map.put("package_box_sn", "%" + map.get("package_box_sn") + "%");
         }
+        if (StrUtil.isNotEmpty(map.get("width_standard"))) {
+            map.put("width_standard", map.get("width_standard"));
+        }
+        if (StrUtil.isNotEmpty(map.get("thickness_request"))) {
+            map.put("thickness_request", map.get("thickness_request"));
+        }
+        if (StrUtil.isNotEmpty(map.get("customer_name"))) {
+            map.put("customer_name", map.get("customer_name"));
+        }
+        if (StrUtil.isNotEmpty(map.get("struct_code"))) {
+            map.put("struct_code", "%" + map.get("struct_code") + "%");
+        }
         JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.struct_code ASC");
         return jo;
     }

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

@@ -51,6 +51,10 @@
     输入.package_box_sn                  TYPEAS s_string
     输入.is_upload                       TYPEAS s_string
     输入.width                           TYPEAS s_string
+    输入.struct_code                     TYPEAS s_string
+    输入.customer_name                   TYPEAS s_string
+    输入.thickness_request               TYPEAS s_string
+    输入.width_standard                  TYPEAS s_string
     输入.in_stor_id                      TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -665,6 +669,22 @@
                    ivt.canuse_qty > 输入.canuse_qty
                ENDOPTION
 
+               OPTION 输入.width_standard <> ""
+                  sub.width_standard = 输入.width_standard
+              ENDOPTION
+
+              OPTION 输入.thickness_request <> ""
+                 sub.thickness_request = 输入.thickness_request
+             ENDOPTION
+
+             OPTION 输入.customer_name <> ""
+                sub.customer_name = 输入.customer_name
+            ENDOPTION
+
+            OPTION 输入.struct_code <> ""
+               attr.struct_code like 输入.struct_code
+           ENDOPTION
+
             ENDSELECT
         ENDPAGEQUERY
     ENDIF

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

@@ -284,6 +284,33 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst);
                 }
 
+                // 改切出库：回传mes
+                if (StrUtil.equals(bill_type, "1003")) {
+                    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 param = new JSONObject();
+                        JSONArray details = new JSONArray();
+                        JSONObject json = disArr.getJSONObject(j);
+                        param.put("PackageBoxSN", json.getString("box_no"));
+                        param.put("Attribute1", "ReCut");
+
+                        JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
+                        for (int k = 0; k < container_jo.size(); k++) {
+                            JSONObject dis_jo = container_jo.getJSONObject(k);
+                            JSONObject jsonParamDtl = new JSONObject();
+                            jsonParamDtl.put("ContainerName", dis_jo.getString("pcsn"));
+                            details.add(jsonParamDtl);
+                        }
+                        param.put("Details", details);
+                        new LmsToMesServiceImpl().lmsUnPackage(param);
+                    }
+                    jo_mst.put("upload_mes", "1");
+                    jo_mst.put("is_upload", "1");
+                    jo_mst.put("upload_optid", SecurityUtils.getCurrentUserId());
+                    jo_mst.put("upload_time", DateUtil.now());
+                    WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst);
+                }
+
                 /*// 改切出库
                 if (StrUtil.equals(bill_type, "1003")) {
                     JSONArray disArr = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0);
@@ -583,7 +610,17 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                         paramSapMstArr.add(paramDis);
                     }
                     param.put("ITEM", paramSapMstArr);
-                    System.out.println(param.toString());
+                    //查询该调拨入库单对应的出库单
+                    JSONObject out_mst = wo_mst.query("source_id = '"+jo_mst.getString("source_id")+"' AND io_type = '1' AND is_delete = '0'").uniqueResult(0);
+                    param.put("ZACTION", "P");
+                    param.put("BUDAT", out_mst.getString("biz_date"));
+                    param.put("ZZYGYF", out_mst.getString("estimated_freight"));
+                    param.put("ZZYZFY", out_mst.getString("run_freight"));
+                    param.put("ZZXCFY", out_mst.getString("unload_freight"));
+                    param.put("ZZQTFY", out_mst.getString("other_freight"));
+                    param.put("ZZYFGY", out_mst.getString("trans_code"));
+                    param.put("ZZYDH", out_mst.getString("order_number"));
+                    param.put("ZZCX", out_mst.getString("car_type"));
 
                     // 调用接口回传
                     new LmsToSapServiceImpl().returnOutDtl(param);
@@ -783,7 +820,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
     }
 
     @Override
-    @Transactional
     public void upload(JSONObject whereJson) {
         //出库分配表
         WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
@@ -933,6 +969,18 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 param.put("ITEM", paramSapMstArr);
                 System.out.println(param.toString());
 
+                //查询该调拨入库单对应的出库单
+                JSONObject out_mst = wo_mst.query("source_id = '"+jo_mst.getString("source_id")+"' AND io_type = '1' AND is_delete = '0'").uniqueResult(0);
+                param.put("ZACTION", "P");
+                param.put("BUDAT", out_mst.getString("biz_date"));
+                param.put("ZZYGYF", out_mst.getString("estimated_freight"));
+                param.put("ZZYZFY", out_mst.getString("run_freight"));
+                param.put("ZZXCFY", out_mst.getString("unload_freight"));
+                param.put("ZZQTFY", out_mst.getString("other_freight"));
+                param.put("ZZYFGY", out_mst.getString("trans_code"));
+                param.put("ZZYDH", out_mst.getString("order_number"));
+                param.put("ZZCX", out_mst.getString("car_type"));
+
                 // 调用接口回传
                 new LmsToSapServiceImpl().returnOutDtl(param);
 

lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java

@@ -36,8 +36,8 @@ public class OutBillQueryController {
     @GetMapping
     @Log("查询")
     @ApiOperation("查询")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page, String[] bill_types) {
-        return new ResponseEntity<>(outBillQueryService.queryAll(whereJson, page), HttpStatus.OK);
+        return new ResponseEntity<>(outBillQueryService.queryAll(whereJson, page, bill_types), HttpStatus.OK);
     }
 
     @PostMapping

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

@@ -24,7 +24,7 @@ public interface OutBillQueryService {
      * @param page      分页参数
      * @return Map<String, Object>
      */
-    Map<String, Object> queryAll(Map whereJson, Pageable page);
+    Map<String, Object> queryAll(Map whereJson, Pageable page, String[] bill_types);
 
     /**
      * 查询所有数据不分页

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

@@ -228,6 +228,9 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 mp.put("居中度（mm）", "±1");
                 mp.put("塌边（mm）", "≤10");
                 mp.put("米数（长度）", NumberUtil.round(StrUtil.isEmpty(json.getString("length")) ? "0" : json.getString("length"), 1));
+                mp.put("管件类型", json.getString("paper_type"));
+                mp.put("管件编码", json.getString("paper_code"));
+                mp.put("管件描述", json.getString("paper_name"));
                 mp.put("生产实际抗拉值", json.getString("actual_value"));
                 mp.put("内控标准抗拉下限", json.getString("standard_limit"));
                 mp.put("客户需求抗拉下限", json.getString("demand_limit"));

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

@@ -3,6 +3,7 @@ package org.nl.wms.stat.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
@@ -21,10 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author Liuxy
@@ -38,9 +36,9 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
 
 
     @Override
-    public Map<String, Object> queryAll(Map whereJson, Pageable page) {
+    public Map<String, Object> queryAll(Map whereJson, Pageable page, String[] bill_types) {
         String stor_id = MapUtil.getStr(whereJson, "stor_id");
-        String bill_type = MapUtil.getStr(whereJson, "bill_type");
+
         String with = MapUtil.getStr(whereJson, "with"); // 厚度*幅宽
         String begin_time = MapUtil.getStr(whereJson, "begin_time");
         String end_time = MapUtil.getStr(whereJson, "end_time");
@@ -49,7 +47,13 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
         JSONObject map = new JSONObject();
         map.put("flag", "1");
         map.put("stor_id",stor_id);
-        map.put("bill_type",bill_type);
+        if (ObjectUtil.isNotEmpty(bill_types)){
+            StringJoiner joiner = new StringJoiner(",","(",")");
+            for (String type : bill_types){
+                joiner.add("'"+type+"'");
+            }
+            map.put("bill_type",joiner.toString());
+        }
         map.put("with",with);
         map.put("begin_time",begin_time);
         map.put("end_time",end_time);

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

@@ -72,6 +72,9 @@
                 sub.date_of_production,
                 mst.input_optname,
                 sub.width,
+                case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type,
+                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,
                 sub.box_weight,
                 sub.length,
@@ -117,7 +120,22 @@
                 LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id
                 LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
                 LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no
-                LEFT JOIN pdm_bi_slittingproductionplan plan ON plan.container_name = sub.container_name
+                LEFT JOIN (SELECT
+                	container_name,
+                	MAX(paper_tube_or_FRP) AS paper_tube_or_FRP,
+                	MAX(paper_tube_material) AS paper_tube_material,
+                	MAX(paper_tube_description) AS paper_tube_description,
+                	MAX(paper_tube_model) AS paper_tube_model,
+                	MAX(FRP_material) AS FRP_material,
+                	MAX(parent_container_name) AS parent_container_name,
+                    MAX(restruct_container_name) AS restruct_container_name,
+                	MAX(FRP_description) AS FRP_description,
+                	MAX(FRP_model) AS FRP_model
+                FROM
+                	pdm_bi_slittingproductionplan plan1
+                	WHERE
+                	plan1.is_delete = '0'
+                	GROUP BY container_name) plan ON plan.container_name = sub.container_name
                 LEFT JOIN md_me_materialbase mb ON mb.material_code = sub.box_type
             WHERE
                 mst.io_type = '0'
@@ -309,6 +327,9 @@
                 sub.date_of_production,
                 mst.input_optname,
                 sub.width,
+                case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type,
+                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,
                 sub.box_weight,
                 sub.length,
@@ -354,7 +375,22 @@
                 LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id
                 LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
                 LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no
-                LEFT JOIN pdm_bi_slittingproductionplan plan ON plan.container_name = sub.container_name
+                LEFT JOIN (SELECT
+                	container_name,
+                	MAX(paper_tube_or_FRP) AS paper_tube_or_FRP,
+                	MAX(paper_tube_material) AS paper_tube_material,
+                	MAX(paper_tube_description) AS paper_tube_description,
+                	MAX(paper_tube_model) AS paper_tube_model,
+                	MAX(FRP_material) AS FRP_material,
+                	MAX(parent_container_name) AS parent_container_name,
+                	MAX(restruct_container_name) AS restruct_container_name,
+                	MAX(FRP_description) AS FRP_description,
+                	MAX(FRP_model) AS FRP_model
+                FROM
+                	pdm_bi_slittingproductionplan plan1
+                	WHERE
+                	plan1.is_delete = '0'
+                	GROUP BY container_name) plan ON plan.container_name = sub.container_name
                 LEFT JOIN md_me_materialbase mb ON mb.material_code = sub.box_type
             WHERE
                 mst.io_type = '0'

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

@@ -15,7 +15,7 @@
 	#################################################
 	输入.flag					            TYPEAS s_string
 	输入.stor_id           			        TYPEAS s_string
-	输入.bill_type			                TYPEAS s_string
+	输入.bill_type			                TYPEAS f_string
 	输入.with			                    TYPEAS s_string
 	输入.begin_time			                TYPEAS s_string
 	输入.end_time			                TYPEAS s_string
@@ -68,6 +68,9 @@
                 sub.thickness,
                 sub.mass_per_unit_area,
                 mst.input_optname,
+                case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type,
+                                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,
                 mst.remark,
                 stor.stor_name AS in_stor_name
             FROM
@@ -78,6 +81,20 @@
                 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
+                LEFT JOIN (SELECT
+                	container_name,
+                	MAX(paper_tube_or_FRP) AS paper_tube_or_FRP,
+                	MAX(paper_tube_material) AS paper_tube_material,
+                	MAX(paper_tube_description) AS paper_tube_description,
+                	MAX(paper_tube_model) AS paper_tube_model,
+                	MAX(FRP_material) AS FRP_material,
+                	MAX(FRP_description) AS FRP_description,
+                	MAX(FRP_model) AS FRP_model
+                FROM
+                	pdm_bi_slittingproductionplan plan1
+                	WHERE
+                	plan1.is_delete = '0'
+                	GROUP BY container_name) plan ON plan.container_name = sub.container_name
             WHERE
                 mst.io_type = '1'
                 AND mst.is_delete = '0'
@@ -88,7 +105,7 @@
                 ENDOPTION
 
                 OPTION 输入.bill_type <> ""
-                    mst.bill_type = 输入.bill_type
+                    mst.bill_type IN 输入.bill_type
                 ENDOPTION
 
                 OPTION 输入.begin_time <> ""

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -192,6 +192,9 @@
         <el-table-column prop="warehousing_qty" label="待入数" :formatter="rounding" />
         <el-table-column prop="unit_name" label="计量单位" />
         <el-table-column prop="instorage_time" label="入库时间" min-width="150" />
+        <el-table-column prop="paper_type" label="管件类型" min-width="150" />
+        <el-table-column prop="paper_code" label="管件编码" min-width="150" />
+        <el-table-column prop="paper_name" label="管件描述" min-width="250" />
       </el-table>
       <!--分页组件-->
       <pagination />

lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -348,10 +348,10 @@ export default {
           this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
-        if (this.form.out_stor_id === this.form.stor_id) {
+        /*if (this.form.out_stor_id === this.form.stor_id) {
           this.crud.notify('移出仓库和移入仓库不能一致！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
-        }
+        }*/
       }
     },
     [CRUD.HOOK.afterToEdit]() {

lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue

@@ -49,6 +49,42 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
+        <el-input
+          v-model="query.width_standard"
+          clearable
+          size="mini"
+          placeholder="幅宽"
+          style="width: 250px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.thickness_request"
+          clearable
+          size="mini"
+          placeholder="厚度"
+          style="width: 250px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.customer_name"
+          clearable
+          size="mini"
+          placeholder="客户"
+          style="width: 250px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.struct_code"
+          clearable
+          size="mini"
+          placeholder="仓位"
+          style="width: 250px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
         <rrOperation />
       </div>
     </div>
@@ -62,7 +98,7 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',crud.data,'入库日期')" />
+      <el-table-column sortable prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',crud.data,'入库日期')" />
       <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
       <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
       <el-table-column prop="struct_name" label="仓位" :min-width="flexWidth('struct_name',crud.data,'仓位')" />

lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue

@@ -34,58 +34,41 @@
             <el-input v-model="formMst.receiptphone" size="mini" style="width: 210px"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="物流公司:">
-            <el-input v-model="formMst.logisticscompany" size="mini" style="width: 210px" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="司机:">
-            <el-input v-model="formMst.drivername" size="mini" style="width: 210px" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="车牌号:">
-            <el-input v-model="formMst.carno" size="mini" style="width: 210px" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="司机联系电话:">
-            <el-input v-model="formMst.driverphone" size="mini" style="width: 210px" />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="合同号:">
             <el-input v-model="formMst.contractno" size="mini" style="width: 210px"/>
           </el-form-item>
+<!--          <el-form-item label="物流公司:">
+            <el-input v-model="formMst.logisticscompany" size="mini" style="width: 210px"/>
+          </el-form-item>-->
         </el-col>
-      </el-row>
-
-      <el-row>
         <el-col :span="8">
           <el-form-item label="送货单位:">
             <el-input v-model="formMst.deliveryunit" size="mini" style="width: 210px"/>
           </el-form-item>
-        </el-col>
+<!--          <el-form-item label="司机:">
-        <el-col :span="8">
+            <el-input v-model="formMst.drivername" size="mini" style="width: 210px"/>
-          <el-form-item label="送货方地址:">
+          </el-form-item>-->
-            <el-input v-model="formMst.deliveryaddress" size="mini" style="width: 210px" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="送货方联系人:">
-            <el-input v-model="formMst.deliveryname" size="mini" style="width: 210px" />
-          </el-form-item>
         </el-col>
       </el-row>
-
       <el-row>
         <el-col :span="8">
-          <el-form-item label="送货联系电话:">
+          <el-form-item label="送货方地址:">
-            <el-input v-model="formMst.deliveryphone" size="mini" style="width: 210px" />
+            <el-select
+              v-model="formMst.deliveryaddress"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 210px"
+            >
+              <el-option
+                v-for="item in addressList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -111,6 +94,23 @@
           <el-form-item label="预估运费:">
             <el-input v-model="formMst.estimated_freight" size="mini" style="width: 210px"/>
           </el-form-item>
+<!--          <el-form-item label="送货方联系人:">
+            <el-input v-model="formMst.deliveryname" size="mini" style="width: 210px"/>
+          </el-form-item>-->
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+<!--          <el-form-item label="送货联系电话:">
+            <el-input v-model="formMst.deliveryphone" size="mini" style="width: 210px"/>
+          </el-form-item>-->
+        </el-col>
+        <el-col :span="8">
+
+        </el-col>
+        <el-col :span="8">
+
         </el-col>
       </el-row>
 
@@ -190,6 +190,12 @@ export default {
   data() {
     return {
       transportaList: [],
+      addressList: [
+        { 'value': '甘肃海亮兰州仓', 'label': '甘肃海亮兰州仓' },
+        { 'value': '塘厦外仓', 'label': '塘厦外仓' },
+        { 'value': '宁德四川外仓', 'label': '宁德四川外仓' },
+        { 'value': '宁德蕉城外仓', 'label': '宁德蕉城外仓' },
+        { 'value': '宁德江苏外仓', 'label': '宁德江苏外仓' }],
       formMst: {},
       dialogVisible: false
     }

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

@@ -189,6 +189,9 @@
         <el-table-column show-overflow-tooltip prop="input_optname" label="入库人" :min-width="flexWidth('input_optname',crud.data,'入库人')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="width" label="产品规格" :min-width="flexWidth('width',crud.data,'产品规格')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_type" label="管件类型" :min-width="flexWidth('paper_type',crud.data,'管件类型')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_code" label="管件编码" :min-width="flexWidth('paper_code',crud.data,'管件编码')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_name" label="管件描述" :min-width="flexWidth('paper_name',crud.data,'管件描述')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="mass_per_unit_area" label="单位面积" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="demand_limit" label="客户需求抗拉下限" :min-width="flexWidth('demand_limit',crud.data,'客户需求抗拉下限')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="standard_limit" label="内控标准抗拉下线" :min-width="flexWidth('standard_limit',crud.data,'内控标准抗拉下线')" />

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

@@ -43,13 +43,12 @@
 
           <el-form-item label="业务类型">
             <el-select
-              v-model="query.bill_type"
+              v-model="query.bill_types"
               clearable
-              filterable
+              multiple
               size="mini"
               placeholder="业务类型"
               class="filter-item"
-              @change="crud.toQuery"
             >
               <el-option
                 v-for="item in dict.ST_INV_OUT_TYPE"
@@ -123,6 +122,9 @@
         <el-table-column show-overflow-tooltip prop="input_time" label="出库日期" :min-width="flexWidth('input_time',crud.data,'出库日期')" />
         <el-table-column show-overflow-tooltip prop="width" label="产品规格" :min-width="flexWidth('width',crud.data,'产品规格')" />
         <el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
+        <el-table-column show-overflow-tooltip prop="paper_type" label="管件类型" :min-width="flexWidth('paper_type',crud.data,'管件类型')" />
+        <el-table-column show-overflow-tooltip prop="paper_code" label="管件编码" :min-width="flexWidth('paper_code',crud.data,'管件编码')" />
+        <el-table-column show-overflow-tooltip prop="paper_name" label="管件描述" :min-width="flexWidth('paper_name',crud.data,'管件描述')" />
         <el-table-column show-overflow-tooltip prop="mass_per_unit_area" label="单位面积" :formatter="crud.formatNum2" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积')" />
         <el-table-column show-overflow-tooltip prop="input_optname" label="制单人" :min-width="flexWidth('input_optname',crud.data,'制单人')" />
         <el-table-column show-overflow-tooltip prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />