#

Junjie

昨天 48cf45216c825ef7379986b7cf98b136768bcb4e

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

@@ -582,9 +582,9 @@
        if (param.getBarcode().length() != 8) {
            throw new CoolException("条码长度不是8位===>>" + param.getBarcode());
        }
//        if (param.getCombMats().size() > 1) {
//            throw new CoolException("不允许混料===>>" + param.getBarcode());
//        }
        if (param.getCombMats().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 +659,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 +1314,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("工作档不存在");
@@ -1316,7 +1333,7 @@
            throw new CoolException("工作状态未处于已出库");
        }

        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
        if (locMast == null) {
            throw new CoolException("库位不存在");
        }
@@ -1330,20 +1347,12 @@
        wrkMast.setModiUser(userId);
        wrkMastService.updateById(wrkMast);

        WrkDetl wrkDetl = new WrkDetl();
        wrkDetl.setZpallet(param.getNewBarcode());
        wrkDetl.setModiTime(new Date());
        wrkDetl.setModiUser(userId);
        wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        wrkDetlService.updateBarcode(wrkMast.getWrkNo(), param.getNewBarcode());

        locMast.setBarcode(param.getNewBarcode());
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);

        LocDetl locDetl = new LocDetl();
        locDetl.setZpallet(param.getNewBarcode());
        locDetl.setModiTime(new Date());
        locDetl.setModiUser(userId);
        locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
        locDetlService.updateBarcode(locMast.getLocNo(), param.getNewBarcode());
    }
}