fix：一期子卷包装页面新增【是否入库】查询条件

lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.FileUtil;
@@ -57,9 +58,18 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
 
         // 子卷号 是否计划外子卷 sap批次 制造完成日期 入库日期 状态
 
+        String type = MapUtil.getStr(whereJson, "type");
 
         JSONObject map = new JSONObject();
-        map.put("flag", "1");
+
+        if (ObjectUtil.isEmpty(type)) {
+            map.put("flag", "1");
+        } else if (type.equals(IOSEnum.IS_NOTANDYES.code("是"))){
+            map.put("flag", "2");
+        } else if (type.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
+            map.put("flag", "3");
+        }
+
         if (ObjectUtil.isNotEmpty(material_code)) {
             map.put("material_code", "%" + material_code + "%");
         }

lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql

@@ -106,6 +106,130 @@
                     status = 输入.status
                 ENDOPTION
 
+            ENDSELECT
+        ENDPAGEQUERY
+    ENDIF
+
+	IF 输入.flag = "2"
+        PAGEQUERY
+            SELECT DISTINCT
+                sub.*
+            FROM
+                pdm_bi_subpackagerelation sub
+                INNER JOIN pdm_bi_subpackagerelationrecord record ON sub.container_name = record.container_name
+            WHERE
+                1=1
+
+                OPTION 输入.material_code <> ""
+                    sub.product_name LIKE 输入.material_code
+                ENDOPTION
+
+                OPTION 输入.package_box_sn <> ""
+                    sub.package_box_sn LIKE 输入.package_box_sn
+                ENDOPTION
+
+                OPTION 输入.material_name <> ""
+                    sub.product_description LIKE 输入.material_name
+                ENDOPTION
+
+                OPTION 输入.sale_order_name <> ""
+                    sub.sale_order_name LIKE 输入.sale_order_name
+                ENDOPTION
+
+                OPTION 输入.customer_name <> ""
+                    sub.customer_name LIKE 输入.customer_name
+                ENDOPTION
+
+                OPTION 输入.customer_description <> ""
+                    sub.customer_description LIKE 输入.customer_description
+                ENDOPTION
+
+                OPTION 输入.container_name <> ""
+                    sub.container_name LIKE 输入.container_name
+                ENDOPTION
+
+                OPTION 输入.sap_pcsn <> ""
+                    sub.sap_pcsn LIKE 输入.sap_pcsn
+                ENDOPTION
+
+                OPTION 输入.is_un_plan_production <> ""
+                    sub.is_un_plan_production = 输入.is_un_plan_production
+                ENDOPTION
+
+                OPTION 输入.date_of_production <> ""
+                    sub.date_of_production = 输入.date_of_production
+                ENDOPTION
+
+                OPTION 输入.date_of_FG_inbound <> ""
+                    sub.date_of_FG_inbound = 输入.date_of_FG_inbound
+                ENDOPTION
+
+                OPTION 输入.status <> ""
+                    sub.status = 输入.status
+                ENDOPTION
+
+            ENDSELECT
+        ENDPAGEQUERY
+    ENDIF
+
+	IF 输入.flag = "3"
+        PAGEQUERY
+            SELECT
+                sub.*
+            FROM
+                pdm_bi_subpackagerelation sub
+                LEFT JOIN pdm_bi_subpackagerelationrecord record ON sub.container_name = record.container_name
+            WHERE
+                IFNULL(record.bill_code,'') = ''
+
+                OPTION 输入.material_code <> ""
+                    sub.product_name LIKE 输入.material_code
+                ENDOPTION
+
+                OPTION 输入.package_box_sn <> ""
+                    sub.package_box_sn LIKE 输入.package_box_sn
+                ENDOPTION
+
+                OPTION 输入.material_name <> ""
+                    sub.product_description LIKE 输入.material_name
+                ENDOPTION
+
+                OPTION 输入.sale_order_name <> ""
+                    sub.sale_order_name LIKE 输入.sale_order_name
+                ENDOPTION
+
+                OPTION 输入.customer_name <> ""
+                    sub.customer_name LIKE 输入.customer_name
+                ENDOPTION
+
+                OPTION 输入.customer_description <> ""
+                    sub.customer_description LIKE 输入.customer_description
+                ENDOPTION
+
+                OPTION 输入.container_name <> ""
+                    sub.container_name LIKE 输入.container_name
+                ENDOPTION
+
+                OPTION 输入.sap_pcsn <> ""
+                    sub.sap_pcsn LIKE 输入.sap_pcsn
+                ENDOPTION
+
+                OPTION 输入.is_un_plan_production <> ""
+                    sub.is_un_plan_production = 输入.is_un_plan_production
+                ENDOPTION
+
+                OPTION 输入.date_of_production <> ""
+                    sub.date_of_production = 输入.date_of_production
+                ENDOPTION
+
+                OPTION 输入.date_of_FG_inbound <> ""
+                    sub.date_of_FG_inbound = 输入.date_of_FG_inbound
+                ENDOPTION
+
+                OPTION 输入.status <> ""
+                    sub.status = 输入.status
+                ENDOPTION
+
             ENDSELECT
         ENDPAGEQUERY
     ENDIF

lms/nladmin-ui/src/views/wms/pdm/bi/index.vue

@@ -143,6 +143,22 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="是否入过库">
+            <el-select
+              v-model="query.type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in typeList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <!--          <el-form-item label="满轴位状态">
             <el-select
               v-model="query.full_point_status"
@@ -645,7 +661,10 @@ export default {
         { 'label': '是', 'value': '1' },
         { 'label': '否', 'value': '0' }
       ],
-
+      typeList: [
+        { 'label': '是', 'value': '1' },
+        { 'label': '否', 'value': '0' }
+      ],
       rules: {
         customer_description: [
           { required: true, message: '客户名称不能为空', trigger: 'blur' }