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 | 150 ++++++++++++++++++++++++-------------------------
1 files changed, 74 insertions(+), 76 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 eef7faa..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"
@@ -5,6 +5,7 @@
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
+using StackExchange.Profiling.Internal;
using WIDESEA_ISerialPortRepository;
using WIDESEA_SerialPortRepository;
using WIDESEAWCS_Core;
@@ -22,7 +23,6 @@
private readonly ITemplateRepository _templateRepository;
private readonly INJtakeHistoryRepository _nJtakeHistoryRepository;
private readonly IPutakeRepository _putakeRepository;
-
private IUnitOfWorkManage _unitOfWorkManage;
@@ -37,39 +37,16 @@
}
- //妯＄硦鏌ヨ
- public WebResponseContent Fuzzyquery(MhuNjtakeTDO mhuNjtakeTDO)
+ public override PageGridData<Dt_NjTask> GetPageData(PageDataOptions options)
{
- try
- {
- var query = BaseDal.Db.Queryable<Dt_NjTask>();
- // 鐢熸垚 OR 鏌ヨ鏉′欢 鍗充换鎰忓瓧娈甸兘鍙互鏌ョ湅
- if (!string.IsNullOrEmpty(mhuNjtakeTDO.trainkind) || !string.IsNullOrEmpty(mhuNjtakeTDO.trainnum) ||
- !string.IsNullOrEmpty(mhuNjtakeTDO.track) || !string.IsNullOrEmpty(mhuNjtakeTDO.coachnum) ||
- !string.IsNullOrEmpty(mhuNjtakeTDO.bogie) || !string.IsNullOrEmpty(mhuNjtakeTDO.processdept))
+ OrderByParameters = new Dictionary<string, SqlSugar.OrderByType> {
{
- BaseDal.QueryData(x =>
- (!string.IsNullOrEmpty(mhuNjtakeTDO.trainkind) && x.trainKind.Contains(mhuNjtakeTDO.trainkind)) ||
- (!string.IsNullOrEmpty(mhuNjtakeTDO.trainnum) && x.trainNum.Contains(mhuNjtakeTDO.trainnum)) ||
- (!string.IsNullOrEmpty(mhuNjtakeTDO.track) && x.track.Contains(mhuNjtakeTDO.track)) ||
- (!string.IsNullOrEmpty(mhuNjtakeTDO.coachnum) && x.coachNum.Contains(mhuNjtakeTDO.coachnum)) ||
- (!string.IsNullOrEmpty(mhuNjtakeTDO.bogie) && x.bogie.Contains(mhuNjtakeTDO.bogie)) ||
- (!string.IsNullOrEmpty(mhuNjtakeTDO.processdept) && x.processDept.Contains(mhuNjtakeTDO.processdept))
- );
- }
-
- var result = query.ToList(); // 鎵ц鏌ヨ .ToList()鏌ヨ鍒楄〃锛� .InSingle(1); // 鏍规嵁鏌ヨ鍗曚釜瀹炰綋
- return new WebResponseContent { Status = true, Data = result };
- }
- catch (Exception ex)
- {
-
- return new WebResponseContent { Status = false, Message = "鏌ョ湅澶辫触锛�" + ex.Message };
- }
-
+ nameof(Dt_NjTask.trainKind),SqlSugar.OrderByType.Asc
+ } };
+ return base.GetPageData(options);
}
-
+
//淇濆瓨妯℃澘
public WebResponseContent Submtandsave(NjtakeDTO njtakeDTO)
{
@@ -118,7 +95,7 @@
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌" };
}
- task.Taskstatus = "宸叉淳宸�";
+ task.Taskstatus = 1;//宸叉淳宸�
if (existtepm == null)
{
@@ -204,9 +181,9 @@
// 瀹氫箟浠诲姟鎷嗚В鐨勭粍淇℃伅
var groups = new[]
{
- new { Grouptype= "鐢垫皵",Pustatus="寰呴绛�",Zhijianyuan = task.zhiJianYuan_DQ, Lijuzouyeyuan = task.liJu_DQ, Fuzyuan = task.fuZhu_DQ },
- new { Grouptype = "鏈烘",Pustatus="寰呴绛�", Zhijianyuan = task.zhiJianYuan_LC, Lijuzouyeyuan = task.liJu_LC, Fuzyuan = task.fuZhu_LC },
- new { Grouptype = "鍦版矡",Pustatus="寰呴绛�", Zhijianyuan = task.zhiJianYuan_DG, Lijuzouyeyuan = task.liJu_DG, Fuzyuan = task.fuZhu_DG }
+ new { Grouptype= "鐢垫皵",Pustatus=0,Zhijianyuan = task.zhiJianYuan_DQ, Lijuzouyeyuan = task.liJu_DQ, Fuzyuan = task.fuZhu_DQ },
+ new { Grouptype = "鏈烘",Pustatus=0, Zhijianyuan = task.zhiJianYuan_LC, Lijuzouyeyuan = task.liJu_LC, Fuzyuan = task.fuZhu_LC },
+ new { Grouptype = "鍦版矡",Pustatus=0, Zhijianyuan = task.zhiJianYuan_DG, Lijuzouyeyuan = task.liJu_DG, Fuzyuan = task.fuZhu_DG }
};
@@ -296,10 +273,10 @@
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌" };
}
- task.Taskstatus = "宸叉淳宸�";
+ task.Taskstatus = 1;//宸叉淳宸�
-
- task.TakeName = notempDTO.takename;
+
+ task.TakeName = notempDTO.takename;
task.jiShuYuan = notempDTO.jishuyuan;
task.zhiJianYuan_DG = notempDTO.zhijianyuan_dg;
task.zhiJianYuan_DQ = notempDTO.zhijianyuan_dq;
@@ -363,9 +340,9 @@
// 瀹氫箟浠诲姟鎷嗚В鐨勭粍淇℃伅
var groups = new[]
{
- new { Grouptype= "鐢垫皵",Pustatus="寰呴绛�",Zhijianyuan = task.zhiJianYuan_DQ, Lijuzouyeyuan = task.liJu_DQ, Fuzyuan = task.fuZhu_DQ },
- new { Grouptype = "鏈烘",Pustatus="寰呴绛�", Zhijianyuan = task.zhiJianYuan_LC, Lijuzouyeyuan = task.liJu_LC, Fuzyuan = task.fuZhu_LC },
- new { Grouptype = "鍦版矡",Pustatus="寰呴绛�", Zhijianyuan = task.zhiJianYuan_DG, Lijuzouyeyuan = task.liJu_DG, Fuzyuan = task.fuZhu_DG }
+ new { Grouptype= "鐢垫皵",Pustatus=0,Zhijianyuan = task.zhiJianYuan_DQ, Lijuzouyeyuan = task.liJu_DQ, Fuzyuan = task.fuZhu_DQ },
+ new { Grouptype = "鏈烘",Pustatus=0, Zhijianyuan = task.zhiJianYuan_LC, Lijuzouyeyuan = task.liJu_LC, Fuzyuan = task.fuZhu_LC },
+ new { Grouptype = "鍦版矡",Pustatus=0, Zhijianyuan = task.zhiJianYuan_DG, Lijuzouyeyuan = task.liJu_DG, Fuzyuan = task.fuZhu_DG }
};
// 閫氳繃寰幆鍒涘缓瀵硅薄
@@ -411,59 +388,80 @@
}
//娣诲姞淇℃伅
- public WebResponseContent AddNJinfom(AddNjtDTO addNjtDTO)
+ public WebResponseContent AddNjtake(AddNjtDTO addNjtDTO)
{
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锛屼緥濡� KH030601, KH030602...
- string CustomizeID = $"{todayPrefix}{nextNumber:D2}";
+ // 鏌ヨ鏁版嵁搴擄紝鎵惧嚭褰撳ぉ鏈�澶х殑 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 ()
+ var addnj = new Dt_NjTask()
{
- NJtaskID= CustomizeID,
- trainKind=addNjtDTO.trainkind,
- trainNum=addNjtDTO.trainNum,
- track=addNjtDTO.track,
- coachNum=addNjtDTO.coachnum,
- bogie=addNjtDTO.bogie,
- processDept=addNjtDTO.processdept,
- Taskstatus="鏈淳宸�",
- createTime=DateTime.Now,
+ NJtaskID = CustomizeID,
+ trainKind = addNjtDTO.trainKind,
+ trainNum = addNjtDTO.trainNum,
+ track = addNjtDTO.track,
+ coachNum = addNjtDTO.coachNum,
+ bogie = addNjtDTO.bogie,
+ processDept = addNjtDTO.processDept,
+ jiShuYuan=addNjtDTO.jiShuYuan,
+ zhiJianYuan_LC=addNjtDTO.zhiJianYuan_LC,
+ zhiJianYuan_DG=addNjtDTO.zhiJianYuan_DG,
+ zhiJianYuan_DQ=addNjtDTO.zhiJianYuan_DQ,
+ gongZhang=addNjtDTO.gongZhang,
+ liJu_LC=addNjtDTO.liJu_LC,
+ liJu_DG=addNjtDTO.liJu_DG,
+ liJu_DQ=addNjtDTO.liJu_DQ,
+ fuZhu_LC=addNjtDTO.fuZhu_LC,
+ fuZhu_DG=addNjtDTO.fuZhu_DG,
+ fuZhu_DQ=addNjtDTO.fuZhu_DQ,
+ Taskstatus = 0,
+ 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