From ef83aea1ac3325003b4ed8cddd23d295c6a01b1d Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期一, 09 六月 2025 17:31:56 +0800
Subject: [PATCH] jushi
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/TaskProcess.cs | 95 +++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 33 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/TaskProcess.cs
index 5f6880f..79e9833 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/TaskProcess.cs
@@ -784,11 +784,6 @@
return result;
-
-
-
-
- return result;
}
#endregion
@@ -807,16 +802,17 @@
{
//鏌ヨ杩欎釜搴撳尯鐨勭┖鎵樼洏涓庢弧鎵樼洏
var list = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == area).OrderByDescending(a => a.N_ROW).ToList();
- LogHelper.Info($"鏌ヨ杩欎釜搴撳尯鐨勭┖鎵樼洏涓庢弧鎵樼洏锛歿JsonConvert.SerializeObject(list)}");
+ //LogHelper.Info($"鏌ヨ杩欎釜搴撳尯鐨勭┖鎵樼洏涓庢弧鎵樼洏锛歿JsonConvert.SerializeObject(list)}");
if (list.Count > 0)
{
List<string> loca = new List<string>();
for (int i = 0; i < list.Count; i++)
{
//濡傛灉閿佷簡鎴栬�瀹归噺婊′簡 褰撳墠鏁伴噺 瀹瑰櫒瀹归噺
- if (list[i].N_LOCK_STATE != 0 || list[i].N_CURRENT_NUM >= list[i].N_CAPACITY)
+ if (list[i].N_LOCK_STATE != 0|| list[i].C_ENABLE != "Y" || list[i].N_CURRENT_NUM >= list[i].N_CAPACITY)
{
loca.Add(list[i].S_CODE);
+ LogHelper.Info($"InWorkTransport 婊℃垨鑰呴攣涓婄殑璐т綅锛歿list[i].S_CODE}锛岀姸鎬亄list[i].N_LOCK_STATE}");
}
}
//绉婚櫎
@@ -824,27 +820,54 @@
{
list.RemoveAll(s => loca.Contains(s.S_CODE));
}
- //杩囨护涓�笅 鍏佽杩涘叆鐨勬墠鍒嗛厤
- var reservoirs = Settings.ReservoirAreas.Where(s => s.areaName == "绔嬪簱鍏ュ簱鍖�).FirstOrDefault();
- if (reservoirs.areaCode.Equals(area))
+ // 3. 濡傛灉鏄珛搴撳叆搴撳尯锛屾鏌�PLC 鏄惁鍏佽鍗歌浇
+ var reservoirs = Settings.ReservoirAreas.FirstOrDefault(s => s.areaName == "绔嬪簱鍏ュ簱鍖�);
+ if (reservoirs != null && reservoirs.areaCode.Equals(area))
{
var plcDeviceTable = S7Helper.plcDeviceTables;
- foreach (var l in list)
+ // 鍏堟敹闆嗚绉婚櫎鐨勮揣浣嶏紝閬垮厤鍦ㄩ亶鍘嗘椂淇敼闆嗗悎
+ List<Location> locationsToRemove = new List<Location>();
+
+ foreach (var location in list)
{
- var safeInteraction = Settings.SafeInteractions.Where(s => s.location == l.S_CODE).FirstOrDefault();
- var res = int.Parse(plcDeviceTable.RGVAllowUnload[safeInteraction.code].ToString().Substring(1, 1));
- if (res!=1)
+ var safeInteraction = Settings.SafeInteractions.FirstOrDefault(s => s.location == location.S_CODE);
+ if (safeInteraction != null)
{
- list.Remove(l);
+ // 妫�煡 PLC 鏄惁鍏佽鍗歌浇锛堝彇绗簩浣嶆暟瀛楋紝鍒ゆ柇鏄惁涓�1锛�+ string allowUnloadStr = plcDeviceTable.RGVAllowUnload[safeInteraction.code].ToString();
+ int allowUnload = int.Parse(allowUnloadStr.Substring(1, 1));
+
+ if (allowUnload != 1)
+ {
+ locationsToRemove.Add(location); // 涓嶅厑璁稿嵏杞斤紝鍔犲叆寰呯Щ闄ゅ垪琛�+ }
}
}
+
+ // 閬嶅巻缁撴潫鍚庯紝鍐嶇粺涓�Щ闄や笉绗﹀悎鏉′欢鐨勮揣浣�+ foreach (var locToRemove in locationsToRemove)
+ {
+ list.Remove(locToRemove);
+ }
}
-
//绗﹀悎鏉′欢鐨勬帓搴忛�绗竴涓� 鍏堟壘绗竴涓� if (list.Count > 0)
{
- result = list.OrderBy(s => s.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ //绔嬪簱鐨勯殢鏈哄垎閰�+ if (reservoirs != null && reservoirs.areaCode.Equals(area))
+ {
+ // 绔嬪簱闅忔満鍒嗛厤绠楁硶
+ var random = new Random();
+ result = list.OrderBy(x => random.Next()).FirstOrDefault();
+ LogHelper.Info($"绔嬪簱闅忔満鍒嗛厤閫夋嫨璐т綅锛歿result?.S_CODE},鐘舵�{result?.N_LOCK_STATE}");
+
+ }
+ else
+ {
+ result = list.OrderBy(s => s.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
+ }
+
}
}
@@ -875,7 +898,7 @@
for (int i = 0; i < list.Count; i++)
{
//鍒ゆ柇璐т綅鏄惁琚攣浣忎簡 涓�鏄惁鏈夋墭鐩�- if (list[i].N_LOCK_STATE == 0)
+ if (list[i].N_LOCK_STATE == 0&& list[i].C_ENABLE =="Y")
{
var locCntrRel = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == list[i].S_CODE).First();
@@ -952,7 +975,7 @@
{
return locations
.Where(l => targetAreas.Any(area => l.S_CODE.Contains(area)))
- .Where(l => l.N_LOCK_STATE == 0 && l.N_CURRENT_NUM < l.N_CAPACITY)
+ .Where(l => l.N_LOCK_STATE == 0&& l.C_ENABLE == "Y" && l.N_CURRENT_NUM < l.N_CAPACITY)
.ToList();
}
@@ -981,7 +1004,7 @@
result = db.Queryable<Location>().OrderBy(a => a.N_COL)
.Where(a => a.S_AREA_CODE.Trim() == area && a.N_ROW == list[i].N_ROW
&& a.N_COL > list[i].N_COL).First();
- if (result != null && result.N_LOCK_STATE == 0)
+ if (result != null && result.N_LOCK_STATE == 0 && result.C_ENABLE == "Y")
{
return result;
}
@@ -991,7 +1014,7 @@
else
{
result = db.Queryable<Location>().
- Where(a => a.S_AREA_CODE.Trim() == area && a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM == 0)
+ Where(a => a.S_AREA_CODE.Trim() == area && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0)
.OrderBy(a => a.N_COL).OrderBy(a => a.N_ROW).First();
}
}
@@ -1188,7 +1211,7 @@
{
//鏍￠獙璧风偣璐т綅鏄惁瀛樺湪/閿佷綇
var loc = db.Queryable<Location>().Where(a => a.S_CODE == model.START_LOC).First();
- if (loc == null || loc.N_LOCK_STATE != 0)
+ if (loc == null || loc.N_LOCK_STATE != 0 || loc.C_ENABLE != "Y")
{
return new Results { Code = "1", Message = $"{model.START_LOC}搴撲綅宸茶閿佸畾!", Data = null };
}
@@ -1274,7 +1297,7 @@
}
//鏍￠獙缁堢偣璐т綅鏄惁瀛樺湪/閿佸畾
var loc = db.Queryable<Location>().Where(a => a.S_CODE == model.END_LOC).First();
- if (loc == null || loc.N_LOCK_STATE != 0)
+ if (loc == null || loc.N_LOCK_STATE != 0 || loc.C_ENABLE != "Y")
{
return new Results { Code = "1", Message = $"{model.END_LOC}搴撲綅宸茶閿佸畾!", Data = null };
}
@@ -1329,7 +1352,7 @@
if (!string.IsNullOrEmpty(model.START_LOC))
{
var loc = db.Queryable<Location>().Where(a => a.S_CODE == model.START_LOC).First();
- if (loc == null || loc.N_LOCK_STATE != 0)
+ if (loc == null || loc.N_LOCK_STATE != 0 || loc.C_ENABLE != "Y")
{
return new Results { Code = "1", Message = $"{model.START_LOC}搴撲綅宸茶閿佸畾!", Data = null };
}
@@ -1382,7 +1405,7 @@
LogHelper.Info($"鏈夌墿鏂檣itemCode}鐨勮揣浣嶇紪鍙穥JsonConvert.SerializeObject(locCntrs)}");
//鎵惧父瑙勯�妫�尯鍐呭惈鏈夋煡鍑虹墿鏂欒揣浣嶇殑璐т綅
var locList = db.Queryable<Location>()
- .Where(p => p.S_AREA_CODE == areaCode && p.N_LOCK_STATE == 0)
+ .Where(p => p.S_AREA_CODE == areaCode && p.N_LOCK_STATE == 0 && p.C_ENABLE == "Y")
.Where(s => locCntrs.Contains(s.S_CODE.Trim()))
.ToList();
@@ -1428,7 +1451,7 @@
//鎵惧埌璇ョ偣浣嶇殑搴撳尯
var loc = db.Queryable<Location>().Where(a => a.S_CODE == model.PointCode).First();
//娌￠攣鍐嶇户缁蛋
- if (loc.N_LOCK_STATE == 0 && loc != null)
+ if (loc.N_LOCK_STATE == 0 && loc.C_ENABLE =="Y" && loc != null)
{
var reservoirs = Settings.ReservoirAreas.Where(s => s.areaName == "閫佹鍏ュ簱鍖�).FirstOrDefault();
//濡傛灉鏄�妫�叆搴撳尯
@@ -1517,7 +1540,7 @@
{
//鍒涘缓浠诲姟 浠庣┖鎵樼紦瀛樺尯鍒版媶鎵樻満
var list = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == loc.S_AREA_CODE
- && a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0).OrderByDescending(a => a.N_ROW)
+ && a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").OrderByDescending(a => a.N_ROW)
.OrderByDescending(a => a.N_COL).First();
var startLoc = list.S_CODE;
@@ -1563,7 +1586,7 @@
}
//缁堢偣
var endloc = db.Queryable<Location>().Where(a => a.S_CODE == model.END_LOC).First();
- if (endloc == null || endloc.N_LOCK_STATE != 0)
+ if (endloc == null || endloc.N_LOCK_STATE != 0 || endloc.C_ENABLE != "Y")
{
return new Results { Code = "1", Message = $"{model.END_LOC}搴撲綅宸茶閿佸畾!", Data = null };
}
@@ -1599,7 +1622,7 @@
try
{
var loc = db.Queryable<Location>().Where(a => a.S_CODE == model.BIND_LOC).First();
- if (loc == null || loc.N_LOCK_STATE != 0)
+ if (loc == null || loc.N_LOCK_STATE != 0 || loc.C_ENABLE != "Y")
{
return new Results { Code = "1", Message = $"缁戝畾璐т綅涓嶅瓨鍦ㄦ垨宸茶閿�, Data = null };
@@ -1676,11 +1699,12 @@
{
var db = new SqlHelper<Location>().GetInstance();
+ LogHelper.Info($"tcpOffline=====鍙傛暟:璧风偣璐т綅{startLoc}缁堢偣搴撳尯{endArea}");
try
{
//鏍￠獙璧风偣璐т綅鏄惁瀛樺湪/閿佷綇
var loc = db.Queryable<Location>().Where(a => a.S_CODE == startLoc).First();
- if (loc == null || loc.N_LOCK_STATE != 0)
+ if (loc == null || loc.N_LOCK_STATE != 0 || loc.C_ENABLE != "Y")
{
LogHelper.Info("璧风偣璐т綅涓嶅瓨鍦ㄦ垨宸查攣" + startLoc);
return false;
@@ -1711,6 +1735,11 @@
// itemCode = model.S_ITEM_CODE;
// wlName = db.Queryable<TN_Material>().Where(b => b.S_ITEM_CODE == model.S_ITEM_CODE).First().S_ITEM_NAME;
//}
+ if (OutLoc==null)
+ {
+ LogHelper.Info($"缁堢偣璐т綅涓嶅瓨鍦�, "鎸夐挳鐩掍笅绾�);
+ return false;
+ }
ContainerHelper.BindLocCntrs(OutLoc.S_CODE, trayCode, itemCode, wlName);
//鍒涘缓浠诲姟
LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc}缁堢偣:{OutLoc.S_CODE}", "鎸夐挳鐩掍笅绾�);
@@ -1719,8 +1748,8 @@
}
catch (Exception ex)
{
- Console.WriteLine("materialOffline:" + ex.Message + ex.StackTrace);
- LogHelper.Error("materialOffline:" + ex.Message, ex);
+ Console.WriteLine("tcpOffline:" + ex.Message + ex.StackTrace);
+ LogHelper.Error("tcpOffline:" + ex.Message, ex);
throw;
}
}
@@ -1737,7 +1766,7 @@
{
//鏍￠獙缁堢偣璐т綅鏄惁閿� var endloc = db.Queryable<Location>().Where(a => a.S_CODE == endLoc).First();
- if (endloc == null || endloc.N_LOCK_STATE != 0)
+ if (endloc == null || endloc.N_LOCK_STATE != 0 || endloc.C_ENABLE != "Y")
{
LogHelper.Info("缁堢偣璐т綅宸查攣" + endLoc);
return false;
--
Gitblit v1.9.1