我们现在讨论一下系统找库位方案， 如何实现，对现有找库位规则进行整改，数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据...

zwl

23 小时以前 b176072388747abb438990157bfa305b215b4b90

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

@@ -574,6 +574,7 @@
        }

        Date now = new Date();
        Integer freqType = resolveCombFreqType(param.getCombMats());
        boolean allEmpty = true;
        if (param.getCombMats() != null) {
            for (CombParam.CombMat mat : param.getCombMats()) {
@@ -616,6 +617,7 @@
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setFreqType(freqType);
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
@@ -681,6 +683,7 @@
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setFreqType(freqType);
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
@@ -704,6 +707,26 @@
//            orderService.updateSettle(order.getId(), 2L, userId);
            OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
        }
    }

    private Integer resolveCombFreqType(List<CombParam.CombMat> combMats) {
        Integer resolvedFreqType = null;
        if (Cools.isEmpty(combMats)) {
            return null;
        }
        for (CombParam.CombMat combMat : combMats) {
            if (combMat == null || combMat.getFreqType() == null || combMat.getFreqType() <= 0) {
                continue;
            }
            if (resolvedFreqType == null) {
                resolvedFreqType = combMat.getFreqType();
                continue;
            }
            if (!resolvedFreqType.equals(combMat.getFreqType())) {
                throw new CoolException("组托货物频次不一致");
            }
        }
        return resolvedFreqType;
    }


@@ -1056,6 +1079,7 @@
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }
        Date now = new Date();
        Integer freqType = resolveCombFreqType(param.getCombMats());

        boolean packDown = Parameter.get().getPackDown().equals("true");

@@ -1189,6 +1213,7 @@
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setFreqType(freqType);
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);