Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
thick-casting
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
thick-casting
Commits
7d96b486
Commit
7d96b486
authored
May 07, 2022
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
暂时 有一半数据都是无效的 这个条件 注解
parent
944e758a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
13 deletions
+34
-13
AssemblyInfo.cs
....FilmCasting.AutoDie.UI.Server/Properties/AssemblyInfo.cs
+2
-2
FeedbackHeat.cs
...ng.AutoDie/FLY.FilmCasting.AutoDie/Server/FeedbackHeat.cs
+2
-2
AssemblyInfo.cs
...LY.Thick.FilmCasting.UI.Client/Properties/AssemblyInfo.cs
+2
-2
AssemblyInfo.cs
...LY.Thick.FilmCasting.UI.Server/Properties/AssemblyInfo.cs
+2
-2
3.get_exe.sh
脚本/3.get_exe.sh
+1
-1
filmCastingInstallZipVersionInfo.json
脚本/filmCastingInstallZipVersionInfo.json
+3
-2
版本描述.md
脚本/版本描述.md
+22
-2
No files found.
Project.FLY.FilmCasting.AutoDie/FLY.FilmCasting.AutoDie.UI.Server/Properties/AssemblyInfo.cs
View file @
7d96b486
...
...
@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.
2
.0")]
[assembly: AssemblyFileVersion("7.0.
2
.0")]
[assembly: AssemblyVersion("7.0.
4
.0")]
[assembly: AssemblyFileVersion("7.0.
4
.0")]
[assembly: Guid("CC6F2BB4-E648-47BE-8223-B6157E35403D")]
Project.FLY.FilmCasting.AutoDie/FLY.FilmCasting.AutoDie/Server/FeedbackHeat.cs
View file @
7d96b486
...
...
@@ -689,8 +689,8 @@ namespace FLY.FilmCasting.AutoDie.Server
//工作的螺丝数
int
workBolts
=
lc_ScanData
.
BoltMapInfo
.
BoltCnt
-
(
lc_ScanData
.
BoltMapInfo
.
LeftEmptyBolts
+
lc_ScanData
.
BoltMapInfo
.
RightEmptyBolts
);
if
(
invalid_cnt
>
workBolts
/
2
)
//有一半数据都是无效的
return
;
//
if (invalid_cnt > workBolts / 2)//有一半数据都是无效的
//
return;
if
(
lc_ScanData
.
FilmVelocity
<
INVALID_VELOCITY
)
{
...
...
Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI.Client/Properties/AssemblyInfo.cs
View file @
7d96b486
...
...
@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.5.
5
.0")]
[assembly: AssemblyFileVersion("7.5.
5
.0")]
[assembly: AssemblyVersion("7.5.
6
.0")]
[assembly: AssemblyFileVersion("7.5.
6
.0")]
[assembly: Guid("BD20A921-953E-44CA-8FAB-4619D3CBCD06")]
Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI.Server/Properties/AssemblyInfo.cs
View file @
7d96b486
...
...
@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.3.
5
")]
[assembly: AssemblyFileVersion("7.3.
5
")]
[assembly: AssemblyVersion("7.3.
6
")]
[assembly: AssemblyFileVersion("7.3.
6
")]
[assembly: Guid("E7D930E0-C871-4001-A31A-DC748ED5817C")]
脚本/3.get_exe.sh
View file @
7d96b486
...
...
@@ -133,7 +133,7 @@ fi
# 进入安装包内 用7z压缩
cd
${
install_dir_root
}
"C:
\P
rogram Files
(x86)
\7
-Zip
\7
z.exe"
a ../
${
fileName7z
}
./
*
"C:
\P
rogram Files
\7
-Zip
\7
z.exe"
a ../
${
fileName7z
}
./
*
cd
..
...
...
脚本/filmCastingInstallZipVersionInfo.json
View file @
7d96b486
{
"InstallZipVersion"
:
"7.5.
5
"
,
"InstallZipUrl"
:
"http://server.flyautomation.net:8889/download/流延测厚仪安装包_v7.5.
5_20220308
.7z"
"InstallZipVersion"
:
"7.5.
6
"
,
"InstallZipUrl"
:
"http://server.flyautomation.net:8889/download/流延测厚仪安装包_v7.5.
6_20220411
.7z"
}
\ No newline at end of file
脚本/版本描述.md
View file @
7d96b486
# 流延测厚仪安装包_v7.5.6_20220411
## 流延测厚仪服务器 v7.3.6
## 流延测厚仪客户端 v7.5.6
## 自动模头服务器 v7.0.3
## 称重服务器 v7.0.0
## 数据浏览器 v7.0.0
## LP3 v3.0.0
## 软件管理器 v0.9.1
<br/>
<br/>
<br/>
# 流延测厚仪安装包_v7.5.5_20220308
## 流延测厚仪服务器 v7.3.5
## 流延测厚仪客户端 v7.5.5
1.
添加 支持称重, 支持自动模头
2.
修复 即时图 Y轴 公差没有与产品不一致
...
...
@@ -7,8 +29,6 @@
## 自动模头服务器 v7.0.0
## 称重服务器 v7.0.0
## 流延测厚仪服务器 v7.3.5
## 数据浏览器 v7.0.0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment