#

luxiaotao1123

2021-04-14 28b01f6a80a38883d61b456b13936baa0291664e

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

@@ -38,15 +38,11 @@
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private CustOrderService custOrderService;
    @Autowired
    private PakoutService pakoutService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private MatService matService;
    @Autowired
    private ErpService erpService;
    @Autowired
    private CheckService checkService;
    @Autowired
@@ -57,6 +53,8 @@
    private ItemService itemService;
    @Autowired
    private CstmrService cstmrService;
    @Autowired
    private ErpService erpService;

    @Override
    @Transactional
@@ -127,6 +125,7 @@
        if (!erpService.uploadBill(dtos, docId, docNum)) {
            throw new CoolException("无法上报至erp");
        }

        return R.ok("入库成功");
    }

@@ -202,7 +201,6 @@
        if (!erpService.uploadBill(dtos, param.getDocType(), docNum)) {
            throw new CoolException("无法上报至erp");
        }

        return R.ok();
    }

@@ -414,7 +412,7 @@
                }
                if (complete) {
                    // 修改单据状态
                    if (!custOrderService.updateStatus(pakout.getDocNum(), 4)) {
                    if (!orderService.updateSettle(pakout.getDocNum(), 4L)) {
                        throw new CoolException("修改单据状态失败");
                    }
                }
@@ -429,35 +427,14 @@
    @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 (!pakoutService.delete(new EntityWrapper<Pakout>().eq("wrk_no", pakout.getWrkNo()))) {
            throw new CoolException("删除拣货单失败");
        }

        // 取消销售订单
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
        if (Cools.isEmpty(pakouts)){
            // 修改单据状态
            if (!custOrderService.updateStatus(pakout.getDocNum(), 3)) {
            if (!orderService.updateSettle(pakout.getDocNum(), 3L)) {
                throw new CoolException("修改单据状态失败");
            }
        }
@@ -739,7 +716,6 @@
        if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) {
            throw new CoolException("无法上报至erp");
        }

        return R.ok();
    }