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

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

Browse Source
This commit is contained in:
liyongde
2024-07-24 15:31:56 +08:00
parent 8f70ad21e4 cf1ec61e51
commit d0674f6ffb
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java
View File

@@ -112,16 +112,25 @@ public class TwoOutHeapTask extends AbstractAcsTask {
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
taskTab.update(jsonTask); taskTab.update(jsonTask);
// 下发桁架任务：捆扎 // 如果是异常出库口则不需要下发行架任务
JSONObject jsonParam = new JSONObject(); if (jsonTask.getString("point_code2").equals(IOSEnum.EXCEP_OUT.code("异常出库口"))) {
jsonParam.put("device_code", jsonTask.getString("point_code2")); // 解绑托盘对应关系
jsonParam.put("vehicle_code", jsonTask.getString("vehicle_code")); WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
jsonParam.put("task_group_id", jsonTask.getString("task_group_id")); JSONObject ext_jo = veExtTab.query("pcsn = '" + jsonTask.getString("vehicle_code") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(ext_jo)) {
LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class); ext_jo.put("pcsn", "");
bean1.createLashTask(jsonParam); veExtTab.update(ext_jo);
}
} else {
// 下发桁架任务：捆扎
JSONObject jsonParam = new JSONObject();
jsonParam.put("device_code", jsonTask.getString("point_code2"));
jsonParam.put("vehicle_code", jsonTask.getString("vehicle_code"));
jsonParam.put("task_group_id", jsonTask.getString("task_group_id"));
LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
bean1.createLashTask(jsonParam);
}
} }
} }

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

@@ -115,6 +115,9 @@ public enum IOSEnum {
// acs外部系统用户 // acs外部系统用户
EXT_ACS(MapOf.of("acs", "2","kc","康成")), EXT_ACS(MapOf.of("acs", "2","kc","康成")),
// 异常出库口
EXCEP_OUT(MapOf.of("异常出库口", "CK2001")),
; ;
private Map<String, String> code; private Map<String, String> code;

16
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
View File

@@ -27,6 +27,7 @@ import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -230,15 +231,20 @@ public class LashManageServiceImpl implements LashManageService {
Map<String, List<JSONObject>> groupPointMap = executeArr.stream() Map<String, List<JSONObject>> groupPointMap = executeArr.stream()
.collect(Collectors.groupingBy(row -> row.getString("point_code2"))); .collect(Collectors.groupingBy(row -> row.getString("point_code2")));
// 终点 // 终点: 如果是异常口则直接生成到异常口的任务
String next_device_code = IOSEnum.OUT_HANGER.code("行架位1"); String next_device_code = IOSEnum.OUT_HANGER.code("行架位1");
List<JSONObject> heapOne = Optional.ofNullable(groupPointMap.get(IOSEnum.OUT_HANGER.code("行架位1"))).orElse(new ArrayList<>()); String TWO_EXCEP = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("TWO_EXCEP").getValue();
List<JSONObject> heapTwo = Optional.ofNullable(groupPointMap.get(IOSEnum.OUT_HANGER.code("行架位2"))).orElse(new ArrayList<>()); if (TWO_EXCEP.equals(IOSEnum.IS_NOTANDYES.code("是"))) {
next_device_code = IOSEnum.EXCEP_OUT.code("异常出库口");
} else {
List<JSONObject> heapOne = Optional.ofNullable(groupPointMap.get(IOSEnum.OUT_HANGER.code("行架位1"))).orElse(new ArrayList<>());
List<JSONObject> heapTwo = Optional.ofNullable(groupPointMap.get(IOSEnum.OUT_HANGER.code("行架位2"))).orElse(new ArrayList<>());
if (heapOne.size() > heapTwo.size()) { if (heapOne.size() > heapTwo.size()) {
next_device_code = IOSEnum.OUT_HANGER.code("行架位2"); next_device_code = IOSEnum.OUT_HANGER.code("行架位2");
}
} }
// 查询木箱对应的载具 // 查询木箱对应的载具