From e3c454b61eb969d186110c3ad7ab6a289cbc013a Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期五, 25 四月 2025 10:17:22 +0800
Subject: [PATCH] 生产订单 加 成品编号

---
 MES.Service/service/WomcaaManager.cs |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 928bde2..b4d469a 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -85,14 +85,41 @@
 
     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)
+        if (mesWomcabs.Count > 0) 
+        {
             db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+        }
 
         var orUpdate = base.Insert(mesWomcaa);
         var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
-        if (orUpdate && baOrUpdate) return true;
+
+        if (orUpdate && baOrUpdate)
+        {
+            //瀹氫箟杈撳叆鍙傛暟
+            var inputParam1 = new SugarParameter("P_WORK_NO", mesWomcaa.Caa001);
+            // 瀹氫箟杈撳嚭鍙傛暟
+            var outParam1 = new SugarParameter("c_Result", null, true);
+            var outParam2 = new SugarParameter("C_MSG", null, true);
+            // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+            Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
+            // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+            int result = int.Parse((string)outParam1.Value);
+            string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+            if (result == 1)
+            {
+                //瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
+                db.Ado.RollbackTran();
+                throw new Exception(message);
+            }
+            // 鎻愪氦浜嬪姟
+            db.Ado.CommitTran();
+            return true;
+        }
         throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
     }
 
@@ -122,7 +149,7 @@
             Caa011 = dto.FPlanFinishDate,
             Caa012 = Convert.ToDecimal(dto.FQty),
             Caa013 = dto.FBomId,
-            Caa015 = dto.FXSHTH,
+            Caa015 = dto.FSaleOrderNo,
             Caa015Head = dto.FSaleOrderEntrySeq,
             Caa016 = dto.FDescription,
             Caa017 = 0,
@@ -148,7 +175,7 @@
             SrcBillType = dto.FSrcBillType,
             SrcBillNo = dto.FSrcBillNo,
             SrcBillentryseq = dto.FSrcBillEntrySeq,
-            SaleOrderNo = dto.FXSHTH,
+            SaleOrderNo = dto.FSaleOrderNo,
             SaleOrderEntryseq = dto.FSaleOrderEntrySeq,
             ForceCloserid = dto.FForceCloserId,
             CloseType = dto.FCloseType,
@@ -158,7 +185,9 @@
             PrdOrg = dto.erP_SCZZ,
             TrustOrg = dto.erP_WTZZ,
             TbTime = DateTime.Now,
-            JaBs = "0"
+            JaBs = "0",
+            SupplierId=dto.SupplierId,
+            FinishedProduct=dto.FinishedProduct
         };
 
         if (dto.Type == "5")
@@ -225,7 +254,6 @@
 
             womcabList.Add(womcab);
         }
-
         return womcabList;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3