四期

zhangc

2025-03-06 b4ec8b4cc3476b49b9bc47e11ec03c4eecaba880

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

@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.constant.AsrsConstants;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.MesBuyPakinReportParam;
import com.zy.asrs.entity.param.MesOrderReportParam;
@@ -432,8 +433,18 @@
                    //目标站点
                    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) {
                            AgvLocMast locByFloor = null;
                            try {
                                locByFloor = agvCommonService.getLocByLocRule(3, 1, AsrsConstants.ERCHANG, true);
                            } catch (Exception e) {

                            }
                            if (locByFloor != null && locByFloor.getLocNo().endsWith("02F1")) {
                                AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
                                agvLocMast.setLocSts("O");
                                agvLocMast.setModiTime(now);
                                agvLocMast.setBarcode("");
                                agvLocMastService.updateById(agvLocMast);
                                wrkMast.setLocNo(locByFloor.getLocNo());
                            } else {
                                wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
@@ -444,7 +455,7 @@
                    } else {
                        wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
                    }

                    //wrkMast.setLocNo(agvWrkMast.getSourceLocNo());

                    //货架编码
                    wrkMast.setBarcode(agvWrkMast.getBarcode());
@@ -460,7 +471,7 @@
                    if (!agvWrkMastService.insertByIncrease(wrkMast)) {
                        throw new CoolException("保存工作档失败");
                    }
                    AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
                    AgvLocMast agvLocMast = agvLocMastService.selectById(wrkMast.getLocNo());
                    agvLocMast.setLocSts("S");
                    agvLocMast.setModiTime(now);
                    agvLocMastService.updateById(agvLocMast);