From 5c465adb6748bfac0bccab66f1587b4ff2b6695a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 18 三月 2025 15:11:24 +0800
Subject: [PATCH] 扭矩
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/ProcessServer.cs | 61 +++++++-----------------------
1 files changed, 14 insertions(+), 47 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..4a723d7 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"
@@ -34,42 +34,18 @@
OrderByParameters = new Dictionary<string, OrderByType>
{
{ nameof(Dt_Process.SetpNum), OrderByType.Asc },//鎸変粈涔堝瓧娈垫帓搴�
+ { nameof(Dt_Process.CraftType), OrderByType.Asc }
};
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 +53,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,14 +68,12 @@
{
try
{
- _unitOfWorkManage.BeginTran(); // 寮�鍚簨鍔�
+ var allProcesses = BaseDal.QueryData(); // 浠呮煡璇竴娆℃墍鏈夋暟鎹�
- // 鍒ゆ柇鏄坊鍔犺繕鏄洿鏂�
- if (addProcessDTO.id == 0)//娣诲姞
+ if (addProcessDTO.id == 0) // 娣诲姞
{
// 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑 setnum
- bool isExist = BaseDal.QueryData(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype).Any();
- if (isExist)
+ if (allProcesses.Any(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype))
{
return new WebResponseContent { Status = false, Message = $"姝ラ {addProcessDTO.setnum} 宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�" };
}
@@ -118,34 +91,29 @@
ArticleOne = addProcessDTO.articleone,
ArticleTowid = addProcessDTO.aritcletowid,
ArticleTwo = addProcessDTO.articletwo,
- Creater = "admin",
CreateDate = DateTime.Now
};
BaseDal.AddData(proces);
- _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
return new WebResponseContent { Status = true, Data = proces };
}
- else
+ else // 鏇存柊
{
- // 鏌ヨ褰撳墠瑕佹洿鏂扮殑璁板綍
- var existingProcess = BaseDal.QueryFirst(x => x.CraftID == addProcessDTO.id);
+ var existingProcess = allProcesses.FirstOrDefault(x => x.CraftID == addProcessDTO.id);
if (existingProcess == null)
{
return new WebResponseContent { Status = false, Message = "鏈壘鍒拌宸ヨ壓姝ラ锛屾棤娉曟洿鏂帮紒" };
}
// 鍙湁褰� setnum 鍙戠敓鍙樺寲鏃讹紝鎵嶈繘琛岄噸澶嶆�ф鏌�
- if (existingProcess.Nodal != addProcessDTO.setnum)
+ if (existingProcess.SetpNum != addProcessDTO.setnum &&
+ allProcesses.Any(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype && x.CraftID != addProcessDTO.id))
{
- bool isExist = BaseDal.QueryData(x => x.Nodal == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype && x.CraftID != addProcessDTO.id).Any();
- if (isExist)
- {
- return new WebResponseContent { Status = false, Message = $"姝ラ {addProcessDTO.setnum} 宸插瓨鍦紝涓嶈兘閲嶅锛�" };
- }
+ return new WebResponseContent { Status = false, Message = $"姝ラ {addProcessDTO.setnum} 宸插瓨鍦紝涓嶈兘閲嶅锛�" };
}
// 鏇存柊鏁版嵁
+ existingProcess.Nodal = addProcessDTO.Nodal;
existingProcess.SetpNum = addProcessDTO.setnum;
existingProcess.CraftType = addProcessDTO.craftstype;
existingProcess.CraftsStep = addProcessDTO.craftsstep;
@@ -157,15 +125,13 @@
existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
existingProcess.ArticleTwo = addProcessDTO.articletwo;
existingProcess.CreateDate = DateTime.Now;
- BaseDal.UpdateData(existingProcess);
- _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
+ BaseDal.UpdateData(existingProcess);
return new WebResponseContent { Status = true, Data = existingProcess };
}
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran(); // 浜嬪姟鍥炴粴
return new WebResponseContent { Status = false, Message = "鎿嶄綔澶辫触锛�" + ex.Message };
}
}
@@ -184,6 +150,7 @@
//鑾峰彇Modifier ="true" 琛ㄧず鏄己鍒舵墽琛�
var Mod = torp.Select(x => x.Modifier).FirstOrDefault();
+
//鏌ュ嚭宸ヨ壓琛�
var process = BaseDal.QueryData(x => x.CraftType == group);
--
Gitblit v1.9.3