From 1d92f653e2bf1174d5d1d101ee0bbbd2103ecf4a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 12 三月 2025 08:34:41 +0800
Subject: [PATCH] 通信
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/NjTaskServer.cs | 68 +++++++++++----------------------
1 files changed, 23 insertions(+), 45 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 c60ca86..97da93f 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"
@@ -38,40 +38,7 @@
}
- //妯＄硦鏌ヨ
- public WebResponseContent Fuzzyquery(MhuNjtakeTDO mhuNjtakeTDO)
- {
- try
- {
- var query = BaseDal.QueryData();
- // 鐢熸垚 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)||
- !string.IsNullOrEmpty(mhuNjtakeTDO.taskstatus) || !string.IsNullOrEmpty(mhuNjtakeTDO.createtime))
- {
- 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))||
- (!string.IsNullOrEmpty(mhuNjtakeTDO.taskstatus) && x.processDept.Contains(mhuNjtakeTDO.taskstatus))||
- (!string.IsNullOrEmpty(mhuNjtakeTDO.createtime) && x.processDept.Contains(mhuNjtakeTDO.createtime))
- );
- }
-
- 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 };
- }
-
- }
+
//淇濆瓨妯℃澘
@@ -415,7 +382,7 @@
}
//娣诲姞淇℃伅
- public WebResponseContent AddNJinfom(AddNjtDTO addNjtDTO)
+ public WebResponseContent AddNjtake(AddNjtDTO addNjtDTO)
{
try
{
@@ -444,17 +411,28 @@
string CustomizeID = $"{todayPrefix}{nextNumber:D3}";//D3琛ㄧず 3浣嶆暟锛屼笉瓒宠ˉ0
#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=0,
- 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();
--
Gitblit v1.9.3