From 6607e57bae8d06d1ad42e6491159338b5a32a3f2 Mon Sep 17 00:00:00 2001
From: lilili <webadmin@tedu.com>
Date: Wed, 20 Sep 2023 16:47:56 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=B0=83=E6=95=B4=E6=94=B6=E6=96=99?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b8cd7b6801d288653f1b07c9611998b0b4b82def.
---
 .../ICSManufactureService.cs                  | 53 ++++++++-----------
 .../ICSSoft.DataProject/ICSSubmitService.cs   |  2 +-
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
index 78b4ee3..8b69ff1 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
@@ -200,46 +200,37 @@ namespace ICSSoft.DataProject
         /// <param name="Quantity"></param>
         /// <param name="WorkPoint"></param>
         /// <param name="cmd"></param>
-        public static void MOApply(string TransCode, string TransSequence, string Quantity, string WorkPoint,string userCode, SqlCommand cmd, Dictionary<string, string> language)
+        public static void MOApply(string TransCode, string TransSequence, string Quantity, string WorkPoint, SqlCommand cmd, Dictionary<string, string> language)
         {
             try
             {
-                //string sql = @"DECLARE @Status VARCHAR(10)
-                //                SELECT @Status=a.Status FROM ICSMOApply  a
-                //                WHERE a.ApplyCode='{0}' AND a.Sequence='{3}' AND a.WorkPoint='{1}'
-
-                //                IF (@Status IS NULL)
-                //                BEGIN
-                //                 RAISERROR('" + language.GetNameByCode("WMSAPIInfo128") + @"',16,1);
-                //                    RETURN
-                //                END
-                //                ELSE IF (@Status!='2')
-                //                BEGIN
-                //                 RAISERROR('" + language.GetNameByCode("WMSAPIInfo129") + @"',16,1);
-                //                    RETURN
-                //                END
-                //                UPDATE a SET IssueQuantity=ISNULL(IssueQuantity,0)+'{2}'
-                //                FROM ICSMOApply  a
-                //                WHERE a.ApplyCode='{0}' AND a.Sequence='{3}' AND a.WorkPoint='{1}'
-
-                //                IF EXISTS(SELECT a.ID FROM ICSMOApply  a
-                //                 WHERE a.ApplyCode='{0}' AND a.Sequence='{3}' and a.WorkPoint='{1}' AND a.Quantity<a.IssueQuantity)
-                //                BEGIN
-                //                 RAISERROR('" + language.GetNameByCode("WMSAPIInfo091") + @"',16,1);
-                //                    RETURN
-                //                END";
+                string sql = @"DECLARE @Status VARCHAR(10)
+                                SELECT @Status=a.Status FROM ICSMOApply  a
+                                WHERE a.ApplyCode='{0}' AND a.Sequence='{3}' AND a.WorkPoint='{1}'
 
-                //sql = string.Format(sql, TransCode, WorkPoint, Quantity, TransSequence,userCode);
+                                IF (@Status IS NULL)
+                                BEGIN
+	                                RAISERROR('" + language.GetNameByCode("WMSAPIInfo128") + @"',16,1);
+                                    RETURN
+                                END
+                                ELSE IF (@Status!='2')
+                                BEGIN
+	                                RAISERROR('" + language.GetNameByCode("WMSAPIInfo129") + @"',16,1);
+                                    RETURN
+                                END
+                                UPDATE a SET IssueQuantity=ISNULL(IssueQuantity,0)+'{2}'
+                                FROM ICSMOApply  a
+                                WHERE a.ApplyCode='{0}' AND a.Sequence='{3}' AND a.WorkPoint='{1}'
 
-                string sql = $@"UPDATE ICSMOApply SET IssueQuantity=ISNULL(IssueQuantity,0)+'{Quantity}',ReceiverNumber='{userCode}',ReceiverName=(SELECT  top 1 F_RealName FROM Sys_SRM_User WHERE F_Account='{userCode}' )
-                               
-                                WHERE ApplyCode='{TransCode}' AND Sequence='{TransSequence}' AND WorkPoint='{WorkPoint}';
                                 IF EXISTS(SELECT a.ID FROM ICSMOApply  a
-	                                WHERE a.ApplyCode='{TransCode}' AND a.Sequence='{TransSequence}' and a.WorkPoint='{WorkPoint}' AND a.Quantity<a.IssueQuantity)
+	                                WHERE a.ApplyCode='{0}' AND a.Sequence='{3}' and a.WorkPoint='{1}' AND a.Quantity<a.IssueQuantity)
                                 BEGIN
-	                                RAISERROR('{language.GetNameByCode("WMSAPIInfo091")}',16,1);
+	                                RAISERROR('" + language.GetNameByCode("WMSAPIInfo091") + @"',16,1);
                                     RETURN
                                 END";
+
+                sql = string.Format(sql, TransCode, WorkPoint, Quantity, TransSequence);
+
                 if (!DBHelper.ExecuteNonQuery(sql, cmd))
                 {
                     throw new Exception(language.GetNameByCode("WMSAPIInfo130"));//"领料申请单更新失败！");
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 13e69fc..7465538 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
@@ -3191,7 +3191,7 @@ namespace ICSSoft.DataProject
                         {
                             BusinessCode = TransTypeEnum.MOApply.GetDescription<DBValue>();
                             //更新源头单据数量
-                            ICSManufactureService.MOApply(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint,item.User, cmd, language);
+                            ICSManufactureService.MOApply(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language);
 
                             foreach (var itemInfo in item.detail)
                             {