From f3b8511345211b6bcdac80218a5f65b77d543a12 Mon Sep 17 00:00:00 2001
From: lilili <webadmin@tedu.com>
Date: Tue, 30 May 2023 11:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=9F=E5=88=9D=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WMS/Views/HomeWork/InitialImport.cshtml   | 137 +++++++++++-------
 1 file changed, 85 insertions(+), 52 deletions(-)

diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/HomeWork/InitialImport.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/HomeWork/InitialImport.cshtml
index 63271dd..26a8298 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/HomeWork/InitialImport.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/HomeWork/InitialImport.cshtml
@@ -693,65 +693,97 @@
         }
     }
 
-    //打印库位
-    function btn_Print() {
+    ////打印库位
+    //function btn_Print() {
+    //    debugger;
+    //    var objArr = '';
+    //    var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
+    //    //if (objList.length != 1) {
+    //    //    $.modalAlert("一次只能打印一个送货单！");
+    //    //    return;
+    //    //}
+    //    for (var i = 0; i < objList.length; i++) {
+    //        var rowId = objList[i];
+    //        var rowData = $("#gridList").jqGrid('getRowData', rowId);
+    //        objArr += "'" + rowData.ID + "',";
+    //    }
+    //    var strPrintData;
+    //    var bIsInstallPrintControl;
+    //    var strPrintControlCookie;
+    //    $.ajax({
+    //        url: "/WMS/BasicSettings/PrintStack",
+    //        type: "post",
+    //        data: { keyValue: JSON.stringify(objArr) },
+    //        dataType: "json",
+    //        async: false,
+    //        success: function (data) {
+    //            strPrintData = data.strPrintData_1;
+    //            bIsInstallPrintControl = data.bIsInstallPrintControl_1;
+    //            strPrintControlCookie = data.strPrintControlCookie_1;
+    //        }
+    //    });
+    //    if (strPrintData != '') {
+    //        var test = "ChuLinPrint:" + strPrintData;
+    //        $("#ifrm")[0].src = "ChuLinPrint:" + strPrintData;
+    //    }
+    //    if (bIsInstallPrintControl == 'False') {
+    //        if (confirm("检测到打印控件未安装，您是否下载安装？")) {
+    //            $("#downPrintControl").click();
+    //        }
+    //    }
+    //    if (bIsInstallPrintControl == 'True') {
+    //        var strPrintControlCookie = strPrintControlCookie;
+    //        if (strPrintControlCookie != '') { //延时3秒后再次检测打印控件是否安装
+    //            setTimeout("checkPrintControlInstall()", 8000);
+    //            function checkPrintControlInstall() {
+    //                $.ajax({
+    //                    url: "/SRM/ASNManage/IsCheckInstall?checkInstall=" + strPrintControlCookie,
+    //                    dataType: "json",
+    //                    async: false,
+    //                    success: function (strResult) {
+    //                        if (strResult.indexOf("PrintControlInstall") == -1) {
+    //                            if (confirm("检测到打印控件未安装，您是否下载安装？")) {
+    //                                $("#downPrintControl").click();
+    //                            }
+    //                        }
+    //                    }
+    //                });
+    //            }
+    //        }
+    //    }
+    //    $("#btn_search").click();
+    //}
+
+    function btnPrint() {
         debugger;
+        var mold = 'QC0001';  //条码打印
         var objArr = '';
+        var arr = [];
         var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
-        //if (objList.length != 1) {
-        //    $.modalAlert("一次只能打印一个送货单！");
-        //    return;
-        //}
         for (var i = 0; i < objList.length; i++) {
             var rowId = objList[i];
             var rowData = $("#gridList").jqGrid('getRowData', rowId);
-            objArr += "'" + rowData.ID + "',";
-        }
-        var strPrintData;
-        var bIsInstallPrintControl;
-        var strPrintControlCookie;
-        $.ajax({
-            url: "/WMS/BasicSettings/PrintStack",
-            type: "post",
-            data: { keyValue: JSON.stringify(objArr) },
-            dataType: "json",
-            async: false,
-            success: function (data) {
-                strPrintData = data.strPrintData_1;
-                bIsInstallPrintControl = data.bIsInstallPrintControl_1;
-                strPrintControlCookie = data.strPrintControlCookie_1;
-            }
-        });
-        if (strPrintData != '') {
-            var test = "ChuLinPrint:" + strPrintData;
-            $("#ifrm")[0].src = "ChuLinPrint:" + strPrintData;
+            objArr += "'" + rowData.LotNoID + "',";
         }
-        if (bIsInstallPrintControl == 'False') {
-            if (confirm("检测到打印控件未安装，您是否下载安装？")) {
-                $("#downPrintControl").click();
-            }
+        objArr = objArr.slice(0, objArr.length - 1);
+        if (objArr == "") {
+            $.modalAlertNew("WMS00110");
+            return;
         }
-        if (bIsInstallPrintControl == 'True') {
-            var strPrintControlCookie = strPrintControlCookie;
-            if (strPrintControlCookie != '') { //延时3秒后再次检测打印控件是否安装
-                setTimeout("checkPrintControlInstall()", 8000);
-                function checkPrintControlInstall() {
-                    $.ajax({
-                        url: "/SRM/ASNManage/IsCheckInstall?checkInstall=" + strPrintControlCookie,
-                        dataType: "json",
-                        async: false,
-                        success: function (strResult) {
-                            if (strResult.indexOf("PrintControlInstall") == -1) {
-                                if (confirm("检测到打印控件未安装，您是否下载安装？")) {
-                                    $("#downPrintControl").click();
-                                }
-                            }
-                        }
-                    });
-                }
+        objArr = "" + objArr + "|";
+        arr.push(objArr);
+
+
+        $.modalOpen({
+            id: "PrintLot",
+            title: "打印",
+            url: "/WMS/Print/PrintView?Arguments=" + encodeURI(encodeURI(arr)) + "&mold=" + mold + "&" + Math.random(),
+            width: "550px",
+            height: "1000px",
+            callBack: function (iframeId) {
+                top.frames[iframeId].submitForm();
             }
-        }
-        $("#btn_search").click();
+        });
     }
     //导入
     function btn_Introduction() {
@@ -825,11 +857,12 @@
             <a id="NF-Delete" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Delete()"><i class="fa fa-pencil-square-o"></i>删除</a>
             <a id="NF-Update" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Update()"><i class="fa fa-pencil-square-o"></i>修改</a>
             <a id="NF-ExportAll" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_ExportAll()"><i class="fa fa-download"></i>全部导出</a>
-            <a id="NF-Print" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Print()"><i class="fa fa-print"></i>打印</a>
+            @*<a id="NF-Print" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Print()"><i class="fa fa-print"></i>打印</a>*@
+            <a id="NF-Print" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnPrint()"><i class="fa fa-pencil-square-o"></i>打印</a>
             <a href="~/File/Stack/库位资料导入模板.xlsx" id="NF-IntroductionMould" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_IntroductionMould()"><i class="fa fa-file-excel-o"></i>导入模板下载</a>
             <a id="NF-Introduction" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Introduction()">导入</a>
             <a id="NF-Clike" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Clike()"><i class="fa fa-eject"></i>...</a>
-          
+
         </div>
         <div class="operates">
             <ul class="nav nav-pills">