3077,3106只有合格能出,2041 只有待判能出

pang.jiabao

1 天以前 e012a72a5660566d698c93ca4f29b6e5ffe997b0

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

@@ -116,6 +116,8 @@
    private SlaveProperties slaveProperties;
    @Autowired
    private WaitPakinService waitPakinService;
    @Resource
    private OpenServiceImpl openService;

    @Override
    @Transactional
@@ -210,8 +212,13 @@
                one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo()));
            }
            if (null != one && !paramLocDetl.getMatnr().equals("空箱")) {
                if (!"合格".equals(one.getThreeCode())) {
                // 3077 3106 只有合格能出
                if((param.getOutSite() == 3077 || param.getOutSite() == 3106) && !"合格".equals(one.getThreeCode())) {
                    throw new CoolException(one.getModel() + "卷不合格:" + one.getThreeCode());
                }
                // 2041 只有待判能出
                if(param.getOutSite() == 2041 && null != one.getThreeCode()) {
                    throw new CoolException(one.getModel() + "卷不为待判:" + one.getThreeCode());
                }
                locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
            } else {
@@ -561,6 +568,130 @@
                }
                // 修改订单明细
                orderDetlMapper.updateOrderDetlByGroupNo(detlDto.getOrderNo(), detlDto.getLocDetl().getBrand(), 1);
                // 修改订单状态
                orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(), 2L, userId);
            }

            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
            locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("F")) {
                locMast.setLocSts(ioType == 101 ? "R" : "P");
                locMast.setModiUser(userId);
                locMast.setModiTime(now);
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("预约库位状态失败，库位号：" + dto.getLocNo());
                }
            } else {
                throw new CoolException(dto.getLocNo() + "库位不是在库状态");
            }
        }
    }

    @Override
    @Transactional
    public void stockOut2(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId, String groupOrderNumber) {
        Date now = new Date();
        // 合并同类项
        Set<String> locNos = new HashSet<>();
        List<OutLocDto> dtos = new ArrayList<>();
        for (LocDetlDto locDetlDto : locDetlDtos) {
            String locNo = locDetlDto.getLocDetl().getLocNo();
            if (locNos.contains(locNo)) {
                for (OutLocDto dto : dtos) {
                    if (dto.getLocNo().equals(locNo)) {
                        dto.getLocDetlDtos().add(locDetlDto);
                        break;
                    }
                }
            } else {
                locNos.add(locNo);
                dtos.add(new OutLocDto(locNo, locDetlDto));
            }
        }
        Integer ioType = null;
        // 生成工作档
        for (OutLocDto dto : dtos) {
            // 判断入出库类型：101.全板出库 or 103.拣料出库
            if (ioWorkType == null) {
                ioType = dto.isAll() ? 101 : 103;
            } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
                ioType = 107;
            } else if (ioWorkType.equals(IoWorkType.ALL_OUT)) {
                ioType = 101;
            }
            assert ioType != null;
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            Integer outSta = staNo.getDevNo();
//            //2号堆垛机全板出库站指定为204站，拣料站指定为202
//            if(locMast.getCrnNo()==2){
//                outSta = ioType == 101 ? 204 : 202;
//            }

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(ioType); // 入出库状态
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setSheetNo("0");
            wrkMast.setMemo(groupOrderNumber);
            if (staDesc.getStnNo() < 118 || staDesc.getStnNo() > 121) {
                wrkMast.setSheetNo("3");
            }
            wrkMast.setBarcode(locMast.getBarcode());
            wrkMast.setAppeUser(userId); // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号：" + dto.getLocNo());
            }
            // 生成工作档明细
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
                    continue;
                }
                WrkDetl wrkDetl = new WrkDetl();
                List<OrderDetl> orderDetl = orderDetlService.selectByModel(detlDto.getLocDetl().getModel());
                wrkDetl.sync(detlDto.getLocDetl());
                for (OrderDetl orderDetlDto : orderDetl) {
                    if (orderDetlDto.getSupp() != null) {
                        wrkDetl.setSupp(orderDetlDto.getSupp());
                    }
                    if (orderDetlDto.getMemo() != null) {
                        wrkDetl.setMemo(orderDetlDto.getMemo());
                    }
                }
                wrkDetl.setOrderNo(detlDto.getOrderNo()); // 手动出库不需要带出库存中的单据编号
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
                wrkDetl.setAnfme(anfme); // 数量
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
                wrkDetl.setModiUser(userId);
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
                // 修改订单明细
                orderDetlMapper.updateOrderDetlByModel(detlDto.getOrderNo(), detlDto.getLocDetl().getModel(), 1);
                // 修改订单状态
                orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(), 2L, userId);
            }
@@ -1155,6 +1286,8 @@
            wrkMast.setWrkSts(4L);
            // 出库
        } else if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107 && wrkMast.getIoType() != 109) {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(Integer.valueOf(workNo));
            openService.ckjgsbPushMes(wrkMast,wrkDetls);
            wrkMast.setWrkSts(14L);
        } else {
            throw new CoolException("当前工作类型或状态无法完成");