From 2d8c736a14b919b208ec07767409d6803e7250b9 Mon Sep 17 00:00:00 2001
From: lixh <lixh>
Date: Thu, 5 May 2022 15:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E3=80=81=E5=A7=94=E5=A4=96?=
 =?UTF-8?q?=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ICSSoft.DataProject/ICSOutsourcingService.cs            | 6 +++---
 .../ICSSoft.DataProject/ICSWareHouseLotInfoService.cs       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs
index 4a227e6..72ba705 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs
@@ -438,7 +438,7 @@ namespace ICSSoft.DataProject
             {
                 #region ERP                       
                 string sql = string.Empty;
-                if (TransType == TransTypeEnum.MOIssueDocNegative.GetDescription())
+                if (TransType == TransTypeEnum.ICSOutsourcingIssueDoNegative.GetDescription())
                 {
                     sql = @"SELECT y.DepCode+a.ToWarehouseCode+y.OOCode+a.MUSER AS Costre,y.DepCode,a.ToWarehouseCode AS WarehouseCode,y.OOCode,a.MUSER,ROW_NUMBER() OVER (ORDER BY y.DepCode,a.ToWarehouseCode,y.OOCode,c.SourceDetailID,a.InvCode) AS Sequence,
                                 a.InvCode,SUM(a.Quantity) AS Quantity,0 AS Amount,c.SourceDetailID,Enable AS UpdateTodoQuantity
@@ -457,7 +457,7 @@ namespace ICSSoft.DataProject
 
                             DROP TABLE #TempERP";
                 }
-                else if (TransType == TransTypeEnum.MOIssueDocNegativeApply.GetDescription())
+                else if (TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeApply.GetDescription())
                 {
                     sql = @"SELECT a.ToWarehouseCode+z.ApplyCode+a.MUSER AS Costre,'' AS DepCode,a.ToWarehouseCode AS WarehouseCode,z.ApplyCode,a.MUSER,ROW_NUMBER() OVER (ORDER BY a.ToWarehouseCode,z.ApplyCode,c.SourceDetailID,a.InvCode) AS Sequence,
                                 a.InvCode,SUM(a.Quantity) AS Quantity,0 AS Amount,c.SourceDetailID,Enable AS UpdateTodoQuantity
@@ -475,7 +475,7 @@ namespace ICSSoft.DataProject
 
                             DROP TABLE #TempERP";
                 }
-                else if (TransType == TransTypeEnum.MOIssueDocNegativeIssue.GetDescription())
+                else if (TransType == TransTypeEnum.ICSOutsourcingIssueDoNegativeIssue.GetDescription())
                 {
                     sql = @"SELECT ISNULL(y.DepCode, '')+a.ToWarehouseCode+ISNULL(y.OOCode, z.ApplyCode)+a.MUSER AS Costre,ISNULL(y.DepCode, '') AS DepCode,a.ToWarehouseCode AS WarehouseCode,CASE WHEN m.PickID IS NOT NULL THEN '生产订单' WHEN m.ApplyDetailID IS NOT NULL THEN '领料申请单' ELSE '' END AS SourceType,ISNULL(y.OOCode, z.ApplyCode) AS OOCode,a.MUSER,ROW_NUMBER() OVER (ORDER BY ISNULL(y.DepCode, ''),a.ToWarehouseCode,ISNULL(y.OOCode, z.ApplyCode),a.InvCode) AS Sequence,
                                 a.InvCode,SUM(a.Quantity) AS Quantity,0 AS Amount,ISNULL(x.PickID, z.ApplyDetailID) AS SourceDetailID,Enable AS UpdateTodoQuantity
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
index 12cf8cc..d1bcf2c 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
@@ -43,9 +43,9 @@ namespace ICSSoft.DataProject
                             BEGIN
 	                            RAISERROR('条码：{0} 已入库！',16,1);
                                 RETURN
-                            END";
+                            END ";
                 }
-                sql += @"IF NOT EXISTS(SELECT F_Account FROM Sys_SRM_User WHERE F_Account='{2}' AND F_Location='{1}')
+                sql += @" IF NOT EXISTS(SELECT F_Account FROM Sys_SRM_User WHERE F_Account='{2}' AND F_Location='{1}')
                         BEGIN
 	                        RAISERROR('操作人：{2} 不存在！',16,1);
                             RETURN