yanjinhui
2025-03-20 62751e74a70b6f1ca848e0f5fdb6fb8922d99f38
ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/PutakeServer.cs
@@ -35,7 +35,7 @@
            OrderByParameters = new Dictionary<string, SqlSugar.OrderByType>
            {
                   { nameof(Dt_Putake.Pustatus),SqlSugar.OrderByType.Asc },
                   { nameof(Dt_Putake.CreateDate),SqlSugar.OrderByType.Asc }//按状态和创建时间升序排序
                  // { nameof(Dt_Putake.CreateDate),SqlSugar.OrderByType.Asc }//按状态和创建时间升序排序
            };
            return base.GetPageData(options);
        }
@@ -127,7 +127,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 == "机械")
                        {
@@ -146,8 +146,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;