任务表查询排序

ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.job.mapper.MydoJobMapper;
 import com.ruoyi.job.domain.MydoJob;
 import com.ruoyi.job.service.IMydoJobService;
 
+import static com.ruoyi.common.TaskStatusCode.TASK_STATUS_FINISH_MANUAL;
 import static com.ruoyi.common.WmsTaskTypeCode.*;
 
 /**
@@ -226,11 +227,14 @@ public class MydoJobServiceImpl implements IMydoJobService
         //获取所有符合【任务单号】的作业
         for (String jobId : jobIds) {
 
+            //生成回传记录
+            MydoJob mydoJob = mydoJobMapper.selectMydoJobByJobId(jobId);
+            mydoJob.setStatus(TASK_STATUS_FINISH_MANUAL);
+            updateMydoJob(mydoJob);
+
             //插入历史表
             mydoJobMapper.insertHistory(jobId);
 
-            //生成回传记录
-            MydoJob mydoJob = mydoJobMapper.selectMydoJobByJobId(jobId);
             JobCallBack jobCallBack = new JobCallBack();
             jobCallBack.setType(mydoJob.getInOrOut());
             jobCallBack.setTaskTypeCode(WMS_TASK_TYPE_FINISH);// wms自定义的任务类型
@@ -245,6 +249,7 @@ public class MydoJobServiceImpl implements IMydoJobService
             jobCallBackService.insertJobCallBack(jobCallBack);
 
             //移除实时任务
+
             mydoJobMapper.deleteMydoJobByJobId(jobId);
 
             log.info("【人工操作】手动完成wcs任务，wcs任务号:{}，wms任务号:{}", mydoJob.getTaskNo(), mydoJob.getWmsTaskNo());