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

fix

Browse Source
This commit is contained in:
psh
2024-03-11 16:32:15 +08:00
parent ffb578a198
commit 445f60a60c
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -231,12 +231,16 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if(device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver){
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if(standardInspectSiteDeviceDriver.getAction()==1){
if(standardInspectSiteDeviceDriver.getAction()==1&&
//电气那边是怕取完货，光电一直有货信号，这样下一个任务员工没有放到位也会继续生成任务，取货时会有问题
standardInspectSiteDeviceDriver.getMove()==0){
standardInspectSiteDeviceDriver.writing(2);
}
}
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
}
}else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
}
//到达放货等待点
//(需要WCS反馈)
} else if (phase == 0x06) {

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java
View File

@@ -94,6 +94,8 @@ public class TBXBKJTask extends AbstractTask {
// 设置终点并修改创建成功状态
if("TBX1".equals(startPoint.getRegion_code())) {
task.setTask_type("4");
}else if("TBX7".equals(startPoint.getRegion_code())) {
task.setTask_type("3");
}else{
task.setTask_type("7");
}