Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
顾剑亮
/
AGVControl-Qisda-ProductionLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit ba44aa47
由
张东亮
编写于
2020-07-02 18:35:14 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
日志书写格式修改
1 个父辈
dfd0a30a
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
14 行增加
和
9 行删除
.vs/AGVControl-ProductionLine/v16/.suo
.vs/AGVControl-ProductionLine/v16/Server/sqlite3/storage.ide-wal
.vs/slnx.sqlite
AGVControl-ProductionLine/BLL/AgvServer.cs
AGVControl-ProductionLine/BLL/Common.cs
AGVControl-ProductionLine/bin/Debug/AGVControl-ProductionLine.exe
AGVControl-ProductionLine/bin/Debug/AGVControl-ProductionLine.pdb
AGVControl-ProductionLine/bin/Debug/logs/AgvServer.log
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csprojAssemblyReference.cache
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.exe
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.pdb
AgvClient/obj/Debug/AgvClient.csproj.FileListAbsolute.txt
AgvClient/obj/Debug/AgvClient.csprojAssemblyReference.cache
AgvClientTest/obj/Debug/AgvClientTest.csprojAssemblyReference.cache
.vs/AGVControl-ProductionLine/v16/.suo
查看文件 @
ba44aa4
此文件类型无法预览
.vs/AGVControl-ProductionLine/v16/Server/sqlite3/storage.ide-wal
查看文件 @
ba44aa4
此文件类型无法预览
.vs/slnx.sqlite
查看文件 @
ba44aa4
此文件类型无法预览
AGVControl-ProductionLine/BLL/AgvServer.cs
查看文件 @
ba44aa4
...
@@ -365,7 +365,7 @@ namespace BLL
...
@@ -365,7 +365,7 @@ namespace BLL
NodeOnline
(
idx
);
NodeOnline
(
idx
);
}
}
client
.
nodeName
.
Clear
();
client
.
nodeName
.
Clear
();
_client
.
Remove
(
client
);
//
_client.Remove(client);
}
}
/// <summary>
/// <summary>
...
...
AGVControl-ProductionLine/BLL/Common.cs
查看文件 @
ba44aa4
...
@@ -33,7 +33,7 @@ namespace AGVControl
...
@@ -33,7 +33,7 @@ namespace AGVControl
public
static
Dictionary
<
string
,
string
>
agvProductionLine
;
public
static
Dictionary
<
string
,
string
>
agvProductionLine
;
public
static
System
.
Configuration
.
Configuration
appConfig
;
public
static
System
.
Configuration
.
Configuration
appConfig
;
public
static
readonly
string
CONFIG_PATH
=
AppDomain
.
CurrentDomain
.
BaseDirectory
+
"Config\\"
;
public
static
readonly
string
CONFIG_PATH
=
AppDomain
.
CurrentDomain
.
BaseDirectory
+
"Config\\"
;
private
static
string
msg
=
""
;
private
static
string
msg
=
""
;
private
static
int
logCnt
=
0
;
private
static
int
logCnt
=
0
;
public
static
void
LogInfo
(
string
text
,
bool
isShow
=
true
)
public
static
void
LogInfo
(
string
text
,
bool
isShow
=
true
)
{
{
...
@@ -47,15 +47,17 @@ namespace AGVControl
...
@@ -47,15 +47,17 @@ namespace AGVControl
return
;
return
;
logCnt
++;
logCnt
++;
if
(
logCnt
>
100
)
if
(
logCnt
>
100
)
{
{
logCnt
=
0
;
logCnt
=
0
;
msg
=
""
;
msg
=
""
;
}
}
log
.
Info
(
msg
);
log
.
Info
(
text
);
if
(
isShow
)
if
(
isShow
)
msg
+=
string
.
Format
(
"[{0}] {1}\r\n"
,
DateTime
.
Now
.
ToString
(
"HH:mm:ss"
),
text
);
{
logTextBox
.
Text
=
msg
;
msg
+=
string
.
Format
(
"[{0}] {1}\r\n"
,
DateTime
.
Now
.
ToString
(
"HH:mm:ss"
),
text
);
logTextBox
.
Text
=
msg
;
}
}
}
public
static
void
ReadLinePlace
()
public
static
void
ReadLinePlace
()
{
{
...
...
AGVControl-ProductionLine/bin/Debug/AGVControl-ProductionLine.exe
查看文件 @
ba44aa4
此文件类型无法预览
AGVControl-ProductionLine/bin/Debug/AGVControl-ProductionLine.pdb
查看文件 @
ba44aa4
此文件类型无法预览
AGVControl-ProductionLine/bin/Debug/logs/AgvServer.log
查看文件 @
ba44aa4
...
@@ -22826,3 +22826,8 @@ System.ServiceModel.AddressAccessDeniedException: HTTP 无法注册 URL http://+
...
@@ -22826,3 +22826,8 @@ System.ServiceModel.AddressAccessDeniedException: HTTP 无法注册 URL http://+
[17:22:29] E4 Ping 10.85.199.92 请求没有响应
[17:22:29] E4 Ping 10.85.199.92 请求没有响应
[17:22:30] E5 Ping 10.85.199.93 请求没有响应
[17:22:30] E5 Ping 10.85.199.93 请求没有响应
[2020-07-02 17:32:28,665][1]INFO
[2020-07-02 17:32:33,928][1]DEBUG HttpGet URL: http://10.85.199.71/api/v2.0.0/registers/20?whitelist=value Return:
[2020-07-02 17:32:33,928][1]ERROR CheckAGVMissionState 获取PLC20失败
[2020-07-02 17:32:38,997][1]DEBUG HttpGet URL: http://10.85.199.72/api/v2.0.0/registers/20?whitelist=value Return:
[2020-07-02 17:32:38,997][1]ERROR CheckAGVMissionState 获取PLC20失败
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt
查看文件 @
ba44aa4
...
@@ -31,5 +31,4 @@ C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug
...
@@ -31,5 +31,4 @@ C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\Newtonsoft.Json.dll
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\Newtonsoft.Json.dll
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csprojAssemblyReference.cache
deleted
100644 → 0
查看文件 @
dfd0a30
此文件类型无法预览
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.exe
查看文件 @
ba44aa4
此文件类型无法预览
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.pdb
查看文件 @
ba44aa4
此文件类型无法预览
AgvClient/obj/Debug/AgvClient.csproj.FileListAbsolute.txt
查看文件 @
ba44aa4
...
@@ -15,7 +15,6 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine
...
@@ -15,7 +15,6 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine
D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AsaPL.AgvClient.pdb
D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AsaPL.AgvClient.pdb
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\bin\Debug\AsaPL.AgvClient.dll
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\bin\Debug\AsaPL.AgvClient.dll
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\bin\Debug\AsaPL.AgvClient.pdb
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\bin\Debug\AsaPL.AgvClient.pdb
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AgvClient.csprojAssemblyReference.cache
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AgvClient.csproj.CopyComplete
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AgvClient.csproj.CopyComplete
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AsaPL.AgvClient.dll
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AsaPL.AgvClient.dll
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AsaPL.AgvClient.pdb
C:\ZDL\Gitee\AGVControl-Qisda-ProductionLine\AgvClient\obj\Debug\AsaPL.AgvClient.pdb
AgvClient/obj/Debug/AgvClient.csprojAssemblyReference.cache
deleted
100644 → 0
查看文件 @
dfd0a30
此文件类型无法预览
AgvClientTest/obj/Debug/AgvClientTest.csprojAssemblyReference.cache
查看文件 @
ba44aa4
此文件类型无法预览
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论