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

---
 .../OMAY/ICSMoCreateLotApp.cs                 |  2 +-
 .../LotDataGenerationIndex.cshtml             | 24 ++++++++++++++++++-
 WMS-BS/NFine.Web/NFine.Web.csproj             |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs b/WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs
index ad610fa..5392180 100644
--- a/WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs
+++ b/WMS-BS/NFine.Application/OMAY/ICSMoCreateLotApp.cs
@@ -1004,7 +1004,7 @@ values(newid(),'{0}','{1}',getdate(),'{2}','{3}','{4}','19','{5}','{6}',getdate(
                 msg += "所选条码已入库，无法删除！";
             }
             if (string.IsNullOrEmpty(msg))
-            {`
+            {
                 string sqls = string.Format(@"DELETE FROM dbo.ICSInventoryLot  WHERE LotNo IN ({0}) and WorkPoint ='{1}' and Type='19' ", keyValue.TrimEnd(','), WorkPoint);
                 SqlHelper.CmdExecuteNonQueryLi(sqls);
             }
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 9b3732d..2b1f006 100644
--- a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml
+++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYLotDataGeneration/LotDataGenerationIndex.cshtml
@@ -156,7 +156,28 @@
     }
 
 
-
+    function btn_Delete() {
+        debugger;
+        var objArr = '';
+        var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
+        for (var i = 0; i < objList.length; i++) {
+            var rowId = objList[i];
+            var rowData = $("#gridList").jqGrid('getRowData', rowId);
+            objArr += "'" + rowData.LotNo + "',";
+        }
+        if (objArr == '') {
+            $.modalAlertNew("WMS00021");
+            return;
+        }
+        debugger;
+        $.deleteForm({
+            url: "/WMS/HomeWork/DeleteInitialImport" + "?" + Math.random(),
+            param: { keyValue: JSON.stringify(objArr) },
+            success: function () {
+                $.currentWindow().$("#gridList").trigger("reloadGrid");
+            }
+        })
+    }
 
 
 </script>
@@ -166,6 +187,7 @@
         <div class="btn-group">
             <a id="NF-Create" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnCreate()"><i class="fa fa-pencil-square-o"></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 id="NF-Delete" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Delete()"><i class="fa fa-pencil-square-o"></i>删除</a>
             <a class="btn btn-primary" onclick="$.reload()"><span class="glyphicon glyphicon-refresh"></span></a>
 
         </div>
diff --git a/WMS-BS/NFine.Web/NFine.Web.csproj b/WMS-BS/NFine.Web/NFine.Web.csproj
index 8435bf4..2abd2d6 100644
--- a/WMS-BS/NFine.Web/NFine.Web.csproj
+++ b/WMS-BS/NFine.Web/NFine.Web.csproj
@@ -65,7 +65,7 @@
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\基础版代码\WMS-BS\NFine.Web\bin\Newtonsoft.Json.dll</HintPath>
+      <HintPath>bin\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />