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

1

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-08-15 18:53:38 +08:00
parent ea12b5dc48
commit 0ddbf33058
3 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -45,9 +45,6 @@ import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDevic
import org.nl.acs.device_driver.standard_photoelectric_inspect_site.StandardPhotoelectricInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver;
import org.nl.acs.device_driver.weighing_site.WeighingSiteDeviceDriver;
import org.nl.acs.device_driver.whxr.whxr_ball_mill_device.BallMillDeviceDriver;
import org.nl.acs.device_driver.whxr.whxr_ball_mill_device.ItemProtocol;
import org.nl.acs.device_driver.whxr.whxr_spary_tower_device.SparyTowerDeviceDriver;
import org.nl.acs.ext.wms.service.WmsToAcsService;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.dto.Instruction;

12
acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
View File

@@ -21,7 +21,6 @@ import org.nl.acs.route.service.dto.RouteLineDto;
import org.nl.acs.task.enums.TaskTypeEnum;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.modules.log.LogMarkerTypeEnum;
import org.nl.utils.SpringContextHolder;
import org.springframework.stereotype.Component;
@@ -79,7 +78,6 @@ public class AutoCreateInst {
log.info("系统参数配置最大指令数为:" + maxInstnumber + "无法生成指令");
acsTask.setRemark("系统参数配置最大指令数为:" + maxInstnumber + "无法生成指令");
taskserver.updateByCodeFromCache(acsTask);
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"系统参数配置最大指令数为:{}无法生成指令",maxInstnumber);
continue;
}
}
@@ -160,7 +158,6 @@ public class AutoCreateInst {
log.info("起点设备:" + startdevice.getDevice_code() + "设备未待机,任务号：" + taskcode);
acsTask.setRemark("起点设备:" + startdevice.getDevice_code() + "设备未待机,任务号：" + taskcode);
taskserver.updateByCodeFromCache(acsTask);
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"起点设备:{}设备未待机,任务号:{}",startdevice.getDevice_code(),taskcode);
//this.execute_log.setResource(startdevice.getDevice_code(), startdevice.getDevice_code());
//this.execute_log.log("起点设备:" + startdevice.getDevice_code() + "设备未待机,任务号：" + taskcode);
continue;
@@ -172,7 +169,6 @@ public class AutoCreateInst {
log.info("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode);
acsTask.setRemark("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode);
taskserver.updateByCodeFromCache(acsTask);
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"目标设备:{}设备未待机,任务号:{}",nextdevice.getDevice_code(),taskcode);
continue;
}
@@ -188,7 +184,6 @@ public class AutoCreateInst {
log.info("存在相同终点的指令,任务号：" + taskcode);
acsTask.setRemark("存在相同终点的指令,任务号：" + taskcode);
taskserver.updateByCodeFromCache(acsTask);
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"存在相同的指令,任务号:{}",taskcode);
continue;
}
}
@@ -200,7 +195,6 @@ public class AutoCreateInst {
log.info(("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode));
acsTask.setRemark("目标设备:" + nextdevice.getDevice_code() + "设备未待机");
taskserver.updateByCodeFromCache(acsTask);
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"目标设备:{}设备未待机,任务号:{}",nextdevice.getDevice_code(),taskcode);
continue;
}
int max_emptypalletnum = Integer.parseInt(nextdevice.getExtraValue().get("max_emptypalletnum").toString());
@@ -209,7 +203,6 @@ public class AutoCreateInst {
log.info("目标设备:" + nextdevice.getDevice_code() + "空盘位已满等待入库,任务号：" + taskcode);
acsTask.setRemark("目标设备:" + nextdevice.getDevice_code() + "空盘位已满等待入库,任务号：" + taskcode);
taskserver.updateByCodeFromCache(acsTask);
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"目标设备:{}空盘位已满等待入库,任务号:{}",nextdevice.getDevice_code(),taskcode);
continue;
}
// 查看是否有相同终点的指令
@@ -218,7 +211,6 @@ public class AutoCreateInst {
log.info("存在相同终点的指令,任务号：" + taskcode);
acsTask.setRemark("存在相同终点的指令,任务号：" + taskcode);
taskserver.updateByCodeFromCache(acsTask);
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"存在相同终点的指令,任务号:{}",taskcode);
//this.execute_log.setResource(nextdevice.getDevice_code(), nextdevice.getDevice_code());
//this.execute_log.log("存在相同终点的指令,任务号：" + taskcode);
continue;
@@ -233,9 +225,6 @@ public class AutoCreateInst {
log.info("存在相同终点的指令,任务号：" + taskcode);
acsTask.setRemark("存在相同终点的指令,任务号：" + taskcode);
taskserver.updateByCodeFromCache(acsTask);
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"存在相同终点的指令,任务号:{}",taskcode);
//this.execute_log.setResource(nextdevice.getDevice_code(), nextdevice.getDevice_code());
//this.execute_log.log("存在相同终点的指令,任务号：" + taskcode);
continue;
}
@@ -283,7 +272,6 @@ public class AutoCreateInst {
continue;
}
log.info("任务号:" + taskcode + "的指令生成成功");
log.info(LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.AUTO_CREATE_INST),"任务号:{}的指令生成成功",taskcode);
//创建指令后修改任务状态
acsTask.setTask_status("1");
taskserver.update(acsTask);

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

@@ -83,7 +83,7 @@ https://juejin.cn/post/6844903775631572999
<!--开发环境:打印控制台-->
<springProfile name="dev">
<root level="info">
<appender-ref ref="CONSOLE"/>
<!-- <appender-ref ref="CONSOLE"/>-->
<appender-ref ref="lokiAppender" />
</root>