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

多个固化室之间互相异常不影响

Browse Source
This commit is contained in:
psh
2024-06-21 14:50:52 +08:00
parent 7733485ea2
commit 9166305707
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
View File

@@ -77,19 +77,23 @@ public class GHCMLTask extends AbstractTask {
List<SchBasePoint> ghsExitList = autoMapper.getGHSExitMaterialList(); List<SchBasePoint> ghsExitList = autoMapper.getGHSExitMaterialList();
AbstractTask task = taskFactory.getTask(TASK_CONFIG_CODE); AbstractTask task = taskFactory.getTask(TASK_CONFIG_CODE);
ghsExitList.forEach(point -> { ghsExitList.forEach(point -> {
JSONObject param = new JSONObject(); try {
param.put("config_code", TASK_CONFIG_CODE); JSONObject param = new JSONObject();
param.put("requestNo", "LMS" + IdUtil.simpleUUID()); param.put("config_code", TASK_CONFIG_CODE);
param.put("device_code", point.getPoint_code()); param.put("requestNo", "LMS" + IdUtil.simpleUUID());
param.put("vehicle_code", point.getVehicle_code()); param.put("device_code", point.getPoint_code());
param.put("vehicle_type", point.getVehicle_type()); param.put("vehicle_code", point.getVehicle_code());
param.put("create_mode", GeneralDefinition.AUTO_CREATION); param.put("vehicle_type", point.getVehicle_type());
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getVehicleGroupInfo( param.put("create_mode", GeneralDefinition.AUTO_CREATION);
point.getVehicle_code(), SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getVehicleGroupInfo(
point.getVehicle_type(), point.getVehicle_code(),
GroupBindMaterialStatusEnum.BOUND.getValue()); point.getVehicle_type(),
param.put("material_id", groupInfo.getMaterial_id()); GroupBindMaterialStatusEnum.BOUND.getValue());
task.apply(param); param.put("material_id", groupInfo.getMaterial_id());
task.apply(param);
} catch (Exception e) {
log.error("{}创建任务失败{}{}", this.TASK_CONFIG_CODE, e, e.getMessage());
}
}); });
} }
@@ -307,7 +311,7 @@ public class GHCMLTask extends AbstractTask {
// throw new BadRequestException("找不到任务：[" + task_id + "]等待点!"); // throw new BadRequestException("找不到任务：[" + task_id + "]等待点!");
// } // }
if (!"DDD".equals(task.getPoint_code2())) { if (!"DDD".equals(task.getPoint_code2())) {
log.info("任务号{}已请求过二次分配，直接返回已分配地址{}",task_id,task.getPoint_code2()); log.info("任务号{}已请求过二次分配，直接返回已分配地址{}", task_id, task.getPoint_code2());
return task.getPoint_code2(); return task.getPoint_code2();
} }
// SchBasePoint waitPointObj = pointService.getById(waitPoint); // SchBasePoint waitPointObj = pointService.getById(waitPoint);

16
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCQLTask.java
View File

@@ -76,12 +76,16 @@ public class GHCQLTask extends AbstractTask {
List<SchBasePoint> ghsExitList = autoMapper.getGHSExitAvailableList(); List<SchBasePoint> ghsExitList = autoMapper.getGHSExitAvailableList();
AbstractTask task = taskFactory.getTask(TASK_CONFIG_CODE); AbstractTask task = taskFactory.getTask(TASK_CONFIG_CODE);
ghsExitList.forEach(point -> { ghsExitList.forEach(point -> {
JSONObject param = new JSONObject(); try {
param.put("config_code", TASK_CONFIG_CODE); JSONObject param = new JSONObject();
param.put("requestNo", "LMS" + IdUtil.simpleUUID()); param.put("config_code", TASK_CONFIG_CODE);
param.put("device_code", point.getPoint_code()); param.put("requestNo", "LMS" + IdUtil.simpleUUID());
param.put("create_mode", GeneralDefinition.AUTO_CREATION); param.put("device_code", point.getPoint_code());
task.apply(param); param.put("create_mode", GeneralDefinition.AUTO_CREATION);
task.apply(param);
}catch (Exception e){
log.error("{}创建任务失败{}{}",this.TASK_CONFIG_CODE,e,e.getMessage());
}
}); });
} }