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

fix 入窑扫码

Browse Source
This commit is contained in:
张江玮
2023-08-07 14:20:07 +08:00
parent 7548052384
commit 2aa2c670f7
2 changed files with 76 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
View File

@@ -208,12 +208,12 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
outKiln();
}
break;
case 6:
//入货架扫码
if (!requireSucess && barcode != 0) {
intoKiln();
}
break;
// case 6:
// //入货架扫码
// if (!requireSucess && barcode != 0) {
// intoKiln();
// }
// break;
case 7:
//申请输送线RGV对接位入窑任务
if (!requireSucess && this.move == 0) {
@@ -337,13 +337,11 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
if (ObjectUtil.isNotEmpty(result)) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (result.getStatus() == 200 && StrUtil.equals(jsonObject.get("status").toString(),"200")) {
// this.writing(this.mode);
this.setRequireSucess(true);
this.setResult(true);
return true;
}
logServer.deviceExecuteLog(this.device_code, "", "", "申请组盘请求lms反馈:"+result);
}
return true;
return false;
}
}

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

@@ -25,6 +25,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.ThreadUtl;
import org.nl.utils.SpringContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -444,20 +445,12 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
inst.setExecute_status("9");
instructionService.update(inst);
try {
if (!lnshLaminatingMachineDeviceDriver.getResult()) {
lnshLaminatingMachineDeviceDriver.writing("to_task", inst.getInstruction_code());
lnshLaminatingMachineDeviceDriver.writing(1);
while (!StrUtil.equals(String.valueOf(lnshLaminatingMachineDeviceDriver.getTo_task()), inst.getInstruction_code())
|| !StrUtil.equals(String.valueOf(lnshLaminatingMachineDeviceDriver.getTo_command()), "1")) {
lnshLaminatingMachineDeviceDriver.writing("to_task", inst.getInstruction_code());
lnshLaminatingMachineDeviceDriver.writing(1);
try {
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
ThreadUtl.sleep(500);
}
} catch (Exception e) {
log.info("下发电气信号失败:" + e.getMessage());
@@ -466,33 +459,19 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
}
//如果组盘绑定条码成功，就允许agv离开
if (lnshLaminatingMachineDeviceDriver.getMode() == 6 && lnshLaminatingMachineDeviceDriver.getResult()) {
try {
while (!StrUtil.equals(String.valueOf(lnshLaminatingMachineDeviceDriver.getTo_command()),"6") ) {
if (lnshLaminatingMachineDeviceDriver.getMode() == 6) {
boolean intoKiln = lnshLaminatingMachineDeviceDriver.intoKiln();
if (intoKiln) {
while (6 != lnshLaminatingMachineDeviceDriver.getTo_command()) {
lnshLaminatingMachineDeviceDriver.writing(6);
try {
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
ThreadUtl.sleep(500);
}
}
} catch (Exception e) {
log.info("下发电气信号失败:" + e.getMessage());
e.printStackTrace();
}
// if(lnshLaminatingMachineDeviceDriver.getTo_command() == 6 ){
// inst.setExecute_status("5");
// instructionService.update(inst);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
// flag = true;
// } else {
// logServer.deviceExecuteLog("ndc","","","组盘绑定条码成功发命令不等于6,无法反馈");
// }
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
}
}
}
//请求放货
else if (phase == 0x07) {
if (ObjectUtil.isEmpty(inst)) {