111

yanjinhui

2025-03-26 da2e87c2a05debbcc7dac5efb5d13c92d533782f

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/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;