bug修复

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/SocketBufferServiceImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.ams.agv.ndc.entity.Order;
 import com.ruoyi.ams.agv.ndc.service.IAmsNdcEventService;
 import com.ruoyi.ams.agv.ndc.service.IAmsTaskService;
 import com.ruoyi.ams.agv.ndc.service.SocketBufferService;
+import com.ruoyi.ams.agv.ndc.service.StatusUpdateService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,8 @@ public class SocketBufferServiceImpl implements SocketBufferService {
     private IAmsNdcEventService amsNdcEventService;
     @Autowired
     private IAmsTaskService amsTaskService;
+    @Autowired
+    private StatusUpdateService statusUpdateService;
 
     @Override
     public List<Order> bufferSeparator(byte[] buffer) {
@@ -131,7 +134,7 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                     taskBean.setIsDelete(null);
                     amsTaskService.updateAmsTask(taskBean);
                     //任务状态回调
-                    // statusUpdateService.updateStatus(taskBean.getId().longValue(), icarNo);
+                    statusUpdateService.updateStatus(taskBean.getId().longValue(), icarNo);
                     break;
                 case 86://user event Order Receive              任务开始
                 case 87://user event FETCH(LP1) is Invalid!!
@@ -153,7 +156,7 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                     taskBean.setIsDelete(null);
                     amsTaskService.updateAmsTask(taskBean);
 
-                    // statusUpdateService.updateStatus(taskBean.getId().longValue(), icarNo);
+                    statusUpdateService.updateStatus(taskBean.getId().longValue(), icarNo);
                     break;
                 case 112://user event  Carrier status
                     //carStatus.setSpeed(ByteUtil.getInt(buffer, 34));

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/StatusUpdateServiceImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.ams.agv.ndc.domain.AmsTask;
 import com.ruoyi.ams.agv.ndc.entity.CallbackResult;
 import com.ruoyi.ams.agv.ndc.service.IAmsTaskService;
 import com.ruoyi.ams.agv.ndc.service.StatusUpdateService;
+import com.ruoyi.ams.task.service.IWcsTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -14,6 +15,8 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
 
     @Autowired
     private IAmsTaskService amsTaskService;
+    @Autowired
+    private IWcsTaskService wcsTaskService;
 
     @Override
     public void updateStatus(Long id, Integer carNo) {
@@ -55,8 +58,6 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
                 }
             }
 
-            //TODO 回调其他系统
-
             amsTask.setSystemStatus(result.getState());
             amsTaskService.updateAmsTask(amsTask);
         }

warewms-ams/src/main/java/com/ruoyi/ams/task/service/IWcsTaskService.java

@@ -30,6 +30,7 @@ public interface IWcsTaskService {
 
     /**
      * 查询待下发的任务
+     *
      * @param warehouseId
      * @return
      */
@@ -84,38 +85,51 @@ public interface IWcsTaskService {
 
     /**
      * 任务完成回调
+     *
      * @param wcsTask
      */
     void callBackTaskComplete(WcsTask wcsTask);
 
     /**
      * 取消任务
+     *
      * @param wcsTask
      */
     void cancelTask(WcsTask wcsTask);
 
     /**
      * 库存处理
+     *
      * @param wcsTask 任务单号
-     * @param result 处理结果
+     * @param result  处理结果
      */
-    void invDisposition(WcsTask wcsTask,String result);
+    void invDisposition(WcsTask wcsTask, String result);
 
     /**
      * 事件回调
+     *
      * @param wcsTask
      */
-    void eventCallBack(String code,WcsTask wcsTask);
+    void eventCallBack(String code, WcsTask wcsTask);
 
     /**
      * 查询同列的任务
-     * @param colNo 列号
-     * @param colIndex 列索引
-     * @param zoneId 区域
+     *
+     * @param colNo       列号
+     * @param colIndex    列索引
+     * @param zoneId      区域
      * @param warehouseId 仓库id
      * @return
      */
-    List<WcsTaskLocationDTO> selectTaskByColNo(String colNo,Long colIndex,Long zoneId,Long warehouseId);
+    List<WcsTaskLocationDTO> selectTaskByColNo(String colNo, Long colIndex, Long zoneId, Long warehouseId);
 
-    List<WcsTaskLocationDTO> selectTaskByColNoAfter(String colNo,Long colIndex,Long zoneId,Long warehouseId);
+    /**
+     * 查询同列任务是否有优先级
+     * @param colNo
+     * @param colIndex
+     * @param zoneId
+     * @param warehouseId
+     * @return
+     */
+    List<WcsTaskLocationDTO> selectTaskByColNoAfter(String colNo, Long colIndex, Long zoneId, Long warehouseId);
 }