diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java index ba45efe2..d27653e4 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java @@ -381,8 +381,11 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri logServer.deviceLogToacs(this.device_code, "", "", device_code + ":未找到对应路由"); throw new BadRequestException(this.device_code + ":未找到对应路由"); } + //link_device tw 满料位设备关联的设备tw String link_device = this.getDevice().getExtraValue().get("link_device_code").toString(); + //empty_device 满料位对应的空料位 String empty_device = this.getDevice().getExtraValue().get("empty_device_code").toString(); + //通过满料位设备关联的设备tw查找订单 ProduceshiftorderDto order = produceshiftorderService.findOrderByDeviceCode(link_device); //判断是否需要agv搬运 if (order.getIs_needmove().equals("0")){ @@ -402,8 +405,9 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri //遍历路由,找到对应所有的物料进行匹配 for (int i = 0; i < list.size(); i++) { RouteLineDto dto = list.get(i); - //找到路由对应工位 + //找到路由对应工位 清洗机设备编号 String route_device_code = dto.getNext_device_code(); + //根据清洗机设备编号获取清洗剂设备信息 Device route_link_device = deviceAppservice.findDeviceByCode(route_device_code); //找到路由工位对应设备 String route_link_device_code = (String)route_link_device.getExtraValue().get("link_device_code"); @@ -482,7 +486,6 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri if (StrUtil.equals(material,cpbh) && hailiangCleaningMachineStorageStationDeviceDriver.getSilo_weight() < maxWeight ){ clear_storage_device = route_link_device.getDevice_code(); //直接生成任务 - TaskDto onedto = new TaskDto(); String now = DateUtil.now(); onedto.setTask_id(IdUtil.simpleUUID()); @@ -508,9 +511,13 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri try { taskserver.create(onedto); + route_link_device.setMaterial(cpbh); + hailiangCleaningMachineStorageStationDeviceDriver.setMaterial(cpbh); flag = true; break; } catch (Exception e) { + route_link_device.setMaterial(""); + hailiangCleaningMachineStorageStationDeviceDriver.setMaterial(""); logServer.deviceLogToacs(this.device_code, "", "", device_code + ":创建任务失败," + String.valueOf(e.getMessage())); } logServer.deviceLogToacs(this.device_code, "", "", device_code + ":创建任务成功"); @@ -558,10 +565,12 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri taskserver.create(onedto); //将当前工单物料赋给对应的清洗路由工位 route_link_device.setMaterial(cpbh); + hailiangCleaningMachineStorageStationDeviceDriver.setMaterial(cpbh); flag = true; break; } catch (Exception e) { route_link_device.setMaterial(""); + hailiangCleaningMachineStorageStationDeviceDriver.setMaterial(""); logServer.deviceLogToacs(this.device_code, "", "", device_code + ":创建任务失败," + String.valueOf(e.getMessage())); } logServer.deviceLogToacs(this.device_code, "", "", device_code + ":创建任务成功");