diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java index 6e78953..0579446 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java @@ -426,6 +426,7 @@ public class StandardEmptyPalletSiteDeviceDriver extends AbstractOpcDeviceDriver dto.setVehicle_type(container_type); String taskcode = CodeUtil.getNewCode("TASK_NO"); dto.setTask_code("-" + taskcode); + dto.setMaterial(this.getDevice().getMaterial_type()); dto.setTask_status("0"); dto.setPriority("101"); dto.setUpdate_time(now); diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index ecefce6..917354f 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -499,6 +499,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp dto.setTask_code("-" + taskcode); dto.setTask_status("0"); dto.setPriority("101"); + dto.setMaterial(this.getDevice().getMaterial_type()); dto.setUpdate_time(now); dto.setCreate_time(now); dto.setStart_device_code(start_device_code); @@ -610,6 +611,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp dto.setStart_point_code(start_device_code); dto.setNext_device_code(next_device_code); dto.setNext_point_code(next_device_code); + dto.setMaterial(route_link_device.getMaterial_type()); try { //判断是否已经有该起点设备的任务,如果有就结束循环 int num2 = taskserver.querySameOriginTask(start_device_code); diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index fb5aac5..7c2248f 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -209,7 +209,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple if (StrUtil.isEmpty(next_device_code)) { throw new RuntimeException("该设备未找到对应路由"); } - + dto.setMaterial(this.getDevice().getMaterial_type()); dto.setNext_point_code(next_device_code); dto.setUpdate_time(now); dto.setCreate_time(now); @@ -296,7 +296,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple dto.setNext_point_code(next_device_code); dto.setUpdate_time(now); dto.setCreate_time(now); - dto.setMaterial(material); + dto.setMaterial(this.getDevice().getMaterial_type()); try { taskserver.create(dto); } catch (Exception e) { @@ -343,7 +343,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple dto.setNext_point_code(next_device_codecode); dto.setUpdate_time(now); dto.setCreate_time(now); - + dto.setMaterial(this.getDevice().getMaterial_type()); try { taskserver.create(dto); } catch (Exception e) { @@ -382,7 +382,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple dto.setTask_code("-" + taskcode); dto.setTask_status("0"); dto.setPriority("101"); - dto.setMaterial(this.getMaterial()); + dto.setMaterial(this.getDevice().getMaterial_type()); dto.setQuantity(new BigDecimal(this.getQty())); RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); String next_device_codecode = jo.getNext_device_code(); @@ -399,6 +399,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple standardOrdinarySiteDeviceDriver.setPurpose(null); standardOrdinarySiteDeviceDriver.setRemark(null); } + dto.setMaterial(this.getDevice().getMaterial_type()); dto.setNext_point_code(purpose); dto.setNext_device_code(purpose); dto.setUpdate_time(now);