Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f3df745c 由 LN
选项

bug修改

1 个父辈 d5f8f28c
内嵌 并排
正在显示 4 个修改的文件 包含 50 行增加 和 50 行删除
DeviceLibrary/mes/MesUtil.cs
...@@ -51,10 +51,13 @@ namespace TSA_V.DeviceLibrary ...@@ -51,10 +51,13 @@ namespace TSA_V.DeviceLibrary
/// <param name="url"></param> /// <param name="url"></param>
/// <returns></returns> /// <returns></returns>
public static bool Open() public static bool Open()
{ {
//获取状态：http://localhost:4090/rest/api/v1/station/status //获取状态：http://localhost:4090/rest/api/v1/station/status
string url = ConfigAppSettings.GetValue(Setting_Init.WebServiceAddr); string url = ConfigAppSettings.GetValue(Setting_Init.WebServiceAddr);
if (String.IsNullOrEmpty(serverAddress))
{
return false ;
}
LogUtil.info("MesUtil 本地地址【" + url + "】上传数据地址【" + serverAddress + "】"); LogUtil.info("MesUtil 本地地址【" + url + "】上传数据地址【" + serverAddress + "】");
try try
......
TSA-V/App.config
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
<add key="CodeRun" value="0" /> <add key="CodeRun" value="0" />
<add key="IsDebug" value="1" /> <add key="IsDebug" value="1" />
<add key="IsNeedCount" value="1" /> <add key="IsNeedCount" value="1" />
<add key="CameraName" value="GigE:MV-CE100-30GC (00D18064699)" /> <add key="CameraName" value="GigE:MV-CE100-30GC (00D18064699)" />
<!--界面标题--> <!--界面标题-->
<add key="App_Title" value="SmartWorkstation" /> <add key="App_Title" value="SmartWorkstation" />
...@@ -24,7 +23,6 @@ ...@@ -24,7 +23,6 @@
<!--元器件库模板地址--> <!--元器件库模板地址-->
<add key="Componet_Template" value="\config\元器件信息模板.csv" /> <add key="Componet_Template" value="\config\元器件信息模板.csv" />
<add key="ComPath_Config" value="\config\componet\" /> <add key="ComPath_Config" value="\config\componet\" />
<!--电路板图片保存路径--> <!--电路板图片保存路径-->
<add key="Board_Image_Path" value="config\image\" /> <add key="Board_Image_Path" value="config\image\" />
<!--电路板默认图片--> <!--电路板默认图片-->
...@@ -34,7 +32,7 @@ ...@@ -34,7 +32,7 @@
<!--使用AIO的IO模块--> <!--使用AIO的IO模块-->
<add key="UseAIOBOX" value="1" /> <add key="UseAIOBOX" value="1" />
<!--IO模块配置--> <!--IO模块配置-->
<add key="IO_IP" value="192.168.0.12" /> <add key="IO_IP" value="192.168.200.11" />
<add key="IO_Port" value="502" /> <add key="IO_Port" value="502" />
<add key="PUSICAN_Ip" value="192.168.0.178" /> <add key="PUSICAN_Ip" value="192.168.0.178" />
<add key="PUSICAN_Port" value="4001" /> <add key="PUSICAN_Port" value="4001" />
...@@ -73,13 +71,11 @@ ...@@ -73,13 +71,11 @@
<add key="YAxis_Change" value="1" /> <add key="YAxis_Change" value="1" />
<add key="YAxis_MaxValue" value="1920" /> <add key="YAxis_MaxValue" value="1920" />
<add key="YAxis_MinValue" value="1" /> <add key="YAxis_MinValue" value="1" />
<!--0=脚踏模式，1=自动模式，间隔指定的时间自动下一步--> <!--0=脚踏模式，1=自动模式，间隔指定的时间自动下一步-->
<add key="WorkMode" value="1" /> <add key="WorkMode" value="1" />
<!-- 自动模式间隔时间/秒--> <!-- 自动模式间隔时间/秒-->
<add key="AuToModeSeconds" value="5" /> <add key="AuToModeSeconds" value="5" />
<add key="WorkCount_ConfigPath" value="\config\workCount.json" /> <add key="WorkCount_ConfigPath" value="\config\workCount.json" />
<!--元器件库名称的类型，0=英文，1=中文--> <!--元器件库名称的类型，0=英文，1=中文-->
<add key="LibNameType" value="1" /> <add key="LibNameType" value="1" />
<!--AOI程序文件夹--> <!--AOI程序文件夹-->
...@@ -89,36 +85,33 @@ ...@@ -89,36 +85,33 @@
<add key="DefaultPointSize" value="5" /> <add key="DefaultPointSize" value="5" />
<add key="DefaultPointType" value="1" /> <add key="DefaultPointType" value="1" />
<add key="Config_Pwd" value="123456" /> <add key="Config_Pwd" value="123456" />
<!--调宽配置：电机回原点速度--> <!--调宽配置：电机回原点速度-->
<add key="Line_HomeSpeed" value="2020" /> <add key="Line_HomeSpeed" value="2020" />
<add key="Line_HomeStartSpeed" value="1000" /> <add key="Line_HomeStartSpeed" value="1000" />
<add key="Line_HomeStopSpeed" value="1000" /> <add key="Line_HomeStopSpeed" value="1000" />
<add key="Line_MicroStepping" value="4" />
<add key="Line_MicroStepping" value="64" /> <add key="Line_MaxSpeed" value="1000" />
<add key="Line_MaxSpeed" value="20000" /> <add key="Line_StartSpeed" value="1000" />
<add key="Line_StartSpeed" value="8000" /> <add key="Line_StopSpeed" value="1000" />
<add key="Line_StopSpeed" value="8000" />
<add key="Line_AddSpeed" value="8" /> <add key="Line_AddSpeed" value="8" />
<add key="Line_DelSpeed" value="8" /> <add key="Line_DelSpeed" value="8" />
<add key="Line_MaxPhaseCurrent" value="800" /> <add key="Line_MaxPhaseCurrent" value="2000" />
<add key="Line_DelPhaseCurrent" value="2" /> <add key="Line_DelPhaseCurrent" value="2" />
<!--调宽配置：电机回原点后的宽度--> <!--调宽配置：电机回原点后的宽度-->
<add key="Line_HomeWidth" value="30" /> <add key="Line_HomeWidth" value="508" />
<!--调宽配置：宽度转换系数，1mm对应的电机位置--> <!--调宽配置：宽度转换系数，1mm对应的电机位置-->
<add key="Line_ChangeValue" value="100" /> <add key="Line_ChangeValue" value="200" />
<!--调宽配置：调宽伺服地址--> <!--调宽配置：调宽伺服地址-->
<add key="Line_NodeAddr" value="11" /> <add key="Line_NodeAddr" value="11" />
<!--流水线最后一次调的宽度--> <!--流水线最后一次调的宽度-->
<add key="Line_LastWidth" value="100" /> <add key="Line_LastWidth" value="400" />
<!--宽度对应位置配置--> <!--宽度对应位置配置-->
<add key="Line_WidthPosition" value="" /> <add key="Line_WidthPosition" value="" />
<add key="Server_Log_Open" value="0" /> <add key="Server_Log_Open" value="0" />
<add key="NeedPCBCode" value="1" />
<!--本地开放的http服务器端口号--> <!--本地开放的http服务器端口号-->
<add key="WebServiceAddr" value="http://localhost:4090/rest/api/v1/station/" /> <!--<add key="WebServiceAddr" value="http://localhost:4090/rest/api/v1/station/" />-->
<!--组装完成后上传数据的服务器地址--> <!--组装完成后上传数据的服务器地址-->
<add key="DCSServerAddr" value="http://192.168.8.1:1007/DCS_Integration/Cartridge.asmx?op=CartridgeInfo" /> <!--<add key="DCSServerAddr" value="http://192.168.8.1:1007/DCS_Integration/Cartridge.asmx?op=CartridgeInfo" />-->
<!--组装工作前，需要输入pcb板条码--> <!--组装工作前，需要输入pcb板条码-->
<add key="NeedPCBCode" value="1" /> <add key="NeedPCBCode" value="1" />
</appSettings> </appSettings>
...@@ -162,8 +155,8 @@ ...@@ -162,8 +155,8 @@
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" /> <assemblyIdentity name="log4net" culture="neutral" publicKeyToken="669e0ddf0bb1aa2a" />
<bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0" /> <bindingRedirect oldVersion="0.0.0.0-2.0.12.0" newVersion="2.0.12.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
......
TSA-V/deviceDebug/FrmPusicanTest.Designer.cs
...@@ -75,10 +75,10 @@ ...@@ -75,10 +75,10 @@
this.btnGetStatus = new System.Windows.Forms.Button(); this.btnGetStatus = new System.Windows.Forms.Button();
this.btnClearStatus = new System.Windows.Forms.Button(); this.btnClearStatus = new System.Windows.Forms.Button();
this.label20 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.cmbMoveType = new System.Windows.Forms.ComboBox(); this.cmbMoveType = new System.Windows.Forms.ComboBox();
this.label19 = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label();
this.cmbTargetType = new System.Windows.Forms.ComboBox(); this.cmbTargetType = new System.Windows.Forms.ComboBox();
this.label12 = new System.Windows.Forms.Label();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudMaxSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMaxSpeed)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudStartSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudStartSpeed)).BeginInit();
...@@ -428,6 +428,8 @@ ...@@ -428,6 +428,8 @@
// checkBox1 // checkBox1
// //
this.checkBox1.AutoSize = true; this.checkBox1.AutoSize = true;
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(306, 62); this.checkBox1.Location = new System.Drawing.Point(306, 62);
this.checkBox1.Name = "checkBox1"; this.checkBox1.Name = "checkBox1";
...@@ -499,10 +501,6 @@ ...@@ -499,10 +501,6 @@
this.groupBox5.Controls.Add(this.btnGetStatus); this.groupBox5.Controls.Add(this.btnGetStatus);
this.groupBox5.Controls.Add(this.btnClearStatus); this.groupBox5.Controls.Add(this.btnClearStatus);
this.groupBox5.Controls.Add(this.label20); this.groupBox5.Controls.Add(this.label20);
this.groupBox5.Controls.Add(this.cmbMoveType);
this.groupBox5.Controls.Add(this.label19);
this.groupBox5.Controls.Add(this.cmbTargetType);
this.groupBox5.Controls.Add(this.label12);
this.groupBox5.Location = new System.Drawing.Point(22, 294); this.groupBox5.Location = new System.Drawing.Point(22, 294);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(716, 178); this.groupBox5.Size = new System.Drawing.Size(716, 178);
...@@ -513,7 +511,7 @@ ...@@ -513,7 +511,7 @@
// txtHomeMoveSpeed // txtHomeMoveSpeed
// //
this.txtHomeMoveSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtHomeMoveSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHomeMoveSpeed.Location = new System.Drawing.Point(123, 132); this.txtHomeMoveSpeed.Location = new System.Drawing.Point(130, 69);
this.txtHomeMoveSpeed.Name = "txtHomeMoveSpeed"; this.txtHomeMoveSpeed.Name = "txtHomeMoveSpeed";
this.txtHomeMoveSpeed.Size = new System.Drawing.Size(120, 26); this.txtHomeMoveSpeed.Size = new System.Drawing.Size(120, 26);
this.txtHomeMoveSpeed.TabIndex = 55; this.txtHomeMoveSpeed.TabIndex = 55;
...@@ -521,7 +519,7 @@ ...@@ -521,7 +519,7 @@
// //
// label2 // label2
// //
this.label2.Location = new System.Drawing.Point(13, 137); this.label2.Location = new System.Drawing.Point(20, 74);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(100, 20); this.label2.Size = new System.Drawing.Size(100, 20);
this.label2.TabIndex = 54; this.label2.TabIndex = 54;
...@@ -586,7 +584,7 @@ ...@@ -586,7 +584,7 @@
// txtPosition // txtPosition
// //
this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosition.Location = new System.Drawing.Point(123, 96); this.txtPosition.Location = new System.Drawing.Point(130, 33);
this.txtPosition.Name = "txtPosition"; this.txtPosition.Name = "txtPosition";
this.txtPosition.Size = new System.Drawing.Size(120, 26); this.txtPosition.Size = new System.Drawing.Size(120, 26);
this.txtPosition.TabIndex = 29; this.txtPosition.TabIndex = 29;
...@@ -616,13 +614,23 @@ ...@@ -616,13 +614,23 @@
// //
// label20 // label20
// //
this.label20.Location = new System.Drawing.Point(13, 97); this.label20.Location = new System.Drawing.Point(20, 34);
this.label20.Name = "label20"; this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(100, 20); this.label20.Size = new System.Drawing.Size(100, 20);
this.label20.TabIndex = 28; this.label20.TabIndex = 28;
this.label20.Text = "步进位置："; this.label20.Text = "步进位置：";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label12
//
this.label12.Location = new System.Drawing.Point(57, 474);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(100, 20);
this.label12.TabIndex = 24;
this.label12.Text = "转动方向：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label12.Visible = false;
//
// cmbMoveType // cmbMoveType
// //
this.cmbMoveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbMoveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
...@@ -631,19 +639,21 @@ ...@@ -631,19 +639,21 @@
this.cmbMoveType.Items.AddRange(new object[] { this.cmbMoveType.Items.AddRange(new object[] {
"位置使能", "位置使能",
"速度使能"}); "速度使能"});
this.cmbMoveType.Location = new System.Drawing.Point(123, 58); this.cmbMoveType.Location = new System.Drawing.Point(167, 495);
this.cmbMoveType.Name = "cmbMoveType"; this.cmbMoveType.Name = "cmbMoveType";
this.cmbMoveType.Size = new System.Drawing.Size(120, 28); this.cmbMoveType.Size = new System.Drawing.Size(120, 28);
this.cmbMoveType.TabIndex = 27; this.cmbMoveType.TabIndex = 27;
this.cmbMoveType.Visible = false;
// //
// label19 // label19
// //
this.label19.Location = new System.Drawing.Point(13, 63); this.label19.Location = new System.Drawing.Point(57, 500);
this.label19.Name = "label19"; this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(100, 20); this.label19.Size = new System.Drawing.Size(100, 20);
this.label19.TabIndex = 26; this.label19.TabIndex = 26;
this.label19.Text = "步进模式："; this.label19.Text = "步进模式：";
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label19.Visible = false;
// //
// cmbTargetType // cmbTargetType
// //
...@@ -653,19 +663,11 @@ ...@@ -653,19 +663,11 @@
this.cmbTargetType.Items.AddRange(new object[] { this.cmbTargetType.Items.AddRange(new object[] {
"正方向", "正方向",
"反方向"}); "反方向"});
this.cmbTargetType.Location = new System.Drawing.Point(123, 20); this.cmbTargetType.Location = new System.Drawing.Point(167, 469);
this.cmbTargetType.Name = "cmbTargetType"; this.cmbTargetType.Name = "cmbTargetType";
this.cmbTargetType.Size = new System.Drawing.Size(120, 28); this.cmbTargetType.Size = new System.Drawing.Size(120, 28);
this.cmbTargetType.TabIndex = 25; this.cmbTargetType.TabIndex = 25;
// this.cmbTargetType.Visible = false;
// label12
//
this.label12.Location = new System.Drawing.Point(13, 25);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(100, 20);
this.label12.TabIndex = 24;
this.label12.Text = "转动方向：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// FrmPusicanTest // FrmPusicanTest
// //
...@@ -677,12 +679,14 @@ ...@@ -677,12 +679,14 @@
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox5);
this.Controls.Add(this.cmbMoveType);
this.Controls.Add(this.label12);
this.Controls.Add(this.cmbTargetType);
this.Controls.Add(this.label19);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Location = new System.Drawing.Point(0, 0);
this.MaximizeBox = true; this.MaximizeBox = true;
this.MinimizeBox = true; this.MinimizeBox = true;
this.Name = "FrmPusicanTest"; this.Name = "FrmPusicanTest";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "位置列表"; this.Text = "位置列表";
this.Load += new System.EventHandler(this.FrmPositionList_Load); this.Load += new System.EventHandler(this.FrmPositionList_Load);
this.Shown += new System.EventHandler(this.FrmPusicanTest_Shown); this.Shown += new System.EventHandler(this.FrmPusicanTest_Shown);
...@@ -721,10 +725,6 @@ ...@@ -721,10 +725,6 @@
private System.Windows.Forms.Button btnRelMove; private System.Windows.Forms.Button btnRelMove;
private System.Windows.Forms.TextBox txtPosition; private System.Windows.Forms.TextBox txtPosition;
private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label20;
private System.Windows.Forms.ComboBox cmbMoveType;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.ComboBox cmbTargetType;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Button btnReadAll; private System.Windows.Forms.Button btnReadAll;
private System.Windows.Forms.NumericUpDown nudDelSpeed; private System.Windows.Forms.NumericUpDown nudDelSpeed;
private System.Windows.Forms.Label label18; private System.Windows.Forms.Label label18;
...@@ -755,5 +755,9 @@ ...@@ -755,5 +755,9 @@
private System.Windows.Forms.Button btnHomeMove; private System.Windows.Forms.Button btnHomeMove;
private System.Windows.Forms.TextBox txtHomeMoveSpeed; private System.Windows.Forms.TextBox txtHomeMoveSpeed;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox cmbMoveType;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.ComboBox cmbTargetType;
private System.Windows.Forms.Label label12;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/记录.txt
...@@ -58,7 +58,7 @@ SmartWorkstation.exe.config文件需要增加参数： ...@@ -58,7 +58,7 @@ SmartWorkstation.exe.config文件需要增加参数：
上传数据地址 DCSServerAddr 需要根据客户实际地址配置，不配置不主动上传，配置后每完成一块pcb板后上传数据。 上传数据地址 DCSServerAddr 需要根据客户实际地址配置，不配置不主动上传，配置后每完成一块pcb板后上传数据。
配置文件 SmartWorkstation.exe.config 增加： 20200908 配置文件 SmartWorkstation.exe.config 增加：
<add key="Line_MicroStepping" value="64" /> <add key="Line_MicroStepping" value="64" />
<add key="Line_MaxSpeed" value="20000" /> <add key="Line_MaxSpeed" value="20000" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!