#配置信号

1

8 天以前 a288efbac8d731488f582da50d39c4b5e0419920

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

@@ -311,6 +311,15 @@
                dtos.add(new OutLocDto(locNo, locDetlDto));
            }
        }
        Config config = configService.selectConfigByCode("AutoMPArea");

        List<LocMast> list = locMastMapper.selectList(
                new EntityWrapper<LocMast>()
                        .eq("whs_type", 5)
                        .eq("loc_sts", "O")
        );
        LocMast locMastRgv = list.isEmpty() ? null : list.get(0);

        Integer ioType = null;
        // 生成工作档
        for (OutLocDto dto : dtos) {
@@ -332,6 +341,10 @@

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            if(ioType.equals(107)){
                staDesc = staDescService.queryCrnStnCheck(ioType, locMast.getCrnNo(), outSta);
            }

            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
@@ -351,6 +364,12 @@
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());
//            if(locMastRgv !=null){
                if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //若有空库位且配置允许则绑定其备料库位号
//                    wrkMast.setLocNo(locMastRgv.getLocNo());
                    wrkMast.setTakeNone("0");  //0rgv未取，1rgv已取货
                }
//            }
            wrkMast.setAppeUser(userId); // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
@@ -376,6 +395,20 @@
                    throw new CoolException("保存工作档明细失败");
                }
            }
//            if(locMastRgv !=null){
//                if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //若有空库位且配置允许则绑定其备料库位号
//                    //修改agv备料区状态
//                    if(locMastRgv.getLocSts().equals("O") && ioType != 107){
//                        locMastRgv.setLocSts("S");
//                        locMastRgv.setModiUser(userId);
//                        locMastRgv.setModiTime(now);
//                        if (!locMastService.updateById(locMastRgv)) {
//                            throw new CoolException("预约agv备料区库位状态失败，库位号："+locMastRgv.getLocNo());
//                        }
//                    }
//                }
//            }

            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
            locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("F")) {
@@ -493,10 +526,10 @@
            locMastRgv.setModiUser(userId);
            locMastRgv.setModiTime(now);
            if (!locMastService.updateById(locMastRgv)) {
                throw new CoolException("预约agv备料区库位状态失败，库位号："+taskDto.getLocNo());
                throw new CoolException("预约agv备料区库位状态失败，库位号："+locMastRgv.getLocNo());
            }
        }else{
            throw new CoolException(taskDto.getLocNo() + "备料区不是空库位状态");
            throw new CoolException(locMastRgv.getLocNo() + "备料区不是空库位状态");

        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中