流利架 入库出库逻辑

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

@@ -27,6 +27,14 @@ public class ToWcsApiController {
         toWcsService.pushOutMydoJob();
     }
 
+    /**
+     * 推送CTU流利架空料箱入库任务
+     */
+    @PostMapping("/pushInMydoJob")
+    public void pushInMydoJob(String trayCode) {
+        toWcsService.pushInMydoJob(trayCode);
+    }
+
     /**
      * 推送agv搬运作业
      * @return

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

@@ -14,4 +14,6 @@ public interface IToWcsService {
     void pushOutMydoJob();
 
     AjaxResult pushAgvMoveJob(GenAgvSchedulingTaskRequest genAgvSchedulingTaskRequest);
+
+    void pushInMydoJob(String trayCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.api.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.api.domain.GenAgvSchedulingTaskRequest;
@@ -39,6 +40,7 @@ public class ToWcsServiceImpl implements IToWcsService {
     private IMydoJobService mydoJobService;
 
     public static final String PUSH_OUT_MYDO_JOB = "http://localhost:8081/agv/api/receiveOutMydoJob";
+    public static final String PUSH_IN_MYDO_JOB = "http://localhost:8081/agv/api/receiveInMydoJob";
     public static final String PUSH_AGV_MOVE_JOB = "http://localhost:8081/agv/api/receiveAgvMoveJob";
 
 
@@ -71,4 +73,16 @@ public class ToWcsServiceImpl implements IToWcsService {
         }
         return AjaxResult.error(requestLog.getDuration());
     }
+
+    @Override
+    public void pushInMydoJob(String trayCode) {
+        MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(trayCode);
+        if (ObjUtil.isNotNull(mydoJob)){
+            RequestLog requestLog = requestLogService.getRequestLog(PUSH_IN_MYDO_JOB, JSONUtil.toJsonStr(mydoJob), "推送出库任务");
+            if ("1".equals(requestLog.getIsSuccessful())){
+                mydoJob.setStatus("2");
+                mydoJobService.updateMydoJob(mydoJob);
+            }
+        }
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java

@@ -129,6 +129,7 @@ public class ToWmsServiceImpl implements IToWmsService {
                 //查询拣选工位绑定的电子标签
                 BasTag tagParam = new BasTag();
                 tagParam.setPickAdd(wmsJobRequest.getPickSsj());
+                tagParam.setSpare3("1");
                 List<BasTag> tags = iBasTagService.selectBasTagList(tagParam);
                 if (tags.isEmpty()){
                     return AjaxResult.error("没有该拣选工位绑定的电子标签");