Merge branch 'master' of http://121.40.234.130:8899/wangs/sanShiJi

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

@@ -1162,6 +1162,27 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
             standardInspectSiteDeviceDriver.setBatch(batch);
             device.setMaterial_type(material_type);
             device.setBatch(batch);
+            device.setModel(model);
+            device.setProcess(process);
+            device.setWeight(weight);
+            device.setQc_status(qc_status);
+            device.setDate(date);
+            device.setOperation_by(operation_by);
+            WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint");
+            JSONObject json = runpointwo.query("device_code ='" + device_code + "'").uniqueResult(0);
+            if (!ObjectUtil.isEmpty(json)) {
+                DeviceRunpointDto obj = (DeviceRunpointDto) JSONObject.toBean(json, DeviceRunpointDto.class);
+                obj.setMaterial_type(material_type);
+                obj.setBatch(batch);
+                obj.setModel(model);
+                obj.setProcess(process);
+                obj.setWeight(weight);
+                obj.setQc_status(qc_status);
+                obj.setDate(date);
+                obj.setOperation_by(operation_by);
+                JSONObject updatejson = JSONObject.fromObject(obj);
+                runpointwo.update(updatejson, "device_code = '" + device_code + "'");
+            }
         } else if (device.getDeviceDriver() instanceof YkbkSpecialDeviceDriver) {
             ykbkSpecialDeviceDriver = (YkbkSpecialDeviceDriver) device.getDeviceDriver();
             ykbkSpecialDeviceDriver.setMaterial(material_type);

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

@@ -772,6 +772,21 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
 //        }
 
         // 如果是无光电的设备 指令完成变更起点、终点状态
+        Device start_device = appService.findDeviceByCode(dto.getStart_point_code());
+        JSONObject jo1 = new JSONObject();
+        jo1.put("device_code", dto.getNext_point_code());
+        jo1.put("hasGoodStatus", "1");
+        jo1.put("material_type", start_device.getMaterial_type());
+        jo1.put("batch", start_device.getBatch());
+        jo1.put("vehicle_code", dto.getVehicle_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);
+
         JSONObject jo = new JSONObject();
         jo.put("device_code", dto.getStart_point_code());
         jo.put("hasGoodStatus", "0");
@@ -785,21 +800,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         jo.put("operation_by", "");
         deviceService.changeDeviceStatus(jo);
 
-        JSONObject jo1 = new JSONObject();
-        jo1.put("device_code", dto.getNext_point_code());
-        jo1.put("hasGoodStatus", "1");
-        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;
 
 

hd/nladmin-system/src/main/resources/config/application-prod.yml

@@ -8,7 +8,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:njyf_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ssj1_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数