From 543f0a71b763660a1b5d12ac2bc0e1259e1ea4cb Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 31 三月 2025 08:47:02 +0800
Subject: [PATCH] Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0227
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/ProcessServer.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 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/ProcessServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
index 99d03ec..2962900 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/ProcessServer.cs"
@@ -360,7 +360,7 @@
{
var now = maxproce + 1;
proNow = process.Where(x => x.SetpNum == now).First();
- var finish= process.Where(x => x.SetpNum > now); //琛ㄧず鍓╀笅鏈墽琛岀殑姝ラ銆�
+ var finish= process.Where(x => x.SetpNum > now);
return new WebResponseContent { Status = true, Data = new { proNow, maxproce, now, finish } };
}
@@ -378,7 +378,7 @@
{
var now = nowNum + 1;
proNow = process.Where(x => x.SetpNum == now).First();
- var finish = process.Where(x => x.SetpNum < now);//琛ㄧず涓�瀹屾垚鐨�
+ var finish = process.Where(x => x.SetpNum < now);
return new WebResponseContent { Status = true, Message = "杩斿洖褰撳墠浠诲姟鍋氬埌鐨勫ぇ姝ラ", Data = new { proNow, maxproce, finish } };
}
}
@@ -472,14 +472,13 @@
// 鏌ヨ褰撳墠姝ラ鐨� TorqueOp 璁板綍锛屽尮閰� ProcessSte鍜岀粍锛屼换鍔″彿锛屾鏌ユ槸鍚﹁揪鍒拌姹傦紙瀹為檯鏁伴噺锛�
int practiceCount = _torqueOpRepository.QueryData(x => x.ProcessSte == setpDTO.setnum && x.GroupOp == setpDTO.group && x.TakeId == setpDTO.takeid).Count();
//鏌ュ埌鏈夎鏉℃暟鎹簡(鏇村叿鍒嗙粍鍜屾楠ゆ壘鍒拌鏉℃暟鎹�)
- var nowdate = process.Where(x => x.SetpNum == setpDTO.setnum);
+ var nowdate = process.Where(x => x.CraftType == setpDTO.group && x.SetpNum == setpDTO.setnum);
//杩斿洖褰撳墠宸ヨ壓鐨勬渶澶ф楠�
var maxproce = process.Max(x => x.SetpNum);
int num = setpDTO.setnum - 1;
- var nex = process.Where(x => x.SetpNum == num).FirstOrDefault();
+ var nex = process.Where(x => x.CraftType == setpDTO.group && x.SetpNum == num).FirstOrDefault();
var finish = process.Where(x => x.SetpNum < num).ToList();
-
return new WebResponseContent { Status = true, Message = $"涓婁竴姝setpDTO.setnum}", Data = new { nex, maxproce, finish } };
}
catch (Exception ex)
--
Gitblit v1.9.3