diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java index 96e97c621..f0817762d 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; +import org.nl.common.utils.RedisUtils; import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt; @@ -18,6 +19,7 @@ import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.AbstractTask; +import org.nl.wms.sch.task_manage.AcsTaskDto; import org.nl.wms.sch.task_manage.TaskStatus; import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition; import org.nl.wms.sch.task_manage.core.enums.TaskFinishedTypeEnum; @@ -49,6 +51,8 @@ public class AutoInHotTrussTask extends AbstractTask { private IstIvtHotpointivtService hotpointivtService; @Autowired private ISchBaseTaskService taskService; + @Autowired + private RedisUtils redisUtils; @Override public void create() throws BadRequestException { @@ -84,19 +88,21 @@ public class AutoInHotTrussTask extends AbstractTask { // 查找合适温度的点位 for (StIvtHotpointivt hxPoint : hotList) { String pointCode = hxPoint.getPoint_code(); -// String pointTemperature = (String) redisUtils.hget(pointCode, "temperature"); -// if (ObjectUtil.isNotEmpty(pointTemperature)) { -// if (pointTemperature.equals(bakingTemperature)) { -// task.setPoint_code2(hotPoint.getPoint_code()); -// break; -// } -// } + String pointTemperature = (String) redisUtils.hget(pointCode, "temperature"); + if (ObjectUtil.isNotEmpty(pointTemperature)) { + if (pointTemperature.equals(bakingTemperature)) { + task.setPoint_code2(pointCode); + break; + } + } // 临时测试 - task.setPoint_code2(hxPoint.getPoint_code()); +// task.setPoint_code2(hxPoint.getPoint_code()); break; } JSONObject param = new JSONObject(); param.put("workorder_id", workOrderId); + param.put("baking_temperature", bakingTemperature); + param.put("baking_time", order.getBaking_time()); task.setPoint_code1(bakingDto.getPoint_code()); task.setVehicle_code(bakingDto.getVehicle_code()); task.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr()); @@ -115,6 +121,15 @@ public class AutoInHotTrussTask extends AbstractTask { return null; } + @Override + public void deliveryBeforeProcessing(SchBaseTask task, AcsTaskDto acsTaskDto) { + JSONObject param = JSONObject.parseObject(task.getRequest_param()); + String bakingTemperature = param.getString("baking_temperature"); + String bakingTime = param.getString("baking_time"); + acsTaskDto.setOven_time(bakingTime); + acsTaskDto.setTemperature(bakingTemperature); + } + /** * 校验工单是否满足 * @param order 工单 diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java index 91e6b7c97..75de31be2 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java @@ -16,6 +16,7 @@ import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.AbstractTask; +import org.nl.wms.sch.task_manage.AcsTaskDto; import org.nl.wms.sch.task_manage.TaskStatus; import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition; import org.nl.wms.sch.task_manage.core.enums.TaskFinishedTypeEnum; @@ -72,23 +73,23 @@ public class InHotTrussTask extends AbstractTask { if (GeneralDefinition.YES.equals(order.getIs_baking())) { String bakingTemperature = order.getBaking_temperature(); - requestObj.put("temperature", bakingTemperature); - requestObj.put("time", order.getBaking_time()); + requestObj.put("baking_temperature", bakingTemperature); + requestObj.put("baking_time", order.getBaking_time()); // 如果需要烘烤, 先找对应点 List hotList = hotpointivtService.getNotTaskHotOven(order.getRoll_type(), "1"); if (hotList.size() > 0) { // 查找合适温度的点位 for (StIvtHotpointivt hotPoint : hotList) { String pointCode = hotPoint.getPoint_code(); -// String pointTemperature = (String) redisUtils.hget(pointCode, "temperature"); -// if (ObjectUtil.isNotEmpty(pointTemperature)) { -// if (pointTemperature.equals(bakingTemperature)) { -// task.setPoint_code2(hotPoint.getPoint_code()); -// break; -// } -// } + String pointTemperature = (String) redisUtils.hget(pointCode, "temperature"); + if (ObjectUtil.isNotEmpty(pointTemperature)) { + if (pointTemperature.equals(bakingTemperature)) { + task.setPoint_code2(pointCode); + break; + } + } // 临时测试 - task.setPoint_code2(hotPoint.getPoint_code()); +// task.setPoint_code2(hotPoint.getPoint_code()); break; } } @@ -188,4 +189,13 @@ public class InHotTrussTask extends AbstractTask { TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); } + + @Override + public void deliveryBeforeProcessing(SchBaseTask task, AcsTaskDto acsTaskDto) { + JSONObject param = JSONObject.parseObject(task.getRequest_param()); + String bakingTemperature = param.getString("baking_temperature"); + String bakingTime = param.getString("baking_time"); + acsTaskDto.setOven_time(bakingTime); + acsTaskDto.setTemperature(bakingTemperature); + } }