From 0c999fbeed306e212e30baabf90792afa52412dc Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 17 十二月 2025 08:37:53 +0800
Subject: [PATCH] 主表ID改为序列化生成：生产订单、采购订单。采购订单整单删除功能日志消息补全。
---
MES.Service/service/BasicData/MesRohInManager.cs | 48 +++++++++++++++++++-----
MESApplication/Controllers/BasicData/MesRohInController.cs | 2 +
MES.Service/service/WomcaaManager.cs | 28 ++++++++++++++
3 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index bb53d8a..cdc658e 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -439,22 +439,50 @@
}).ToList();
}
+ ///// <summary>
+ ///// 鐢熸垚鏂扮殑涓昏〃ID锛岀‘淇濅笉閲嶅
+ ///// </summary>
+ //private decimal GenerateNewId()
+ //{
+ // // 澶勭悊绌鸿〃鐨勬儏鍐碉紝浠�1寮�濮�
+ // var maxId = Db.Queryable<MesRohIn>().Max(x => (decimal?)x.EbelnK3id) ?? 0;
+ // var newId = maxId + 1;
+
+ // // 鍙岄噸妫�鏌ワ紝纭繚鐢熸垚鐨処D涓嶅瓨鍦�
+ // while (Db.Queryable<MesRohIn>().Where(x => x.EbelnK3id == newId).Any())
+ // {
+ // newId++;
+ // }
+
+ // return newId;
+ //}
+
/// <summary>
- /// 鐢熸垚鏂扮殑涓昏〃ID锛岀‘淇濅笉閲嶅
+ /// 鐢熸垚鏂扮殑涓昏〃ID锛岄�氳繃鏁版嵁搴撳簭鍒楄幏鍙栧敮涓�ID
/// </summary>
private decimal GenerateNewId()
{
- // 澶勭悊绌鸿〃鐨勬儏鍐碉紝浠�1寮�濮�
- var maxId = Db.Queryable<MesRohIn>().Max(x => (decimal?)x.EbelnK3id) ?? 0;
- var newId = maxId + 1;
-
- // 鍙岄噸妫�鏌ワ紝纭繚鐢熸垚鐨処D涓嶅瓨鍦�
- while (Db.Queryable<MesRohIn>().Where(x => x.EbelnK3id == newId).Any())
+ try
{
- newId++;
- }
+ // 鏇挎崲涓猴細
+ var sequenceValueObj = Db.Ado.GetScalar("SELECT NEXT VALUE FOR MES_ROH_IN_seq");
+ var sequenceValue = Convert.ToDecimal(sequenceValueObj);
+ // 楠岃瘉搴忓垪鍊兼槸鍚︽湁鏁�
+ if (sequenceValue <= 0)
+ {
+ throw new InvalidOperationException($"鏁版嵁搴撳簭鍒� MES_ROH_IN_seq 杩斿洖浜嗘棤鏁堢殑鍊�: {sequenceValue}");
+ }
- return newId;
+ return sequenceValue;
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父淇℃伅
+ Console.WriteLine($"璋冪敤鏁版嵁搴撳簭鍒� MES_ROH_IN_seq 澶辫触: {ex.Message}");
+
+ // 鍚戜笂灞傛姏鍑烘槑纭殑寮傚父淇℃伅
+ throw new InvalidOperationException($"鐢熸垚瀛愯〃ID澶辫触锛屾棤娉曡幏鍙栨暟鎹簱搴忓垪鍊�: {ex.Message}", ex);
+ }
}
/// <summary>
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 6860bee..0672037 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -342,6 +342,34 @@
return newId;
}
+ ///// <summary>
+ ///// 鐢熸垚鏂扮殑涓昏〃ID锛岄�氳繃鏁版嵁搴撳簭鍒楄幏鍙栧敮涓�ID
+ ///// </summary>
+ //private decimal GenerateNewId()
+ //{
+ // try
+ // {
+ // // 鏇挎崲涓猴細
+ // var sequenceValueObj = Db.Ado.GetScalar("SELECT NEXT VALUE FOR MES_WOMCAB_IN_seq");
+ // var sequenceValue = Convert.ToDecimal(sequenceValueObj);
+ // // 楠岃瘉搴忓垪鍊兼槸鍚︽湁鏁�
+ // if (sequenceValue <= 0)
+ // {
+ // throw new InvalidOperationException($"鏁版嵁搴撳簭鍒� MES_WOMCAB_IN_seq 杩斿洖浜嗘棤鏁堢殑鍊�: {sequenceValue}");
+ // }
+
+ // return sequenceValue;
+ // }
+ // catch (Exception ex)
+ // {
+ // // 璁板綍寮傚父淇℃伅
+ // Console.WriteLine($"璋冪敤鏁版嵁搴撳簭鍒� MES_WOMCAB_IN_seq 澶辫触: {ex.Message}");
+
+ // // 鍚戜笂灞傛姏鍑烘槑纭殑寮傚父淇℃伅
+ // throw new InvalidOperationException($"鐢熸垚瀛愯〃ID澶辫触锛屾棤娉曡幏鍙栨暟鎹簱搴忓垪鍊�: {ex.Message}", ex);
+ // }
+ //}
+
/// <summary>
/// 鐢熸垚鏂扮殑瀛愯〃ID锛岄�氳繃鏁版嵁搴撳簭鍒楄幏鍙栧敮涓�ID
/// </summary>
diff --git a/MESApplication/Controllers/BasicData/MesRohInController.cs b/MESApplication/Controllers/BasicData/MesRohInController.cs
index 5049570..3300631 100644
--- a/MESApplication/Controllers/BasicData/MesRohInController.cs
+++ b/MESApplication/Controllers/BasicData/MesRohInController.cs
@@ -270,6 +270,7 @@
entity.Data = JsonConvert.SerializeObject(data);
entity.Status = 1;
entity.CreateBy = "PL017";
+ entity.Route = data.FBillNo;
try
{
dynamic resultInfos = new ExpandoObject();
@@ -284,6 +285,7 @@
entity.DealWith = 1;
_manager.save(entity);
+ entity.ResultData = outMsg;
return new ResponseResult
{
//status = outSum,
--
Gitblit v1.9.3