From a4ae3bf5f1826e8e29a95da3dc2c947d713d4ebb Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 06 六月 2025 15:38:14 +0800
Subject: [PATCH] 1.仓库信息储存逻辑调整 2.生产订单接口优化。

---
 MES.Service/service/BasicData/OrganizeManager.cs |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index a9b7cc8..0472154 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -3,7 +3,7 @@
 using MES.Service.Modes;
 using SqlSugar;
 
-namespace MES.Service.service;
+namespace MES.Service.service.BasicData;
 
 public class OrganizeManager : Repository<SysOrganization>
 {
@@ -23,14 +23,11 @@
                     if (UpdateOrganizetatus(db, entity.FNumber, "B"))
                         return 1;
                     break;
-                case "2":
-                    if (InsertItem(db, entity))
-                        return 1;
-                    break;
                 case "3":
                     if (DeleteItem(db, entity.FNumber))
                         return 1;
                     break;
+                case "2":
                 case "4":
                     if (InsertOrUpdate(db, entity))
                         return 1;
@@ -63,14 +60,11 @@
                         if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
                             throw new NotImplementedException("绂佺敤澶辫触");
                         break;
-                    case "2":
-                        if (!InsertItemBatch(db, itemGroup.Value))
-                            throw new NotImplementedException("鎻掑叆澶辫触");
-                        break;
                     case "3":
                         if (!DeleteItemBatch(db, itemGroup.Value))
                             throw new NotImplementedException("鍒犻櫎澶辫触");
                         break;
+                    case "2":
                     case "4":
                         if (!InsertOrUpdateBatch(db, itemGroup.Value))
                             throw new NotImplementedException("鍚屾澶辫触");
@@ -87,8 +81,9 @@
     private bool UpdateOrganizetatus(SqlSugarScope db, string number,
         string status)
     {
+        var equals = status.Equals("A");
         var result = db.Updateable<SysOrganization>()
-            .SetColumns(s => s.IsStatus == status.Equals("A"))
+            .SetColumns(s => s.IsStatus == equals)
             .Where(s => s.FNumber == number).ExecuteCommand();
 
         if (result > 0)
@@ -123,7 +118,9 @@
             Name = organize.FName,
             FNumber = organize.FNumber,
             FParentlD = organize.FParentID,
-            IsStatus = organize.FForbidStatus.Equals("A")
+            IsStatus = organize.FForbidStatus.Equals("A"),
+            Fid = organize.Id,
+            SynchronousDate = DateTime.Now
         };
     }
 
@@ -176,10 +173,6 @@
     private bool InsertOrUpdateBatch(SqlSugarScope db,
         List<SysOrganization> itemList)
     {
-        foreach (var entity in itemList)
-            if (!InsertOrUpdate(db, entity))
-                return false;
-
-        return true;
+        return itemList.All(entity => InsertOrUpdate(db, entity));
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3