#

luxiaotao1123

2021-03-03 01f56e1480178f0ee3ce7d2a67a85b5dad94d204

#

 src/main/java/zy/cloud/wms/manager/controller/WorkController.java

@@ -54,6 +54,12 @@
        return workService.stockOut(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/out/print")
    @ManagerAuth(memo = "捡货单打印")
    public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOutPrint(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/allot")
    @ManagerAuth(memo = "库存调拨")
    public R stockAllot() {

 src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java

New file
@@ -0,0 +1,13 @@
package zy.cloud.wms.manager.entity.result;

import lombok.Data;

/**
 * Created by vincent on 2021/3/3
 */
@Data
public class StoPrintVo {

    private String docNum;

}

 src/main/java/zy/cloud/wms/manager/service/WorkService.java

@@ -11,6 +11,8 @@

    R stockOutCheck(String number, Long userId);

    R stockOutPrint(StockOutParam param, Long userId);

    R stockOut(StockOutParam param, Long userId);

    R stockOutComplete(StockConfirmParam param, Long userId);

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

@@ -17,6 +17,7 @@
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.entity.result.StoPrintVo;
import zy.cloud.wms.manager.service.*;

import java.util.Date;
@@ -88,6 +89,14 @@
    }

    @Override
    public R stockOutPrint(StockOutParam param, Long userId) {

        StoPrintVo vo = new StoPrintVo();
        vo.setDocNum(param.getNumber());
        return R.ok().add(vo);
    }

    @Override
    public R stockOut(StockOutParam param, Long userId) {
        List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
                .eq("number", param.getNumber())
@@ -105,7 +114,9 @@
    @Transactional
    public R stockOutComplete(StockConfirmParam param, Long userId) {
        // 修改出库单状态
        pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId);
        if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
            return R.error("保存数据失败");
        }
        // todo：修改库存数量

        return R.ok();

 src/main/webapp/static/js/custOrder/custOrder.js

@@ -199,6 +199,7 @@
                                        , btn: ['打印捡货单']
                                    }, function() {
                                        layer.closeAll();
                                        printPakouts(data.number);
                                    }
                                )
                            // 缺料
@@ -207,8 +208,10 @@
                                        shadeClose: true
                                        , btn: ['库存调拨', '打印']
                                    }, function() {
                                        // todo 库存调拨
                                        layer.closeAll();
                                    }, function() {
                                        printPakouts(data.number);
                                        layer.closeAll();
                                    }
                                )
@@ -217,7 +220,6 @@
                            } else {
                                layer.msg(res.msg)
                            }
                            layer.close(index);
                        }
                    })
                });
@@ -267,21 +269,22 @@
    // 打印捡货单
    function printPakouts(docNumber) {
        $.ajax({
            url: baseUrl+"/work/pakout/get",
            url: baseUrl+"/work/stock/out/print",
            headers: {'token': localStorage.getItem('token')},
            data: {
                docNumber: docNumber
            },
            data: JSON.stringify({
                number: docNumber
            }),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
            success: function (res) {
                console.log(res)
                if (res.code === 200){
                    alert(JSON.stringify(res.data));
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg)
                    layer.msg(res.msg, {icon: 2})
                }
                layer.close(index);
            }
        })
    }