同上

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

@@ -777,6 +777,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         jo.put("hasGoodStatus", "0");
         jo.put("material_type", "");
         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);
 
         JSONObject jo1 = new JSONObject();
@@ -785,6 +791,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         jo1.put("material_type", dto.getMaterial());
         jo1.put("batch", dto.getBatch());
         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);
         LampThreecolorDeviceDriver lampThreecolorDeviceDriver;