流程测试修改

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

@@ -80,4 +80,17 @@ public class ToWmsApiController {
         return ajaxResult;
     }
 
+    /**
+     * 获取任务
+     * @param mydoJob
+     * @return
+     */
+    @PostMapping("/getJob")
+    public AjaxResult getJob(@RequestBody MydoJob mydoJob) {
+        AjaxResult ajaxResult = toWmsService.getJob(mydoJob);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(mydoJob), "getJob");
+        requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));
+        requestLogService.insertRequestLog(requestLog);
+        return ajaxResult;
+    }
 }

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

@@ -18,4 +18,6 @@ public interface IToWmsService {
     AjaxResult reAssign(MydoJob mydoJob);
 
     AjaxResult reMaterial(MydoJob mydoJob);
+
+    AjaxResult getJob(MydoJob mydoJob);
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.api.service.impl;
 
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
@@ -83,6 +85,7 @@ public class ToWmsServiceImpl implements IToWmsService {
             mydoJob.setExecutionPhase("2");
             mydoJob.setEntranceId(param.getEntranceId());
             mydoJob.setStatus("3");
+            mydoJob.setStartTime(DateUtil.formatDateTime(DateUtil.date()));
             mydoJobService.updateMydoJob(mydoJob);
         }
         return AjaxResult.success(mydoJob);
@@ -209,4 +212,14 @@ public class ToWmsServiceImpl implements IToWmsService {
         //调用自动分配
         return outStockoutService.autoAllot(stockOutId);
     }
+
+    @Override
+    public AjaxResult getJob(MydoJob mydoJob) {
+        List<MydoJob> mydoJobs = mydoJobService.selectMydoJobListApi(mydoJob);
+        if (mydoJobs.isEmpty()){
+            return AjaxResult.error("没有该作业");
+        }else {
+            return AjaxResult.success(mydoJobs);
+        }
+    }
 }