Skip to content

刘韬 / SO827-AutoScanAndLabel

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e0d733ae 由 刘韬
选项

1

1 个父辈 a718ffd1
内嵌 并排
正在显示 6 个修改的文件 包含 32 行增加 和 29 行删除
AutoScanAndLabel/Form1.cs
......@@ -167,7 +167,7 @@ namespace AutoScanAndLabel
void addTablePage() {
AddForm(crc.GetString("Res0008","IO调试"), ioc);
AddForm(crc.GetString("Res0009","伺服调试"), ac);
AddForm("Agv调试", agv);
AddForm(crc.GetString("Res0070","Agv调试"), agv);
AddForm(crc.GetString("Res0010","相关设置"), sc);
crc.LanguageProcess(this);
}
......
AutoScanAndLabel/UC/AgvControl.cs
using DeviceLibrary;
using OnlineStore;
using DeviceLibrary;
using DL.StandardRobot;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
......@@ -23,7 +24,7 @@ namespace AutoScanAndLabel.UC
serverIp = ConfigHelper.Config.Get(Setting_Init.STD_IP, "127.0.0.1");
AGVManager.Connect(serverIp);
load();
groupBox2.Text = "AGV状态"+"["+ serverIp + "]";
groupBox2.Text = crc.GetString("Res0029","AGV状态")+"["+ serverIp + "]";
AGVManager.Register(MissionStateChanged);
endit(false);
}
......@@ -49,10 +50,10 @@ namespace AutoScanAndLabel.UC
{
try
{
lblCurMissionId.Text = "当前任务编号："+state.MissionId;
lblCurRunMissionId.Text = "运行任务编号："+state.RunMissionId;
lblMissionRunstate.Text = "任务运行状态："+state.MissionRunState;
lblMissionResult.Text = "任务运行结果："+state.MissionResult;
lblCurMissionId.Text = crc.GetString("Res0030","当前任务编号：")+state.MissionId;
lblCurRunMissionId.Text = crc.GetString("Res0031","运行任务编号：")+state.RunMissionId;
lblMissionRunstate.Text = crc.GetString("Res0032","任务运行状态：")+state.MissionRunState;
lblMissionResult.Text = crc.GetString("Res0033","任务运行结果：")+state.MissionResult;
}
catch
{
......@@ -65,12 +66,12 @@ namespace AutoScanAndLabel.UC
{
if (!RobotManage.isRunning)
{
MessageBox.Show("机器尚未启动不能呼叫Agv");
MessageBox.Show(crc.GetString("Res0034","机器尚未启动不能呼叫Agv"));
return;
}
if (InCalling)
{
MessageBox.Show("已呼叫Agv，不能重复呼叫");
MessageBox.Show(crc.GetString("Res0035","已呼叫Agv，不能重复呼叫"));
return;
}
if (RobotManage.mainMachine.IOValue(IO_Type.RightEnd_Check).Equals(IO_VALUE.LOW))
......@@ -101,19 +102,19 @@ namespace AutoScanAndLabel.UC
});
}
else
MessageBox.Show("当前有料串不能请求进入料串");
MessageBox.Show(crc.GetString("Res0036","当前有料串不能请求进入料串"));
}
private void button_rightleavefull_Click(object sender, EventArgs e)
{
if (!RobotManage.isRunning)
{
MessageBox.Show("机器尚未启动不能呼叫Agv");
MessageBox.Show(crc.GetString("Res0034","机器尚未启动不能呼叫Agv"));
return;
}
if (InCalling)
{
MessageBox.Show("已呼叫Agv，不能重复呼叫");
MessageBox.Show(crc.GetString("Res0035","已呼叫Agv，不能重复呼叫"));
return;
}
if (RobotManage.mainMachine.IOValue(IO_Type.RightEnd_Check).Equals(IO_VALUE.HIGH))
......@@ -145,7 +146,7 @@ namespace AutoScanAndLabel.UC
});
}
else
MessageBox.Show("当前没有料串不能请求取料串");
MessageBox.Show(crc.GetString("Res0037","当前没有料串不能请求取料串"));
}
private void RequestLeft()
{
......@@ -184,12 +185,12 @@ namespace AutoScanAndLabel.UC
{
if (!RobotManage.isRunning)
{
MessageBox.Show("机器尚未启动不能呼叫Agv");
MessageBox.Show(crc.GetString("Res0034","机器尚未启动不能呼叫Agv"));
return;
}
if (InCalling)
{
MessageBox.Show("已呼叫Agv，不能重复呼叫");
MessageBox.Show(crc.GetString("Res0035","已呼叫Agv，不能重复呼叫"));
return;
}
if (RobotManage.mainMachine.IOValue(IO_Type.LeftEnd_Check).Equals(IO_VALUE.HIGH))
......@@ -221,19 +222,19 @@ namespace AutoScanAndLabel.UC
});
}
else
MessageBox.Show("当前没有料串不能请求取料串");
MessageBox.Show(crc.GetString("Res0037","当前没有料串不能请求取料串"));
}
private void button_leftneedempty_Click(object sender, EventArgs e)
{
if (!RobotManage.isRunning)
{
MessageBox.Show("机器尚未启动不能呼叫Agv");
MessageBox.Show(crc.GetString("Res0034","机器尚未启动不能呼叫Agv"));
return;
}
if (InCalling)
{
MessageBox.Show("已呼叫Agv，不能重复呼叫");
MessageBox.Show(crc.GetString("Res0035","已呼叫Agv，不能重复呼叫"));
return;
}
if (RobotManage.mainMachine.IOValue(IO_Type.LeftEnd_Check).Equals(IO_VALUE.LOW))
......@@ -264,7 +265,7 @@ namespace AutoScanAndLabel.UC
});
}
else
MessageBox.Show("当前有料串不能请求进入料串");
MessageBox.Show(crc.GetString("Res0036","当前有料串不能请求进入料串"));
}
private void checkBox1_CheckedChanged(object sender, EventArgs e)
......@@ -286,4 +287,4 @@ namespace AutoScanAndLabel.UC
InCalling = false;
}
}
}
}
\ No newline at end of file
Common/util/TcpServer.cs
......@@ -34,7 +34,7 @@ namespace OnlineStore.Common
private void logLocalIp()
{
string[] addresses = GetLocalAddresses();
string iplist = $"本机IP:";
string iplist = $"本机IP"+":";
if (addresses.Length > 0)
{
for (int i = 0; i < addresses.Length; i++)
......
Common/util/UdpServer.cs
......@@ -27,7 +27,7 @@ namespace OnlineStore.Common
private void logLocalIp()
{
string[] addresses = GetLocalAddresses();
string iplist = $"本机IP:[";
string iplist = $"本机IP"+":[";
if (addresses.Length > 0)
{
for (int i = 0; i < addresses.Length; i++)
......
DL.StandardRobots/TCP/TcpServer.cs
using DL.Utils;
using OnlineStore;
using DL.Utils;
using log4net;
using System;
using System.Collections.Generic;
......@@ -37,7 +38,7 @@ namespace DL.Com.TCP
private void logLocalIp()
{
string[] addresses = GetLocalAddresses();
string iplist = "本机IP:[";
string iplist = crc.GetString("Res0041","本机IP")+":[";
if (addresses.Length > 0)
{
for (int i = 0; i < addresses.Length; i++)
......@@ -279,7 +280,7 @@ namespace DL.Com.TCP
expr_36[arg_53_1] = ((expr_47 != null) ? expr_47.ToString() : null);
expr_36[2] = "】port【";
expr_36[3] = iPEndPoint.Port.ToString();
expr_36[4] = "】已使用";
expr_36[4] = "】"+crc.GetString("Res0044","已使用");
LogUtil.Error(string.Concat(expr_36));
result = true;
break;
......@@ -324,4 +325,4 @@ namespace DL.Com.TCP
set { this.m_clientSocket = value; }
}
}
}
}
\ No newline at end of file
DL.StandardRobots/UdpServer.cs

using OnlineStore;
using DL.Utils;
using log4net;
using System;
......@@ -30,7 +31,7 @@ namespace DL.Com
private void logLocalIp()
{
string[] addresses = GetLocalAddresses();
string iplist = "本机IP:[";
string iplist = crc.GetString("Res0038","本机IP:[");
if (addresses.Length > 0)
{
for (int i = 0; i < addresses.Length; i++)
......@@ -180,4 +181,4 @@ namespace DL.Com
return $"{string.Join(",",GetLocalAddresses())}:{serverPort}";
}
}
}
}
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!