Skip to content

张东亮 / SO1131-AGVDispatch

转到一个项目
切换导航栏
切换导航栏固定状态
Commit eee03fc8 由 张东亮
选项

取消密码

1 个父辈 07aa8107
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 12 行增加 和 36 行删除
Source/AGVDispatch/bin/Debug/logs/AGVServer/AGVServer.log
[2023-01-06 11:39:00,996][1]INFO AGVServer 【12000】服务启动 [2023-01-07 20:43:23,259][1]INFO AGVServer 【12000】服务启动
[2023-01-06 11:39:01,000][1]INFO Server start listen : 12000 [2023-01-07 20:43:23,260][1]INFO Server start listen : 12000
[2023-01-06 11:39:01,009][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1] [2023-01-07 20:43:23,269][1]INFO 本机IP:[ 192.168.0.106 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
[2023-01-06 11:39:41,082][1]INFO AGVServer 【12000】服务启动
[2023-01-06 11:39:41,085][1]INFO Server start listen : 12000
[2023-01-06 11:39:41,092][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
[2023-01-06 11:43:31,836][1]INFO AGVServer 【12000】服务启动
[2023-01-06 11:43:31,839][1]INFO Server start listen : 12000
[2023-01-06 11:43:31,846][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
[2023-01-06 11:47:21,760][1]INFO AGVServer 【12000】服务启动
[2023-01-06 11:47:21,763][1]INFO Server start listen : 12000
[2023-01-06 11:47:21,770][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
[2023-01-06 11:49:27,332][1]INFO AGVServer 【12000】服务启动
[2023-01-06 11:49:27,335][1]INFO Server start listen : 12000
[2023-01-06 11:49:27,342][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
[2023-01-06 11:52:08,876][1]INFO AGVServer 【12000】服务启动
[2023-01-06 11:52:08,879][1]INFO Server start listen : 12000
[2023-01-06 11:52:08,887][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
[2023-01-06 11:54:42,837][1]INFO AGVServer 【12000】服务启动
[2023-01-06 11:54:42,840][1]INFO Server start listen : 12000
[2023-01-06 11:54:42,847][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
[2023-01-06 11:58:47,244][1]INFO AGVServer 【12000】服务启动
[2023-01-06 11:58:47,248][1]INFO Server start listen : 12000
[2023-01-06 11:58:47,257][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
[2023-01-06 12:43:22,867][1]INFO AGVServer 【12000】服务启动
[2023-01-06 12:43:22,870][1]INFO Server start listen : 12000
[2023-01-06 12:43:22,877][1]INFO 本机IP:[ 192.168.101.37 192.168.64.1 192.168.153.1 172.30.48.1 172.25.240.1]
Source/AGVDispatch/bin/ProCopyClient.exe.config
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup> </startup>
<appSettings> <appSettings>
<add key="ProName" value="AGVDispatch-手动清除料箱问题" /> <add key="ProName" value="AGVDispatch-agv临时点改为充电桩-手动加密码" />
</appSettings> </appSettings>
</configuration> </configuration>
\ No newline at end of file \ No newline at end of file
Source/UIControls/UCs/robot/UCRobotStatus.cs
...@@ -587,14 +587,14 @@ namespace UControl.UC ...@@ -587,14 +587,14 @@ namespace UControl.UC
private void robotSetting_DropDownOpening(object sender, EventArgs e) private void robotSetting_DropDownOpening(object sender, EventArgs e)
{ {
FrmPwd fw = new FrmPwd(10); //FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog(); //DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK)) //if (!result.Equals(DialogResult.OK))
{ //{
LogUtil.Warn($"打开机器人{robot.name}设置时，没有正确输入密码"); // LogUtil.Warn($"打开机器人{robot.name}设置时，没有正确输入密码");
canSettting(false); // canSettting(false);
return; // return;
} //}
canSettting(true); canSettting(true);
} }
void canSettting(bool can) void canSettting(bool can)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!