#

Junjie

18 小时以前 a1f531ee3acc549aabfed8efb6c821e6f6209fa4

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

@@ -585,6 +585,17 @@
//        if (param.getCombMats().size() > 1) {
//            throw new CoolException("不允许混料===>>" + param.getBarcode());
//        }
        HashMap<String, Object> containMatnrMap = new HashMap<>();
        for (CombParam.CombMat mat : param.getCombMats()) {
            if(!containMatnrMap.containsKey(mat.getMatnr())) {
                containMatnrMap.put(mat.getMatnr(), 1);
            }
        }

        if (containMatnrMap.size() > 1) {
            throw new CoolException("不允许混料===>>" + param.getBarcode());
        }


        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
@@ -659,6 +670,17 @@
                }
                if (order.getSettle() > 2) {
                    throw new CoolException("单据编号已作业完成");
                }

                List<WaitPakin> waitPakinList = waitPakinService.selectList(new EntityWrapper<WaitPakin>()
                        .eq("matnr", elem.getMatnr())
                        .eq("batch", elem.getBatch())
                        .eq("order_no", elem.getOrderNo())
                        .eq("anfme", elem.getAnfme())
                        .eq("standby1", elem.getStandby1())
                );
                if (!waitPakinList.isEmpty()) {
                    throw new CoolException("该订单物料已经组托！");
                }

                // 订单明细数量校验
@@ -1303,6 +1325,12 @@

    @Override
    public void toAllOut(PalletToAllOutParam param, Long userId) {
        String barcodeSize = param.getBarcode().substring(0, 2);
        String newBarcodeSize = param.getNewBarcode().substring(0, 2);
        if (!barcodeSize.equals(newBarcodeSize)) {
            throw new CoolException("托盘尺寸不一致");
        }

        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
        if (wrkMast == null) {
            throw new CoolException("工作档不存在");