#

zjj

2024-01-11 f31629c857a5cb607f67b1a7f89a826ad3f72563

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1001,8 +1001,8 @@
            //指令已完成，更新任务
            if (taskWrk.getIoType() == 1) {
                //入库任务
                taskWrk.setWrkSts(4);//3.吊车入库中 => 4.入库完成
                //taskWrk.setStatus(TaskStatusType.COMPLETE.id);
//                taskWrk.setWrkSts(4);//3.吊车入库中 => 4.入库完成
                taskWrk.setStatus(TaskStatusType.OVER.id);
                taskWrk.setModiTime(now);
                taskWrkService.updateById(taskWrk);

@@ -1015,8 +1015,8 @@
                locMastService.updateById(locMast);
            } else if (taskWrk.getIoType() == 2) {
                //出库任务
                taskWrk.setWrkSts(14);//12.吊车出库中 => 14.出库完成
//                taskWrk.setStatus(TaskStatusType.COMPLETE.id);
//                taskWrk.setWrkSts(14);//12.吊车出库中 => 14.出库完成
                taskWrk.setStatus(TaskStatusType.OVER.id);
                taskWrk.setModiTime(now);
                taskWrkService.updateById(taskWrk);


 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -271,10 +271,11 @@
                        );
                        JSONObject jsonObject = JSON.parseObject(response);
                        if (jsonObject.getInteger("code").equals(200)){
                            if (taskWrk.getIoType() == 3){
                            if (taskWrk.getIoType() == 3 || taskWrk.getIoType() == 1){
                                taskWrk.setWrkSts(4);
                            }else {
                                taskWrk.setWrkSts(14);
                            }
                            taskWrk.setStatus(5);
                            if (!taskWrkService.updateById(taskWrk)){
                                log.error("堆垛机任务完成，改变任务状态失败");
                            }

 src/main/resources/mapper/TaskWrkMapper.xml

@@ -129,8 +129,8 @@

    <select id="selectWorkingTask" resultMap="BaseResultMap">
        select * from dbo.wcs_task_wrk
        where (wrk_sts=3 and io_type = 1)
        or (wrk_sts=12 and io_type = 2)
        where (wrk_sts=4 and io_type = 1)
        or (wrk_sts=14 and io_type = 2)
        order by io_pri desc,create_time,wrk_no ASC
    </select>