From 3b2985e7a3cc29863d39937fcd28ae4514a83408 Mon Sep 17 00:00:00 2001
From: Juj <1005539536@qq.com>
Date: Tue, 23 Jan 2024 17:45:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=9F=E5=88=9D=E6=96=B0=E5=A2=9E=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WMS-BS/NFine.Application/WMS/HomeWorkApp.cs               | 2 +-
 .../OMAYLotDataGeneration/LotDataGenerationIndex.cshtml   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WMS-BS/NFine.Application/WMS/HomeWorkApp.cs b/WMS-BS/NFine.Application/WMS/HomeWorkApp.cs
index 0bf305a..e0d05d2 100644
--- a/WMS-BS/NFine.Application/WMS/HomeWorkApp.cs
+++ b/WMS-BS/NFine.Application/WMS/HomeWorkApp.cs
@@ -461,7 +461,7 @@ namespace NFine.Application.WMS
             string msg = "";
             keyValue = keyValue.Substring(1, keyValue.Length - 2);
 
-            string sqlSeach = string.Format(@" select LotNo from dbo.ICSWareHouseLotInfoLog where TransType<>'1' and LotNo in({0}) and WorkPoint in ('{1}')", keyValue.TrimEnd(','), WorkPoint);
+            string sqlSeach = string.Format(@" select LotNo from dbo.ICSWareHouseLotInfoLog where BusinessCode<>'39' and LotNo in({0}) and WorkPoint in ('{1}')", keyValue.TrimEnd(','), WorkPoint);
             DataTable dtASN = SqlHelper.GetDataTableBySql(sqlSeach);
             if (dtASN != null && dtASN.Rows.Count > 0)
             {
diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml
index 2b1f006..6463d6e 100644
--- a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml
+++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml
@@ -49,10 +49,10 @@
             sortorder: "desc",
             viewrecords: true,
             multiselect: true,
-            beforeSelectRow: function (rowid, e) {
-                $("#gridList").jqGrid('resetSelection');
-                return (true);
-            },
+            //beforeSelectRow: function (rowid, e) {
+            //    $("#gridList").jqGrid('resetSelection');
+            //    return (true);
+            //},
         });
 
         $("#warehouse a.btn-default").click(function () {