From 4073bcc6e43f8f72945da396915f32d9d986967c Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 26 三月 2025 10:15:51 +0800
Subject: [PATCH] 11
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs"
index 289e518..cab0415 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs"
@@ -337,9 +337,17 @@
/// </summary>
private void SaveTorqueOpData(string group, string devicecode, string torqueValue)
{
- var take = _putakeRepository.QueryData(x => x.Grouptype == group)
- .OrderBy(x => x.Dispatchtime)
- .FirstOrDefault();
+ //var take = _putakeRepository.QueryData(x => x.Grouptype == group)
+ // .OrderBy(x => x.Dispatchtime)
+ // .FirstOrDefault();
+ //var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙�
+ var takeResponse = _putakeServer.PerformTasks(group);
+ if (takeResponse == null || !takeResponse.Status)
+ {
+ Console.WriteLine($"浠诲姟鍒嗙骇琛ㄦ帴鍙ｉ敊璇細{takeResponse?.Message}");
+ }
+
+ var take = JsonConvert.DeserializeObject<Dt_Putake>(JsonConvert.SerializeObject(takeResponse.Data)); // 纭繚杞崲姝ｇ‘
var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙�
//璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
@@ -368,7 +376,10 @@
TorqueSize = float.TryParse(torqueValue, out float torque) ? torque : 0.0f, // 杩欓噷杩涜瀛楃涓插埌float鐨勮浆鎹�
CreateDate = DateTime.Now,
};
- _orqueOpRepository.AddData(Addop);
+ //_orqueOpRepository.AddData(Addop);
+ _torqueOpServer.AddData(Addop);
+
+
}
}
}
--
Gitblit v1.9.3