From 84c2e090b4c3d380cbbc029291c162e4e86ec51d Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 30 六月 2025 17:32:25 +0800
Subject: [PATCH] 11
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs | 2 +-
/dev/null | 0
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/56b45850-7c70-4012-b361-03c118a1f4b5.vsidx | 0
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs | 2 +-
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs | 3 ++-
6 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/56b45850-7c70-4012-b361-03c118a1f4b5.vsidx b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/56b45850-7c70-4012-b361-03c118a1f4b5.vsidx
new file mode 100644
index 0000000..c9022f6
--- /dev/null
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/56b45850-7c70-4012-b361-03c118a1f4b5.vsidx
Binary files differ
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/bf82eed7-d03a-4773-8615-e25b89253835.vsidx b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/bf82eed7-d03a-4773-8615-e25b89253835.vsidx
deleted file mode 100644
index 01d4249..0000000
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/bf82eed7-d03a-4773-8615-e25b89253835.vsidx
+++ /dev/null
Binary files differ
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs
index 5b0292d..7be0e86 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/EnentListen.cs
@@ -272,7 +272,8 @@
#region 2000-鍏呯數浠诲姟--鏃犻渶鏀瑰姩
if (currActionModel.CN_N_ACTION_CODE == 2000)
{
- ProcessHelper.AGVBatteryTime();
+ //ProcessHelper.AGVBatteryTime();
+ ProcessHelper.AGVBatteryTimeTwo();
//Thread.Sleep(500);
}
#endregion
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
index 6e5a535..8ccc524 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/PLCControl.cs
@@ -4639,7 +4639,7 @@
if (result.result[0] == 1)
{
//鎺ㄩ�灏忚溅杩涘叆
- TSHelper.GoToAGV(taskNo, 10, 3);
+ TSHelper.GoToAGV(taskNo, 10, 1);
writeRes = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
{
host = plc.ip,
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 2128a19..2de3602 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
@@ -1120,6 +1120,53 @@
}
CMMLog.Info("杩涘叆鍏呯數浠诲姟娴佺▼鍒ゆ柇锛氭墽琛岀粨鏉燂紒");
}
+
+ internal static void AGVBatteryTimeTwo()
+ {
+ var cpsInfo = MongoDBSingleton.Instance.FindAll<TN_B_CHARGE_PLAN_SET>("TN_B_CHARGE_PLAN_SET");
+ if (cpsInfo.Count > 0)
+ {
+ foreach (var a in cpsInfo)
+ {
+ int agvNo = int.Parse(a.CN_S_NAME);
+ if(agvNo != 0)
+ {
+ //鍒ゆ柇涓棿琛�MarginAGV 鏄惁鏈夎AGV鐨勬暟鎹�+ var maInfo = MongoDBSingleton.Instance.FindOne<MarginAGV>(Query.EQ("agvNo", int.Parse(a.CN_S_NAME)), "MarginAGV");
+ if (maInfo == null)
+ {
+ if (DateTime.Parse(a.CN_DT_START).AddMinutes(10) > DateTime.Now)
+ {
+ //褰撳墠鏃堕棿鍦ㄦ寚瀹氬厖鐢垫椂闂寸殑10鍒嗛挓涔嬪唴
+ var pileInfo = Settings.GetChargingPile().Where(b => b.agvNo == a.CN_S_NAME && b.enable == "1").FirstOrDefault();
+ if(pileInfo != null)
+ {
+ int marginGroup = int.Parse(pileInfo.charginGroup);
+ TSHelper.SendChargeTask(a.CN_S_NAME, true);
+ //澧炲姞鏃堕棿
+ MongoDBSingleton.Instance.Insert<MarginAGV>(new MarginAGV { agvNo = agvNo, marginGroup = marginGroup, dateTime = DateTime.Now });
+ }
+ else
+ {
+ CMMLog.Info($"鍏呯數浠诲姟锛屾湭閰嶇疆褰撳墠杞﹀彿锛岃溅鍙凤細{a.CN_S_NAME}");
+ }
+ }
+ }
+ else
+ {
+ if (maInfo.dateTime.AddMinutes(10) < DateTime.Now)
+ {
+ MongoDBSingleton.Instance.Remove<MarginAGV>(Query.EQ("id", maInfo.id), RemoveFlags.None);
+ }
+ }
+ }
+ else
+ {
+ CMMLog.Info("鍏呯數浠诲姟娴佺▼寮傚父锛屽綋鍓嶈溅鍙蜂负0");
+ }
+ }
+ }
+ }
#endregion
/// <summary>
@@ -1340,6 +1387,8 @@
return result;
}
+
+
/// <summary>
/// SQL-AMS浠诲姟涓昏〃
/// </summary>
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
index 55d7dca..5d5d724 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProtocolAnalysis.cs
@@ -689,7 +689,7 @@
if (result != null && result.errCode == 0)
{
CMMLog.Info($"鐢靛姩闂ㄥ紑闂ㄦ祦绋嬶細璇诲彇鐢靛姩闂ㄩ�閬撳彿涓猴細{doorInfo.readAddr}閲岄潰鐨勫�涓簕result.result[0]},{doorInfo.readAddr + 1}閲岄潰鐨勫�涓簕result.result[1]},闂ㄥ彿锛歿action.Ext2}");
- if(action.Ext2 == "4")
+ if(action.Ext2 == "4" || action.Ext2 == "5")
{
if (result.result[0] == 1)
{
--
Gitblit v1.9.1