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

bug

Browse Source
This commit is contained in:
张江玮
2022-12-09 14:13:21 +08:00
parent 47f0f258d0
commit 27c4b5876d
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

@@ -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}
# 初始连接数