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

更新

Browse Source
This commit is contained in:
gengby
2023-01-03 13:40:00 +08:00
parent 01348ffbfb
commit 65b64084ca
2 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java
View File

@@ -102,7 +102,7 @@ public class HandlingTask extends AbstractAcsTask {
KlzhcwUtil klzhcwUtil = SpringContextHolder.getBean(KlzhcwUtil.class);
//更新终点的库存
if (!StrUtil.equals(region_codeE, RegionTypeEnum.KLZHCQ.getCode())) {
MaterialbaseDto materialbaseDto = materialbaseService.findById(Long.parseLong(jsonTask.getString("material_id")));
MaterialbaseDto materialbaseDto = materialbaseService.findById(jsonTask.getLong("material_id"));
LinkedList<JSONObject> ll = MyLinkedListService.getLinkedList();
JSONObject param = new JSONObject();
param.put("vehicle_type", jsonTask.getString("vehicle_type"));
@@ -126,7 +126,7 @@ public class HandlingTask extends AbstractAcsTask {
//修改终点库存信息
jsonObject.put("vehicle_type", jsonTask.getString("vehicle_type"));
jsonObject.put("vehicle_code", jsonTask.getString("vehicle_code"));
jsonObject.put("material_id", jsonTask.getString("material_id"));
jsonObject.put("material_id", jsonTask.getLong("material_id"));
jsonObject.put("instorage_time", DateUtil.now());
ivtTab.update(jsonObject);
//解锁终点
@@ -136,6 +136,45 @@ public class HandlingTask extends AbstractAcsTask {
jsonEnd.put("update_time", DateUtil.now());
pointTab.update(jsonEnd);
}
} else if (StrUtil.equals(region_codeS, RegionTypeEnum.KLZHCQ.getCode()) && StrUtil.equals(region_codeE, RegionTypeEnum.GT1.getCode())) {
MaterialbaseServiceImpl materialbaseService = SpringContextHolder.getBean(MaterialbaseServiceImpl.class);
KlzhcwUtil klzhcwUtil = SpringContextHolder.getBean(KlzhcwUtil.class);
MaterialbaseDto materialbaseDto = materialbaseService.findById(ivtStart.getLong("material_id"));
LinkedList<JSONObject> ll = MyLinkedListService.getLinkedList();
JSONObject param = new JSONObject();
param.put("vehicle_type", ivtStart.getString("vehicle_type"));
param.put("vehicle_code", ivtStart.getString("vehicle_code"));
if (ObjectUtil.isNotEmpty(materialbaseDto)) {
param.put("material_code", materialbaseDto.getMaterial_code());
}
boolean flag = klzhcwUtil.judge(ll, param);
if (flag) {
jsonEnd.put("lock_type", "1");
jsonEnd.put("task_id", "");
jsonEnd.put("vehicle_type", "");
jsonEnd.put("vehicle_code", "");
jsonEnd.put("material_id", "");
jsonEnd.put("point_status", "1");
jsonEnd.put("update_time", DateUtil.now());
pointTab.update(jsonEnd);
}
//修改起点库存
ivtStart.put("vehicle_type", "");
ivtStart.put("vehicle_code", "");
ivtStart.put("material_id", "");
ivtStart.put("instorage_time", DateUtil.now());
ivtTab.update(ivtStart);
//解锁起点
jsonStart.put("lock_type", "1");
jsonStart.put("point_status", "1");
jsonStart.put("task_id", "");
jsonStart.put("vehicle_type", "");
jsonStart.put("vehicle_code", "");
jsonStart.put("material_id", "");
jsonStart.put("update_time", DateUtil.now());
pointTab.update(jsonStart);
} else if (StrUtil.equals(region_codeE, RegionTypeEnum.YLJQ.getCode())) {
//修改起点库存
ivtStart.put("vehicle_type", "");