Third_Dev_Dept/FG2608061
18
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.初版差异提交

Browse Source
This commit is contained in:
龚记林
2026-08-19 17:02:08 +08:00
parent 6f8dae2d02
commit 92c0d2e8d5
24 changed files with 507 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CODE/20230901/SA17168/AGVSystem Ver2.0/A17168/Cls_A17168.cs
+55 -24
View File
@@ -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
}
}
CODE/20230901/SA17168/AGVSystem Ver2.0/A17168/Frm_A17168.cs
+28
View File
@@ -31,6 +31,14 @@ namespace AGVSystem
public static ClsDBConn_sql db_station = new ClsDBConn_sql();
public static ClsDBConn_sql db_Agv_Info = new ClsDBConn_sql();
public static BusinessManage businessCtrl;
/// <summary>
/// 第三方交管自动归还秒数
/// </summary>
public static int TraffAutoTimet = 0;
/// <summary>
/// 第三方交管路口占用列表
/// </summary>
public static List<TrafficModel> autoLeavedDic = new List<TrafficModel>();
public static Dictionary<int, int> leavedDic = new Dictionary<int, int>();
/// <summary>
/// Array_Station_Info [17,12]
@@ -111,6 +119,22 @@ namespace AGVSystem
mainfrm.Map2 = panel2;
mainfrm.Map3 = panel1;
businessCtrl = new BusinessManage();
//初始化第三方交管路口占用列表
if (businessCtrl != null && businessCtrl.apiModel != null)
{
TraffAutoTimet = businessCtrl.apiModel.AutoTime;
if (!string.IsNullOrEmpty(businessCtrl.apiModel.waitRfidList))
{
autoLeavedDic = new List<TrafficModel>();
foreach (string areaCode in businessCtrl.apiModel.waitRfidList.Split(','))
{
autoLeavedDic.Add(new TrafficModel
{
areaCode = areaCode
});
}
}
}
this.ControlBox = false;
this.Width = mainfrm.newmainfrm.ClientSize.Width - 5;
this.Height = mainfrm.newmainfrm.ClientSize.Height - 29 - 74 - 22 - 5;
@@ -304,6 +328,10 @@ namespace AGVSystem
Thread dbThread = new Thread(UPDateDBList.UpDateDb);
dbThread.IsBackground = true;
dbThread.Start();
//第三方交管自动归还监听线程
Thread trafficThread = new Thread(TrafficCtrl.Listen);
trafficThread.IsBackground = true;
trafficThread.Start();
//初始化小车控制线程
Cls.Param.th_GetData = new Thread[Cls.Param.AGV_Qty];
CODE/20230901/SA17168/AGVSystem Ver2.0/A17168/TrafficCtrl.cs
+65
View File
@@ -0,0 +1,65 @@
using System;
using System.Threading;
namespace AGVSystem.A17168
{
/// <summary>
/// 第三方交管自动归还路权监听
/// </summary>
public class TrafficCtrl
{
/// <summary>
/// 获取AGV当前地标
/// </summary>
private static int Agv_Land(int agvid)
{
for (byte b = 0; b < Func.AgvInfo.Length; b++)
{
if (Func.AgvInfo[b].Agv_ID == agvid)
{
return Func.AgvInfo[b].Location_Display;
}
}
return 0;
}
/// <summary>
/// 监听线程：占用超过AutoTime秒的路口自动归还路权
/// </summary>
public static void Listen()
{
while (true)
{
try
{
if (Frm_A17168.businessCtrl?.apiModel == null)
continue;
int autoTime = Frm_A17168.businessCtrl.apiModel.AutoTime;
if (autoTime == 0 || string.IsNullOrEmpty(Frm_A17168.businessCtrl.apiModel.waitRfidList) || Frm_A17168.autoLeavedDic == null || Frm_A17168.autoLeavedDic.Count <= 0)
continue;
foreach (TrafficModel item in Frm_A17168.autoLeavedDic)
{
if (item.agvId == 0)
continue;
if ((DateTime.Now - item.InArea).TotalSeconds > autoTime)
{
bool flag = Frm_A17168.businessCtrl.ByLeaved(item.agvId.ToString(), Agv_Land(item.agvId).ToString(), item.areaCode.ToString());
WriteTxt.SaveLog1(item.areaCode.ToString() + "自动释放，返回的值" + flag, "放行日志" + item.agvId, "插件日志");
if (flag)
{
Frm_A17168.leavedDic[item.agvId] = 0;
item.agvId = 0;
WriteTxt.SaveLog1(item.areaCode.ToString() + "路口已自动归还", "放行日志" + item.agvId, "插件日志");
}
}
}
}
catch (Exception ex)
{
WriteTxt.SaveLog1("第三方交管监听线程异常！" + ex.ToString(), "异常日志", "插件日志");
}
Thread.Sleep(1000);
}
}
}
}
CODE/20230901/SA17168/AGVSystem Ver2.0/A17168/TrafficModel.cs
+23
View File
@@ -0,0 +1,23 @@
using System;
namespace AGVSystem.A17168
{
/// <summary>
/// 第三方交管路口占用模型
/// </summary>
public class TrafficModel
{
/// <summary>
/// 路口（交汇区）地标编号
/// </summary>
public string areaCode { get; set; }
/// <summary>
/// 当前占用该路口的AGV编号，0=空闲
/// </summary>
public int agvId { get; set; }
/// <summary>
/// 进入路口时间
/// </summary>
public DateTime InArea { get; set; }
}
}
CODE/20230901/SA17168/AGVSystem Ver2.0/AGVSystem.csproj
+2
View File
@@ -184,6 +184,8 @@
<Compile Include="A17168\Frm_A17168.Designer.cs">
<DependentUpon>Frm_A17168.cs</DependentUpon>
</Compile>
<Compile Include="A17168\TrafficCtrl.cs" />
<Compile Include="A17168\TrafficModel.cs" />
<Compile Include="A17168\UPDateDBList.cs" />
<Compile Include="AboutBox1.cs">
<SubType>Form</SubType>
CODE/20230901/SA17168/AGVSystem Ver2.0/Cls/Func.cs
+82
View File
@@ -67,6 +67,9 @@ namespace AGVSystem
lab.Tag = Assembly_ID + "-" + id;
lab.DoubleClick += new System.EventHandler(Cls.Path_Reset.label12_DoubleClick);
lab.MouseClick += new MouseEventHandler(label_MouseClick);
lab.MouseUp += new MouseEventHandler(label_UpClick);
lab.MouseDown += new MouseEventHandler(label_DownClick);
lab.MouseMove += new MouseEventHandler(label_MoveClick);
}
else if (Cls.Param.Display_CrossID == false)
{
@@ -117,6 +120,85 @@ namespace AGVSystem
}
}
private static bool moveFlag = false;
private static int xPos;
private static int yPos;
/// <summary>
/// 松开鼠标：按住Ctrl且已登录管理员时，确认后更新地标坐标
/// </summary>
private static void label_UpClick(object sender, MouseEventArgs e)
{
moveFlag = false;
try
{
if ((Control.ModifierKeys & Keys.Control) != Keys.Control)
{
return;
}
if (Cls.Param.UserName_temp == "")
{
MessageBox.Show("请登录管理员权限！", "AGV调度管理系统", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
return;
}
Label label = (Label)sender;
int num = Convert.ToInt16(label.Text);
if (MessageBox.Show($"是否移动该{num}地标？", "消息", MessageBoxButtons.YesNo, MessageBoxIcon.Asterisk) != DialogResult.No && label.Parent.GetType() == typeof(Panel))
{
Panel panel = label.Parent as Panel;
int y = panel.Top + Cls.Param.Icon_Size / 2;
int left = panel.Left;
Console.WriteLine(num + "up === X:" + left + "Y:" + y);
UpLocation(num, left, y);
}
}
catch (Exception)
{
}
}
private static void label_DownClick(object sender, MouseEventArgs e)
{
moveFlag = true;
xPos = e.X;
yPos = e.Y;
}
/// <summary>
/// 拖动地标所在Panel
/// </summary>
private static void label_MoveClick(object sender, MouseEventArgs e)
{
if (moveFlag)
{
Label label = (Label)sender;
int num = Convert.ToInt16(label.Text);
if (label.Parent.GetType() == typeof(Panel))
{
Panel panel = label.Parent as Panel;
panel.Top += e.Y - yPos;
panel.Left += e.X - xPos;
}
}
}
/// <summary>
/// 更新地标坐标到数据库
/// </summary>
private static void UpLocation(int rfid, int x, int y)
{
try
{
string text = db_conn.Command($"UPDATE [LandMarkInfo] SET [Loc_X] = {x},[Loc_Y] = {y} WHERE [Loc_ID] = {rfid}");
if (text == "1")
{
Console.WriteLine($"{rfid} 更新成功！x:{x},y:{y} ");
}
}
catch (Exception)
{
}
}
private static object obj_dgvupdate = new object();
public static void DgvUpdate(DataGridView dgv, int row, string columnname, bool value)
CODE/20230901/SA17168/AGVSystem Ver2.0/Cls/Path_Reset.cs
+34
View File
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using AGVSystem.A17168;
namespace AGVSystem.Cls
{
@@ -16,6 +17,7 @@ namespace AGVSystem.Cls
int[] num = new int[2];
num[0] = Convert.ToInt16(((System.Windows.Forms.Label)sender).Tag.ToString().Split('-')[0]);
num[1] = Convert.ToInt16(((System.Windows.Forms.Label)sender).Tag.ToString().Split('-')[1]);
ClearOtherLand(num[1]);
for (int i = 0; i < mainfrm.ds_CrossInfo.Tables[0].Rows.Count; i++)
{
string s = mainfrm.ds_CrossInfo.Tables[0].Rows[i]["当前地标编号"].ToString();
@@ -29,5 +31,37 @@ namespace AGVSystem.Cls
}
}
}
/// <summary>
/// 复位路口时向第三方交管手动归还路权
/// </summary>
private static void ClearOtherLand(int land)
{
try
{
foreach (TrafficModel item in Frm_A17168.autoLeavedDic)
{
if (item.agvId == 0)
{
continue;
}
if (item.areaCode != land.ToString())
{
continue;
}
bool flag = Frm_A17168.businessCtrl.ByLeaved(item.agvId.ToString(), land.ToString(), item.areaCode.ToString());
WriteTxt.SaveLog1(item.areaCode.ToString() + "手动释放，返回的值" + flag, "放行日志" + item.agvId, "插件日志");
if (flag)
{
Frm_A17168.leavedDic[item.agvId] = 0;
item.agvId = 0;
WriteTxt.SaveLog1(item.areaCode.ToString() + "路口已手动归还", "放行日志" + item.agvId, "插件日志");
}
}
}
catch (Exception)
{
}
}
}
}
CODE/20230901/SA17168/AGVSystem Ver2.0/Properties/Resources.Designer.cs
Generated
+1 -1
View File
@@ -19,7 +19,7 @@ namespace AGVSystem.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
CODE/20230901/SA17168/AGVSystem Ver2.0/Properties/Settings.Designer.cs
Generated
+1 -1
View File
@@ -12,7 +12,7 @@ namespace AGVSystem.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
CODE/20230901/SA17168/AGVSystem Ver2.0/bin/Debug/BllSql.dll
BIN
View File
Binary file not shown.
CODE/20230901/SA17168/AGVSystem Ver2.0/bin/Debug/HxBusiness.dll
BIN
View File
Binary file not shown.
CODE/20230901/SA17168/AGVSystem Ver2.0/bin/Debug/华晓AGV管理系统.exe
BIN
View File
Binary file not shown.
CODE/20230901/SA17168/AGVSystem Ver2.0/obj/x86/Debug/AGVSystem.csproj.FileListAbsolute.txt
+42
View File
@@ -632,3 +632,45 @@ D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\AGVSystem Ver2.0
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.mainfrm.resources
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.csproj.CoreCompileInputs.cache
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.csproj.Up2Date
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\华晓AGV管理系统.exe.config
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\华晓AGV管理系统.exe
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\华晓AGV管理系统.pdb
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\BllSql.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\HxBusiness.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\Nancy.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\Newtonsoft.Json.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\BllSql.pdb
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\HxBusiness.pdb
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\Nancy.xml
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\bin\Debug\Newtonsoft.Json.xml
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.csproj.AssemblyReference.cache
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.Frm_A17168.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.AboutBox1.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.AGVManage.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.Agv_Status.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.APInfo.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.APTest.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.Control_Point.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.DatabaseSet.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.frmfind.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.frm_card.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.Frm_Path_Status.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.InputSet.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.Linemanage.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.Location_Set.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.logon.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.mainfrm.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.OutputSet.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.Point_loc_Set.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.Properties.Resources.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.SetControl.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.SysSet.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.warnlist.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.frmwarnfind.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.frmchangefind.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.frmnetfind.resources
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.csproj.GenerateResource.cache
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.csproj.CoreCompileInputs.cache
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\AGVSystem.csproj.Up2Date
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\华晓AGV管理系统.exe
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\AGVSystem Ver2.0\obj\x86\Debug\华晓AGV管理系统.pdb
CODE/20230901/SA17168/AGVSystem Ver2.0/obj/x86/Debug/华晓AGV管理系统.exe
BIN
View File
Binary file not shown.
CODE/20230901/SA17168/BllSql/bin/Debug/BllSql.dll
BIN
View File
Binary file not shown.
CODE/20230901/SA17168/BllSql/obj/Debug/BllSql.csproj.FileListAbsolute.txt
+6
View File
@@ -89,3 +89,9 @@ D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\BllSql\obj\Debug
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\BllSql\obj\Debug\BllSql.csproj.CoreCompileInputs.cache
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\BllSql\obj\Debug\BllSql.dll
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\BllSql\obj\Debug\BllSql.pdb
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\BllSql\bin\Debug\BllSql.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\BllSql\bin\Debug\BllSql.pdb
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\BllSql\obj\Debug\BllSql.csproj.AssemblyReference.cache
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\BllSql\obj\Debug\BllSql.csproj.CoreCompileInputs.cache
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\BllSql\obj\Debug\BllSql.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\BllSql\obj\Debug\BllSql.pdb
CODE/20230901/SA17168/BllSql/obj/Debug/BllSql.dll
BIN
View File
Binary file not shown.
CODE/20230901/SA17168/HxBusiness/BusinessManage.cs
+1 -1
View File
@@ -155,7 +155,7 @@ namespace HxBusiness
WriteTxt.SaveLog1("离开时请求时配置为空！", "异常日志");
return false;
}
if (string.IsNullOrEmpty(agvid) || string.IsNullOrEmpty(rfid))
if (string.IsNullOrEmpty(agvid))
{
WriteTxt.SaveLog1("离开时请求时请求参数为空！", "异常日志");
return false;
CODE/20230901/SA17168/HxBusiness/Model/ApiModel.cs
+4
View File
@@ -31,5 +31,9 @@ namespace HxBusiness
/// 离开归还地标列表
/// </summary>
public string leavedRfidList { get; set; }
/// <summary>
/// 自动归还路权秒数，0=手动归还
/// </summary>
public int AutoTime { get; set; }
}
}
CODE/20230901/SA17168/HxBusiness/bin/Debug/HxBusiness.dll
BIN
View File
Binary file not shown.
CODE/20230901/SA17168/HxBusiness/obj/Debug/HxBusiness.csproj.FileListAbsolute.txt
+13
View File
@@ -128,3 +128,16 @@ D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\HxBusiness\obj\D
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\HxBusiness\obj\Debug\HxBusiness.csproj.Up2Date
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\HxBusiness\obj\Debug\HxBusiness.dll
D:\Item\项目资料\05FG2608061\hx备份\CODE\20230901\SA17168\HxBusiness\obj\Debug\HxBusiness.pdb
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\bin\Debug\HxBusiness.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\bin\Debug\HxBusiness.pdb
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\bin\Debug\Nancy.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\bin\Debug\Nancy.Hosting.Self.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\bin\Debug\Newtonsoft.Json.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\bin\Debug\Nancy.xml
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\bin\Debug\Nancy.Hosting.Self.xml
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\bin\Debug\Newtonsoft.Json.xml
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\obj\Debug\HxBusiness.csproj.AssemblyReference.cache
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\obj\Debug\HxBusiness.csproj.CoreCompileInputs.cache
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\obj\Debug\HxBusiness.csproj.Up2Date
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\obj\Debug\HxBusiness.dll
D:\Item\项目资料\05FG2608061\FG2608061\CODE\20230901\SA17168\HxBusiness\obj\Debug\HxBusiness.pdb
CODE/20230901/SA17168/HxBusiness/obj/Debug/HxBusiness.csproj.Up2Date
View File
CODE/20230901/SA17168/HxBusiness/obj/Debug/HxBusiness.dll
BIN
View File
Binary file not shown.