qx

czw

2025-06-18 9862f9e1237c3d360cb4fb5547d8b11e33578d39

 HH.WCS.QingXiNongfu/core/TaskCore.cs

@@ -200,16 +200,16 @@
            var list = TaskHelper.GetTaskListByState("未执行");
            if (list.Count > 0)
            {
                foreach (var mst in list)
                {
                    var dinfo = Settings.GetDeviceInfoList().FindAll(x => x.deviceType == 13);
                    if (dinfo.Find(x => x.location.Contains(mst.S_START_LOC)) != null)
                        mst.N_PRIORITY = 99;
                    else
                    if (dinfo.Find(x => x.location.Contains(mst.S_END_LOC)) != null)
                        mst.N_PRIORITY = 98;
                }
                list = list.OrderByDescending(x => x.N_PRIORITY).ToList();
                //foreach (var mst in list)
                //{
                //    var dinfo = Settings.GetDeviceInfoList().FindAll(x => x.deviceType == 13);
                //    if (dinfo.Find(x => x.location.Contains(mst.S_START_LOC)) != null)
                //        mst.N_PRIORITY = 99;
                //    else
                //    if (dinfo.Find(x => x.location.Contains(mst.S_END_LOC)) != null)
                //        mst.N_PRIORITY = 98;
                //}
                //list = list.OrderByDescending(x => x.N_PRIORITY).ToList();

                list.ForEach(task =>
                {
@@ -385,7 +385,7 @@
                    var totalX = 0;
                    var totalRows = 0;
                    var list = new List<KuRong>();
                    var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas();
                    var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => x != null && System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas();
                    areas.ForEach(area =>
                    {
                        totalX += db.Queryable<Location>().Count(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X"));