发货通知单打印日志

cl

2 天以前 b47369fbc73269f0661ba169c6387e04fb037e87

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

@@ -55,8 +55,12 @@

    @Override
    public Page<OutStockBillEntry> queryOutStock(Page<OutStockBillEntry> page) {
        page.setRecords(baseMapper.queryOutStock(page.getCondition()));
        page.setTotal(baseMapper.queryOutStockCount(page.getCondition()));
        Map<String, Object> cond = page.getCondition();
        page.setRecords(baseMapper.queryOutStock(cond));
        page.setTotal(baseMapper.queryOutStockCount(cond));
        if (log.isDebugEnabled()) {
            log.debug("queryOutStock 条件 FBillNo={}, FSourceBillNo={}, 查询结果 total={}", cond.get("FBillNo"), cond.get("FSourceBillNo"), page.getTotal());
        }
        return page;
    }

@@ -73,13 +77,13 @@
            if (tempLocList.size() > 0) {
                for (Integer j = 0; j < tempLocList.size(); j ++) {
                    locNum = locNum.add(new BigDecimal(tempLocList.get(j).getAnfme()));
                    /* 计算需要的数量，符合数量后结束循环 */
                    if (needNum.compareTo(locNum) == 1) {
//                    /* 计算需要的数量，符合数量后结束循环 */
//                    if (needNum.compareTo(locNum) == 1) {
                        locList.add(tempLocList.get(j));
                    } else {
                        locList.add(tempLocList.get(j));
                        break;
                    }
//                    } else {
//                        locList.add(tempLocList.get(j));
//                        break;
//                    }
                }
            }
        }
@@ -166,7 +170,8 @@
        // 获取库位明细
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())
                && paramLocDetl.getCount() > 0) {
                LocDetl sqlParam = new LocDetl();
                sqlParam.setLocNo(paramLocDetl.getLocNo());
                sqlParam.setMatnr(paramLocDetl.getMatnr());
@@ -209,6 +214,10 @@
//            }
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());
            //如果托盘条码为空，就不能进行拣料，无法再入库
            if(ioType==103 && null!=locMast && Cools.isEmpty(locMast.getBarcode())){
                throw new CoolException("库位没有托盘码，无法拣料作业===>>" + locMast.getLocNo());
            }
            // 获取路径
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", ioType)