From da2e87c2a05debbcc7dac5efb5d13c92d533782f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 26 三月 2025 08:54:10 +0800
Subject: [PATCH] 111
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/NjTaskServer.cs | 606 +++++++++++++++++++++++++-----------------------------
1 files changed, 285 insertions(+), 321 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..d23ec3c 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,8 @@
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
+using SqlSugar;
using StackExchange.Profiling.Internal;
using WIDESEA_ISerialPortRepository;
using WIDESEA_SerialPortRepository;
@@ -23,87 +25,79 @@
private readonly ITemplateRepository _templateRepository;
private readonly INJtakeHistoryRepository _nJtakeHistoryRepository;
private readonly IPutakeRepository _putakeRepository;
-
private IUnitOfWorkManage _unitOfWorkManage;
public NjTaskServer(INjTaskRepository BaseDal, ITemplateRepository templateRepository, INJtakeHistoryRepository nJtakeHistoryRepository,
- IPutakeRepository putakeRepository , IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ IPutakeRepository putakeRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
_templateRepository = templateRepository;
_nJtakeHistoryRepository = nJtakeHistoryRepository;
_putakeRepository = putakeRepository;
_unitOfWorkManage = unitOfWorkManage;//鏁版嵁搴撲簨鍔�
-
+
}
- //妯＄硦鏌ヨ
- public WebResponseContent Fuzzyquery(MhuNjtakeTDO mhuNjtakeTDO)
+ public override PageGridData<Dt_NjTask> GetPageData(PageDataOptions options)
{
- 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))
+ 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))||
- (!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 };
- }
-
+ nameof(Dt_NjTask.trainKind),SqlSugar.OrderByType.Asc
+ } };
+ return base.GetPageData(options);
}
-
- //淇濆瓨妯℃澘
+
+ /// <summary>
+ /// 淇濆瓨妯℃澘骞舵彁浜�
+ /// 鏈夋ā鏉縤d鐨勬椂鍊欏氨杩斿洖妯℃澘鐨勫�硷紝鏇存柊鎴栭�夋嫨妯℃澘鐨勫�煎苟灏嗕换鍔℃淳鍙戜笅鍘�
+ /// 娌℃湁妯℃澘id鐨勬椂鍊欙紝灏卞垱寤轰竴涓ā鏉匡紝鍏变笅娆′娇鐢�
+ /// </summary>
+ /// <param name="njtakeDTO"></param>
+ /// <returns></returns>
public WebResponseContent Submtandsave(NjtakeDTO njtakeDTO)
{
try
- {
- //鏇村叿妯℃澘id鏉ユ煡璇㈡槸鍚﹀瓨鍦ㄨ鏉℃暟鎹�
+ {
+ // 1. 鏌ヨ妯℃澘琛� & 浠诲姟琛�
var existtepm = _templateRepository.QueryFirst(i => i.TemplateID == njtakeDTO.Tpid);
- var Temp = new Dt_Template(); //濡傛灉浣犺鏇存柊閭ｄ箞瑕佸厛鎵惧埌锛屽惁鍒欎綘杩欐牱鏄垱寤轰竴涓柊鐨勫璞�
- //濡傛灉娌℃湁妯℃澘id閭ｄ箞灏变箣闂村垱寤烘ā鏉�
+ var task = BaseDal.QueryFirst(i => i.NJtaskID == njtakeDTO.Njtakeid);
+
+ if (task == null)
+ {
+ return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌浠诲姟" };
+ }
+
+ //2.纭畾鏄柊寤烘ā鏉胯繕鏄洿鏂板凡鏈夋ā鏉�
+ bool isNewTemplate = existtepm == null;
if (existtepm == null)
{
-
- Temp.TemplateName = njtakeDTO.takename;
- Temp.TakeName = njtakeDTO.takename;
- Temp.jiShuYuan = njtakeDTO.jishuyuan;
- Temp.gongZhang = njtakeDTO.gongzhang;
- Temp.zhiJianYuan_Dq = njtakeDTO.zhijianyuan_dq;
- Temp.zhiJianYuan_Lc = njtakeDTO.zhijianyuan_lc;
- Temp.zhiJianYuan_Dg = njtakeDTO.zhijianyuan_dg;
- Temp.liJu_Dg = njtakeDTO.liju_dg;
- Temp.liJu_Dq = njtakeDTO.liju_dq;
- Temp.liJu_Lc = njtakeDTO.liju_lc;
- Temp.fuZhu_Dg = njtakeDTO.fuzhu_dg;
- Temp.fuZhu_Dq = njtakeDTO.fuzhu_dq;
- Temp.fuZhu_Lc = njtakeDTO.fuzhu_lc;
-
+ existtepm = new Dt_Template
+ {
+ TemplateName = njtakeDTO.takename,
+ TakeName = njtakeDTO.takename,
+ jiShuYuan = njtakeDTO.jishuyuan,
+ gongZhang = njtakeDTO.gongzhang,
+ zhiJianYuan_Dq = njtakeDTO.zhijianyuan_dq,
+ zhiJianYuan_Lc = njtakeDTO.zhijianyuan_lc,
+ zhiJianYuan_Dg = njtakeDTO.zhijianyuan_dg,
+ liJu_Dg = njtakeDTO.liju_dg,
+ liJu_Dq = njtakeDTO.liju_dq,
+ liJu_Lc = njtakeDTO.liju_lc,
+ fuZhu_Dg = njtakeDTO.fuzhu_dg,
+ fuZhu_Dq = njtakeDTO.fuzhu_dq,
+ fuZhu_Lc = njtakeDTO.fuzhu_lc,
+ Creater = "admin",
+ CreateDate = DateTime.Now
+ };
}
- //濡傛灉鏈夊氨鍦ㄦā鏉夸笂杩涜鏇存敼
else
{
+ existtepm.TakeName = njtakeDTO.takename;
+ existtepm.jiShuYuan = njtakeDTO.jishuyuan;
+ existtepm.gongZhang = njtakeDTO.gongzhang;
+
existtepm.zhiJianYuan_Dq = njtakeDTO.zhijianyuan_dq;
existtepm.zhiJianYuan_Lc = njtakeDTO.zhijianyuan_lc;
existtepm.zhiJianYuan_Dg = njtakeDTO.zhijianyuan_dg;
@@ -113,176 +107,116 @@
existtepm.fuZhu_Dg = njtakeDTO.fuzhu_dg;
existtepm.fuZhu_Dq = njtakeDTO.fuzhu_dq;
existtepm.fuZhu_Lc = njtakeDTO.fuzhu_lc;
-
- }
- //鍏堟牴鎹甶d鍒ゆ柇鏄惁鏈夎浠诲姟
- var task = BaseDal.QueryFirst(i => i.NJtaskID == njtakeDTO.Njtakeid);
- if (task == null)
- {
- return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌" };
+ existtepm.ModifyDate = DateTime.Now;
}
- task.Taskstatus = 1;//宸叉淳宸�
+ // 3. 鏇存柊浠诲姟琛�
+ task.Taskstatus = 1; // 宸叉淳宸�
+ task.dispatchTime = DateTime.Now;
+ task.startTime = DateTime.Now;
+ ApplyTemplateToTask(task, existtepm, isNewTemplate, njtakeDTO);
- if (existtepm == null)
+ //// 4. 鎻掑叆鍘嗗彶璁板綍
+ //var history = new Dt_NJtakeHistory
+ //{
+ // taskID = task.id,
+ // trainKind = task.trainKind,
+ // TakeName = task.TakeName,
+ // trainNum = task.trainNum,
+ // track = task.track,
+ // coachNum = task.coachNum,
+ // bogie = task.bogie,
+ // processDept = task.processDept,
+ // jiShuYuan = task.jiShuYuan,
+ // zhiJianYuan_LC = task.zhiJianYuan_LC,
+ // zhiJianYuan_DG = task.zhiJianYuan_DG,
+ // zhiJianYuan_DQ = task.zhiJianYuan_DQ,
+ // gongZhang = task.gongZhang,
+ // liJu_LC = task.liJu_LC,
+ // liJu_DG = task.liJu_DG,
+ // liJu_DQ = task.liJu_DQ,
+ // fuZhu_LC = task.fuZhu_LC,
+ // fuZhu_DQ = task.fuZhu_DQ,
+ // fuZhu_DG = task.fuZhu_DG,
+ // createTime = (DateTime)task.createTime,
+ // dispatchTime = (DateTime)task.dispatchTime,
+ // startTime = (DateTime)task.startTime,
+ // startTime_LC = (DateTime)task.startTime_LC,
+ // endTime_LC = (DateTime)task.endTime_LC,
+ // startTime_DG = (DateTime)task.startTime_DG,
+ // endTime_DG = (DateTime)task.endTime_DG,
+ // startTime_DQ = (DateTime)task.startTime_DQ,
+ // endTime_DQ = (DateTime)task.endTime_DQ,
+ // endTime = (DateTime)task.endTime,
+ // confirmTime_JS = (DateTime)task.confirmTime_JS,
+ // confirmTime_GZ = (DateTime)task.confirmTime_GZ,
+ // confirmTime_LC = (DateTime)task.confirmTime_LC,
+ // confirmTime_DG = (DateTime)task.confirmTime_DG,
+ // confirmTime_DQ = (DateTime)task.confirmTime_DQ
+ //};
+
+ // 5. 鎻掑叆浠诲姟鍒嗚В鏁版嵁
+ var listp = new List<Dt_Putake>
+ {
+ new Dt_Putake { Njtakeid = task.NJtaskID, takename = task.TakeName, jishuyuan = task.jiShuYuan, gonzhang = task.gongZhang, Grouptype = "鐢垫皵", Pustatus = 0, zhijianyuan = task.zhiJianYuan_DQ, lijuzouyeyuan = task.liJu_DQ, fuzyuan = task.fuZhu_DQ, Dispatchtime = task.dispatchTime },
+ new Dt_Putake { Njtakeid = task.NJtaskID, takename = task.TakeName, jishuyuan = task.jiShuYuan, gonzhang = task.gongZhang, Grouptype = "鏈烘", Pustatus = 0, zhijianyuan = task.zhiJianYuan_LC, lijuzouyeyuan = task.liJu_LC, fuzyuan = task.fuZhu_LC, Dispatchtime = task.dispatchTime },
+ new Dt_Putake { Njtakeid = task.NJtaskID, takename = task.TakeName, jishuyuan = task.jiShuYuan, gonzhang = task.gongZhang, Grouptype = "鍦版矡", Pustatus = 0, zhijianyuan = task.zhiJianYuan_DG, lijuzouyeyuan = task.liJu_DG, fuzyuan = task.fuZhu_DG, Dispatchtime = task.dispatchTime }
+ };
+
+ // 6. 浜嬪姟鎻愪氦
+ _unitOfWorkManage.BeginTran();
+
+ if (isNewTemplate)
{
-
- task.TakeName = njtakeDTO.takename;
- task.jiShuYuan = njtakeDTO.jishuyuan;
- task.zhiJianYuan_DG = njtakeDTO.zhijianyuan_dg;
- task.zhiJianYuan_DQ = njtakeDTO.zhijianyuan_dq;
- task.zhiJianYuan_LC = njtakeDTO.zhijianyuan_lc;
- task.gongZhang = njtakeDTO.gongzhang;
- task.liJu_DG = njtakeDTO.liju_dg;
- task.liJu_DQ = njtakeDTO.liju_dq;
- task.liJu_LC = njtakeDTO.liju_lc;
- task.fuZhu_DG = njtakeDTO.fuzhu_dg;
- task.fuZhu_DQ = njtakeDTO.fuzhu_dq;
- task.fuZhu_LC = njtakeDTO.fuzhu_lc;
- task.dispatchTime = DateTime.Now;
- task.startTime = DateTime.Now;
+ _templateRepository.AddData(existtepm);
}
else
{
- task.TakeName = existtepm.TakeName; //浠庢ā鏉夸腑鎷垮��
- task.jiShuYuan = existtepm.jiShuYuan;
- task.zhiJianYuan_DG = njtakeDTO.zhijianyuan_dg;
- task.zhiJianYuan_DQ = njtakeDTO.zhijianyuan_dq;
- task.zhiJianYuan_LC = njtakeDTO.zhijianyuan_lc;
- task.gongZhang = existtepm.gongZhang;
- task.liJu_DG = njtakeDTO.liju_dg;
- task.liJu_DQ = njtakeDTO.liju_dq;
- task.liJu_LC = njtakeDTO.liju_lc;
- task.fuZhu_DG = njtakeDTO.fuzhu_dg;
- task.fuZhu_DQ = njtakeDTO.fuzhu_dq;
- task.fuZhu_LC = njtakeDTO.fuzhu_lc;
- task.dispatchTime = DateTime.Now;
- task.startTime = DateTime.Now;
- }
-
-
- // 鎻掑叆鍒颁换鍔″巻鍙茶〃
- var history = new Dt_NJtakeHistory
- {
- taskID = task.id,
- trainKind = task.trainKind,
- TakeName = task.TakeName,
- trainNum = task.trainNum,
- track = task.track,
- coachNum = task.coachNum,
- bogie = task.bogie,
- processDept = task.processDept,
- jiShuYuan = task.jiShuYuan,
- zhiJianYuan_LC = task.zhiJianYuan_LC,
- zhiJianYuan_DG = task.zhiJianYuan_DG,
- zhiJianYuan_DQ = task.zhiJianYuan_DQ,
- gongZhang = task.gongZhang,
- liJu_LC = task.liJu_LC,
- liJu_DG = task.liJu_DG,
- liJu_DQ = task.liJu_DQ,
- fuZhu_LC = task.fuZhu_LC,
- fuZhu_DQ = task.fuZhu_DQ,
- fuZhu_DG=task.fuZhu_DG,
- createTime = task.createTime,
- dispatchTime = task.dispatchTime,
- startTime = task.startTime,
- startTime_LC = task.startTime_LC,
- endTime_LC = task.endTime_LC,
- startTime_DG = task.startTime_DG,
- endTime_DG = task.endTime_DG,
- startTime_DQ = task.startTime_DQ,
- endTime_DQ = task.endTime_DQ,
- endTime = task.endTime,
- confirmTime_JS = task.confirmTime_JS,
- confirmTime_GZ = task.confirmTime_GZ,
- confirmTime_LC = task.confirmTime_LC,
- confirmTime_DG = task.confirmTime_DG,
- confirmTime_DQ = task.confirmTime_DQ
- };
-
-
-
-
- List<Dt_Putake> listp = new List<Dt_Putake>();
-
- // 瀹氫箟浠诲姟鎷嗚В鐨勭粍淇℃伅
- var groups = new[]
- {
- 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 }
- };
-
-
- // 閫氳繃寰幆鍒涘缓瀵硅薄
- foreach (var g in groups)
- {
- listp.Add(new Dt_Putake
- {
- Njtakeid = task.NJtaskID,
- takename = task.TakeName,
- jishuyuan = task.jiShuYuan,
- gonzhang = task.gongZhang,
-
- zhijianyuan = g.Zhijianyuan,
- lijuzouyeyuan = g.Lijuzouyeyuan,
- fuzyuan = g.Fuzyuan,
- Grouptype=g.Grouptype,
- Pustatus=g.Pustatus,
- Dispatchtime=task.dispatchTime,
- });
- }
-
-
- _unitOfWorkManage.BeginTran();//寮�鍚簨鍔★紙鍦ㄥ鍒犳敼鏌ュ墠锛屼笟鍔″悗锛�
-
- if (existtepm == null)//濡傛灉涓嶅瓨鍦╥d
- {
-
- _templateRepository.AddData(Temp);//娣诲姞妯℃澘
-
- //db.Insertable(task).ExecuteCommand();
- BaseDal.UpdateData(task);//灏嗘ā鏉胯〃涓慨鏀圭殑鎻掑叆杩涗换鍔¤〃涓�
-
- // db.Insertable(history).ExecuteCommand();
- _nJtakeHistoryRepository.AddData(history);// 鎻掑叆鍘嗗彶璁板綍
-
- _putakeRepository.AddData(listp);//涓嬪彂涓夋潯浠诲姟鍒嗚В琛ㄦ暟鎹�
- // return new WebResponseContent { Status = true, Message = "涓嬪彂浜嗕换鍔″苟淇濆瓨浜嗘ā鏉�"};
- }
- else
- {
-
- //鑾峰彇骞惰繑鍥炴彃鍏ヨ褰曠殑鑷涓婚敭鍊硷紝璇ュ�艰瀛樺偍鍦� templatID 鍙橀噺涓�
- //int templatID = _templateRepository.Db.Insertable(Temp).ExecuteReturnIdentity();
- //task.tempID = templatID;
-
- //淇敼妯℃澘琛�
_templateRepository.UpdateData(existtepm);
-
- //灏嗘ā鏉垮彿鎻掑叆杩欐潯浠诲姟琛ㄤ腑
- task.tempID = existtepm.TemplateID;
-
- BaseDal.UpdateData(task);//灏嗕换鍔¤〃涓殑浜哄憳鎻掑叆杩涗换鍔¤〃涓�
-
-
- _nJtakeHistoryRepository.AddData(history);// 鎻掑叆鍘嗗彶璁板綍
-
- _putakeRepository.AddData(listp);//涓嬪彂涓夋潯浠诲姟鍒嗚В琛ㄦ暟鎹�
-
}
- _unitOfWorkManage.CommitTran();//鎻愪氦浜嬪姟
+
+ BaseDal.UpdateData(task);
+ //_nJtakeHistoryRepository.AddData(history);
+ _putakeRepository.AddData(listp);
+
+ _unitOfWorkManage.CommitTran();
+
return new WebResponseContent { Status = true, Data = task };
}
catch (Exception ex)
{
-
- //db.Ado.RollbackTran(); // 鍥炴粴浜嬪姟
_unitOfWorkManage.RollbackTran();
return new WebResponseContent { Status = false, Message = "娣诲姞澶辫触锛�" + ex.Message };
}
}
+ /// <summary>
+ /// 浠诲姟琛ㄥ簲鐢ㄦā鏉夸俊鎭�
+ /// </summary>
+ private void ApplyTemplateToTask(Dt_NjTask task, Dt_Template template, bool isNewTemplate, NjtakeDTO njtakeDTO)
+ {
+ if (isNewTemplate) //妯℃澘id鏄惁鏈夛紝榛樿涓簄ull
+ {
+ task.TakeName = njtakeDTO.takename;
+ task.gongZhang = njtakeDTO.gongzhang;
+ }
+ else
+ {
+ task.TakeName = template.TakeName;
+ task.gongZhang = template.gongZhang;
+ }
+
+ task.jiShuYuan = template.jiShuYuan;
+ task.zhiJianYuan_DG = njtakeDTO.zhijianyuan_dg;
+ task.zhiJianYuan_DQ = njtakeDTO.zhijianyuan_dq;
+ task.zhiJianYuan_LC = njtakeDTO.zhijianyuan_lc;
+ task.liJu_DG = njtakeDTO.liju_dg;
+ task.liJu_DQ = njtakeDTO.liju_dq;
+ task.liJu_LC = njtakeDTO.liju_lc;
+ task.fuZhu_DG = njtakeDTO.fuzhu_dg;
+ task.fuZhu_DQ = njtakeDTO.fuzhu_dq;
+ task.fuZhu_LC = njtakeDTO.fuzhu_lc;
+ }
//涓嶄繚瀛樻ā鏉�
@@ -290,7 +224,7 @@
{
try
{
-
+
//鍏堟牴鎹甶d鍒ゆ柇鏄惁鏈夎浠诲姟
@@ -304,60 +238,61 @@
task.TakeName = notempDTO.takename;
- task.jiShuYuan = notempDTO.jishuyuan;
- task.zhiJianYuan_DG = notempDTO.zhijianyuan_dg;
- task.zhiJianYuan_DQ = notempDTO.zhijianyuan_dq;
- task.zhiJianYuan_LC = notempDTO.zhijianyuan_lc;
- task.gongZhang = notempDTO.gongzhang;
- task.liJu_DG = notempDTO.liju_dg;
- task.liJu_DQ = notempDTO.liju_dq;
- task.liJu_LC = notempDTO.liju_lc;
- task.fuZhu_DG = notempDTO.fuzhu_dg;
- task.fuZhu_DQ = notempDTO.fuzhu_dq;
- task.fuZhu_LC = notempDTO.fuzhu_lc;
- task.dispatchTime=DateTime.Now;
- task.startTime = DateTime.Now;
-
+ task.jiShuYuan = notempDTO.jishuyuan;
+ task.zhiJianYuan_DG = notempDTO.zhijianyuan_dg;
+ task.zhiJianYuan_DQ = notempDTO.zhijianyuan_dq;
+ task.zhiJianYuan_LC = notempDTO.zhijianyuan_lc;
+ task.gongZhang = notempDTO.gongzhang;
+ task.liJu_DG = notempDTO.liju_dg;
+ task.liJu_DQ = notempDTO.liju_dq;
+ task.liJu_LC = notempDTO.liju_lc;
+ task.fuZhu_DG = notempDTO.fuzhu_dg;
+ task.fuZhu_DQ = notempDTO.fuzhu_dq;
+ task.fuZhu_LC = notempDTO.fuzhu_lc;
+ task.dispatchTime = DateTime.Now;
+ task.startTime = DateTime.Now;
+
// 鎻掑叆鍒颁换鍔″巻鍙茶〃
- var history = new Dt_NJtakeHistory
- {
- taskID = task.id,
- trainKind = task.trainKind,
- TakeName = task.TakeName,
- trainNum = task.trainNum,
- track = task.track,
- coachNum = task.coachNum,
- bogie = task.bogie,
- processDept = task.processDept,
- jiShuYuan = task.jiShuYuan,
- zhiJianYuan_LC = task.zhiJianYuan_LC,
- zhiJianYuan_DG = task.zhiJianYuan_DG,
- zhiJianYuan_DQ = task.zhiJianYuan_DQ,
- gongZhang = task.gongZhang,
- liJu_LC = task.liJu_LC,
- liJu_DG = task.liJu_DG,
- liJu_DQ = task.liJu_DQ,
- fuZhu_LC = task.fuZhu_LC,
- fuZhu_DQ = task.fuZhu_DQ,
- fuZhu_DG = task.fuZhu_DG,
- createTime = task.createTime,
- dispatchTime = task.dispatchTime,
- startTime = task.startTime,
- startTime_LC = task.startTime_LC,
- endTime_LC = task.endTime_LC,
- startTime_DG = task.startTime_DG,
- endTime_DG = task.endTime_DG,
- startTime_DQ = task.startTime_DQ,
- endTime_DQ = task.endTime_DQ,
- endTime = task.endTime,
- confirmTime_JS = task.confirmTime_JS,
- confirmTime_GZ = task.confirmTime_GZ,
- confirmTime_LC = task.confirmTime_LC,
- confirmTime_DG = task.confirmTime_DG,
- confirmTime_DQ = task.confirmTime_DQ
- };
+ //var history = new Dt_NJtakeHistory
+ //{
+ // taskID = task.id,
+ // trainKind = task.trainKind,
+ // TakeName = task.TakeName,
+ // trainNum = task.trainNum,
+ // track = task.track,
+ // coachNum = task.coachNum,
+ // bogie = task.bogie,
+ // processDept = task.processDept,
+ // jiShuYuan = task.jiShuYuan,
+ // zhiJianYuan_LC = task.zhiJianYuan_LC,
+ // zhiJianYuan_DG = task.zhiJianYuan_DG,
+ // zhiJianYuan_DQ = task.zhiJianYuan_DQ,
+ // gongZhang = task.gongZhang,
+ // liJu_LC = task.liJu_LC,
+ // liJu_DG = task.liJu_DG,
+ // liJu_DQ = task.liJu_DQ,
+ // fuZhu_LC = task.fuZhu_LC,
+ // fuZhu_DQ = task.fuZhu_DQ,
+ // fuZhu_DG = task.fuZhu_DG,
+ // createTime = (DateTime)task.createTime,
+ // dispatchTime = (DateTime)task.dispatchTime,
+ // startTime = (DateTime)task.startTime,
+ // startTime_LC = (DateTime)task.startTime_LC,
+ // endTime_LC = (DateTime)task.endTime_LC,
+ // startTime_DG = (DateTime)task.startTime_DG,
+ // endTime_DG = (DateTime)task.endTime_DG,
+ // startTime_DQ = (DateTime)task.startTime_DQ,
+ // endTime_DQ = (DateTime)task.endTime_DQ,
+ // endTime = (DateTime)task.endTime,
+ // confirmTime_JS = (DateTime)task.confirmTime_JS,
+ // confirmTime_GZ = (DateTime)task.confirmTime_GZ,
+ // confirmTime_LC = (DateTime)task.confirmTime_LC,
+ // confirmTime_DG = (DateTime)task.confirmTime_DG,
+ // confirmTime_DQ = (DateTime)task.confirmTime_DQ
+
+ //};
@@ -387,21 +322,22 @@
Grouptype = g.Grouptype,
Pustatus = g.Pustatus,
Dispatchtime = task.dispatchTime,
-
+ Creater="",
+ CreateDate=new DateTime()
});
}
_unitOfWorkManage.BeginTran();//寮�鍚簨鍔★紙鍦ㄥ鍒犳敼鏌ュ墠锛屼笟鍔″悗锛�
- BaseDal.UpdateData(task);//灏嗘ā鏉胯〃涓慨鏀圭殑鎻掑叆杩涗换鍔¤〃涓�
+ BaseDal.UpdateData(task);//灏嗘ā鏉胯〃涓慨鏀圭殑鎻掑叆杩涗换鍔¤〃涓�
- // db.Insertable(history).ExecuteCommand();
- _nJtakeHistoryRepository.AddData(history);// 鎻掑叆鍘嗗彶璁板綍
+ // db.Insertable(history).ExecuteCommand();
+ //_nJtakeHistoryRepository.AddData(history);// 鎻掑叆鍘嗗彶璁板綍
- _putakeRepository.AddData(listp);//涓嬪彂涓夋潯浠诲姟鍒嗚В琛ㄦ暟鎹�
- // return new WebResponseContent { Status = true, Message = "涓嬪彂浜嗕换鍔″苟淇濆瓨浜嗘ā鏉�"};
-
+ _putakeRepository.AddData(listp);//涓嬪彂涓夋潯浠诲姟鍒嗚В琛ㄦ暟鎹�
+ // return new WebResponseContent { Status = true, Message = "涓嬪彂浜嗕换鍔″苟淇濆瓨浜嗘ā鏉�"};
+
_unitOfWorkManage.CommitTran();//鎻愪氦浜嬪姟(澧炲垹鏀规煡鍚�)
return new WebResponseContent { Status = true, Data = task };
}
@@ -415,111 +351,139 @@
}
//娣诲姞淇℃伅
- 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锛屼緥濡� 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 ()
+ 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,
+ TakeName=addNjtDTO.TakeName,
+ 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 };
}
}
//鏌ョ湅璇︽儏 杩斿洖鏁翠釜琛ㄧ殑鏁版嵁锛堟洿鍏穒d锛�
- public WebResponseContent GetNjdetail(string njtaskID)
+ public WebResponseContent GetNjdetail(string njtaskID)
{
try
{
- _unitOfWorkManage.BeginTran();
var datatail = BaseDal.QueryData(x => x.NJtaskID == njtaskID).FirstOrDefault();
if (datatail == null)
{
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌" };
}
- _unitOfWorkManage.CommitTran();
- return new WebResponseContent { Status = true,Data = datatail };
+ return new WebResponseContent { Status = true, Data = datatail };
}
catch (Exception ex)
{
-
- _unitOfWorkManage.RollbackTran();
- return new WebResponseContent() { Status = false, Message ="澶辫触"+ ex.Message };
+ return new WebResponseContent() { Status = false, Message = "澶辫触" + ex.Message };
}
}
- //鏇村叿id鏇存柊
+ //鏍规嵁id鏇存柊
public WebResponseContent PuNjtake(PutNjtDTO putNjtDTO)
{
try
{
- var putake = BaseDal.QueryData(x => x.id==putNjtDTO.id).FirstOrDefault();
+ var putake = BaseDal.QueryData(x => x.id == putNjtDTO.id).FirstOrDefault();
if (putake == null)
{
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌" };
}
- putake.trainKind= putNjtDTO.trainkind;
- putake.trainNum= putNjtDTO.trainNum;
- putake.track=putNjtDTO.track;
- putake.coachNum=putake.coachNum;
- putake.bogie=putNjtDTO.bogie;
- putake.processDept=putake.processDept;
- _unitOfWorkManage.BeginTran();
+ putake.trainKind = putNjtDTO.trainkind;
+ putake.trainNum = putNjtDTO.trainNum;
+ putake.track = putNjtDTO.track;
+ putake.coachNum = putake.coachNum;
+ putake.bogie = putNjtDTO.bogie;
+ putake.processDept = putake.processDept;
+
BaseDal.UpdateData(putake);
- _unitOfWorkManage.CommitTran();
+
return new WebResponseContent { Status = true, Data = putake };
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
+
return new WebResponseContent { Status = false, Message = "鏌ヨ澶辫触锛�" + ex.Message };
}
}
+
+
+
+
+
+
+
+
+
}
}
+
--
Gitblit v1.9.3