初始化

ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java

@@ -21,29 +21,43 @@ public class Wcs2WmsController {
     @Autowired
     private IWcsPortService wcsPortService;
 
+
+
     /**
      * 接收wms出库任务
      *
-     * @param stockoutReceive
+     * @param receiveJob
      * @return
      */
     @PostMapping("/receiveOutMydoJob")
-    public AjaxResult receiveOutMydoJob(@RequestBody StockoutReceive stockoutReceive) {
-        return apiService.receiveOutMydoJob(stockoutReceive);
+    public AjaxResult receiveOutMydoJob(@RequestBody ReceiveJob receiveJob) {
+        return apiService.receiveOutMydoJob(receiveJob);
     }
 
+
     /**
      * 接收入库任务
      *
-     * @param receiveInJob
+     * @param receiveJob
      * @return
      */
     @PostMapping("/receiveInMydoJob")
-    public AjaxResult receiveInMydoJob(@RequestBody ReceiveJob receiveInJob) {
-        return apiService.receiveInMydoJob(receiveInJob);
+    public AjaxResult receiveInMydoJob(@RequestBody ReceiveJob receiveJob) {
+        return apiService.receiveInMydoJob(receiveJob);
     }
 
 
+    /**
+     * 接收盘点任务
+     *
+     * @param receiveJob
+     * @return
+     */
+    @PostMapping("/receiveInventoryMydoJob")
+    public AjaxResult receiveInventoryMydoJob(@RequestBody ReceiveJob receiveJob) {
+        return apiService.receiveInventoryMydoJob(receiveJob);
+    }
+
 
     /**
      * wms取消任务
@@ -52,7 +66,18 @@ public class Wcs2WmsController {
      */
     @PostMapping("/cancelMydoJob")
     public AjaxResult cancelMydoJob(@RequestBody JobParam jobParam) {
-        return apiService.cancelMydoJob(jobParam);
+        return apiService.cancelTask(jobParam.getTaskNo());
+    }
+
+
+    /**
+     * wms手动完成任务
+     * @param jobParam
+     * @return
+     */
+    @PostMapping("/manuallyCompeleteMydoJob")
+    public AjaxResult manuallyCompeleteMydoJob(@RequestBody JobParam jobParam) {
+        return apiService.manuallyCompeleteTask(jobParam.getTaskNo());
     }
 
 
@@ -66,6 +91,7 @@ public class Wcs2WmsController {
         return apiService.selectWcsPort(wcsPort);
     }
 
+
     /**
      * 修改缓存点状态
      * @param wcsPort

ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/JobParam.java

@@ -23,5 +23,10 @@ public class JobParam {
      */
     private String taskNo;
 
+    /**
+     * 货位号
+     */
+    private String cargoSpaceId;
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java

@@ -8,6 +8,12 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ReceiveJob {
+
+    /**
+     * 作业号
+     */
+    private String jobId;
+
     /**
      * 任务号
      */
@@ -18,6 +24,11 @@ public class ReceiveJob {
      */
     private String cargoSpaceId;
 
+    /**
+     * 入口
+     */
+    private String entranceId;
+
     /**
      * 出口
      */
@@ -28,21 +39,11 @@ public class ReceiveJob {
      */
     private String trayCode;
 
-    /**
-     * 入口
-     */
-    private String entranceId;
-
     /**
      * 任务类型
      */
     private String inOrOut;
 
-    /**
-     * 作业号
-     */
-    private String jobId;
-
     /**
      * 巷道号
      */
@@ -52,4 +53,6 @@ public class ReceiveJob {
      *
      */
     private String departmentId;
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java

@@ -1,5 +1,11 @@
 package com.ruoyi.api.service;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.api.domain.RequestLog;
 import com.ruoyi.api.domain.agv.agvCallback.AgvCallbackRequest;
 import com.ruoyi.api.domain.agv.agvCallback.AgvCallbackResponse;
@@ -9,6 +15,7 @@ import com.ruoyi.api.domain.agv.continueTask.ContinueTaskRequest;
 import com.ruoyi.api.domain.agv.continueTask.ContinueTaskResponse;
 import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskRequest;
 import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskResponse;
+import com.ruoyi.api.domain.agv.genAgvSchedulingTask.PositionCodeData;
 import com.ruoyi.api.domain.wcs2wms.JobParam;
 import com.ruoyi.api.domain.wcs2wms.ReceiveJob;
 import com.ruoyi.api.domain.wcs2wms.exception.TaskExceptionRequest;
@@ -19,11 +26,16 @@ import com.ruoyi.common.exception.job.TaskException;
 import com.ruoyi.job.domain.MydoJob;
 import com.ruoyi.queue.agv.domain.AgvQueue;
 import org.aspectj.weaver.loadtime.Aj;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.ruoyi.common.Constant.*;
+import static com.ruoyi.common.Constant.CANCEL_TASK_URL;
+
 /**
  * 接口记录Service接口
  *
@@ -33,6 +45,77 @@ import java.util.Map;
 public interface IApiService
 {
 
+
+    /**
+     * 任务到达拣选口
+     * @param param
+     * @return
+     */
+    RequestLog finishMydoJob(Map<String, Object> param);
+
+    AjaxResult selectWcsPort(WcsPort wcsPort);
+
+    AjaxResult updateWcsPort(WcsPort wcsPort);
+
+
+
+    /**
+     * 放货有货，重新分配货位
+     * @param jobParam
+     * @return
+     */
+    AjaxResult reAssign(JobParam jobParam);
+
+
+    /**
+     * 取货无货，重新分配单据
+     * @param jobParam
+     * @return
+     */
+    AjaxResult reMaterial(JobParam jobParam);
+
+
+
+    /**
+     * 入库请求生成作业
+     */
+    AjaxResult createInMydoJob(Map<String, Object> param);
+
+    /**
+     * @@@ FT568 入库请求生成作业 处理了请求响应，适应wms的自定义响应格式
+     */
+    AjaxResult createMydoJobForStockin(Map<String, Object> param);
+
+    /**
+     * 入库请求作业异常反馈（扫码失败、外形、称重等异常）
+     */
+    AjaxResult createInMydoJobException(Map<String, Object> param);
+
+    AjaxResult selectMydoJobByNoTrayCode(Map<String, Object> param);
+
+    AjaxResult receiveOutMydoJob(ReceiveJob receiveJob);
+
+    AjaxResult receiveInMydoJob(ReceiveJob receiveJob);
+
+    AjaxResult receiveInventoryMydoJob(ReceiveJob receiveInventoryJob);
+
+    AjaxResult selectMydoJobByTrayCodeAndEntranceId(HashMap<String, Object> paramMap);
+
+    AjaxResult requestWmsSpace(MydoJob mydoJob);
+
+    AjaxResult manuallyCompeleteTask(String taskNo);
+
+    AjaxResult cancelTask(String taskNo);
+
+
+
+
+
+    //=============================================AGV相关=============================================
+    //=============================================AGV相关=============================================
+    //=============================================AGV相关=============================================
+
+
     /**
      * 生成agv队列
      * @param code1 起点
@@ -82,19 +165,7 @@ public interface IApiService
      */
     AjaxResult receiveAgvMoveJob(Map<String, String> param);
 
-    /**
-     * 任务到达拣选口
-     * @param param
-     * @return
-     */
-    RequestLog finishMydoJob(Map<String, Object> param);
-
-    /**
-     * @@@ FT568 任务完成回传 适应wms的自定义响应格式
-     * @param param
-     * @return
-     */
-    RequestLog finishMydoJobForResponseResult(Map<String, Object> param);
+    AjaxResult deleteAgvTray(AgvQueue agvQueue);
 
     /**
      * 下发agv任务
@@ -103,7 +174,6 @@ public interface IApiService
      */
     public GenAgvSchedulingTaskResponse requestAgvQueue(AgvQueue agvQueue);
 
-
     /**
      * 取消ctu任务
      * @param jobParam
@@ -111,69 +181,5 @@ public interface IApiService
      */
     AjaxResult cancelMydoJob(JobParam jobParam);
 
-    AjaxResult selectWcsPort(WcsPort wcsPort);
-
-    AjaxResult updateWcsPort(WcsPort wcsPort);
-
-
-
-    /**
-     * 放货有货，重新分配货位
-     * @param jobParam
-     * @return
-     */
-    AjaxResult reAssign(JobParam jobParam);
-
-    /**
-     * 放货有货 （参数类型TaskExceptionRequest）
-     * @param taskExceptionRequest
-     * @return
-     */
-    AjaxResult reAssign(TaskExceptionRequest taskExceptionRequest);
-
-    /**
-     * 取货无货，重新分配单据
-     * @param jobParam
-     * @return
-     */
-    AjaxResult reMaterial(JobParam jobParam);
-
-    /**
-     * 取货无货（参数类型TaskExceptionRequest）
-     * @param taskExceptionRequest
-     * @return
-     */
-    AjaxResult reMaterial(TaskExceptionRequest taskExceptionRequest);
-
-    /**
-     * 入库请求生成作业
-     */
-    AjaxResult createInMydoJob(Map<String, Object> param);
-
-    /**
-     * @@@ FT568 入库请求生成作业 处理了请求响应，适应wms的自定义响应格式
-     */
-    AjaxResult createMydoJobForStockin(Map<String, Object> param);
-
-    /**
-     * 入库请求作业异常反馈（扫码失败、外形、称重等异常）
-     */
-    AjaxResult createInMydoJobException(Map<String, Object> param);
-
-    AjaxResult selectMydoJobByNoTrayCode(Map<String, Object> param);
-
-    AjaxResult receiveOutMydoJob(StockoutReceive stockoutReceive);
-
-    AjaxResult receiveInMydoJob(ReceiveJob receiveInJob);
-
-    AjaxResult selectMydoJobByTrayCodeAndEntranceId(HashMap<String, Object> paramMap);
-
-    AjaxResult deleteAgvTray(AgvQueue agvQueue);
-
-    AjaxResult requestWmsSpace(MydoJob mydoJob);
-
-
-
-
 
 }