From 61ece19b5b178d1b23bed16c733b01af1185f838 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期日, 20 七月 2025 23:11:43 +0800
Subject: [PATCH] 0720
---
wms/LocationHelper.cs | 88 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 900b06a..9dbae35 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -105,6 +105,19 @@
return result;
}
+ internal static List<string> GetConnectionListNoYN(string S_AREA_CODE)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE ).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>
@@ -115,7 +128,12 @@
List<string> result = new List<string>();
foreach (var item in ConnectionList)
{
- result.Add(item.S_CODE);
+ var ConnectionY = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y" && s.CONNEC_ROADWAY== item.CONNEC_ROADWAY).First();
+ if (ConnectionY==null)
+ {
+ result.Add(item.S_CODE);
+ }
+
}
return result;
}
@@ -158,7 +176,17 @@
var db = new SqlHelper<object>().GetInstance();
return db.Queryable<WMSTask>().Where(a => ( a.S_START_LOC.Contains(jbLoc)&& a.S_SCHEDULE_TYPE.Contains(type) && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�)).OrderBy(b=>b.T_CREATE).First();
-
+ }
+
+ /// <summary>
+ /// 杩斿洖鍑哄簱agv浠诲姟
+ /// </summary>
+ internal static WMSTask GetConnectionTask(string jbLoc, string type,DateTime time)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+ return db.Queryable<WMSTask>().Where(a => (a.S_START_LOC.Contains(jbLoc) && a.S_SCHEDULE_TYPE.Contains(type) && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�&&a.T_CREATE<time)).OrderBy(b => b.T_CREATE).First();
+
}
/// <summary>
@@ -320,8 +348,13 @@
//鑾峰彇string鎺ラ┏浣嶉泦鍚� var connectionList = LocationHelper.GetConnectionList(CONNECTION);
+
+ var connectionListNoYN = LocationHelper.GetConnectionListNoYN(CONNECTION);
+
//涓嶅彲鐢ㄦ帴椹充綅闆嗗悎
- var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionList);
+ var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionListNoYN);
+
+
List<Location> jblist = new List<Location>();
@@ -336,7 +369,7 @@
List<Location> difference = flaseConnectionList
.Where(loc1 => !balanceConnectionList.Any(loc2 => loc2.S_CODE == loc1.S_CODE))
.ToList();
-
+
jblist = difference;
@@ -399,8 +432,13 @@
{
if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)
{
- flag2 = true;
- break;
+ var ConnectionY = db.Queryable<Location>().Where(s => s.S_AREA_CODE == CONNECTION && s.C_ENABLE == "Y" && s.CONNEC_ROADWAY == item2.CONNEC_ROADWAY).First();
+ if (ConnectionY == null)
+ {
+ flag2 = true;
+ break;
+ }
+
}
}
@@ -458,8 +496,10 @@
//鑾峰彇string鎺ラ┏浣嶉泦鍚� var connectionList = LocationHelper.GetConnectionList(CONNECTION);
+ var connectionListNoYN = LocationHelper.GetConnectionListNoYN(CONNECTION);
+
//涓嶅彲鐢ㄦ帴椹充綅闆嗗悎
- var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionList);
+ var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionListNoYN);
List<Location> jblist = new List<Location>();
@@ -534,8 +574,12 @@
{
if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)
{
- flag2 = true;
- break;
+ var ConnectionY = db.Queryable<Location>().Where(s => s.S_AREA_CODE == CONNECTION && s.C_ENABLE == "Y" && s.CONNEC_ROADWAY == item2.CONNEC_ROADWAY).First();
+ if (ConnectionY == null)
+ {
+ flag2 = true;
+ break;
+ }
}
}
@@ -677,7 +721,7 @@
foreach (var item in v)
{
//鍙栧緱宸烽亾鍒楄〃涓彲鐢ㄨ揣浣嶆渶澶氱殑宸烽亾 骞惰幏鍙栧贩閬撲腑鎵�湁璐т綅
- location_roadray = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).ToList();
+ location_roadray = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).OrderBy(b => b.N_LAYER).ToList();
if (location_roadray != null && location_roadray.Count > 0)
{
@@ -709,7 +753,7 @@
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();
+ var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).OrderBy(b => b.N_LAYER).ToList();
foreach (var item1 in loclist)
{
@@ -744,7 +788,7 @@
{
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();
+ 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).OrderBy(b => b.N_LAYER).ToList();
foreach (var item1 in loclist)
{
var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item1.S_CODE).First();
@@ -774,7 +818,7 @@
foreach (var item in result)
{
- var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.loc.N_ROADWAY && o.N_CURRENT_NUM==0 ).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).ToList();
+ var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.loc.N_ROADWAY && o.N_CURRENT_NUM==0 ).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).OrderBy(b => b.N_LAYER).ToList();
foreach (var item1 in loclist)
{
location_roadray.Add(item1);
@@ -994,10 +1038,8 @@
var db = new SqlHelper<object>().GetInstance();
try
{
-
- var connectionList = LocationHelper.GetConnectionList(CONNECTION);
-
+ var connectionList = LocationHelper.GetConnectionListByN(CONNECTION);
var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);
@@ -1006,7 +1048,7 @@
//鏌ユ壘涓嶅彲鐢ㄥ贩閬� var rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == startArea && x.status == "0").ToList();
-
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱鎺掗櫎涓嶅彲鐢ㄨ揣浣嶅紑濮嬶細{locations.Count}", "绌烘墭鍑哄簱");
for (int i = 0; i < rowsStart.Count; i++)
{
var rowList = locations.Where(r => r.N_ROW == rowsStart[i]).ToList().OrderByDescending(a => a.N_COL);
@@ -1027,7 +1069,7 @@
foreach (var item2 in balanceConnectionList)
{
- if (rowList.Count(a => a.N_ROADWAY != item2.CONNEC_ROADWAY) > 0)
+ if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)
{
flag2 = true;
break;
@@ -1037,7 +1079,7 @@
if (flag || flag2)
{
- continue;
+ locations.RemoveAll(a => a.N_ROW == rowsStart[i]);
}
//褰撳墠鎺掓湁閿佸苟涓旀病鏈夋弧璐т綅锛屾帓闄�@@ -1046,6 +1088,8 @@
locations.RemoveAll(a => a.N_ROW == rowsStart[i]);
}
}
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱鎺掗櫎涓嶅彲鐢ㄨ揣浣嶇粨鏉燂細{locations.Count}", "绌烘墭鍑哄簱");
+
foreach (var item in locations)
{
if (item.N_CURRENT_NUM == 0)
@@ -1053,11 +1097,13 @@
continue;
}
var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item.S_CODE).First();
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱itemCode:{item.S_CODE},itemLock:{item.S_LOCK_STATE} ,tp淇℃伅" + JsonConvert.SerializeObject(tp), "绌烘墭鍑哄簱");
if (tp != null && item.S_LOCK_STATE == "鏃�)
{
var tp1 = db.Queryable<Container>().Where(s => s.S_CODE == tp.S_CNTR_CODE).First();
+ LogHelper.Info($"绌烘墭鑷姩鍑哄簱tp1淇℃伅"+JsonConvert.SerializeObject(tp1), "绌烘墭鍑哄簱");
if (tp1 != null && tp1.N_DETAIL_COUNT==0)
{
start = item;
@@ -1258,10 +1304,6 @@
var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);
-
-
-
-
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟鎺掗櫎涓嶅彲鐢ㄥ贩閬撳紑濮�, "Mes浠诲姟涓嬪彂");
//浣滀笟娴佺▼鐨勫贩閬�
--
Gitblit v1.9.1