From 9862f9e1237c3d360cb4fb5547d8b11e33578d39 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 18 六月 2025 22:49:38 +0800
Subject: [PATCH] qx
---
HH.WCS.QingXiNongfu/core/TaskCore.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index 1d0daeb..7f03a0e 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/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"));
--
Gitblit v1.9.1