From e789e002de5174c0fa51f78a05bf11f9b4c63345 Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 31 三月 2025 08:44:31 +0800
Subject: [PATCH] 修改websocket的端口
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/PutakeServer.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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/PutakeServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
index bcc052d..550fa3f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
@@ -55,7 +55,8 @@
{
try
{
- var putake = BaseDal.QueryData(i => i.Njtakeid == id&&i.Grouptype==gruops).FirstOrDefault();
+ var putakeList = BaseDal.QueryData(i => i.Grouptype == gruops && i.Pustatus != (int)cond.宸插畬鎴�).ToList();
+ var putake = putakeList.Where(i => i.Njtakeid == id).FirstOrDefault();
var nj = _iNjTaskRepository.QueryData(i => i.NJtaskID == id).FirstOrDefault();
if (putake == null)
{
@@ -74,6 +75,10 @@
{
case cond.寰呴绛�: //
+ if(putakeList.Where(a=>a.Pustatus== (int)cond.寰呬綔涓�).Count() > 0)
+ {
+ return new WebResponseContent { Status = false, Message = "褰撳墠鏈変綔涓氭湭瀹屾垚锛岃鍏堝畬鎴愭鍦ㄦ墽琛岀殑浣滀笟" };
+ }
putake.Pustatus = (int)cond.寰呬綔涓�; // 鏋氫妇杞� int
if (gruops=="鏈烘")
{
@@ -216,8 +221,24 @@
}
}
+ public WebResponseContent PerformTasks(string group)
+ {
+ try
+ {
+ var putake=BaseDal.QueryData(x=>x.Grouptype==group&&x.Pustatus==1)
+ .OrderBy(x=>x.Dispatchtime)
+ .FirstOrDefault();
+ if (putake == null)
+ {
+ return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌浠诲姟" };
+ }
+ return new WebResponseContent { Status = true,Data=putake};
+ }
+ catch (Exception ex)
+ {
-
-
+ return new WebResponseContent { Status=false, Message="閿欒淇℃伅锛�"+ex.Message};
+ }
+ }
}
}
--
Gitblit v1.9.3