From d3ae2e67d8237e8474c7b88f526619550608b933 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 13 三月 2025 21:51:20 +0800
Subject: [PATCH] 通信
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/NjTaskServer.cs | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 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/NjTaskServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/NjTaskServer.cs"
index 151fb20..ef3f16e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/NjTaskServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/NjTaskServer.cs"
@@ -393,28 +393,40 @@
try
{
#region 鑷畾涔夊懡鍚嶇粰Njtaskid
- // 鑾峰彇浠婂ぉ鐨勬棩鏈熼儴鍒嗭紝濡� "KH0306"
- string todayPrefix = $"KH{DateTime.Now:MMdd}";
-
- // 鏌ヨ鏁版嵁搴擄紝鎵惧嚭褰撳ぉ鏈�澶х殑 NJtaskID
- var lastTask = BaseDal.QueryData(i => i.NJtaskID.StartsWith(todayPrefix))
- .OrderByDescending(i => i.NJtaskID)
- .FirstOrDefault();
-
- int nextNumber = 1; // 榛樿缂栧彿
-
- if (lastTask != null)
+ string CustomizeID = "";
+ if (addNjtDTO.NJtaskID == 0)
{
- // 鑾峰彇鍚庝袱浣嶅垎閽熺紪鍙�
- string lastNumberPart = lastTask.NJtaskID.Substring(6, 2);
- if (int.TryParse(lastNumberPart, out int lastNumber))
- {
- nextNumber = lastNumber + 1;
- }
- }
+ // 鑾峰彇浠婂ぉ鐨勬棩鏈熼儴鍒嗭紝濡� "K20250306"
+ string todayPrefix = $"K{DateTime.Now:yyyyMMdd}";
- // 鐢熸垚 NJtaskID锛屼緥濡� KH0306001, KH0306002...
- string CustomizeID = $"{todayPrefix}{nextNumber:D3}";//D3琛ㄧず 3浣嶆暟锛屼笉瓒宠ˉ0
+ // 鏌ヨ鏁版嵁搴擄紝鎵惧嚭褰撳ぉ鏈�澶х殑 NJtaskID
+ var lastTask = BaseDal.QueryData(i => i.NJtaskID.StartsWith(todayPrefix))
+ .OrderByDescending(i => i.NJtaskID)
+ .FirstOrDefault();
+
+ int nextNumber = 1; // 榛樿缂栧彿
+
+ if (lastTask != null)
+ {
+ // 鑾峰彇鍚庝袱浣嶅垎閽熺紪鍙�
+ string lastNumberPart = lastTask.NJtaskID.Substring(6, 2);
+ if (int.TryParse(lastNumberPart, out int lastNumber))
+ {
+ nextNumber = lastNumber + 1;
+ }
+ }
+
+ // 鐢熸垚 NJtaskID锛屼緥濡� KH0306001, KH0306002...
+ CustomizeID = $"{todayPrefix}{nextNumber:D3}";//D3琛ㄧず 3浣嶆暟锛屼笉瓒宠ˉ0
+ }
+ else
+ {
+ CustomizeID = addNjtDTO.NJtaskID.ToString();
+ }
+ if (addNjtDTO.Creater=="")
+ {
+ addNjtDTO.Creater = "admin";
+ }
#endregion
var addnj = new Dt_NjTask()
@@ -441,17 +453,15 @@
createTime = DateTime.Now,
};
- _unitOfWorkManage.BeginTran();
BaseDal.AddData(addnj);
- _unitOfWorkManage.CommitTran();
- return new WebResponseContent { Status = true, Data = addnj };
+ return new WebResponseContent { Status = true, Message = "鎴愬姛", Code = 200, Data = addnj };
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
- return new WebResponseContent { Status = false, Message = "澶辫触" + ex.Message };
+
+ return new WebResponseContent { Status = false, Message = "澶辫触" + ex.Message,Code= 400 };
}
}
--
Gitblit v1.9.3