From 00b6105b34870f6f5a33551534d0088f3f741906 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 07 七月 2025 17:33:53 +0800
Subject: [PATCH] 退库修改
---
wms/LocationHelper.cs | 502 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 434 insertions(+), 68 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 85bafbe..9c7c0df 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -1,4 +1,5 @@
锘縰sing HH.WCS.ZhongCeJinTan;
+using HH.WCS.ZhongCeJinTan.dispatch;
using HH.WCS.ZhongCeJinTan.util;
using HH.WCS.ZhongCeJinTan.wms;
using Microsoft.Owin;
@@ -10,9 +11,11 @@
using System.Text;
using System.Threading.Tasks;
using Top.Api;
+using WebSocketSharp.Frame;
using static HH.WCS.ZhongCeJinTan.api.ApiModel;
using static HH.WCS.ZhongCeJinTan.util.Settings;
using static HH.WCS.ZhongCeJinTan.wms.WcsModel;
+using static ICSharpCode.SharpZipLib.Zip.ExtendedUnixData;
namespace HH.WCS.ZhongCeJinTan.wms
{
@@ -23,15 +26,15 @@
static LocationHelper() {
//鍒濆鍖杔ocation鍔犲叆鍒板瓧鍏哥紦瀛�- locations = new Dictionary<string, Location>();
- var list = GetAllLocList();
- if (list.Count > 0) {
- list.ForEach(a => {
- if (!locations.ContainsKey(a.S_CODE)) {
- locations.Add(a.S_CODE, a);
- }
- });
- }
+ //locations = new Dictionary<string, Location>();
+ //var list = GetAllLocList();
+ //if (list.Count > 0) {
+ // list.ForEach(a => {
+ // if (!locations.ContainsKey(a.S_CODE)) {
+ // locations.Add(a.S_CODE, a);
+ // }
+ // });
+ //}
//鍒濆鍖杔ocationExt鍔犲叆鍒伴泦鍚堢紦瀛� //locationExts = new Dictionary<string, LocationExt>();
//var exts = GetAllLocExtList();
@@ -84,13 +87,29 @@
}
+
/// <summary>
/// 鑾峰彇璐т綅淇℃伅,鍙傛暟搴撳尯缂栧彿
/// </summary>
internal static List<string> GetConnectionList(string S_AREA_CODE)
{
var db = new SqlHelper<object>().GetInstance();
- var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y").OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList();
+ var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y").OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList();
+ List<string> result = new List<string>();
+ foreach (var item in ConnectionList)
+ {
+ result.Add(item.S_CODE);
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 鑾峰彇璐т綅淇℃伅,鍙傛暟搴撳尯缂栧彿
+ /// </summary>
+ internal static List<string> GetConnectionListByN(string S_AREA_CODE)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "N").OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList();
List<string> result = new List<string>();
foreach (var item in ConnectionList)
{
@@ -111,7 +130,7 @@
foreach (var item in locList)
{
var ConnectionList = 0;
- ConnectionList = db.Queryable<WMSTask>().Where(a => (a.S_END_LOC.Contains(item) || a.S_START_LOC.Contains(item)) && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "閿欒").ToList().Count();
+ ConnectionList = db.Queryable<WMSTask>().Where(a => (a.S_END_LOC.Contains(item) || a.S_START_LOC.Contains(item)) && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�).ToList().Count();
var re = new connectionBalance();
var con = LocationHelper.GetLoc(item);
re.loc = con;
@@ -121,8 +140,37 @@
return result.OrderBy(a => a.taskCount).ToList();
}
+ /// <summary>
+ /// 杩斿洖鎺ラ┏浣嶉泦鍚�+ /// </summary>
+ internal static List<Location> GetConnectionListByst(List<string> locList)
+ {
+ var db = new SqlHelper<object>().GetInstance();
-
+ List<Location> result = new List<Location>();
+
+ foreach (var item in locList)
+ {
+
+ var con = LocationHelper.GetLoc(item);
+
+ result.Add(con);
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 杩斿洖褰撳墠鎺ラ┏浣嶆墽琛屼换鍔℃暟閲�+ /// </summary>
+ internal static int GetConnectionTaskCount(string connection)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+ var ConnectionList = 0;
+ ConnectionList = db.Queryable<WMSTask>().Where(a => (a.S_END_LOC.Contains(connection) || a.S_START_LOC.Contains(connection)) && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� ).ToList().Count();
+ return ConnectionList;
+ }
+
/// <summary>
/// 鎵剧粓鐐瑰贩閬撳彲鐢ㄧ┖璐т綅
@@ -300,9 +348,9 @@
}
}
+ var balanceLocList = RoadWayBalance(locations);
-
- foreach (var item in locations)
+ foreach (var item in balanceLocList)
{
if (item.S_LOCK_STATE=="鏃� && item.N_CURRENT_NUM==0)
{
@@ -318,6 +366,241 @@
throw;
}
+ }
+
+
+ /// <summary>
+ /// 鎵剧粓鐐瑰贩閬撳彲鐢ㄧ┖璐т綅闆嗗悎 鍧囪
+ /// </summary>
+ /// <param name="locations"></param>
+ /// <returns></returns>
+ internal static List<Location> FindBalanceEndLocList(List<Location> locations, string endArea, string rodway = "")
+ {
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ Location end = null;
+ //鏍规嵁缁堢偣璐т綅鎵剧┖闂茶揣浣�+ var rows = locations.Select(a => a.N_ROW).Distinct().ToList();
+
+ //浣滀笟娴佺▼鐨勫贩閬�+ var xd = new List<string>();
+
+ List<RoadWayEnable> rowdwa = null;
+
+ if (!string.IsNullOrEmpty(rodway))
+ {
+ xd = rodway.Split('-').ToList();
+ rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == endArea && x.status == "0" && xd.Contains(x.roadWay)).ToList();
+ }
+ else
+ {
+ //鏌ユ壘鍙敤宸烽亾
+ rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == endArea && x.status == "0").ToList();
+ }
+
+ for (int i = 0; i < rows.Count; i++)
+ {
+ var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
+
+ var flag = false;
+ var flag1 = false;
+
+ foreach (var item in rowdwa)
+ {
+ if (rowList.Count(a => a.N_ROADWAY.ToString() == item.roadWay) > 0)
+ {
+ flag = true;
+ break;
+ }
+ }
+
+ foreach (var item1 in xd)
+ {
+ if (rowList.Count(a => a.N_ROADWAY.ToString() != item1) > 0)
+ {
+ flag1 = true;
+ break;
+ }
+ }
+
+ if (flag1 || flag)
+ {
+ locations.RemoveAll(a => a.N_ROW == rows[i]);
+ }
+
+ if (rowList.Count(a => a.N_CURRENT_NUM == 0) == 0)
+ {
+ locations.RemoveAll(a => a.N_ROW == rows[i]);
+ }
+ }
+
+ //瀵绘壘鍧囪 宸烽亾
+ var balanceLocList = RoadWayBalance1(locations);
+
+
+
+ return balanceLocList;
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+
+ }
+
+
+ /// <summary>
+ /// 宸烽亾鍧囪 绛栫暐
+ /// </summary>
+ /// <param name="lstTrueLocation">鍙敤鐨勮揣浣嶄俊鎭暟鎹�/param>
+ /// <returns>璁＄畻鍚庤繑鍥炵殑瀹炰綋</returns>
+ public static List<Location> RoadWayBalance(List<Location> lstTrueLocation)
+ {
+ //鎸囧畾璁＄畻鍚庤繑鍥炵殑瀹炰綋
+ List<Location> location_roadray = new List<Location>();
+
+ //鎸夌収宸烽亾鍒嗙粍 骞惰幏寰楀贩閬撲腑鍙敤璐т綅鐨勬暟鎹�+ //涔嬪悗杩涜鍊掑彊 鎵惧埌鍙敤璐т綅鏈�鐨勫贩閬�+ var v = lstTrueLocation.GroupBy(x => x.N_ROADWAY).Select(g => (new
+ {
+ roadWay = g.Key,
+ qty = g.Count(p => p.S_LOCK_STATE=="鏃�)
+ })).OrderByDescending(o => o.qty);
+
+ //鍊掑彊鎺掑垪鍚庣殑宸烽亾 寰幆
+ foreach (var item in v)
+ {
+ //鍙栧緱宸烽亾鍒楄〃涓彲鐢ㄨ揣浣嶆渶澶氱殑宸烽亾 骞惰幏鍙栧贩閬撲腑鎵�湁璐т綅
+ location_roadray = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).ToList();
+
+ if (location_roadray != null && location_roadray.Count > 0)
+ {
+ break;
+ }
+ }
+ return location_roadray;
+ }
+
+ /// <summary>
+ /// 宸烽亾鍧囪 绛栫暐
+ /// </summary>
+ /// <param name="lstTrueLocation">鍙敤鐨勮揣浣嶄俊鎭暟鎹�/param>
+ /// <returns>璁＄畻鍚庤繑鍥炵殑瀹炰綋</returns>
+ public static List<Location> RoadWayBalance1(List<Location> lstTrueLocation)
+ {
+ //鎸囧畾璁＄畻鍚庤繑鍥炵殑瀹炰綋
+ List<Location> location_roadray = new List<Location>();
+
+ //鎸夌収宸烽亾鍒嗙粍 骞惰幏寰楀贩閬撲腑鍙敤璐т綅鐨勬暟鎹�+ //涔嬪悗杩涜鍊掑彊 鎵惧埌鍙敤璐т綅鏈�鐨勫贩閬�+ var v = lstTrueLocation.GroupBy(x => x.N_ROADWAY).Select(g => (new
+ {
+ roadWay = g.Key,
+ qty = g.Count(p => p.S_LOCK_STATE == "鏃�)
+ })).OrderByDescending(o => o.qty);
+
+ //鍊掑彊鎺掑垪鍚庣殑宸烽亾 寰幆
+ foreach (var item in v)
+ {
+ //鍙栧緱宸烽亾鍒楄〃涓彲鐢ㄨ揣浣嶆渶澶氱殑宸烽亾 骞惰幏鍙栧贩閬撲腑鎵�湁璐т綅
+ var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).ToList();
+
+ foreach (var item1 in loclist)
+ {
+ location_roadray.Add(item1);
+ }
+ }
+ return location_roadray;
+ }
+
+
+ /// <summary>
+ /// 鐗╂枡鍧囪
+ /// </summary>
+ /// <param name="lstTrueLocation"></param>
+ /// <returns></returns>
+ public static List<Location> RoadWayBalance1ByItem(List<Location> lstTrueLocation, string itemCode)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+
+ //鎸囧畾璁＄畻鍚庤繑鍥炵殑瀹炰綋
+ List<Location> location_roadray = new List<Location>();
+
+
+ List<connectionBalance> result = new List<connectionBalance>();
+
+ var newlstTrueLocation = lstTrueLocation.GroupBy(c => c.N_ROADWAY)
+ .Select(g => g.First()) // 鎴栬� g.FirstOrDefault()
+ .ToList();
+
+ foreach (var item in newlstTrueLocation)
+ {
+ var ConnectionList = 0;
+
+ var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.N_ROADWAY && o.N_CURRENT_NUM>0).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).ToList();
+ foreach (var item1 in loclist)
+ {
+ var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item1.S_CODE).First();
+
+ // LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣璐т綅瀹瑰櫒淇℃伅" + JsonConvert.SerializeObject(tp), "Mes浠诲姟涓嬪彂");
+ if (tp != null && item1.S_LOCK_STATE == "鏃�)
+ {
+ var tp1 = db.Queryable<CntrItemRel>().Where(s => s.S_CNTR_CODE == tp.S_CNTR_CODE).First();
+ //LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣瀹瑰櫒鐗╂枡淇℃伅" + JsonConvert.SerializeObject(tp1), "Mes浠诲姟涓嬪彂");
+
+ if (tp1 != null && tp1.S_ITEM_CODE == itemCode)
+ {
+ ConnectionList += 1;
+ }
+ }
+ }
+
+ var re = new connectionBalance();
+
+ var con = LocationHelper.GetLoc(item.S_CODE);
+ re.loc = con;
+ re.taskCount = ConnectionList;
+ result.Add(re);
+ }
+
+
+
+ result = result.OrderBy(a=>a.taskCount).ToList();
+
+ foreach (var item in result)
+ {
+ location_roadray.Add(item.loc);
+ }
+
+
+ return location_roadray;
+ }
+
+
+
+ /// <summary>
+ /// 杩斿洖鍧囪 鐨勬帴椹充綅闆嗗悎
+ /// </summary>
+ internal static List<connectionBalance> GetBalanceConnectionList3(List<string> locList)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+ List<connectionBalance> result = new List<connectionBalance>();
+
+ foreach (var item in locList)
+ {
+ var ConnectionList = 0;
+ ConnectionList = db.Queryable<WMSTask>().Where(a => (a.S_END_LOC.Contains(item) || a.S_START_LOC.Contains(item)) && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�).ToList().Count();
+ var re = new connectionBalance();
+ var con = LocationHelper.GetLoc(item);
+ re.loc = con;
+ re.taskCount = ConnectionList;
+ result.Add(re);
+ }
+ return result.OrderBy(a => a.taskCount).ToList();
}
/// <summary>
@@ -501,10 +784,17 @@
/// </summary>
/// <param name="locations"></param>
/// <returns></returns>
- internal static Location FindStartcolByLoclistAndcntr(List<Location> locations,string startArea) {
+ internal static Location FindStartcolByLoclistAndcntr(List<Location> locations,string startArea, string CONNECTION = "") {
var db = new SqlHelper<object>().GetInstance();
try
{
+
+
+ var connectionList = LocationHelper.GetConnectionList(CONNECTION);
+
+
+ var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);
+
Location start = null;
var rowsStart = locations.Select(a => a.N_ROW).Distinct().ToList();
@@ -518,6 +808,8 @@
var flag = false;
+ var flag2 = false;
+
foreach (var item in rowdwa)
{
if (rowList.Count(a => a.N_ROADWAY.ToString() == item.roadWay) > 0)
@@ -527,7 +819,17 @@
}
}
- if (flag)
+ foreach (var item2 in balanceConnectionList)
+ {
+ if (rowList.Count(a => a.N_ROADWAY != item2.CONNEC_ROADWAY) > 0)
+ {
+ flag2 = true;
+ break;
+ }
+ }
+
+
+ if (flag || flag2)
{
continue;
}
@@ -736,13 +1038,21 @@
/// </summary>
/// <param name="locations"></param>
/// <returns></returns>
- internal static Location FindStartcolByLoclistAndItem(List<Location> locations,string itemCode,string endArea,string rodway="")
+ internal static Location FindStartcolByLoclistAndItem(List<Location> locations,string itemCode,string endArea,string rodway="",string CONNECTION="")
{
var db = new SqlHelper<object>().GetInstance();
try
{
Location start = null;
var rowsStart = locations.Select(a => a.N_ROW).Distinct().ToList();
+
+
+ var connectionList = LocationHelper.GetConnectionListByN(CONNECTION);
+
+
+ var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);
+
+
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟鎺掗櫎涓嶅彲鐢ㄥ贩閬撳紑濮�, "Mes浠诲姟涓嬪彂");
//浣滀笟娴佺▼鐨勫贩閬�@@ -757,7 +1067,7 @@
}
else
{
- //鏌ユ壘鍙敤宸烽亾
+ //鏌ユ壘涓嶅彲鐢ㄥ贩閬� rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == endArea && x.status == "0").ToList();
}
@@ -766,7 +1076,7 @@
// LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟璧风偣搴撳尯{endArea}鎵句笉鍒板彲鐢ㄥ贩閬�, "Mes浠诲姟涓嬪彂");
// return null;
//}
-
+
for (int i = 0; i < rowsStart.Count; i++)
{
@@ -774,6 +1084,7 @@
var flag = false;
var flag1 = false;
+ var flag2 = false;
foreach (var item in rowdwa)
{
@@ -792,59 +1103,69 @@
}
}
- if (flag1 || flag)
+ foreach (var item2 in balanceConnectionList)
{
- locations.RemoveAll(a => a.N_ROW == rowsStart[i]);
- }
-
- //rowList.Count(a => a.S_LOCK_STATE.Trim() != "鏃�) > 0 ||
- //褰撳墠鎺掓湁閿佸苟涓旀病鏈夋弧璐т綅锛屾帓闄�- if ( rowList.Count(a => a.N_CURRENT_NUM == 1) == 0)
- {
- locations.RemoveAll(a => a.N_ROW == rowsStart[i]);
- }
- }
-
- DateTime date = DateTime.Now;
- List<CntrItemRel> startList = new List<CntrItemRel>(); ;
-
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟鎺掗櫎涓嶅彲鐢ㄥ贩閬撳畬鎴�, "Mes浠诲姟涓嬪彂");
-
- foreach (var item in locations) {
- if (item.N_CURRENT_NUM==0)
- {
- continue;
- }
-
- var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item.S_CODE).First();
-
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣璐т綅瀹瑰櫒淇℃伅" + JsonConvert.SerializeObject(tp), "Mes浠诲姟涓嬪彂");
- if (tp != null && item.S_LOCK_STATE == "鏃�)
- {
- var tp1 = db.Queryable<CntrItemRel>().Where(s => s.S_CNTR_CODE == tp.S_CNTR_CODE).First();
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣瀹瑰櫒鐗╂枡淇℃伅" + JsonConvert.SerializeObject(tp1), "Mes浠诲姟涓嬪彂");
-
- if (tp1 != null && tp1.S_ITEM_CODE== itemCode&& tp1.S_ITEM_STATE == "鍚堟牸" && tp1.takeEffectTime < date && tp1.expireTime > date)
+ if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)
{
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鍚堟牸瀹瑰櫒鐗╂枡锛屽鍣ㄥ彿{tp1.S_CNTR_CODE}", "Mes浠诲姟涓嬪彂");
- startList.Add(tp1);
+ flag2 = true;
+ break;
}
}
- }
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鍚堟牸鐗╂枡鏁伴噺{startList.Count}", "Mes浠诲姟涓嬪彂");
- var startItem = startList.OrderBy(a => a.PRODUCTIONDATE).FirstOrDefault();
+ if (flag1 || flag || flag2)
+ {
+ locations.RemoveAll(a => a.N_ROW == rowsStart[i]);
+ }
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鎸夌敓浜ф椂闂存帓搴忕墿鏂欎俊鎭� + JsonConvert.SerializeObject(startItem), "Mes浠诲姟涓嬪彂");
- if (startItem!=null)
- {
-
+ //rowList.Count(a => a.S_LOCK_STATE.Trim() != "鏃�) > 0 ||
+ //褰撳墠鎺掓湁閿佸苟涓旀病鏈夋弧璐т綅锛屾帓闄�+ if (rowList.Count(a => a.N_CURRENT_NUM == 1) == 0)
+ {
+ locations.RemoveAll(a => a.N_ROW == rowsStart[i]);
+ }
+ }
- var tp = db.Queryable<LocCntrRel>().Where(s => s.S_CNTR_CODE == startItem.S_CNTR_CODE).First();
- start = LocationHelper.GetLocOne(tp.S_LOC_CODE);
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣璐т綅淇℃伅" + JsonConvert.SerializeObject(start), "Mes浠诲姟涓嬪彂");
- }
- return start;
+ DateTime date = DateTime.Now;
+ List<CntrItemRel> startList = new List<CntrItemRel>(); ;
+
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟鎺掗櫎涓嶅彲鐢ㄥ贩閬撳畬鎴�, "Mes浠诲姟涓嬪彂");
+
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟鎺掗櫎瀹屾垚璐т綅鏁伴噺{locations.Count}", "Mes浠诲姟涓嬪彂");
+
+ foreach (var item in locations)
+ {
+ if (item.N_CURRENT_NUM == 0)
+ {
+ continue;
+ }
+
+ var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item.S_CODE).First();
+
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣璐т綅瀹瑰櫒淇℃伅" + JsonConvert.SerializeObject(tp), "Mes浠诲姟涓嬪彂");
+ if (tp != null && item.S_LOCK_STATE == "鏃�)
+ {
+ var tp1 = db.Queryable<CntrItemRel>().Where(s => s.S_CNTR_CODE == tp.S_CNTR_CODE).First();
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣瀹瑰櫒鐗╂枡淇℃伅" + JsonConvert.SerializeObject(tp1), "Mes浠诲姟涓嬪彂");
+
+ if (tp1 != null && tp1.S_ITEM_CODE == itemCode && tp1.S_ITEM_STATE == "鍚堟牸" && tp1.takeEffectTime < date && tp1.expireTime > date)
+ {
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鍚堟牸瀹瑰櫒鐗╂枡锛屽鍣ㄥ彿{tp1.S_CNTR_CODE}", "Mes浠诲姟涓嬪彂");
+ startList.Add(tp1);
+ }
+ }
+ }
+
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鍚堟牸鐗╂枡鏁伴噺{startList.Count}", "Mes浠诲姟涓嬪彂");
+ var startItem = startList.OrderBy(a => a.PRODUCTIONDATE).FirstOrDefault();
+
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣鎸夌敓浜ф椂闂存帓搴忕墿鏂欎俊鎭� + JsonConvert.SerializeObject(startItem), "Mes浠诲姟涓嬪彂");
+ if (startItem != null)
+ {
+ var tp = db.Queryable<LocCntrRel>().Where(s => s.S_CNTR_CODE == startItem.S_CNTR_CODE).First();
+ start = LocationHelper.GetLocOne(tp.S_LOC_CODE);
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣璐т綅淇℃伅" + JsonConvert.SerializeObject(start), "Mes浠诲姟涓嬪彂");
+ }
+ return start;
}
catch (Exception)
{
@@ -924,9 +1245,6 @@
for (int i = 0; i < rowsStart.Count; i++)
{
var rowList = locations.Where(r => r.N_ROW == rowsStart[i]).ToList().OrderByDescending(a => a.N_COL);
-
-
-
//rowList.Count(a => a.S_LOCK_STATE.Trim() != "鏃�) > 0 ||
//褰撳墠鎺掓湁閿佸苟涓旀病鏈夋弧璐т綅锛屾帓闄�@@ -1247,6 +1565,25 @@
}
/// <summary>
+ /// 鑾峰彇寮傚父搴撳尯
+ /// </summary>
+ /// <returns></returns>
+ internal static bool GetErroArea(string area)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var erroArea = db.Queryable<Area>().Where(a => a.S_NAME.Contains("寮傚父") && a.S_CODE.Contains(area)).First();
+
+ if (erroArea == null)
+ {
+ return false;
+ }
+ else {
+ return true;
+ }
+ }
+
+
+ /// <summary>
/// 鍏ュ簱閿佸畾缁堢偣锛屽嚭搴撻攣瀹氳捣鐐� /// </summary>
/// <param name="loc"></param>
@@ -1506,5 +1843,34 @@
}
return res;
}
+
+ /// <summary>
+ /// 鑾峰彇閫昏緫搴撳尯璐т綅
+ /// </summary>
+ /// <param name="zoneCode"></param>
+ /// <returns></returns>
+ public static List<Location> GetZoneLoc(string zoneCode) {
+ var db = new SqlHelper<object>().GetInstance();
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟瀵绘壘閫昏緫搴撳尯鍙傛暟{zoneCode}", "Mes浠诲姟涓嬪彂");
+ var zones = db.Queryable<Zone>().Where(a => a.S_ZONE_CLS_CODE == zoneCode).ToList();
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟瀵绘壘閫昏緫搴撳尯淇℃伅" +JsonConvert.SerializeObject(zones), "Mes浠诲姟涓嬪彂");
+ var locList = new List<Location>();
+
+ foreach (var item in zones)
+ {
+ var locations = db.Queryable<ZoneLoc>().Includes(t => t.Loc).Where(a => a.S_ZONE_CODE == item.S_CODE).ToList();
+
+ foreach (var item1 in locations)
+ {
+ locList.Add(item1.Loc);
+ }
+ }
+
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟瀵绘壘閫昏緫璐т綅鏁伴噺淇℃伅{locList.Count}", "Mes浠诲姟涓嬪彂");
+
+ return locList.OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList(); ;
+ }
+
+
}
}
--
Gitblit v1.9.1