入口输送机重下任务功能和部分界面功能调整

2026-05-07 16:15:15 +08:00
parent bb148ee7e4
commit c30b7afab5
9 changed files with 254 additions and 220 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/common/TaskStatusCode.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/common/TaskStatusCode.java
@@ -27,10 +27,15 @@ public class TaskStatusCode {
     */
    public static final String TASK_STATUS_FINISH = "4";

+    /**
+     * 任务状态-手动完成
+     */
+    public static final String TASK_STATUS_FINISH_MANUAL = "5";
+
    /**
     * 任务状态-作废
     */
-    public static final String TASK_STATUS_INVALID = "5";
+    public static final String TASK_STATUS_INVALID = "6";


    //>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 【执行阶段】 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java
@@ -120,5 +120,17 @@ public class MydoJobController extends BaseController
        return mydoJobService.OuthandFinish(jobIds);
    }

+    @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:resendTaskToEntrance')")
+    @Log(title = "入口输送机重新下发", businessType = BusinessType.OTHER)
+    @PutMapping("/resendTaskToEntrance")
+    public AjaxResult resendTaskToEntrance(@RequestParam("jobId") String jobId){
+
+        if (jobId == null || jobId == "") return AjaxResult.error("未选择任务或选择任务异常");
+
+        MydoJob job = mydoJobService.selectMydoJobByJobId(jobId);
+        job.setExecutionPhase("0");
+        job.setStatus("1");
+        return toAjax(mydoJobService.updateMydoJob(job));
+    }

 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
@@ -94,7 +94,7 @@ public interface IMydoJobService

    AjaxResult OuthandFinish(String[] jobIds);

-    public AjaxResult ManuelTaskFinish(String[] taskNos);
+    AjaxResult ManuelTaskFinish(String taskNo);

    List<MydoJob> getInJobByEntranceId(String exitId);

@@ -102,6 +102,8 @@ public interface IMydoJobService

    MydoJob selectMydoJobByWmsTaskNo(String wmsTaskNo);

+
+
    /**
     * 获取本地生成作业号
     * @param type RK-入库 CK-出库
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
@@ -142,8 +142,6 @@ public class MydoJobServiceImpl implements IMydoJobService
        deleteMydoJobByJobId(task.getJobId());
        ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(task.getTaskNo());

-        log.info("【堆垛机入库】堆垛机："+ task.getRoadwayId() +"任务完成，任务号："+ rwh);
-
        JobCallBack jobCallBack = new JobCallBack();
        jobCallBack.setType(Integer.valueOf(task.getInOrOut()) < 20 ? "1" : "2");
        jobCallBack.setMydoJobId(task.getJobId());
@@ -211,21 +209,14 @@ public class MydoJobServiceImpl implements IMydoJobService
        //获取所有符合【任务单号】的作业
        for (String jobId : jobIds) {

-            //todo 是否需要校验响应成功后再执行历史表操作
-
            //插入历史表
            mydoJobMapper.insertHistory(jobId);

            //生成回传记录
            MydoJob mydoJob = mydoJobMapper.selectMydoJobByJobId(jobId);
            JobCallBack jobCallBack = new JobCallBack();
-            long jobIdNum = Long.parseLong(mydoJob.getInOrOut());
-            if (jobIdNum > 20){
-                jobCallBack.setType("2");
-            }else{
-                jobCallBack.setType("1");
-            }
-            jobCallBack.setTaskTypeCode(WMS_TASK_TYPE_FINISH);//todo wms下发的任务类型
+            jobCallBack.setType(mydoJob.getInOrOut());
+            jobCallBack.setTaskTypeCode(WMS_TASK_TYPE_FINISH);// wms自定义的任务类型
            jobCallBack.setMydoJobId(mydoJob.getJobId());
            jobCallBack.setStatus("0");
            jobCallBack.setTaskNo(Convert.toLong(mydoJob.getTaskNo()));
@@ -244,34 +235,30 @@ public class MydoJobServiceImpl implements IMydoJobService
    }

    /**
-     * 手动处理指定批量【任务号】的作业
-     * >>需要确定【jobid】是否由wms下发
-     * >>如果【jobid】和【taskno】是一对多的情况，使用上一个方法<OuthandFinish>手动完成作业会导致整个【jobid】单据完成回传
-     * >>如果【jobid】和【taskno】是一对一的情况，则直接使用 <OuthandFinish> 方法手动完成即可
-     * @param taskNos
+     * 手动处理指定【任务号】的作业
+     * @param taskNo
     * @return
     */
    @Override
