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

Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2025-04-17 12:36:23 +08:00
parent b2cd97fb9e 47f49549f3
commit 4d9d432e4c
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java
View File

@@ -111,6 +111,12 @@ public class TrussCallAirShaftTask extends AbstractAcsTask {
} }
TaskUtils.updateOptMessageByBCutPoint(startPointObj); TaskUtils.updateOptMessageByBCutPoint(startPointObj);
bcutpointivtService.updateById(startPointObj); bcutpointivtService.updateById(startPointObj);
// 终点设置有轴
LambdaUpdateWrapper<BstIvtShafttubeivt> shaftLamUpdate = new LambdaUpdateWrapper<>();
shaftLamUpdate.set(BstIvtShafttubeivt::getHave_qzz, SlitterConstant.SLITTER_YES)
.set(BstIvtShafttubeivt::getUpdate_time, DateUtil.now())
.eq(BstIvtShafttubeivt::getPoint_code, task.getPoint_code2());
shafttubeivtService.update(shaftLamUpdate);
} }
// 取消 // 取消
if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {

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

@@ -227,6 +227,7 @@ public class StructivtServiceImpl implements StructivtService {
String is_virtual = MapUtil.getStr(whereJson, "is_virtual"); String is_virtual = MapUtil.getStr(whereJson, "is_virtual");
String sub_type = MapUtil.getStr(whereJson, "sub_type"); String sub_type = MapUtil.getStr(whereJson, "sub_type");
String quality_scode = MapUtil.getStr(whereJson, "quality_scode"); String quality_scode = MapUtil.getStr(whereJson, "quality_scode");
String control = MapUtil.getStr(whereJson, "control");
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("flag", "2"); map.put("flag", "2");
map.put("stor_id", stor_id); map.put("stor_id", stor_id);
@@ -235,6 +236,7 @@ public class StructivtServiceImpl implements StructivtService {
map.put("is_virtual", is_virtual); map.put("is_virtual", is_virtual);
map.put("sub_type", sub_type); map.put("sub_type", sub_type);
map.put("quality_scode", quality_scode); map.put("quality_scode", quality_scode);
map.put("control", control);
if (StrUtil.isNotEmpty(material)) { if (StrUtil.isNotEmpty(material)) {
map.put("material", "%" + material + "%"); map.put("material", "%" + material + "%");
} }
@@ -334,6 +336,7 @@ public class StructivtServiceImpl implements StructivtService {
} else { } else {
mp.put("超期原因", ""); mp.put("超期原因", "");
} }
mp.put("是否管控", json.getString("lock_type").equals("88") ? "是" : "否");
mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel")); mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel"));
mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox")); mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox"));
mp.put("客户要求规格幅宽", json.getString("width_standard")); mp.put("客户要求规格幅宽", json.getString("width_standard"));

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

@@ -277,6 +277,7 @@
attr.sect_code, attr.sect_code,
attr.sect_name, attr.sect_name,
attr.stor_name, attr.stor_name,
attr.lock_type,
attr.storagevehicle_code, attr.storagevehicle_code,
mater.material_code, mater.material_code,
mater.material_name, mater.material_name,
@@ -330,6 +331,12 @@
OPTION 输入.ivt_status = "frozen_qty" OPTION 输入.ivt_status = "frozen_qty"
StructIvt.frozen_qty > 0 StructIvt.frozen_qty > 0
ENDOPTION ENDOPTION
OPTION 输入.control = "0"
attr.lock_type <> '88'
ENDOPTION
OPTION 输入.control = "1"
attr.lock_type = '88'
ENDOPTION
) ivt ) ivt
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND ivt.storagevehicle_code = sub.package_box_sn 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 LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name