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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyongde
2024-05-28 14:18:54 +08:00
parent 230d1ab7bd 60571a21b7
commit d5334c5017
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
View File

@@ -13,14 +13,19 @@ import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.RouteableDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.dto.Instruction;
import org.nl.acs.log.LokiLog;
import org.nl.acs.log.LokiLogType;
import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.monitor.DeviceStageMonitor;
import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.task.service.TaskService;
import org.nl.modules.system.service.ParamService;
@@ -121,6 +126,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
@Override
@LokiLog(type = LokiLogType.AGV)
public void execute() {
String message = null;
try {
@@ -216,7 +222,23 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
//叫料
if (ObjectUtil.isNotEmpty(ignore_pickup_check) && "true".equals(ignore_pickup_check.toString())) {
if (!requireSucess) {
callMaterial();
if(this.device_code.endsWith("SL01")){
String devicecode="BLJ0"+this.device_code.charAt(3);
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
Device nextDevice = appService.findDeviceByCode(devicecode);
log.info("当前压机"+this.device_code+"申请叫料,开始判断"+devicecode+"是否有货");
if (nextDevice!=null && nextDevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
StandardInspectSiteDeviceDriver driver = (StandardInspectSiteDeviceDriver) nextDevice.getDeviceDriver();
if(driver.getMove()==1){
log.info("当前压机"+this.device_code+"对应对接位"+driver.getDevice_code()+"有货，暂不生成任务");
}else{
callMaterial();
}
}
}else {
callMaterial();
}
}
} else {
if (!requireSucess && this.move == 0) {

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

@@ -26,6 +26,7 @@ import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl;
import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.modules.system.service.ParamService;
import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder;
@@ -588,7 +589,28 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver();
lnshStationDeviceDriver.writing(13);
Object ignore_pickup_check = lnshStationDeviceDriver.getExtraValue().get("ignore_pickup_check");
if (ObjectUtil.isNotEmpty(ignore_pickup_check) && "true".equals(ignore_pickup_check.toString())) {
//上料位判断对应的对接位光电是否有货
if(device.getDevice_code().endsWith("SL01")){
String devicecode="BLJ0"+device.getDevice_code().charAt(3);
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
Device nextDevice = appService.findDeviceByCode(devicecode);
log.info("当前压机"+device.getDevice_code()+"申请放料,开始判断"+devicecode+"是否有货");
if (nextDevice!=null && nextDevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
StandardInspectSiteDeviceDriver driver = (StandardInspectSiteDeviceDriver) nextDevice.getDeviceDriver();
if(driver.getMove()==1){
String message = "当前压机"+device.getDevice_code()+"对应对接位"+driver.getDevice_code()+"有货，暂不允许放货";
log.info(message);
lnshStationDeviceDriver.setMessage(message);
}else{
inst.setExecute_status("3");
instructionService.update(inst);
lnshStationDeviceDriver.writing(3, Integer.parseInt(inst.getInstruction_code()));
data = ndcAGVService.sendAgvOneModeInst(phase, index, 0);
lnshStationDeviceDriver.setMessage("");
flag = true;
}
}
} else if (ObjectUtil.isNotEmpty(ignore_pickup_check) && "true".equals(ignore_pickup_check.toString())) {
if (lnshStationDeviceDriver.getMode() != 0
&& (lnshStationDeviceDriver.getAction() == 2 || lnshStationDeviceDriver.getAction() == 3)
&& (lnshStationDeviceDriver.getIo_action() == 1 || lnshStationDeviceDriver.getIo_action() == 3)) {

2
lms/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -8,7 +8,7 @@ spring:
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yksh_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:12356}
password: ${DB_PWD:123456}
# 初始连接数
initial-size: 5
# 最小连接数