四期

zhangc

2025-03-07 252bfe6c268c95444525c16c95845a4ee8d10fd5

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

@@ -168,8 +168,8 @@
                            locDto.getCsocode(),
                            locDto.getIsoseq(),
                            locDto.getProcessSts());
                    OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    //OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                   // AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    // 流水 -- 新增订单明细
//                    FlowLog flowLog = new FlowLog();
//                    flowLog.setFid(String.valueOf(flowId));
@@ -580,7 +580,7 @@
                }
            } else {
                if (station.endsWith("F4") && locType == 3) {
                    agvLocMast = agvCommonService.getLocNo(locType, 1, false, false);
                    agvLocMast = agvCommonService.getLocNoOnXiSuer(locType, 1);
                } else {
                    List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
                    if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
@@ -741,7 +741,8 @@
//                    //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
//                }
//            }
            agvLocMast = agvCommonService.getLocByLocRule(3, 1, code);
            // 预留20个库位
            agvLocMast = agvCommonService.getLocByLocRule20(3, 1, code,false);


            String devNo = agvBasDevp.getDevNo();