wms功能完善

pjb

昨天 2ded9514aa9a93ee440af0b1437d788fb052028b

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

@@ -96,6 +96,9 @@
    @Resource
    private OrderDetlPakoutService orderDetlPakoutService;

    @Resource
    private WrkDetlLogService wrkDetlLogService;

    @Override
    @Transactional
    public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId, Long userId) {
@@ -1111,4 +1114,47 @@
            throw new CoolException(locDetl.getLocNo() + "库位不是在库状态");
        }
    }

    @Override
    public R getMatInfoByBarcode(String barcode) {
        WrkDetlLog wrkDetl = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("zpallet", barcode).orderBy("io_time", false));
        if(wrkDetl == null) {
            return R.parse("该条码没有查询到物料信息");
        }
        return R.ok(wrkDetl);
    }

    @Override
    public R barcodeComb(BarcodeCombParam combParams) {
        String barcode = combParams.getBarcode();
        BarcodeCombParam.CombMat combParam = combParams.getCombMats().get(0);
        String matnr = combParam.getMatnr();
        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",barcode));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",barcode));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode));
        if (countLoc > 0 || countWrk > 0 || countwait > 0) {
            throw new CoolException("组托档/工作档/库存条码数据已存在===>>" + barcode);
        }

        Mat mat = matService.selectByMatnr(matnr);
        if (Cools.isEmpty(mat)) {
            throw new CoolException(matnr + "商品档案不存在");
        }

        Date now = new Date();
        WaitPakin waitPakin = new WaitPakin();
        waitPakin.sync(combParam);
        waitPakin.setZpallet(barcode);   // 托盘码
        waitPakin.setIoStatus("N");     // 入出状态
        waitPakin.setStatus("Y");    // 状态
        waitPakin.setDanger(1); // 手动组拖入库
//        waitPakin.setAppeUser(userId);
        waitPakin.setAppeTime(now);
//        waitPakin.setModiUser(userId);
        waitPakin.setModiTime(now);
        if (!waitPakinService.insert(waitPakin)) {
            throw new CoolException("保存入库通知档失败");
        }
        return R.ok("组拖绑定成功");
    }
}