#

luxiaotao1123

2021-04-13 52f694ab369861f644f8efab797a85776b73ee52

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

@@ -213,7 +213,7 @@

    @Override
    public R stockOutPrint(StockOutParam param, Long userId) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getNumber()));
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getOrderNo()));
        Double total = 0.0D;
        String custName = "";
        for (Pakout pakout : pakouts) {
@@ -221,7 +221,7 @@
            custName = pakout.getCustName();
        }
        StoPrintVo vo = new StoPrintVo();
        vo.setDocNum(param.getNumber());
        vo.setDocNum(param.getOrderNo());
        vo.setList(pakouts);
        vo.setTotal(total);
        vo.setCustName("浙江中扬立库技术有限公司");
@@ -231,25 +231,47 @@

    @Override
    public R stockOutPreview(StockOutParam param, Long userId) {
        List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
                .eq("number", param.getNumber())
                .eq("status", 1)
        );
        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();
        dto.setNumber(param.getNumber());
        dto.setCustOrders(custOrders);
        dto.setOrderNo(param.getOrderNo());
        List<MatnrDto> matnrDtos = new ArrayList<>();
        for (OrderDetl orderDetl : orderDetls) {
            MatnrDto matnrDto = new MatnrDto();
            matnrDto.setMatnr(orderDetl.getMatnr());
            matnrDto.setCount(orderDetl.getAnfme());
            matnrDtos.add(matnrDto);
        }
        dto.setDtos(matnrDtos);
        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("number", param.getOrderNo())
                .eq("status", 1)
        );
        List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(param.getOrderNo());
        if (Cools.isEmpty(orderDetls)) {
            return R.error("此单据已失效，请联系管理员");
        }
        OrderStoDto dto = new OrderStoDto();
        dto.setNumber(param.getNumber());
        dto.setCustOrders(custOrders);
        dto.setOrderNo(param.getOrderNo());
        List<MatnrDto> matnrDtos = new ArrayList<>();
        for (OrderDetl orderDetl : orderDetls) {
            MatnrDto matnrDto = new MatnrDto();
            matnrDto.setMatnr(orderDetl.getMatnr());
            matnrDto.setCount(orderDetl.getAnfme());
            matnrDtos.add(matnrDto);
        }
        dto.setDtos(matnrDtos);
        // 开始整理出库数据
        mainService.stockOutProcess(dto);
        return R.ok("生成拣货单成功");
@@ -515,7 +537,7 @@
                null,    // 发货时间
                null,    // 物流名称
                null,    // 物流单号
                null,    // 订单状态
                1L,    // 订单状态
                1,    // 状态
                userId,    // 添加人员
                now,    // 添加时间