#

luxiaotao1123

2021-04-13 6575ff94ec9ab3d2f5cb4155b422abe055b709f6

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

@@ -257,7 +257,7 @@
        vo.setList(pakouts);
        vo.setTotal(total);
        vo.setCstmrName(order.getCstmrName());
        vo.setWorkerName(order.getOperMemb());
        vo.setWorkerName(Cools.isEmpty(order.getOperMemb())? "" : order.getOperMemb());
        return R.ok().add(vo);
    }

@@ -265,7 +265,7 @@
    @Transactional
    public R stockOutComplete(StockConfirmParam param, Long userId) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
                .eq("doc_num", param.getNumber())
                .eq("doc_num", param.getOrderNo())
                .in("wrk_sts", 1, 2));
        for (Pakout pakout : pakouts) {
            LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
@@ -334,31 +334,13 @@
        }

        // 修改出库单状态
        if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
        if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getOrderNo(), userId)) {
            return R.error("保存数据失败");
        }
        // 修改单据状态
        if (!custOrderService.updateStatus(param.getNumber(), 4)) {
        if (!orderService.updateSettle(param.getOrderNo(), 4L)) {
            throw new CoolException("修改单据状态失败");
        }
        // 采购退货单
//        if (param.getNumber().startsWith("PR-")) {
            // erp单据上传 todo
//            Long docId = pakouts.get(0).getDocId();
//            if (null != docId) {
//                List<BillDto> dtos = new ArrayList<>();
//                for (Pakout pakout : pakouts) {
//                    BillDto billDto = new BillDto();
//                    billDto.setMatnr(pakout.getMatnr());
//                    billDto.setQty(pakout.getAnfme());
//                    dtos.add(billDto);
//                }
//                if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) {
//                    throw new CoolException("无法上报至erp");
//                }
//            }

//        }
        return R.ok();
    }