#

lsh

2025-04-25 642428dd870c2f288bb0f3a5fc94373a69a425cf

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -31,6 +31,7 @@
            ,{field: 'sourceLocNo$', align: 'center',title: '源库位'}
            ,{field: 'locNo$', align: 'center',title: '目标库位'}
            ,{field: 'barcode', align: 'center',title: '条码'}
            ,{field: 'sheetNo$', align: 'center',title: '机械臂', hide: false}
            ,{field: 'preHave', align: 'center',title: '先入品', hide: true}
            ,{field: 'takeNone', align: 'center',title: '空操作', hide: true}
            // ,{field: 'picking', align: 'center',title: '拣料', templet:function(row){
@@ -273,7 +274,25 @@
    table.on('tool(wrkMast)', function(obj){
        let data = obj.data;
        switch (obj.event) {
            // 明细展示 todo
            case 'upSheetNo':
                layer.open({
                    type: 2,
                    title: '修改工作档的机械臂相关参数',
                    maxmin: true,
                    area: ['500px', top.detailHeight],
                    shadeClose: false,
                    content: 'wrkMast_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-save', index).hide();
                        setFormVal(layer.getChildFrame('#detail', index), data, false);
                        top.convertDisabled(layer.getChildFrame('#locNo', index), true);
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                    }
                });
                break;
            // 明细展示
            case 'detlShow':
                wrkNo = data.wrkNo;
                // 表格下方显示
@@ -320,7 +339,6 @@
                        layer.closeAll();
                    });
                }

                break;
            //  拣料入库
            case 'pick':
@@ -334,7 +352,12 @@
                break;
            //  先入品
            case 'preHave':
                layer.confirm('任务发送先入品异常！是否。。。。。。。。？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                layer.confirm('任务发生先入品异常。如需重新入库，请确保货物已放至堆垛机出库站！', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    http.post(baseUrl+"/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg, {icon: 1});
                    })
                    layer.closeAll();
                });
                break;
            //  空操作
@@ -544,7 +567,7 @@
                {type: 'checkbox'}
                ,{field: 'wrkNo', align: 'center',title: '工作号'}
                ,{field: 'ioTime$', align: 'center',title: '工作时间'}
                ,{field: 'matnr', align: 'center',title: '物料'}
                ,{field: 'matnr', align: 'center',title: '规格'}
                ,{field: 'lgnum', align: 'center',title: '仓库号'}
                ,{field: 'tbnum', align: 'center',title: '转储请求编号'}
                ,{field: 'tbpos', align: 'center',title: '行项目'}