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

更新

Browse Source
This commit is contained in:
gengby
2022-07-23 12:47:24 +08:00
parent 8d124c4ad2
commit cb301f3499
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java
View File

@@ -426,6 +426,7 @@ public class StandardEmptyPalletSiteDeviceDriver extends AbstractOpcDeviceDriver
dto.setVehicle_type(container_type); dto.setVehicle_type(container_type);
String taskcode = CodeUtil.getNewCode("TASK_NO"); String taskcode = CodeUtil.getNewCode("TASK_NO");
dto.setTask_code("-" + taskcode); dto.setTask_code("-" + taskcode);
dto.setMaterial(this.getDevice().getMaterial_type());
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("101");
dto.setUpdate_time(now); dto.setUpdate_time(now);

2
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -499,6 +499,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
dto.setTask_code("-" + taskcode); dto.setTask_code("-" + taskcode);
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("101");
dto.setMaterial(this.getDevice().getMaterial_type());
dto.setUpdate_time(now); dto.setUpdate_time(now);
dto.setCreate_time(now); dto.setCreate_time(now);
dto.setStart_device_code(start_device_code); 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.setStart_point_code(start_device_code);
dto.setNext_device_code(next_device_code); dto.setNext_device_code(next_device_code);
dto.setNext_point_code(next_device_code); dto.setNext_point_code(next_device_code);
dto.setMaterial(route_link_device.getMaterial_type());
try { try {
//判断是否已经有该起点设备的任务,如果有就结束循环 //判断是否已经有该起点设备的任务,如果有就结束循环
int num2 = taskserver.querySameOriginTask(start_device_code); int num2 = taskserver.querySameOriginTask(start_device_code);

9
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -209,7 +209,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
if (StrUtil.isEmpty(next_device_code)) { if (StrUtil.isEmpty(next_device_code)) {
throw new RuntimeException("该设备未找到对应路由"); throw new RuntimeException("该设备未找到对应路由");
} }
dto.setMaterial(this.getDevice().getMaterial_type());
dto.setNext_point_code(next_device_code); dto.setNext_point_code(next_device_code);
dto.setUpdate_time(now); dto.setUpdate_time(now);
dto.setCreate_time(now); dto.setCreate_time(now);
@@ -296,7 +296,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
dto.setNext_point_code(next_device_code); dto.setNext_point_code(next_device_code);
dto.setUpdate_time(now); dto.setUpdate_time(now);
dto.setCreate_time(now); dto.setCreate_time(now);
dto.setMaterial(material); dto.setMaterial(this.getDevice().getMaterial_type());
try { try {
taskserver.create(dto); taskserver.create(dto);
} catch (Exception e) { } catch (Exception e) {
@@ -343,7 +343,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
dto.setNext_point_code(next_device_codecode); dto.setNext_point_code(next_device_codecode);
dto.setUpdate_time(now); dto.setUpdate_time(now);
dto.setCreate_time(now); dto.setCreate_time(now);
dto.setMaterial(this.getDevice().getMaterial_type());
try { try {
taskserver.create(dto); taskserver.create(dto);
} catch (Exception e) { } catch (Exception e) {
@@ -382,7 +382,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
dto.setTask_code("-" + taskcode); dto.setTask_code("-" + taskcode);
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("101");
dto.setMaterial(this.getMaterial()); dto.setMaterial(this.getDevice().getMaterial_type());
dto.setQuantity(new BigDecimal(this.getQty())); dto.setQuantity(new BigDecimal(this.getQty()));
RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
String next_device_codecode = jo.getNext_device_code(); String next_device_codecode = jo.getNext_device_code();
@@ -399,6 +399,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
standardOrdinarySiteDeviceDriver.setPurpose(null); standardOrdinarySiteDeviceDriver.setPurpose(null);
standardOrdinarySiteDeviceDriver.setRemark(null); standardOrdinarySiteDeviceDriver.setRemark(null);
} }
dto.setMaterial(this.getDevice().getMaterial_type());
dto.setNext_point_code(purpose); dto.setNext_point_code(purpose);
dto.setNext_device_code(purpose); dto.setNext_device_code(purpose);
dto.setUpdate_time(now); dto.setUpdate_time(now);