Skip to content

T
thick-casting
Commit 2fdd0d28 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

Merge remote-tracking branch 'remotes/origin/master' into feature-feng-cap-20240403

parents 0732cb36 6cacadce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 380 additions and 352 deletions
脚本/0.init.sh 0 → 100644
View file @ 2fdd0d28
#!/bin/bash
cp -rf init/FLY.Thick.FilmCasting.UI.Client/* ../Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI.Client/bin/Debug
cp -rf init/FLY.Thick.FilmCasting.UI.Server/* ../Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI.Server/bin/Debug
cp -rf init/FLY.Weight.UI.Server/* ../Project.FLY.Weight/FLY.Weight.UI.Server/bin/Debug
脚本/init/FLY.Thick.FilmCasting.UI.Client/layout/gmscangraph2.json
View file @ 2fdd0d28
{"Items":[{"YRangePercent":3.0,"Mix":100,"FromId":0,"IsPercent":true,"IsAutoTarget":false,"IsLineMode":true,"ID":23496262}]}
\ No newline at end of file
{
"Items": [
{
"YRangePercent": 3.0,
"Mix": 100,
"CellMix": 3,
"FromId": 0,
"IsPercent": true,
"IsAutoTarget": true,
"IsLineMode": true,
"IsSideCutHidden": false,
"ID": 20385185
}
]
}
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Client/layout/graphcustom.json
View file @ 2fdd0d28
......@@ -6,37 +6,16 @@
"MenuItems": [
49223887,
61172469,
33898355,
6724289,
35356632
33898355
],
"DynAreaItems": [
20504736,
66264409,
25657252,
39540754,
30274111,
2456031,
36182073,
27120652
2456031
],
"Items": [
{
"Graphs": [
{
"ID": 5486348,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "称重"
},
{
"Graphs": [
{
......@@ -48,7 +27,7 @@
"Rect": "0, 1, 1, 1"
},
{
"ID": 23496262,
"ID": 20385185,
"Rect": "0, 2, 1, 1"
}
],
......@@ -64,34 +43,6 @@
],
"Header": "扫描"
},
{
"Graphs": [
{
"ID": 32607229,
"Rect": "0, 0, 1, 1"
},
{
"ID": 39662560,
"Rect": "0, 1, 1, 1"
},
{
"ID": 9547065,
"Rect": "0, 2, 1, 2"
}
],
"ColumnCount": 1,
"RowCount": 4,
"RowDefinitions": [
false,
false,
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "模头"
},
{
"Graphs": [
{
......@@ -109,33 +60,11 @@
],
"Header": "趋势"
},
{
"Graphs": [
{
"ID": 21927833,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "定点"
},
{
"Graphs": [
{
"ID": 24540058,
"Rect": "0, 0, 1, 1"
},
{
"ID": 24848535,
"Rect": "0, 1, 1, 1"
}
],
"ColumnCount": 1,
......@@ -152,7 +81,7 @@
{
"Graphs": [
{
"ID": 65456887,
"ID": 21927833,
"Rect": "0, 0, 1, 1"
}
],
......@@ -165,7 +94,7 @@
"ColumnDefinitions": [
false
],
"Header": "称重流量"
"Header": "定点"
}
],
"Components": [
......@@ -184,56 +113,6 @@
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_MenuMotion",
"ServiceContainerName": "gage0.service"
},
{
"ID": 6724289,
"Module": "FLY.FilmCasting.AutoDie.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 35356632,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 20504736,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaThick",
"ServiceContainerName": "gage0.service"
},
{
"ID": 66264409,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_DynAreaProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 25657252,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaFilmWidth",
"ServiceContainerName": "gage0.service"
},
{
"ID": 30274111,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaSample",
"ServiceContainerName": "gage0.service"
},
{
"ID": 2456031,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 36182073,
"Module": "FLY.FilmCasting.AutoDie.UI.Client.UiModule.UiModule2_DynAreaAutoDie",
"ServiceContainerName": "gage0.service"
},
{
"ID": 27120652,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_DynAreaWeight",
"ServiceContainerName": "gage0.service"
},
{
"ID": 5486348,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MainGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 27138911,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_TempScanGraph",
......@@ -245,48 +124,48 @@
"ServiceContainerName": "gage0.service"
},
{
"ID": 23496262,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UIModule2_GiantMixScanGraph2",
"ID": 20385185,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_GiantMixScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 32607229,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_ScanGraph",
"ID": 42797999,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_TrendGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 39662560,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_ScanGraph",
"ID": 24540058,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_ScanMmGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 9547065,
"Module": "FLY.FilmCasting.AutoDie.UI.Client.UiModule.UiModule2_GraphAutoDie",
"ID": 21927833,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 42797999,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_TrendGraph2",
"ID": 20504736,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaThick",
"ServiceContainerName": "gage0.service"
},
{
"ID": 21927833,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ID": 66264409,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_DynAreaProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 24540058,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_ScanMmGraph",
"ID": 39540754,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_DynAreaFilmWidth",
"ServiceContainerName": "gage0.service"
},
{
"ID": 24848535,
"Module": "FLY.Thick.FilmCasting.UI.UiModule.UiModule2_TempScanGraph",
"ID": 30274111,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaSample",
"ServiceContainerName": "gage0.service"
},
{
"ID": 65456887,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FlowGraph",
"ID": 2456031,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO2",
"ServiceContainerName": "gage0.service"
}
]
......
脚本/init/FLY.Thick.FilmCasting.UI.Client/layout/paramDict.json 0 → 100644
View file @ 2fdd0d28
[
{
"Key": "SkipWarningUnityNames",
"Value": [
"自动模头",
"称重"
]
},
{
"Key": "LCUS1_PortName",
"Value": "COM1"
},
{
"Key": "LCUS1_Enable",
"Value": false
},
{
"Key": "XStep",
"Value": 2
},
{
"Key": "HaveOSK",
"Value": true
},
{
"Key": "HaveOSK_mouse",
"Value": false
},
{
"Key": "gage0.service.stateChanged",
"Value": [
{
"ControllerState": "FIX",
"No": 3
}
]
},
{
"Key": "EnableScanErrBigTip",
"Value": false
},
{
"Key": "WarningTipPath",
"Value": ""
},
{
"Key": "WarningDurationSec",
"Value": 5
}
]
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Client/layout/scanmmgraph.json 0 → 100644
View file @ 2fdd0d28
{
"XStep": 10,
"Items": [
{
"IsXShowBoltNo": false,
"UiModule": "scanMmGraph",
"YRangePercent": 3.0,
"Mix": 2,
"IsSideCutHidden": false,
"Number": 0,
"IsPercent": true,
"IsAutoTarget": true,
"IsLineMode": false,
"ID": 24540058
}
]
}
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Client/paramDict.json 0 → 100644
View file @ 2fdd0d28
[
{
"Key": "SkipWarningUnityNames",
"Value": []
},
{
"Key": "LCUS1_PortName",
"Value": "COM1"
},
{
"Key": "XStep",
"Value": 5
},
{
"Key": "HaveOSK",
"Value": true
},
{
"Key": "HaveOSK_mouse",
"Value": true
},
{
"Key": "gage0.service.stateChanged",
"Value": []
},
{
"Key": "EnableScanErrBigTip",
"Value": false
},
{
"Key": "WarningTipPath",
"Value": ""
},
{
"Key": "WarningDurationSec",
"Value": 5
},
{
"Key": "LCUS1_Enable",
"Value": false
},
{
"Key": "WindowSize",
"Value": 30
},
{
"Key": "FLY.Weight.UI.Client.PgFlowTableVm.Interval",
"Value": 10
}
]
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Client/password.json 0 → 100644
View file @ 2fdd0d28
{
"Db": {
"UiLvs": [
{
"UiName": "PwManager",
"Description": "密码管理",
"Level": 10
},
{
"UiName": "GraphConfig",
"Description": "图表配置",
"Level": 0
},
{
"UiName": "Boltmap",
"Description": "分区表",
"Level": 1
},
{
"UiName": "CoatingMmDetection",
"Description": "涂布剔除",
"Level": 5
},
{
"UiName": "CoatingWidthDetection",
"Description": "涂宽测量",
"Level": 5
},
{
"UiName": "FlyAd",
"Description": "AD盒控制器",
"Level": 10
},
{
"UiName": "Curve",
"Description": "曲线标定",
"Level": 5
},
{
"UiName": "Address",
"Description": "地址管理",
"Level": 5
},
{
"UiName": "CustomSetting",
"Description": "客户配置",
"Level": 5
},
{
"UiName": "BorderSearch",
"Description": "边界查找",
"Level": 5
},
{
"UiName": "GageInfo",
"Description": "机架信息",
"Level": 5
},
{
"UiName": "GetSample",
"Description": "样品标定",
"Level": 5
},
{
"UiName": "InitParam",
"Description": "系统参数",
"Level": 5
},
{
"UiName": "Reject",
"Description": "剔除",
"Level": 5
},
{
"UiName": "ScanWarning",
"Description": "扫描报警",
"Level": 5
},
{
"UiName": "FbAuto",
"Description": "自控打开",
"Level": 0
},
{
"UiName": "Feedback",
"Description": "自控配置",
"Level": 5
},
{
"UiName": "Param2Lock",
"Description": "产品参数解锁",
"Level": 2
},
{
"UiName": "BaseLock",
"Description": "产品基本解锁",
"Level": 2
},
{
"UiName": "BLock",
"Description": "平移补偿解锁",
"Level": 1
},
{
"UiName": "Profile",
"Description": "产品",
"Level": 1
}
],
"Pws": [
{
"Password": "\"Zmx5bWVhc3VyZQ==\"",
"Level": 10,
"Description": null
},
{
"Password": "\"MQ==\"",
"Level": 5,
"Description": null
},
{
"Password": "\"MA==\"",
"Level": 1,
"Description": null
}
]
},
"Time": "2021-07-27T13:57:08.7843442+08:00"
}
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Server/Gage1/boltmap.json
View file @ 2fdd0d28
{
"BoltWidth": 25.4,
"BoltCnt": 82,
"BoltCnt": 60,
"MidMm": 1000,
"IsReversed": false,
"Smooth": 1,
"Smooth": 0,
"BorderType": 4
}
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Server/Gage1/bordersearch.json
View file @ 2fdd0d28
{
"Enable": true,
"IsOneMaterial": false,
"IsBreakDetect": true,
"IsOneMaterial": true,
"IsBreakDetect": false,
"Valid": {
"Begin": 0,
"End": 25799
"End": 7129
},
"TempADBySet": false,
"TempAD": 50320,
"TempRange": 1006,
"TempAD": 51246,
"TempRange": 2562,
"IsTempRangeByPercent": true,
"TempRangePercent": 0.02,
"N": 52,
"SensorWidth": 350,
"N2": 1000,
"N3": 2000
"TempRangePercent": 0.05,
"N": 20,
"SensorWidth": 180,
"N2": 500,
"N3": 500
}
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Server/Gage1/curve.json
View file @ 2fdd0d28
......@@ -2,67 +2,39 @@
"Curves": [
{
"Value": 0.0,
"AD": 50300
"AD": 58395
},
{
"Value": 19.0,
"AD": 46505
"Value": 118.56,
"AD": 44812
},
{
"Value": 38.0,
"AD": 42999
"Value": 237.13,
"AD": 35525
},
{
"Value": 58.0,
"AD": 39698
"Value": 355.69,
"AD": 27955
},
{
"Value": 78.0,
"AD": 36646
"Value": 474.26,
"AD": 21547
},
{
"Value": 98.0,
"AD": 33894
"Value": 592.82,
"AD": 16137
},
{
"Value": 118.0,
"AD": 31229
"Value": 711.38,
"AD": 11510
},
{
"Value": 137.0,
"AD": 28934
"Value": 829.95,
"AD": 7925
},
{
"Value": 156.0,
"AD": 26818
},
{
"Value": 175.0,
"AD": 24908
},
{
"Value": 194.0,
"AD": 23220
},
{
"Value": 213.0,
"AD": 21558
},
{
"Value": 232.0,
"AD": 20057
},
{
"Value": 251.0,
"AD": 18606
},
{
"Value": 271.0,
"AD": 17283
},
{
"Value": 290.0,
"AD": 16035
"Value": 948.51,
"AD": 5224
}
],
"CorrectWay": 0,
......
脚本/init/FLY.Thick.FilmCasting.UI.Server/Gage1/flyad.json
View file @ 2fdd0d28
{
"Addr": "192.168.251.10:20006",
"Addr": "127.0.0.1:20008",
"HasCRC": false,
"GridSmooth": 0,
"ADLag": 0,
......@@ -8,10 +8,10 @@
"HasPosMaxMin": false,
"IsDevParamValid": true,
"MotorType": 2,
"PosOfGrid": 26,
"PosOfGrid": 16,
"Ratio01": 4,
"Ratio02": 1,
"PosOffset": 0,
"JogVelocity": 1000,
"HardwareVersion": 3
"JogVelocity": 3000,
"HardwareVersion": 2
}
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Server/Gage1/gsample.json
View file @ 2fdd0d28
{
"Enable": true,
"Window": 2,
"SampleRange": 50,
"Window": 3,
"SampleRange": 100,
"IsCheckByPercent": true,
"ErrPercent": 0.021,
"ErrPercent": 2.0,
"ErrValue": 200,
"CrossErrPercent": 0.03,
"ErrIntervalMin": 33,
"CrossErrPercent": 0.02,
"Samples": [
{
"Enable": true,
"JustForCheck": false,
"OrgAD": 50300,
"OrgAD": 58395,
"Position": 200
},
{
"Enable": false,
"JustForCheck": false,
"OrgAD": 4000,
"Position": 8000
"OrgAD": 0,
"Position": 0
},
{
"Enable": false,
......
脚本/init/FLY.Thick.FilmCasting.UI.Server/Gage1/initparam.json
View file @ 2fdd0d28
{
"PosLength": 25800,
"PosOfGrid": 26,
"HasVBeforeStretching": false,
"MmOfR_VBefore": 2512.0,
"PosLength": 16000,
"PosOfGrid": 16,
"IsTimeGridAdvEnabled": false,
"AutoOrgInterval": 10,
"FilmVSrc": 1,
......@@ -9,14 +11,14 @@
"MmOfR": 376.8,
"Encoder1_mmpp": 0.0943,
"Speed1Scale": 0.25,
"VScan": 5000,
"VScan": 3000,
"VJOG": 3000,
"VAccuracy": 3000,
"SVelocity": 50,
"ATime": 300,
"DTime": 200,
"SVelocity": 100,
"ATime": 200,
"DTime": 300,
"HVelocity1": 3000,
"HVelocity2": 500,
"HVelocity2": 300,
"DataValidSrc": 4,
"AutoF1F3": false,
"ReStartDelay": 5,
......@@ -27,7 +29,5 @@
"HasHSign": false,
"VSignOffset": 50,
"PunchOffset": 120,
"HasScanCorr": true,
"DBKeepMonth": 6,
"DbDirPath": "D:\\film_casting_data"
"HasScanCorr": true
}
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Server/Gage1/profile.json
View file @ 2fdd0d28
{
"CurrentPName": "HB712",
"CurrentPName": "123",
"ParamList": [
{
"PName": "测试模式",
"Batch": "2153344R",
"Number": "1",
"Target": 50.0,
"TolerancePercent": 0.1,
"K": 1.3888888888888888,
"B": 0.0,
"Number": "137",
"Target": 100.0,
"TolerancePercent": 0.01,
"K": 1.0,
"B": 100.0,
"LeftEmptyBolts": 0,
"RightEmptyBolts": 0,
"UniformShrinkPercent": 0.0,
"MidOffset": 0,
"ScanRange": {
"Begin": 0,
"End": 81
},
"DataRange": {
"Begin": 10,
"End": 72
}
},
{
"PName": "cpp175",
"Batch": "2153344R",
"Number": "1",
"Target": 30.0,
"TolerancePercent": 0.083,
"K": 1.3071895424836602,
"B": 0.0,
"LeftEmptyBolts": 4,
"RightEmptyBolts": 4,
"UniformShrinkPercent": 0.0,
"UniformShrinkPercent": 0.03,
"MidOffset": 0,
"ScanRange": {
"Begin": 0,
"End": 81
"End": 59
},
"DataRange": {
"Begin": 13,
"End": 70
}
},
{
"PName": "cpp200",
"Batch": "2153344R",
"Number": "1",
"Target": 41.5,
"TolerancePercent": 0.048,
"K": 1.4106361969248131,
"B": 0.0,
"LeftEmptyBolts": 6,
"RightEmptyBolts": 6,
"UniformShrinkPercent": 0.0,
"MidOffset": 0,
"ScanRange": {
"Begin": 0,
"End": 81
"Begin": 4,
"End": 27
},
"DataRange": {
"Begin": 15,
"End": 67
}
"IsAutoDataRange": true,
"SideCutWidth": 50
},
{
"PName": "HB714",
"PName": "123",
"Batch": "2153344R",
"Number": "1",
"Target": 40.0,
"TolerancePercent": 0.024,
"K": 1.45,
"B": 0.0,
"LeftEmptyBolts": 8,
"RightEmptyBolts": 8,
"UniformShrinkPercent": 0.0,
"MidOffset": 0,
"ScanRange": {
"Begin": 0,
"End": 81
},
"DataRange": {
"Begin": 19,
"End": 64
}
},
{
"PName": "CPE120",
"Batch": "2153344R",
"Number": "1",
"Target": 60.0,
"Number": "138",
"Target": 129.0,
"TolerancePercent": 0.1,
"K": 1.8677868162985951,
"K": 1.0,
"B": 0.0,
"LeftEmptyBolts": 6,
"RightEmptyBolts": 6,
"UniformShrinkPercent": 0.0,
"MidOffset": 0,
"ScanRange": {
"Begin": 0,
"End": 81
},
"DataRange": {
"Begin": 19,
"End": 64
}
},
{
"PName": "LD2420I",
"Batch": "2153344R",
"Number": "1",
"Target": 69.0,
"TolerancePercent": 0.024,
"K": 1.8677868162985951,
"B": 0.0,
"LeftEmptyBolts": 6,
"RightEmptyBolts": 6,
"UniformShrinkPercent": 0.0,
"LeftEmptyBolts": 0,
"RightEmptyBolts": 0,
"UniformShrinkPercent": 0.03,
"MidOffset": 0,
"ScanRange": {
"Begin": 0,
"End": 81
"End": 59
},
"DataRange": {
"Begin": 9,
"End": 74
}
},
{
"PName": "HB712",
"Batch": "2153344R",
"Number": "1",
"Target": 52.0,
"TolerancePercent": 0.03,
"K": 1.45,
"B": 0.0,
"LeftEmptyBolts": 1,
"RightEmptyBolts": 1,
"UniformShrinkPercent": 0.05,
"MidOffset": 0,
"ScanRange": {
"Begin": 0,
"End": 81
"Begin": 6,
"End": 53
},
"DataRange": {
"Begin": 8,
"End": 75
}
"IsAutoDataRange": true,
"SideCutWidth": 50
}
]
}
\ No newline at end of file
脚本/init/FLY.Thick.FilmCasting.UI.Server/Gage1/sysparam.json
View file @ 2fdd0d28
{
"Addr": "127.0.0.1:20006"
"Addr": "127.0.0.1:20006",
"FlyAdHardwareVersion": "A",
"DbKeepMonth": 12,
"DbDirPath": "D:\\flydata"
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment