From 45d11ad57ed77f0fc6e8052807f54c88b0c6a85e Mon Sep 17 00:00:00 2001
From: lilili <webadmin@tedu.com>
Date: Tue, 6 Jun 2023 13:55:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 d7f724e..5ab5d48 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
@@ -263,8 +263,10 @@
         }
 
         $gridList.dataGrid({
-            url: "/WMS/PickMaterial/GetGridJson?Type=" + Type + "&" + Math.random(),
-            postData: { queryJson: JSON.stringify(queryJson) },
+            //url: "/WMS/PickMaterial/GetGridJson?Type=" + Type + "&" + Math.random(),
+            //postData: { queryJson: JSON.stringify(queryJson) },
+            url: "/WMS/PickMaterial/GetGridJson?" + Math.random(),
+            postData: { queryJson: JSON.stringify(queryJson),Type:Type },
             height: 280,
             width: $(window).width() - 500,
             colModel: _Clos,
@@ -488,6 +490,7 @@
             $('#btn_search').trigger("click");
         });
         $("#btn_search").click(function () {
+            debugger;
             var warehouse = $("#warehouse a.active").attr('data-value');
             var Types = $("#selShow").val();
             var queryJson = {