diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java index 26e118d65..5be27bdd2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java @@ -427,6 +427,22 @@ public class FeedingServiceImpl implements FeedingService { task_jo.put("point_code2", pointArr.getString("point_code")); + // 2.找冷却区空货位 + JSONObject cool_map = new JSONObject(); + cool_map.put("flag", "2"); + cool_map.put("product_area", cool_jo.getString("product_area")); + cool_map.put("point_location", "0"); + + JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(cool_map).process().uniqueResult(0); + // 如果为空 + if (ObjectUtil.isEmpty(jsonCooIvt)) { + cool_map.put("point_location", "1"); + jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(cool_map).process().uniqueResult(0); + } + if (ObjectUtil.isEmpty(jsonCooIvt)) { + throw new BadRequestException("冷却区空位不足"); + } + //将分切机的点位作为目的点,桁架任务完成时,自动创建AGV任务 task_jo.put("point_code3", next_point_code); task_jo.put("material_code", cool_jo.getString("container_name")); diff --git a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue index bb2d0ffd6..5b8f17409 100644 --- a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue +++ b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue @@ -33,7 +33,7 @@ -
+
- - - + + +
@@ -83,10 +83,10 @@
- + 报警: - + {{ agvObj.fault }}