From a5019b475f8620dba3b495da983f4db9e32f7ca8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 10 七月 2025 08:18:36 +0800
Subject: [PATCH] AOI
---
MES.Service/service/WomcaaManager.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index b4d469a..a569556 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -24,7 +24,7 @@
public bool Save(ErpWOM wom)
{
var womErpCaa = wom.ErpCaa;
- var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
+ var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FXSHTBH, wom.ErpCabs[0].F_ZJXF_HSDJ);
var mesWomcabs =
MapErpCABtoWomcab(wom.ErpCabs);
@@ -58,6 +58,7 @@
}
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
+ db.Ado.CommitTran();
if (orUpdate && baOrUpdate)
{
//瀹氫箟杈撳叆鍙傛暟
@@ -73,11 +74,11 @@
if (result == 1)
{
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
- db.Ado.RollbackTran();
+ //db.Ado.RollbackTran();
throw new Exception(message);
}
// 鎻愪氦浜嬪姟
- db.Ado.CommitTran();
+ //db.Ado.CommitTran();
return true;
}
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
@@ -97,7 +98,7 @@
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
-
+ db.Ado.CommitTran();
if (orUpdate && baOrUpdate)
{
//瀹氫箟杈撳叆鍙傛暟
@@ -113,11 +114,11 @@
if (result == 1)
{
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
- db.Ado.RollbackTran();
+ //db.Ado.RollbackTran();
throw new Exception(message);
}
// 鎻愪氦浜嬪姟
- db.Ado.CommitTran();
+ //db.Ado.CommitTran();
return true;
}
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
@@ -133,7 +134,7 @@
throw new NotImplementedException("鏇存柊澶辫触");
}
- private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
+ private Womcaa MapErpCAAtoWomcaa(ErpCAA dto,string? fxshtbh,string? hsdj)
{
string jabs="0";
@@ -149,7 +150,7 @@
Caa011 = dto.FPlanFinishDate,
Caa012 = Convert.ToDecimal(dto.FQty),
Caa013 = dto.FBomId,
- Caa015 = dto.FSaleOrderNo,
+ Caa015 = fxshtbh,
Caa015Head = dto.FSaleOrderEntrySeq,
Caa016 = dto.FDescription,
Caa017 = 0,
@@ -187,7 +188,8 @@
TbTime = DateTime.Now,
JaBs = "0",
SupplierId=dto.SupplierId,
- FinishedProduct=dto.FinishedProduct
+ FinishedProduct=dto.FinishedProduct,
+ F_ZJXF_HSDJ= hsdj
};
if (dto.Type == "5")
--
Gitblit v1.9.3