xhouse/CheryFianlAssemblyLineNew
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#250829 剥离生成客户报告为独立函数

Browse Source
This commit is contained in:
HM-CN\zhengxuan.zhang
2025-08-30 01:02:49 +08:00
parent fc6586855d
commit 88b8ddefbf
14 changed files with 3172 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Analysis/CenterControl.cs
+3128 -3101
View File
File diff suppressed because it is too large Load Diff
Analysis/CenterControl.designer.cs
Generated
+3 -2
View File
@@ -582,7 +582,7 @@
this.RPV.ItemSizeMode = ((Telerik.WinControls.UI.PageViewItemSizeMode)((Telerik.WinControls.UI.PageViewItemSizeMode.EqualWidth | Telerik.WinControls.UI.PageViewItemSizeMode.EqualHeight)));
this.RPV.Location = new System.Drawing.Point(1, 42);
this.RPV.Name = "RPV";
this.RPV.SelectedPage = this.rpvpSetup;
this.RPV.SelectedPage = this.rpvpAnalysis;
this.RPV.Size = new System.Drawing.Size(1918, 1008);
this.RPV.TabIndex = 127;
this.RPV.ViewMode = Telerik.WinControls.UI.PageViewMode.NavigationView;
@@ -665,7 +665,7 @@
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).HorizontalLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).Text = " 软件设置";
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).Text = " 分析主界面";
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).FocusBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.White;
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
@@ -3301,6 +3301,7 @@
this.Text = "海克斯康间隙面差分析系统";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.CenterControl_FormClosed);
this.Load += new System.EventHandler(this.CenterControl_Load);
this.Shown += new System.EventHandler(this.CenterControl_Shown);
((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit();
this.radTitleBar1.ResumeLayout(false);
this.radTitleBar1.PerformLayout();
Analysis/Program.cs
+1 -1
View File
@@ -91,7 +91,7 @@ namespace NSAnalysis
gAuthorizationMode = FileIni.ReadInt(ConfigDfn.strConfigFile, "Chery", "AuthorizationMode", 1);
#endregion 创建Log文件
//Application.Run(new CenterControl());
if (gAuthorizationMode == 1)
{
MyBase.TraceWriteLine("Log in using the CLMS authorization.");
Analysis/bin/x64/Debug/DAL.dll
BIN
View File
Binary file not shown.
Analysis/bin/x64/Debug/DAL.pdb
BIN
View File
Binary file not shown.
Analysis/bin/x64/Debug/Debug.txt
+34 -24
View File
@@ -1,24 +1,34 @@
2025-08-28 00:01:33.190----软件Program Main函数开始执行--
2025-08-28 00:01:33.191--加载配置文件——>开始
2025-08-28 00:01:33.206--数据库连接 SqlServerName：127.0.0.1
2025-08-28 00:01:33.207--数据库连接 SqlUserName：sa
2025-08-28 00:01:33.207--数据库连接 SqlPassword：Hexagon123
2025-08-28 00:01:33.207--数据库连接 SqlDbName：NextSenseStandardDB
2025-08-28 00:01:33.210--加载配置文件——>完成
2025-08-28 00:01:34.614--数据库连接 SqlServerName：127.0.0.1
2025-08-28 00:01:34.615--数据库连接 SqlUserName：sa
2025-08-28 00:01:34.616--数据库连接 SqlPassword：Hexagon123
2025-08-28 00:01:34.617--数据库连接 SqlDbName：NextSenseStandardDB
2025-08-28 00:01:34.618--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=NextSenseStandardDB;User ID=sa;password=Hexagon123;
2025-08-28 00:01:35.112-- 进入显示车身模式！显示车身界面。
2025-08-28 00:01:35.624--启动PLC写线程！
2025-08-28 00:01:35.627-- 进入解析CSV文件模式，开始解析扫码CSV文件！
2025-08-28 00:01:35.650--连接PLC....
2025-08-28 00:01:35.652--软件首次启动， Nextsense EH3 CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEH3
2025-08-28 00:01:35.653--软件首次启动， Nextsense EHY CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEHY
2025-08-28 00:01:37.708--PLC S7连接失败。
2025-08-28 00:01:40.645--连接PLC失败
2025-08-28 00:01:41.053--Right EH3 UI Refresh tmrRefreshData (strVIN.Length==21)：CarType：EHY ;VIN: LNNBBDEC8RDA23997
2025-08-28 00:01:41.063--Right EHY UI Refresh tmrRefreshData (strVIN.Length==21)：CarType：EHY ;VIN: LNNBBDEC8RDA23997
2025-08-28 00:01:50.246--显示右侧EHY车身数据界面。
2025-08-28 00:02:31.399---------------海克斯康面隙分析软件程序关闭---------------------
2025-08-29 22:53:21.911----软件Program Main函数开始执行--
2025-08-29 22:53:22.122--加载配置文件——>开始
2025-08-29 22:53:22.436--数据库连接 SqlServerName：127.0.0.1
2025-08-29 22:53:22.545--数据库连接 SqlUserName：sa
2025-08-29 22:53:22.573--数据库连接 SqlPassword：Hexagon123
2025-08-29 22:53:22.576--数据库连接 SqlDbName：NextSenseStandardDB
2025-08-29 22:53:22.625--加载配置文件——>完成
2025-08-29 22:53:22.666--Log in using the original authorization mode.
2025-08-29 22:53:24.548--软件授权成功
2025-08-29 22:53:27.359--数据库连接 SqlServerName：127.0.0.1
2025-08-29 22:53:27.361--数据库连接 SqlUserName：sa
2025-08-29 22:53:27.362--数据库连接 SqlPassword：Hexagon123
2025-08-29 22:53:27.363--数据库连接 SqlDbName：NextSenseStandardDB
2025-08-29 22:53:27.364--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=NextSenseStandardDB;User ID=sa;password=Hexagon123;
2025-08-29 22:53:28.309-- 进入显示车身模式！显示车身界面。
2025-08-29 22:53:29.581--启动PLC写线程！
2025-08-29 22:53:29.583-- 进入解析CSV文件模式，开始解析扫码CSV文件！
2025-08-29 22:53:29.585--连接PLC....
2025-08-29 22:53:29.586--软件首次启动， Nextsense EH3 CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEH3
2025-08-29 22:53:29.588--软件首次启动， Nextsense EHY CSV读取路径存在；不清空，读取NextSense生成 CSV报告路径下的所有文件，路径为：D:\cherytestEHY
2025-08-29 22:53:31.222--Right EH3 UI Refresh tmrRefreshData (strVIN.Length==21)：CarType：EHY ;VIN: LNNBBDEC8RDA23997
2025-08-29 22:53:31.257--Right EHY UI Refresh tmrRefreshData (strVIN.Length==21)：CarType：EHY ;VIN: LNNBBDEC8RDA23997
2025-08-29 22:53:31.753--PLC S7连接失败。
2025-08-29 22:53:32.612--显示右侧EHY车身数据界面。
2025-08-29 22:53:32.619--连接PLC失败
2025-08-29 22:55:12.952--Test Post Data: {"serno":"312314141","vin":"LNNAJDDU9RDA00213"}
2025-08-29 22:55:24.984--测试从IOT获取车型信息完成，获取到的原返回值为： Error: System.Net.WebException: 操作超时
在 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context)
在 System.Net.HttpWebRequest.GetRequestStream()
在 NSAnalysis.CenterControl.PostJsonToIOT(String url, String jsonData, Nullable`1 timeout) 位置 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\CenterControl.cs:行号 1598
2025-08-29 22:55:25.831--测试从IOT获取车型信息完成，处理后 获取到的返回值为： rror: System.Net.WebException: 操作超时
在 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context)
在 System.Net.HttpWebRequest.GetRequestStream()
在 NSAnalysis.CenterControl.PostJsonToIOT(String url, String jsonData, Nullable`1 timeout) 位置 D:\HexagonProjects\2024-20-奇瑞间隙面差\奇瑞间隙面差总装代码资料\Code\Analysis\CenterControl.cs:行号 159
Analysis/bin/x64/Debug/File/AnalysisConfig.ini
+2 -2
View File
@@ -16,14 +16,14 @@ ReportCSVPath=D:\QMLTest
CLMSModeID=10
;1:CLMS授权
AuthorizationMode=1
AuthorizationMode=2
;CarModel 初始化车型
CarModel=EHY
EquipmentNo=NS002
EquipmentName=Hexagon
;1:上传IOT；0：不上传IOT
StartIOTFlag=0
StartIOTFlag=1
IOTAddress=http://10.188.2.56:9337/web/httpServlet/api/saveGfResult
IOTCarTypeAddr=http://10.188.2.56:9337/web/httpServlet/api/queryGFModelAndMaterial
;显示车身数据：1：显示；0：不显示
Analysis/bin/x64/Debug/File/PlcAddrDfn_S7.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<PlcLive Type="byte" StartAddr="110" IndexOrLength=" " Remark="PLC心跳0或1交替" />
<PlcAutoRunning Type="byte" StartAddr="112" IndexOrLength="" Remark="设备状态：10：手动；20：自动；30：自动联动；40自动脱机模式" />
<CarPassFlag Type="byte" StartAddr="113" IndexOrLength="" Remark="有车流过标志位 0-&gt;10" />
<NSStartMeasure Type="byte" StartAddr="115" IndexOrLength="" Remark="Nextsense启动测量 0-&gt;10" />
<NSStartMeasure Type="byte" StartAddr="104" IndexOrLength="" Remark="Nextsense启动测量 0-&gt;10" />
<LeaveFirstFlag Type="byte" StartAddr="116" IndexOrLength="" Remark="离开第一个工位的信号 0-&gt;10" />
<LeaveSecondFlag Type="byte" StartAddr="117" IndexOrLength="" Remark="离开第二个工位的信号 0-&gt;10" />
<PartID Type="string" StartAddr="120" IndexOrLength="17" Remark="工件ID" />
Analysis/bin/x64/Debug/Key/reg.key
+1 -1
View File
@@ -1 +1 @@
E0257D210D71798C7D342413B6AE6E827FF7CDF4D9B987590FAE35D6DCCAFB886AA76997CF2A0EB6CE1262B84EAA89847CE6CDC5A6F8D2EED117805EA3C58FC41BAE98458ABC8F6E2F7D3BC1F235ECAA82954257F761B6EDE6B01E9FFEE276B41AAB0B16C34FF9D2865DF53073BE883F9187EB6EB61E90DDAAA99D8CEBD45D79C7B258FDE9888FDC6ACCD540C3DB33F837A1CD9E7A11BB9D832E332CAE39B9F387EB6710AB221145D9A6E1F2A1FA298D40262129F295BA060BED16C420C03178782B354A00BAD77335C105D312852C3ACEA15E3CA3F54D6B16970431D3E78069F9EAD8D82F39E953F2D6B51CAEE05D904F400BAFC3F41FF2152E610D26B4CDCF27B257D642BF1F30BD8A177925C11CCA10126D0A2870F62CEE7FBD251DCC6A5C68D62B656F9ADA143E07B02516F84636148A81409E1D928DFB346CD8050354C82CA074EDB89ADCBE6E31AD2D142B58B04F2577A03F4CE43586150CE1C69370F28D58DAEABCB2C5920A9759C3D210DF7422DFAA2D1CB0D95564D2A07A82B2F4B4A497C47C57CE23CB1294C515FACF9EEF0C4A6CB8300317D90ECBC6B30D2ABA0EBE5698648EB59A1B33F770C4EB0F928970D13FD27DA4B9521F223210E3B43345B22C2583B76CFAF265F453C3835D7ADAF002206BD6F4C338D19D0DCCFC21F76526CAFDDEC710742816AFD59794DA9653452A9EF92504C1D44B9ED41133C75E185B80E331B531F0535705493788E09E4B04CF0AF947157D7C9E1D6F7F55ADFF4CA2786E83F4315A170E4C7F461B43515DA399766454E68E89428308D085AF0CC75182F5F21077D3A1A42E53784A13DA35D174311F41CB0C111672D7AF1E3EA0E62530BFD5AED3055D783C8020517B9BDB734E885A536BE72FC79A53B301F6994EE89E1EC3D195C4A95C8E880A1F058A9C745242797396C1505ADE70F66B51C0028466F38DDBFBDB66351B696404DC767D0886B7E903EA892C6D667723939B66376CBABF1035635CB9
E0257D210D71798C7D342413B6AE6E827FF7CDF4D9B987590FAE35D6DCCAFB886AA76997CF2A0EB6183A1A07A6254010415BCA8EF7EB824B6AC227D17C067A53EC3C074338CE4489D1526A6745F8326A3CCC88BA268537C2982273D504D3FBD0570E4C172917E3829DA2C9683B7D6556C8F161F85B4111525371DC60C71086CCC0DED32D5E81E9A83608FB23D8A98F0CE9A56F4559B73159E51D63588E1D1B1995354C2A43825755B0D8869373E58D59AF678076388BCAD83C36867FE0FCFB50D6200CA3AF3E09CB8A154F46BDBE1651F20EAB4AE02E0D16267C192E4B8AEB473DBD8EA87CFD59933062F5FC46B4C360507E9ABEA928539EDCA1FDE38757CB5D50CD286312A907C8659BB2CD95C1C5EB5FB3FF894808137E7F01C767C4AFF501FE74A18570277994AC542D7CF811A0AAB4B53BF5083C4EC10DE7EC55E72BCEAE80B364DDBA2515CEA190D585F349A2A704ADFD6F7EA8D23C429EEE440239844CEC4ACA624A34933816E72E71BFF1669EC74486B70E0C7DD1418C983FCBC9D35043CB2523A685435B541C7B59F511B00347D7E16E1044B337CDD4A819E499EDE975FE7A553DE2604235916CAE6FC2C906625DAE32A7C2441969B842242AAE869F95C22AE889BC2388CBECD6BD0B3074A656940CAB067C850C554E112A104F445F4F7AAA5A879F2C476B088120CEFA03CB3597CC695AF681C6A54B61DEC63E8F39B25446DAAB73608AF105A1F1C2631780E4A7A202FB03323B82115B2BFE71A26FA516FDAAA00A1D4887BEBE6DF4C8D9130C57E0DA55DAC33220C891A46CB8B73D8EFA47314D8015A7F3267D2C726ACAB59DAC92E8CD24F4D08F3B030A96489379642E982F8E4A8B25FA3979A230A6A7C6B38EEB71B0B3E65305D38AB9AD3C3433BC7A5555AAA21F3807ED4BFE97093359CB1E80BBC539B97F616E017218773297294742D0EAB299DD2FD178FAD7D01FD2FA200E6974BA95123B01367C62EF6F0ECDF715ECA67BFE83
Analysis/bin/x64/Debug/NSAnalysis.exe
BIN
View File
Binary file not shown.
Analysis/bin/x64/Debug/NSAnalysis.pdb
BIN
View File
Binary file not shown.
DAL/SQLHelper.cs
+2 -2
View File
@@ -112,9 +112,9 @@ namespace DAL
DataTable dt = new DataTable();
cmd = new SqlCommand(cmdText, GetConn());
cmd.CommandType = ct;
cmd.CommandTimeout = 60;
//cmd.CommandTimeout = 60;
using (sdr = cmd.ExecuteReader(CommandBehavior.CloseConnection))
using (sdr = cmd.ExecuteReader(CommandBehavior.CloseConnection))
{
dt.Load(sdr);
}
DAL/bin/Debug/DAL.dll
BIN
View File
Binary file not shown.
DAL/bin/Debug/DAL.pdb
BIN
View File
Binary file not shown.