-    public AjaxResult ManuelTaskFinish(String[] taskNos) {
+    public AjaxResult ManuelTaskFinish(String taskNo) {

        //获取所有符合【任务号】的作业
-        for (String taskNo : taskNos) {
-            MydoJob mydoJob = mydoJobMapper.selectMydoJobByTaskNo(taskNo);
-            mydoJobMapper.insertHistory(mydoJob.getInOrOut());
-            JobCallBack jobCallBack = new JobCallBack();
-            long jobIdNum = Long.parseLong(mydoJob.getInOrOut());
-            if (jobIdNum > 20) {
-                jobCallBack.setType("2");
-            } else {
-                jobCallBack.setType("1");
-            }
-            jobCallBack.setMydoJobId(mydoJob.getJobId());
-            jobCallBack.setStatus("0");
-            jobCallBack.setTaskNo(Convert.toLong(taskNo));
-            jobCallBack.setCreateTime(new Date());
-            jobCallBackService.insertJobCallBack(jobCallBack);
-            mydoJobMapper.deleteMydoJobByTaskNo(taskNo);
-        }
+        MydoJob mydoJob = mydoJobMapper.selectMydoJobByTaskNo(taskNo);
+        mydoJobMapper.insertHistory(mydoJob.getInOrOut());
+        JobCallBack jobCallBack = new JobCallBack();
+        jobCallBack.setType(mydoJob.getInOrOut());
+        jobCallBack.setTaskTypeCode(WMS_TASK_TYPE_FINISH);// wms下发的任务类型
+        jobCallBack.setMydoJobId(mydoJob.getJobId());
+        jobCallBack.setStatus("0");
+        jobCallBack.setTaskNo(Convert.toLong(mydoJob.getTaskNo()));
+        jobCallBack.setCreateTime(new Date());
+        jobCallBack.setTaskCode(mydoJob.getWmsTaskNo());
+        jobCallBack.setRetry(0);
+        jobCallBack.setReqCode(UUID.randomUUID().toString());
+        jobCallBackService.insertJobCallBack(jobCallBack);
+
+        mydoJobMapper.deleteMydoJobByTaskNo(taskNo);
+

        return AjaxResult.success("操作成功");
    }
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/TaskHandler.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/TaskHandler.java
@@ -24,6 +24,9 @@ import static com.ruoyi.common.TaskExceptionType.TASK_EXCEPTION_STOCKIN_OCCUPIED
 import static com.ruoyi.common.TaskStatusCode.*;
 import static com.ruoyi.common.WmsTaskTypeCode.WMS_TASK_TYPE_EXCEPTION;

+/**
+ * 处理wcs执行作业的定时任务类
+ */
@Component
@Slf4j
 public class TaskHandler {
@@ -39,13 +42,16 @@ public class TaskHandler {
    @Autowired
    private IDdjDeviceExecutionQueueService ddjDeviceExecutionQueueService;

+
+    private static final int DEFAULTTIMEINTERVAL = 2000;
+
+
    /**
     * 处理未正常移除的【堆垛机执行完成】或【出库到位】的遗留任务
     */
 //    @Scheduled(fixedDelay = 3000)
    public void mydoJobHandler() {
-        //此处 - 堆垛机执行完成【TASK_EP_DDJ_FINISH】和出库到位【TASK_EP_SSJ_STOCKOUT_FINISH】的常量值相同，均可表示任务【已完成】
-        //用任意一种状态查询所有标记为【已完成】的任务
+        //查询所有标记为【已完成】的任务
        List<MydoJob> jobs = mydoJobService.selectMydoJobList(
                new MydoJob().builder().executionPhase(TASK_EP_FINISH).build()
        );
@@ -57,23 +63,58 @@ public class TaskHandler {
    }


+    /**
+     * 【手动作废】 - 查询并处理标记为已经作废的任务
+     */
+    //@Scheduled(fixedDelay = 3000)
+    public void cancelMydoJob(){
+        List<MydoJob> jobs = mydoJobService.selectInOrOutMydoJobList(
+                new MydoJob().builder().status(TASK_STATUS_INVALID).build()
+        );
+
+        if (!jobs.isEmpty()) {
+            for (MydoJob job : jobs) {
+                mydoJobService.ManuelTaskFinish(job.getTaskNo());
+            }
+        }
+    }
+
+
+    /**
+     * 【手动完成】 - 查询并处理标记为已经手动完成的任务
+     */
+    //@Scheduled(fixedDelay = 3000)
+    public void finishMydoJob(){
+        List<MydoJob> jobs = mydoJobService.selectInOrOutMydoJobList(
+                new MydoJob().builder().status(TASK_STATUS_FINISH_MANUAL).build()
+        );
+
+        if (!jobs.isEmpty()) {
+            for (MydoJob job : jobs) {
+                mydoJobService.ManuelTaskFinish(job.getTaskNo());
+            }
+        }
+    }
+
+
    /**
     * 定时扫描未回传或回传异常的任务记录
     */
-    @Scheduled(fixedDelay=3000)
+    @Scheduled(fixedDelay = 3000)
    public void jobCallBack() {
        jobCallBackService.jobCallBack();
    }


    /**
-     * 入库异常 - 【放货有货】处理方法
+     * 【入库异常-请求重分】 - 【放货有货】处理方法
     */
-    @Scheduled(fixedDelay = 2000)
+    @Scheduled(fixedDelay = DEFAULTTIMEINTERVAL)
    public void stockinExceptionHandler() {
        List<MydoJob> jobs = mydoJobService.selectInOrOutMydoJobList(
                new MydoJob().builder().executionPhase(TASK_EXCEPTION_PUT).build()
        );
+
        if (!jobs.isEmpty()) {
            for (MydoJob job : jobs) {
                //上报异常 - 向wms请求重分接口
@@ -112,10 +153,11 @@ public class TaskHandler {

    }

+
    /**
-     * 出库异常 - 【取货无货】处理方法
+     * 【出库异常】 - 【取货无货】处理方法
     */
-    @Scheduled(fixedDelay = 2000)
+    @Scheduled(fixedDelay = DEFAULTTIMEINTERVAL)
    public void stockoutExceptionHandler() {
        List<MydoJob> jobs = mydoJobService.selectInOrOutMydoJobList(
                new MydoJob().builder().executionPhase(TASK_EXCEPTION_PICK).build()
@@ -146,10 +188,11 @@ public class TaskHandler {

    }

+
    /**
-     * 入库重分完成 - 堆垛机重新下发
+     * 【入库异常-重分完成】 - 堆垛机重新下发
     */
-    @Scheduled(fixedDelay = 2000)
+    @Scheduled(fixedDelay = DEFAULTTIMEINTERVAL)
    public void sendTaskForStacker(){
        List<MydoJob> jobs = mydoJobService.selectInOrOutMydoJobList(
                new MydoJob().builder().executionPhase(TASK_EXCEPTION_PUT_REASSIGN).build()
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/PortConvThread.java
@@ -300,6 +300,9 @@ public class PortConvThread implements Runnable {

    /**
     * 从 MOXA NPort 5110（TCP Server 模式）读取单次称重值
+     * ************测试方法************
+     * ************测试方法************
+     * ************测试方法************
     *
     * @param moxaIp   MOXA 设备 IP（如 "192.168.1.200"）
     * @param moxaPort MOXA 配置的 TCP 端口（如 4001）
--- a/ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        where status != '1' and retry &lt; 10
    </select>

-    <insert id="insertJobCallBack" parameterType="JobCallBack" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertJobCallBack" parameterType="JobCallBack" useGeneratedKeys="false" keyProperty="id">
        insert into job_call_back
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="type != null">type,</if>