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 11:26:36 +08:00
parent 2b18a9633f
commit 6cfb812d2c
3 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,6 +199,7 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im
return;
//申请
case 3:
log.info("设备运转模式:申请任务");
if (start == 0 || end == 0){
message = "起点终点为空";
break;
@@ -207,7 +208,9 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im
break;
//取消
case 4:
if (task == 0){
break;
}
this.cancle_require();
break;
@@ -244,7 +247,7 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im
dto.setUpdate_by(this.getDevice().getDevice_code());
Device startDevice = deviceAppservice.findDeviceByAddress(String.valueOf(start));
Device endDevice = deviceAppservice.findDeviceByAddress(String.valueOf(start));
Device endDevice = deviceAppservice.findDeviceByAddress(String.valueOf(end));
String taskcode = CodeUtil.getNewCode("TASK_NO");
if (startDevice == null || endDevice == null){
message = "起点终点为空";

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

@@ -21,6 +21,7 @@ import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
import org.nl.acs.device_driver.standard_conveyor_control.StandardCoveyorControlDeviceDriver;
import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver;
import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_inspect_site2.StandardInspectSite2DeviceDriver;
import org.nl.acs.device_driver.standard_manipulator_inspect_site.StandardManipulatorInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_manipulator_stacking_site.StandardManipulatorStackingSiteDeviceDriver;
import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
@@ -167,6 +168,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
device = deviceAppService.findDeviceByCode(device_code);
}
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
StandardInspectSite2DeviceDriver standardInspectSite2DeviceDriver;
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
StandardStorageDeviceDriver standardStorageDeviceDriver;
@@ -253,6 +255,12 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
//检测站点2
if (device.getDeviceDriver() instanceof StandardInspectSite2DeviceDriver) {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
//空盘堆叠站点
if (device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) {
standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) device.getDeviceDriver();
@@ -356,6 +364,14 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
standardInspectSiteDeviceDriver.writing(2);
flag = true;
}
if (device.getDeviceDriver() instanceof StandardInspectSite2DeviceDriver) {
standardInspectSite2DeviceDriver = (StandardInspectSite2DeviceDriver) device.getDeviceDriver();
data = AgvService.sendAgvOneModeInst(phase, index, 0);
standardInspectSite2DeviceDriver.writing(2);
flag = true;
}
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
if (standardCoveyorControlDeviceDriver.getMove() == 0) {
@@ -472,6 +488,17 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
flag = true;
// } else {
// log.info("AGV请求放货设备{}有货,无法反馈", device_code);
// }
}
if (device.getDeviceDriver() instanceof StandardInspectSite2DeviceDriver) {
standardInspectSite2DeviceDriver = (StandardInspectSite2DeviceDriver) device.getDeviceDriver();
inst.setExecute_status("3");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
// } else {
// log.info("AGV请求放货设备{}有货,无法反馈", device_code);
// }
}
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
@@ -570,6 +597,19 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
// log.info("AGV放货完成请求离开设备{}无货,无法反馈", device_code);
// }
}
if (device.getDeviceDriver() instanceof StandardInspectSite2DeviceDriver) {
standardInspectSite2DeviceDriver = (StandardInspectSite2DeviceDriver) device.getDeviceDriver();
// if (standardInspectSiteDeviceDriver.getMove() != 0) {
inst.setExecute_status("6");
instructionService.update(inst);
standardInspectSite2DeviceDriver.writing(3);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
// } else {
// log.info("AGV放货完成请求离开设备{}无货,无法反馈", device_code);
// }
}
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
if (standardCoveyorControlDeviceDriver.getMove() != 0) {

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

@@ -66,9 +66,42 @@ https://juejin.cn/post/6844903775631572999
<!--生产环境:打印控制台和输出到文件-->
<springProfile name="prod">
<root level="error">
<!-- <root level="error">-->
<!-- <appender-ref ref="asyncFileAppender"/>-->
<!-- </root>-->
<root level="info">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="CONSOLE"/>
</root>
<logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.springframework" level="ERROR" additivity="true">
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.hibernate" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.quartz" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="com.google" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.redisson" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.springframework.data" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.jinterop" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
</springProfile>