[import]修改库存数量修改顺序

luxiaotao1123

2021-03-19 53dbbd7be6a6ed00d65276a8707680955f9912b9

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -64,22 +64,31 @@
            if (!update) {
                throw new CoolException("修改托盘资料档失败");
            }
            // 更新货位库存明细
            LocDetl locDetl = new LocDetl();
            locDetl.setLocNo(node.getName());
            locDetl.setNodeId(node.getId());
            locDetl.setZpallet(param.getZpallet());
            locDetl.setAnfme(comb.getAnfme());
            VersionUtils.setLocDetl(locDetl, comb);
            locDetl.setStatus(1);
            locDetl.setCreateBy(userId);
            locDetl.setCreateTime(now);
            locDetl.setUpdateBy(userId);
            locDetl.setUpdateTime(now);
            boolean insert = locDetlService.insert(locDetl);
            if (!insert) {
                throw new CoolException("新增库存明细档失败");
            LocDetl locDetl = locDetlService.getLocDetl(node.getId(), comb.getMatnr());
            if (locDetl == null) {
                // 更新货位库存明细
                locDetl = new LocDetl();
                locDetl.setLocNo(node.getName());
                locDetl.setNodeId(node.getId());
                locDetl.setZpallet(param.getZpallet());
                locDetl.setAnfme(comb.getAnfme());
                VersionUtils.setLocDetl(locDetl, comb);
                locDetl.setStatus(1);
                locDetl.setCreateBy(userId);
                locDetl.setCreateTime(now);
                locDetl.setUpdateBy(userId);
                locDetl.setUpdateTime(now);
                boolean insert = locDetlService.insert(locDetl);
                if (!insert) {
                    throw new CoolException("新增库存明细档失败");
                }
            } else {
                if (!locDetlService.incrementStock(node.getId(), comb.getMatnr(), comb.getAnfme())) {
                    throw new CoolException("新增库存明细档失败");
                }

            }

        }
        return R.ok();
    }
@@ -108,6 +117,18 @@
    }

    @Override
    public R stockOutPreview(StockOutParam param, Long userId) {
        List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
                .eq("number", param.getNumber())
                .eq("status", 1)
        );
        OrderStoDto dto = new OrderStoDto();
        dto.setNumber(param.getNumber());
        dto.setCustOrders(custOrders);
        return R.ok().add(mainService.stockOutPreview(dto));
    }

    @Override
    public R stockOut(StockOutParam param, Long userId) {
        List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
                .eq("number", param.getNumber())
@@ -118,17 +139,34 @@
        dto.setCustOrders(custOrders);
        // 开始整理出库数据
        mainService.stockOutProcess(dto);
        return R.ok();
        return R.ok("生成拣货单成功");
    }

    @Override
    @Transactional
    public R stockOutComplete(StockConfirmParam param, Long userId) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
                .eq("doc_num", param.getNumber())
                .in("wrk_sts", 1, 2));
        // 修改库存数量
        for (Pakout pakout : pakouts) {
            LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
            if (pakout.getAnfme()>=locDetl.getAnfme()) {
                // 删除库存明细
                if (!locDetlService.removeStock(locDetl.getNodeId(), pakout.getMatnr())) {
                    throw new CoolException("删除库存明细失败");
                }
            } else {
                // 修改库存明细数量
                if (!locDetlService.reduceStock(locDetl.getNodeId(), pakout.getMatnr(), pakout.getAnfme())) {
                    throw new CoolException("修改库存明细数量失败");
                }
            }
        }
        // 修改出库单状态
        if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
            return R.error("保存数据失败");
        }
        // todo：修改库存数量
        // 修改单据状态
        if (!custOrderService.updateStatus(param.getNumber(), 4)) {
            throw new CoolException("修改单据状态失败");
@@ -180,6 +218,20 @@
    public R completePakout(String wrkNo, Long userId) {
        Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
        if (null != pakout) {
            // 修改库存数量
            LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
            if (pakout.getAnfme()>=locDetl.getAnfme()) {
                // 删除库存明细
                if (!locDetlService.removeStock(locDetl.getNodeId(), pakout.getMatnr())) {
                    throw new CoolException("删除库存明细失败");
                }
            } else {
                // 修改库存明细数量
                if (!locDetlService.reduceStock(locDetl.getNodeId(), pakout.getMatnr(), pakout.getAnfme())) {
                    throw new CoolException("修改库存明细数量失败");
                }
            }
            // 修改拣货单状态
            if (pakoutService.stockOutComplete(wrkNo, null, userId)) {

                boolean complete = true;
@@ -207,26 +259,26 @@
    @Transactional
    public R cancelPakout(String wrkNo, Long userId) {
        Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
        if (null != pakout) {
            LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
            if (locDetl == null) {
                LocDetl oldLocDetl = new LocDetl();
                VersionUtils.setLocDetl(oldLocDetl, pakout);
                oldLocDetl.setCreateTime(new Date());
                oldLocDetl.setCreateBy(userId);
                oldLocDetl.setUpdateTime(new Date());
                oldLocDetl.setUpdateBy(userId);
                if (!locDetlService.insert(oldLocDetl)) {
                    throw new CoolException("恢复库存明细失败");
                }
            } else {
                if (!locDetlService.incrementStock(locDetl.getNodeId(), locDetl.getMatnr(), pakout.getAnfme())) {
                   throw new CoolException("恢复库存明细失败");
                }
            }
        } else {
            return R.error("拣货单已失效，取消失败！");
        }
//        if (null != pakout) {
//            LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
//            if (locDetl == null) {
//                LocDetl oldLocDetl = new LocDetl();
//                VersionUtils.setLocDetl(oldLocDetl, pakout);
//                oldLocDetl.setCreateTime(new Date());
//                oldLocDetl.setCreateBy(userId);
//                oldLocDetl.setUpdateTime(new Date());
//                oldLocDetl.setUpdateBy(userId);
//                if (!locDetlService.insert(oldLocDetl)) {
//                    throw new CoolException("恢复库存明细失败");
//                }
//            } else {
//                if (!locDetlService.incrementStock(locDetl.getNodeId(), locDetl.getMatnr(), pakout.getAnfme())) {
//                   throw new CoolException("恢复库存明细失败");
//                }
//            }
//        } else {
//            return R.error("拣货单已失效，取消失败！");
//        }
        if (!pakoutService.delete(new EntityWrapper<Pakout>().eq("wrk_no", pakout.getWrkNo()))) {
            throw new CoolException("删除拣货单失败");
        }