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/PutakeServer.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 fa58402..82cd6af 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"
@@ -32,10 +32,11 @@
}
public override PageGridData<Dt_Putake> GetPageData(PageDataOptions options)
{
- OrderByParameters = new Dictionary<string, SqlSugar.OrderByType> {
- {
- nameof(Dt_Putake.ID),SqlSugar.OrderByType.Asc
- } };
+ OrderByParameters = new Dictionary<string, SqlSugar.OrderByType>
+ {
+ { nameof(Dt_Putake.Pustatus),SqlSugar.OrderByType.Asc },
+ // { nameof(Dt_Putake.CreateDate),SqlSugar.OrderByType.Asc }//鎸夌姸鎬佸拰鍒涘缓鏃堕棿鍗囧簭鎺掑簭
+ };
return base.GetPageData(options);
}
@@ -54,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)
{
@@ -73,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=="鏈烘")
{
@@ -126,7 +132,7 @@
case cond.寰呰川妫�: // 瀹屾垚璐ㄦ鏃堕棿
putake.Pustatus = (int)cond.宸插畬鎴�;
- DateTime latestTime = new DateTime(1900, 1, 1, 0, 0, 0);
+ //DateTime latestTime = new DateTime(1900, 1, 1, 0, 0, 0);
if (gruops == "鏈烘")
{
@@ -145,8 +151,13 @@
}
// 鑾峰彇鏈�鍚庝竴娆″畬鎴愮殑鏃堕棿
- latestTime = new[] { nj.confirmTime_LC, nj.confirmTime_DQ, nj.confirmTime_DG }.Max(); // 鍙栨渶鏂扮殑鏃堕棿
+ // latestTime = (DateTime)new[] { nj.confirmTime_LC, nj.confirmTime_DQ, nj.confirmTime_DG }.Max(); // 鍙栨渶鏂扮殑鏃堕棿
+ DateTime? latestTime = new[] { nj.confirmTime_LC, nj.confirmTime_DQ, nj.confirmTime_DG }
+ .Where(t => t.HasValue) // 杩囨护鎺� null
+ .Select(t => t.Value) // 鍙栧嚭闈炵┖鐨勫��
+ .DefaultIfEmpty(DateTime.Now) // 鑻ユ暟缁勪负绌猴紝浣跨敤褰撳墠鏃堕棿
+ .Max(); // 鍙栨渶澶ф椂闂�
nj.endTime = latestTime; // 璧嬪�兼渶鏂版椂闂�
putake.Finishedtime = DateTime.Now;
break;
--
Gitblit v1.9.3