From 563ce4cedd764d3e53e9384197fc14e618d776d5 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 14 三月 2025 17:44:23 +0800
Subject: [PATCH] 美型
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/ProcessServer.cs | 44 +++++++++-----------------------------------
1 files changed, 9 insertions(+), 35 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
index 76a679e..611d79e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
@@ -38,38 +38,13 @@
return base.GetPageData(options);
}
- public WebResponseContent GetProcess(string gruop)
- {
- try
- {
- _unitOfWorkManage.BeginTran();
- var proce = BaseDal.QueryData(i => i.CraftType == gruop);
-
-
- _unitOfWorkManage.CommitTran();
- if (proce != null)
- {
- return new WebResponseContent { Status = true, Data = proce };
- }
- else
- {
- return new WebResponseContent { Status = false, Message = "鏁版嵁涓虹┖" };
- }
-
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return new WebResponseContent { Status = false, Message = "澶辫触" + ex.Message };
- }
- }
+
//鑾峰彇濂楃瓛鏁伴噺
public WebResponseContent GetSleeveandStep(string gruops)
{
try
{
- _unitOfWorkManage.BeginTran();
var result = BaseDal.QueryData(x => x.CraftType == gruops) // 鍏堢瓫閫� CraftType
.GroupBy(x => x.CraftType) // 鎸� CraftType 鍒嗙粍
.Select(g => new
@@ -77,12 +52,11 @@
maxNodal = g.Max(a => a.Nodal),
sumTorqueSum = g.Sum(a => a.TorqueSum)
}).ToList();
- _unitOfWorkManage.CommitTran();
+
return new WebResponseContent { Status = true, Data = result };
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
return new WebResponseContent { Status = false, Message = "鏌ヨ澶辫触锛�" + ex.Message };
}
}
@@ -93,13 +67,13 @@
{
try
{
- _unitOfWorkManage.BeginTran(); // 寮�鍚簨鍔�
-
+
// 鍒ゆ柇鏄坊鍔犺繕鏄洿鏂�
if (addProcessDTO.id == 0)//娣诲姞
{
+ var pross = BaseDal.QueryData();
// 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑 setnum
- bool isExist = BaseDal.QueryData(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype).Any();
+ bool isExist = pross.Where(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype).Any();
if (isExist)
{
return new WebResponseContent { Status = false, Message = $"姝ラ {addProcessDTO.setnum} 宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�" };
@@ -123,10 +97,9 @@
};
BaseDal.AddData(proces);
- _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
return new WebResponseContent { Status = true, Data = proces };
}
- else
+ else//鏇存柊
{
// 鏌ヨ褰撳墠瑕佹洿鏂扮殑璁板綍
var existingProcess = BaseDal.QueryFirst(x => x.CraftID == addProcessDTO.id);
@@ -158,14 +131,14 @@
existingProcess.ArticleTwo = addProcessDTO.articletwo;
existingProcess.CreateDate = DateTime.Now;
BaseDal.UpdateData(existingProcess);
- _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
+
return new WebResponseContent { Status = true, Data = existingProcess };
}
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran(); // 浜嬪姟鍥炴粴
+
return new WebResponseContent { Status = false, Message = "鎿嶄綔澶辫触锛�" + ex.Message };
}
}
@@ -184,6 +157,7 @@
//鑾峰彇Modifier ="true" 琛ㄧず鏄己鍒舵墽琛�
var Mod = torp.Select(x => x.Modifier).FirstOrDefault();
+
//鏌ュ嚭宸ヨ壓琛�
var process = BaseDal.QueryData(x => x.CraftType == group);
--
Gitblit v1.9.3