rev:1.推送区域库存不查询管控的库存2.成品库存增加是否管控查询条件3.出库单新增不允许新增管控出库类型的出库单

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

@@ -59,6 +59,7 @@ public class StructivtServiceImpl implements StructivtService {
         String is_virtual = MapUtil.getStr(whereJson, "is_virtual");
         String sub_type = MapUtil.getStr(whereJson, "sub_type");
         String quality_scode = MapUtil.getStr(whereJson, "quality_scode");
+        String control = MapUtil.getStr(whereJson, "control");
         JSONObject map = new JSONObject();
         map.put("flag", "1");
         map.put("stor_id", stor_id);
@@ -67,6 +68,7 @@ public class StructivtServiceImpl implements StructivtService {
         map.put("is_virtual", is_virtual);
         map.put("sub_type", sub_type);
         map.put("quality_scode", quality_scode);
+        map.put("control", control);
         if (StrUtil.isNotEmpty(material)) {
             map.put("material", "%" + material + "%");
         }

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

@@ -29,6 +29,7 @@
 	输入.in_stor_id					        TYPEAS f_string
 	输入.sub_type					        TYPEAS s_string
 	输入.quality_scode					    TYPEAS s_string
+    输入.control                             TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -148,6 +149,13 @@
                          OPTION 输入.ivt_status = "frozen_qty"
                             StructIvt.frozen_qty > 0
                          ENDOPTION
+                         OPTION 输入.control = "0"
+                            attr.lock_type <> '88'
+                         ENDOPTION
+                         OPTION 输入.control = "1"
+                            attr.lock_type = '88'
+                         ENDOPTION
+
                        ) ivt
                         LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND ivt.storagevehicle_code = sub.package_box_sn
                         LEFT JOIN (SELECT

lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/AUTO01.wql

@@ -52,6 +52,7 @@
                 INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
            WHERE
                ivt.canuse_qty > '0'
+               AND attr.lock_type <> '88'
                AND cust.cust_name in 输入.cust_name_in
                AND DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) < "15"
 
@@ -73,6 +74,7 @@
                 INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
            WHERE
                ivt.canuse_qty > '0'
+               AND attr.lock_type <> '88'
                AND cust.cust_name in 输入.cust_name_in
                AND (
                     DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) >= "15"
@@ -96,6 +98,7 @@
                 INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
            WHERE
                ivt.canuse_qty > '0'
+               AND attr.lock_type <> '88'
                AND cust.cust_name in 输入.cust_name_in
                AND (
                     DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) >= "31"
@@ -120,6 +123,7 @@
                 INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
            WHERE
                ivt.canuse_qty > '0'
+               AND attr.lock_type <> '88'
                AND cust.cust_name in 输入.cust_name_in
                AND (
                     DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) >= "61"
@@ -144,6 +148,7 @@
                 INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
            WHERE
                ivt.canuse_qty > '0'
+               AND attr.lock_type <> '88'
                AND cust.cust_name in 输入.cust_name_in
                AND DATEDIFF( NOW(), LEFT(ivt.instorage_time,10) ) > "90"
 

lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql

@@ -69,6 +69,7 @@
              INNER JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
          WHERE
             ivt.canuse_qty > '0'
+            AND attr.lock_type <> '88'
             AND cust.cust_code in 输入.cust_code_in
 
             GROUP BY cust.cust_code

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

@@ -193,6 +193,25 @@
               />
             </el-select>
           </el-form-item>
+
+          <el-form-item label="是否管控">
+            <el-select
+              v-model="query.control"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 200px;"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -379,6 +398,7 @@ export default {
       this.sects = res.content
     })
     this.crud.query.ivt_status = 'canuse_qty'
+    this.crud.query.control = '0'
     this.crud.toQuery()
   },
   methods: {

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

@@ -57,6 +57,7 @@
         >
           <el-option
             v-for="item in dict.ST_INV_OUT_TYPE"
+            :disabled="item.value === '1099'"
             :key="item.value"
             :label="item.label"
             :value="item.value"