#

luxiaotao1123

2021-04-13 753c62e44d59ea702e3c95a5a0160cfed3c05e42

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

@@ -212,54 +212,60 @@
    }

    @Override
    public R stockOutPrint(StockOutParam param, Long userId) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getNumber()));
        Double total = 0.0D;
        String custName = "";
        for (Pakout pakout : pakouts) {
            total = pakout.getAnfme() + total;
            custName = pakout.getCustName();
        }
        StoPrintVo vo = new StoPrintVo();
        vo.setDocNum(param.getNumber());
        vo.setList(pakouts);
        vo.setTotal(total);
        vo.setCustName("浙江中扬立库技术有限公司");
        vo.setWorkerName("陆晓涛");
        return R.ok().add(vo);
    }

    @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);
        Order order = orderService.selectByOrderNo(param.getOrderNo());
        if (order.getSettle() != 1) {
            return R.error("此单据无法生成拣货单");
        }
        List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(order.getOrderNo());
        if (Cools.isEmpty(orderDetls)) {
            return R.error("此单据已失效，请联系管理员");
        }
        OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
        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())
                .eq("status", 1)
        );
        OrderStoDto dto = new OrderStoDto();
        dto.setNumber(param.getNumber());
        dto.setCustOrders(custOrders);
    public R stockOutCreate(StockOutParam param, Long userId) {
        Order order = orderService.selectByOrderNo(param.getOrderNo());
        if (order.getSettle() != 1) {
            return R.error("此单据无法生成拣货单");
        }
        List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(param.getOrderNo());
        if (Cools.isEmpty(orderDetls)) {
            return R.error("此单据已失效，请联系管理员");
        }
        OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
        // 开始整理出库数据
        mainService.stockOutProcess(dto);
        return R.ok("生成拣货单成功");
    }

    @Override
    public R stockOutPrint(StockOutParam param, Long userId) {
        Order order = orderService.selectByOrderNo(param.getOrderNo());
        if (order == null) {
            return R.error("此单据已失效");
        }
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", order.getOrderNo()));
        Double total = 0.0D;
        for (Pakout pakout : pakouts) {
            total = pakout.getAnfme() + total;
        }
        StoPrintVo vo = new StoPrintVo();
        vo.setDocNum(param.getOrderNo());
        vo.setList(pakouts);
        vo.setTotal(total);
        vo.setCstmrName(order.getCstmrName());
        vo.setWorkerName(Cools.isEmpty(order.getOperMemb())? "" : order.getOperMemb());
        return R.ok().add(vo);
    }

    @Override
    @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());
@@ -328,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();
    }

@@ -515,7 +503,7 @@
                null,    // 发货时间
                null,    // 物流名称
                null,    // 物流单号
                null,    // 订单状态
                1L,    // 订单状态
                1,    // 状态
                userId,    // 添加人员
                now,    // 添加时间