1

zhang

2025-09-10 5ceb1fc9be10e20d1f6e59382b2d14c8034485cf

 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;
@@ -15,6 +16,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;
@@ -44,7 +46,7 @@
    private static final List<Integer> MOVE_TYPE_List = new ArrayList<Integer>() {{
        add(11);
        add(12);
        //add(53);
        add(53);
        add(101);
        add(103);
        add(108);
@@ -115,6 +117,9 @@
    @Autowired
    private ReportDataService reportDataService;

    @Autowired
    private AgvCommonService agvCommonService;


    @Transactional
    public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
@@ -145,13 +150,15 @@
                    }
                }
                if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
                    agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
                    agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
                    if (agvLocMast != null) {
                        pltType = agvLocMast.getPltType();
                    }
                }
                agvWrkMast.setPltType(pltType);
                log.info("仓库编码：{}",agvWrkMast.getPltType());
                if (pltType != null) {
                    agvWrkMast.setPltType(pltType);
                }
                //log.info("工作号--{},仓库编码：{}", agvWrkMast.getWrkNo(), agvWrkMast.getPltType());
            }
            agvWrkMast.setModiTime(new Date());
            //修改工作档状态为207.库存更新完成
@@ -169,7 +176,7 @@

            switch (agvWrkMast.getIoType()) {
                case 1:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    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);
@@ -181,15 +188,28 @@
                    break;
                case 10:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                    AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
                    if (byDevNo != null) {
                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {

                        } else {
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                        }
                    }
                    //agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                    break;
                case 11:
                case 12:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    AgvLocDetl agvLocDetl1 = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo());
                    if (agvLocDetl1 == null) {
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    } else {
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    }
                    //更新库存明细
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(),null);
                    //修改源库位状态为O
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null, "");
                    break;
                case 53:
                    //修改工作党明细
@@ -234,7 +254,14 @@

                    });
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
                    if (byDevNo != null) {
                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {

                        } else {
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                        }
                    }
                    break;
                case 57:
                    // 更新库存明细
@@ -251,20 +278,27 @@
                        }
                    });
                    // 更新站点 + 库位状态     源库位是站点
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
                    if (byDevNo != null) {
                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {

                        } else {
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                        }
                    }
                    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());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    //agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    break;
                case 108:
                case 114:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    //更新库存明细
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                    //修改源库位状态为O
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
//                    //更新库存明细
//                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
//                    //修改源库位状态为O
//                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                    break;
                case 109:
                    // 库位 -- 接驳位 / 库位
@@ -280,7 +314,7 @@
                        // 库位 -- 接驳位 / 库位
                    } else {
                        //修改源库位状态为O
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                        //agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                    }
                    break;
                case 111:
@@ -333,7 +367,7 @@
                case 121:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    //更新库存明细
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(),agvWrkMast.getAppeUser());
                    //修改源库位状态为O
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                    break;
@@ -419,16 +453,43 @@
                    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 = 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());
                            }
                        } else {
                            wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
                        }
                    } else {
                        wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
                    }
                    //wrkMast.setLocNo(agvWrkMast.getSourceLocNo());

                    //货架编码
                    wrkMast.setBarcode(agvWrkMast.getBarcode());
                    //货架类型
                    wrkMast.setWhsType(Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)));

                    wrkMast.setAppeUser(9527L);
                    wrkMast.setAppeUser(agvWrkMast.getAppeUser());
                    wrkMast.setAppeTime(now);
                    wrkMast.setModiUser(9527L);
                    wrkMast.setModiTime(now);
@@ -437,7 +498,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);
@@ -571,7 +632,7 @@
            return SUCCESS;
        } catch (Exception e) {
            //TODO
            log.error("修改AGV入库通知档状态入出状态为Y,{}", e.getMessage());
            //log.error("修改AGV入库通知档状态入出状态为Y,{}", e.getMessage());
        }
        return FAIL;
    }
@@ -736,12 +797,12 @@
            if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
                reportMesPakinOrder(agvWrkMast, data);
            }
            if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
                reportMesPakoutOrder(agvWrkMast, data);
            }
            if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
                generateMesParam(agvWrkMast, data);
            }
//            if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
//                reportMesPakoutOrder(agvWrkMast, data);
//            }
//            if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
//                generateMesParam(agvWrkMast, data);
//            }
        }

    }
@@ -771,7 +832,7 @@
                iteam.setLineNo(orderDetl.getItemNum());
                iteam.setSupplierCode(order.getSalesman());
                iteam.setUnit(agvWrkDetl.getUnit());

                iteam.setRemark(agvWrkDetl.getThreeCode());
                iteams.add(iteam);

                mesBuyPakinReportParam.setCode(orderNo);
@@ -818,11 +879,11 @@
        MesOrderReportParam param = new MesOrderReportParam();

        List<MesOrderReportParam.TransferOrderItem> transferOrderItems = new ArrayList<>();
        List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>();
        List<MesOrderReportParam.RecordCustomFieldBaseCO.CustomField> customFields = new ArrayList<>();

        //MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customFields = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField();

        MesOrderReportParam.RecordCustomFieldBaseCO recordCustomFieldBaseCO = new MesOrderReportParam.RecordCustomFieldBaseCO();
        recordCustomFieldBaseCO.setCustomFields(customFields);
        //recordCustomFieldBaseCO.setCustomFields(customFields);
        param.setRecordCustomFieldBaseCO(recordCustomFieldBaseCO);

        //添加transferOrderItem属性
@@ -837,11 +898,12 @@
            transferOrderItem.setTargetLocationCode(getTargetLocationByFloor(floor));
        }
        transferOrderItems.add(transferOrderItem);
        transferOrderItem.setInventoryDetails(inventoryDetails);


        param.setTransferOrderItems(transferOrderItems);

        for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
            List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>();
            MesOrderReportParam.TransferOrderItem.InventoryDetail inventoryDetail = new MesOrderReportParam.TransferOrderItem.InventoryDetail();
            //添加amount属性
            MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount amount = new MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null);
@@ -855,12 +917,13 @@
            inventoryDetail.setQcStatus(1);
            inventoryDetail.setStorageStatus(1);
            inventoryDetails.add(inventoryDetail);
            transferOrderItem.setInventoryDetails(inventoryDetails);
            //添加销售订单号
            MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customField = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField("workOrderCode__c", agvWrkDetl.getThreeCode().trim());
            customFields.add(customField);
            //customFields.add(customField);
            recordCustomFieldBaseCO.setCustomFields(customField);
            doHttpRequest(param, getMesTokenInfo(), "上报mes调拨信息", url, orderReportPath, null, "127.0.0.1");
        }

        doHttpRequest(param, getMesTokenInfo(), "上报mes调拨信息", url, orderReportPath, null, "127.0.0.1");

    }