四期

zhangc

2025-03-02 b13b6baf03a0860d0aa7fe7536bf2313588bf8ae

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -15,6 +15,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.service.AgvCommonService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -115,6 +116,9 @@
    @Autowired
    private ReportDataService reportDataService;

    @Autowired
    private AgvCommonService agvCommonService;


    @Transactional
    public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
@@ -171,7 +175,7 @@

            switch (agvWrkMast.getIoType()) {
                case 1:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(),agvWrkMast.getCtnNo());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());
                    //更新目标库位明细
                    log.info("更新目标库位明细 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo);
                    agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(), wrkNo);
@@ -191,7 +195,7 @@
                    //更新库存明细
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                    //修改源库位状态为O
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null,"");
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null, "");
                    break;
                case 53:
                    //修改工作党明细
@@ -254,7 +258,7 @@
                    });
                    // 更新站点 + 库位状态     源库位是站点
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(),agvWrkMast.getCtnNo());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());
                    break;
                case 58:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
@@ -421,10 +425,27 @@
                    wrkMast.setIoTime(now);
                    //优先级
                    wrkMast.setIoPri(300.0);

                    //源站点
                    wrkMast.setSourceLocNo(agvWrkMast.getLocNo());

                    //目标站点
                    wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
                    if (agvWrkMast.getLocNo().startsWith("QO") && agvWrkMast.getLocNo().endsWith("F4") && Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)) == 30) {
                        if (!agvWrkMast.getSourceLocNo().endsWith("02F1")) {
                            AgvLocMast locByFloor = agvCommonService.getLocByFloor(3, 1);
                            if (locByFloor != null) {
                                wrkMast.setLocNo(locByFloor.getLocNo());
                            } else {
                                wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
                            }
                        } else {
                            wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
                        }
                    } else {
                        wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
                    }


                    //货架编码
                    wrkMast.setBarcode(agvWrkMast.getBarcode());
                    //货架类型