Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

chenhaozhe

2025-10-22 cbd3c6396a01e2f78ed4dc82154cdb913abecfa7

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackagingList.html

@@ -525,69 +525,7 @@
                //标注选中样式
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
            });

            //#region æ‰“印
            //form.on('submit(Print)', function (obj) {//退出
            //    var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
            //    var linterid = checkStatus.data[0].HInterID;
            //    ////打开打印模板
            //    ////var linterid = $("#HInterID").val();
            //    ////var linterid = "28973";
            //    //var Type = "HBarCodePrint";
            //    //var OpenTmp = "包装单物料标识卡(网页版)";
            //    ////var ReportViewer = document.getElementById("ReportViewer");
            //    //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());


            //    var sWhere = "select  a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM   from Sc_PackUnionBillMain a left join  Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;

            //    $.ajax({
            //        type: "GET",
            //        url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名
            //        async: true,
            //        data: { "sWhere": sWhere },
            //        success: function (data) {
            //            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ

            //                if (data.data.length != 0) {
            //                    var dataPrint = [];
            //                    dataPrint.push(data.data[0]
            //                        //{ "产品名称": data.data[0]["产品名称"], "条码编号": data.data[0]["条码编号"], "数量": data.data[0]["数量"], "日期": data.data[0]["日期"], "生产任务单": data.data[0]["生产任务单"], "流转卡编号": data.data[0]["流转卡编号"], "自定义字段": data.data[0]["自定义字段"], "项目编号": data.data[0]["项目编号"] }
            //                    );

            //                    var Customer = {
            //                        "Table": dataPrint
            //                    }

            //                    var args = {
            //                        type: "print",
            //                        showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
            //                        report: urlAddRandomNo("../../grf/白标打印.grf"),
            //                        data: Customer
            //                    };
            //                    //var args = {
            //                    //    report: urlAddRandomNo("../../views/grf/包装单物料标识卡(网页版).grf"),
            //                    //    data: Customer
            //                    //};
            //                    webapp_ws_ajax_run(args);
            //                } else {
            //                    layer.msg("查无数据!");
            //                }

            //            }
            //            else {
            //                layer.msg(data.Message, { icon: 5 });
            //            }
            //            layer.closeAll("loading");
            //        },
            //        error: function (err) {
            //            layer.msg("错误:" + err, { icon: 5 });
            //        }
            //    })

            //});
            //#endregion

          
            //白标生成保存
            form.on('submit(WhiteSave)', function (obj) {//退出
                var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
@@ -614,11 +552,17 @@
            form.on('submit(Print)', function (obj) {//退出
                var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
                var linterid = checkStatus.data[0].HInterID;
                var HOrgID = $("#HOrgID").val();
                var Type = "HBarCodePrint";
                var OpenTmp = "白标打印15";
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "|" + HOrgID +  "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                var HOrgID = $("#HOrgID").val();              
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '打印模版选择'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: false //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid='+ linterid.toString() + '|' + HOrgID +  '&MyMsg=&Type=' + HModName, 'yes']
                    , resize: false
                })             
            });

            //打印按钮  æ™®è²ç‰¹æ‰“印