#

whycq

2024-08-02 e97bfb5567d95dea572f84a84db9c4151b884656

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

@@ -17,8 +17,11 @@
import com.zy.common.model.TaskDto;
import com.zy.common.service.AgvCommonService;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -69,6 +72,8 @@
    private AgvWrkDetlLogService agvWrkDetlLogService;
    @Autowired
    private WrkMastExecuteService wrkMastExecuteService;
    @Autowired
    private ConfigService configService;


    /*
@@ -281,6 +286,7 @@
            agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo());
            agvWrkMast.setSourceLocNo(locNo);
            agvWrkMast.setIoTime(now);
            agvWrkMast.setLogErrMemo("createWaitPainWrkMastStart");
            agvWrkMastService.updateById(agvWrkMast);

            List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
@@ -475,13 +481,28 @@
                    }
                }
            });
            if (isCurrLev.get()) {
                agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);


            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks"));
            if (Cools.isEmpty(config)) {
                if (isCurrLev.get()) {
                    agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
                } else {
                    agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                }
            } else {
                agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
                if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
                    agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
                } else {
                    if (isCurrLev.get()) {
                        agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,true);
                    } else {
                        agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                    }
                    //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                }
            }



            String devNo = agvBasDevp.getDevNo();
            String locNo = agvLocMast.getLocNo();
@@ -499,7 +520,7 @@
        }else {
            //查询工作档
            AgvWrkMast agvWrkMast1 = agvWrkMastService.selectByContainerCode(containerCode);
            if (Cools.isEmpty(agvWrkMast1)) {
            if (!Cools.isEmpty(agvWrkMast1)) {
                throw new CoolException("当前货架已有入库任务，无法进行入库");
            }
            agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);
@@ -513,7 +534,6 @@
        updateAgvLocMast(agvLocMast,"S");
        return agvLocMast.getLocNo();
    }

    /*
    空板出库
     */
@@ -692,7 +712,9 @@
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        }

        if (wrkMast.getIoType() == 113 && (wrkMast.getWrkSts() != 212L || wrkMast.getWrkSts() != 213L || wrkMast.getWrkSts() != 214L)) {
            throw new CoolException(workNo+"不支持手动维护");
        }
        if (wrkMast.getIoType()==121){
            if (wrkMast.getWrkSts()<12L){
                agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205,"手动完成",userId);
@@ -1093,6 +1115,7 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        wrkMast.setLogErrMemo("createWaitPainWrkMastStart");

        if (!agvWrkMastService.insertByIncrease(wrkMast)) {
            throw new CoolException("保存工作档失败");
@@ -1204,4 +1227,4 @@

    }

}
}