# 入库拣货功能添加

zyx

2024-01-08 71d838e032d13a46a07917f5606862496220ea74

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

@@ -146,12 +146,11 @@
        })
    }


    // 工具条点击事件
    table.on('tool(order)', function (obj) {
        var data = obj.data;
        var layEvent = obj.event;



        if (layEvent === 'edit') {
            showEditModel(data);
@@ -189,22 +188,24 @@
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'batch', title: '批号'},
                            // {field: 'matnr', title: '商品编码', width: 160},
                            // {field: 'maktx', title: '商品名称', width: 160},
                            //
                            // {field: 'batch', title: '批号'},
                            {field: 'batch', title: '批次'},
                            {field: 'brand', title: '牌号'},
                            {field: 'fingerMeltingMin', title: '最小熔指'},
                            {field: 'fingerMeltingMax', title: '最大熔指'},
                            {field: 'fusingPointMin', title: '最小熔点'},
                            {field: 'fusingPointMax', title: '最大熔点'},
                            {field: 'yellownessMin', title: '最小黄度'},
                            {field: 'yellownessMax', title: '最大黄度'},
                            {field: 'opacityMin', title: '最小不透明度'},
                            {field: 'opacityMax', title: '最大不透明度'},
                            {field: 'anfme', title: '数量'},
                            // {field: 'workQty', title: '作业数量'},
                            {field: 'workQty', title: '作业数量'},
                            {field: 'qty', title: '完成数量', style: 'font-weight: bold'},
                            // {field: 'unit', title: '单位'},
                            // {
                            //     field: 'createTime$', title: '创建时间', sort: true, templet: function (d) {
                            //         return util.toDateString(d.createTime);
                            //     },  width: 180
                            // },
                            // {field: 'inQty', title: '已入库量'},
                            // {field: 'color', title: '颜色'},
                            {field: 'specs', title: '规格'},
                            {field: 'weight', title: '重量'}

                        ]],
                        request: {
                            pageName: 'curr',
@@ -228,6 +229,9 @@
                    });
                }
            });
        }
        else if (layEvent === 'printExcel'){
            printExcel(data);
        }
    });

@@ -254,16 +258,26 @@
                        return false;
                    }
                    let nList = admin.util.deepClone(xxDataList);
                    console.log(nList);
                    for (let xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].anfme <= 0){
                            layer.msg('明细修改数量不合法', {icon: 2});
                        if(!nList[xi].anfme){
                            layer.msg('明细数量不合法', {icon: 2});
                            return false;
                        }
                        if (nList[xi].anfme <= 0){
                            layer.msg('明细数量不合法', {icon: 2});
                            return false;
                        }
                        // if (nList[xi].batch == null || nList[xi].batch == ""){
                        //     layer.msg('批次不合法', {icon: 2});
                        //     return false;
                        // }
                        if (nList[xi].anfme < nList[xi].workQty){
                            layer.msg('数量不能小于已作业数量', {icon: 2});
                            return false;
                        }
                    }

                    layer.load(2);
                    $.ajax({
                        url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
@@ -302,21 +316,55 @@
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'matnr', title: '商品编码', width: 160},
                        {field: 'maktx', title: '商品名称', width: 200},
                        {field: 'batch', title: '批号', edit: true},
                        {field: 'specs', title: '规格'},
                        {field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'qty', title: '作业数量',  minWidth: 100, width: 100},
                        // {field: 'matnr', title: '商品编码', width: 160},
                        // {field: 'maktx', title: '商品名称', width: 200},
                        // {field: 'specs', title: '规格'},
                        {field: 'batch', title: '批次', edit: true},
                        {field: 'brand', title: '牌号', edit: true},
                        {field: 'fingerMeltingMin', title: '最小熔指', edit: true},
                        {field: 'fingerMeltingMax', title: '最大熔指', edit: true},
                        {field: 'fusingPointMin', title: '最小熔点', edit: true},
                        {field: 'fusingPointMax', title: '最大熔点', edit: true},
                        {field: 'yellownessMin', title: '最小黄度', edit: true},
                        {field: 'yellownessMax', title: '最大黄度', edit: true},
                        {field: 'opacityMin', title: '最小不透明度', edit: true},
                        {field: 'opacityMax', title: '最大不透明度', edit: true},

                        {field: 'anfme', title: '重量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},

                        // {field: 'payment', title: '货物状态',align: 'center', templet: '#payment'},
                        {field: 'qty', title: '作业重量',  minWidth: 100, width: 100},
                        // {field: 'unit', title: '单位', width: 80},
                        {field: 'memo', title: '备注' , edit: true},
                        {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
                    ]],
                    done: function (res) {
                    done: function (res, curr, count) {
                        $(layero).find('.layui-table-view').css('margin', '0');
                        var options = this;

                        // 获取当前行数据
                        table.getRowData = function(elem){
                            var index = $(elem).closest('tr').data('index');
                            return table.cache[options.id][index] || {};
                        };

                        $('.select-primary').on('change', function(){
                            var value = this.value; // 获取选中项 value
                            var data = table.getRowData(this);
                            console.log(value);
                            xxDataList.forEach(res => {
                                if (data.id === res.id){
                                    console.log(res)
                                    res.payment = value;
                                }
                            })


                        });
                    },
                    size: ''
                };

                if (!isExpAdd) {
                    $.ajax({
                        url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
@@ -387,7 +435,7 @@
                        }
                    }
                    data[obj.field] = obj.value;
                    insTbSSXM.reload({data: xxDataList});
                   insTbSSXM.reloadData({data: xxDataList,scrollPos: true});
                });

                $('#matAddBtnComment').click(function () {
@@ -396,6 +444,9 @@

                // 显示添加明细表单弹窗
                function showEditModel2(exp) {
                    xxDataList.push({});
                    insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                    return;
                    admin.open({
                        type: 1,
                        offset: '150px',
@@ -469,7 +520,11 @@

            }
        });


    }



    // 删除单据
    function doDel(orderId) {
@@ -548,4 +603,16 @@
        ,type: 'datetime'
        ,range: true
    });

    function printExcel(data){
        layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
            layer.closeAll();
            layer.load(1, {shade: [0.1,'#fff']});
            location.href = baseUrl+"/order/printExport/auth?orderNo="+data.orderNo;
            layer.closeAll('loading');
        });
    }



});