#

luxiaotao1123

2021-04-14 a4a9b52810e925fdd0eb3ba0cf800f8d1528dd82

#

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

@@ -36,7 +36,7 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private CustOrderService custOrderService;
    private OrderService orderService;

    @RequestMapping("/stock/pakin")
    @ManagerAuth(memo = "入库")
@@ -125,14 +125,14 @@
    }

    @RequestMapping("/orderNo/init")
    @ManagerAuth(memo = "生成销售订单编号")
    @ManagerAuth(memo = "生成单据编号")
    public R initOrderNo() {
        long nextId = snowflakeIdWorker.nextId();
        String number = "PR-" + String.valueOf(nextId).substring(0, 15);
        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
            return R.error("抱歉单号已存在，请再生成一次");
        String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
        if (orderService.selectByOrderNo(orderNo) != null) {
            return R.error("抱歉，单据编号已存在");
        }
        return R.ok().add(number);
        return R.ok().add(orderNo);
    }

    @RequestMapping("/order/init")

 src/main/webapp/static/js/order/order.js

@@ -59,13 +59,17 @@
        if (obj.event === 'add') { // 添加
            showEditModel();
        } else if (obj.event === 'edit') { // 修改
            showEditModel(selObj.data, selObj);
            if (selObj == null) {
                return;
            }
            showEditModel(selObj.data);
        } else if (obj.event === 'del') { // 删除
            doDel(selObj);
        }
    });

    /* 监听行单击事件 */
    var selObj;
    table.on('row(docTypeTable)', function (obj) {
        selObj = obj;
        obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
@@ -73,7 +77,7 @@
    });

    /* 显示表单弹窗 */
    function showEditModel(mData, obj) {
    function showEditModel(mData) {
        admin.open({
            type: 1,
            title: (mData ? '修改' : '添加') + '单据类型',
@@ -91,6 +95,7 @@
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            selObj = null;
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
@@ -153,9 +158,9 @@
        cols: [[
            {type: 'checkbox'}
            // ,{field: 'uuid', align: 'center',title: '编号'}
            ,{field: 'docType$', align: 'center',title: '类别', templet: '#docTypeTpl', width: 100}
            ,{field: 'orderNo', align: 'center',title: '单据编号', minWidth: 200}
            ,{field: 'orderTime', align: 'center',title: '单据日期'}
            ,{field: 'docType$', align: 'center',title: '单据类型', templet: '#docTypeTpl', width: 100}
            ,{field: 'itemName', align: 'center',title: '项目'}
            ,{field: 'allotItemId$', align: 'center',title: '调拨项目编号', hide: true}
            ,{field: 'defNumber', align: 'center',title: '初始票据号', hide: true}
@@ -215,6 +220,23 @@
        return false;
    });

    /* 表格2头工具栏点击事件 */
    table.on('toolbar(orderTable)', function (obj) {
        if (obj.event === 'add') { // 添加
            right();
        } else if (obj.event === 'del') { // 删除
            var checkRows = table.checkStatus('orderTable');
            if (checkRows.data.length === 0) {
                layer.msg('请选择要删除的数据', {icon: 2});
                return;
            }
            var ids = checkRows.data.map(function (d) {
                return d.id;
            });
            doDelOrder({ids: ids});
        }
    });

    /* 表格2工具条点击事件 */
    table.on('tool(orderTable)', function (obj) {
        var data = obj.data;
@@ -232,7 +254,6 @@
                    method: 'POST',
                    success: function (res) {
                        layer.close(loadIndex);
                        // 成功
                        if (res.code === 200){
                            layer.open({
                                type: 1
@@ -289,14 +310,10 @@
                break;
            // 打印
            case 'print':
                layer.confirm('开始打印' +data.number + ' 拣货单？', {shadeClose: true}, function(){
                layer.confirm('开始打印' +data.orderNo + ' 拣货单？', {shadeClose: true}, function(){
                    layer.closeAll();
                    printPakouts(data.orderNo);
                })
                break;
            // 修改
            case 'edit':
                showEditModel2(obj.data);
                break;
            // 删除
            case 'del':
@@ -306,53 +323,6 @@

        }
    });

    /* 表格2头工具栏点击事件 */
    table.on('toolbar(orderTable)', function (obj) {
        if (obj.event === 'add') { // 添加
            // showEditModel2();
            right();
        } else if (obj.event === 'del') { // 删除
            var checkRows = table.checkStatus('orderTable');
            if (checkRows.data.length === 0) {
                layer.msg('请选择要删除的数据', {icon: 2});
                return;
            }
            var ids = checkRows.data.map(function (d) {
                return d.id;
            });
            doDelOrder({ids: ids});
        }
    });

    /* 显示表单弹窗2 */
    function showEditModel2(mData) {
        admin.open({
            type: 1,
            title: (mData ? '修改' : '添加') + '数据字典项',
            content: $('#dictDataEditDialog').html(),
            success: function (layero, dIndex) {
                // 回显表单数据
                form.val('dictDataEditForm', mData);
                // 表单提交事件
                form.on('submit(dictDataEditSubmit)', function (data) {
                    data.field.dictId = selObj.data.dictId;
                    var loadIndex = layer.load(2);
                    $.get(mData ? '../../json/ok.json' : '../../json/ok.json', data.field, function (res) {
                        layer.close(loadIndex);
                        if (200 === res.code) {
                            layer.close(dIndex);
                            layer.msg(res.msg, {icon: 1});
                            insTb2.reload({page: {curr: 1}});
                        } else {
                            layer.msg(res.msg, {icon: 2});
                        }
                    }, 'json');
                    return false;
                });
            }
        });
    }

    /* 删除订单 */
    function doDelOrder(obj) {
@@ -383,7 +353,6 @@
        });
    }


    // 生成拣货单
    function stockOut(orderNo) {
        layer.closeAll();
@@ -404,19 +373,6 @@
                        }, function() {
                            layer.closeAll();
                            printPakouts(orderNo);
                        }
                    )
                    // 缺料
                } else if (res.code === 20001) {
                    layer.confirm(res.msg, {
                            shadeClose: true
                            , btn: ['库存调拨', '取消']
                        }, function() {
                            // 库存调拨
                            layer.closeAll();
                        }, function() {
                            alert(number)
                            layer.closeAll();
                        }
                    )
                } else if (res.code === 403){
@@ -534,11 +490,6 @@
        }
    });
}

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};