优化0120

ruoyi-admin/src/main/java/com/ruoyi/queue/agv/mapper/AgvQueueMapper.java

@@ -70,4 +70,6 @@ public interface AgvQueueMapper
     void insertHistory(String reqCode);
 
     AgvQueue selectAgvQueueByWmsTask(@Param("wmsTaskNo") int wmsTaskNo);
+
+    List<AgvQueue> selectAgvQueueList1(AgvQueue agvQueue);
 }

ruoyi-admin/src/main/java/com/ruoyi/queue/agv/service/IAgvQueueService.java

@@ -73,4 +73,6 @@ public interface IAgvQueueService
     void insertHistory(String reqCode);
 
     AgvQueue selectAgvQueueByWmsTask(int taskNo);
+
+    List<AgvQueue> selectAgvQueueList1(AgvQueue agvQueue);
 }

ruoyi-admin/src/main/java/com/ruoyi/queue/agv/service/impl/AgvQueueServiceImpl.java

@@ -43,6 +43,12 @@ public class AgvQueueServiceImpl implements IAgvQueueService
         return agvQueueMapper.selectAgvQueueList(agvQueue);
     }
 
+    @Override
+    public List<AgvQueue> selectAgvQueueList1(AgvQueue agvQueue)
+    {
+        return agvQueueMapper.selectAgvQueueList1(agvQueue);
+    }
+
     /**
      * 新增AGV任务队列
      *

ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/controller/DdjDeviceExecutionQueueController.java

@@ -91,6 +91,7 @@ public class DdjDeviceExecutionQueueController extends BaseController
         return toAjax(ddjDeviceExecutionQueueService.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue));
     }
 
+
     /**
      * 删除堆垛机执行队列
      */

ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/mapper/DdjDeviceExecutionQueueMapper.java

@@ -43,6 +43,7 @@ public interface DdjDeviceExecutionQueueMapper
      * @return 结果
      */
     public int updateDdjDeviceExecutionQueue(DdjDeviceExecutionQueue ddjDeviceExecutionQueue);
+    public int updateDdjDeviceExecutionQueue1(DdjDeviceExecutionQueue ddjDeviceExecutionQueue);
 
     /**
      * 删除堆垛机执行队列

ruoyi-admin/src/main/java/com/ruoyi/queue/ddj/service/impl/DdjDeviceExecutionQueueServiceImpl.java

@@ -64,9 +64,12 @@ public class DdjDeviceExecutionQueueServiceImpl implements IDdjDeviceExecutionQu
     @Override
     public int updateDdjDeviceExecutionQueue(DdjDeviceExecutionQueue ddjDeviceExecutionQueue)
     {
+        ddjDeviceExecutionQueue.setDdjxf("0");
         return ddjDeviceExecutionQueueMapper.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
     }
 
+
+
     /**
      * 批量删除堆垛机执行队列
      *