diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
index 704e33975..158230d57 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
+++ b/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 + "%");
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
index 5af6965da..ed3abca8d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
+++ b/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
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/AUTO01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/AUTO01.wql
index 3c740af3a..0fe2cd41c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/AUTO01.wql
+++ b/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"
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql
index d316aab64..5f4aa1e13 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql
+++ b/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
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
index 1c23b4249..b3ed8ec6f 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
@@ -193,6 +193,25 @@
/>
+
+
+
+
+
+
@@ -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: {
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
index 7f2c98f93..31f0c1958 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -57,6 +57,7 @@
>