优化异常处理及订单同步逻辑

zhangc

2025-01-07 ce43df438a4bbef5b9ffaed0a33a97db6e88fbf1

 src/main/java/com/zy/asrs/task/AutoMoveCreateExecuteScheduler.java

@@ -6,9 +6,7 @@
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvLocMastService;
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.WrkMastExecuteServiceImpl;
import com.zy.asrs.task.handler.AutoMoveCreateExecuteHandler;
import com.zy.common.service.AgvCommonService;
@@ -37,14 +35,16 @@
    @Autowired
    private AgvCommonService agvCommonService;
    @Autowired
    private WrkMastExecuteServiceImpl wrkMastExecuteService;
    private WrkMastExecuteService wrkMastExecuteService;
    @Autowired
    private WrkMastExecuteLogService wrkMastExecuteLogService;

    /**
     * 生成agv_wrk_mast_execute任务
     */
    @Scheduled(cron = "0/2 * * * * ? ")
//    @Scheduled(cron = "0/2 * * * * ? ")
    private void autoMove(){
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 121).eq("wrk_sts",11));
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 121).eq("wrk_sts",11).orderBy("io_pri",false));
        for (AgvWrkMast agvWrkMast:agvWrkMastList){
            try{
                Date now = new Date();
@@ -109,15 +109,20 @@
    /**
     * 完成agv_wrk_mast_execute任务
     */
    @Scheduled(cron = "0/2 * * * * ? ")
//    @Scheduled(cron = "0/2 * * * * ? ")
    private void autoMoveEnd(){
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 121).eq("wrk_sts",12));
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 121).eq("wrk_sts",12).orderBy("io_pri",false));
        for (AgvWrkMast agvWrkMast:agvWrkMastList){
            try{
                WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_no", agvWrkMast.getWrkNo().longValue()));
                if (!Cools.isEmpty(wrkMastExecute) && wrkMastExecute.getWrkSts()==2 && wrkMastExecute.getNowPosition()==4){
                    agvWrkMast.setWrkSts(14L);//任务完成
                if (!Cools.isEmpty(wrkMastExecute) && wrkMastExecute.getWrkSts()==3L && wrkMastExecute.getNowPosition()==3){
                    agvWrkMast.setWrkSts(205L);//任务完成
                    agvWrkMast.setModiTime(new Date());
                    agvWrkMastService.updateById(agvWrkMast);
                    //生成agv_wrk_mast_execute任务历史档
                    wrkMastExecuteLogService.save(wrkMastExecute);
                    //删除执行档案
                    wrkMastExecuteService.deleteById(wrkMastExecute);
                }
            }catch (Exception e){
                log.error("完成agv_wrk_mast_execute任务异常===》异常原因："+e.getMessage());