From 8e6c1b7d1cda8bce46dbdc9c6921658d52d87dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=92=E6=9E=97=E6=9D=B0?= <1205395967@qq.com>
Date: Fri, 16 Sep 2022 11:06:54 +0800
Subject: [PATCH] mao

---
 .../ICSSoft.DataProject/ICSSubmitService.cs       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 2335cb7..dde0972 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
@@ -1537,13 +1537,16 @@ namespace ICSSoft.DataProject
                     //入库条码
                     else
                     {
+                        
                         if (ScanType == "LOTNO")
                         {
-                            sql = @"IF NOT EXISTS(SELECT a.ID FROM ICSInventoryLot a WHERE a.LotNo='{2}' AND a.WorkPoint='{3}')
-                                    BEGIN
-	                                    RAISERROR('" + string.Format(language.GetNameByCode("WMSAPIInfo038"), "{2}") + @"',16,1);
-                                        RETURN
-                                    END
+                            sql = @"
+                                IF NOT EXISTS(SELECT a.ID FROM ICSInventoryLot a WHERE a.LotNo = '{2}' AND a.WorkPoint = '{3}')
+                                            BEGIN
+
+                                                RAISERROR('" + string.Format(language.GetNameByCode("WMSAPIInfo038"), "{2}") + @"', 16, 1);
+                                RETURN
+                                END
                                 IF EXISTS(SELECT a.ID FROM ICSWareHouseLotInfo a WHERE a.LotNo='{2}' AND a.WorkPoint='{3}')
                                     BEGIN
 	                                    RAISERROR('" + language.GetNameByCode("WMSAPIInfo039") + @"',16,1);
@@ -1630,7 +1633,7 @@ namespace ICSSoft.DataProject
                     #region 出库检验是否符合源头单据
                     string msg = string.Empty;
                     bool isLimit = false;
-                    string sqlCheckSign = @"select F_EnabledMark  from Sys_SRM_Items where F_EnCode = 'OutWithLocationCode'";
+                    string sqlCheckSign = @"select F_EnabledMark  from Sys_SRM_Items where F_EnCode = 'OutWithLocationCode' and F_EnabledMark = '1'";
                     DataTable flag = DBHelper.SQlReturnData(sqlCheckSign, cmd);
                     if (isOut)   // && TransType != TransTypeEnum.LOTSplit.GetDescription()
                     {//&& TransType != TransTypeEnum.TransferLibrary.GetDescription()