From 2b3f6159b220222825068d3c039b7b3634fe87fc Mon Sep 17 00:00:00 2001
From: lilili <webadmin@tedu.com>
Date: Tue, 20 Jun 2023 16:33:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs          | 4 ++--
 .../Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml    | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
index 7dc4942..d0f4990 100644
--- a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
+++ b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
@@ -1610,7 +1610,7 @@ WHERE
                 string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode;
                 string MUSERNAME = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName;
                 DateTime MTime = DateTime.Now;
-                string sql = $@"SELECT *  FROM ICSDeliveryNotice WHERE ID in({ids}) AND DNCode NOT IN(SELECT TransCode From ICSInventoryLotDetail) ";
+                string sql = $@"SELECT *  FROM ICSDeliveryNotice a WHERE ID in({ids}) AND DNCode NOT IN(SELECT TransCode From ICSInventoryLotDetail b where a.Sequence=b.TransSequence)  ";
                 var dataset = Repository().FindDataSetBySql(sql);
                 if (dataset.Tables.Count <= 0)
                     return 0;
@@ -1821,7 +1821,7 @@ insert into ICSInventoryLot
                 string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode;
                 string MUSERNAME = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName;
                 DateTime MTime = DateTime.Now;
-                string sql = $@"SELECT *  FROM ICSManufactureReceive WHERE ID in({ids}) AND RCVCode NOT IN(SELECT TransCode From ICSInventoryLotDetail) ";
+                string sql = $@"SELECT *  FROM ICSManufactureReceive a WHERE ID in({ids}) AND RCVCode NOT IN(SELECT TransCode From ICSInventoryLotDetail b where a.Sequence=b.TransSequence) ";
                 var dataset = Repository().FindDataSetBySql(sql);
                 if (dataset.Tables.Count == 0)
                     return 0;
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
index 3fd6132..ab5be21 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
@@ -3206,6 +3206,11 @@
             return;
         }
         for (var i = 0; i < objList.length; i++) {
+            var AreaType = $("#gridList").jqGrid('getRowData', objList[i]).AreaType;
+            if (AreaType == "货柜") {
+                $.modalAlertNew("WMS00112");
+                return;
+            }
             /*var rowData = $("#gridList").jqGrid('getRowData', rowId);获取数据*/
             if (objList[i] != undefined) {
                 objID += "'" + objList[i] + "',";