任务完成后修改起点终点的状态

hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@@ -1010,6 +1010,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
                 device.setQuantity(quantity);
                 device.setBatch(batch);
                 device.setIslock(islock);
+                device.setModel(model);
+                device.setProcess(process);
+                device.setWeight(weight);
+                device.setQc_status(qc_status);
+                device.setDate(date);
+                device.setOperation_by(operation_by);
                 JSONObject updatejson = JSONObject.fromObject(obj);
                 runpointwo.update(updatejson, "device_code = '" + device_code + "'");
             }
@@ -1034,6 +1040,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
                 device.setMaterial_type(material_type);
                 device.setBatch(batch);
                 device.setIslock(islock);
+                device.setModel(model);
+                device.setProcess(process);
+                device.setWeight(weight);
+                device.setQc_status(qc_status);
+                device.setDate(date);
+                device.setOperation_by(operation_by);
                 JSONObject updatejson = JSONObject.fromObject(obj);
                 runpointwo.update(updatejson, "device_code = '" + device_code + "'");
             }

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

@@ -675,6 +675,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         jo1.put("batch", startdevice.getBatch());
         jo1.put("vehicle_code", entity.getVehicle_code());
         jo1.put("islock", "false");
+        jo1.put("model", startdevice.getModel());
+        jo1.put("process", startdevice.getProcess());
+        jo1.put("weight", startdevice.getWeight());
+        jo1.put("qc_status", startdevice.getQc_status());
+        jo1.put("date", startdevice.getDate());
+        jo1.put("operation_by", startdevice.getOperation_by());
         deviceService.changeDeviceStatus(jo1);
         // 如果是无光电的设备 指令完成变更起点、终点状态
         JSONObject jo = new JSONObject();
@@ -685,6 +691,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         jo.put("remark", "");
         jo.put("batch", "");
         jo.put("islock", "false");
+        jo.put("model", "");
+        jo.put("process", "");
+        jo.put("weight", "");
+        jo.put("qc_status", "");
+        jo.put("date", "");
+        jo.put("operation_by", "");
         deviceService.changeDeviceStatus(jo);
 
         JSONObject json = JSONObject.fromObject(entity);