双单位

zhangchao

2024-11-15 7c1af4c63e66754f0868c1a501f4895f9cbc9213

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

@@ -5,6 +5,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.MesBuyPakinReportParam;
@@ -57,6 +59,8 @@

    @Value("${agvBasDev.maxWorkNum}")
    private int maxWrokNum;
    @Value("${mes.report}")
    private Boolean flag;
    @Value("${mes.url}")
    private String url;
    @Value("${mes.getTokenUrl}")
@@ -105,12 +109,18 @@
    private DocTypeService docTypeService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private FlowLogService flowLogService;

    @Transactional
    public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
        //用于上报mes的工作档明细
        List<AgvWrkDetl> agvWrkDetlListOld = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));

        long flowId = snowflakeIdWorker.nextId();
        Date now = new Date();
        try {
            int wrkNo = agvWrkMast.getWrkNo();
            String barcode = agvWrkMast.getBarcode();
@@ -169,6 +179,34 @@
                        AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                        if (!Cools.isEmpty(agvLocDetl)) {
                            double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
//                            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode());
//                            FlowLog flowLog = new FlowLog();
//                            flowLog.setFid(String.valueOf(flowId));
//                            flowLog.setSpare2(String.valueOf(agvWrkMast.getWrkNo()));
//                            flowLog.setLocNo(agvWrkMast.getLocNo());
//                            flowLog.setSpare1(agvWrkDetl.getSuppCode());
//                            flowLog.setOpType(53L);
//                            flowLog.setOrderNo(agvWrkDetl.getOrderNo());
//                            flowLog.setThreeCode(agvWrkDetl.getThreeCode());
//                            flowLog.setMatnr(agvWrkDetl.getMatnr());
//                            flowLog.setMaktx(agvWrkDetl.getMaktx());
//
//                            flowLog.setOrderPrevious(orderDetl.getAnfme());
//                            flowLog.setOrderCurrent(orderDetl.getAnfme());
//                            flowLog.setOrderChanged(0.0);
//
//                            flowLog.setQtyPrevious(orderDetl.getQty());
//                            flowLog.setQtyCurrent(updateAnfme);
//                            flowLog.setQtyChanged(agvWrkDetl.getAnfme());
//
//                            flowLog.setLocPrevious(agvLocDetl.getAnfme());
//                            flowLog.setLocCurrent(updateAnfme);
//                            flowLog.setLocChanged(agvWrkDetl.getAnfme());
//
//                            flowLog.setAppeTime(now);
//                            if (!flowLogService.insert(flowLog)) {
//                                throw new CoolException("同步半成品调拨单流水记录失败");
//                            }
                            agvLocDetlService.updateAnfme(updateAnfme, agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
                        }
                        //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
@@ -178,7 +216,6 @@
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    break;
                case 57:
                    Date now = new Date();
                    // 更新库存明细
                    List<AgvWrkDetl> wrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
                    wrkDetlList.forEach(agvWrkDetl -> {
@@ -318,11 +355,7 @@
        }
        //TODO
        //暂时加上trycatch
        try {
            reportMes(agvWrkMast, agvWrkDetlListOld);
        } catch (Exception e) {
            e.printStackTrace();
        }
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }

@@ -482,7 +515,7 @@
            log.error("" + e.getMessage());
        }
        //TODO 张超
        //reportMes(agvWrkMast, agvWrkDetlListOld);
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }

@@ -507,7 +540,7 @@
            return SUCCESS;
        } catch (Exception e) {
            //TODO
            //log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
        }
        return FAIL;
    }
@@ -657,6 +690,9 @@
    }

    private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
        if (!flag){
            return;
        }
        if (Cools.isEmpty(agvWrkDetls)) {
            return;
        }
@@ -835,7 +871,7 @@
            if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
                log.info("mes接口调用失败，返回信息：" + jsonObject);
                //TODO 张超
                //throw new CoolException("mes接口调用失败，返回信息:" + jsonObject);
                throw new CoolException("mes接口调用失败，返回信息:" + jsonObject);
            }
            success = true;
            return jsonObject;