1.初版差异提交
This commit is contained in:
@@ -185,6 +185,7 @@ namespace AGVSystem
|
||||
temp.Read_dt = DateTime.Now;
|
||||
UPDateDBList.upDbList.Add(new Location_Log(DateTime.Now, temp.Agv_ID, temp.Location_Display, location_value, 0, 0, 0));
|
||||
}
|
||||
WriteTxt.SaveLog1("=========》(11):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
#region 路口放行判断
|
||||
if (temp.Cross_Location_Go != location_temp && location_value > 0 && location_value < 2000)
|
||||
{
|
||||
@@ -361,10 +362,12 @@ namespace AGVSystem
|
||||
#region 海康交管
|
||||
else if (Frm_A17168.businessCtrl.apiModel.waitRfidList.Split(',').Contains(location_temp.ToString()))
|
||||
{
|
||||
WriteTxt.SaveLog1("=========》(12):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
if (Frm_A17168.businessCtrl == null) Frm_A17168.businessCtrl = new BusinessManage();
|
||||
if (Frm_A17168.leavedDic == null) Frm_A17168.leavedDic = new Dictionary<int, int>();
|
||||
if (!Frm_A17168.leavedDic.ContainsKey(temp.Agv_ID)) Frm_A17168.leavedDic.Add(temp.Agv_ID, 0);
|
||||
bool flg = false;
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "开始请求放行", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
//2秒请求一次
|
||||
if (Frm_A17168.leavedDic[temp.Agv_ID] % Frm_A17168.businessCtrl.apiModel.requestSecond == 0)
|
||||
{
|
||||
@@ -375,16 +378,15 @@ namespace AGVSystem
|
||||
//放行
|
||||
if (flg)
|
||||
{
|
||||
// if (Link_To_PLC.WriteGo(temp.Agv_ID) == 0)
|
||||
// {
|
||||
// Frm_A17168.leavedDic[temp.Agv_ID] = 0;
|
||||
// WriteTxt.SaveLog1(location_temp.ToString() + "路口已放行", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
// t_temp = 0;
|
||||
// temp.Cross_Location_Go = location_temp;
|
||||
// }
|
||||
|
||||
|
||||
|
||||
WriteTxt.SaveLog1("=========》(13):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
//登记第三方交管路口占用
|
||||
TrafficModel trafficModel = Frm_A17168.autoLeavedDic.Find(_ => _.areaCode.Equals(location_temp.ToString()));
|
||||
if (trafficModel != null)
|
||||
{
|
||||
trafficModel.agvId = temp.Agv_ID;
|
||||
trafficModel.InArea = DateTime.Now;
|
||||
}
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "路口添加" + trafficModel?.areaCode + "(" + trafficModel.agvId + ")", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
if (Link_To_PC.WriteInfo(1, 0, 0) == 0)
|
||||
{
|
||||
Frm_A17168.leavedDic[temp.Agv_ID] = 0;
|
||||
@@ -402,23 +404,31 @@ namespace AGVSystem
|
||||
//{
|
||||
else if (Frm_A17168.businessCtrl.apiModel.leavedRfidList.Split(',').Contains(location_temp.ToString()))
|
||||
{
|
||||
WriteTxt.SaveLog1("=========》(14):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
if (Frm_A17168.businessCtrl == null) Frm_A17168.businessCtrl = new BusinessManage();
|
||||
if (Frm_A17168.leavedDic == null) Frm_A17168.leavedDic = new Dictionary<int, int>();
|
||||
if (!Frm_A17168.leavedDic.ContainsKey(temp.Agv_ID)) Frm_A17168.leavedDic.Add(temp.Agv_ID, 0);
|
||||
bool flg = false;
|
||||
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "开始请求释放", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
|
||||
if (Frm_A17168.leavedDic[temp.Agv_ID] % Frm_A17168.businessCtrl.apiModel.requestSecond == 0)
|
||||
{
|
||||
flg = Frm_A17168.businessCtrl.ByLeaved(temp.Agv_ID.ToString(), location_temp.ToString(), lockCode.ToString());
|
||||
flg = Frm_A17168.businessCtrl.ByLeaved(temp.Agv_ID.ToString(), location_temp.ToString(), (location_temp - 1).ToString());
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "离开释放返回的值" + flg, "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
}
|
||||
//归还
|
||||
if (flg)
|
||||
{
|
||||
WriteTxt.SaveLog1("=========》(15):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
Frm_A17168.leavedDic[temp.Agv_ID] = 0;
|
||||
temp.Cross_Location_Go = location_temp;
|
||||
lockCode = location_temp;
|
||||
//清除第三方交管路口占用
|
||||
TrafficModel trafficModel2 = Frm_A17168.autoLeavedDic.Find(_ => _.areaCode.Equals(location_temp.ToString()));
|
||||
if (trafficModel2 != null)
|
||||
{
|
||||
trafficModel2.agvId = 0;
|
||||
}
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "路口已归还", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
}
|
||||
Frm_A17168.leavedDic[temp.Agv_ID]++;
|
||||
@@ -467,8 +477,11 @@ namespace AGVSystem
|
||||
Convert.ToString(param_info[6], 2).PadLeft(8, '0') +
|
||||
Convert.ToString(param_info[5], 2).PadLeft(8, '0') +
|
||||
Convert.ToString(param_info[4], 2).PadLeft(8, '0');
|
||||
Thread.Sleep(100);
|
||||
Warn_Deal(temp, sWarn);
|
||||
ThreadPool.QueueUserWorkItem(delegate
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
Warn_Deal(temp, sWarn);
|
||||
});
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -608,8 +621,6 @@ namespace AGVSystem
|
||||
WriteTxt.SaveLog1("AGV经过地标:" + location_temp, temp.Agv_ID + "#Agv", "地标日志");
|
||||
//地标信息
|
||||
temp.Location_Display = location_temp;
|
||||
//记录充电
|
||||
Func.Change_Rec(temp.Agv_ID, location_temp, temp.Location_Display, temp.Read_dt);
|
||||
|
||||
temp.Read_dt = DateTime.Now;
|
||||
//Func.db_conn.Command("INSERT INTO [Location_Log] ([Dt] ,[Agv_ID] ,[Loc_ID] ,[Value] ,[Loc_ID2] ,[Value2],[Value3]) VALUES ('" +
|
||||
@@ -617,13 +628,13 @@ namespace AGVSystem
|
||||
string strsql = "INSERT INTO [Location_Log] ([Dt] ,[Agv_ID] ,[Loc_ID] ,[Value] ,[Loc_ID2] ,[Value2],[Value3]) VALUES ('" +
|
||||
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'," + temp.Agv_ID + "," + location_temp + "," + location_value + "," + 0 + "," + 0 + "," + 0 + ")";
|
||||
|
||||
bBllBase.ExecuteNonQuery(strsql);
|
||||
UPDateDBList.sqlList.Add(strsql);
|
||||
|
||||
}
|
||||
|
||||
if (Math.Abs(errorcount) > 0) errorcount = 0;
|
||||
|
||||
|
||||
WriteTxt.SaveLog1("=========》(21):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
|
||||
#region 路口放行判断
|
||||
if (temp.Cross_Location_Go != location_temp && location_value > 0 && location_value < 2000)
|
||||
@@ -799,10 +810,12 @@ namespace AGVSystem
|
||||
#region 海康交管
|
||||
else if (Frm_A17168.businessCtrl.apiModel.waitRfidList.Split(',').Contains(location_temp.ToString()))
|
||||
{
|
||||
WriteTxt.SaveLog1("=========》(22):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
if (Frm_A17168.businessCtrl == null) Frm_A17168.businessCtrl = new BusinessManage();
|
||||
if (Frm_A17168.leavedDic == null) Frm_A17168.leavedDic = new Dictionary<int, int>();
|
||||
if (!Frm_A17168.leavedDic.ContainsKey(temp.Agv_ID)) Frm_A17168.leavedDic.Add(temp.Agv_ID, 0);
|
||||
bool flg = false;
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "开始请求放行", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
//2秒请求一次
|
||||
if (Frm_A17168.leavedDic[temp.Agv_ID] % Frm_A17168.businessCtrl.apiModel.requestSecond == 0)
|
||||
{
|
||||
@@ -821,8 +834,15 @@ namespace AGVSystem
|
||||
// temp.Cross_Location_Go = location_temp;
|
||||
// }
|
||||
|
||||
|
||||
|
||||
WriteTxt.SaveLog1("=========》(23):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
//登记第三方交管路口占用
|
||||
TrafficModel trafficModel = Frm_A17168.autoLeavedDic.Find(_ => _.areaCode.Equals(location_temp.ToString()));
|
||||
if (trafficModel != null)
|
||||
{
|
||||
trafficModel.agvId = temp.Agv_ID;
|
||||
trafficModel.InArea = DateTime.Now;
|
||||
}
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "路口添加" + trafficModel?.areaCode + "(" + trafficModel.agvId + ")", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
if (Link_To_PLC.WriteVW(2, 116, temp.Location_Display) == 0)
|
||||
{
|
||||
Frm_A17168.leavedDic[temp.Agv_ID] = 0;
|
||||
@@ -840,23 +860,31 @@ namespace AGVSystem
|
||||
//{
|
||||
else if (Frm_A17168.businessCtrl.apiModel.leavedRfidList.Split(',').Contains(location_temp.ToString()))
|
||||
{
|
||||
WriteTxt.SaveLog1("=========》(24):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
if (Frm_A17168.businessCtrl == null) Frm_A17168.businessCtrl = new BusinessManage();
|
||||
if (Frm_A17168.leavedDic == null) Frm_A17168.leavedDic = new Dictionary<int, int>();
|
||||
if (!Frm_A17168.leavedDic.ContainsKey(temp.Agv_ID)) Frm_A17168.leavedDic.Add(temp.Agv_ID, 0);
|
||||
bool flg = false;
|
||||
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "开始请求释放", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
|
||||
if (Frm_A17168.leavedDic[temp.Agv_ID] % Frm_A17168.businessCtrl.apiModel.requestSecond == 0)
|
||||
{
|
||||
flg = Frm_A17168.businessCtrl.ByLeaved(temp.Agv_ID.ToString(), location_temp.ToString(), lockCode.ToString());
|
||||
flg = Frm_A17168.businessCtrl.ByLeaved(temp.Agv_ID.ToString(), location_temp.ToString(), (location_temp - 1).ToString());
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "离开释放返回的值" + flg, "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
}
|
||||
//归还
|
||||
if (flg)
|
||||
{
|
||||
WriteTxt.SaveLog1("=========》(25):" + location_temp, temp.Agv_ID + "#Agv", "调试日志");
|
||||
Frm_A17168.leavedDic[temp.Agv_ID] = 0;
|
||||
temp.Cross_Location_Go = location_temp;
|
||||
lockCode = location_temp;
|
||||
//清除第三方交管路口占用
|
||||
TrafficModel trafficModel2 = Frm_A17168.autoLeavedDic.Find(_ => _.areaCode.Equals(location_temp.ToString()));
|
||||
if (trafficModel2 != null)
|
||||
{
|
||||
trafficModel2.agvId = 0;
|
||||
}
|
||||
WriteTxt.SaveLog1(location_temp.ToString() + "路口已归还", "放行日志" + (temp.Agv_ID), "插件日志");
|
||||
}
|
||||
Frm_A17168.leavedDic[temp.Agv_ID]++;
|
||||
@@ -902,8 +930,11 @@ namespace AGVSystem
|
||||
|
||||
string sWarn = (Convert.ToString(WarnRead[0], 2).PadLeft(8, '0') + Convert.ToString(WarnRead[1], 2).PadLeft(8, '0')).PadLeft(64, '0');
|
||||
|
||||
Thread.Sleep(100);
|
||||
Warn_Deal_Plc(temp, sWarn);
|
||||
ThreadPool.QueueUserWorkItem(delegate
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
Warn_Deal_Plc(temp, sWarn);
|
||||
});
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user