#

whycq

2024-06-02 f25494648b97bbc0e0da5f66ee01fc2b49fc3a27

 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,7 +35,9 @@
    @Autowired
    private AgvCommonService agvCommonService;
    @Autowired
    private WrkMastExecuteServiceImpl wrkMastExecuteService;
    private WrkMastExecuteService wrkMastExecuteService;
    @Autowired
    private WrkMastExecuteLogService wrkMastExecuteLogService;

    /**
     * 生成agv_wrk_mast_execute任务
@@ -115,9 +115,13 @@
        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);//任务完成
                    agvWrkMastService.updateById(agvWrkMast);
                    //生成agv_wrk_mast_execute任务历史档
                    wrkMastExecuteLogService.save(wrkMastExecute);
                    //删除执行档案
                    wrkMastExecuteService.deleteById(wrkMastExecute);
                }
            }catch (Exception e){
                log.error("完成agv_wrk_mast_execute任务异常===》异常原因："+e.getMessage());