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 | 89 ++++++++++++++++++++++++--------------------
1 files changed, 48 insertions(+), 41 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 6abd063..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"
@@ -71,7 +71,7 @@
//2.纭畾鏄柊寤烘ā鏉胯繕鏄洿鏂板凡鏈夋ā鏉�
bool isNewTemplate = existtepm == null;
- if (isNewTemplate)
+ if (existtepm == null)
{
existtepm = new Dt_Template
{
@@ -87,11 +87,17 @@
liJu_Lc = njtakeDTO.liju_lc,
fuZhu_Dg = njtakeDTO.fuzhu_dg,
fuZhu_Dq = njtakeDTO.fuzhu_dq,
- fuZhu_Lc = njtakeDTO.fuzhu_lc
+ 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;
@@ -101,6 +107,7 @@
existtepm.fuZhu_Dg = njtakeDTO.fuzhu_dg;
existtepm.fuZhu_Dq = njtakeDTO.fuzhu_dq;
existtepm.fuZhu_Lc = njtakeDTO.fuzhu_lc;
+ existtepm.ModifyDate = DateTime.Now;
}
// 3. 鏇存柊浠诲姟琛�
@@ -109,44 +116,44 @@
task.startTime = DateTime.Now;
ApplyTemplateToTask(task, existtepm, isNewTemplate, njtakeDTO);
- // 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
- };
+ //// 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>
@@ -169,7 +176,7 @@
}
BaseDal.UpdateData(task);
- _nJtakeHistoryRepository.AddData(history);
+ //_nJtakeHistoryRepository.AddData(history);
_putakeRepository.AddData(listp);
_unitOfWorkManage.CommitTran();
--
Gitblit v1.9.3