From e3d6e8ddbfc930db88bef1e7f170ddfe71b06cf1 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 04 七月 2025 17:25:43 +0800
Subject: [PATCH] 1
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs | 158 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 147 insertions(+), 11 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 1e4237b..ce7e3bc 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
@@ -9,6 +9,7 @@
using MongoDB.Driver.Builders;
using MySql.Data.MySqlClient;
using Newtonsoft.Json;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -174,6 +175,32 @@
end.CN_N_AGV_LOCATION = Settings.GetConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
}
}
+
+ var conn1 = Settings.GetDGConnectingbitsList().Where(a => a.enable == 1).ToList();
+ if (conn1.Count == 2)
+ {
+ //涓や釜鎺ラ┏骞冲彴
+ if (mst.CN_S_START_BIT == conn1[0].locCode || mst.CN_S_START_BIT == conn1[1].locCode)
+ {
+ start.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[1];
+ }
+ if (mst.CN_S_END_BIT == conn1[0].locCode || mst.CN_S_END_BIT == conn1[1].locCode)
+ {
+ end.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
+ }
+ }
+ if (conn1.Count == 1)
+ {
+ //涓�釜鎺ラ┏骞冲彴
+ if (mst.CN_S_START_BIT == conn1[0].locCode)
+ {
+ start.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_START_BIT).First().agvSite[1];
+ }
+ if (mst.CN_S_END_BIT == conn1[0].locCode)
+ {
+ end.CN_N_AGV_LOCATION = Settings.GetDGConnectingbitsList().Where(a => a.locCode == mst.CN_S_END_BIT).First().agvSite[0];
+ }
+ }
#endregion
string FRow = string.IsNullOrEmpty(start.CN_S_FLOOR) ? "1" : start.CN_S_FLOOR;
@@ -207,7 +234,7 @@
}
}
}
- if (mst.CN_S_BUSS_TYPE == "缂撳瓨鏋跺叆绔嬪簱")
+ if (mst.CN_S_BUSS_TYPE == "缂撳瓨鏋跺叆绔嬪簱" || mst.CN_S_BUSS_TYPE == "鐢甸挻缂撳瓨鏋跺叆绔嬪簱")
{
TRow = "1";
}
@@ -697,9 +724,10 @@
if (plc.Count > 0)
{
#region 鍒ゆ柇杈撻�绾挎ā寮�鍙樻洿娉ㄩ噴
- //bool action = true;
+
//foreach(var a in plc)
//{
+ // bool action = false;
// var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
// {
// dataNum = 1,
@@ -712,7 +740,6 @@
// CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満{a.ip}閫氶亾鍙蜂负锛歿a.readAddr + 3}鐨勫�涓猴細{modeResult.result[0]}");
// if (modeResult.result[0] == 2)
// {
- // action = false;
// CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
// break;
// }
@@ -724,24 +751,25 @@
// {
// if (modelInfo.Mode == "鍏ュ簱妯″紡")
// {
- // action = false;
// CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
- // break;
+ // }
+ // else
+ // {
+ // action = true;
// }
// }
// else
// {
- // action = false;
// CMMLog.Debug("OutWareTask:涓棿琛�ModeList 涓虹┖");
- // break;
// }
// }
// }
+ // if (!action)
+ // {
+ // return false;
+ // }
//};
- //if (!action)
- //{
- // return false;
- //}
+
#endregion
@@ -1118,6 +1146,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>
@@ -1321,5 +1396,66 @@
return WeekNumInMonth;
}
+ internal static bool UpdateTaskState(string taskNo, int state)
+ {
+ var result = false;
+ try
+ {
+ string taskState = state == 3 ? "寮�鍙栬揣" : state == 4 ? "鍙栬揣瀹屾垚" : state == 5 ? "寮�鍗歌揣" : state == 6 ? "鍗歌揣瀹屾垚" : state == 2 ? "瀹屾垚" : "";
+ CMMLog.Info($"SQLServer 鏇存柊浠诲姟鐘舵�锛氫换鍔″彿锛歿taskNo},鏇存敼鐘舵�锛歿taskState}");
+ if (!string.IsNullOrEmpty(taskState)) result = new SqlHelper<SQL_TN_I_TASK_MST>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_STATUS='{taskState}' where CN_S_TASK_NO='{taskNo}'");
+ }
+ catch (Exception ex)
+ {
+ CMMLog.Error($"SQLServer 鏇存柊浠诲姟鐘舵�寮傚父锛歿ex.Message}");
+ }
+
+ return result;
+ }
+
+
+
+ /// <summary>
+ /// SQL-AMS浠诲姟涓昏〃
+ /// </summary>
+ [SugarTable("dbo.tn_am_task_mst")]
+ public class SQL_TN_I_TASK_MST
+ {
+ public string CN_S_BATCH_NO { get; set; }
+ public int CN_S_ORDER_NO { get; set; }
+ public string CN_S_TASK_NO { get; set; }
+ public string CN_S_SOURCE_SYS { get; set; }
+ public string CN_S_SOURCE_NO { get; set; }
+ public string CN_S_PROCESS_CODE { get; set; }
+ public string CN_S_TASK_TYPE { get; set; }
+ public string CN_S_START_AREA { get; set; }
+ public string CN_S_START_AREA_NAME { get; set; }
+ public string CN_S_START_BIT { get; set; }
+ public int CN_N_START_AGVBIT { get; set; }
+ public string CN_S_END_AREA { get; set; }
+ public string CN_S_END_AREA_NAME { get; set; }
+ public string CN_S_END_BIT { get; set; }
+ public int CN_N_END_AGVBIT { get; set; }
+ public string CN_S_STATUS { get; set; }
+ public string CN_S_BEF_STATUS { get; set; }
+ public string CN_S_BEFORE_NO { get; set; }
+ public string CN_S_AFTER_NO { get; set; }
+ public string CN_T_START_WORKING { get; set; }
+ public string CN_T_END_WORKING { get; set; }
+ public int CN_N_PRIORITY { get; set; }
+ public int CN_N_CUR_STEP { get; set; }
+ public string CN_S_CREATOR { get; set; }
+ public string CN_S_CREATOR_NAME { get; set; }
+ public string CN_T_CREATE { get; set; }
+ public string CN_S_MENDER { get; set; }
+ public string CN_S_MODIFY_NAME { get; set; }
+ public string CN_T_MODIFY { get; set; }
+ public string CN_S_TASK_MODEL { get; set; }
+ public string CN_S_EXT1 { get; set; }
+ public string CN_S_EXT2 { get; set; }
+ public string CN_S_EXT3 { get; set; }
+ public string CN_N_AGV_NO { get; set; }
+ public string CN_S_TRANSPORT_INFO { get; set; }
+ }
}
}
--
Gitblit v1.9.1