From 291185b6c286ab72f3b90208a61cbed78fdbd9ce Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期三, 04 六月 2025 17:17:32 +0800
Subject: [PATCH] jushi
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs | 3 ++-
HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/TaskProcess.cs | 28 +++++++++-------------------
2 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs
index 730049f..d208a68 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs
@@ -31,7 +31,8 @@
if (data.Substring(0, 2) == "3a")
{
//鏁版嵁搴忓彿
- data = data.Substring(16, 2);
+ data = data.Substring(18, 2);
+ LogHelper.Info($"Analysis======鍙傛暟{data}锛寋ip}");
//鏍规嵁ip鎵惧埌璧风偣/缁堢偣璐т綅
var plc = Settings.deviceInfos.Where(a => a.address == ip).FirstOrDefault();
var loc = plc.TN_Location;
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 7687ea1..5c14bb5 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/TaskProcess.cs
@@ -807,7 +807,7 @@
{
//鏌ヨ杩欎釜搴撳尯鐨勭┖鎵樼洏涓庢弧鎵樼洏
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>();
@@ -854,22 +854,6 @@
list.Remove(locToRemove);
}
}
- ////杩囨护涓�笅 鍏佽杩涘叆鐨勬墠鍒嗛厤
- //var reservoirs = Settings.ReservoirAreas.Where(s => s.areaName == "绔嬪簱鍏ュ簱鍖�).FirstOrDefault();
- //if (reservoirs.areaCode.Equals(area))
- //{
- // var plcDeviceTable = S7Helper.plcDeviceTables;
- // foreach (var l 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)
- // {
- // list.Remove(l);
- // }
- // }
- //}
-
//绗﹀悎鏉′欢鐨勬帓搴忛�绗竴涓� 鍏堟壘绗竴涓� if (list.Count > 0)
@@ -1706,6 +1690,7 @@
{
var db = new SqlHelper<Location>().GetInstance();
+ LogHelper.Info($"tcpOffline=====鍙傛暟:璧风偣璐т綅{startLoc}缁堢偣搴撳尯{endArea}");
try
{
//鏍￠獙璧风偣璐т綅鏄惁瀛樺湪/閿佷綇
@@ -1741,6 +1726,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}", "鎸夐挳鐩掍笅绾�);
@@ -1749,8 +1739,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;
}
}
--
Gitblit v1.9.1