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 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 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 f2eea2a..72412de 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"
@@ -8,8 +8,10 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using Quartz;
+using SqlSugar;
using StackExchange.Profiling.Internal;
using WIDESEA_ISerialPortRepository;
+using WIDESEA_SerialPortRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DTO;
@@ -66,13 +68,48 @@
if (deviceProtocolDetail != null)
{
//鎴戣鍓嶇杩斿洖缁欐垜涓�涓粍鍒紝鍜屼换鍔d
- string group = "";
- var putake = _putakeRepository.QueryFirst(x => x.Grouptype == group);
+ //鍏堟煡鐘舵�佸拰缁勶紝鎸夋椂闂撮檷搴�
+ string group = "鐢垫皵";
+
+
//杩欓噷鍒ゆ柇缁勫埆涓変釜鐪嬫槸閭ｄ釜锛屽氨鏌ラ偅涓伐鑹鸿〃鐨勫��
if (group=="鐢垫皵")
{
+
//鍏堢湅宸ヨ壓琛ㄤ腑姝ラ涓�涓鎵殑鍊兼湁澶氬皯涓� 鍐嶆煡鐪婦t_TorqueOp琛ㄤ腑鏄惁鏈夎浠诲姟鍙穒d鍜屾楠ゆ�绘暟鏄惁婊¤冻宸ヨ壓琛�
- var proces = _processRepository.QueryData(x => x.CraftType == group);
+ // 鏌ヨ鎵�鏈夊伐鑹烘暟鎹紝鎸夌収姝ラ鍙� SetpNum 閫掑鎺掑簭
+ var processList = _processRepository.QueryData(x => x.CraftType == group)
+ .OrderBy(x => x.SetpNum)
+ .ToList();
+
+ foreach (var process in processList)
+ {
+ float torqueone = process.TorqueOne;//璇诲埌鍊间簡
+ float torquetow = process.TorqueTwo;
+ if (torqueone!=0)
+ {
+ serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r");
+ }
+ if (torquetow != 0)
+ {
+ serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torquetow * 1000).ToString().PadLeft(7, '0')) + "\r");
+ }
+
+ // 璁＄畻褰撳墠姝ラ鎵�闇�鐨� Torque 鎬绘暟
+ int requiredTorqueCount = process.TorqueOneQuantity + process.TorqueTwoQuantity;
+
+ // 鏌ヨ褰撳墠姝ラ鐨� TorqueOp 璁板綍锛屽尮閰� ProcessSte鍜岀粍锛屾鏌ユ槸鍚﹁揪鍒拌姹�
+ int torqueCount = _orqueOpRepository.QueryData(x => x.ProcessSte == process.SetpNum&& x.GroupOp== group).Count();
+
+ if (torqueCount < requiredTorqueCount)
+ {
+ // 濡傛灉鏁伴噺涓嶆弧瓒筹紝鍋滄璇诲彇
+
+ break;
+ }
+ //绗﹀悎瑕佹眰锛岀户缁鍙栦笅涓�姝�
+
+ }
}
if (group == "鏈烘")
@@ -83,11 +120,7 @@
{
}
- //g宸ヨ壓琛ㄧ殑鎵姏鍊�
-
- double num = 4.5;//0005000
-
- serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (num* 1000).ToString().PadLeft(7,'0'))+"\r");//鎵撳紑涓插彛鏃跺厛璁惧��
+ //鎵撳紑涓插彛鏃跺厛璁惧��
item.DeviceProParamName = CommandType.Set.ToString();
}
}
@@ -141,10 +174,30 @@
if (deviceProtocolDetail != null && receiveData.Contains(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue))
{
//杩欓噷鎴愬姛涔嬪悗锛岃瀛樺偍鍒扮湅Dt_TorqueOp锛堝瓨浠诲姟鍙凤紝缁勶紝鍊硷級
+ string group = "";
+ if (group == "鐢垫皵")
+ {
+ var putake = _putakeRepository.QueryData(x => x.Pustatus == 2 && x.Grouptype == group).OrderByDescending(x => x.Dispatchtime).FirstOrDefault();//姣忔閮芥嬁鏈�鏃╃殑閭ｆ潯
+ var punjid = putake.ID;
+ var Nj = new Dt_TorqueOp()
+ {
+ TakeId = putake.Njtakeid,
+ GroupOp = group,
+ //ProcessSte= processList
+ TorqueSize = receiveData
+
+ };
+ _orqueOpRepository.AddData(Nj);
+
+ }
+ if (group == "鏈烘")
+ {
+
+ }
+ if (group == "鍦版矡")
-
- item.DeviceProParamName = CommandType.Set.ToString();
+ item.DeviceProParamName = CommandType.Set.ToString();
}
}
--
Gitblit v1.9.3