Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 1b7dcae2 由 张东亮
选项

使用相机对屏蔽托盘进行二次判断并纠正信息

1 个父辈 7bbe83b1
内嵌 并排
正在显示 31 个修改的文件 包含 1791 行增加 和 696 行删除
source/AssemblyLineClient/App.config
<?xml version="1.0"?> <?xml version="1.0"?>
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
</configSections> </configSections>
<appSettings> <appSettings>
<!--是否开机自动启动料仓--> <!--是否开机自动启动料仓-->
<add key="App_AutoRun" value="1" /> <add key="App_AutoRun" value="1"/>
<add key="App_Title" value="流水线客户端" /> <add key="App_Title" value="流水线客户端"/>
<!--Server address--> <!--Server address-->
<!--<add key="http.server" value="http://localhost/myproject/service/store/emptyPosForPutin"/>--> <!--<add key="http.server" value="http://localhost/myproject/service/store/emptyPosForPutin"/>-->
<add key="http.server" value="http://10.85.199.25/myproject/" /> <add key="http.server" value="http://10.85.199.25/myproject/"/>
<!--storeType--> <!--storeType-->
<add key="Line_moveEquip_count" value="20" /> <add key="Line_moveEquip_count" value="20"/>
<add key="Line_feedingEquip_count" value="4" /> <add key="Line_feedingEquip_count" value="4"/>
<add key="Line_providingEquip_count" value="4" /> <add key="Line_providingEquip_count" value="4"/>
<add key="Line_dischargeLine_count" value="2" /> <add key="Line_dischargeLine_count" value="2"/>
<!--start one store config--> <!--start one store config-->
<add key="ConfigPath_Line" value="\LineConfig\Config_Line.csv" /> <add key="ConfigPath_Line" value="\LineConfig\Config_Line.csv"/>
<add key="ConfigPath_MoveEquip" value="\LineConfig\MoveEquip\Config_MoveEquip.csv" /> <add key="ConfigPath_MoveEquip" value="\LineConfig\MoveEquip\Config_MoveEquip.csv"/>
<add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" /> <add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv"/>
<add key="ConfigPath_ProvidingEquip" value="\LineConfig\Config_ProvidingEquip.csv" /> <add key="ConfigPath_ProvidingEquip" value="\LineConfig\Config_ProvidingEquip.csv"/>
<add key="ConfigPath_DischargeLine" value="\LineConfig\Config_DischargeLine.csv" /> <add key="ConfigPath_DischargeLine" value="\LineConfig\Config_DischargeLine.csv"/>
<add key="Line_Type" value="Line" /> <add key="Line_Type" value="Line"/>
<add key="Line_CID" value="rc1250" /> <add key="Line_CID" value="rc1250"/>
<!--end one store config--> <!--end one store config-->
<!--摄像机名称列表配置，用#分割--> <!--摄像机名称列表配置，用#分割-->
<add key="CameraName" value="GigE:MV-CE100-30GC (00C69898519)#GigE:MV-CE100-30GC (00C95305929)" /> <add key="CameraName" value="GigE:MV-CE100-30GC (00C69898519)#GigE:MV-CE100-30GC (00C95305929)"/>
<!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code--> <!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code-->
<add key="CodeType" value="Data Matrix ECC 200#QR Code" /> <add key="CodeType" value="Data Matrix ECC 200#QR Code"/>
<!--<add key="CodeType" value="Data Matrix ECC 200"/>--> <!--<add key="CodeType" value="Data Matrix ECC 200"/>-->
<add key="ACBaudRate" value="115200" /> <add key="ACBaudRate" value="115200"/>
<!--二维码参数文件所在路径，文件名与二维码类型名一样--> <!--二维码参数文件所在路径，文件名与二维码类型名一样-->
<add key="CodeParamPath" value="\CodeParam\" /> <add key="CodeParamPath" value="\CodeParam\"/>
<add key="Config_Pwd" value="123456" /> <add key="Config_Pwd" value="123456"/>
<!--出库等待料盘拿走的时间，秒--> <!--出库等待料盘拿走的时间，秒-->
<add key="OutStoreWaitSeconds" value="10" /> <add key="OutStoreWaitSeconds" value="10"/>
<add key="UseAIOBOX" value="1" /> <add key="UseAIOBOX" value="1"/>
<!--流水线监听端口--> <!--流水线监听端口-->
<add key="TCPServerPort" value="5246" /> <add key="TCPServerPort" value="5246"/>
<!--AGV调度服务器地址--> <!--AGV调度服务器地址-->
<add key="AgvServerIp" value="10.85.199.20" /> <add key="AgvServerIp" value="10.85.199.20"/>
<!--IO配置--> <!--IO配置-->
<add key="DIMS" value="60" /> <add key="DIMS" value="60"/>
<add key="DOMS" value="300" /> <add key="DOMS" value="300"/>
<add key="LineRunTest" value="1" /> <add key="LineRunTest" value="1"/>
<!--ABB机器人服务器--> <!--ABB机器人服务器-->
<add key="ABBServerPort" value="21" /> <add key="ABBServerPort" value="21"/>
<!--是否打开托盘编码界面--> <!--是否打开托盘编码界面-->
<add key="OpenRFIDWrite" value="1" /> <add key="OpenRFIDWrite" value="1"/>
<add key="DefaultPWD" value="123456" /> <add key="DefaultPWD" value="123456"/>
<!--当前调试的设备ID，分号分割--> <!--当前调试的设备ID，分号分割-->
<add key="DebugDeviceId" value="0" /> <add key="DebugDeviceId" value="0"/>
<add key="Server_Log_Open" value="0" /> <add key="Server_Log_Open" value="0"/>
<add key="CodeCount" value="4" /> <add key="CodeCount" value="4"/>
<add key="DefaultTrayNum" value="0" /> <add key="DefaultTrayNum" value="0"/>
<add key="NeedScanCode" value="1" /> <add key="NeedScanCode" value="1"/>
<add key="Agv_Log_Open" value="0" /> <add key="Agv_Log_Open" value="0"/>
<add key="NeedCheckTray" value="0" /> <add key="NeedCheckTray" value="0"/>
<add key="Feed_LastShelfID_101" value="B19" /> <add key="Feed_LastShelfID_101" value="B19"/>
<add key="Feed_LastShelfID_102" value="B23" /> <add key="Feed_LastShelfID_102" value="B23"/>
<add key="Feed_LastShelfID_103" value="B25" /> <add key="Feed_LastShelfID_103" value="B25"/>
<add key="Feed_LastShelfID_104" value="B7" /> <add key="Feed_LastShelfID_104" value="B7"/>
<add key="Brush_Delay_Seconds" value="5" /> <add key="Brush_Delay_Seconds" value="5"/>
<add key ="SaveErrorImageToFile" value ="1"/> <add key="SaveErrorImageToFile" value="1"/>
<add key ="UseTrayCheck" value ="8,"/> <add key="UseTrayCheck" value="4,5,6,9,12,13,14,15,20,18,8,16,17,1,2,11,7,3,10,19,101,102,103,"/>
<add key ="ConfigPath_TrayList" value ="\LineConfig\TrayList.data"/> <add key="ConfigPath_TrayList" value="\LineConfig\TrayList.data"/>
<add key="TESTFILE" value="D:\皮带线料盘识别\test.bmp"/> <add key="TESTFILE" value="D:\皮带线料盘识别\test.bmp"/>
</appSettings> </appSettings>
<!-- <log4net> --> <!-- <log4net> -->
...@@ -85,60 +85,60 @@ ...@@ -85,60 +85,60 @@
<!-- </log4net> --> <!-- </log4net> -->
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="logs/Line-RC1250.log" /> <file value="logs/Line-RC1250.log"/>
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8"/>
<appendToFile value="true" /> <appendToFile value="true"/>
<rollingStyle value="Date" /> <rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd" /> <datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" /> <conversionPattern value="[%date][%t]%-5p %m%n"/>
</layout> </layout>
</appender> </appender>
<appender name="TheRFID" type="log4net.Appender.RollingFileAppender"> <appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
<file value="logs/rfid/TheRFID-line.log" /> <file value="logs/rfid/TheRFID-line.log"/>
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8"/>
<appendToFile value="true" /> <appendToFile value="true"/>
<rollingStyle value="Date" /> <rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd" /> <datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" /> <conversionPattern value="[%date][%t]%-5p %m%n"/>
</layout> </layout>
</appender> </appender>
<appender name="AIOBOX" type="log4net.Appender.RollingFileAppender"> <appender name="AIOBOX" type="log4net.Appender.RollingFileAppender">
<file value="logs/aio/AIOBOX-line.log" /> <file value="logs/aio/AIOBOX-line.log"/>
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8"/>
<appendToFile value="true" /> <appendToFile value="true"/>
<rollingStyle value="Date" /> <rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd" /> <datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" /> <conversionPattern value="[%date][%t]%-5p %m%n"/>
</layout> </layout>
</appender> </appender>
<appender name="RunLog" type="log4net.Appender.RollingFileAppender"> <appender name="RunLog" type="log4net.Appender.RollingFileAppender">
<file value="logs/log/RunLog-line.log" /> <file value="logs/log/RunLog-line.log"/>
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8"/>
<appendToFile value="true" /> <appendToFile value="true"/>
<rollingStyle value="Date" /> <rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd" /> <datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value=" %m%n" /> <conversionPattern value=" %m%n"/>
</layout> </layout>
</appender> </appender>
<logger name="RollingLogFileAppender"> <logger name="RollingLogFileAppender">
<level value="Info" /> <level value="Info"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
</logger> </logger>
<logger name="TheRFID"> <logger name="TheRFID">
<level value="Info" /> <level value="Info"/>
<appender-ref ref="TheRFID" /> <appender-ref ref="TheRFID"/>
</logger> </logger>
<logger name="AIOBOX"> <logger name="AIOBOX">
<level value="Info" /> <level value="Info"/>
<appender-ref ref="AIOBOX" /> <appender-ref ref="AIOBOX"/>
</logger> </logger>
<logger name="RunLog"> <logger name="RunLog">
<level value="Info" /> <level value="Info"/>
<appender-ref ref="RunLog" /> <appender-ref ref="RunLog"/>
</logger> </logger>
<!--<root> <!--<root>
<level value="Info" /> <level value="Info" />
...@@ -146,14 +146,14 @@ ...@@ -146,14 +146,14 @@
</root>--> </root>-->
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="log4net" culture="neutral" publicKeyToken="669e0ddf0bb1aa2a" Retargetable="Yes" /> <assemblyIdentity name="log4net" culture="neutral" publicKeyToken="669e0ddf0bb1aa2a" Retargetable="Yes"/>
<bindingRedirect oldVersion="0.0.0.0-9.9.9.0" newVersion="2.0.8.0" /> <bindingRedirect oldVersion="0.0.0.0-9.9.9.0" newVersion="2.0.8.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration>
\ No newline at end of file \ No newline at end of file
</configuration>
source/AssemblyLineClient/AssemblyLineClient.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.AssemblyLine</RootNamespace> <RootNamespace>OnlineStore.AssemblyLine</RootNamespace>
<AssemblyName>AssemblyLine</AssemblyName> <AssemblyName>AssemblyLine</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.chbUseTrayCheck = new System.Windows.Forms.CheckBox();
this.btnUpdateShelf = new System.Windows.Forms.Button(); this.btnUpdateShelf = new System.Windows.Forms.Button();
this.txtShelfID = new System.Windows.Forms.TextBox(); this.txtShelfID = new System.Windows.Forms.TextBox();
this.lblwidth = new System.Windows.Forms.Label(); this.lblwidth = new System.Windows.Forms.Label();
...@@ -109,7 +110,6 @@ ...@@ -109,7 +110,6 @@
this.chbMoveStop = new System.Windows.Forms.CheckBox(); this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.lblName = new System.Windows.Forms.Label(); this.lblName = new System.Windows.Forms.Label();
this.btnScan = new System.Windows.Forms.Button(); this.btnScan = new System.Windows.Forms.Button();
this.chbUseTrayCheck = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -147,9 +147,11 @@ ...@@ -147,9 +147,11 @@
this.groupBox1.Controls.Add(this.txtWriteTime); this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(685, 390); this.groupBox1.Location = new System.Drawing.Point(881, 459);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(604, 99); this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Size = new System.Drawing.Size(777, 116);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
...@@ -158,10 +160,11 @@ ...@@ -158,10 +160,11 @@
// //
this.txtDOIndex.Enabled = false; this.txtDOIndex.Enabled = false;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(237, 56); this.txtDOIndex.Location = new System.Drawing.Point(305, 66);
this.txtDOIndex.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtDOIndex.MaxLength = 10; this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex"; this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(47, 23); this.txtDOIndex.Size = new System.Drawing.Size(59, 27);
this.txtDOIndex.TabIndex = 260; this.txtDOIndex.TabIndex = 260;
this.txtDOIndex.Text = "0"; this.txtDOIndex.Text = "0";
// //
...@@ -169,10 +172,11 @@ ...@@ -169,10 +172,11 @@
// //
this.txtDoName.Enabled = false; this.txtDoName.Enabled = false;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(69, 56); this.txtDoName.Location = new System.Drawing.Point(89, 66);
this.txtDoName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtDoName.MaxLength = 10; this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName"; this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(116, 23); this.txtDoName.Size = new System.Drawing.Size(148, 27);
this.txtDoName.TabIndex = 259; this.txtDoName.TabIndex = 259;
this.txtDoName.Text = "0"; this.txtDoName.Text = "0";
// //
...@@ -181,9 +185,10 @@ ...@@ -181,9 +185,10 @@
this.label17.AutoSize = true; this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(17, 59); this.label17.Location = new System.Drawing.Point(22, 69);
this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17"; this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 17); this.label17.Size = new System.Drawing.Size(56, 20);
this.label17.TabIndex = 258; this.label17.TabIndex = 258;
this.label17.Text = "设备IP:"; this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -193,9 +198,10 @@ ...@@ -193,9 +198,10 @@
this.label14.AutoSize = true; this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(201, 59); this.label14.Location = new System.Drawing.Point(258, 69);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17); this.label14.Size = new System.Drawing.Size(43, 20);
this.label14.TabIndex = 257; this.label14.TabIndex = 257;
this.label14.Text = "地址:"; this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -205,9 +211,10 @@ ...@@ -205,9 +211,10 @@
this.btnOpenDo.BackColor = System.Drawing.Color.White; this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(297, 51); this.btnOpenDo.Location = new System.Drawing.Point(382, 60);
this.btnOpenDo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOpenDo.Name = "btnOpenDo"; this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(110, 34); this.btnOpenDo.Size = new System.Drawing.Size(141, 40);
this.btnOpenDo.TabIndex = 256; this.btnOpenDo.TabIndex = 256;
this.btnOpenDo.Text = "打开"; this.btnOpenDo.Text = "打开";
this.btnOpenDo.UseVisualStyleBackColor = false; this.btnOpenDo.UseVisualStyleBackColor = false;
...@@ -216,10 +223,11 @@ ...@@ -216,10 +223,11 @@
// txtSlaveId // txtSlaveId
// //
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.Location = new System.Drawing.Point(133, 110); this.txtSlaveId.Location = new System.Drawing.Point(171, 129);
this.txtSlaveId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtSlaveId.MaxLength = 10; this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId"; this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 23); this.txtSlaveId.Size = new System.Drawing.Size(14, 27);
this.txtSlaveId.TabIndex = 255; this.txtSlaveId.TabIndex = 255;
this.txtSlaveId.Text = "0"; this.txtSlaveId.Text = "0";
this.txtSlaveId.Visible = false; this.txtSlaveId.Visible = false;
...@@ -230,9 +238,10 @@ ...@@ -230,9 +238,10 @@
this.chbAutoRead.Checked = true; this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked; this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(316, 57); this.chbAutoRead.Location = new System.Drawing.Point(406, 67);
this.chbAutoRead.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbAutoRead.Name = "chbAutoRead"; this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21); this.chbAutoRead.Size = new System.Drawing.Size(91, 24);
this.chbAutoRead.TabIndex = 244; this.chbAutoRead.TabIndex = 244;
this.chbAutoRead.Text = "自动读取"; this.chbAutoRead.Text = "自动读取";
this.chbAutoRead.UseVisualStyleBackColor = true; this.chbAutoRead.UseVisualStyleBackColor = true;
...@@ -246,9 +255,10 @@ ...@@ -246,9 +255,10 @@
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.ItemHeight = 22; this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(17, 18); this.cmbWriteIO.Location = new System.Drawing.Point(22, 21);
this.cmbWriteIO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbWriteIO.Name = "cmbWriteIO"; this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(356, 28); this.cmbWriteIO.Size = new System.Drawing.Size(457, 28);
this.cmbWriteIO.TabIndex = 234; this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName"; this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem); this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
...@@ -259,9 +269,10 @@ ...@@ -259,9 +269,10 @@
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White; this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(409, 51); this.btnWriteSingleDO.Location = new System.Drawing.Point(526, 60);
this.btnWriteSingleDO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnWriteSingleDO.Name = "btnWriteSingleDO"; this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(110, 34); this.btnWriteSingleDO.Size = new System.Drawing.Size(141, 40);
this.btnWriteSingleDO.TabIndex = 232; this.btnWriteSingleDO.TabIndex = 232;
this.btnWriteSingleDO.Text = "关闭"; this.btnWriteSingleDO.Text = "关闭";
this.btnWriteSingleDO.UseVisualStyleBackColor = false; this.btnWriteSingleDO.UseVisualStyleBackColor = false;
...@@ -270,10 +281,11 @@ ...@@ -270,10 +281,11 @@
// txtWriteTime // txtWriteTime
// //
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(453, 23); this.txtWriteTime.Location = new System.Drawing.Point(582, 27);
this.txtWriteTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWriteTime.MaxLength = 10; this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime"; this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(66, 23); this.txtWriteTime.Size = new System.Drawing.Size(84, 27);
this.txtWriteTime.TabIndex = 238; this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0"; this.txtWriteTime.Text = "0";
// //
...@@ -282,9 +294,10 @@ ...@@ -282,9 +294,10 @@
this.label5.AutoSize = true; this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(390, 26); this.label5.Location = new System.Drawing.Point(501, 31);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17); this.label5.Size = new System.Drawing.Size(74, 20);
this.label5.TabIndex = 237; this.label5.TabIndex = 237;
this.label5.Text = "定时(ms):"; this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -294,9 +307,11 @@ ...@@ -294,9 +307,11 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(457, 1); this.groupBox4.Location = new System.Drawing.Point(588, 1);
this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(220, 491); this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Size = new System.Drawing.Size(283, 578);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -308,12 +323,13 @@ ...@@ -308,12 +323,13 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.ColumnCount = 1; this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14); this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 16);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(209, 471); this.tableLayoutPanel2.Size = new System.Drawing.Size(269, 554);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -321,9 +337,11 @@ ...@@ -321,9 +337,11 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 1); this.groupBox3.Location = new System.Drawing.Point(8, 1);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(220, 491); this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Size = new System.Drawing.Size(283, 578);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -335,12 +353,13 @@ ...@@ -335,12 +353,13 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14); this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 16);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 471); this.tableLayoutPanel1.Size = new System.Drawing.Size(269, 554);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox5 // groupBox5
...@@ -368,9 +387,11 @@ ...@@ -368,9 +387,11 @@
this.groupBox5.Controls.Add(this.btnFeedSideWayCylinder); this.groupBox5.Controls.Add(this.btnFeedSideWayCylinder);
this.groupBox5.Controls.Add(this.btnFeedCylinder); this.groupBox5.Controls.Add(this.btnFeedCylinder);
this.groupBox5.Controls.Add(this.btnFeedSideWay); this.groupBox5.Controls.Add(this.btnFeedSideWay);
this.groupBox5.Location = new System.Drawing.Point(931, 1); this.groupBox5.Location = new System.Drawing.Point(1197, 1);
this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(362, 389); this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox5.Size = new System.Drawing.Size(465, 458);
this.groupBox5.TabIndex = 255; this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试"; this.groupBox5.Text = "IO操作测试";
...@@ -380,9 +401,10 @@ ...@@ -380,9 +401,10 @@
this.btnOutStopDown.BackColor = System.Drawing.Color.White; this.btnOutStopDown.BackColor = System.Drawing.Color.White;
this.btnOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStopDown.Location = new System.Drawing.Point(168, 179); this.btnOutStopDown.Location = new System.Drawing.Point(216, 211);
this.btnOutStopDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOutStopDown.Name = "btnOutStopDown"; this.btnOutStopDown.Name = "btnOutStopDown";
this.btnOutStopDown.Size = new System.Drawing.Size(153, 34); this.btnOutStopDown.Size = new System.Drawing.Size(197, 40);
this.btnOutStopDown.TabIndex = 272; this.btnOutStopDown.TabIndex = 272;
this.btnOutStopDown.Text = "SL出料阻挡下降"; this.btnOutStopDown.Text = "SL出料阻挡下降";
this.btnOutStopDown.UseVisualStyleBackColor = false; this.btnOutStopDown.UseVisualStyleBackColor = false;
...@@ -393,9 +415,10 @@ ...@@ -393,9 +415,10 @@
this.btnSwStop.BackColor = System.Drawing.Color.White; this.btnSwStop.BackColor = System.Drawing.Color.White;
this.btnSwStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSwStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSwStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSwStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSwStop.Location = new System.Drawing.Point(8, 258); this.btnSwStop.Location = new System.Drawing.Point(10, 304);
this.btnSwStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSwStop.Name = "btnSwStop"; this.btnSwStop.Name = "btnSwStop";
this.btnSwStop.Size = new System.Drawing.Size(153, 34); this.btnSwStop.Size = new System.Drawing.Size(197, 40);
this.btnSwStop.TabIndex = 271; this.btnSwStop.TabIndex = 271;
this.btnSwStop.Text = "环形线阻挡气缸下降"; this.btnSwStop.Text = "环形线阻挡气缸下降";
this.btnSwStop.UseVisualStyleBackColor = false; this.btnSwStop.UseVisualStyleBackColor = false;
...@@ -406,9 +429,10 @@ ...@@ -406,9 +429,10 @@
this.btnFLStop1.BackColor = System.Drawing.Color.White; this.btnFLStop1.BackColor = System.Drawing.Color.White;
this.btnFLStop1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFLStop1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFLStop1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFLStop1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFLStop1.Location = new System.Drawing.Point(9, 257); this.btnFLStop1.Location = new System.Drawing.Point(12, 302);
this.btnFLStop1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFLStop1.Name = "btnFLStop1"; this.btnFLStop1.Name = "btnFLStop1";
this.btnFLStop1.Size = new System.Drawing.Size(153, 34); this.btnFLStop1.Size = new System.Drawing.Size(197, 40);
this.btnFLStop1.TabIndex = 270; this.btnFLStop1.TabIndex = 270;
this.btnFLStop1.Text = "FL阻挡1下降"; this.btnFLStop1.Text = "FL阻挡1下降";
this.btnFLStop1.UseVisualStyleBackColor = false; this.btnFLStop1.UseVisualStyleBackColor = false;
...@@ -419,9 +443,10 @@ ...@@ -419,9 +443,10 @@
this.btnFLStop2Down.BackColor = System.Drawing.Color.White; this.btnFLStop2Down.BackColor = System.Drawing.Color.White;
this.btnFLStop2Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFLStop2Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFLStop2Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFLStop2Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFLStop2Down.Location = new System.Drawing.Point(168, 257); this.btnFLStop2Down.Location = new System.Drawing.Point(216, 302);
this.btnFLStop2Down.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFLStop2Down.Name = "btnFLStop2Down"; this.btnFLStop2Down.Name = "btnFLStop2Down";
this.btnFLStop2Down.Size = new System.Drawing.Size(153, 34); this.btnFLStop2Down.Size = new System.Drawing.Size(197, 40);
this.btnFLStop2Down.TabIndex = 269; this.btnFLStop2Down.TabIndex = 269;
this.btnFLStop2Down.Text = "FL阻挡2下降"; this.btnFLStop2Down.Text = "FL阻挡2下降";
this.btnFLStop2Down.UseVisualStyleBackColor = false; this.btnFLStop2Down.UseVisualStyleBackColor = false;
...@@ -432,9 +457,10 @@ ...@@ -432,9 +457,10 @@
this.btnOLine.BackColor = System.Drawing.Color.White; this.btnOLine.BackColor = System.Drawing.Color.White;
this.btnOLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOLine.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOLine.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOLine.Location = new System.Drawing.Point(168, 23); this.btnOLine.Location = new System.Drawing.Point(216, 27);
this.btnOLine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOLine.Name = "btnOLine"; this.btnOLine.Name = "btnOLine";
this.btnOLine.Size = new System.Drawing.Size(153, 34); this.btnOLine.Size = new System.Drawing.Size(197, 40);
this.btnOLine.TabIndex = 268; this.btnOLine.TabIndex = 268;
this.btnOLine.Text = "SL出料线体运转"; this.btnOLine.Text = "SL出料线体运转";
this.btnOLine.UseVisualStyleBackColor = false; this.btnOLine.UseVisualStyleBackColor = false;
...@@ -446,9 +472,10 @@ ...@@ -446,9 +472,10 @@
this.btnBStopDown.BackColor = System.Drawing.Color.White; this.btnBStopDown.BackColor = System.Drawing.Color.White;
this.btnBStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBStopDown.Location = new System.Drawing.Point(168, 101); this.btnBStopDown.Location = new System.Drawing.Point(216, 119);
this.btnBStopDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBStopDown.Name = "btnBStopDown"; this.btnBStopDown.Name = "btnBStopDown";
this.btnBStopDown.Size = new System.Drawing.Size(153, 34); this.btnBStopDown.Size = new System.Drawing.Size(197, 40);
this.btnBStopDown.TabIndex = 267; this.btnBStopDown.TabIndex = 267;
this.btnBStopDown.Text = "SL缓冲阻挡下降"; this.btnBStopDown.Text = "SL缓冲阻挡下降";
this.btnBStopDown.UseVisualStyleBackColor = false; this.btnBStopDown.UseVisualStyleBackColor = false;
...@@ -459,9 +486,10 @@ ...@@ -459,9 +486,10 @@
this.btnEStopDown.BackColor = System.Drawing.Color.White; this.btnEStopDown.BackColor = System.Drawing.Color.White;
this.btnEStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnEStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnEStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnEStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnEStopDown.Location = new System.Drawing.Point(9, 101); this.btnEStopDown.Location = new System.Drawing.Point(12, 119);
this.btnEStopDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnEStopDown.Name = "btnEStopDown"; this.btnEStopDown.Name = "btnEStopDown";
this.btnEStopDown.Size = new System.Drawing.Size(153, 34); this.btnEStopDown.Size = new System.Drawing.Size(197, 40);
this.btnEStopDown.TabIndex = 266; this.btnEStopDown.TabIndex = 266;
this.btnEStopDown.Text = "SL进料阻挡下降"; this.btnEStopDown.Text = "SL进料阻挡下降";
this.btnEStopDown.UseVisualStyleBackColor = false; this.btnEStopDown.UseVisualStyleBackColor = false;
...@@ -472,9 +500,10 @@ ...@@ -472,9 +500,10 @@
this.btnOSWRun.BackColor = System.Drawing.Color.White; this.btnOSWRun.BackColor = System.Drawing.Color.White;
this.btnOSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOSWRun.Location = new System.Drawing.Point(168, 62); this.btnOSWRun.Location = new System.Drawing.Point(216, 73);
this.btnOSWRun.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOSWRun.Name = "btnOSWRun"; this.btnOSWRun.Name = "btnOSWRun";
this.btnOSWRun.Size = new System.Drawing.Size(153, 34); this.btnOSWRun.Size = new System.Drawing.Size(197, 40);
this.btnOSWRun.TabIndex = 265; this.btnOSWRun.TabIndex = 265;
this.btnOSWRun.Text = "SL出口横移电机运转"; this.btnOSWRun.Text = "SL出口横移电机运转";
this.btnOSWRun.UseVisualStyleBackColor = false; this.btnOSWRun.UseVisualStyleBackColor = false;
...@@ -485,9 +514,10 @@ ...@@ -485,9 +514,10 @@
this.btnLSWRun.BackColor = System.Drawing.Color.White; this.btnLSWRun.BackColor = System.Drawing.Color.White;
this.btnLSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLSWRun.Location = new System.Drawing.Point(9, 62); this.btnLSWRun.Location = new System.Drawing.Point(12, 73);
this.btnLSWRun.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLSWRun.Name = "btnLSWRun"; this.btnLSWRun.Name = "btnLSWRun";
this.btnLSWRun.Size = new System.Drawing.Size(153, 34); this.btnLSWRun.Size = new System.Drawing.Size(197, 40);
this.btnLSWRun.TabIndex = 264; this.btnLSWRun.TabIndex = 264;
this.btnLSWRun.Text = "SL定位横移电机运转"; this.btnLSWRun.Text = "SL定位横移电机运转";
this.btnLSWRun.UseVisualStyleBackColor = false; this.btnLSWRun.UseVisualStyleBackColor = false;
...@@ -498,9 +528,10 @@ ...@@ -498,9 +528,10 @@
this.btnLineRun.BackColor = System.Drawing.Color.White; this.btnLineRun.BackColor = System.Drawing.Color.White;
this.btnLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineRun.Location = new System.Drawing.Point(9, 23); this.btnLineRun.Location = new System.Drawing.Point(12, 27);
this.btnLineRun.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLineRun.Name = "btnLineRun"; this.btnLineRun.Name = "btnLineRun";
this.btnLineRun.Size = new System.Drawing.Size(153, 34); this.btnLineRun.Size = new System.Drawing.Size(197, 40);
this.btnLineRun.TabIndex = 263; this.btnLineRun.TabIndex = 263;
this.btnLineRun.Text = "SL进料线体运转"; this.btnLineRun.Text = "SL进料线体运转";
this.btnLineRun.UseVisualStyleBackColor = false; this.btnLineRun.UseVisualStyleBackColor = false;
...@@ -511,9 +542,10 @@ ...@@ -511,9 +542,10 @@
this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White; this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White;
this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFL_TopCylinder.Location = new System.Drawing.Point(9, 296); this.btnFL_TopCylinder.Location = new System.Drawing.Point(12, 348);
this.btnFL_TopCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFL_TopCylinder.Name = "btnFL_TopCylinder"; this.btnFL_TopCylinder.Name = "btnFL_TopCylinder";
this.btnFL_TopCylinder.Size = new System.Drawing.Size(153, 34); this.btnFL_TopCylinder.Size = new System.Drawing.Size(197, 40);
this.btnFL_TopCylinder.TabIndex = 262; this.btnFL_TopCylinder.TabIndex = 262;
this.btnFL_TopCylinder.Text = "FL顶升上升"; this.btnFL_TopCylinder.Text = "FL顶升上升";
this.btnFL_TopCylinder.UseVisualStyleBackColor = false; this.btnFL_TopCylinder.UseVisualStyleBackColor = false;
...@@ -524,9 +556,10 @@ ...@@ -524,9 +556,10 @@
this.btnSwLocationCylinder.BackColor = System.Drawing.Color.White; this.btnSwLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnSwLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSwLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSwLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSwLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSwLocationCylinder.Location = new System.Drawing.Point(168, 258); this.btnSwLocationCylinder.Location = new System.Drawing.Point(216, 304);
this.btnSwLocationCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSwLocationCylinder.Name = "btnSwLocationCylinder"; this.btnSwLocationCylinder.Name = "btnSwLocationCylinder";
this.btnSwLocationCylinder.Size = new System.Drawing.Size(153, 34); this.btnSwLocationCylinder.Size = new System.Drawing.Size(197, 40);
this.btnSwLocationCylinder.TabIndex = 261; this.btnSwLocationCylinder.TabIndex = 261;
this.btnSwLocationCylinder.Text = "环形线横移定位上升"; this.btnSwLocationCylinder.Text = "环形线横移定位上升";
this.btnSwLocationCylinder.UseVisualStyleBackColor = false; this.btnSwLocationCylinder.UseVisualStyleBackColor = false;
...@@ -537,9 +570,10 @@ ...@@ -537,9 +570,10 @@
this.btnSWTop.BackColor = System.Drawing.Color.White; this.btnSWTop.BackColor = System.Drawing.Color.White;
this.btnSWTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSWTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSWTop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSWTop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSWTop.Location = new System.Drawing.Point(168, 296); this.btnSWTop.Location = new System.Drawing.Point(216, 348);
this.btnSWTop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSWTop.Name = "btnSWTop"; this.btnSWTop.Name = "btnSWTop";
this.btnSWTop.Size = new System.Drawing.Size(153, 34); this.btnSWTop.Size = new System.Drawing.Size(197, 40);
this.btnSWTop.TabIndex = 260; this.btnSWTop.TabIndex = 260;
this.btnSWTop.Text = "环形线横移顶升上升"; this.btnSWTop.Text = "环形线横移顶升上升";
this.btnSWTop.UseVisualStyleBackColor = false; this.btnSWTop.UseVisualStyleBackColor = false;
...@@ -550,9 +584,10 @@ ...@@ -550,9 +584,10 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White; this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(9, 335); this.btnCloseAll.Location = new System.Drawing.Point(12, 394);
this.btnCloseAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(153, 34); this.btnCloseAll.Size = new System.Drawing.Size(197, 40);
this.btnCloseAll.TabIndex = 259; this.btnCloseAll.TabIndex = 259;
this.btnCloseAll.Text = "关闭所有DO"; this.btnCloseAll.Text = "关闭所有DO";
this.btnCloseAll.UseVisualStyleBackColor = false; this.btnCloseAll.UseVisualStyleBackColor = false;
...@@ -563,9 +598,10 @@ ...@@ -563,9 +598,10 @@
this.btnOutTopCylinder.BackColor = System.Drawing.Color.White; this.btnOutTopCylinder.BackColor = System.Drawing.Color.White;
this.btnOutTopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutTopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutTopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutTopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutTopCylinder.Location = new System.Drawing.Point(168, 140); this.btnOutTopCylinder.Location = new System.Drawing.Point(216, 165);
this.btnOutTopCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOutTopCylinder.Name = "btnOutTopCylinder"; this.btnOutTopCylinder.Name = "btnOutTopCylinder";
this.btnOutTopCylinder.Size = new System.Drawing.Size(153, 34); this.btnOutTopCylinder.Size = new System.Drawing.Size(197, 40);
this.btnOutTopCylinder.TabIndex = 258; this.btnOutTopCylinder.TabIndex = 258;
this.btnOutTopCylinder.Text = "SL出口顶升上升"; this.btnOutTopCylinder.Text = "SL出口顶升上升";
this.btnOutTopCylinder.UseVisualStyleBackColor = false; this.btnOutTopCylinder.UseVisualStyleBackColor = false;
...@@ -576,9 +612,10 @@ ...@@ -576,9 +612,10 @@
this.btnLocationCylinder.BackColor = System.Drawing.Color.White; this.btnLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationCylinder.Location = new System.Drawing.Point(9, 140); this.btnLocationCylinder.Location = new System.Drawing.Point(12, 165);
this.btnLocationCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnLocationCylinder.Name = "btnLocationCylinder"; this.btnLocationCylinder.Name = "btnLocationCylinder";
this.btnLocationCylinder.Size = new System.Drawing.Size(153, 34); this.btnLocationCylinder.Size = new System.Drawing.Size(197, 40);
this.btnLocationCylinder.TabIndex = 256; this.btnLocationCylinder.TabIndex = 256;
this.btnLocationCylinder.Text = "SL定位气缸上升"; this.btnLocationCylinder.Text = "SL定位气缸上升";
this.btnLocationCylinder.UseVisualStyleBackColor = false; this.btnLocationCylinder.UseVisualStyleBackColor = false;
...@@ -589,9 +626,10 @@ ...@@ -589,9 +626,10 @@
this.btnTrayLocationCylinder.BackColor = System.Drawing.Color.White; this.btnTrayLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnTrayLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTrayLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnTrayLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTrayLocationCylinder.Location = new System.Drawing.Point(168, 335); this.btnTrayLocationCylinder.Location = new System.Drawing.Point(216, 394);
this.btnTrayLocationCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTrayLocationCylinder.Name = "btnTrayLocationCylinder"; this.btnTrayLocationCylinder.Name = "btnTrayLocationCylinder";
this.btnTrayLocationCylinder.Size = new System.Drawing.Size(153, 34); this.btnTrayLocationCylinder.Size = new System.Drawing.Size(197, 40);
this.btnTrayLocationCylinder.TabIndex = 255; this.btnTrayLocationCylinder.TabIndex = 255;
this.btnTrayLocationCylinder.Text = "SL升降盘定位气缸前进"; this.btnTrayLocationCylinder.Text = "SL升降盘定位气缸前进";
this.btnTrayLocationCylinder.UseVisualStyleBackColor = false; this.btnTrayLocationCylinder.UseVisualStyleBackColor = false;
...@@ -602,9 +640,10 @@ ...@@ -602,9 +640,10 @@
this.btnFeedSideWayCylinder.BackColor = System.Drawing.Color.White; this.btnFeedSideWayCylinder.BackColor = System.Drawing.Color.White;
this.btnFeedSideWayCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedSideWayCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedSideWayCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedSideWayCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedSideWayCylinder.Location = new System.Drawing.Point(9, 179); this.btnFeedSideWayCylinder.Location = new System.Drawing.Point(12, 211);
this.btnFeedSideWayCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFeedSideWayCylinder.Name = "btnFeedSideWayCylinder"; this.btnFeedSideWayCylinder.Name = "btnFeedSideWayCylinder";
this.btnFeedSideWayCylinder.Size = new System.Drawing.Size(153, 34); this.btnFeedSideWayCylinder.Size = new System.Drawing.Size(197, 40);
this.btnFeedSideWayCylinder.TabIndex = 252; this.btnFeedSideWayCylinder.TabIndex = 252;
this.btnFeedSideWayCylinder.Text = "上料横移气缸取料端"; this.btnFeedSideWayCylinder.Text = "上料横移气缸取料端";
this.btnFeedSideWayCylinder.UseVisualStyleBackColor = false; this.btnFeedSideWayCylinder.UseVisualStyleBackColor = false;
...@@ -615,9 +654,10 @@ ...@@ -615,9 +654,10 @@
this.btnFeedCylinder.BackColor = System.Drawing.Color.White; this.btnFeedCylinder.BackColor = System.Drawing.Color.White;
this.btnFeedCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedCylinder.Location = new System.Drawing.Point(168, 217); this.btnFeedCylinder.Location = new System.Drawing.Point(216, 255);
this.btnFeedCylinder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFeedCylinder.Name = "btnFeedCylinder"; this.btnFeedCylinder.Name = "btnFeedCylinder";
this.btnFeedCylinder.Size = new System.Drawing.Size(153, 34); this.btnFeedCylinder.Size = new System.Drawing.Size(197, 40);
this.btnFeedCylinder.TabIndex = 249; this.btnFeedCylinder.TabIndex = 249;
this.btnFeedCylinder.Text = "夹料气缸放松"; this.btnFeedCylinder.Text = "夹料气缸放松";
this.btnFeedCylinder.UseVisualStyleBackColor = false; this.btnFeedCylinder.UseVisualStyleBackColor = false;
...@@ -628,9 +668,10 @@ ...@@ -628,9 +668,10 @@
this.btnFeedSideWay.BackColor = System.Drawing.Color.White; this.btnFeedSideWay.BackColor = System.Drawing.Color.White;
this.btnFeedSideWay.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFeedSideWay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedSideWay.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFeedSideWay.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedSideWay.Location = new System.Drawing.Point(9, 217); this.btnFeedSideWay.Location = new System.Drawing.Point(12, 255);
this.btnFeedSideWay.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnFeedSideWay.Name = "btnFeedSideWay"; this.btnFeedSideWay.Name = "btnFeedSideWay";
this.btnFeedSideWay.Size = new System.Drawing.Size(153, 34); this.btnFeedSideWay.Size = new System.Drawing.Size(197, 40);
this.btnFeedSideWay.TabIndex = 246; this.btnFeedSideWay.TabIndex = 246;
this.btnFeedSideWay.Text = "上料横移机构上升"; this.btnFeedSideWay.Text = "上料横移机构上升";
this.btnFeedSideWay.UseVisualStyleBackColor = false; this.btnFeedSideWay.UseVisualStyleBackColor = false;
...@@ -640,9 +681,10 @@ ...@@ -640,9 +681,10 @@
// //
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(651, 13); this.chbDebug.Location = new System.Drawing.Point(837, 15);
this.chbDebug.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.TabIndex = 247; this.chbDebug.TabIndex = 247;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -655,9 +697,10 @@ ...@@ -655,9 +697,10 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red; this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(406, 21); this.lblThisSta.Location = new System.Drawing.Point(522, 25);
this.lblThisSta.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(881, 330); this.lblThisSta.Size = new System.Drawing.Size(1133, 388);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -668,9 +711,10 @@ ...@@ -668,9 +711,10 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green; this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(979, 15); this.lblStoreStatus.Location = new System.Drawing.Point(1259, 18);
this.lblStoreStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblStoreStatus.Name = "lblStoreStatus"; this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20); this.lblStoreStatus.Size = new System.Drawing.Size(82, 24);
this.lblStoreStatus.TabIndex = 245; this.lblStoreStatus.TabIndex = 245;
this.lblStoreStatus.Text = "等待启动"; this.lblStoreStatus.Text = "等待启动";
this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -680,9 +724,10 @@ ...@@ -680,9 +724,10 @@
this.btnStart.BackColor = System.Drawing.Color.White; this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(190, 5); this.btnStart.Location = new System.Drawing.Point(244, 6);
this.btnStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStart.Name = "btnStart"; this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 40); this.btnStart.Size = new System.Drawing.Size(141, 47);
this.btnStart.TabIndex = 86; this.btnStart.TabIndex = 86;
this.btnStart.Text = "启动调试"; this.btnStart.Text = "启动调试";
this.btnStart.UseVisualStyleBackColor = false; this.btnStart.UseVisualStyleBackColor = false;
...@@ -693,9 +738,10 @@ ...@@ -693,9 +738,10 @@
this.btnStop.BackColor = System.Drawing.Color.White; this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(305, 5); this.btnStop.Location = new System.Drawing.Point(392, 6);
this.btnStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStop.Name = "btnStop"; this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 40); this.btnStop.Size = new System.Drawing.Size(141, 47);
this.btnStop.TabIndex = 87; this.btnStop.TabIndex = 87;
this.btnStop.Text = "停止"; this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = false; this.btnStop.UseVisualStyleBackColor = false;
...@@ -707,9 +753,10 @@ ...@@ -707,9 +753,10 @@
this.btnReset.Enabled = false; this.btnReset.Enabled = false;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(420, 5); this.btnReset.Location = new System.Drawing.Point(540, 6);
this.btnReset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnReset.Name = "btnReset"; this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(110, 40); this.btnReset.Size = new System.Drawing.Size(141, 47);
this.btnReset.TabIndex = 95; this.btnReset.TabIndex = 95;
this.btnReset.Text = "复位"; this.btnReset.Text = "复位";
this.btnReset.UseVisualStyleBackColor = false; this.btnReset.UseVisualStyleBackColor = false;
...@@ -723,18 +770,20 @@ ...@@ -723,18 +770,20 @@
this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(5, 52); this.tabControl1.Location = new System.Drawing.Point(6, 61);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1307, 526); this.tabControl1.Size = new System.Drawing.Size(1680, 619);
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
// //
// tabPage3 // tabPage3
// //
this.tabPage3.Controls.Add(this.groupBox6); this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 26); this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1299, 496); this.tabPage3.Size = new System.Drawing.Size(1672, 586);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "状态信息"; this.tabPage3.Text = "状态信息";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -752,21 +801,37 @@ ...@@ -752,21 +801,37 @@
this.groupBox6.Controls.Add(this.lblAgvInfo); this.groupBox6.Controls.Add(this.lblAgvInfo);
this.groupBox6.Controls.Add(this.lblInstoreList); this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblThisSta); this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(3, 3); this.groupBox6.Location = new System.Drawing.Point(4, 4);
this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(1293, 497); this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Size = new System.Drawing.Size(1662, 585);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息"; this.groupBox6.Text = "消息";
// //
// chbUseTrayCheck
//
this.chbUseTrayCheck.AutoSize = true;
this.chbUseTrayCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseTrayCheck.Location = new System.Drawing.Point(361, 525);
this.chbUseTrayCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbUseTrayCheck.Name = "chbUseTrayCheck";
this.chbUseTrayCheck.Size = new System.Drawing.Size(140, 28);
this.chbUseTrayCheck.TabIndex = 283;
this.chbUseTrayCheck.Text = "启用料盘检测";
this.chbUseTrayCheck.UseVisualStyleBackColor = true;
this.chbUseTrayCheck.CheckedChanged += new System.EventHandler(this.chbUseTrayCheck_CheckedChanged);
//
// btnUpdateShelf // btnUpdateShelf
// //
this.btnUpdateShelf.BackColor = System.Drawing.Color.White; this.btnUpdateShelf.BackColor = System.Drawing.Color.White;
this.btnUpdateShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdateShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdateShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateShelf.Location = new System.Drawing.Point(119, 435); this.btnUpdateShelf.Location = new System.Drawing.Point(153, 512);
this.btnUpdateShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdateShelf.Name = "btnUpdateShelf"; this.btnUpdateShelf.Name = "btnUpdateShelf";
this.btnUpdateShelf.Size = new System.Drawing.Size(110, 40); this.btnUpdateShelf.Size = new System.Drawing.Size(141, 47);
this.btnUpdateShelf.TabIndex = 281; this.btnUpdateShelf.TabIndex = 281;
this.btnUpdateShelf.Text = "更改料架号"; this.btnUpdateShelf.Text = "更改料架号";
this.btnUpdateShelf.UseVisualStyleBackColor = false; this.btnUpdateShelf.UseVisualStyleBackColor = false;
...@@ -775,10 +840,11 @@ ...@@ -775,10 +840,11 @@
// txtShelfID // txtShelfID
// //
this.txtShelfID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtShelfID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtShelfID.Location = new System.Drawing.Point(13, 444); this.txtShelfID.Location = new System.Drawing.Point(17, 522);
this.txtShelfID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtShelfID.MaxLength = 6; this.txtShelfID.MaxLength = 6;
this.txtShelfID.Name = "txtShelfID"; this.txtShelfID.Name = "txtShelfID";
this.txtShelfID.Size = new System.Drawing.Size(100, 26); this.txtShelfID.Size = new System.Drawing.Size(127, 31);
this.txtShelfID.TabIndex = 280; this.txtShelfID.TabIndex = 280;
// //
// lblwidth // lblwidth
...@@ -786,9 +852,10 @@ ...@@ -786,9 +852,10 @@
this.lblwidth.AutoSize = true; this.lblwidth.AutoSize = true;
this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblwidth.Location = new System.Drawing.Point(21, 47); this.lblwidth.Location = new System.Drawing.Point(27, 55);
this.lblwidth.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblwidth.Name = "lblwidth"; this.lblwidth.Name = "lblwidth";
this.lblwidth.Size = new System.Drawing.Size(92, 17); this.lblwidth.Size = new System.Drawing.Size(114, 20);
this.lblwidth.TabIndex = 279; this.lblwidth.TabIndex = 279;
this.lblwidth.Text = "当前料盘宽度："; this.lblwidth.Text = "当前料盘宽度：";
// //
...@@ -797,9 +864,10 @@ ...@@ -797,9 +864,10 @@
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(21, 73); this.lblMoveInfo.Location = new System.Drawing.Point(27, 86);
this.lblMoveInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17); this.lblMoveInfo.Size = new System.Drawing.Size(84, 20);
this.lblMoveInfo.TabIndex = 278; this.lblMoveInfo.TabIndex = 278;
this.lblMoveInfo.Text = "运动信息："; this.lblMoveInfo.Text = "运动信息：";
// //
...@@ -808,9 +876,10 @@ ...@@ -808,9 +876,10 @@
this.lblAgvInfo.AutoSize = true; this.lblAgvInfo.AutoSize = true;
this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(21, 21); this.lblAgvInfo.Location = new System.Drawing.Point(27, 25);
this.lblAgvInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblAgvInfo.Name = "lblAgvInfo"; this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17); this.lblAgvInfo.Size = new System.Drawing.Size(75, 20);
this.lblAgvInfo.TabIndex = 276; this.lblAgvInfo.TabIndex = 276;
this.lblAgvInfo.Text = "AGV 状态"; this.lblAgvInfo.Text = "AGV 状态";
// //
...@@ -821,9 +890,10 @@ ...@@ -821,9 +890,10 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green; this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(406, 258); this.lblInstoreList.Location = new System.Drawing.Point(522, 304);
this.lblInstoreList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(720, 109); this.lblInstoreList.Size = new System.Drawing.Size(926, 128);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// tabPage1 // tabPage1
...@@ -834,10 +904,11 @@ ...@@ -834,10 +904,11 @@
this.tabPage1.Controls.Add(this.groupBox8); this.tabPage1.Controls.Add(this.groupBox8);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.groupBox4); this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Size = new System.Drawing.Size(1299, 496); this.tabPage1.Size = new System.Drawing.Size(1672, 586);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -847,9 +918,11 @@ ...@@ -847,9 +918,11 @@
this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox7.Controls.Add(this.tableLayoutPanel3); this.groupBox7.Controls.Add(this.tableLayoutPanel3);
this.groupBox7.Location = new System.Drawing.Point(232, 1); this.groupBox7.Location = new System.Drawing.Point(298, 1);
this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Name = "groupBox7"; this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(220, 491); this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Size = new System.Drawing.Size(283, 578);
this.groupBox7.TabIndex = 279; this.groupBox7.TabIndex = 279;
this.groupBox7.TabStop = false; this.groupBox7.TabStop = false;
this.groupBox7.Text = "DI列表"; this.groupBox7.Text = "DI列表";
...@@ -861,12 +934,13 @@ ...@@ -861,12 +934,13 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel3.ColumnCount = 1; this.tableLayoutPanel3.ColumnCount = 1;
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 14); this.tableLayoutPanel3.Location = new System.Drawing.Point(8, 16);
this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(209, 471); this.tableLayoutPanel3.Size = new System.Drawing.Size(269, 554);
this.tableLayoutPanel3.TabIndex = 102; this.tableLayoutPanel3.TabIndex = 102;
// //
// groupBox8 // groupBox8
...@@ -874,9 +948,11 @@ ...@@ -874,9 +948,11 @@
this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox8.Controls.Add(this.tableLayoutPanel4); this.groupBox8.Controls.Add(this.tableLayoutPanel4);
this.groupBox8.Location = new System.Drawing.Point(685, 1); this.groupBox8.Location = new System.Drawing.Point(881, 1);
this.groupBox8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox8.Name = "groupBox8"; this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(240, 389); this.groupBox8.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox8.Size = new System.Drawing.Size(309, 458);
this.groupBox8.TabIndex = 280; this.groupBox8.TabIndex = 280;
this.groupBox8.TabStop = false; this.groupBox8.TabStop = false;
this.groupBox8.Text = "DO列表"; this.groupBox8.Text = "DO列表";
...@@ -888,12 +964,13 @@ ...@@ -888,12 +964,13 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel4.ColumnCount = 1; this.tableLayoutPanel4.ColumnCount = 1;
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.Location = new System.Drawing.Point(5, 14); this.tableLayoutPanel4.Location = new System.Drawing.Point(6, 16);
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 2; this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 369); this.tableLayoutPanel4.Size = new System.Drawing.Size(294, 434);
this.tableLayoutPanel4.TabIndex = 103; this.tableLayoutPanel4.TabIndex = 103;
// //
// tabPage2 // tabPage2
...@@ -902,10 +979,11 @@ ...@@ -902,10 +979,11 @@
this.tabPage2.Controls.Add(this.groupBox9); this.tabPage2.Controls.Add(this.groupBox9);
this.tabPage2.Controls.Add(this.axisMoveControl1); this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Controls.Add(this.groupBox2); this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Size = new System.Drawing.Size(1299, 496); this.tabPage2.Size = new System.Drawing.Size(1672, 586);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 "; this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -920,9 +998,11 @@ ...@@ -920,9 +998,11 @@
this.groupDetial.Controls.Add(this.label2); this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize); this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1); this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(716, 9); this.groupDetial.Location = new System.Drawing.Point(921, 11);
this.groupDetial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupDetial.Name = "groupDetial"; this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(381, 296); this.groupDetial.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupDetial.Size = new System.Drawing.Size(490, 348);
this.groupDetial.TabIndex = 319; this.groupDetial.TabIndex = 319;
this.groupDetial.TabStop = false; this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置"; this.groupDetial.Text = "移栽位置P2详细配置";
...@@ -931,9 +1011,10 @@ ...@@ -931,9 +1011,10 @@
// //
this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDSave.ForeColor = System.Drawing.Color.Blue; this.btnDSave.ForeColor = System.Drawing.Color.Blue;
this.btnDSave.Location = new System.Drawing.Point(21, 241); this.btnDSave.Location = new System.Drawing.Point(27, 284);
this.btnDSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnDSave.Name = "btnDSave"; this.btnDSave.Name = "btnDSave";
this.btnDSave.Size = new System.Drawing.Size(94, 34); this.btnDSave.Size = new System.Drawing.Size(121, 40);
this.btnDSave.TabIndex = 322; this.btnDSave.TabIndex = 322;
this.btnDSave.Text = "保存"; this.btnDSave.Text = "保存";
this.btnDSave.UseVisualStyleBackColor = true; this.btnDSave.UseVisualStyleBackColor = true;
...@@ -944,9 +1025,10 @@ ...@@ -944,9 +1025,10 @@
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(21, 172); this.label3.Location = new System.Drawing.Point(27, 202);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(94, 17); this.label3.Size = new System.Drawing.Size(117, 20);
this.label3.TabIndex = 321; this.label3.TabIndex = 321;
this.label3.Text = "升降轴P2位置："; this.label3.Text = "升降轴P2位置：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -957,11 +1039,12 @@ ...@@ -957,11 +1039,12 @@
this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtDP2.Location = new System.Drawing.Point(21, 202); this.txtDP2.Location = new System.Drawing.Point(27, 238);
this.txtDP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtDP2.MaxLength = 12; this.txtDP2.MaxLength = 12;
this.txtDP2.Name = "txtDP2"; this.txtDP2.Name = "txtDP2";
this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtDP2.Size = new System.Drawing.Size(90, 26); this.txtDP2.Size = new System.Drawing.Size(115, 31);
this.txtDP2.TabIndex = 320; this.txtDP2.TabIndex = 320;
this.txtDP2.Text = "-1"; this.txtDP2.Text = "-1";
// //
...@@ -969,10 +1052,11 @@ ...@@ -969,10 +1052,11 @@
// //
this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listDetitalP2.FormattingEnabled = true; this.listDetitalP2.FormattingEnabled = true;
this.listDetitalP2.ItemHeight = 20; this.listDetitalP2.ItemHeight = 23;
this.listDetitalP2.Location = new System.Drawing.Point(132, 30); this.listDetitalP2.Location = new System.Drawing.Point(170, 35);
this.listDetitalP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.listDetitalP2.Name = "listDetitalP2"; this.listDetitalP2.Name = "listDetitalP2";
this.listDetitalP2.Size = new System.Drawing.Size(208, 244); this.listDetitalP2.Size = new System.Drawing.Size(266, 280);
this.listDetitalP2.TabIndex = 319; this.listDetitalP2.TabIndex = 319;
this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged); this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged);
// //
...@@ -981,9 +1065,10 @@ ...@@ -981,9 +1065,10 @@
this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDHeight.FormattingEnabled = true; this.cmbDHeight.FormattingEnabled = true;
this.cmbDHeight.Location = new System.Drawing.Point(21, 131); this.cmbDHeight.Location = new System.Drawing.Point(27, 154);
this.cmbDHeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbDHeight.Name = "cmbDHeight"; this.cmbDHeight.Name = "cmbDHeight";
this.cmbDHeight.Size = new System.Drawing.Size(90, 28); this.cmbDHeight.Size = new System.Drawing.Size(115, 31);
this.cmbDHeight.TabIndex = 318; this.cmbDHeight.TabIndex = 318;
this.cmbDHeight.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged); this.cmbDHeight.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged);
// //
...@@ -992,9 +1077,10 @@ ...@@ -992,9 +1077,10 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(21, 101); this.label2.Location = new System.Drawing.Point(27, 119);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17); this.label2.Size = new System.Drawing.Size(84, 20);
this.label2.TabIndex = 317; this.label2.TabIndex = 317;
this.label2.Text = "料盘高度："; this.label2.Text = "料盘高度：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1004,9 +1090,10 @@ ...@@ -1004,9 +1090,10 @@
this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDSize.FormattingEnabled = true; this.cmbDSize.FormattingEnabled = true;
this.cmbDSize.Location = new System.Drawing.Point(21, 60); this.cmbDSize.Location = new System.Drawing.Point(27, 71);
this.cmbDSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbDSize.Name = "cmbDSize"; this.cmbDSize.Name = "cmbDSize";
this.cmbDSize.Size = new System.Drawing.Size(90, 28); this.cmbDSize.Size = new System.Drawing.Size(115, 31);
this.cmbDSize.TabIndex = 316; this.cmbDSize.TabIndex = 316;
this.cmbDSize.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged); this.cmbDSize.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged);
// //
...@@ -1015,9 +1102,10 @@ ...@@ -1015,9 +1102,10 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(21, 30); this.label1.Location = new System.Drawing.Point(27, 35);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17); this.label1.Size = new System.Drawing.Size(84, 20);
this.label1.TabIndex = 315; this.label1.TabIndex = 315;
this.label1.Text = "料盘尺寸："; this.label1.Text = "料盘尺寸：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1031,9 +1119,11 @@ ...@@ -1031,9 +1119,11 @@
this.groupBox9.Controls.Add(this.btnBP1); this.groupBox9.Controls.Add(this.btnBP1);
this.groupBox9.Controls.Add(this.btnBP2); this.groupBox9.Controls.Add(this.btnBP2);
this.groupBox9.Controls.Add(this.txtBP2); this.groupBox9.Controls.Add(this.txtBP2);
this.groupBox9.Location = new System.Drawing.Point(548, 316); this.groupBox9.Location = new System.Drawing.Point(705, 372);
this.groupBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox9.Name = "groupBox9"; this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(520, 143); this.groupBox9.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox9.Size = new System.Drawing.Size(669, 168);
this.groupBox9.TabIndex = 220; this.groupBox9.TabIndex = 220;
this.groupBox9.TabStop = false; this.groupBox9.TabStop = false;
this.groupBox9.Text = "上料提升轴位置配置"; this.groupBox9.Text = "上料提升轴位置配置";
...@@ -1045,10 +1135,11 @@ ...@@ -1045,10 +1135,11 @@
this.btnBP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP3.ForeColor = System.Drawing.Color.Red; this.btnBP3.ForeColor = System.Drawing.Color.Red;
this.btnBP3.Location = new System.Drawing.Point(258, 25); this.btnBP3.Location = new System.Drawing.Point(332, 29);
this.btnBP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBP3.Name = "btnBP3"; this.btnBP3.Name = "btnBP3";
this.btnBP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnBP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP3.Size = new System.Drawing.Size(163, 34); this.btnBP3.Size = new System.Drawing.Size(210, 40);
this.btnBP3.TabIndex = 312; this.btnBP3.TabIndex = 312;
this.btnBP3.Text = "上料目标位置P3"; this.btnBP3.Text = "上料目标位置P3";
this.btnBP3.UseVisualStyleBackColor = true; this.btnBP3.UseVisualStyleBackColor = true;
...@@ -1060,11 +1151,12 @@ ...@@ -1060,11 +1151,12 @@
this.txtBP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtBP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtBP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBP3.Location = new System.Drawing.Point(424, 29); this.txtBP3.Location = new System.Drawing.Point(545, 34);
this.txtBP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtBP3.MaxLength = 12; this.txtBP3.MaxLength = 12;
this.txtBP3.Name = "txtBP3"; this.txtBP3.Name = "txtBP3";
this.txtBP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtBP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtBP3.Size = new System.Drawing.Size(70, 26); this.txtBP3.Size = new System.Drawing.Size(89, 31);
this.txtBP3.TabIndex = 311; this.txtBP3.TabIndex = 311;
this.txtBP3.Text = "-1"; this.txtBP3.Text = "-1";
// //
...@@ -1073,9 +1165,10 @@ ...@@ -1073,9 +1165,10 @@
this.btnBSave.BackColor = System.Drawing.SystemColors.Control; this.btnBSave.BackColor = System.Drawing.SystemColors.Control;
this.btnBSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBSave.ForeColor = System.Drawing.Color.Red; this.btnBSave.ForeColor = System.Drawing.Color.Red;
this.btnBSave.Location = new System.Drawing.Point(259, 67); this.btnBSave.Location = new System.Drawing.Point(333, 79);
this.btnBSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBSave.Name = "btnBSave"; this.btnBSave.Name = "btnBSave";
this.btnBSave.Size = new System.Drawing.Size(163, 34); this.btnBSave.Size = new System.Drawing.Size(210, 40);
this.btnBSave.TabIndex = 310; this.btnBSave.TabIndex = 310;
this.btnBSave.Text = "保存位置"; this.btnBSave.Text = "保存位置";
this.btnBSave.UseVisualStyleBackColor = false; this.btnBSave.UseVisualStyleBackColor = false;
...@@ -1087,11 +1180,12 @@ ...@@ -1087,11 +1180,12 @@
this.txtBp1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtBp1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBp1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBp1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBp1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtBp1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBp1.Location = new System.Drawing.Point(180, 30); this.txtBp1.Location = new System.Drawing.Point(231, 35);
this.txtBp1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtBp1.MaxLength = 12; this.txtBp1.MaxLength = 12;
this.txtBp1.Name = "txtBp1"; this.txtBp1.Name = "txtBp1";
this.txtBp1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtBp1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtBp1.Size = new System.Drawing.Size(70, 26); this.txtBp1.Size = new System.Drawing.Size(89, 31);
this.txtBp1.TabIndex = 309; this.txtBp1.TabIndex = 309;
this.txtBp1.Text = "-1"; this.txtBp1.Text = "-1";
// //
...@@ -1102,10 +1196,11 @@ ...@@ -1102,10 +1196,11 @@
this.btnBP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP1.ForeColor = System.Drawing.Color.Red; this.btnBP1.ForeColor = System.Drawing.Color.Red;
this.btnBP1.Location = new System.Drawing.Point(14, 26); this.btnBP1.Location = new System.Drawing.Point(18, 31);
this.btnBP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBP1.Name = "btnBP1"; this.btnBP1.Name = "btnBP1";
this.btnBP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnBP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP1.Size = new System.Drawing.Size(163, 34); this.btnBP1.Size = new System.Drawing.Size(210, 40);
this.btnBP1.TabIndex = 307; this.btnBP1.TabIndex = 307;
this.btnBP1.Text = "上升待机位置P1："; this.btnBP1.Text = "上升待机位置P1：";
this.btnBP1.UseVisualStyleBackColor = true; this.btnBP1.UseVisualStyleBackColor = true;
...@@ -1118,10 +1213,11 @@ ...@@ -1118,10 +1213,11 @@
this.btnBP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBP2.ForeColor = System.Drawing.Color.Red; this.btnBP2.ForeColor = System.Drawing.Color.Red;
this.btnBP2.Location = new System.Drawing.Point(14, 67); this.btnBP2.Location = new System.Drawing.Point(18, 79);
this.btnBP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBP2.Name = "btnBP2"; this.btnBP2.Name = "btnBP2";
this.btnBP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP2.Size = new System.Drawing.Size(163, 34); this.btnBP2.Size = new System.Drawing.Size(210, 40);
this.btnBP2.TabIndex = 306; this.btnBP2.TabIndex = 306;
this.btnBP2.Text = "下降点位置P2"; this.btnBP2.Text = "下降点位置P2";
this.btnBP2.UseVisualStyleBackColor = true; this.btnBP2.UseVisualStyleBackColor = true;
...@@ -1133,19 +1229,21 @@ ...@@ -1133,19 +1229,21 @@
this.txtBP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtBP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtBP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBP2.Location = new System.Drawing.Point(180, 71); this.txtBP2.Location = new System.Drawing.Point(231, 84);
this.txtBP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtBP2.MaxLength = 12; this.txtBP2.MaxLength = 12;
this.txtBP2.Name = "txtBP2"; this.txtBP2.Name = "txtBP2";
this.txtBP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtBP2.Size = new System.Drawing.Size(70, 26); this.txtBP2.Size = new System.Drawing.Size(89, 31);
this.txtBP2.TabIndex = 305; this.txtBP2.TabIndex = 305;
this.txtBP2.Text = "-1"; this.txtBP2.Text = "-1";
// //
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Location = new System.Drawing.Point(14, 4); this.axisMoveControl1.Location = new System.Drawing.Point(18, 5);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(697, 309); this.axisMoveControl1.Size = new System.Drawing.Size(896, 364);
this.axisMoveControl1.TabIndex = 219; this.axisMoveControl1.TabIndex = 219;
// //
// groupBox2 // groupBox2
...@@ -1159,9 +1257,11 @@ ...@@ -1159,9 +1257,11 @@
this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnMoveto); this.groupBox2.Controls.Add(this.btnMoveto);
this.groupBox2.Controls.Add(this.txtSizePosition); this.groupBox2.Controls.Add(this.txtSizePosition);
this.groupBox2.Location = new System.Drawing.Point(22, 316); this.groupBox2.Location = new System.Drawing.Point(28, 372);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(520, 143); this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Size = new System.Drawing.Size(669, 168);
this.groupBox2.TabIndex = 218; this.groupBox2.TabIndex = 218;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "移栽升降轴位置配置"; this.groupBox2.Text = "移栽升降轴位置配置";
...@@ -1172,11 +1272,12 @@ ...@@ -1172,11 +1272,12 @@
this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP3.Location = new System.Drawing.Point(424, 61); this.txtUpdownP3.Location = new System.Drawing.Point(545, 72);
this.txtUpdownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpdownP3.MaxLength = 12; this.txtUpdownP3.MaxLength = 12;
this.txtUpdownP3.Name = "txtUpdownP3"; this.txtUpdownP3.Name = "txtUpdownP3";
this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP3.Size = new System.Drawing.Size(70, 26); this.txtUpdownP3.Size = new System.Drawing.Size(89, 31);
this.txtUpdownP3.TabIndex = 312; this.txtUpdownP3.TabIndex = 312;
this.txtUpdownP3.Text = "-1"; this.txtUpdownP3.Text = "-1";
// //
...@@ -1187,10 +1288,11 @@ ...@@ -1187,10 +1288,11 @@
this.btnUpdownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP3.ForeColor = System.Drawing.Color.Blue; this.btnUpdownP3.ForeColor = System.Drawing.Color.Blue;
this.btnUpdownP3.Location = new System.Drawing.Point(258, 57); this.btnUpdownP3.Location = new System.Drawing.Point(332, 67);
this.btnUpdownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdownP3.Name = "btnUpdownP3"; this.btnUpdownP3.Name = "btnUpdownP3";
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(163, 34); this.btnUpdownP3.Size = new System.Drawing.Size(210, 40);
this.btnUpdownP3.TabIndex = 311; this.btnUpdownP3.TabIndex = 311;
this.btnUpdownP3.Text = "移栽升降轴取料位置P3："; this.btnUpdownP3.Text = "移栽升降轴取料位置P3：";
this.btnUpdownP3.UseVisualStyleBackColor = true; this.btnUpdownP3.UseVisualStyleBackColor = true;
...@@ -1201,9 +1303,10 @@ ...@@ -1201,9 +1303,10 @@
this.btnSave.BackColor = System.Drawing.SystemColors.Control; this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue; this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(152, 95); this.btnSave.Location = new System.Drawing.Point(195, 112);
this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(163, 34); this.btnSave.Size = new System.Drawing.Size(210, 40);
this.btnSave.TabIndex = 310; this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置"; this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = false; this.btnSave.UseVisualStyleBackColor = false;
...@@ -1215,11 +1318,12 @@ ...@@ -1215,11 +1318,12 @@
this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP1.Location = new System.Drawing.Point(424, 24); this.txtP1.Location = new System.Drawing.Point(545, 28);
this.txtP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtP1.MaxLength = 12; this.txtP1.MaxLength = 12;
this.txtP1.Name = "txtP1"; this.txtP1.Name = "txtP1";
this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP1.Size = new System.Drawing.Size(70, 26); this.txtP1.Size = new System.Drawing.Size(89, 31);
this.txtP1.TabIndex = 309; this.txtP1.TabIndex = 309;
this.txtP1.Text = "-1"; this.txtP1.Text = "-1";
// //
...@@ -1230,10 +1334,11 @@ ...@@ -1230,10 +1334,11 @@
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue; this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(258, 20); this.btnMoveToP1.Location = new System.Drawing.Point(332, 24);
this.btnMoveToP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMoveToP1.Name = "btnMoveToP1"; this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34); this.btnMoveToP1.Size = new System.Drawing.Size(210, 40);
this.btnMoveToP1.TabIndex = 307; this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1："; this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true; this.btnMoveToP1.UseVisualStyleBackColor = true;
...@@ -1244,9 +1349,10 @@ ...@@ -1244,9 +1349,10 @@
this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbSizeList.FormattingEnabled = true; this.cmbSizeList.FormattingEnabled = true;
this.cmbSizeList.Location = new System.Drawing.Point(109, 23); this.cmbSizeList.Location = new System.Drawing.Point(140, 27);
this.cmbSizeList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbSizeList.Name = "cmbSizeList"; this.cmbSizeList.Name = "cmbSizeList";
this.cmbSizeList.Size = new System.Drawing.Size(143, 28); this.cmbSizeList.Size = new System.Drawing.Size(183, 31);
this.cmbSizeList.TabIndex = 303; this.cmbSizeList.TabIndex = 303;
this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged); this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged);
// //
...@@ -1255,9 +1361,10 @@ ...@@ -1255,9 +1361,10 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(24, 29); this.label4.Location = new System.Drawing.Point(31, 34);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17); this.label4.Size = new System.Drawing.Size(84, 20);
this.label4.TabIndex = 302; this.label4.TabIndex = 302;
this.label4.Text = "料盘尺寸："; this.label4.Text = "料盘尺寸：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1269,10 +1376,11 @@ ...@@ -1269,10 +1376,11 @@
this.btnMoveto.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveto.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMoveto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveto.ForeColor = System.Drawing.Color.Blue; this.btnMoveto.ForeColor = System.Drawing.Color.Blue;
this.btnMoveto.Location = new System.Drawing.Point(16, 57); this.btnMoveto.Location = new System.Drawing.Point(21, 67);
this.btnMoveto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMoveto.Name = "btnMoveto"; this.btnMoveto.Name = "btnMoveto";
this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveto.Size = new System.Drawing.Size(163, 34); this.btnMoveto.Size = new System.Drawing.Size(210, 40);
this.btnMoveto.TabIndex = 306; this.btnMoveto.TabIndex = 306;
this.btnMoveto.Text = "托盘放料位置P2"; this.btnMoveto.Text = "托盘放料位置P2";
this.btnMoveto.UseVisualStyleBackColor = true; this.btnMoveto.UseVisualStyleBackColor = true;
...@@ -1284,11 +1392,12 @@ ...@@ -1284,11 +1392,12 @@
this.txtSizePosition.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtSizePosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtSizePosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSizePosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSizePosition.ForeColor = System.Drawing.SystemColors.WindowText; this.txtSizePosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtSizePosition.Location = new System.Drawing.Point(182, 61); this.txtSizePosition.Location = new System.Drawing.Point(234, 72);
this.txtSizePosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtSizePosition.MaxLength = 12; this.txtSizePosition.MaxLength = 12;
this.txtSizePosition.Name = "txtSizePosition"; this.txtSizePosition.Name = "txtSizePosition";
this.txtSizePosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtSizePosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtSizePosition.Size = new System.Drawing.Size(70, 26); this.txtSizePosition.Size = new System.Drawing.Size(89, 31);
this.txtSizePosition.TabIndex = 305; this.txtSizePosition.TabIndex = 305;
this.txtSizePosition.Text = "-1"; this.txtSizePosition.Text = "-1";
// //
...@@ -1305,18 +1414,20 @@ ...@@ -1305,18 +1414,20 @@
this.panel1.Controls.Add(this.btnStart); this.panel1.Controls.Add(this.btnStart);
this.panel1.Controls.Add(this.btnStop); this.panel1.Controls.Add(this.btnStop);
this.panel1.Controls.Add(this.btnReset); this.panel1.Controls.Add(this.btnReset);
this.panel1.Location = new System.Drawing.Point(2, 1); this.panel1.Location = new System.Drawing.Point(3, 1);
this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1306, 47); this.panel1.Size = new System.Drawing.Size(1679, 55);
this.panel1.TabIndex = 258; this.panel1.TabIndex = 258;
// //
// chbBoxSendShelf // chbBoxSendShelf
// //
this.chbBoxSendShelf.AutoSize = true; this.chbBoxSendShelf.AutoSize = true;
this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBoxSendShelf.Location = new System.Drawing.Point(831, 13); this.chbBoxSendShelf.Location = new System.Drawing.Point(1068, 15);
this.chbBoxSendShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbBoxSendShelf.Name = "chbBoxSendShelf"; this.chbBoxSendShelf.Name = "chbBoxSendShelf";
this.chbBoxSendShelf.Size = new System.Drawing.Size(140, 24); this.chbBoxSendShelf.Size = new System.Drawing.Size(176, 28);
this.chbBoxSendShelf.TabIndex = 251; this.chbBoxSendShelf.TabIndex = 251;
this.chbBoxSendShelf.Text = "出库完成送出料架"; this.chbBoxSendShelf.Text = "出库完成送出料架";
this.chbBoxSendShelf.UseVisualStyleBackColor = true; this.chbBoxSendShelf.UseVisualStyleBackColor = true;
...@@ -1326,9 +1437,10 @@ ...@@ -1326,9 +1437,10 @@
// //
this.chbMoveStop.AutoSize = true; this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(741, 13); this.chbMoveStop.Location = new System.Drawing.Point(953, 15);
this.chbMoveStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24); this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
this.chbMoveStop.TabIndex = 250; this.chbMoveStop.TabIndex = 250;
this.chbMoveStop.Text = "暂停运动"; this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
...@@ -1339,9 +1451,10 @@ ...@@ -1339,9 +1451,10 @@
this.lblName.BackColor = System.Drawing.Color.DodgerBlue; this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black; this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 5); this.lblName.Location = new System.Drawing.Point(6, 6);
this.lblName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblName.Name = "lblName"; this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40); this.lblName.Size = new System.Drawing.Size(231, 47);
this.lblName.TabIndex = 249; this.lblName.TabIndex = 249;
this.lblName.Text = "出料流水线"; this.lblName.Text = "出料流水线";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -1351,34 +1464,24 @@ ...@@ -1351,34 +1464,24 @@
this.btnScan.BackColor = System.Drawing.Color.White; this.btnScan.BackColor = System.Drawing.Color.White;
this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnScan.Location = new System.Drawing.Point(534, 5); this.btnScan.Location = new System.Drawing.Point(687, 6);
this.btnScan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnScan.Name = "btnScan"; this.btnScan.Name = "btnScan";
this.btnScan.Size = new System.Drawing.Size(110, 40); this.btnScan.Size = new System.Drawing.Size(141, 47);
this.btnScan.TabIndex = 248; this.btnScan.TabIndex = 248;
this.btnScan.Text = "扫码测试"; this.btnScan.Text = "扫码测试";
this.btnScan.UseVisualStyleBackColor = false; this.btnScan.UseVisualStyleBackColor = false;
this.btnScan.Click += new System.EventHandler(this.btnScan_Click); this.btnScan.Click += new System.EventHandler(this.btnScan_Click);
// //
// chbUseTrayCheck
//
this.chbUseTrayCheck.AutoSize = true;
this.chbUseTrayCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseTrayCheck.Location = new System.Drawing.Point(281, 446);
this.chbUseTrayCheck.Name = "chbUseTrayCheck";
this.chbUseTrayCheck.Size = new System.Drawing.Size(112, 24);
this.chbUseTrayCheck.TabIndex = 283;
this.chbUseTrayCheck.Text = "启用料盘检测";
this.chbUseTrayCheck.UseVisualStyleBackColor = true;
this.chbUseTrayCheck.CheckedChanged += new System.EventHandler(this.chbUseTrayCheck_CheckedChanged);
//
// FrmFeedingEquip // FrmFeedingEquip
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1318, 582); this.ClientSize = new System.Drawing.Size(1695, 685);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "FrmFeedingEquip"; this.Name = "FrmFeedingEquip";
......
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -292,6 +292,8 @@ namespace OnlineStore.AssemblyLine ...@@ -292,6 +292,8 @@ namespace OnlineStore.AssemblyLine
chbBoxSendShelf.Visible = equipBean.Config.IsCanOut.Equals(1); chbBoxSendShelf.Visible = equipBean.Config.IsCanOut.Equals(1);
chbUseTrayCheck.Visible = equipBean.Config.IsCanOut.Equals(0); chbUseTrayCheck.Visible = equipBean.Config.IsCanOut.Equals(0);
chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut; chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
//chbUseTrayCheck.Visible = equipBean.Config.DIList.ContainsKey(IO_Type.TrayCheck);
chbUseTrayCheck.Checked = LineManager.useTrayCheck.Contains(equipBean.DeviceID);
IsLoad = true; IsLoad = true;
} }
...@@ -776,6 +778,7 @@ namespace OnlineStore.AssemblyLine ...@@ -776,6 +778,7 @@ namespace OnlineStore.AssemblyLine
} }
} }
} }
} }
} }
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
this.lblSelTrayNum = new System.Windows.Forms.Label(); this.lblSelTrayNum = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.btnOpenRfid = new System.Windows.Forms.Button();
this.btnIOAutoCon = new System.Windows.Forms.Button(); this.btnIOAutoCon = new System.Windows.Forms.Button();
this.btnShunt2Reset = new System.Windows.Forms.Button(); this.btnShunt2Reset = new System.Windows.Forms.Button();
this.btnShuntReset = new System.Windows.Forms.Button(); this.btnShuntReset = new System.Windows.Forms.Button();
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
this.启用分流横移2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.启用分流横移2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
this.自动保存托盘信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.自动保存托盘信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btnOpenRfid = new System.Windows.Forms.Button(); this.新托盘检测逻辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
...@@ -160,9 +161,9 @@ ...@@ -160,9 +161,9 @@
this.tabPage1.Controls.Add(this.listView1); this.tabPage1.Controls.Add(this.listView1);
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1328, 609); this.tabPage1.Size = new System.Drawing.Size(1328, 606);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "状态信息"; this.tabPage1.Text = "状态信息";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -173,7 +174,7 @@ ...@@ -173,7 +174,7 @@
this.chbSaveImg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbSaveImg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbSaveImg.Location = new System.Drawing.Point(1187, 145); this.chbSaveImg.Location = new System.Drawing.Point(1187, 145);
this.chbSaveImg.Name = "chbSaveImg"; this.chbSaveImg.Name = "chbSaveImg";
this.chbSaveImg.Size = new System.Drawing.Size(112, 24); this.chbSaveImg.Size = new System.Drawing.Size(140, 28);
this.chbSaveImg.TabIndex = 285; this.chbSaveImg.TabIndex = 285;
this.chbSaveImg.Text = "保存视觉图片"; this.chbSaveImg.Text = "保存视觉图片";
this.chbSaveImg.UseVisualStyleBackColor = true; this.chbSaveImg.UseVisualStyleBackColor = true;
...@@ -185,7 +186,7 @@ ...@@ -185,7 +186,7 @@
this.chbSaveImage.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbSaveImage.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbSaveImage.Location = new System.Drawing.Point(1059, 145); this.chbSaveImage.Location = new System.Drawing.Point(1059, 145);
this.chbSaveImage.Name = "chbSaveImage"; this.chbSaveImage.Name = "chbSaveImage";
this.chbSaveImage.Size = new System.Drawing.Size(112, 24); this.chbSaveImage.Size = new System.Drawing.Size(140, 28);
this.chbSaveImage.TabIndex = 203; this.chbSaveImage.TabIndex = 203;
this.chbSaveImage.Text = "保存扫码图片"; this.chbSaveImage.Text = "保存扫码图片";
this.chbSaveImage.UseVisualStyleBackColor = true; this.chbSaveImage.UseVisualStyleBackColor = true;
...@@ -212,7 +213,7 @@ ...@@ -212,7 +213,7 @@
this.numTrayNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numTrayNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numTrayNum.Location = new System.Drawing.Point(66, 29); this.numTrayNum.Location = new System.Drawing.Point(66, 29);
this.numTrayNum.Name = "numTrayNum"; this.numTrayNum.Name = "numTrayNum";
this.numTrayNum.Size = new System.Drawing.Size(71, 26); this.numTrayNum.Size = new System.Drawing.Size(71, 31);
this.numTrayNum.TabIndex = 283; this.numTrayNum.TabIndex = 283;
this.numTrayNum.ValueChanged += new System.EventHandler(this.numTrayNum_ValueChanged); this.numTrayNum.ValueChanged += new System.EventHandler(this.numTrayNum_ValueChanged);
// //
...@@ -233,7 +234,7 @@ ...@@ -233,7 +234,7 @@
this.label10.AutoSize = true; this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(7, 32); this.label10.Location = new System.Drawing.Point(7, 32);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(54, 20); this.label10.Size = new System.Drawing.Size(68, 24);
this.label10.TabIndex = 207; this.label10.TabIndex = 207;
this.label10.Text = "托盘号:"; this.label10.Text = "托盘号:";
// //
...@@ -260,6 +261,19 @@ ...@@ -260,6 +261,19 @@
this.panel1.Size = new System.Drawing.Size(165, 160); this.panel1.Size = new System.Drawing.Size(165, 160);
this.panel1.TabIndex = 199; this.panel1.TabIndex = 199;
// //
// btnOpenRfid
//
this.btnOpenRfid.BackColor = System.Drawing.Color.White;
this.btnOpenRfid.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenRfid.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenRfid.Location = new System.Drawing.Point(16, 126);
this.btnOpenRfid.Name = "btnOpenRfid";
this.btnOpenRfid.Size = new System.Drawing.Size(133, 31);
this.btnOpenRfid.TabIndex = 203;
this.btnOpenRfid.Text = "重启RFID服务";
this.btnOpenRfid.UseVisualStyleBackColor = false;
this.btnOpenRfid.Click += new System.EventHandler(this.btnOpenRfid_Click);
//
// btnIOAutoCon // btnIOAutoCon
// //
this.btnIOAutoCon.BackColor = System.Drawing.Color.White; this.btnIOAutoCon.BackColor = System.Drawing.Color.White;
...@@ -322,7 +336,7 @@ ...@@ -322,7 +336,7 @@
this.chbShunt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbShunt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt.Location = new System.Drawing.Point(8, 61); this.chbShunt.Location = new System.Drawing.Point(8, 61);
this.chbShunt.Name = "chbShunt"; this.chbShunt.Name = "chbShunt";
this.chbShunt.Size = new System.Drawing.Size(120, 24); this.chbShunt.Size = new System.Drawing.Size(151, 28);
this.chbShunt.TabIndex = 200; this.chbShunt.TabIndex = 200;
this.chbShunt.Text = "禁用分流横移1"; this.chbShunt.Text = "禁用分流横移1";
this.chbShunt.UseVisualStyleBackColor = true; this.chbShunt.UseVisualStyleBackColor = true;
...@@ -334,7 +348,7 @@ ...@@ -334,7 +348,7 @@
this.chbShunt2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbShunt2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt2.Location = new System.Drawing.Point(8, 86); this.chbShunt2.Location = new System.Drawing.Point(8, 86);
this.chbShunt2.Name = "chbShunt2"; this.chbShunt2.Name = "chbShunt2";
this.chbShunt2.Size = new System.Drawing.Size(120, 24); this.chbShunt2.Size = new System.Drawing.Size(151, 28);
this.chbShunt2.TabIndex = 202; this.chbShunt2.TabIndex = 202;
this.chbShunt2.Text = "禁用分流横移2"; this.chbShunt2.Text = "禁用分流横移2";
this.chbShunt2.UseVisualStyleBackColor = true; this.chbShunt2.UseVisualStyleBackColor = true;
...@@ -346,7 +360,7 @@ ...@@ -346,7 +360,7 @@
this.chbTrayCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbTrayCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbTrayCheck.Location = new System.Drawing.Point(154, 17); this.chbTrayCheck.Location = new System.Drawing.Point(154, 17);
this.chbTrayCheck.Name = "chbTrayCheck"; this.chbTrayCheck.Name = "chbTrayCheck";
this.chbTrayCheck.Size = new System.Drawing.Size(123, 21); this.chbTrayCheck.Size = new System.Drawing.Size(151, 24);
this.chbTrayCheck.TabIndex = 197; this.chbTrayCheck.TabIndex = 197;
this.chbTrayCheck.Text = "启用托盘顺序检测"; this.chbTrayCheck.Text = "启用托盘顺序检测";
this.chbTrayCheck.UseVisualStyleBackColor = true; this.chbTrayCheck.UseVisualStyleBackColor = true;
...@@ -359,7 +373,7 @@ ...@@ -359,7 +373,7 @@
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(8, 39); this.chbBuzzer.Location = new System.Drawing.Point(8, 39);
this.chbBuzzer.Name = "chbBuzzer"; this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(87, 21); this.chbBuzzer.Size = new System.Drawing.Size(106, 24);
this.chbBuzzer.TabIndex = 196; this.chbBuzzer.TabIndex = 196;
this.chbBuzzer.Text = "启用蜂鸣器"; this.chbBuzzer.Text = "启用蜂鸣器";
this.chbBuzzer.UseVisualStyleBackColor = true; this.chbBuzzer.UseVisualStyleBackColor = true;
...@@ -383,7 +397,7 @@ ...@@ -383,7 +397,7 @@
this.chbAGV.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAGV.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAGV.Location = new System.Drawing.Point(154, 47); this.chbAGV.Location = new System.Drawing.Point(154, 47);
this.chbAGV.Name = "chbAGV"; this.chbAGV.Name = "chbAGV";
this.chbAGV.Size = new System.Drawing.Size(121, 21); this.chbAGV.Size = new System.Drawing.Size(151, 24);
this.chbAGV.TabIndex = 198; this.chbAGV.TabIndex = 198;
this.chbAGV.Text = "AGV cancelState"; this.chbAGV.Text = "AGV cancelState";
this.chbAGV.UseVisualStyleBackColor = true; this.chbAGV.UseVisualStyleBackColor = true;
...@@ -396,7 +410,7 @@ ...@@ -396,7 +410,7 @@
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(8, 17); this.chbAutoRun.Location = new System.Drawing.Point(8, 17);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(99, 21); this.chbAutoRun.Size = new System.Drawing.Size(121, 24);
this.chbAutoRun.TabIndex = 94; this.chbAutoRun.TabIndex = 94;
this.chbAutoRun.Text = "开机自动启动"; this.chbAutoRun.Text = "开机自动启动";
this.chbAutoRun.UseVisualStyleBackColor = true; this.chbAutoRun.UseVisualStyleBackColor = true;
...@@ -408,7 +422,7 @@ ...@@ -408,7 +422,7 @@
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.Location = new System.Drawing.Point(1230, 7); this.lblCID.Location = new System.Drawing.Point(1230, 7);
this.lblCID.Name = "lblCID"; this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(33, 20); this.lblCID.Size = new System.Drawing.Size(41, 24);
this.lblCID.TabIndex = 95; this.lblCID.TabIndex = 95;
this.lblCID.Text = "CID"; this.lblCID.Text = "CID";
this.lblCID.Visible = false; this.lblCID.Visible = false;
...@@ -419,7 +433,7 @@ ...@@ -419,7 +433,7 @@
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(906, 9); this.lblMoveInfo.Location = new System.Drawing.Point(906, 9);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17); this.lblMoveInfo.Size = new System.Drawing.Size(34, 20);
this.lblMoveInfo.TabIndex = 196; this.lblMoveInfo.TabIndex = 196;
this.lblMoveInfo.Text = "CID"; this.lblMoveInfo.Text = "CID";
// //
...@@ -435,7 +449,7 @@ ...@@ -435,7 +449,7 @@
this.listView1.Location = new System.Drawing.Point(9, 7); this.listView1.Location = new System.Drawing.Point(9, 7);
this.listView1.MultiSelect = false; this.listView1.MultiSelect = false;
this.listView1.Name = "listView1"; this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(705, 599); this.listView1.Size = new System.Drawing.Size(705, 596);
this.listView1.TabIndex = 191; this.listView1.TabIndex = 191;
this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details; this.listView1.View = System.Windows.Forms.View.Details;
...@@ -449,7 +463,7 @@ ...@@ -449,7 +463,7 @@
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(720, 253); this.logBox.Location = new System.Drawing.Point(720, 253);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(600, 353); this.logBox.Size = new System.Drawing.Size(600, 350);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -480,7 +494,7 @@ ...@@ -480,7 +494,7 @@
this.chbInStoNG.AutoSize = true; this.chbInStoNG.AutoSize = true;
this.chbInStoNG.Location = new System.Drawing.Point(414, 24); this.chbInStoNG.Location = new System.Drawing.Point(414, 24);
this.chbInStoNG.Name = "chbInStoNG"; this.chbInStoNG.Name = "chbInStoNG";
this.chbInStoNG.Size = new System.Drawing.Size(70, 21); this.chbInStoNG.Size = new System.Drawing.Size(84, 24);
this.chbInStoNG.TabIndex = 205; this.chbInStoNG.TabIndex = 205;
this.chbInStoNG.Text = "入库NG"; this.chbInStoNG.Text = "入库NG";
this.chbInStoNG.UseVisualStyleBackColor = true; this.chbInStoNG.UseVisualStyleBackColor = true;
...@@ -495,7 +509,7 @@ ...@@ -495,7 +509,7 @@
"出库"}); "出库"});
this.cmbTrayType.Location = new System.Drawing.Point(64, 22); this.cmbTrayType.Location = new System.Drawing.Point(64, 22);
this.cmbTrayType.Name = "cmbTrayType"; this.cmbTrayType.Name = "cmbTrayType";
this.cmbTrayType.Size = new System.Drawing.Size(78, 25); this.cmbTrayType.Size = new System.Drawing.Size(78, 28);
this.cmbTrayType.TabIndex = 204; this.cmbTrayType.TabIndex = 204;
// //
// label4 // label4
...@@ -503,7 +517,7 @@ ...@@ -503,7 +517,7 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(354, 26); this.label4.Location = new System.Drawing.Point(354, 26);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(23, 17); this.label4.Size = new System.Drawing.Size(28, 20);
this.label4.TabIndex = 203; this.label4.TabIndex = 203;
this.label4.Text = "宽:"; this.label4.Text = "宽:";
// //
...@@ -512,7 +526,7 @@ ...@@ -512,7 +526,7 @@
this.txtTrayW.Location = new System.Drawing.Point(381, 23); this.txtTrayW.Location = new System.Drawing.Point(381, 23);
this.txtTrayW.MaxLength = 2; this.txtTrayW.MaxLength = 2;
this.txtTrayW.Name = "txtTrayW"; this.txtTrayW.Name = "txtTrayW";
this.txtTrayW.Size = new System.Drawing.Size(29, 23); this.txtTrayW.Size = new System.Drawing.Size(29, 27);
this.txtTrayW.TabIndex = 202; this.txtTrayW.TabIndex = 202;
this.txtTrayW.Text = "7"; this.txtTrayW.Text = "7";
// //
...@@ -521,7 +535,7 @@ ...@@ -521,7 +535,7 @@
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(294, 26); this.label3.Location = new System.Drawing.Point(294, 26);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(23, 17); this.label3.Size = new System.Drawing.Size(28, 20);
this.label3.TabIndex = 201; this.label3.TabIndex = 201;
this.label3.Text = "高:"; this.label3.Text = "高:";
// //
...@@ -530,7 +544,7 @@ ...@@ -530,7 +544,7 @@
this.txtTrayH.Location = new System.Drawing.Point(321, 23); this.txtTrayH.Location = new System.Drawing.Point(321, 23);
this.txtTrayH.MaxLength = 2; this.txtTrayH.MaxLength = 2;
this.txtTrayH.Name = "txtTrayH"; this.txtTrayH.Name = "txtTrayH";
this.txtTrayH.Size = new System.Drawing.Size(29, 23); this.txtTrayH.Size = new System.Drawing.Size(29, 27);
this.txtTrayH.TabIndex = 200; this.txtTrayH.TabIndex = 200;
this.txtTrayH.Text = "8"; this.txtTrayH.Text = "8";
// //
...@@ -539,7 +553,7 @@ ...@@ -539,7 +553,7 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(146, 26); this.label2.Location = new System.Drawing.Point(146, 26);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(35, 17); this.label2.Size = new System.Drawing.Size(43, 20);
this.label2.TabIndex = 199; this.label2.TabIndex = 199;
this.label2.Text = "库位:"; this.label2.Text = "库位:";
// //
...@@ -547,7 +561,7 @@ ...@@ -547,7 +561,7 @@
// //
this.txtTrayPosid.Location = new System.Drawing.Point(185, 23); this.txtTrayPosid.Location = new System.Drawing.Point(185, 23);
this.txtTrayPosid.Name = "txtTrayPosid"; this.txtTrayPosid.Name = "txtTrayPosid";
this.txtTrayPosid.Size = new System.Drawing.Size(105, 23); this.txtTrayPosid.Size = new System.Drawing.Size(105, 27);
this.txtTrayPosid.TabIndex = 198; this.txtTrayPosid.TabIndex = 198;
this.txtTrayPosid.Text = "11#AC1_1_1"; this.txtTrayPosid.Text = "11#AC1_1_1";
// //
...@@ -557,7 +571,7 @@ ...@@ -557,7 +571,7 @@
this.cmbTray.FormattingEnabled = true; this.cmbTray.FormattingEnabled = true;
this.cmbTray.Location = new System.Drawing.Point(9, 22); this.cmbTray.Location = new System.Drawing.Point(9, 22);
this.cmbTray.Name = "cmbTray"; this.cmbTray.Name = "cmbTray";
this.cmbTray.Size = new System.Drawing.Size(51, 25); this.cmbTray.Size = new System.Drawing.Size(51, 28);
this.cmbTray.TabIndex = 194; this.cmbTray.TabIndex = 194;
// //
// btnUpdateTray // btnUpdateTray
...@@ -575,9 +589,9 @@ ...@@ -575,9 +589,9 @@
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.picLine); this.tabPage2.Controls.Add(this.picLine);
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 32);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1328, 609); this.tabPage2.Size = new System.Drawing.Size(1328, 606);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 示意图 "; this.tabPage2.Text = " 示意图 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -587,7 +601,7 @@ ...@@ -587,7 +601,7 @@
this.picLine.Dock = System.Windows.Forms.DockStyle.Fill; this.picLine.Dock = System.Windows.Forms.DockStyle.Fill;
this.picLine.Location = new System.Drawing.Point(0, 0); this.picLine.Location = new System.Drawing.Point(0, 0);
this.picLine.Name = "picLine"; this.picLine.Name = "picLine";
this.picLine.Size = new System.Drawing.Size(1328, 609); this.picLine.Size = new System.Drawing.Size(1328, 606);
this.picLine.TabIndex = 0; this.picLine.TabIndex = 0;
this.picLine.TabStop = false; this.picLine.TabStop = false;
// //
...@@ -598,7 +612,7 @@ ...@@ -598,7 +612,7 @@
this.lblStatus.ForeColor = System.Drawing.Color.Green; this.lblStatus.ForeColor = System.Drawing.Color.Green;
this.lblStatus.Location = new System.Drawing.Point(29, 46); this.lblStatus.Location = new System.Drawing.Point(29, 46);
this.lblStatus.Name = "lblStatus"; this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(65, 20); this.lblStatus.Size = new System.Drawing.Size(82, 24);
this.lblStatus.TabIndex = 92; this.lblStatus.TabIndex = 92;
this.lblStatus.Text = "等待启动"; this.lblStatus.Text = "等待启动";
// //
...@@ -626,29 +640,30 @@ ...@@ -626,29 +640,30 @@
// contextMenuStrip1 // contextMenuStrip1
// //
this.contextMenuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.contextMenuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.显示ToolStripMenuItem, this.显示ToolStripMenuItem,
this.toolStripSeparator8, this.toolStripSeparator8,
this.toolStripMenuItem1}); this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(113, 62); this.contextMenuStrip1.Size = new System.Drawing.Size(125, 74);
// //
// 显示ToolStripMenuItem // 显示ToolStripMenuItem
// //
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem"; this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(112, 26); this.显示ToolStripMenuItem.Size = new System.Drawing.Size(124, 32);
this.显示ToolStripMenuItem.Text = "显示"; this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click); this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
// //
// toolStripSeparator8 // toolStripSeparator8
// //
this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(109, 6); this.toolStripSeparator8.Size = new System.Drawing.Size(121, 6);
// //
// toolStripMenuItem1 // toolStripMenuItem1
// //
this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(112, 26); this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 32);
this.toolStripMenuItem1.Text = "退出"; this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
// //
...@@ -670,60 +685,60 @@ ...@@ -670,60 +685,60 @@
this.toolStripSeparator2, this.toolStripSeparator2,
this.退出ToolStripMenuItem}); this.退出ToolStripMenuItem});
this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem"; this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem";
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(96, 25); this.操作ToolStripMenuItem.Size = new System.Drawing.Size(118, 31);
this.操作ToolStripMenuItem.Text = " 设备操作 "; this.操作ToolStripMenuItem.Text = " 设备操作 ";
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(221, 6);
// //
// 启动AToolStripMenuItem // 启动AToolStripMenuItem
// //
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem"; this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.启动AToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.启动AToolStripMenuItem.Text = "启动 "; this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click); this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(221, 6);
// //
// 复位RToolStripMenuItem // 复位RToolStripMenuItem
// //
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem"; this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.复位RToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.复位RToolStripMenuItem.Text = "复位"; this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click); this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(221, 6);
// //
// 停止TToolStripMenuItem // 停止TToolStripMenuItem
// //
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem"; this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.停止TToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.停止TToolStripMenuItem.Text = "停止"; this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click); this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
// //
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(221, 6);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator2.Size = new System.Drawing.Size(221, 6);
this.toolStripSeparator2.Visible = false; this.toolStripSeparator2.Visible = false;
// //
// 退出ToolStripMenuItem // 退出ToolStripMenuItem
// //
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem"; this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.退出ToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.退出ToolStripMenuItem.Text = "退出"; this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1); this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
// //
...@@ -742,74 +757,74 @@ ...@@ -742,74 +757,74 @@
this.toolStripSeparator12, this.toolStripSeparator12,
this.清空托盘信息ToolStripMenuItem}); this.清空托盘信息ToolStripMenuItem});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem"; this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25); this.设置TToolStripMenuItem.Size = new System.Drawing.Size(112, 31);
this.设置TToolStripMenuItem.Text = "设备调试 "; this.设置TToolStripMenuItem.Text = "设备调试 ";
// //
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator6.Visible = false; this.toolStripSeparator6.Visible = false;
// //
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.二维码学习ToolStripMenuItem.Text = "二维码学习"; this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click); this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(215, 6);
// //
// iO模块状态ToolStripMenuItem // iO模块状态ToolStripMenuItem
// //
this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem"; this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.iO模块状态ToolStripMenuItem.Text = "IO模块状态"; this.iO模块状态ToolStripMenuItem.Text = "IO模块状态";
this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click); this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(215, 6);
// //
// toolStripMenuItem3 // toolStripMenuItem3
// //
this.toolStripMenuItem3.Name = "toolStripMenuItem3"; this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(176, 26); this.toolStripMenuItem3.Size = new System.Drawing.Size(218, 32);
this.toolStripMenuItem3.Text = "查看禁用托盘"; this.toolStripMenuItem3.Text = "查看禁用托盘";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click); this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
// //
// 托盘初始化ToolStripMenuItem // 托盘初始化ToolStripMenuItem
// //
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem"; this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码"; this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click); this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
// //
// toolStripSeparator14 // toolStripSeparator14
// //
this.toolStripSeparator14.Name = "toolStripSeparator14"; this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator14.Size = new System.Drawing.Size(215, 6);
// //
// 查看托盘信息ToolStripMenuItem // 查看托盘信息ToolStripMenuItem
// //
this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem"; this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息"; this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息";
this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click); this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
// //
// toolStripSeparator12 // toolStripSeparator12
// //
this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(173, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(215, 6);
// //
// 清空托盘信息ToolStripMenuItem // 清空托盘信息ToolStripMenuItem
// //
this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem"; this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26); this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息"; this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click); this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
// //
...@@ -822,37 +837,37 @@ ...@@ -822,37 +837,37 @@
this.toolStripSeparator11, this.toolStripSeparator11,
this.版本号ToolStripMenuItem}); this.版本号ToolStripMenuItem});
this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem"; this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(69, 25); this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(84, 31);
this.帮助ToolStripMenuItem.Text = " 系统 "; this.帮助ToolStripMenuItem.Text = " 系统 ";
// //
// 清空日志ToolStripMenuItem // 清空日志ToolStripMenuItem
// //
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem"; this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26); this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.清空日志ToolStripMenuItem.Text = "清空日志"; this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click); this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
// //
// toolStripSeparator10 // toolStripSeparator10
// //
this.toolStripSeparator10.Name = "toolStripSeparator10"; this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(141, 6); this.toolStripSeparator10.Size = new System.Drawing.Size(175, 6);
// //
// 复制日志ToolStripMenuItem // 复制日志ToolStripMenuItem
// //
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem"; this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26); this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.复制日志ToolStripMenuItem.Text = "复制日志"; this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click); this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
// //
// toolStripSeparator11 // toolStripSeparator11
// //
this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(141, 6); this.toolStripSeparator11.Size = new System.Drawing.Size(175, 6);
// //
// 版本号ToolStripMenuItem // 版本号ToolStripMenuItem
// //
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem"; this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26); this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.版本号ToolStripMenuItem.Text = "关于软件"; this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click); this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
// //
...@@ -860,6 +875,7 @@ ...@@ -860,6 +875,7 @@
// //
this.menuStrip1.BackColor = System.Drawing.Color.White; this.menuStrip1.BackColor = System.Drawing.Color.White;
this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.操作ToolStripMenuItem, this.操作ToolStripMenuItem,
this.运行参数ToolStripMenuItem, this.运行参数ToolStripMenuItem,
...@@ -867,7 +883,7 @@ ...@@ -867,7 +883,7 @@
this.帮助ToolStripMenuItem}); this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1350, 29); this.menuStrip1.Size = new System.Drawing.Size(1350, 35);
this.menuStrip1.TabIndex = 4; this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
...@@ -884,90 +900,85 @@ ...@@ -884,90 +900,85 @@
this.toolStripSeparator18, this.toolStripSeparator18,
this.启用分流横移2ToolStripMenuItem, this.启用分流横移2ToolStripMenuItem,
this.toolStripSeparator19, this.toolStripSeparator19,
this.自动保存托盘信息ToolStripMenuItem}); this.自动保存托盘信息ToolStripMenuItem,
this.新托盘检测逻辑ToolStripMenuItem});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem"; this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25); this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(106, 31);
this.运行参数ToolStripMenuItem.Text = "运行参数"; this.运行参数ToolStripMenuItem.Text = "运行参数";
// //
// 开机自动启动ToolStripMenuItem // 开机自动启动ToolStripMenuItem
// //
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem"; this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.开机自动启动ToolStripMenuItem.Text = "开机自动启动"; this.开机自动启动ToolStripMenuItem.Text = "开机自动启动";
this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click); this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click);
// //
// toolStripSeparator15 // toolStripSeparator15
// //
this.toolStripSeparator15.Name = "toolStripSeparator15"; this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(205, 6); this.toolStripSeparator15.Size = new System.Drawing.Size(262, 6);
// //
// 启用蜂鸣器ToolStripMenuItem // 启用蜂鸣器ToolStripMenuItem
// //
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem"; this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器"; this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click); this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
// //
// toolStripSeparator16 // toolStripSeparator16
// //
this.toolStripSeparator16.Name = "toolStripSeparator16"; this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(205, 6); this.toolStripSeparator16.Size = new System.Drawing.Size(262, 6);
// //
// aGVCancelStateToolStripMenuItem // aGVCancelStateToolStripMenuItem
// //
this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem"; this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem";
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState"; this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click); this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click);
// //
// toolStripSeparator17 // toolStripSeparator17
// //
this.toolStripSeparator17.Name = "toolStripSeparator17"; this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(205, 6); this.toolStripSeparator17.Size = new System.Drawing.Size(262, 6);
// //
// 启用分流横移1ToolStripMenuItem // 启用分流横移1ToolStripMenuItem
// //
this.启用分流横移1ToolStripMenuItem.Name = "启用分流横移1ToolStripMenuItem"; this.启用分流横移1ToolStripMenuItem.Name = "启用分流横移1ToolStripMenuItem";
this.启用分流横移1ToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.启用分流横移1ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.启用分流横移1ToolStripMenuItem.Text = "✔启用分流横移1"; this.启用分流横移1ToolStripMenuItem.Text = "✔启用分流横移1";
this.启用分流横移1ToolStripMenuItem.Click += new System.EventHandler(this.启用分流横移1ToolStripMenuItem_Click); this.启用分流横移1ToolStripMenuItem.Click += new System.EventHandler(this.启用分流横移1ToolStripMenuItem_Click);
// //
// toolStripSeparator18 // toolStripSeparator18
// //
this.toolStripSeparator18.Name = "toolStripSeparator18"; this.toolStripSeparator18.Name = "toolStripSeparator18";
this.toolStripSeparator18.Size = new System.Drawing.Size(205, 6); this.toolStripSeparator18.Size = new System.Drawing.Size(262, 6);
// //
// 启用分流横移2ToolStripMenuItem // 启用分流横移2ToolStripMenuItem
// //
this.启用分流横移2ToolStripMenuItem.Name = "启用分流横移2ToolStripMenuItem"; this.启用分流横移2ToolStripMenuItem.Name = "启用分流横移2ToolStripMenuItem";
this.启用分流横移2ToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.启用分流横移2ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.启用分流横移2ToolStripMenuItem.Text = "✔启用分流横移2"; this.启用分流横移2ToolStripMenuItem.Text = "✔启用分流横移2";
this.启用分流横移2ToolStripMenuItem.Click += new System.EventHandler(this.启用分流横移2ToolStripMenuItem_Click); this.启用分流横移2ToolStripMenuItem.Click += new System.EventHandler(this.启用分流横移2ToolStripMenuItem_Click);
// //
// toolStripSeparator19 // toolStripSeparator19
// //
this.toolStripSeparator19.Name = "toolStripSeparator19"; this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(205, 6); this.toolStripSeparator19.Size = new System.Drawing.Size(262, 6);
// //
// 自动保存托盘信息ToolStripMenuItem // 自动保存托盘信息ToolStripMenuItem
// //
this.自动保存托盘信息ToolStripMenuItem.Name = "自动保存托盘信息ToolStripMenuItem"; this.自动保存托盘信息ToolStripMenuItem.Name = "自动保存托盘信息ToolStripMenuItem";
this.自动保存托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.自动保存托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.自动保存托盘信息ToolStripMenuItem.Text = "自动保存托盘信息"; this.自动保存托盘信息ToolStripMenuItem.Text = "自动保存托盘信息";
this.自动保存托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.自动保存托盘信息ToolStripMenuItem_Click); this.自动保存托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.自动保存托盘信息ToolStripMenuItem_Click);
// //
// btnOpenRfid // 新托盘检测逻辑ToolStripMenuItem
// //
this.btnOpenRfid.BackColor = System.Drawing.Color.White; this.新托盘检测逻辑ToolStripMenuItem.Name = "新托盘检测逻辑ToolStripMenuItem";
this.btnOpenRfid.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.新托盘检测逻辑ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.btnOpenRfid.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.新托盘检测逻辑ToolStripMenuItem.Text = "✔新托盘检测逻辑";
this.btnOpenRfid.Location = new System.Drawing.Point(16, 126); this.新托盘检测逻辑ToolStripMenuItem.Click += new System.EventHandler(this.新托盘检测逻辑ToolStripMenuItem_Click);
this.btnOpenRfid.Name = "btnOpenRfid";
this.btnOpenRfid.Size = new System.Drawing.Size(133, 31);
this.btnOpenRfid.TabIndex = 203;
this.btnOpenRfid.Text = "重启RFID服务";
this.btnOpenRfid.UseVisualStyleBackColor = false;
this.btnOpenRfid.Click += new System.EventHandler(this.btnOpenRfid_Click);
// //
// FrmLineStore // FrmLineStore
// //
...@@ -1100,6 +1111,7 @@ ...@@ -1100,6 +1111,7 @@
private System.Windows.Forms.Button btnIOAutoCon; private System.Windows.Forms.Button btnIOAutoCon;
private System.Windows.Forms.CheckBox chbSaveImg; private System.Windows.Forms.CheckBox chbSaveImg;
private System.Windows.Forms.Button btnOpenRfid; private System.Windows.Forms.Button btnOpenRfid;
private System.Windows.Forms.ToolStripMenuItem 新托盘检测逻辑ToolStripMenuItem;
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -12,6 +12,7 @@ using System.Drawing; ...@@ -12,6 +12,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
...@@ -362,9 +363,11 @@ namespace OnlineStore.AssemblyLine ...@@ -362,9 +363,11 @@ namespace OnlineStore.AssemblyLine
{ {
if (lineBean.runStatus != LineRunStatus.Wait) if (lineBean.runStatus != LineRunStatus.Wait)
{ {
MessageBox.Show(lineBean.Name + "当前状态：" + lineBean.runStatus + "，不能启动！"); //MessageBox.Show(lineBean.Name + "当前状态：" + lineBean.runStatus + "，不能启动！");
return; return;
} }
stopRequest = false;
stopRun = false;
LogUtil.info("点击 开始启动"); LogUtil.info("点击 开始启动");
startTimer.Interval = 300; startTimer.Interval = 300;
startTimer.Elapsed += timer_Elapsed; startTimer.Elapsed += timer_Elapsed;
...@@ -427,7 +430,7 @@ namespace OnlineStore.AssemblyLine ...@@ -427,7 +430,7 @@ namespace OnlineStore.AssemblyLine
{ {
if (lineBean.runStatus.Equals(LineRunStatus.Wait)) if (lineBean.runStatus.Equals(LineRunStatus.Wait))
{ {
MessageBox.Show(lineBean.Name + "流水线未启动，不需要停止"); // MessageBox.Show(lineBean.Name + "流水线未启动，不需要停止");
return; return;
} }
LogUtil.info(lineBean.Name + "点击：停止"); LogUtil.info(lineBean.Name + "点击：停止");
...@@ -541,11 +544,47 @@ namespace OnlineStore.AssemblyLine ...@@ -541,11 +544,47 @@ namespace OnlineStore.AssemblyLine
LogUtil.error("LogM Error: ", ex); LogUtil.error("LogM Error: ", ex);
} }
} }
bool stopRun = false;
bool stopRequest = false;
DateTime stopTime = new DateTime();
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
try try
{ {
LogM(); LogM();
try
{
if (SServerManager.stopRun(Name))
{
if (!stopRequest)
{
stopTime = DateTime.Now;
stopRequest = true;
//lineBean.WriteDrivetMotorRun(IO_VALUE.LOW);
}
if (!stopRun && stopRequest && (DateTime.Now - stopTime).TotalSeconds > 40)
{
stopRun = true;
//停止所有料仓TToolStripMenuItem_Click(null, null);
lineBean.WriteDrivetMotorRun(IO_VALUE.LOW);
lineBean.LineStopRun = true;
LogUtil.info("收到服务端停机要求，停止环形线");
}
}
else
{
if (stopRun)
{
lineBean.LineStopRun = false;
lineBean.WriteDrivetMotorRun(IO_VALUE.HIGH);
//启动所有料仓AToolStripMenuItem_Click(null, null);
stopRun = false;
LogUtil.info("收到服务端开机要求，启动环形线");
}
stopRequest = false;
}
}
catch { lineBean.WriteDrivetMotorRun(IO_VALUE.HIGH); }
if (!this.Visible) if (!this.Visible)
{ {
return; return;
...@@ -570,9 +609,9 @@ namespace OnlineStore.AssemblyLine ...@@ -570,9 +609,9 @@ namespace OnlineStore.AssemblyLine
warnMsg += TrayManager.TrayErrorMsg + "\r\n"; warnMsg += TrayManager.TrayErrorMsg + "\r\n";
} }
if (lineBean.IOErrorMsg.Equals("").Equals(false)) if (lineBean.IOErrorMsg.Equals("").Equals(false))
{ {
warnMsg += lineBean.IOErrorMsg + "\r\n"; warnMsg += lineBean.IOErrorMsg + "\r\n";
} }
foreach (EquipBase move in lineBean.AllEquipMap.Values) foreach (EquipBase move in lineBean.AllEquipMap.Values)
{ {
if (move.WarnMsg.Equals("").Equals(false)) if (move.WarnMsg.Equals("").Equals(false))
...@@ -942,8 +981,8 @@ namespace OnlineStore.AssemblyLine ...@@ -942,8 +981,8 @@ namespace OnlineStore.AssemblyLine
private void btnTrayInfo_Click(object sender, EventArgs e) private void btnTrayInfo_Click(object sender, EventArgs e)
{ {
string msg =""; string msg = "";
List<TrayInfo> tray = TrayManager.getTrayList(); List<TrayInfo> tray = TrayManager.getTrayList();
LogUtil.info("-------------------开始打印托盘信息："); LogUtil.info("-------------------开始打印托盘信息：");
msg += "-------------------开始打印托盘信息：\r\n"; msg += "-------------------开始打印托盘信息：\r\n";
...@@ -954,7 +993,7 @@ namespace OnlineStore.AssemblyLine ...@@ -954,7 +993,7 @@ namespace OnlineStore.AssemblyLine
{ {
disstr = "✘"; disstr = "✘";
} }
LogUtil.info(disstr+ t.ToStr()); LogUtil.info(disstr + t.ToStr());
msg += disstr + t.ToStr() + "\r\n"; msg += disstr + t.ToStr() + "\r\n";
} }
LogUtil.info("-------------------结束打印托盘信息"); LogUtil.info("-------------------结束打印托盘信息");
...@@ -1255,7 +1294,8 @@ namespace OnlineStore.AssemblyLine ...@@ -1255,7 +1294,8 @@ namespace OnlineStore.AssemblyLine
TrayInfo tray = TrayManager.GetTrayInfo(trayNum); TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
lblSelTrayNum.Text = tray.ToStr(); lblSelTrayNum.Text = tray.ToStr();
} }
}catch(Exception ex) }
catch (Exception ex)
{ {
} }
...@@ -1274,7 +1314,7 @@ namespace OnlineStore.AssemblyLine ...@@ -1274,7 +1314,7 @@ namespace OnlineStore.AssemblyLine
DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + oldStr + "", "提示", MessageBoxButtons.YesNo); DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + oldStr + "", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes)) if (resut.Equals(DialogResult.Yes))
{ {
TrayManager.ClearInstore(tray,"手动清空托盘"); TrayManager.ClearInstore(tray, "手动清空托盘");
TrayManager.UpdateTrayInfo(num); TrayManager.UpdateTrayInfo(num);
TrayInfo info = TrayManager.GetTrayInfo(num); TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr()); MessageBox.Show("更新成功：\r" + info.ToStr());
...@@ -1290,14 +1330,14 @@ namespace OnlineStore.AssemblyLine ...@@ -1290,14 +1330,14 @@ namespace OnlineStore.AssemblyLine
return; return;
} }
if (启用分流横移1ToolStripMenuItem.Text.Contains(gouStr)) if (启用分流横移1ToolStripMenuItem.Text.Contains(gouStr))
{ {
启用分流横移1ToolStripMenuItem.Text = "启用分流横移1"; 启用分流横移1ToolStripMenuItem.Text = "启用分流横移1";
lineBean.DisableShunt = true; lineBean.DisableShunt = true;
} }
else else
{ {
启用分流横移1ToolStripMenuItem.Text = gouStr + "启用分流横移1"; 启用分流横移1ToolStripMenuItem.Text = gouStr + "启用分流横移1";
lineBean.DisableShunt = false ; lineBean.DisableShunt = false;
} }
LogUtil.info(Name + " 点击：" + 启用分流横移1ToolStripMenuItem.Text + "，lineBean.DisableShunt=" + lineBean.DisableShunt); LogUtil.info(Name + " 点击：" + 启用分流横移1ToolStripMenuItem.Text + "，lineBean.DisableShunt=" + lineBean.DisableShunt);
} }
...@@ -1318,7 +1358,7 @@ namespace OnlineStore.AssemblyLine ...@@ -1318,7 +1358,7 @@ namespace OnlineStore.AssemblyLine
启用分流横移2ToolStripMenuItem.Text = gouStr + "启用分流横移2"; 启用分流横移2ToolStripMenuItem.Text = gouStr + "启用分流横移2";
lineBean.DisableShunt2 = false; lineBean.DisableShunt2 = false;
} }
LogUtil.info(Name + " 点击：" + 启用分流横移2ToolStripMenuItem.Text+ "，lineBean.DisableShunt2="+ lineBean.DisableShunt2); LogUtil.info(Name + " 点击：" + 启用分流横移2ToolStripMenuItem.Text + "，lineBean.DisableShunt2=" + lineBean.DisableShunt2);
} }
private void 自动保存托盘信息ToolStripMenuItem_Click(object sender, EventArgs e) private void 自动保存托盘信息ToolStripMenuItem_Click(object sender, EventArgs e)
...@@ -1373,11 +1413,41 @@ namespace OnlineStore.AssemblyLine ...@@ -1373,11 +1413,41 @@ namespace OnlineStore.AssemblyLine
{ {
RFIDManager.Open(); RFIDManager.Open();
} }
catch(Exception ex) catch (Exception ex)
{ {
LogUtil.error("btnOpenRfid_Click",ex); LogUtil.error("btnOpenRfid_Click", ex);
} }
} }
//private void 启用服务器停止ToolStripMenuItem_Click(object sender, EventArgs e)
//{
// if (SServerManager.IgnoreServerStop)
// {
// 启用服务器停止ToolStripMenuItem.Text = gouStr + " 启用服务器停止功能";
// SServerManager.IgnoreServerStop = false;
// }
// else
// {
// 启用服务器停止ToolStripMenuItem.Text = "启用服务器停止功能";
// SServerManager.IgnoreServerStop = true;
// }
// LogUtil.info(Name + " 点击：" + 启用服务器停止ToolStripMenuItem.Text);
//}
private void 新托盘检测逻辑ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (TrayDisableManager.UseNewLogic)
{
新托盘检测逻辑ToolStripMenuItem.Text = "新托盘检测逻辑";
TrayDisableManager.UseNewLogic = false;
}
else
{
新托盘检测逻辑ToolStripMenuItem.Text = gouStr + " 新托盘检测逻辑";
TrayDisableManager.UseNewLogic = true;
}
LogUtil.info(Name + " 点击：" + 新托盘检测逻辑ToolStripMenuItem.Text);
}
} }
} }
source/AssemblyLineClient/FrmProvidingEquip.Designer.cs
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnReelCheck = new System.Windows.Forms.Button();
this.lblMoveInfo = new System.Windows.Forms.Label(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblTrayNum = new System.Windows.Forms.Label(); this.lblTrayNum = new System.Windows.Forms.Label();
this.lblInstoreList = new System.Windows.Forms.Label(); this.lblInstoreList = new System.Windows.Forms.Label();
...@@ -108,9 +109,11 @@ ...@@ -108,9 +109,11 @@
this.groupBox1.Controls.Add(this.txtSlaveId); this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.cmbWriteIO); this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(497, 6); this.groupBox1.Location = new System.Drawing.Point(639, 7);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(394, 188); this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
this.groupBox1.Size = new System.Drawing.Size(507, 221);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
...@@ -119,10 +122,11 @@ ...@@ -119,10 +122,11 @@
// //
this.txtDOIndex.Enabled = false; this.txtDOIndex.Enabled = false;
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(328, 67); this.txtDOIndex.Location = new System.Drawing.Point(422, 79);
this.txtDOIndex.Margin = new System.Windows.Forms.Padding(4);
this.txtDOIndex.MaxLength = 10; this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex"; this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(47, 23); this.txtDOIndex.Size = new System.Drawing.Size(59, 27);
this.txtDOIndex.TabIndex = 284; this.txtDOIndex.TabIndex = 284;
this.txtDOIndex.Text = "0"; this.txtDOIndex.Text = "0";
// //
...@@ -130,10 +134,11 @@ ...@@ -130,10 +134,11 @@
// //
this.txtDoName.Enabled = false; this.txtDoName.Enabled = false;
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(71, 67); this.txtDoName.Location = new System.Drawing.Point(91, 79);
this.txtDoName.Margin = new System.Windows.Forms.Padding(4);
this.txtDoName.MaxLength = 10; this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName"; this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(116, 23); this.txtDoName.Size = new System.Drawing.Size(148, 27);
this.txtDoName.TabIndex = 283; this.txtDoName.TabIndex = 283;
this.txtDoName.Text = "0"; this.txtDoName.Text = "0";
// //
...@@ -142,9 +147,10 @@ ...@@ -142,9 +147,10 @@
this.label17.AutoSize = true; this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(19, 70); this.label17.Location = new System.Drawing.Point(24, 82);
this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17"; this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 17); this.label17.Size = new System.Drawing.Size(56, 20);
this.label17.TabIndex = 282; this.label17.TabIndex = 282;
this.label17.Text = "设备IP:"; this.label17.Text = "设备IP:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -154,9 +160,10 @@ ...@@ -154,9 +160,10 @@
this.label14.AutoSize = true; this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(272, 70); this.label14.Location = new System.Drawing.Point(350, 82);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17); this.label14.Size = new System.Drawing.Size(43, 20);
this.label14.TabIndex = 281; this.label14.TabIndex = 281;
this.label14.Text = "地址:"; this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -166,9 +173,10 @@ ...@@ -166,9 +173,10 @@
this.btnOpenDo.BackColor = System.Drawing.Color.White; this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(169, 107); this.btnOpenDo.Location = new System.Drawing.Point(217, 126);
this.btnOpenDo.Margin = new System.Windows.Forms.Padding(4);
this.btnOpenDo.Name = "btnOpenDo"; this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(100, 34); this.btnOpenDo.Size = new System.Drawing.Size(129, 40);
this.btnOpenDo.TabIndex = 280; this.btnOpenDo.TabIndex = 280;
this.btnOpenDo.Text = "打开"; this.btnOpenDo.Text = "打开";
this.btnOpenDo.UseVisualStyleBackColor = false; this.btnOpenDo.UseVisualStyleBackColor = false;
...@@ -179,9 +187,10 @@ ...@@ -179,9 +187,10 @@
this.btnWriteSingleDO.BackColor = System.Drawing.Color.White; this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(275, 107); this.btnWriteSingleDO.Location = new System.Drawing.Point(354, 126);
this.btnWriteSingleDO.Margin = new System.Windows.Forms.Padding(4);
this.btnWriteSingleDO.Name = "btnWriteSingleDO"; this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(100, 34); this.btnWriteSingleDO.Size = new System.Drawing.Size(129, 40);
this.btnWriteSingleDO.TabIndex = 277; this.btnWriteSingleDO.TabIndex = 277;
this.btnWriteSingleDO.Text = "关闭"; this.btnWriteSingleDO.Text = "关闭";
this.btnWriteSingleDO.UseVisualStyleBackColor = false; this.btnWriteSingleDO.UseVisualStyleBackColor = false;
...@@ -190,10 +199,11 @@ ...@@ -190,10 +199,11 @@
// txtWriteTime // txtWriteTime
// //
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(82, 113); this.txtWriteTime.Location = new System.Drawing.Point(105, 133);
this.txtWriteTime.Margin = new System.Windows.Forms.Padding(4);
this.txtWriteTime.MaxLength = 10; this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime"; this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(66, 23); this.txtWriteTime.Size = new System.Drawing.Size(84, 27);
this.txtWriteTime.TabIndex = 279; this.txtWriteTime.TabIndex = 279;
this.txtWriteTime.Text = "0"; this.txtWriteTime.Text = "0";
// //
...@@ -202,9 +212,10 @@ ...@@ -202,9 +212,10 @@
this.label5.AutoSize = true; this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(19, 116); this.label5.Location = new System.Drawing.Point(24, 136);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17); this.label5.Size = new System.Drawing.Size(74, 20);
this.label5.TabIndex = 278; this.label5.TabIndex = 278;
this.label5.Text = "定时(ms):"; this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -212,10 +223,11 @@ ...@@ -212,10 +223,11 @@
// txtSlaveId // txtSlaveId
// //
this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSlaveId.Location = new System.Drawing.Point(417, 26); this.txtSlaveId.Location = new System.Drawing.Point(536, 31);
this.txtSlaveId.Margin = new System.Windows.Forms.Padding(4);
this.txtSlaveId.MaxLength = 10; this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId"; this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 23); this.txtSlaveId.Size = new System.Drawing.Size(14, 27);
this.txtSlaveId.TabIndex = 255; this.txtSlaveId.TabIndex = 255;
this.txtSlaveId.Text = "0"; this.txtSlaveId.Text = "0";
this.txtSlaveId.Visible = false; this.txtSlaveId.Visible = false;
...@@ -228,9 +240,10 @@ ...@@ -228,9 +240,10 @@
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.ItemHeight = 22; this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(17, 25); this.cmbWriteIO.Location = new System.Drawing.Point(22, 29);
this.cmbWriteIO.Margin = new System.Windows.Forms.Padding(4);
this.cmbWriteIO.Name = "cmbWriteIO"; this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(356, 28); this.cmbWriteIO.Size = new System.Drawing.Size(457, 28);
this.cmbWriteIO.TabIndex = 234; this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName"; this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem); this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
...@@ -241,9 +254,11 @@ ...@@ -241,9 +254,11 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 6); this.groupBox4.Location = new System.Drawing.Point(323, 7);
this.groupBox4.Margin = new System.Windows.Forms.Padding(4);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 431); this.groupBox4.Padding = new System.Windows.Forms.Padding(4);
this.groupBox4.Size = new System.Drawing.Size(309, 507);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -255,12 +270,13 @@ ...@@ -255,12 +270,13 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.ColumnCount = 1; this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14); this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 16);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 411); this.tableLayoutPanel2.Size = new System.Drawing.Size(294, 484);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -268,9 +284,11 @@ ...@@ -268,9 +284,11 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6); this.groupBox3.Location = new System.Drawing.Point(8, 7);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 431); this.groupBox3.Padding = new System.Windows.Forms.Padding(4);
this.groupBox3.Size = new System.Drawing.Size(309, 507);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -282,12 +300,13 @@ ...@@ -282,12 +300,13 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14); this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 16);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 411); this.tableLayoutPanel1.Size = new System.Drawing.Size(294, 484);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox5 // groupBox5
...@@ -301,9 +320,11 @@ ...@@ -301,9 +320,11 @@
this.groupBox5.Controls.Add(this.btnUpDownUp); this.groupBox5.Controls.Add(this.btnUpDownUp);
this.groupBox5.Controls.Add(this.btnBeforeAfterBefore); this.groupBox5.Controls.Add(this.btnBeforeAfterBefore);
this.groupBox5.Controls.Add(this.btnTopUp); this.groupBox5.Controls.Add(this.btnTopUp);
this.groupBox5.Location = new System.Drawing.Point(897, 6); this.groupBox5.Location = new System.Drawing.Point(1153, 7);
this.groupBox5.Margin = new System.Windows.Forms.Padding(4);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(393, 188); this.groupBox5.Padding = new System.Windows.Forms.Padding(4);
this.groupBox5.Size = new System.Drawing.Size(505, 221);
this.groupBox5.TabIndex = 255; this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试"; this.groupBox5.Text = "IO操作测试";
...@@ -313,9 +334,10 @@ ...@@ -313,9 +334,10 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White; this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(17, 140); this.btnCloseAll.Location = new System.Drawing.Point(22, 165);
this.btnCloseAll.Margin = new System.Windows.Forms.Padding(4);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(140, 34); this.btnCloseAll.Size = new System.Drawing.Size(180, 40);
this.btnCloseAll.TabIndex = 259; this.btnCloseAll.TabIndex = 259;
this.btnCloseAll.Text = "关闭所有DO"; this.btnCloseAll.Text = "关闭所有DO";
this.btnCloseAll.UseVisualStyleBackColor = false; this.btnCloseAll.UseVisualStyleBackColor = false;
...@@ -326,9 +348,10 @@ ...@@ -326,9 +348,10 @@
this.btnStop2Up.BackColor = System.Drawing.Color.White; this.btnStop2Up.BackColor = System.Drawing.Color.White;
this.btnStop2Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStop2Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop2Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStop2Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop2Up.Location = new System.Drawing.Point(175, 22); this.btnStop2Up.Location = new System.Drawing.Point(225, 26);
this.btnStop2Up.Margin = new System.Windows.Forms.Padding(4);
this.btnStop2Up.Name = "btnStop2Up"; this.btnStop2Up.Name = "btnStop2Up";
this.btnStop2Up.Size = new System.Drawing.Size(140, 34); this.btnStop2Up.Size = new System.Drawing.Size(180, 40);
this.btnStop2Up.TabIndex = 258; this.btnStop2Up.TabIndex = 258;
this.btnStop2Up.Text = "阻挡2下降"; this.btnStop2Up.Text = "阻挡2下降";
this.btnStop2Up.UseVisualStyleBackColor = false; this.btnStop2Up.UseVisualStyleBackColor = false;
...@@ -339,9 +362,10 @@ ...@@ -339,9 +362,10 @@
this.btnStop1Up.BackColor = System.Drawing.Color.White; this.btnStop1Up.BackColor = System.Drawing.Color.White;
this.btnStop1Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStop1Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop1Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStop1Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop1Up.Location = new System.Drawing.Point(17, 22); this.btnStop1Up.Location = new System.Drawing.Point(22, 26);
this.btnStop1Up.Margin = new System.Windows.Forms.Padding(4);
this.btnStop1Up.Name = "btnStop1Up"; this.btnStop1Up.Name = "btnStop1Up";
this.btnStop1Up.Size = new System.Drawing.Size(140, 34); this.btnStop1Up.Size = new System.Drawing.Size(180, 40);
this.btnStop1Up.TabIndex = 256; this.btnStop1Up.TabIndex = 256;
this.btnStop1Up.Text = "阻挡1下降"; this.btnStop1Up.Text = "阻挡1下降";
this.btnStop1Up.UseVisualStyleBackColor = false; this.btnStop1Up.UseVisualStyleBackColor = false;
...@@ -352,9 +376,10 @@ ...@@ -352,9 +376,10 @@
this.btnClampSlack.BackColor = System.Drawing.Color.White; this.btnClampSlack.BackColor = System.Drawing.Color.White;
this.btnClampSlack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClampSlack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampSlack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClampSlack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampSlack.Location = new System.Drawing.Point(17, 100); this.btnClampSlack.Location = new System.Drawing.Point(22, 118);
this.btnClampSlack.Margin = new System.Windows.Forms.Padding(4);
this.btnClampSlack.Name = "btnClampSlack"; this.btnClampSlack.Name = "btnClampSlack";
this.btnClampSlack.Size = new System.Drawing.Size(140, 34); this.btnClampSlack.Size = new System.Drawing.Size(180, 40);
this.btnClampSlack.TabIndex = 255; this.btnClampSlack.TabIndex = 255;
this.btnClampSlack.Text = "夹料夹紧"; this.btnClampSlack.Text = "夹料夹紧";
this.btnClampSlack.UseVisualStyleBackColor = false; this.btnClampSlack.UseVisualStyleBackColor = false;
...@@ -365,9 +390,10 @@ ...@@ -365,9 +390,10 @@
this.btnUpDownUp.BackColor = System.Drawing.Color.White; this.btnUpDownUp.BackColor = System.Drawing.Color.White;
this.btnUpDownUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownUp.Location = new System.Drawing.Point(175, 100); this.btnUpDownUp.Location = new System.Drawing.Point(225, 118);
this.btnUpDownUp.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownUp.Name = "btnUpDownUp"; this.btnUpDownUp.Name = "btnUpDownUp";
this.btnUpDownUp.Size = new System.Drawing.Size(140, 34); this.btnUpDownUp.Size = new System.Drawing.Size(180, 40);
this.btnUpDownUp.TabIndex = 252; this.btnUpDownUp.TabIndex = 252;
this.btnUpDownUp.Text = "升降上升"; this.btnUpDownUp.Text = "升降上升";
this.btnUpDownUp.UseVisualStyleBackColor = false; this.btnUpDownUp.UseVisualStyleBackColor = false;
...@@ -379,9 +405,10 @@ ...@@ -379,9 +405,10 @@
this.btnBeforeAfterBefore.BackColor = System.Drawing.Color.White; this.btnBeforeAfterBefore.BackColor = System.Drawing.Color.White;
this.btnBeforeAfterBefore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBeforeAfterBefore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBeforeAfterBefore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBeforeAfterBefore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBeforeAfterBefore.Location = new System.Drawing.Point(175, 61); this.btnBeforeAfterBefore.Location = new System.Drawing.Point(225, 72);
this.btnBeforeAfterBefore.Margin = new System.Windows.Forms.Padding(4);
this.btnBeforeAfterBefore.Name = "btnBeforeAfterBefore"; this.btnBeforeAfterBefore.Name = "btnBeforeAfterBefore";
this.btnBeforeAfterBefore.Size = new System.Drawing.Size(140, 34); this.btnBeforeAfterBefore.Size = new System.Drawing.Size(180, 40);
this.btnBeforeAfterBefore.TabIndex = 249; this.btnBeforeAfterBefore.TabIndex = 249;
this.btnBeforeAfterBefore.Text = "横移前进"; this.btnBeforeAfterBefore.Text = "横移前进";
this.btnBeforeAfterBefore.UseVisualStyleBackColor = false; this.btnBeforeAfterBefore.UseVisualStyleBackColor = false;
...@@ -392,9 +419,10 @@ ...@@ -392,9 +419,10 @@
this.btnTopUp.BackColor = System.Drawing.Color.White; this.btnTopUp.BackColor = System.Drawing.Color.White;
this.btnTopUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTopUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnTopUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopUp.Location = new System.Drawing.Point(17, 61); this.btnTopUp.Location = new System.Drawing.Point(22, 72);
this.btnTopUp.Margin = new System.Windows.Forms.Padding(4);
this.btnTopUp.Name = "btnTopUp"; this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(140, 34); this.btnTopUp.Size = new System.Drawing.Size(180, 40);
this.btnTopUp.TabIndex = 246; this.btnTopUp.TabIndex = 246;
this.btnTopUp.Text = "顶升上升"; this.btnTopUp.Text = "顶升上升";
this.btnTopUp.UseVisualStyleBackColor = false; this.btnTopUp.UseVisualStyleBackColor = false;
...@@ -404,9 +432,10 @@ ...@@ -404,9 +432,10 @@
// //
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(673, 15); this.chbDebug.Location = new System.Drawing.Point(865, 18);
this.chbDebug.Margin = new System.Windows.Forms.Padding(4);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.TabIndex = 247; this.chbDebug.TabIndex = 247;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -419,9 +448,10 @@ ...@@ -419,9 +448,10 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red; this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(255, 13); this.lblThisSta.Location = new System.Drawing.Point(317, 72);
this.lblThisSta.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(531, 197); this.lblThisSta.Size = new System.Drawing.Size(683, 203);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -432,9 +462,10 @@ ...@@ -432,9 +462,10 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green; this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(788, 17); this.lblStoreStatus.Location = new System.Drawing.Point(1013, 20);
this.lblStoreStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblStoreStatus.Name = "lblStoreStatus"; this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20); this.lblStoreStatus.Size = new System.Drawing.Size(82, 24);
this.lblStoreStatus.TabIndex = 245; this.lblStoreStatus.TabIndex = 245;
this.lblStoreStatus.Text = "等待启动"; this.lblStoreStatus.Text = "等待启动";
this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -444,9 +475,10 @@ ...@@ -444,9 +475,10 @@
this.btnStart.BackColor = System.Drawing.Color.White; this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(190, 6); this.btnStart.Location = new System.Drawing.Point(244, 7);
this.btnStart.Margin = new System.Windows.Forms.Padding(4);
this.btnStart.Name = "btnStart"; this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 40); this.btnStart.Size = new System.Drawing.Size(141, 47);
this.btnStart.TabIndex = 86; this.btnStart.TabIndex = 86;
this.btnStart.Text = "启动调试"; this.btnStart.Text = "启动调试";
this.btnStart.UseVisualStyleBackColor = false; this.btnStart.UseVisualStyleBackColor = false;
...@@ -457,9 +489,10 @@ ...@@ -457,9 +489,10 @@
this.btnStop.BackColor = System.Drawing.Color.White; this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(305, 6); this.btnStop.Location = new System.Drawing.Point(392, 7);
this.btnStop.Margin = new System.Windows.Forms.Padding(4);
this.btnStop.Name = "btnStop"; this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 40); this.btnStop.Size = new System.Drawing.Size(141, 47);
this.btnStop.TabIndex = 87; this.btnStop.TabIndex = 87;
this.btnStop.Text = "停止"; this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = false; this.btnStop.UseVisualStyleBackColor = false;
...@@ -471,9 +504,10 @@ ...@@ -471,9 +504,10 @@
this.btnReset.Enabled = false; this.btnReset.Enabled = false;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(420, 6); this.btnReset.Location = new System.Drawing.Point(540, 7);
this.btnReset.Margin = new System.Windows.Forms.Padding(4);
this.btnReset.Name = "btnReset"; this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(110, 40); this.btnReset.Size = new System.Drawing.Size(141, 47);
this.btnReset.TabIndex = 95; this.btnReset.TabIndex = 95;
this.btnReset.Text = "复位"; this.btnReset.Text = "复位";
this.btnReset.UseVisualStyleBackColor = false; this.btnReset.UseVisualStyleBackColor = false;
...@@ -484,9 +518,10 @@ ...@@ -484,9 +518,10 @@
this.btnOutStore.BackColor = System.Drawing.Color.White; this.btnOutStore.BackColor = System.Drawing.Color.White;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(535, 6); this.btnOutStore.Location = new System.Drawing.Point(688, 7);
this.btnOutStore.Margin = new System.Windows.Forms.Padding(4);
this.btnOutStore.Name = "btnOutStore"; this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 40); this.btnOutStore.Size = new System.Drawing.Size(141, 47);
this.btnOutStore.TabIndex = 101; this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出料测试"; this.btnOutStore.Text = "出料测试";
this.btnOutStore.UseVisualStyleBackColor = false; this.btnOutStore.UseVisualStyleBackColor = false;
...@@ -499,10 +534,11 @@ ...@@ -499,10 +534,11 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(5, 55); this.tabControl1.Location = new System.Drawing.Point(6, 65);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1307, 473); this.tabControl1.Size = new System.Drawing.Size(1680, 556);
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
// //
// tabPage1 // tabPage1
...@@ -512,10 +548,11 @@ ...@@ -512,10 +548,11 @@
this.tabPage1.Controls.Add(this.groupBox4); this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Controls.Add(this.groupBox5); this.tabPage1.Controls.Add(this.groupBox5);
this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
this.tabPage1.Size = new System.Drawing.Size(1299, 443); this.tabPage1.Size = new System.Drawing.Size(1672, 523);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -525,25 +562,43 @@ ...@@ -525,25 +562,43 @@
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.btnReelCheck);
this.groupBox6.Controls.Add(this.lblMoveInfo); this.groupBox6.Controls.Add(this.lblMoveInfo);
this.groupBox6.Controls.Add(this.lblTrayNum); this.groupBox6.Controls.Add(this.lblTrayNum);
this.groupBox6.Controls.Add(this.lblInstoreList); this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblThisSta); this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(498, 200); this.groupBox6.Location = new System.Drawing.Point(640, 235);
this.groupBox6.Margin = new System.Windows.Forms.Padding(4);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(792, 237); this.groupBox6.Padding = new System.Windows.Forms.Padding(4);
this.groupBox6.Size = new System.Drawing.Size(1018, 279);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息"; this.groupBox6.Text = "消息";
// //
// btnReelCheck
//
this.btnReelCheck.BackColor = System.Drawing.Color.White;
this.btnReelCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReelCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReelCheck.Location = new System.Drawing.Point(535, 24);
this.btnReelCheck.Margin = new System.Windows.Forms.Padding(4);
this.btnReelCheck.Name = "btnReelCheck";
this.btnReelCheck.Size = new System.Drawing.Size(180, 40);
this.btnReelCheck.TabIndex = 281;
this.btnReelCheck.Text = "出料口4料盘检测";
this.btnReelCheck.UseVisualStyleBackColor = false;
this.btnReelCheck.Click += new System.EventHandler(this.btnReelCheck_Click);
//
// lblMoveInfo // lblMoveInfo
// //
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(18, 29); this.lblMoveInfo.Location = new System.Drawing.Point(23, 34);
this.lblMoveInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17); this.lblMoveInfo.Size = new System.Drawing.Size(84, 20);
this.lblMoveInfo.TabIndex = 280; this.lblMoveInfo.TabIndex = 280;
this.lblMoveInfo.Text = "运动信息："; this.lblMoveInfo.Text = "运动信息：";
// //
...@@ -552,9 +607,10 @@ ...@@ -552,9 +607,10 @@
this.lblTrayNum.AutoSize = true; this.lblTrayNum.AutoSize = true;
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTrayNum.Location = new System.Drawing.Point(29, 29); this.lblTrayNum.Location = new System.Drawing.Point(37, 34);
this.lblTrayNum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblTrayNum.Name = "lblTrayNum"; this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(0, 17); this.lblTrayNum.Size = new System.Drawing.Size(0, 20);
this.lblTrayNum.TabIndex = 276; this.lblTrayNum.TabIndex = 276;
this.lblTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
...@@ -565,9 +621,10 @@ ...@@ -565,9 +621,10 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green; this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(255, 177); this.lblInstoreList.Location = new System.Drawing.Point(328, 208);
this.lblInstoreList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(531, 184); this.lblInstoreList.Size = new System.Drawing.Size(683, 216);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// tabPage2 // tabPage2
...@@ -575,9 +632,10 @@ ...@@ -575,9 +632,10 @@
this.tabPage2.Controls.Add(this.groupDetial); this.tabPage2.Controls.Add(this.groupDetial);
this.tabPage2.Controls.Add(this.groupBox2); this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Controls.Add(this.axisMoveControl1); this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1299, 436); this.tabPage2.Size = new System.Drawing.Size(1672, 523);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "伺服调试"; this.tabPage2.Text = "伺服调试";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -592,9 +650,11 @@ ...@@ -592,9 +650,11 @@
this.groupDetial.Controls.Add(this.label2); this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize); this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1); this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(710, 179); this.groupDetial.Location = new System.Drawing.Point(913, 211);
this.groupDetial.Margin = new System.Windows.Forms.Padding(4);
this.groupDetial.Name = "groupDetial"; this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(537, 205); this.groupDetial.Padding = new System.Windows.Forms.Padding(4);
this.groupDetial.Size = new System.Drawing.Size(690, 241);
this.groupDetial.TabIndex = 318; this.groupDetial.TabIndex = 318;
this.groupDetial.TabStop = false; this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置"; this.groupDetial.Text = "移栽位置P2详细配置";
...@@ -603,9 +663,10 @@ ...@@ -603,9 +663,10 @@
// //
this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDSave.ForeColor = System.Drawing.Color.Blue; this.btnDSave.ForeColor = System.Drawing.Color.Blue;
this.btnDSave.Location = new System.Drawing.Point(108, 150); this.btnDSave.Location = new System.Drawing.Point(139, 176);
this.btnDSave.Margin = new System.Windows.Forms.Padding(4);
this.btnDSave.Name = "btnDSave"; this.btnDSave.Name = "btnDSave";
this.btnDSave.Size = new System.Drawing.Size(94, 34); this.btnDSave.Size = new System.Drawing.Size(121, 40);
this.btnDSave.TabIndex = 322; this.btnDSave.TabIndex = 322;
this.btnDSave.Text = "保存"; this.btnDSave.Text = "保存";
this.btnDSave.UseVisualStyleBackColor = true; this.btnDSave.UseVisualStyleBackColor = true;
...@@ -616,9 +677,10 @@ ...@@ -616,9 +677,10 @@
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(9, 111); this.label3.Location = new System.Drawing.Point(12, 131);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(94, 17); this.label3.Size = new System.Drawing.Size(117, 20);
this.label3.TabIndex = 321; this.label3.TabIndex = 321;
this.label3.Text = "升降轴P2位置："; this.label3.Text = "升降轴P2位置：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -629,11 +691,12 @@ ...@@ -629,11 +691,12 @@
this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtDP2.Location = new System.Drawing.Point(108, 105); this.txtDP2.Location = new System.Drawing.Point(139, 124);
this.txtDP2.Margin = new System.Windows.Forms.Padding(4);
this.txtDP2.MaxLength = 12; this.txtDP2.MaxLength = 12;
this.txtDP2.Name = "txtDP2"; this.txtDP2.Name = "txtDP2";
this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtDP2.Size = new System.Drawing.Size(90, 26); this.txtDP2.Size = new System.Drawing.Size(115, 31);
this.txtDP2.TabIndex = 320; this.txtDP2.TabIndex = 320;
this.txtDP2.Text = "-1"; this.txtDP2.Text = "-1";
// //
...@@ -641,10 +704,11 @@ ...@@ -641,10 +704,11 @@
// //
this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listDetitalP2.FormattingEnabled = true; this.listDetitalP2.FormattingEnabled = true;
this.listDetitalP2.ItemHeight = 20; this.listDetitalP2.ItemHeight = 23;
this.listDetitalP2.Location = new System.Drawing.Point(231, 27); this.listDetitalP2.Location = new System.Drawing.Point(297, 32);
this.listDetitalP2.Margin = new System.Windows.Forms.Padding(4);
this.listDetitalP2.Name = "listDetitalP2"; this.listDetitalP2.Name = "listDetitalP2";
this.listDetitalP2.Size = new System.Drawing.Size(270, 164); this.listDetitalP2.Size = new System.Drawing.Size(346, 188);
this.listDetitalP2.TabIndex = 319; this.listDetitalP2.TabIndex = 319;
this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged); this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged);
// //
...@@ -653,9 +717,10 @@ ...@@ -653,9 +717,10 @@
this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDHeight.FormattingEnabled = true; this.cmbDHeight.FormattingEnabled = true;
this.cmbDHeight.Location = new System.Drawing.Point(108, 67); this.cmbDHeight.Location = new System.Drawing.Point(139, 79);
this.cmbDHeight.Margin = new System.Windows.Forms.Padding(4);
this.cmbDHeight.Name = "cmbDHeight"; this.cmbDHeight.Name = "cmbDHeight";
this.cmbDHeight.Size = new System.Drawing.Size(90, 28); this.cmbDHeight.Size = new System.Drawing.Size(115, 31);
this.cmbDHeight.TabIndex = 318; this.cmbDHeight.TabIndex = 318;
this.cmbDHeight.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged); this.cmbDHeight.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged);
// //
...@@ -664,9 +729,10 @@ ...@@ -664,9 +729,10 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(9, 73); this.label2.Location = new System.Drawing.Point(12, 86);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17); this.label2.Size = new System.Drawing.Size(84, 20);
this.label2.TabIndex = 317; this.label2.TabIndex = 317;
this.label2.Text = "料盘高度："; this.label2.Text = "料盘高度：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -676,9 +742,10 @@ ...@@ -676,9 +742,10 @@
this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDSize.FormattingEnabled = true; this.cmbDSize.FormattingEnabled = true;
this.cmbDSize.Location = new System.Drawing.Point(108, 29); this.cmbDSize.Location = new System.Drawing.Point(139, 34);
this.cmbDSize.Margin = new System.Windows.Forms.Padding(4);
this.cmbDSize.Name = "cmbDSize"; this.cmbDSize.Name = "cmbDSize";
this.cmbDSize.Size = new System.Drawing.Size(90, 28); this.cmbDSize.Size = new System.Drawing.Size(115, 31);
this.cmbDSize.TabIndex = 316; this.cmbDSize.TabIndex = 316;
this.cmbDSize.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged); this.cmbDSize.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged);
// //
...@@ -687,9 +754,10 @@ ...@@ -687,9 +754,10 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(9, 35); this.label1.Location = new System.Drawing.Point(12, 41);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17); this.label1.Size = new System.Drawing.Size(84, 20);
this.label1.TabIndex = 315; this.label1.TabIndex = 315;
this.label1.Text = "料盘尺寸："; this.label1.Text = "料盘尺寸：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -705,9 +773,11 @@ ...@@ -705,9 +773,11 @@
this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnP2); this.groupBox2.Controls.Add(this.btnP2);
this.groupBox2.Controls.Add(this.txtP2); this.groupBox2.Controls.Add(this.txtP2);
this.groupBox2.Location = new System.Drawing.Point(710, 5); this.groupBox2.Location = new System.Drawing.Point(913, 6);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(538, 168); this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
this.groupBox2.Size = new System.Drawing.Size(692, 198);
this.groupBox2.TabIndex = 219; this.groupBox2.TabIndex = 219;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "升降轴位置配置"; this.groupBox2.Text = "升降轴位置配置";
...@@ -719,10 +789,11 @@ ...@@ -719,10 +789,11 @@
this.btnP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP3.ForeColor = System.Drawing.Color.Blue; this.btnP3.ForeColor = System.Drawing.Color.Blue;
this.btnP3.Location = new System.Drawing.Point(273, 64); this.btnP3.Location = new System.Drawing.Point(351, 75);
this.btnP3.Margin = new System.Windows.Forms.Padding(4);
this.btnP3.Name = "btnP3"; this.btnP3.Name = "btnP3";
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(163, 34); this.btnP3.Size = new System.Drawing.Size(210, 40);
this.btnP3.TabIndex = 312; this.btnP3.TabIndex = 312;
this.btnP3.Text = "出料皮带线位置P3"; this.btnP3.Text = "出料皮带线位置P3";
this.btnP3.UseVisualStyleBackColor = true; this.btnP3.UseVisualStyleBackColor = true;
...@@ -734,11 +805,12 @@ ...@@ -734,11 +805,12 @@
this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP3.Location = new System.Drawing.Point(439, 68); this.txtP3.Location = new System.Drawing.Point(564, 80);
this.txtP3.Margin = new System.Windows.Forms.Padding(4);
this.txtP3.MaxLength = 12; this.txtP3.MaxLength = 12;
this.txtP3.Name = "txtP3"; this.txtP3.Name = "txtP3";
this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP3.Size = new System.Drawing.Size(87, 26); this.txtP3.Size = new System.Drawing.Size(111, 31);
this.txtP3.TabIndex = 311; this.txtP3.TabIndex = 311;
this.txtP3.Text = "-1"; this.txtP3.Text = "-1";
// //
...@@ -747,9 +819,10 @@ ...@@ -747,9 +819,10 @@
this.btnSave.BackColor = System.Drawing.SystemColors.Control; this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue; this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(204, 114); this.btnSave.Location = new System.Drawing.Point(262, 134);
this.btnSave.Margin = new System.Windows.Forms.Padding(4);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(110, 34); this.btnSave.Size = new System.Drawing.Size(141, 40);
this.btnSave.TabIndex = 310; this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置"; this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = false; this.btnSave.UseVisualStyleBackColor = false;
...@@ -761,11 +834,12 @@ ...@@ -761,11 +834,12 @@
this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP1.Location = new System.Drawing.Point(439, 28); this.txtP1.Location = new System.Drawing.Point(564, 33);
this.txtP1.Margin = new System.Windows.Forms.Padding(4);
this.txtP1.MaxLength = 12; this.txtP1.MaxLength = 12;
this.txtP1.Name = "txtP1"; this.txtP1.Name = "txtP1";
this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP1.Size = new System.Drawing.Size(87, 26); this.txtP1.Size = new System.Drawing.Size(111, 31);
this.txtP1.TabIndex = 309; this.txtP1.TabIndex = 309;
this.txtP1.Text = "-1"; this.txtP1.Text = "-1";
// //
...@@ -776,10 +850,11 @@ ...@@ -776,10 +850,11 @@
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue; this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(272, 24); this.btnMoveToP1.Location = new System.Drawing.Point(350, 28);
this.btnMoveToP1.Margin = new System.Windows.Forms.Padding(4);
this.btnMoveToP1.Name = "btnMoveToP1"; this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34); this.btnMoveToP1.Size = new System.Drawing.Size(210, 40);
this.btnMoveToP1.TabIndex = 307; this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1："; this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true; this.btnMoveToP1.UseVisualStyleBackColor = true;
...@@ -790,9 +865,10 @@ ...@@ -790,9 +865,10 @@
this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbSizeList.FormattingEnabled = true; this.cmbSizeList.FormattingEnabled = true;
this.cmbSizeList.Location = new System.Drawing.Point(97, 28); this.cmbSizeList.Location = new System.Drawing.Point(125, 33);
this.cmbSizeList.Margin = new System.Windows.Forms.Padding(4);
this.cmbSizeList.Name = "cmbSizeList"; this.cmbSizeList.Name = "cmbSizeList";
this.cmbSizeList.Size = new System.Drawing.Size(168, 28); this.cmbSizeList.Size = new System.Drawing.Size(215, 31);
this.cmbSizeList.TabIndex = 303; this.cmbSizeList.TabIndex = 303;
this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged); this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged);
// //
...@@ -801,9 +877,10 @@ ...@@ -801,9 +877,10 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(17, 34); this.label4.Location = new System.Drawing.Point(22, 40);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17); this.label4.Size = new System.Drawing.Size(84, 20);
this.label4.TabIndex = 302; this.label4.TabIndex = 302;
this.label4.Text = "料盘尺寸："; this.label4.Text = "料盘尺寸：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -815,10 +892,11 @@ ...@@ -815,10 +892,11 @@
this.btnP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP2.ForeColor = System.Drawing.Color.Blue; this.btnP2.ForeColor = System.Drawing.Color.Blue;
this.btnP2.Location = new System.Drawing.Point(12, 68); this.btnP2.Location = new System.Drawing.Point(15, 80);
this.btnP2.Margin = new System.Windows.Forms.Padding(4);
this.btnP2.Name = "btnP2"; this.btnP2.Name = "btnP2";
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(163, 34); this.btnP2.Size = new System.Drawing.Size(210, 40);
this.btnP2.TabIndex = 306; this.btnP2.TabIndex = 306;
this.btnP2.Text = "移栽位置P2"; this.btnP2.Text = "移栽位置P2";
this.btnP2.UseVisualStyleBackColor = true; this.btnP2.UseVisualStyleBackColor = true;
...@@ -830,20 +908,21 @@ ...@@ -830,20 +908,21 @@
this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP2.Location = new System.Drawing.Point(178, 72); this.txtP2.Location = new System.Drawing.Point(229, 85);
this.txtP2.Margin = new System.Windows.Forms.Padding(4);
this.txtP2.MaxLength = 12; this.txtP2.MaxLength = 12;
this.txtP2.Name = "txtP2"; this.txtP2.Name = "txtP2";
this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP2.Size = new System.Drawing.Size(87, 26); this.txtP2.Size = new System.Drawing.Size(111, 31);
this.txtP2.TabIndex = 305; this.txtP2.TabIndex = 305;
this.txtP2.Text = "-1"; this.txtP2.Text = "-1";
// //
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Location = new System.Drawing.Point(6, 5); this.axisMoveControl1.Location = new System.Drawing.Point(8, 6);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(698, 349); this.axisMoveControl1.Size = new System.Drawing.Size(897, 411);
this.axisMoveControl1.TabIndex = 0; this.axisMoveControl1.TabIndex = 0;
// //
// panel1 // panel1
...@@ -857,9 +936,10 @@ ...@@ -857,9 +936,10 @@
this.panel1.Controls.Add(this.btnStart); this.panel1.Controls.Add(this.btnStart);
this.panel1.Controls.Add(this.btnStop); this.panel1.Controls.Add(this.btnStop);
this.panel1.Controls.Add(this.btnReset); this.panel1.Controls.Add(this.btnReset);
this.panel1.Location = new System.Drawing.Point(2, 1); this.panel1.Location = new System.Drawing.Point(3, 1);
this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1306, 51); this.panel1.Size = new System.Drawing.Size(1679, 60);
this.panel1.TabIndex = 258; this.panel1.TabIndex = 258;
// //
// lblName // lblName
...@@ -867,21 +947,23 @@ ...@@ -867,21 +947,23 @@
this.lblName.BackColor = System.Drawing.Color.DodgerBlue; this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black; this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 6); this.lblName.Location = new System.Drawing.Point(6, 7);
this.lblName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblName.Name = "lblName"; this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40); this.lblName.Size = new System.Drawing.Size(231, 47);
this.lblName.TabIndex = 259; this.lblName.TabIndex = 259;
this.lblName.Text = "出料流水线"; this.lblName.Text = "出料流水线";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// FrmProvidingEquip // FrmProvidingEquip
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1318, 532); this.ClientSize = new System.Drawing.Size(1695, 626);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(5);
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "FrmProvidingEquip"; this.Name = "FrmProvidingEquip";
...@@ -971,6 +1053,7 @@ ...@@ -971,6 +1053,7 @@
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox cmbDSize; private System.Windows.Forms.ComboBox cmbDSize;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnReelCheck;
} }
} }
source/AssemblyLineClient/FrmProvidingEquip.cs
...@@ -16,7 +16,7 @@ using System.Reflection; ...@@ -16,7 +16,7 @@ using System.Reflection;
using UserFromControl; using UserFromControl;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using OnlineStore.Common; using OnlineStore.Common;
using System.Threading.Tasks;
namespace OnlineStore.AssemblyLine namespace OnlineStore.AssemblyLine
{ {
...@@ -62,6 +62,7 @@ namespace OnlineStore.AssemblyLine ...@@ -62,6 +62,7 @@ namespace OnlineStore.AssemblyLine
lblThisSta.Text = equipBean.WarnMsg; lblThisSta.Text = equipBean.WarnMsg;
lblName.Text = equipBean.Name; lblName.Text = equipBean.Name;
txtP1.Text = equipBean.Config.UpDownAxisP1.ToString(); txtP1.Text = equipBean.Config.UpDownAxisP1.ToString();
btnReelCheck.Visible = equipBean.Config.CameraName_1 != "";
IsLoad = true; IsLoad = true;
} }
...@@ -540,6 +541,32 @@ namespace OnlineStore.AssemblyLine ...@@ -540,6 +541,32 @@ namespace OnlineStore.AssemblyLine
} }
} }
private void btnReelCheck_Click(object sender, EventArgs e)
{
ReelCheck(btnReelCheck.Text, equipBean.Config.CameraName_1);
}
private void ReelCheck(string text, string cameraName)
{
if (String.IsNullOrEmpty(cameraName))
{
return;
}
Task.Factory.StartNew(delegate {
int rfid = equipBean.ReadReelCheckId();
string reelInfo = equipBean.GetCurReelInfo(cameraName);
if (!string.IsNullOrEmpty(reelInfo))
{
MessageBox.Show("相机[" + cameraName + "]检测料盘结果：[" + rfid + "][" + reelInfo + "]", text + "结果", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
MessageBox.Show("相机[" + cameraName + "]检测料盘失败：[" + rfid + "]", text + "结果", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
});
}
} }
} }
......
source/AssemblyLineClient/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace OnlineStore.AssemblyLine.Properties { ...@@ -19,7 +19,7 @@ namespace OnlineStore.AssemblyLine.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -47,8 +47,8 @@ namespace OnlineStore.AssemblyLine.Properties { ...@@ -47,8 +47,8 @@ namespace OnlineStore.AssemblyLine.Properties {
} }
/// <summary> /// <summary>
/// 重写当前线程的 CurrentUICulture 属性 /// 重写当前线程的 CurrentUICulture 属性，对
/// 重写当前线程的 CurrentUICulture 属性。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
......
source/AssemblyLineClient/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace OnlineStore.AssemblyLine.Properties { ...@@ -12,7 +12,7 @@ namespace OnlineStore.AssemblyLine.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
source/Common/Common.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace> <RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName> <AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.DeviceLibrary</RootNamespace> <RootNamespace>OnlineStore.DeviceLibrary</RootNamespace>
<AssemblyName>DeviceLibrary</AssemblyName> <AssemblyName>DeviceLibrary</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_4.csv
...@@ -3,6 +3,8 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,, ...@@ -3,6 +3,8 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
PRO,0,对应的横移模块,SidesWayNum,4,,,,, PRO,0,对应的横移模块,SidesWayNum,4,,,,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,2,,,,, PRO,0,设备对应的出料流水线的编号,DLineEquipNum,2,,,,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,2,,,,, PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,2,,,,,
PRO,0,出料口前阻挡监控相机,CameraName_1,r_camera_1,,,,,
PRO,0,出料口前阻挡RFID,CameraName_1_RFID,192.168.210.133,,,,,
,,,,, ,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,10,COM3,0,,, AXIS,0,移栽上下轴,UpDown_Axis,10,COM3,0,,,
......
source/DeviceLibrary/assemblyLine/DischargeLine.cs
...@@ -47,14 +47,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -47,14 +47,14 @@ namespace OnlineStore.DeviceLibrary
if (id.Equals(1)) if (id.Equals(1))
{ {
IsNewType = true; IsNewType = true;
TrayLine1 = new OutTrayLineBean(330 + ((id - 1) * 3 + 1) , "皮带线" + "_" + ((id - 1) * 3 + 1) + " ", IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.EntryTray_Check3, this.DeviceID,IO_Type.DLine_Brush1,Config.CameraName_1); TrayLine1 = new OutTrayLineBean(330 + ((id - 1) * 3 + 1), "皮带线" + "_" + ((id - 1) * 3 + 1) + " ", IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.EntryTray_Check3, this.DeviceID, IO_Type.DLine_Brush1, Config.CameraName_1);
TrayLine2 = new OutTrayLineBean(330 + ((id - 1) * 3 + 2),"皮带线" + "_" + ((id - 1) * 3 + 2) + " ", IO_Type.ExitLocation_Check2, IO_Type.ExitTray_Check2, IO_Type.DLine_Run2, IO_Type.MiddleTray_Check3, this.DeviceID,IO_Type.DLine_Brush2,Config.CameraName_2); TrayLine2 = new OutTrayLineBean(330 + ((id - 1) * 3 + 2), "皮带线" + "_" + ((id - 1) * 3 + 2) + " ", IO_Type.ExitLocation_Check2, IO_Type.ExitTray_Check2, IO_Type.DLine_Run2, IO_Type.MiddleTray_Check3, this.DeviceID, IO_Type.DLine_Brush2, Config.CameraName_2);
} }
else else
{ {
IsNewType = true; IsNewType = true;
TrayLine1 = new OutTrayLineBean(330+ ((id - 1) * 3 + 1),"皮带线" + "_" + ((id - 1) * 3 + 1) + " ", IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.MiddleTray_Check3, this.DeviceID,IO_Type.DLine_Brush1,Config.CameraName_1); TrayLine1 = new OutTrayLineBean(330 + ((id - 1) * 3 + 1), "皮带线" + "_" + ((id - 1) * 3 + 1) + " ", IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.MiddleTray_Check3, this.DeviceID, IO_Type.DLine_Brush1, Config.CameraName_1);
TrayLine2 = new OutTrayLineBean(330+((id - 1) * 3 + 2),"皮带线" + "_" + ((id - 1) * 3 + 2) + " ", IO_Type.ExitLocation_Check2, IO_Type.ExitTray_Check2, IO_Type.DLine_Run2, IO_Type.EntryTray_Check3, this.DeviceID,IO_Type.DLine_Brush2,Config.CameraName_2); TrayLine2 = new OutTrayLineBean(330 + ((id - 1) * 3 + 2), "皮带线" + "_" + ((id - 1) * 3 + 2) + " ", IO_Type.ExitLocation_Check2, IO_Type.ExitTray_Check2, IO_Type.DLine_Run2, IO_Type.EntryTray_Check3, this.DeviceID, IO_Type.DLine_Brush2, Config.CameraName_2);
} }
Line3Turn = new LineTurnBean(DeviceID, IO_Type.DLine_Run3, IO_Type.Location_Check3); Line3Turn = new LineTurnBean(DeviceID, IO_Type.DLine_Run3, IO_Type.Location_Check3);
if ((DeviceID % 100).Equals(1)) if ((DeviceID % 100).Equals(1))
...@@ -91,7 +91,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -91,7 +91,7 @@ namespace OnlineStore.DeviceLibrary
lineStatus = LineStatus.StoreOnline; lineStatus = LineStatus.StoreOnline;
runStatus = LineRunStatus.HomeMoving; runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome); MoveInfo.NewMove(LineMoveType.ReturnHome);
StartReset(); StartReset();
if (isDebug) if (isDebug)
{ {
...@@ -129,7 +129,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -129,7 +129,7 @@ namespace OnlineStore.DeviceLibrary
TrayLine1.LastTrayPosition = 1; TrayLine1.LastTrayPosition = 1;
TrayLine2.LastTrayPosition = 1; TrayLine2.LastTrayPosition = 1;
Line3LastTrayP = 1; Line3LastTrayP = 1;
ResetClearData(); ResetClearData();
lineStatus = LineStatus.ResetMove; lineStatus = LineStatus.ResetMove;
MoveInfo.NextMoveStep(LineMoveStep.DL_R_CylinderDown); MoveInfo.NextMoveStep(LineMoveStep.DL_R_CylinderDown);
CylinderMove(null, IO_Type.SeparateDevice_Up, IO_Type.SeparateDevice_Down); CylinderMove(null, IO_Type.SeparateDevice_Up, IO_Type.SeparateDevice_Down);
...@@ -260,13 +260,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -260,13 +260,13 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + "收到急停信号，等待300后再次验证急停"); LogUtil.error(Name + "收到急停信号，等待300后再次验证急停");
//Task.Factory.StartNew(delegate //Task.Factory.StartNew(delegate
//{ //{
Thread.Sleep(300); Thread.Sleep(300);
if (IOValue(IO_Type.DLine_SuddenStop).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.DLine_SuddenStop).Equals(IO_VALUE.LOW))
{ {
SetWarnMsg(Name + "收到急停信号，急停报警", "急停报警"); SetWarnMsg(Name + "收到急停信号，急停报警", "急停报警");
Alarm(LineAlarmType.SuddenStop); Alarm(LineAlarmType.SuddenStop);
return; return;
} }
//}); //});
} }
} }
...@@ -434,7 +434,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -434,7 +434,7 @@ namespace OnlineStore.DeviceLibrary
//判断皮带三还有料盘，需要转动一个工位 //判断皮带三还有料盘，需要转动一个工位
UpdateLastP(); UpdateLastP();
LogUtil.debug(hengyiName + "空闲，且流水线还有料盘，转动一个工位"); LogUtil.debug(hengyiName + "空闲，且流水线还有料盘，转动一个工位");
Line3Turn.StartLineRun( Line3EndProcess); Line3Turn.StartLineRun(Line3EndProcess);
} }
} }
private void UpdateLastP() private void UpdateLastP()
...@@ -495,7 +495,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -495,7 +495,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
LogUtil.error (Name + "Line3EndProcess result=" + result + ""); LogUtil.error(Name + "Line3EndProcess result=" + result + "");
} }
} }
private bool ScanIsEnd() private bool ScanIsEnd()
...@@ -520,71 +520,111 @@ namespace OnlineStore.DeviceLibrary ...@@ -520,71 +520,111 @@ namespace OnlineStore.DeviceLibrary
} }
IsInScanCode = true; IsInScanCode = true;
LastScanTime=DateTime.Now; LastScanTime = DateTime.Now;
string LastCode = ""; string LastCode = "";
//Task.Factory.StartNew(delegate //Task.Factory.StartNew(delegate
//{ //{
if (isfirst) if (isfirst)
{
StationInfo_NG = new StationTrayInfo(IO_VALUE.HIGH);
}
else
{
StationInfo_NG = new StationTrayInfo(StationInfo_Scan.TrayValue, StationInfo_Scan.CodeStr);
}
Thread.Sleep(300);
if (IOValue(IO_Type.ExitTray_Check3).Equals(IO_VALUE.LOW))
{
UpdateScanInfo(IO_VALUE.LOW, "");
IsInScanCode = false;
}
else
{
string resStr = "";
bool hasR=false;
bool hasReel=false;
if(IOValue(IO_Type.ExitTray_Check3).Equals(IO_VALUE.HIGH))
{ {
StationInfo_NG = new StationTrayInfo(IO_VALUE.HIGH); hasReel = true;
resStr += "信号检测到有料盘，";
} }
else else
{ {
StationInfo_NG = new StationTrayInfo(StationInfo_Scan.TrayValue, StationInfo_Scan.CodeStr); resStr += "信号未检测到料盘，";
}
Thread.Sleep(300);
if (IOValue(IO_Type.ExitTray_Check3).Equals(IO_VALUE.LOW))
{
UpdateScanInfo(IO_VALUE.LOW,"");
IsInScanCode = false;
} }
else try
{ {
try LastCode = "";
// StationInfo_Scan = new StationTrayInfo(IO_VALUE.HIGH, LastCode);
UpdateScanInfo(IO_VALUE.HIGH, LastCode);
if (DeviceID.Equals(301))
{ {
LastCode = ""; if (Line3LastTrayP > Line3MaxPosition) { Line3LastTrayP = Line3MaxPosition; }
// StationInfo_Scan = new StationTrayInfo(IO_VALUE.HIGH, LastCode); // StationInfo_NG = new StationTrayInfo(StationInfo_Scan.TrayValue, StationInfo_Scan.CodeStr);
UpdateScanInfo(IO_VALUE.HIGH, LastCode); }
if (DeviceID.Equals(301)) else
{
if (Line3LastTrayP > Line3MaxPosition - 1)
{ {
if (Line3LastTrayP > Line3MaxPosition) { Line3LastTrayP = Line3MaxPosition; } Line3LastTrayP = Line3MaxPosition - 1;
// StationInfo_NG = new StationTrayInfo(StationInfo_Scan.TrayValue, StationInfo_Scan.CodeStr);
} }
else }
LogUtil.info(hengyiName + "扫码工位：开始扫码，IsInScanCode=" + IsInScanCode);
List<string> LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), hengyiName, true);
hasR = CodeManager.HasRightCode(LastCodeList.ToArray());
if(LastCodeList.Count>0)
{
hasReel = true;
resStr += "第一次扫到条码，";
}
else
{
resStr += "第一次未扫到条码，";
}
if (!hasR)
{
LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), hengyiName, true, 3000);
hasR = CodeManager.HasRightCode(LastCodeList.ToArray());
if (LastCodeList.Count > 0)
{ {
if (Line3LastTrayP > Line3MaxPosition - 1) hasReel = true;
{ resStr += "第二次扫到条码";
Line3LastTrayP = Line3MaxPosition - 1;
}
} }
LogUtil.info(hengyiName + "扫码工位：开始扫码，IsInScanCode=" + IsInScanCode); else
List<string> LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), hengyiName, true);
bool hasR = CodeManager.HasRightCode(LastCodeList.ToArray());
if (!hasR)
{ {
LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), hengyiName, true, 3000); resStr += "第二次未扫到条码";
} }
LastCode = SServerManager.ProcessCodeList(LastCodeList);
} }
catch (Exception ex)
LastCode = SServerManager.ProcessCodeList(LastCodeList);
}
catch (Exception ex)
{
LogUtil.error(Name + "扫码错误：" + ex.ToString());
}
finally
{
if(hasReel)
{ {
LogUtil.error(Name + "扫码错误：" + ex.ToString()); UpdateScanInfo(IO_VALUE.HIGH, LastCode);
} }
finally else
{ {
UpdateScanInfo(IO_VALUE.HIGH, LastCode); UpdateScanInfo(IO_VALUE.LOW, LastCode);
IsInScanCode = false;
LogUtil.info(hengyiName + " 扫码工位 : 扫码结束 ，" + StationInfo_Scan.ToStr + " IsInScanCode = " + IsInScanCode);
} }
} IsInScanCode = false;
LogUtil.info(hengyiName + $" 扫码工位 [{resStr}]: 扫码结束 ，" + StationInfo_Scan.ToStr + " IsInScanCode = " + IsInScanCode);
}
}
//}, TaskCreationOptions.LongRunning); //}, TaskCreationOptions.LongRunning);
} }
private void UpdateScanInfo(IO_VALUE value,string code) private void UpdateScanInfo(IO_VALUE value, string code)
{ {
StationInfo_Scan = new StationTrayInfo(value,code); StationInfo_Scan = new StationTrayInfo(value, code);
if (DeviceID.Equals(301)) if (DeviceID.Equals(301))
{ {
StationInfo_NG = new StationTrayInfo(StationInfo_Scan.TrayValue, StationInfo_Scan.CodeStr); StationInfo_NG = new StationTrayInfo(StationInfo_Scan.TrayValue, StationInfo_Scan.CodeStr);
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -256,8 +256,34 @@ namespace OnlineStore.DeviceLibrary ...@@ -256,8 +256,34 @@ namespace OnlineStore.DeviceLibrary
// } // }
//} //}
UpdateTrayNum(); UpdateTrayNum();
TrayInfo trayInfo = TrayManager.GetTrayInfo(currTrayNum);
if (trayInfo.InoutPar?.ManualJudgeNG ?? false)
{
if (Config.SidesWayNum <= 0)
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
TrayInfo tray = TrayManager.GetTrayInfo(currTrayNum);
CheckLog(SecondMoveInfo.MoveNum + "***************上个托盘号【" + preTrayNum + "】，当前 【" + tray.ToStr() + "】被标记为判定NG，放盘通过~");
//CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
}
else
{
CheckLog("托盘检测：此托盘被标记为判定NG，写一下顶升上升，结束处理");
if (Config.SidesWayNum.Equals(2))
{
CylinderMove(null, IO_Type.SW_TopCylinder_Down, IO_Type.SW_TopCylinder_Up);
if (LineManager.Line.SwCanUpMove(3))
{
LineManager.Line.CylinderMove(null, IO_Type.SW3_TopCylinder_Down, IO_Type.SW3_TopCylinder_Up);
}
}
SMoveEnd();
}
}
//出料中，需要拦盘 //出料中，需要拦盘
if (CurrTrayIsNeed(currTrayNum, true)) else if (CurrTrayIsNeed(currTrayNum, true))
{ {
SecondMoveInfo.MoveParam = CheckParam; SecondMoveInfo.MoveParam = CheckParam;
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopUp); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopUp);
...@@ -332,7 +358,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -332,7 +358,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.ReelCheck)); LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.ReelCheck));
} }
LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 入库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘，暂时放托盘离开"); LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 入库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘，暂时放托盘离开");
TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮"); TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮",2);
TrayMoveOk(); TrayMoveOk();
return; return;
} }
...@@ -343,7 +369,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -343,7 +369,7 @@ namespace OnlineStore.DeviceLibrary
if ((!isfull) && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.HIGH)) if ((!isfull) && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.HIGH))
{ {
LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 入库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘，暂时放托盘离开"); LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 入库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘，暂时放托盘离开");
TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮"); TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮",2);
TrayMoveOk(); TrayMoveOk();
return; return;
} }
...@@ -355,7 +381,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -355,7 +381,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.ReelCheck)); LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.ReelCheck));
} }
LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 需拦截有料托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，禁用托盘，暂时放托盘离开"); LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 需拦截有料托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，禁用托盘，暂时放托盘离开");
TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮"); TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮",1);
TrayMoveOk(); TrayMoveOk();
return; return;
} }
...@@ -835,6 +861,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -835,6 +861,7 @@ namespace OnlineStore.DeviceLibrary
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端"); InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take); CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
ClearTimeoutAlarm("扫码执行结束超时"); ClearTimeoutAlarm("扫码执行结束超时");
ClearTimeoutAlarm("即将关机，暂停抓取料盘");
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
...@@ -1440,71 +1467,78 @@ namespace OnlineStore.DeviceLibrary ...@@ -1440,71 +1467,78 @@ namespace OnlineStore.DeviceLibrary
private Task ScanCodeTask = null; private Task ScanCodeTask = null;
private void FI_13_ScanCode() private void FI_13_ScanCode()
{ {
if (CylinderIsOk(IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give)) if (SServerManager.putInEnable(Name))
{ {
if (YuScanTask == null || YuScanTask.IsCompleted) if (CylinderIsOk(IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give))
{ {
ClearTimeoutAlarm("预扫码结束超时"); if (YuScanTask == null || YuScanTask.IsCompleted)
MoveInfo.NextMoveStep(LineMoveStep.FI_13_ScanCode); {
bool isScan = ConfigAppSettings.GetIntValue(Setting_Init.NeedScanCode).Equals(1); ClearTimeoutAlarm("预扫码结束超时");
MoveInfo.NextMoveStep(LineMoveStep.FI_13_ScanCode);
bool isScan = ConfigAppSettings.GetIntValue(Setting_Init.NeedScanCode).Equals(1);
LastCodeList = new List<string>(); LastCodeList = new List<string>();
ScanCodeTask = null; ScanCodeTask = null;
if (NextCodeList.Count > 0) if (NextCodeList.Count > 0)
{
InLog("料盘移栽" + MoveInfo.SLog + "：开始扫码：使用预扫码");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
LastCodeList = new List<string>(NextCodeList);
NextCodeList = new List<string>();
MoveInfo.NextMoveStep(LineMoveStep.FI_14_CylinderTake);
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
}
else if (isScan)
{
InLog("料盘移栽" + MoveInfo.SLog + "：开始扫码");
MoveInfo.OneWaitCanEndStep = true;
MoveInfo.WaitList.Add(WaitResultInfo.WaitFeedScanCode());
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(7000));
try
{ {
ScanCodeTask = Task.Factory.StartNew(delegate InLog("料盘移栽" + MoveInfo.SLog + "：开始扫码：使用预扫码");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
LastCodeList = new List<string>(NextCodeList);
NextCodeList = new List<string>();
MoveInfo.NextMoveStep(LineMoveStep.FI_14_CylinderTake);
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
}
else if (isScan)
{
InLog("料盘移栽" + MoveInfo.SLog + "：开始扫码");
MoveInfo.OneWaitCanEndStep = true;
MoveInfo.WaitList.Add(WaitResultInfo.WaitFeedScanCode());
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(7000));
try
{ {
LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name); ScanCodeTask = Task.Factory.StartNew(delegate
bool hasRightCode = CodeManager.HasRightCode(LastCodeList.ToArray());
if (!hasRightCode)
{ {
LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name, false, 3000); LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name);
} bool hasRightCode = CodeManager.HasRightCode(LastCodeList.ToArray());
return LastCodeList; if (!hasRightCode)
}); {
LastCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name, false, 3000);
}
return LastCodeList;
});
}
catch (Exception ex)
{
LogUtil.error("FI_13_ScanCode扫码出错：", ex);
}
//finally
//{
// MoveInfo.EndStepWait();
//}
} }
catch (Exception ex) else
{ {
LogUtil.error("FI_13_ScanCode扫码出错：", ex); InLog("料盘移栽" + MoveInfo.SLog + "：不需要扫码");
} }
//finally
//{
// MoveInfo.EndStepWait();
//}
} }
else else if (MoveInfo.IsTimeOut(60))
{ {
InLog("料盘移栽" + MoveInfo.SLog + "：不需要扫码"); MoveTimeoutAlarm(MoveInfo, "等待预扫码结束超时");
} //WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待预扫码结束超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
//LogUtil.error(WarnMsg, DeviceID * 1000 + 21);
//Alarm(LineAlarmType.IoSingleTimeOut);
}
} }
else if (MoveInfo.IsTimeOut(60)) else
{ {
MoveTimeoutAlarm(MoveInfo, "等待预扫码结束超时"); FI_12_MoveCylinder_Give();
//WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待预扫码结束超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
//LogUtil.error(WarnMsg, DeviceID * 1000 + 21);
//Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else else //if (MoveInfo.IsTimeOut(10))
{ {
FI_12_MoveCylinder_Give(); MoveTimeoutAlarm(MoveInfo, "即将关机，暂停抓取料盘");
} }
} }
private int LoopCount = 0; private int LoopCount = 0;
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -552,6 +552,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -552,6 +552,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.Alarm_HddLed, IO_VALUE.HIGH); IOMove(IO_Type.Alarm_HddLed, IO_VALUE.HIGH);
} }
public bool LineStopRun = false;
public void WriteDrivetMotorRun(IO_VALUE value) public void WriteDrivetMotorRun(IO_VALUE value)
{ {
...@@ -561,13 +562,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -561,13 +562,12 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.DriveMotor_Run4, value); IOMove(IO_Type.DriveMotor_Run4, value);
} }
#region 灯光处理 #region 灯光处理
private void CloseLed() public void CloseLed()
{ {
CheckAndMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW); CheckAndMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
CheckAndMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW); CheckAndMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
CheckAndMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW); CheckAndMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
CheckAndMove(IO_Type.Alarm_Buzzer, IO_VALUE.LOW); CheckAndMove(IO_Type.Alarm_Buzzer, IO_VALUE.LOW);
...@@ -577,7 +577,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -577,7 +577,7 @@ namespace OnlineStore.DeviceLibrary
try try
{ {
DateTime time = DateTime.Now; DateTime time = DateTime.Now;
if (runStatus <= LineRunStatus.Wait) if (runStatus <= LineRunStatus.Wait || LineStopRun)
{ {
CloseLed(); CloseLed();
return; return;
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -351,7 +351,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -351,7 +351,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.error(Name + "入库 [" + posId + "]，升降气缸下降到托盘[" + currTrayNum + "]取料失败，升降轴上升，禁用托盘，同时放行托盘"); LogUtil.error(Name + "入库 [" + posId + "]，升降气缸下降到托盘[" + currTrayNum + "]取料失败，升降轴上升，禁用托盘，同时放行托盘");
LogInfo("入库 [" + posId + "]" + MoveInfo.SLog + ": 升降轴上升，禁用托盘，同时放行托盘，顶升气缸1下降"); LogInfo("入库 [" + posId + "]" + MoveInfo.SLog + ": 升降轴上升，禁用托盘，同时放行托盘，顶升气缸1下降");
TrayDisableManager.AddDisable(currTrayNum, Name, "入库取料失败"); TrayDisableManager.AddDisable(currTrayNum, Name, "入库取料失败",0);
MI_18_UpdownUp(); MI_18_UpdownUp();
} }
} }
...@@ -390,7 +390,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -390,7 +390,7 @@ namespace OnlineStore.DeviceLibrary
} }
LogUtil.error(Name + "入库 [" + posId + "]，托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，升降轴上升，禁用托盘，同时放行托盘"); LogUtil.error(Name + "入库 [" + posId + "]，托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，升降轴上升，禁用托盘，同时放行托盘");
LogInfo("入库 [" + posId + "]" + MoveInfo.SLog + ": 升降轴上升，禁用托盘，同时放行托盘，顶升气缸1下降"); LogInfo("入库 [" + posId + "]" + MoveInfo.SLog + ": 升降轴上升，禁用托盘，同时放行托盘，顶升气缸1下降");
TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮"); TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮",1);
MI_18_UpdownUp(); MI_18_UpdownUp();
} }
else else
...@@ -651,7 +651,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -651,7 +651,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.TrayCheck)); LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.TrayCheck));
} }
LogInfo(" 出库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘"); LogInfo(" 出库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘");
TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮"); TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮", 2);
} }
else else
{ {
...@@ -734,7 +734,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -734,7 +734,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.TrayCheck)); LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.TrayCheck));
} }
LogInfo(" 入库需拦截有料托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，禁用托盘"); LogInfo(" 入库需拦截有料托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，禁用托盘");
TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮"); TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮", 1);
return false; return false;
} }
else if (!LineServer.BoxCanInStore(StoreID)) else if (!LineServer.BoxCanInStore(StoreID))
...@@ -958,7 +958,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -958,7 +958,7 @@ namespace OnlineStore.DeviceLibrary
try try
{ {
StopReadRfid(); StopReadRfid();
LogUtil.info($"【{Name}】停止记录rfid缓存"); LogUtil.debug($"【{Name}】停止记录rfid缓存");
} }
catch (Exception ex1) catch (Exception ex1)
{ {
...@@ -970,8 +970,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -970,8 +970,13 @@ namespace OnlineStore.DeviceLibrary
bool isFull = TrayManager.TrayIsFull(currTrayNum); bool isFull = TrayManager.TrayIsFull(currTrayNum);
if (TrayManager.RightTrayCode(currTrayNum, preTrayNum, false)) if (TrayManager.RightTrayCode(currTrayNum, preTrayNum, false))
{ {
TrayInfo tray = TrayManager.GetTrayInfo(currTrayNum);
if (tray.InoutPar?.ManualJudgeNG ?? false)
{
LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘【" + currTrayNum + "】被为标记判定NG,放盘通过");
}
//出库中，需要拦盘 //出库中，需要拦盘
if (CheckIsNeedOutStore()) else if (CheckIsNeedOutStore())
{ {
isNeed = true; isNeed = true;
} }
...@@ -1056,8 +1061,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -1056,8 +1061,13 @@ namespace OnlineStore.DeviceLibrary
//托盘号正确 //托盘号正确
//preTrayNum = num; //preTrayNum = num;
bool isNeedMove = false; bool isNeedMove = false;
TrayInfo tray = TrayManager.GetTrayInfo(currTrayNum);
if(tray.InoutPar?.ManualJudgeNG??false)
{
LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘【" + currTrayNum + "】被为标记判定NG,放盘通过");
}
//判断盘是空盘,空盘并且编号正确才需要放料盘过去 //判断盘是空盘,空盘并且编号正确才需要放料盘过去
if (CheckIsNeedOutStore()) else if (CheckIsNeedOutStore())
{ {
SecondMoveInfo.MoveParam = new InOutParam(currTrayNum); SecondMoveInfo.MoveParam = new InOutParam(currTrayNum);
isNeedMove = true; isNeedMove = true;
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
...@@ -64,9 +64,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -64,9 +64,10 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
bool check2Ok = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false); bool check2Ok = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false);
if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH) ) if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH))
{ {
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum)); bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
ProcessReelCheck();
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && (DateTime.Now - lastStopDown).TotalSeconds > 3 && check2Ok && canProcess) if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && (DateTime.Now - lastStopDown).TotalSeconds > 3 && check2Ok && canProcess)
{ {
trayCheckWait.Stop(); trayCheckWait.Stop();
...@@ -74,11 +75,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -74,11 +75,12 @@ namespace OnlineStore.DeviceLibrary
lastStopDown = DateTime.Now; lastStopDown = DateTime.Now;
//托盘在第一个阻挡处 //托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.CheckFixture); SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
LogUtil.debug(Name + " [" + trayCount + "] 托盘检测：" + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ，等待 StopCylinder_Check1=0，清理托盘RFID"); LogUtil.debug(Name + " [" + trayCount + "] 托盘检测：" + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ，等待 StopCylinder_Check1=0，清理托盘RFID");
ClearTrayRFID(); ClearTrayRFID();
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH, 1200); IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH, 1200);
SecondMoveInfo.OneWaitCanEndStep = true; SecondMoveInfo.OneWaitCanEndStep = true;
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
//SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000)); //SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
...@@ -104,6 +106,195 @@ namespace OnlineStore.DeviceLibrary ...@@ -104,6 +106,195 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " StartCheckFixture " + "失败，未得到锁"); LogUtil.error(Name + " StartCheckFixture " + "失败，未得到锁");
} }
} }
public int ReadReelCheckId()
{
if (string.IsNullOrEmpty(Config.CameraName_1_RFID)) return 0;
try
{
RFIDData data = RFIDManager.ReadRFID(Config.CameraName_1_RFID, true);
if (data != null)
{
if (data.RFType.Equals('E'))
{
return data.Num;
}
}
}
catch (Exception ex)
{
LogUtil.error("ReadReelCheckId", ex);
}
return 0;
}
public string GetCurReelInfo(string cameName)
{
try
{
(bool result, string barcode) = CodeManager.ReelCheckCameraScan(new List<string> { cameName }, Name);
if (result)
{
(int resultCode, taskInfo task) = SServerManager.getTaskInfo(barcode);
return $"【{result}】【{barcode}】【{resultCode}】【{JsonHelper.SerializeObject(task)}】";
}
else
{
return $"相机扫码失败：【{result}】【{barcode}】";
}
}
catch (Exception ex)
{
LogUtil.error("GetCurReelInfo", ex);
}
return "";
}
private void ProcessReelCheck()
{
try
{
if (!TrayDisableManager.UseNewLogic) return;
if (Config.SidesWayNum.Equals(4) && !string.IsNullOrEmpty(Config.CameraName_1) && !string.IsNullOrEmpty(Config.CameraName_1_RFID))
{
RFIDData data = RFIDManager.ReadRFID(Config.CameraName_1_RFID, true);
int trayNum = -1;
if (data != null)
{
if (data.RFType.Equals('E'))
{
trayNum = data.Num;
LogUtil.info("RFID [ " + Config.CameraName_1_RFID + " ] 读到数据 " + data.NumStr());
//获取托盘信息
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
if (tray.InoutPar.ManualJudgeNG)
{
//扫码
(bool result, string barcode) = CodeManager.ReelCheckCameraScan(new List<string> { Config.CameraName_1 }, Name);
if (tray.IsFull)//初次检测有料盘
{
if (result)//有料盘
{
(int resCode, taskInfo task) = SServerManager.getTaskInfo(barcode);
if (resCode == -1)
{
TrayDisableManager.AddDisableTray(trayNum);
LogUtil.info($"【屏蔽料盘二次判断】【-1】【需要禁用该托盘】【{tray.ToStr()}】");
}
else if (resCode == 100)
{
tray.InoutPar.InStoreNg = true;
tray.InoutPar.PlateH = task.plateH;
tray.InoutPar.PlateW = task.plateW;
TrayManager.UpdateTrayInfo(trayNum, true, tray.InOrOutStore, tray.InoutPar);
tray.InoutPar.Corrected = true;
LogUtil.info($"【屏蔽料盘二次判断】【100】【有尺寸信息，认为NG】【{tray.ToStr()}】");
}
else if (resCode == 0)
{
//if (task != null)
{
tray.InoutPar.WareCode = task.barcode;
tray.InOrOutStore = task.isPutInTask ? 1 : 2;
tray.InoutPar.PosId = task.posId;
tray.InoutPar.PlateH = task.plateH;
tray.InoutPar.PlateW = task.plateW;
tray.InoutPar.cutReel = task.cutReel;
tray.InoutPar.smallReel = task.smallReel;
tray.InoutPar.urgentReel = task.urgentReel;
tray.InoutPar.rfid = task.rfid;
tray.InoutPar.rfidLoc = task.rfidLoc;
tray.InoutPar.ManualJudgeNG = false;
tray.InoutPar.InStoreNg = false;
TrayManager.UpdateTrayInfo(trayNum, true, tray.InOrOutStore, tray.InoutPar);
if (tray.InOrOutStore == 1)
{
SServerManager.SendPosToStoreCheck(Name, tray.InoutPar);
}
tray.InoutPar.Corrected = true;
LogUtil.info($"【屏蔽料盘二次判断】【初次有料，第二次有料,认为有料】【{tray.ToStr()}】");
}
}
}
else//二次检测无料盘
{
if (tray.IsFull && tray.InOrOutStore.Equals(1))
{
TrayManager.ClearInstore(tray, "【屏蔽料盘二次判断】【初次有料，第二次无料】【清空托盘】[" + trayNum + "]");
}
TrayManager.UpdateTrayInfo(trayNum);
tray.InoutPar.Corrected = true;
LogUtil.info($"【屏蔽料盘二次判断】【初次有料，第二次无料】【清空托盘】【{tray.ToStr()}】");
}
}
else////初次检测无料盘
{
if (result)//有料盘
{
(int resCode, taskInfo task) = SServerManager.getTaskInfo(barcode);
if (resCode == -1)
{
TrayDisableManager.AddDisableTray(trayNum);
LogUtil.info($"【屏蔽料盘二次判断】【-1】【初次无料，第二次有料】 【禁用该托盘】【{tray.ToStr()}】");
}
else if (resCode == 100)
{
tray.InoutPar.InStoreNg = true;
tray.InoutPar.PlateH = task.plateH;
tray.InoutPar.PlateW = task.plateW;
TrayManager.UpdateTrayInfo(trayNum, true, tray.InOrOutStore, tray.InoutPar);
tray.InoutPar.Corrected = true;
LogUtil.info($"【屏蔽料盘二次判断】【100】【有尺寸信息，认为NG】【{tray.ToStr()}】");
}
else if (resCode == 0)
{
// if (task != null)
{
tray.InoutPar.WareCode = task.barcode;
tray.InOrOutStore = task.isPutInTask ? 1 : 2;
tray.InoutPar.PosId = task.posId;
tray.InoutPar.PlateH = task.plateH;
tray.InoutPar.PlateW = task.plateW;
tray.InoutPar.cutReel = task.cutReel;
tray.InoutPar.urgentReel = task.urgentReel;
tray.InoutPar.smallReel = task.smallReel;
tray.InoutPar.rfid = task.rfid;
tray.InoutPar.rfidLoc = task.rfidLoc;
tray.InoutPar.ManualJudgeNG = false;
TrayManager.UpdateTrayInfo(trayNum, true, tray.InOrOutStore, tray.InoutPar);
tray.InoutPar.Corrected = true;
LogUtil.info($"【屏蔽料盘二次判断】【初次无料，第二次有料】【纠正为有料】【{tray.ToStr()}】");
}
}
}
else//二次检测无料盘
{
if (tray.IsFull && tray.InOrOutStore.Equals(1))
{
TrayManager.ClearInstore(tray, "【屏蔽料盘二次判断】【初次无料，第二次无料】【清空托盘】[" + trayNum + "]");
}
TrayManager.UpdateTrayInfo(trayNum);
tray.InoutPar.Corrected = true;
LogUtil.info($"【屏蔽料盘二次判断】【初次无料，第二次无料】【清空托盘】【{tray.ToStr()}】");
}
}
}
}
else
{
trayNum = 0;
LogUtil.debug("RFID [ " + Config.CameraName_1_RFID + " ] 读到数据 " + data.NumStr() + " 返回盘号 0");
}
}
}
}
catch (Exception ex)
{
LogUtil.error($"屏蔽料盘二次处理", ex);
}
}
private void MO_14_TopCylinder_Down() private void MO_14_TopCylinder_Down()
{ {
// SecondMoveInfo.NewMove(LineMoveType.CheckFixture); // SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
...@@ -154,7 +345,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -154,7 +345,7 @@ namespace OnlineStore.DeviceLibrary
//如果分配了库位，需要调用取消 //如果分配了库位，需要调用取消
if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "") if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "")
{ {
SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode,false ); SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode, false);
} }
//入料失败料 //入料失败料
return inoup; return inoup;
...@@ -269,7 +460,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -269,7 +460,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (lineNum.Equals(1) || lineNum.Equals(2)) if (lineNum.Equals(1) || lineNum.Equals(2))
{ {
if (LastValue<=2) if (LastValue <= 2)
{ {
outMsg = "随意放" + LastValue; outMsg = "随意放" + LastValue;
LastValue++; LastValue++;
...@@ -313,12 +504,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -313,12 +504,12 @@ namespace OnlineStore.DeviceLibrary
{ {
//if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.LOW)) //if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.LOW))
//{ //{
TimeSpan span = DateTime.Now - SecondMoveInfo.LastSetpTime; TimeSpan span = DateTime.Now - SecondMoveInfo.LastSetpTime;
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_04_Wait); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_04_Wait);
LogUtil.debug(Name + "托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸上升，下降耗时（" + FormUtil.GetSpanStr(span) + "），等待 阻挡2托盘检测=1），最多等待30秒"); LogUtil.debug(Name + "托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸上升，下降耗时（" + FormUtil.GetSpanStr(span) + "），等待 阻挡2托盘检测=1），最多等待30秒");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
SecondMoveInfo.OneWaitCanEndStep = true; SecondMoveInfo.OneWaitCanEndStep = true;
//} //}
//else //else
//{ //{
...@@ -357,7 +548,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -357,7 +548,13 @@ namespace OnlineStore.DeviceLibrary
string outMsg = ""; string outMsg = "";
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
InOutParam param = CheckIsNeedOutStore(out outMsg); InOutParam param = CheckIsNeedOutStore(out outMsg);
if (param != null) TrayInfo tray = TrayManager.GetTrayInfo(currTrayNum);
if (tray.InoutPar?.ManualJudgeNG ?? false)
{
LogInfo(SecondMoveInfo.MoveNum + "*************** 托盘【" + currTrayNum + "】被为标记判定NG,放盘通过");
MO_14_TopDown();
}
else if (param != null)
{ {
SecondMoveInfo.MoveParam = param; SecondMoveInfo.MoveParam = param;
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_05_WaitTime); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_05_WaitTime);
...@@ -613,7 +810,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -613,7 +810,7 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.IsInWait) if (MoveInfo.IsInWait)
{ {
CheckWait(MoveInfo); CheckWait(MoveInfo);
} }
if (MoveInfo.IsInWait) if (MoveInfo.IsInWait)
{ {
return; return;
...@@ -626,7 +823,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -626,7 +823,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_01_CylinderDown)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_01_CylinderDown))
{ {
PO_03_CylinderOpen(); PO_03_CylinderOpen();
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_02_TopUP)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_02_TopUP))
{ {
PO_03_CylinderOpen(); PO_03_CylinderOpen();
...@@ -655,7 +852,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -655,7 +852,7 @@ namespace OnlineStore.DeviceLibrary
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ClampCylinder_Slack, IO_VALUE.HIGH)); // MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.ClampCylinder_Slack, IO_VALUE.HIGH));
//} //}
//else //else
{ {
PO_07_CylinderBefore(); PO_07_CylinderBefore();
} }
} }
...@@ -674,7 +871,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -674,7 +871,7 @@ namespace OnlineStore.DeviceLibrary
if (CylinderIsOk(IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before)) if (CylinderIsOk(IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before))
{ {
if (LineIsReady()) if (LineIsReady())
{ {
MoveInfo.NextMoveStep(LineMoveStep.PO_09_CylinderRelax); MoveInfo.NextMoveStep(LineMoveStep.PO_09_CylinderRelax);
OutLog("出料：" + MoveInfo.SLog + "，夹料气缸放松）"); OutLog("出料：" + MoveInfo.SLog + "，夹料气缸放松）");
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten); CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten);
...@@ -713,9 +910,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -713,9 +910,9 @@ namespace OnlineStore.DeviceLibrary
OutLog("出料：" + MoveInfo.SLog + " ，前后气缸前进）"); OutLog("出料：" + MoveInfo.SLog + " ，前后气缸前进）");
CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before); CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before);
} }
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_09_CylinderRelax)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_09_CylinderRelax))
{ {
MoveInfo.NextMoveStep(LineMoveStep.PO_11_CylinderAfter); MoveInfo.NextMoveStep(LineMoveStep.PO_11_CylinderAfter);
OutLog("出料：" + MoveInfo.SLog + "，前后气缸后退，等待200 ,皮带线继续运动"); OutLog("出料：" + MoveInfo.SLog + "，前后气缸后退，等待200 ,皮带线继续运动");
CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After); CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
...@@ -757,7 +954,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -757,7 +954,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private bool afterPutCutOK= false ; private bool afterPutCutOK = false;
private OutTrayLineBean GetDisLine() private OutTrayLineBean GetDisLine()
{ {
try try
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
...@@ -278,7 +278,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -278,7 +278,7 @@ namespace OnlineStore.DeviceLibrary
try try
{ {
int id = Convert.ToInt32(st.Trim()); int id = Convert.ToInt32(st.Trim());
if (id > 0 && id <= 20) //if (id > 0 && id <= 20)
{ {
useTrayCheck.Add(id); useTrayCheck.Add(id);
} }
......
source/DeviceLibrary/assemblymanager/SServerManager.cs
...@@ -598,6 +598,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -598,6 +598,11 @@ namespace OnlineStore.DeviceLibrary
{ {
//如果当前正在出入库中，需要记录下来，等待空闲时执行 //如果当前正在出入库中，需要记录下来，等待空闲时执行
LogUtil.info(deviceName + "[" + moveEquip.Name + " ]入库命令： " + param.ToStr() + "加入等待列表中！"); LogUtil.info(deviceName + "[" + moveEquip.Name + " ]入库命令： " + param.ToStr() + "加入等待列表中！");
InOutParam inOutParam = moveEquip.waitInStoreList.Find(s => param.PosId.Equals(s.PosId));
if(inOutParam!=null)
{
moveEquip.waitInStoreList.Remove(inOutParam);
}
moveEquip.waitInStoreList.Add(param); moveEquip.waitInStoreList.Add(param);
} }
} }
...@@ -654,8 +659,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -654,8 +659,6 @@ namespace OnlineStore.DeviceLibrary
return msg; return msg;
} }
// 流水线料盘移动到皮带线时进行判断: 地址： /rest/api/qisda/device/canReelToBelt 参数:barcode: 料盘条码 // 流水线料盘移动到皮带线时进行判断: 地址： /rest/api/qisda/device/canReelToBelt 参数:barcode: 料盘条码
private static string Addr_canReelToBelt = "/rest/api/qisda/device/canReelToBelt"; private static string Addr_canReelToBelt = "/rest/api/qisda/device/canReelToBelt";
public static bool canReelToBelt(string deviceName, string barcode) public static bool canReelToBelt(string deviceName, string barcode)
...@@ -666,14 +669,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -666,14 +669,14 @@ namespace OnlineStore.DeviceLibrary
//data: true 可以放上皮带线 false 继续留在环形线。默认直接放到皮带线 //data: true 可以放上皮带线 false 继续留在环形线。默认直接放到皮带线
try try
{ {
Dictionary<string, string> paramMap = new Dictionary<string, string>(); Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add("barcode", barcode); paramMap.Add("barcode", barcode);
string server = GetAddr(Addr_canReelToBelt, paramMap); string server = GetAddr(Addr_canReelToBelt, paramMap);
DateTime startTime = DateTime.Now; DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Post(server, ""); string resultStr = HttpHelper.Post(server, "");
LogUtil.debug($"{deviceName }canReelToBelt {FormUtil.GetSpanStr(DateTime.Now - startTime) } 【{ server }】【{resultStr }】"); LogUtil.debug($"{deviceName}canReelToBelt {FormUtil.GetSpanStr(DateTime.Now - startTime)} 【{server}】【{resultStr}】");
ReturnData data = JsonHelper.DeserializeJsonToObject<ReturnData>(resultStr); ReturnData data = JsonHelper.DeserializeJsonToObject<ReturnData>(resultStr);
...@@ -683,11 +686,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -683,11 +686,12 @@ namespace OnlineStore.DeviceLibrary
if (data.code.Equals(0) && (!result)) if (data.code.Equals(0) && (!result))
{ {
return result; return result;
} else if (!data.code.Equals(0)) }
else if (!data.code.Equals(0))
{ {
LogUtil.error($"{deviceName }canReelToBelt【 { barcode }】 返回错误 ：{ data.msg}={data.msg}"); LogUtil.error($"{deviceName}canReelToBelt【 {barcode}】 返回错误 ：{data.msg}={data.msg}");
} }
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -695,7 +699,155 @@ namespace OnlineStore.DeviceLibrary ...@@ -695,7 +699,155 @@ namespace OnlineStore.DeviceLibrary
} }
return true; return true;
} }
public static bool IgnoreServerStop = false;
private static string Addr_putInEnable = "/rest/api/qisda/device/putInEnable";
/// <summary>
/// 流水线抓取料盘前获取是否可以继续抓取料盘
/// </summary>
/// <param name="deviceName"></param>
/// <returns></returns>
public static bool putInEnable(string deviceName)
{
if (IgnoreServerStop) return true;
// 返回: // { "code":0,"msg":"ok","data":{"putInEnable":true}}
// code: 0为正常,其他为异常
// msg:消息,
//putInEnable: false 时不允许抓取下一盘，true时允许抓取
try
{
Dictionary<string, string> paramMap = new Dictionary<string, string>();
//paramMap.Add("barcode", barcode);
string server = GetAddr(Addr_putInEnable, paramMap);
DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Post(server, "");
LogUtil.debug($"{deviceName}putInEnable {FormUtil.GetSpanStr(DateTime.Now - startTime)} 【{server}】【{resultStr}】");
ReturnData1 data = JsonHelper.DeserializeJsonToObject<ReturnData1>(resultStr);
if (data != null)
{
bool result = data.data.putInEnable;
if (data.code.Equals(0))
{
return result;
}
else if (!data.code.Equals(0))
{
LogUtil.error($"{deviceName} putInEnable 返回错误 ：{data.msg}={data.msg}");
}
}
}
catch (Exception ex)
{
LogUtil.error(deviceName + " " + ex.ToString());
}
return false;
}
private static string Addr_stopRun = "/rest/api/qisda/device/stopRun";
/// <summary>
/// 流水线停止运行
/// </summary>
/// <param name="deviceName"></param>
/// <returns>true：停止运行</returns>
public static bool stopRun(string deviceName)
{
if (IgnoreServerStop) return false;
try
{
Dictionary<string, string> paramMap = new Dictionary<string, string>();
//paramMap.Add("barcode", barcode);
string server = GetAddr(Addr_stopRun, paramMap);
DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Post(server, "");
LogUtil.debug($"{deviceName}stopRun {FormUtil.GetSpanStr(DateTime.Now - startTime)} 【{server}】【{resultStr}】");
ReturnData2 data = JsonHelper.DeserializeJsonToObject<ReturnData2>(resultStr);
if (data != null)
{
bool result = data.data.stopOut;
if (data.code.Equals(0))
{
return result && data.data.unfinishedTask < 1;
}
else if (!data.code.Equals(0))
{
LogUtil.error($"{deviceName} stopRun 返回错误 ：{data.msg}={data.msg}");
}
}
}
catch (Exception ex)
{
LogUtil.error(deviceName + " " + ex.ToString());
}
return false;
}
private static string Addr_getTaskInfo = "/rest/api/qisda/device/getTaskInfo";
/// <summary>
/// 获取托盘任务信息
/// </summary>
/// <param name="barcode"></param>
/// <returns>
/// result:
/// 0,ok
/// -1,异常，需要屏蔽
/// 100,异常，需要抓到NG区
/// </returns>
public static (int, taskInfo) getTaskInfo(string barcode)
{
int result = 0;
taskInfo task = new taskInfo();
try
{
Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add("barcode", barcode);
string server = GetAddr(Addr_getTaskInfo, paramMap);
DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Post(server, "");
LogUtil.info($"getTaskInfo {FormUtil.GetSpanStr(DateTime.Now - startTime)} 【{server}】【{resultStr}】");
ReturnData3 data = JsonHelper.DeserializeJsonToObject<ReturnData3>(resultStr);
if (data != null)
{
if (data.code.Equals(0))
{
return (0, data.data);
}
else if (data.code.Equals(-1))
{
return (-1, data.data);
}
else if(data.code.Equals(100))
{
if(data.data.plateH>0&& data.data.plateW>0)
{
return (100, data.data);
}
else
{
return (-1, data.data);
}
}
else
{
return (-1, data.data);
}
}
}
catch (Exception ex)
{
LogUtil.error("getTaskInfo " + ex.ToString());
}
return (result,task);
}
} }
public class ReturnData public class ReturnData
{ {
// { "code":0,"msg":"ok","data":true} // { "code":0,"msg":"ok","data":true}
...@@ -705,6 +857,91 @@ namespace OnlineStore.DeviceLibrary ...@@ -705,6 +857,91 @@ namespace OnlineStore.DeviceLibrary
public object data { get; set; } public object data { get; set; }
} }
public class ReturnData1
{
// { "code":0,"msg":"ok","data":true}
public int code { get; set; }
public string msg { get; set; }
public PutInEnable data { get; set; }
}
public class PutInEnable
{
public bool putInEnable { get; set; }
}
public class ReturnData2
{
// { "code":0,"msg":"ok","data":true}
public int code { get; set; }
public string msg { get; set; }
public StopRun data { get; set; }
}
public class StopRun
{
public int unfinishedTask { get; set; }
public bool stopOut { get; set; }
}
public class ReturnData3
{
// { "code":0,"msg":"ok","data":true}
public int code { get; set; }
public string msg { get; set; }
public taskInfo data { get; set; }
}
public class taskInfo
{
/// <summary>
/// 是否是出入库任务
/// true:入库任务
/// false:出库任务
/// </summary>
public bool isPutInTask { get; set; }
/// <summary>
/// 解析后的条码
/// </summary>
public string barcode { get; set; }
/// <summary>
/// 库位
/// </summary>
public string posId { get; set; }
/// <summary>
/// 料盘尺寸
/// </summary>
public int plateW { get; set; }
/// <summary>
/// 料盘厚度
/// </summary>
public int plateH { get; set; }
/// <summary>
/// 是否为单独出库
/// </summary>
public bool singleOut { get; set; }
/// <summary>
/// 是否是分盘料
/// </summary>
public bool cutReel { get; set; }
/// <summary>
/// 是否是小料盘
/// </summary>
public bool smallReel { get; set; }
/// <summary>
/// 紧急料
/// </summary>
public bool urgentReel { get; set; }
/// <summary>
/// 分配的料架RFID
/// </summary>
public string rfid { get; set; }
/// <summary>
/// 分配的位置信息
/// </summary>
public int rfidLoc { get; set; }
}
public class AlarmMsg public class AlarmMsg
{ {
...@@ -715,7 +952,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -715,7 +952,7 @@ namespace OnlineStore.DeviceLibrary
//>>>msgValue : 异常信息 //>>>msgValue : 异常信息
public string msgValue = ""; public string msgValue = "";
public AlarmMsg(string n ,string key,string value) public AlarmMsg(string n, string key, string value)
{ {
this.name = n; this.name = n;
this.msgKey = key; this.msgKey = key;
...@@ -742,7 +979,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -742,7 +979,7 @@ namespace OnlineStore.DeviceLibrary
public string msg { get; set; } public string msg { get; set; }
public Dictionary<string,string> data { get; set; } public Dictionary<string, string> data { get; set; }
} }
public class LocStatus public class LocStatus
{ {
...@@ -766,7 +1003,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -766,7 +1003,7 @@ namespace OnlineStore.DeviceLibrary
public string msg { get; set; } public string msg { get; set; }
public string data { get; set; } public string data { get; set; }
} }
public class AfterPutData public class AfterPutData
{ {
...@@ -806,10 +1043,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -806,10 +1043,10 @@ namespace OnlineStore.DeviceLibrary
public string ToStr() public string ToStr()
{ {
return "[分盘料=" + cutTask + "][紧急料=" + urgentTask+"]"; return "[分盘料=" + cutTask + "][紧急料=" + urgentTask + "]";
} }
} }
} }
source/DeviceLibrary/assemblymanager/TrayDisableManager.cs
...@@ -35,10 +35,83 @@ namespace OnlineStore.DeviceLibrary ...@@ -35,10 +35,83 @@ namespace OnlineStore.DeviceLibrary
List<TrayDisableInfo> dislist = new List<TrayDisableInfo>(TrayDisableMap.Values); List<TrayDisableInfo> dislist = new List<TrayDisableInfo>(TrayDisableMap.Values);
return dislist; return dislist;
} }
public static bool UseNewLogic = true;
public static void AddDisable(int trayNum, string deviceName, string describle) /// <summary>
/// 添加屏蔽库位
/// </summary>
/// <param name="trayNum"></param>
/// <param name="deviceName"></param>
/// <param name="describle"></param>
/// <param name="type">0，无；1：硬件未检测到；2：硬件检测到</param>
public static void AddDisable(int trayNum, string deviceName, string describle,int type)
{ {
TrayDisableInfo t = new TrayDisableInfo(trayNum, deviceName, describle); TrayDisableInfo t = new TrayDisableInfo(trayNum, deviceName, describle);
if(UseNewLogic)
{
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
if(tray.InoutPar.Corrected)
{
LogUtil.info($"{deviceName} 托盘新判断逻辑，料盘已纠正，无需处理：【{tray.ToStr()}】【{describle}】");
return;
}
if (tray.IsFull && type.Equals(1))//有料，但传感器未检测到
{
LogUtil.info($"{deviceName} 托盘新判断逻辑：【{tray.ToStr()}】【{describle}】。需要二次判断");
tray.InoutPar.ManualJudgeNG = true;
TrayManager.UpdateTrayInfo(trayNum,tray.IsFull,tray.InOrOutStore,tray.InoutPar);
}
else if (!tray.IsFull && type.Equals(2) && !tray.InoutPar.InStoreNg)//无料，但传感器感应到
{
tray.InoutPar.ManualJudgeNG = true;
LogUtil.info($"{deviceName} 托盘新判断逻辑：【{tray.ToStr()}】【{describle}】。认为NG");
TrayManager.UpdateTrayInfo(trayNum, tray.IsFull, tray.InOrOutStore, tray.InoutPar);
}
else
{
tray.InoutPar.ManualJudgeNG = true;
TrayManager.UpdateTrayInfo(trayNum, tray.IsFull, tray.InOrOutStore, tray.InoutPar);
LogUtil.info($"{deviceName} 托盘新判断逻辑：【{tray.ToStr()}】【{describle}】。其他处理，需要二次判断");
}
//if (tray.InOrOutStore.Equals(1))//入库料
//{
// if (tray.IsFull && type.Equals(1))//认为无料
// {
// TrayManager.UpdateTrayInfo(trayNum) ;
// LogUtil.info($"{deviceName} 托盘新判断逻辑：【{tray.ToStr()}】【{describle}】。认为无料");
// }
// else if(!tray.IsFull && type.Equals(2) && !tray.InoutPar.InStoreNg)
// {
// tray.InoutPar.InStoreNg = true;
// TrayManager.UpdateTrayInfo(trayNum,true,tray.InOrOutStore,tray.InoutPar);
// LogUtil.info($"{deviceName} 托盘新判断逻辑：【{tray.ToStr()}】【{describle}】。认为NG");
// }
//}
//else if(tray.InOrOutStore.Equals(2))
//{
// if (tray.IsFull && type.Equals(1))//认为无料
// {
// TrayManager.UpdateTrayInfo(trayNum);
// LogUtil.info($"{deviceName} 托盘新判断逻辑：【{tray.ToStr()}】【{describle}】。认为无料");
// }
// else if (!tray.IsFull && type.Equals(2) && !tray.InoutPar.InStoreNg)
// {
// tray.InoutPar.InStoreNg = true;
// TrayManager.UpdateTrayInfo(trayNum, true, tray.InOrOutStore, tray.InoutPar);
// LogUtil.info($"{deviceName} 托盘新判断逻辑：【{tray.ToStr()}】【{describle}】。认为NG");
// }
//}
}
else
{
AddDisableTray(t);
}
}
public static void AddDisableTray(int trayNum)
{
TrayDisableInfo t = new TrayDisableInfo();
t.TrayCode = trayNum;
if (TrayDisableMap.ContainsKey(trayNum)) if (TrayDisableMap.ContainsKey(trayNum))
{ {
TrayDisableMap[trayNum] = t; TrayDisableMap[trayNum] = t;
...@@ -56,7 +129,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -56,7 +129,25 @@ namespace OnlineStore.DeviceLibrary
} }
LogUtil.info("增加托盘禁用：" + t.ToStr() + ""); LogUtil.info("增加托盘禁用：" + t.ToStr() + "");
} }
public static void AddDisableTray(TrayDisableInfo t)
{
if (TrayDisableMap.ContainsKey(t.TrayCode))
{
TrayDisableMap[t.TrayCode] = t;
}
else
{
TrayDisableMap.TryAdd(t.TrayCode, t);
}
//如果托盘上物料是入库的，直接清理入库 任务
TrayInfo tray = TrayManager.GetTrayInfo(t.TrayCode);
if (tray.IsFull && tray.InOrOutStore.Equals(1))
{
TrayManager.ClearInstore(tray, "禁用托盘[" + t.TrayCode + "]");
}
LogUtil.info("增加托盘禁用：" + t.ToStr() + "");
}
public static void RemoveDisable(int trayNum) public static void RemoveDisable(int trayNum)
{ {
TrayManager.UpdateTrayInfo(trayNum); TrayManager.UpdateTrayInfo(trayNum);
......
source/DeviceLibrary/assemblymanager/TrayManager.cs
...@@ -105,14 +105,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -105,14 +105,18 @@ namespace OnlineStore.DeviceLibrary
{ {
param = new InOutParam(); param = new InOutParam();
} }
param.Corrected = false;
TrayInfoMap[trayNum].InoutPar = param; TrayInfoMap[trayNum].InoutPar = param;
TrayInfoMap[trayNum].ShowMsg = ngMsg; TrayInfoMap[trayNum].ShowMsg = ngMsg;
} }
else else
{ {
TrayInfo fixture = new TrayInfo(trayNum, isFull, inOrOut, param,ngMsg); TrayInfo fixture = new TrayInfo(trayNum, isFull, inOrOut, param,ngMsg);
fixture.InoutPar.Corrected = false;
TrayInfoMap.TryAdd(trayNum, fixture); TrayInfoMap.TryAdd(trayNum, fixture);
// TrayInfoMap.TryAdd(trayNum, fixture);
} }
SaveMapToFile(); SaveMapToFile();
} }
......
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
...@@ -258,6 +258,169 @@ namespace OnlineStore.DeviceLibrary ...@@ -258,6 +258,169 @@ namespace OnlineStore.DeviceLibrary
return codeList; return codeList;
} }
[HandleProcessCorruptedStateExceptions]
public static (bool,string) ReelCheckCameraScan(List<string> cameraList, string deviceName)
{
bool isPreScan = deviceName.EndsWith("预扫码");
List<string> codeList = new List<string>();
bool findCode = true;
if (cameraList == null || cameraList.Count <= 0)
{
return (findCode, ProcessCode(codeList));
}
try
{
foreach (string cameraName in cameraList)
{
if (cameraName.Trim().Equals(""))
{
continue;
}
ScanCount++;
DateTime startTime = DateTime.Now;
if (deviceName != "")
{
LogUtil.info(deviceName + " 【" + cameraName + "】开始取图片");
}
Bitmap bmp = null;
HalconDotNet.HObject ho_Image = null;
try
{
ho_Image = Camera._cam.CaptureOnImage(cameraName, out bmp);
if (ho_Image == null)
{
LogUtil.error(deviceName + " 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
CloseCamera(cameraName);
continue;
}
LogUtil.debug(deviceName + " 【" + cameraName + "】取图片完成，开始扫码");
string r = "";
// bool eyemNoCode = false;
Task eyemtask = Task.Factory.StartNew(delegate {
List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp);
foreach (CodeInfo co in tlci)
{
LogUtil.info(deviceName + " 【" + cameraName + "】[eyemDecode]" + co.CodeType + "(X: " + co.X + "，Y: " + co.Y + ") " + co.CodeStr);
string str = CodeManager.ReplaceCode(co.CodeStr);
if (!codeList.Contains(str))
{
codeList.Add(str);
r = r + "##eyem|" + co.CodeType + "|" + str;
//if (!findCode)
//{
// findCode = HasRightCode(str);
//}
}
}
});
//最多等待60秒
bool taskResult = eyemtask.Wait(60000);
if (!taskResult)
{
LogUtil.error(deviceName + " 【" + cameraName + "】eyem扫码超时");
//eyemNoCode = true;
}
//if (!isPreScan)
//{
// if (!findCode)
// {
// try
// {
// List<CodeInfo> cc = new List<CodeInfo>();
// eyemNoCode = true;
// RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
// {
// codeTypeList = allCodeTypeList.ToArray(),
// codeCount = 3,
// timeout = 3000
// };
// cc = RemoteDecodeHelper.DecodeRequest(ho_Image, remoteDecodeParam);
// if (cc != null && cc.Count > 0) findCode = true;
// //if (cc != null)
// //{
// // foreach (CodeInfo c in cc)
// // {
// // string str = CodeManager.ReplaceCode(c.CodeStr);
// // if (!codeList.Contains(str))
// // {
// // codeList.Add(str);
// // r = r + "##halcon|" + c.CodeType + "|" + str;
// // if (!findCode)
// // {
// // findCode = HasRightCode(str);
// // }
// // }
// // }
// //}
// }
// catch (Exception ex)
// {
// LogUtil.error(deviceName + " RemoteDecodeHelper扫码出错：" + ex.ToString());
// }
// }
// //if (!findRightCode && SaveErrorImageToFile.Equals(1))
// if (SaveImage || (((!findCode) || eyemNoCode) && (!isPreScan)))
// {
// //如果halcon没扫出的，
// string nameStr = "";
// if (findCode && eyemNoCode)
// {
// nameStr = "eyem";
// }
// SaveImageToFile(deviceName, cameraName + nameStr, bmp);
// }
//}
if (deviceName != "" || r != "")
{
LogUtil.info(deviceName + " 【" + cameraName + "】扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】[" + findCode + "]" + ScanCount + " ：" + r);
}
}
catch (AccessViolationException e)
{
LogUtil.error(deviceName + " 扫码出现AccessViolationException异常，关闭相机【" + cameraName + "】：" + e.ToString());
Camera._cam.Close(cameraName);
// GC.Collect();
}
catch (Exception ex)
{
LogUtil.error(deviceName + " 扫码出错：" + ex.ToString());
}
finally
{
if (ho_Image != null)
{
ho_Image.Dispose();
ho_Image = null;
}
// GC.Collect();
Task.Delay(10);
}
}
}
catch (AccessViolationException e)
{
LogUtil.error(deviceName + " 扫码出现AccessViolationException异常，关闭所有相机：" + e.ToString());
Camera._cam.CloseAll();
//GC.Collect();
}
catch (Exception ex)
{
LogUtil.error(deviceName + " 扫码出错：" + ex.ToString());
}
string code = ProcessCode(codeList);
findCode = string.IsNullOrEmpty(code) ? false : true;
return (findCode,code);
}
private static int SaveErrorImageToFile = ConfigAppSettings.GetIntValue(Setting_Init.SaveErrorImageToFile); private static int SaveErrorImageToFile = ConfigAppSettings.GetIntValue(Setting_Init.SaveErrorImageToFile);
private static void SaveImageToFile(string deviceName, string cameraName, HalconDotNet.HObject bitmap) private static void SaveImageToFile(string deviceName, string cameraName, HalconDotNet.HObject bitmap)
...@@ -282,6 +445,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -282,6 +445,7 @@ namespace OnlineStore.DeviceLibrary
} }
private static void SaveImageToFile(string deviceName, string cameraName, Bitmap bitmap) private static void SaveImageToFile(string deviceName, string cameraName, Bitmap bitmap)
{ {
if (!SaveImage) return;
string date = deviceName.Trim().Replace('_', '-') +"-"+ DateTime.Now.ToString("yyyyMMdd-HHmmss") + DateTime.Now.Millisecond; string date = deviceName.Trim().Replace('_', '-') +"-"+ DateTime.Now.ToString("yyyyMMdd-HHmmss") + DateTime.Now.Millisecond;
string dire = @"D:\image\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\"; string dire = @"D:\image\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\";
string iamgeName = date + ".bmp"; string iamgeName = date + ".bmp";
...@@ -309,7 +473,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -309,7 +473,7 @@ namespace OnlineStore.DeviceLibrary
foreach (string code in codes) foreach (string code in codes)
{ {
string[] strarray = code.Split(';'); string[] strarray = code.Split(';');
if (strarray.Length == 4) if (strarray.Length >= 4)
{ {
if ( if (
//strarray[0].StartsWith("L") && //strarray[0].StartsWith("L") &&
......
source/DeviceLibrary/model/InOutParam.cs
...@@ -60,6 +60,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -60,6 +60,15 @@ namespace OnlineStore.DeviceLibrary
/// 是否是入库NG的料盘 /// 是否是入库NG的料盘
/// </summary> /// </summary>
public bool InStoreNg = false; public bool InStoreNg = false;
/// <summary>
/// 手动判断NG
/// </summary>
public bool ManualJudgeNG = false;
/// <summary>
/// 相机已纠正
/// </summary>
public bool Corrected = false;
public string NgMsg = ""; public string NgMsg = "";
public string ToStr() public string ToStr()
{ {
......
source/DeviceLibrary/model/KTK_Store.cs
...@@ -593,22 +593,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -593,22 +593,22 @@ namespace OnlineStore.DeviceLibrary
{ {
if (msg.StartsWith(Name)) if (msg.StartsWith(Name))
{ {
LogUtil.error(msg, logtype, logseconds); //LogUtil.error(msg, logtype, logseconds);
} }
else else
{ {
LogUtil.error(Name + msg, logtype, logseconds); //LogUtil.error(Name + msg, logtype, logseconds);
} }
} }
else else
{ {
if (msg.StartsWith(Name)) if (msg.StartsWith(Name))
{ {
LogUtil.error(msg); //LogUtil.error(msg);
} }
else else
{ {
LogUtil.error(Name + msg); // LogUtil.error(Name + msg);
} }
} }
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -257,6 +257,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -257,6 +257,7 @@ namespace OnlineStore.DeviceLibrary
MI_18_UpdownUp, MI_18_UpdownUp,
#endregion #endregion
#region 移栽装置出入库共同模块 1180-1100 #region 移栽装置出入库共同模块 1180-1100
/// <summary> /// <summary>
///移载（流水线）装置出入库处理，阻挡气缸1-1下降 ///移载（流水线）装置出入库处理，阻挡气缸1-1下降
......
source/DeviceLibrary/model/TrayInfo.cs
...@@ -48,7 +48,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -48,7 +48,7 @@ namespace OnlineStore.DeviceLibrary
//return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type + //return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type +
// "]二维码[" + WareCode + "]库位号[" + PosId + "] [" + PlateW + "X" + PlateH+ "] " + err + " "+ jinji + "" ; // "]二维码[" + WareCode + "]库位号[" + PosId + "] [" + PlateW + "X" + PlateH+ "] " + err + " "+ jinji + "" ;
return "托盘 [" + TrayCode + "] [" + LastUpdateTime.ToLongTimeString() + "] [" + (IsFull ? "有料" : "空") + "] [" + type + "]"; return "托盘 [" + TrayCode + "] [" + LastUpdateTime.ToLongTimeString() + "] [" + (IsFull ? "有料" : "空") + "] [" + type + "]"+"["+ ((inoutPar?.ManualJudgeNG ?? false) ? "判定NG" : "判定OK") + "]["+((inoutPar?.Corrected??false)?"纠正OK":"未纠正")+"]";
} }
/// <summary> /// <summary>
/// 夹具编码值（1-32?） /// 夹具编码值（1-32?）
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace> <RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName> <AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
source/LoadCVSLibrary/storeConfig/config/ProvidingEquip_Config.cs
...@@ -119,8 +119,16 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -119,8 +119,16 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("UpdownAxis_P3Speed", false)] [ConfigProAttribute("UpdownAxis_P3Speed", false)]
public int UpdownAxis_P3Speed { get; set; } public int UpdownAxis_P3Speed { get; set; }
/// <summary>
/// PRO 0 出料口监控相机 CameraName_1
/// </summary>
[ConfigProAttribute("CameraName_1", false)]
public string CameraName_1 { get; set; }
/// <summary>
/// PRO,0,出料口前阻挡RFID,CameraName_1_RFID,192.168.103.21,,,,,
/// </summary>
[ConfigProAttribute("CameraName_1_RFID", false)]
public string CameraName_1_RFID { get; set; }
/// <summary> /// <summary>
/// PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7*16=80000;,,,,, /// PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7*16=80000;,,,,,
......
source/UserFromControl/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace UserFromControl.Properties { ...@@ -19,7 +19,7 @@ namespace UserFromControl.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -47,8 +47,8 @@ namespace UserFromControl.Properties { ...@@ -47,8 +47,8 @@ namespace UserFromControl.Properties {
} }
/// <summary> /// <summary>
/// 重写当前线程的 CurrentUICulture 属性 /// 重写当前线程的 CurrentUICulture 属性，对
/// 重写当前线程的 CurrentUICulture 属性。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
......
source/UserFromControl/UserFromControl.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UserFromControl</RootNamespace> <RootNamespace>UserFromControl</RootNamespace>
<AssemblyName>UserFromControl</AssemblyName> <AssemblyName>UserFromControl</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!