*

whycq

2024-09-26 ec8f35851c6b92cf283579db68651abebc1a40e8

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

@@ -17,6 +17,8 @@
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.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +71,8 @@
    private AgvWrkDetlLogService agvWrkDetlLogService;
    @Autowired
    private WrkMastExecuteService wrkMastExecuteService;
    @Autowired
    private ConfigService configService;


    /*
@@ -280,7 +284,9 @@
            String locNo = agvWrkMast.getLocNo();
            agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo());
            agvWrkMast.setSourceLocNo(locNo);
            agvWrkMast.setModiTime(new Date());
            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();
@@ -513,7 +534,6 @@
        updateAgvLocMast(agvLocMast,"S");
        return agvLocMast.getLocNo();
    }

    /*
    空板出库
     */
@@ -525,6 +545,10 @@
        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
        if(!agvBasDevp.getLocSts().equals("O")){
            throw new CoolException("当前工作位状态为" + agvBasDevp.getLocSts()+",无法进行空板出库");
        }
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvBasDevp.getDevNo()));
        if(!Cools.isEmpty(agvWrkMast)){
            throw new CoolException("有货架在往站点搬运" + agvBasDevp.getDevNo()+",无法进行空板出库");
        }

        //寻找相应类型的空货架
@@ -692,7 +716,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);
@@ -821,9 +847,11 @@
                String targetLocNo = wrkMast.getLocNo();
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
                agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                // 源库位 库位主档
                AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
                AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
                // 当前任务是跨层移库  且目标楼层是1楼的 回滚调拨单
                if (wrkMast.getIoType() == 12 && locMast.getFloor() == 1) {
                if (wrkMast.getIoType() == 12 && locMast.getFloor() == 1 && sourceLocMast.getFloor() != 1) {
                    List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
                    for (AgvLocDetl agvLocDetl : agvLocDetls) {
                        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("order_no", "DB" + agvLocDetl.getOrderNo()));
@@ -911,7 +939,7 @@

            }

            if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12){
            if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
                //订单回滚
                //List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
@@ -1093,6 +1121,7 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        wrkMast.setLogErrMemo("createWaitPainWrkMastStart");

        if (!agvWrkMastService.insertByIncrease(wrkMast)) {
            throw new CoolException("保存工作档失败");
@@ -1178,9 +1207,11 @@
        }
        if (wrkMast.getIoType() == 108) {
            wrkMast.setIoType(111);
            wrkMast.setModiTime(new Date());
            agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
        } else if(wrkMast.getIoType() == 111) {
            wrkMast.setIoType(108);
            wrkMast.setModiTime(new Date());
            agvWrkMastService.update(wrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", workNo));
        }

@@ -1204,4 +1235,4 @@

    }

}
}