From 4b8adf76a495aca73c3a1af9b28a15d19b9a03f4 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 28 十一月 2025 14:38:52 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MES.Service/service/WomcaaManager.cs | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 1e62567..2a440e1 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -66,21 +66,23 @@
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);
+ 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;
+ var result = int.Parse((string)outParam1.Value);
+ var 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("鏇存柊澶辫触");
}
@@ -158,6 +160,7 @@
Reasonforrework = dto.FReasonForRework,
Isforcewholeset = dto.FIsForceWholeSet,
PREVMO = dto.FPrevMO,
+ TsDate = DateTime.Now,
Typea = dto.TypeA
};
@@ -171,7 +174,15 @@
&& x.OrgId == dto.FPrdOrgId
&& x.TableType == "MES_ITEMS").First();
+
+ var mesLinkU9_xm = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == Convert.ToString(dto.FProject)
+ && x.OrgId == dto.FPrdOrgId
+ && x.TableType == "MES_PROJECT").First();
+
if (mesLinkU9 != null) entity.Caa006 = mesLinkU9.MesId;
+ if (mesLinkU9_xm != null)
+ entity.Project = Convert.ToInt64(mesLinkU9_xm.MesId);
return entity;
}
@@ -257,7 +268,6 @@
Iscoupleissue = dto.FIsCoupleIssue,
FDescription = dto.FDescription,
TypeB = dto.TypeB
-
};
var entity = Db.Queryable<Womcab>()
@@ -267,10 +277,23 @@
//Cab003 = dto.FMaterialID
var mesLinkU9 = Db.Queryable<MesLinkU9>()
.Where(x => x.U9Id == dto.FMaterialID
- && x.OrgId == "1002011210000095"
+ && x.OrgId == "1002503270000079"
&& x.TableType == "MES_ITEMS").First();
+ var mesLinkU9_TDL = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == Convert.ToString(dto.FSubstitutedItem)
+ && x.OrgId == "1002503270000079"
+ && x.TableType == "MES_ITEMS").First();
+
+ var mesLinkU9_xm = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == Convert.ToString(dto.FProject)
+ && x.OrgId == "1002503270000079"
+ && x.TableType == "MES_PROJECT").First();
+
if (mesLinkU9 != null) womcab.Cab003 = mesLinkU9.MesId;
+ if (mesLinkU9_TDL != null)
+ womcab.Substituteditem = Convert.ToInt64(mesLinkU9_TDL.MesId);
+ if (mesLinkU9_xm != null) womcab.Project = mesLinkU9_xm.MesId;
womcabList.Add(womcab);
}
--
Gitblit v1.9.3