lty
2025-03-24 77563840b71532f52ff04543886663582d5f1f19
#优化输送线循环逻辑
5个文件已修改
39 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/TaskWrkService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/TaskWrkMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -40,4 +40,6 @@
    List<TaskWrk> selectWorkingTask();//获取工作中的任务
    TaskWrk selectStaWorking(Integer wrkNo);
}
src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -34,4 +34,5 @@
     */
    int getStoreCount(Integer crnNo);
    TaskWrk selectStaWorking(Integer wrkNo);
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -209,7 +209,10 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                TaskWrk taskWrk = taskWrkMapper.selectById(staProtocol.getWorkNo());
                if(staProtocol.getWorkNo() == 0){
                    continue;
                }
                TaskWrk taskWrk = taskWrkMapper.selectStaWorking(Integer.valueOf(staProtocol.getWorkNo()));
                if(taskWrk != null &&  taskWrk.getWrkNo() < 9001 && taskWrk.getWrkNo() > 6000){
                    staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -1,32 +1,13 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.utils.CommandUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.core.DevpThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.StaProtocol;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -34,8 +15,6 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@Slf4j
@@ -254,4 +233,9 @@
    public int getStoreCount(Integer crnNo){
        return selectCount(new EntityWrapper<TaskWrk>().eq("crn_no", crnNo).in("wrk_sts",12,14,2));
    }
    @Override
    public TaskWrk selectStaWorking(Integer wrkNo){
        return this.baseMapper.selectStaWorking(wrkNo);
    }
}
src/main/resources/mapper/TaskWrkMapper.xml
@@ -134,4 +134,9 @@
        order by io_pri desc,create_time,wrk_no ASC
    </select>
    <select id="selectStaWorking" resultMap="BaseResultMap">
        select * from dbo.wcs_task_wrk
        where wrk_no = #{workNo}
    </select>
</mapper>