fix

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

@@ -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);
 
+                }
+            }else {
                 data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
+            }
             //到达放货等待点
             //(需要WCS反馈)
         } else if (phase == 0x06) {

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

@@ -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");
             }