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

同上

Browse Source
This commit is contained in:
张江玮
2022-12-06 18:14:09 +08:00
parent aa67abac7b
commit 8fdb2e5abb
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -777,6 +777,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
jo.put("hasGoodStatus", "0"); jo.put("hasGoodStatus", "0");
jo.put("material_type", ""); jo.put("material_type", "");
jo.put("batch", ""); jo.put("batch", "");
jo.put("model", "");
jo.put("process", "");
jo.put("weight", "");
jo.put("qc_status", "");
jo.put("date", "");
jo.put("operation_by", "");
deviceService.changeDeviceStatus(jo); deviceService.changeDeviceStatus(jo);
JSONObject jo1 = new JSONObject(); JSONObject jo1 = new JSONObject();
@@ -785,6 +791,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
jo1.put("material_type", dto.getMaterial()); jo1.put("material_type", dto.getMaterial());
jo1.put("batch", dto.getBatch()); jo1.put("batch", dto.getBatch());
jo1.put("vehicle_code", dto.getVehicle_code()); jo1.put("vehicle_code", dto.getVehicle_code());
Device start_device = appService.findDeviceByCode(dto.getStart_point_code());
jo1.put("model", start_device.getModel());
jo1.put("process", start_device.getProcess());
jo1.put("weight", start_device.getWeight());
jo1.put("qc_status", start_device.getQc_status());
jo1.put("date", start_device.getDate());
jo1.put("operation_by", start_device.getOperation_by());
deviceService.changeDeviceStatus(jo1); deviceService.changeDeviceStatus(jo1);
LampThreecolorDeviceDriver lampThreecolorDeviceDriver; LampThreecolorDeviceDriver lampThreecolorDeviceDriver;