From cdd170dd9008d8124d63c76ba186e34cfe61a619 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 11 三月 2025 08:40:56 +0800
Subject: [PATCH] 美新
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/NjTaskServer.cs | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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..c60ca86 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;
@@ -42,11 +43,12 @@
{
try
{
- var query = BaseDal.Db.Queryable<Dt_NjTask>();
+ 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.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)) ||
@@ -54,7 +56,9 @@
(!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.processdept) && x.processDept.Contains(mhuNjtakeTDO.processdept))||
+ (!string.IsNullOrEmpty(mhuNjtakeTDO.taskstatus) && x.processDept.Contains(mhuNjtakeTDO.taskstatus))||
+ (!string.IsNullOrEmpty(mhuNjtakeTDO.createtime) && x.processDept.Contains(mhuNjtakeTDO.createtime))
);
}
@@ -118,7 +122,7 @@
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌" };
}
- task.Taskstatus = "宸叉淳宸�";
+ task.Taskstatus = 1;//宸叉淳宸�
if (existtepm == null)
{
@@ -204,9 +208,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 +300,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 +367,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 }
};
// 閫氳繃寰幆鍒涘缓瀵硅薄
@@ -436,8 +440,8 @@
}
}
- // 鐢熸垚 NJtaskID锛屼緥濡� KH030601, KH030602...
- string CustomizeID = $"{todayPrefix}{nextNumber:D2}";
+ // 鐢熸垚 NJtaskID锛屼緥濡� KH0306001, KH0306002...
+ string CustomizeID = $"{todayPrefix}{nextNumber:D3}";//D3琛ㄧず 3浣嶆暟锛屼笉瓒宠ˉ0
#endregion
var addnj = new Dt_NjTask ()
@@ -449,7 +453,7 @@
coachNum=addNjtDTO.coachnum,
bogie=addNjtDTO.bogie,
processDept=addNjtDTO.processdept,
- Taskstatus="鏈淳宸�",
+ Taskstatus=0,
createTime=DateTime.Now,
};
--
Gitblit v1.9.3