产线输送机

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

@@ -29,7 +29,7 @@ public class Wcs2WmsController {
     }
 
     /**
-     * 接收流利架空料箱入库任务
+     * 接收入库任务
      *
      * @param receiveInJob
      * @return
@@ -39,16 +39,7 @@ public class Wcs2WmsController {
         return apiService.receiveInMydoJob(receiveInJob);
     }
 
-    /**
-     * 流利架出库确认,清空状态记录表
-     *
-     * @param jobParam
-     * @return
-     */
-    @PostMapping("/outMydojobMakesure")
-    public AjaxResult outMydojobMakesure(@RequestBody JobParam jobParam) {
-        return apiService.outMydojobMakesure(jobParam);
-    }
+
 
     /**
      * 取消ctu任务

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

@@ -132,12 +132,7 @@ public interface IApiService
      */
     AjaxResult receiveInMydoJob(ReceiveJob receiveInJob);
 
-    /**
-     * 流利架状态清空表
-     * @param jobParam
-     * @return
-     */
-    AjaxResult outMydojobMakesure(JobParam jobParam);
+
     /**
      * 取消ctu任务
      * @param jobParam
@@ -158,4 +153,9 @@ public interface IApiService
      * @return
      */
     AjaxResult reAssignMydoJob2(JobParam jobParam);
+
+    /**
+     * 入库请求生成作业
+     */
+    public AjaxResult createInMydoJob(Map<String, Object> param);
 }

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

@@ -259,25 +259,6 @@ public class ApiServiceImpl implements IApiService {
         }
     }
 
-    /**
-     * 流利架出库确认，清空流利架状态信息
-     * @param jobParam
-     * @return
-     */
-    @Override
-    public AjaxResult outMydojobMakesure(JobParam jobParam) {
-        BasFluentFrame param = new BasFluentFrame();
-        param.setTrayCode(jobParam.getTrayCode());
-        List<BasFluentFrame> basFluentFrames = fluentFrameService.selectBasFluentFrameList(param);
-        if (CollUtil.isEmpty(basFluentFrames)){
-            return AjaxResult.error("无流利架信息");
-        }
-        BasFluentFrame basFluentFrame = basFluentFrames.get(0);
-        basFluentFrame.setTrayCode("");
-        basFluentFrame.setAllotNum(0L);
-        fluentFrameService.updateBasFluentFrame(basFluentFrame);
-        return AjaxResult.success();
-    }
     /**
      * 取消ctu任务
      *
@@ -405,5 +386,13 @@ public class ApiServiceImpl implements IApiService {
         return genAgvSchedulingTask(genAgvSchedulingTaskRequest);
     }
 
-
+    @Override
+    public AjaxResult createInMydoJob(Map<String, Object> param) {
+        RequestLog requestLog = requestLogService.getRequestLog(CREATE_IN_MYDO_JOB_URL, "入库请求生成作业", JSONUtil.toJsonStr(param));
+        if ("1".equals(requestLog.getIsSuccessful())) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
 }