From f34f0751ef0c6305c94ff342ca7fbe24aa09844e Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期四, 18 十二月 2025 14:48:31 +0800
Subject: [PATCH] 111

---
 StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs |   83 ++++++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index 7d44521..4af7f52 100644
--- a/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -16,45 +16,40 @@
 
         return UseTransaction(db =>
         {
-            // 鏍规嵁AsnNo鍜孧esNo瀵规槑缁嗚繘琛屽垎缁�
-            var groupedItems = itemOutLists
-                .GroupBy(item => new { item.AsnNo, item.MesNo, item.SqNo })
-                .ToList();
-
-            var result = 1;
-            foreach (var group in groupedItems)
+            // 鏍规嵁Type鎵ц涓嶅悓鐨勯�昏緫
+            switch (itemOutFrom.Type)
             {
-                // if (group.Key.AsnNo == null)
-                // {
-                //     throw new NotImplementedException("AsnNo涓嶈兘涓虹┖");
-                // }
-
-                if (group.Key.MesNo == null)
-                    throw new NotImplementedException("鍏ュ簱鍗曞崟鍙蜂笉鑳戒负绌�");
-
-                if (group.Key.SqNo == null)
-                    throw new NotImplementedException("閫�璐х敵璇峰崟琛屽彿涓嶈兘涓虹┖");
-
-                // 鍒涘缓涓�涓复鏃剁殑itemOutFrom瀵硅薄锛屼娇鐢ㄥ垎缁勭殑Key浣滀负涓昏灞炴��
-                var tempItemOutFrom = new ItemOutFrom
+                case "1":
                 {
-                    AsnNo = group.Key.AsnNo,
-                    MesNo = group.Key.MesNo,
-                    SqNo = group.Key.SqNo,
-                    // 缁ф壙鍘熷itemOutFrom鐨勫叾浠栧睘鎬�
-                    RtnNo = itemOutFrom.RtnNo,
-                    Type = itemOutFrom.Type,
-                    CreateBy = itemOutFrom.CreateBy,
-                    FMRMODE = itemOutFrom.FMRMODE,
-                    DepotId = itemOutFrom.DepotId,
-                    SupperId = itemOutFrom.SupperId
-                };
+                    // 鏍规嵁AsnNo鍜孧esNo瀵规槑缁嗚繘琛屽垎缁�
+                    var groupedItems = itemOutLists
+                        .GroupBy(item => new { item.AsnNo, item.MesNo, item.SqNo })
+                        .ToList();
 
-                // 鏍规嵁Type鎵ц涓嶅悓鐨勯�昏緫
-                switch (tempItemOutFrom.Type)
-                {
-                    case "1":
+                    var result = 1;
+                    foreach (var group in groupedItems)
                     {
+                        if (group.Key.MesNo == null)
+                            throw new NotImplementedException("鍏ュ簱鍗曞崟鍙蜂笉鑳戒负绌�");
+
+                        if (group.Key.SqNo == null)
+                            throw new NotImplementedException("閫�璐х敵璇峰崟琛屽彿涓嶈兘涓虹┖");
+
+                        // 鍒涘缓涓�涓复鏃剁殑itemOutFrom瀵硅薄锛屼娇鐢ㄥ垎缁勭殑Key浣滀负涓昏灞炴��
+                        var tempItemOutFrom = new ItemOutFrom
+                        {
+                            AsnNo = group.Key.AsnNo,
+                            MesNo = group.Key.MesNo,
+                            SqNo = group.Key.SqNo,
+                            // 缁ф壙鍘熷itemOutFrom鐨勫叾浠栧睘鎬�
+                            RtnNo = itemOutFrom.RtnNo,
+                            Type = itemOutFrom.Type,
+                            CreateBy = itemOutFrom.CreateBy,
+                            FMRMODE = itemOutFrom.FMRMODE,
+                            DepotId = itemOutFrom.DepotId,
+                            SupperId = itemOutFrom.SupperId
+                        };
+
                         var mesInvItemOuts = Db.Queryable<MesInvItemOuts>()
                             .Where(s => s.BillTypeId == BILL_TYPE_ID
                                         && s.TransactionNo == TRANSACTION_NO
@@ -71,21 +66,17 @@
                         // 涓哄綋鍓嶅垎缁勪繚瀛樻暟鎹�
                         var groupResult = Save(tempItemOutFrom, group.ToList());
                         if (!groupResult) result = 0;
-
-                        break;
                     }
-                    case "4":
-                        var removeResult = Remove(tempItemOutFrom);
-                        if (!removeResult) result = 0;
 
-                        break;
-                    default:
-                        result = 0;
-                        break;
+                    return result;
                 }
+                case "4":
+                    // 鍒犻櫎鎿嶄綔涓嶉渶瑕佸垎缁勶紝鐩存帴鏍规嵁RtnNo鍒犻櫎鍗冲彲
+                    var removeResult = Remove(itemOutFrom);
+                    return removeResult ? 1 : 0;
+                default:
+                    return 0;
             }
-
-            return result;
         }) > 0;
     }
 

--
Gitblit v1.9.3