代码修改

Shuxia Ning

2024-12-27 f94a4ed8e9f5400e73bad84be023096585cb0498

 01-api/Service/IStation.Service/07-helper/02-schedule/ScheduleHelper.cs

@@ -229,7 +229,13 @@

            #region 存在-优先开泵列表

            var priority_open_flag_list_remark = string.Empty;
            var exist_priority_open_flag_list = priority_open_flag_list != null && priority_open_flag_list.Count > 0;
            if (exist_priority_open_flag_list)
            {
                priority_open_flag_list = priority_open_flag_list.OrderBy(x => x).ToList();
                priority_open_flag_list_remark = IntListHelper.ToString(priority_open_flag_list);
            }

            #endregion

@@ -420,13 +426,18 @@
                    //优先开泵列表
                    if (exist_priority_open_flag_list)
                    {
                        foreach (var flag in priority_open_flag_list)
                        {
                            if (combine.Contains(flag))
                            {
                                combine_merit_ratio *= 1.05;
                            }
                        }
                        //foreach (var flag in priority_open_flag_list)
                        //{
                        //    if (combine.Contains(flag))
                        //    {
                        //        combine_merit_ratio *= 1.05;
                        //    } 
                        //}

                        //目前逻辑 优先开泵==必开方案
                        var combine_remark = IntListHelper.ToString(combine.OrderBy(x => x));
                        if (!combine_remark.Contains(priority_open_flag_list_remark))
                            continue;
                    }

                    #endregion