From 69aefa309c976befa2cad92cfb2017005fbad99c Mon Sep 17 00:00:00 2001
From: Juj <1005539536@qq.com>
Date: Thu, 8 Jun 2023 20:23:35 +0800
Subject: [PATCH] 111

---
 .../NFine.Application/WMS/PickMaterialApp.cs  |  2 +-
 .../Views/PickMaterial/ICSMOPickMerge.cshtml  | 37 +++++++++++--------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index 5fcc73c..0d67c94 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -1737,7 +1737,7 @@ a.Sequence,
                 #region 其它出库SQL
                 sqls = @" select
 	                        a.OutCode as Code,
-a.Sequence
+a.Sequence,
 	                        a.InvCode,
 	                        b.InvName,
 	                        b.InvStd,
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
index b37212e..6249a46 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
@@ -8,7 +8,7 @@
     var _Clos = new Array();
     var _Clos1 = new Array();
     var flag = '1';
-    var mark = '';
+    var mark = '拣料';
     var Arguments = '';
     //var PickID = '';
     $(function () {
@@ -741,6 +741,7 @@
             $.modalAlertNew("WMS00093");
             return;
         }
+
         if (mark == '合并拣料') {
             
             var arr = [];
@@ -753,6 +754,10 @@
                 for (var i = 0; i < rowIds_Item1.length; i++) {
                     var objArr = '';
                     var RowData_Item1 = obj_Item1.getRowData(rowIds_Item1[i]);
+                    if (RowData_Item1.IsOccupy!='已占料') {
+                        $.modalAlert("所选单据未拣料,无法打印！", "warning");
+                        return;
+                    }
                     objArr += "'" + RowData_Item1.MergeID + "',";
                     objArr = objArr.slice(0, objArr.length - 1);
                     objArr = "" + objArr + "|";
@@ -775,22 +780,22 @@
             }
         }
         if (mark == '拣料') {        
-            
             var arr = [];
-            var obj_Item1 = $("#gridList2");
-            var rowIds_Item1 = obj_Item1.getDataIDs();
-            var arrayData_Item1 = new Array();
-            var Enables = '';
-            if (rowIds_Item1.length > 0) {
-                debugger;
-                for (var i = 0; i < rowIds_Item1.length; i++) {
-                    var objArr = '';
-                    var RowData_Item1 = obj_Item1.getRowData(rowIds_Item1[i]);
-                    objArr += "'" + RowData_Item1.Code + "',";
-                    objArr = objArr.slice(0, objArr.length - 1);
-                    objArr = "" + objArr + "|";
-                    arr.push(objArr);
+            var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
+            for (var i = 0; i < objList.length; i++) {
+                var objArr = '';
+                var rowId = objList[i];
+                var rowData = $("#gridList").jqGrid('getRowData', rowId);
+                if (rowData.IsOccupy == '未占料') {
+                    $.modalAlert("所选单据未拣料,无法打印！", "warning");
+                    return;
                 }
+                objArr += "'" + rowData.Code + "',";
+                objArr = objArr.slice(0, objArr.length - 1);
+                objArr = "" + objArr + "|";
+                arr.push(objArr);
+
+            }
 
             //var arr = [];
             //var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
@@ -805,7 +810,7 @@
             //}
                 Arguments = arr;
                 mold = 'JL00001';
-            }
+      
         }
         $.modalOpen({
             id: "PrintLot",