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-21 16:22:37 +08:00
parent 843dc6bcad a57bb4b5cc
commit 5f8180b844
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
View File

@@ -102,7 +102,9 @@ public enum IOSEnum {
// 出库堆垛机点位
OUT_POINT(MapOf.of("1","CK2038", "2","CK2038", "3","CK2042", "4","CK2042" ,"5","CK2046",
"6","CK2046", "7","7", "8","8", "9","9", "10","10")),
// 出库堆垛机点位
OUT_POINT2(MapOf.of("1","CK2037", "2","CK2037", "3","CK2041", "4","CK2041" ,"5","CK2045",
"6","CK2045", "7","7", "8","8", "9","9", "10","10")),
// 出库发货等待点
OUT_FH_POINT(MapOf.of("1","B_FH01_0", "2","B_FH02_0", "3","B_FH03_0", "4","B_FH04_0" ,"5","B_FH05_0",
"6","B_FH06_0")),

32
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
View File

@@ -1614,7 +1614,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
String start_device_code = "";
// 是否自动下发
String is_auto_issue = IOSEnum.IS_SEND.code("是");
WQLObject paramTab = WQLObject.getWQLObject("sys_param");
JSONObject jsonParam = paramTab.query("code = 'one_or_two_struct'").uniqueResult(0);
String flag = "0";
if (ObjectUtil.isNotEmpty(jsonParam)) {
flag = jsonParam.getString("value");
}
for (int i = 0; i < taskMangeList.size(); i++) {
JSONObject json = taskMangeList.get(i);
@@ -1622,7 +1627,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
start_device_code = json.getString("struct_code");
// 确定终点： 根据仓位所在排确定终点
String end_device_code = IsEndCode(json);
String end_device_code = "";
if("1".equals(flag)){
end_device_code = IsEndCode2(json);
}else{
end_device_code = IsEndCode(json);
}
// 过滤此仓位的分配明细
List<StIvtIostorinvdis> disDaoList = disLikeList.stream()
@@ -1744,7 +1755,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
String start_device_code = "";
// 是否自动下发
String is_auto_issue = IOSEnum.IS_SEND.code("是");
WQLObject paramTab = WQLObject.getWQLObject("sys_param");
JSONObject jsonParam = paramTab.query("code = 'one_or_two_struct'").uniqueResult(0);
String flag = "0";
if (ObjectUtil.isNotEmpty(jsonParam)) {
flag = jsonParam.getString("value");
}
for (int i = 0; i < taskMangeList.size(); i++) {
JSONObject json = taskMangeList.get(i);
@@ -1754,7 +1771,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
start_device_code = json.getString("struct_code");
// 确定终点： 根据仓位所在排确定终点
String end_device_code = IsEndCode(json);
String end_device_code = "";
if("1".equals(flag)){
end_device_code = IsEndCode2(json);
}else{
end_device_code = IsEndCode(json);
}
// 过滤此仓位的分配明细
List<StIvtIostorinvdis> disDaoList = disLikeList.stream()
@@ -1854,7 +1876,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
private String IsEndCode(JSONObject structDao) {
return IOSEnum.OUT_POINT.code(structDao.getString("row_num"));
}
private String IsEndCode2(JSONObject structDao) {
return IOSEnum.OUT_POINT2.code(structDao.getString("row_num"));
}
/**
* 更新异常货位
* @param disDaoList：所有分配明细集合