root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_1' into master_1

Browse Source
This commit is contained in:
liyongde
2025-04-17 12:12:48 +08:00
parent 83bcb92bc9 d27446b48f
commit 8b5bfab361
7 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
@@ -66,6 +67,7 @@ public class StructivtServiceImpl implements StructivtService {
map.put("ivt_status", ivt_status);
map.put("is_virtual", is_virtual);
map.put("sub_type", sub_type);
map.put("control", control);
map.put("quality_scode", quality_scode);
if (StrUtil.isNotEmpty(material)) {
map.put("material", "%" + material + "%");
@@ -299,6 +301,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", "2");
map.put("stor_id", stor_id);
@@ -307,6 +310,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 + "%");
}
@@ -406,6 +410,7 @@ public class StructivtServiceImpl implements StructivtService {
} else {
mp.put("超期原因", "");
}
mp.put("是否管控", json.getString("lock_type").equals("88") ? "是" : "否");
mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel"));
mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox"));
mp.put("客户要求规格幅宽", json.getString("width_standard"));

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

@@ -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
@@ -429,6 +437,7 @@
attr.sect_code,
attr.sect_name,
attr.stor_name,
attr.lock_type,
attr.storagevehicle_code,
mater.material_code,
mater.material_name,
@@ -482,6 +491,12 @@
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 md_cs_customerbase cust ON cust.cust_code = sub.customer_name

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

@@ -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"

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

@@ -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

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

@@ -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: {

6
lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue
View File

@@ -293,6 +293,12 @@ export default {
return
}
this.form.open_type = this.openType
if (this.openType === '0' || this.openType === '1') {
if (this.form.remark === '') {
this.crud.notify('备注不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
}
crudControl.addSubmit(this.form).then(res => {
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()

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

@@ -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"