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-19 18:03:38 +08:00
parent 01fa0a83eb
commit 8ca2109d99
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,7 +231,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if(device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver){ if(device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver){
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if(standardInspectSiteDeviceDriver.getAction()==1&& if(
//电气那边是怕取完货，光电一直有货信号，这样下一个任务员工没有放到位也会继续生成任务，取货时会有问题 //电气那边是怕取完货，光电一直有货信号，这样下一个任务员工没有放到位也会继续生成任务，取货时会有问题
standardInspectSiteDeviceDriver.getMove()==0){ standardInspectSiteDeviceDriver.getMove()==0){
standardInspectSiteDeviceDriver.writing(2); standardInspectSiteDeviceDriver.writing(2);

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

@@ -134,9 +134,8 @@ public class TBXBKJTask extends AbstractTask {
if(task.getTask_code().equals(schBasePoint.getIng_task_code())){ if(task.getTask_code().equals(schBasePoint.getIng_task_code())){
return schBasePoint; return schBasePoint;
} }
//点位允许取货且已被任务锁定则抛异常 //点位已被任务锁定则抛异常，暂时不反馈
if (schBasePoint.getVehicle_qty() > 0 && if ( (ObjectUtil.isNotEmpty(schBasePoint.getIng_task_code()))) {
(ObjectUtil.isNotEmpty(schBasePoint.getIng_task_code()))) {
throw new BadRequestException("当前点位"+ schBasePoint.getPoint_code()+"已被任务锁定!"); throw new BadRequestException("当前点位"+ schBasePoint.getPoint_code()+"已被任务锁定!");
} }
if (schBasePoint.getVehicle_qty() > 0 && if (schBasePoint.getVehicle_qty() > 0 &&