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

fix ： 测试修改

Browse Source
This commit is contained in:
ls
2025-04-23 17:16:07 +08:00
parent 466469ef3e
commit fb0156bc72
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java
View File

@@ -266,7 +266,7 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im
dto.setNext_device_code(endDevice.getDevice_code()); dto.setNext_device_code(endDevice.getDevice_code());
dto.setTask_code("-" + taskcode); dto.setTask_code("-" + taskcode);
dto.setTask_status("0"); dto.setTask_status("0");
dto.setPriority("101"); dto.setPriority("1");
// RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); // RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
// String next_device_codecode = jo.getNext_device_code(); // String next_device_codecode = jo.getNext_device_code();
// if(StrUtil.isEmpty(next_device_codecode)){ // if(StrUtil.isEmpty(next_device_codecode)){

6
acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -400,6 +400,12 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.IGNOREHASGOODS), "1")) { if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.IGNOREHASGOODS), "1")) {
inst.setExecute_status("5"); inst.setExecute_status("5");
instructionService.update(inst); instructionService.update(inst);
String nextPointCode = inst.getNext_point_code();
Device nextDevice = deviceAppService.findDeviceByCode(nextPointCode);
if (nextDevice.getDeviceDriver() instanceof StandardInspectSite2DeviceDriver){
standardInspectSite2DeviceDriver = (StandardInspectSite2DeviceDriver) device.getDeviceDriver();
standardInspectSite2DeviceDriver.writing(2);
}
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true; flag = true;
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();

6
acs/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -68,14 +68,8 @@ https://juejin.cn/post/6844903775631572999
<springProfile name="prod"> <springProfile name="prod">
<root level="error"> <root level="error">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="CONSOLE"/>
</root> </root>
<root level="info">
<appender-ref ref="CONSOLE"/>
</root>
</springProfile> </springProfile>
<!--开发环境:打印控制台--> <!--开发环境:打印控制台-->