From c98705ac9833f1b8fd2122ffb4d2d9eb45bf7bfa Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期一, 15 十二月 2025 09:22:47 +0800
Subject: [PATCH] 生产用料清单单号删除

---
 StandardInterface/MES.Service/service/WomcaaManager.cs |   32 ++++++++++++++++++++++++++++----
 StandardInterface/MESApplication/appsettings.json      |    2 +-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/StandardInterface/MES.Service/service/WomcaaManager.cs b/StandardInterface/MES.Service/service/WomcaaManager.cs
index 5651b46..24b41ba 100644
--- a/StandardInterface/MES.Service/service/WomcaaManager.cs
+++ b/StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -49,11 +49,23 @@
     private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
         List<Womcab> mesWomcabs)
     {
-        if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
+        /*if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
 
         if (mesWomcabs.Count > 0)
             db.Deleteable<Womcab>()
-                .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+                .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();*/
+
+
+        //20251212 鐒曠編鏀规垚鍗曞彿鍒犻櫎
+        // 鍒犻櫎涓昏〃锛氭寜 Caa001 鍒犻櫎鏃у崟鎹�
+        db.Deleteable<Womcaa>()
+            .Where(s => s.Caa001 == mesWomcaa.Caa001)
+            .ExecuteCommand();
+
+        // 鍒犻櫎瀛愯〃锛氭寜 Cab001 鍒犻櫎鎵�鏈夋棫琛�
+        db.Deleteable<Womcab>()
+            .Where(s => s.Cab001 == mesWomcaa.Caa001)  
+            .ExecuteCommand();
 
         //鍗曟潯鎻掑叆蹇界暐绌哄瓧娈�
         var orUpdate = db.Insertable(mesWomcaa)
@@ -122,7 +134,7 @@
         // 鎻愪氦浜嬪姟
         db.Ado.CommitTran();
 
-
+/*
         var decimals = mesWomcabs.Select(s => s.Id).ToArray();
 
         var update = true;
@@ -145,7 +157,19 @@
             return true;
         }
         throw new NotImplementedException("鏇存柊澶辫触");
-       
+        */
+        //20251212 鐒曠編鏀规垚鍗曞彿鍒犻櫎
+        // 鍒犻櫎涓昏〃锛氭寜 Caa001 鍒犻櫎鏃у崟鎹�
+        db.Deleteable<Womcaa>()
+            .Where(s => s.Caa001 == mesWomcaa.Caa001)
+            .ExecuteCommand();
+
+        // 鍒犻櫎瀛愯〃锛氭寜 Cab001 鍒犻櫎鎵�鏈夋棫琛�
+        db.Deleteable<Womcab>()
+            .Where(s => s.Cab001 == mesWomcaa.Caa001)
+            .ExecuteCommand();
+        return true;
+
     }
 
     private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
diff --git a/StandardInterface/MESApplication/appsettings.json b/StandardInterface/MESApplication/appsettings.json
index 28cfc2a..59a3601 100644
--- a/StandardInterface/MESApplication/appsettings.json
+++ b/StandardInterface/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
   "AppSettings": {
     "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
     "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
-    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd"
+    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
   }
 }

--
Gitblit v1.9.3