From 161574a0dd7d9e1da6e00c65855a0c8b401c934e Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期三, 25 六月 2025 16:21:14 +0800
Subject: [PATCH] 反审核无id通过

---
 StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs           |   19 ++++++++-
 StandardInterface/MES.Service/service/WomcaaManager.cs                               |   23 +++++++++--
 StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs |   23 +++++++++--
 StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs    |   23 +++++++++--
 4 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
index 6291f89..31efed9 100644
--- a/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
@@ -50,12 +50,25 @@
         List<Womcab> mesRohInDatas)
     {
         var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
-        var update = base.DeleteById(womcaaWW.Id);
-        var insertOrUpdate = db
-            .Deleteable<Womcab>().In(decimals)
-            .ExecuteCommand() > 0;
 
-        if (update && insertOrUpdate) return true;
+        var update = true;
+        if (womcaaWW != null)
+        {
+            if (womcaaWW.Id != null)
+            {
+                update = base.DeleteById(womcaaWW.Id);
+            }
+        }
+        var insertOrUpdate = true;
+        if (decimals != null || decimals.Length > 0)
+        {
+            insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+        }
+
+        if (update && insertOrUpdate)
+        {
+            return true;
+        }
         throw new NotImplementedException("鏇存柊澶辫触");
     }
 
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
index 42e41b0..987942e 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
@@ -39,14 +39,29 @@
     private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder, List<SalesOrderDetail> mesSalesOrderDatas)
     {
         var decimals = mesSalesOrderDatas.Select(s => s.Id).ToArray();
-        var update = base.DeleteById(mesSalesOrder.Id);
-        var insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals).ExecuteCommand() > 0;
+
+        var update = true;
+        if (mesSalesOrder != null) {
+            if (mesSalesOrder.Id != null)
+            {
+                 update = base.DeleteById(mesSalesOrder.Id);
+            }
+        }
+        var insertOrUpdate = true;
+        if (decimals != null || decimals .Length>0)
+        {
+            insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals).ExecuteCommand() > 0;
+        } 
 
         if (update && insertOrUpdate)
         {
             return true;
         }
         throw new NotImplementedException("鏇存柊澶辫触");
+
+      
+
+
     }
 
     // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
index 9175278..4e91e23 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
@@ -48,12 +48,25 @@
         List<SalesReturnNoticeDetail> mesSalesReturnDatas)
     {
         var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
-        var update = base.DeleteById(mesSalesReturn.Id);
-        var insertOrUpdate = db
-            .Deleteable<SalesReturnNoticeDetail>().In(decimals)
-            .ExecuteCommand() > 0;
 
-        if (update && insertOrUpdate) return true;
+        var update = true;
+        if (mesSalesReturn != null)
+        {
+            if (mesSalesReturn.Id != null)
+            {
+                update = base.DeleteById(mesSalesReturn.Id);
+            }
+        }
+        var insertOrUpdate = true;
+        if (decimals != null || decimals.Length > 0)
+        {
+            insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>().In(decimals).ExecuteCommand() > 0;
+        }
+
+        if (update && insertOrUpdate)
+        {
+            return true;
+        }
         throw new NotImplementedException("鏇存柊澶辫触");
     }
 
diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs
index 853ca03..2c03d6f 100644
--- a/StandardInterface/MES.Service/service/WomcaaManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -72,14 +72,27 @@
         List<Womcab> mesWomcabs)
     {
         var decimals = mesWomcabs.Select(s => s.Id).ToArray();
-        var update = base.DeleteById(mesWomcaa.Id);
-        var insertOrUpdate = db
-            .Deleteable<Womcab>().In(decimals)
-            .ExecuteCommand() > 0;
 
+        var update = true;
+        if (mesWomcaa != null)
+        {
+            if (mesWomcaa.Id != null)
+            {
+                update = base.DeleteById(mesWomcaa.Id);
+            }
+        }
+        var insertOrUpdate = true;
+        if (decimals != null || decimals.Length > 0)
+        {
+            insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+        }
 
-        if (update && insertOrUpdate) return true;
+        if (update && insertOrUpdate)
+        {
+            return true;
+        }
         throw new NotImplementedException("鏇存柊澶辫触");
+       
     }
 
     private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)

--
Gitblit v1.9.3