净化日志

刘韬
Commit b35ac40c 由刘韬编写于 2020-12-31 17:07:07 +0800
source/ACSingleStore/App.config
source/ACSingleStore/AutoInOutStore.csproj
source/ACSingleStore/FrmStoreBox.Designer.cs
source/ACSingleStore/FrmStoreBox.cs
source/ACSingleStore/Properties/Resource.zh-CN.resx
source/ACSingleStore/ResourceCulture.cs
source/ACSingleStore/positionTool/FrmPositionTool.cs
source/ACSingleStore/userControl/AxisMoveControl.Designer.cs
source/ACSingleStore/userControl/AxisMoveControl.cs
source/ACSingleStore/userControl/AxisMoveControl.resx
source/Common/util/HumitureController.cs
source/DeviceLibrary/DeviceLibrary/HC/HCAxisManager.cs
source/DeviceLibrary/DeviceLibrary/IO/HCIOManager.cs
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
source/DeviceLibrary/acSingleStore/StoreManager.cs
source/DeviceLibrary/store/AC_Store.cs
--- a/source/ACSingleStore/App.config
查看文件 @b35ac40
+++ b/source/ACSingleStore/App.config
查看文件 @b35ac40
@@ -27,8 +27,7 @@
    <!--摄像机名称列表配置，用#分割-->
    <add key="CameraName" value="GigE:acA3800-10gc (23124327)#GigE:acA3800-10gc (23172285)" />
    <!--二维码类型列表配置，用#分割-->
-    <add key="CodeType" value="QR Code" />
+    <add key="CodeType" value="Data Matrix ECC 200#QR Code" />
-    <add key="CodeType" value="Data Matrix ECC 200#QR Code#PDF417" />
    <!--二维码参数文件所在路径，文件名与二维码类型名一样-->
    <add key="CodeParamPath" value="\CodeParam\" />
    <add key="InOutDefaultPosition" value="50000000" />
@@ -73,10 +72,10 @@
      <layout type="log4net.Layout.PatternLayout">
        <conversionPattern value="[%date][%t]%-5p %m%n" />
      </layout>
-      <filter type="log4net.Filter.LevelRangeFilter">
+		<!--filter type="log4net.Filter.LevelRangeFilter">
        <levelMin value="INFO" />
        <levelMax value="ERROR" />
-      </filter>
+      </filter-->
    </appender>
    <appender name="AIOBOX" type="log4net.Appender.RollingFileAppender">
      <file value="logs/aio/AIOBOX.log" />
@@ -99,11 +98,11 @@
 		 </layout>
 	 </appender>
    <logger name="RollingLogFileAppender">
-      <level value="Info" />
+      <level value="ALL" />
      <appender-ref ref="RollingLogFileAppender" />
    </logger>
    <logger name="AIOBOX">
-      <level value="Info" />
+      <level value="ALL" />
      <appender-ref ref="AIOBOX" />
    </logger>
 	 <logger name="HCBOARD">
@@ -111,7 +110,7 @@
 		 <appender-ref ref="HCBOARD" />
 	 </logger>
 	 <root>
-      <level value="INFO" />
+      <level value="ALL" />
      <appender-ref ref="RollingLogFileAppender" />
    </root>
  </log4net>

--- a/source/ACSingleStore/AutoInOutStore.csproj
查看文件 @b35ac40
+++ b/source/ACSingleStore/AutoInOutStore.csproj
查看文件 @b35ac40
@@ -44,6 +44,10 @@
    <Reference Include="halcondotnet">
      <HintPath>..\..\dll\halcondotnet.dll</HintPath>
    </Reference>
+    <Reference Include="HuichuanLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
+    </Reference>
    <Reference Include="log4net">
      <HintPath>..\..\dll\log4net.dll</HintPath>
    </Reference>
@@ -101,6 +105,12 @@
    <Compile Include="Program.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="ResourceCulture.cs" />
+    <Compile Include="userControl\AxisMoveControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="userControl\AxisMoveControl.Designer.cs">
+      <DependentUpon>AxisMoveControl.cs</DependentUpon>
+    </Compile>
    <EmbeddedResource Include="FrmAxisDebug.resx">
      <DependentUpon>FrmAxisDebug.cs</DependentUpon>
    </EmbeddedResource>
@@ -140,6 +150,9 @@
      <DependentUpon>Resources.resx</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
+    <EmbeddedResource Include="userControl\AxisMoveControl.resx">
+      <DependentUpon>AxisMoveControl.cs</DependentUpon>
+    </EmbeddedResource>
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>

--- a/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @b35ac40
+++ b/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @b35ac40
@@ -212,6 +212,7 @@
            this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
            this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
+            this.axisMoveControl1 = new OnlineStore.AutoCountClient.AxisMoveControl();
            this.contextMenuStrip1.SuspendLayout();
            this.groupAuto.SuspendLayout();
            this.groupBox6.SuspendLayout();
@@ -606,7 +607,7 @@
            this.tabControl1.Location = new System.Drawing.Point(4, 33);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1257, 693);
+            this.tabControl1.Size = new System.Drawing.Size(1328, 693);
            this.tabControl1.TabIndex = 301;
            // 
            // tabPage4
@@ -714,6 +715,7 @@
            // 
            // tabPage2
            // 
+            this.tabPage2.Controls.Add(this.axisMoveControl1);
            this.tabPage2.Controls.Add(this.picAxis4);
            this.tabPage2.Controls.Add(this.lblTemp);
            this.tabPage2.Controls.Add(this.picPPoint);
@@ -724,7 +726,7 @@
            this.tabPage2.Location = new System.Drawing.Point(4, 30);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(1249, 659);
+            this.tabPage2.Size = new System.Drawing.Size(1320, 659);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "伺服调试";
            this.tabPage2.UseVisualStyleBackColor = true;
@@ -741,7 +743,7 @@
            // 
            // picPPoint
            // 
-            this.picPPoint.Location = new System.Drawing.Point(587, 496);
+            this.picPPoint.Location = new System.Drawing.Point(585, 525);
            this.picPPoint.Name = "picPPoint";
            this.picPPoint.Size = new System.Drawing.Size(656, 66);
            this.picPPoint.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -761,16 +763,16 @@
            this.groupBox7.Controls.Add(this.btnTempClose);
            this.groupBox7.Controls.Add(this.btnTempInit);
            this.groupBox7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox7.Location = new System.Drawing.Point(587, 331);
+            this.groupBox7.Location = new System.Drawing.Point(588, 424);
            this.groupBox7.Name = "groupBox7";
-            this.groupBox7.Size = new System.Drawing.Size(653, 137);
+            this.groupBox7.Size = new System.Drawing.Size(653, 95);
            this.groupBox7.TabIndex = 90;
            this.groupBox7.TabStop = false;
            this.groupBox7.Text = "温湿度控制器调试";
            // 
            // btnSelTemp
            // 
-            this.btnSelTemp.Location = new System.Drawing.Point(261, 76);
+            this.btnSelTemp.Location = new System.Drawing.Point(419, 16);
            this.btnSelTemp.Name = "btnSelTemp";
            this.btnSelTemp.Size = new System.Drawing.Size(100, 33);
            this.btnSelTemp.TabIndex = 248;
@@ -781,7 +783,7 @@
            // txtHum
            // 
            this.txtHum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtHum.Location = new System.Drawing.Point(102, 92);
+            this.txtHum.Location = new System.Drawing.Point(293, 59);
            this.txtHum.MaxLength = 10;
            this.txtHum.Name = "txtHum";
            this.txtHum.Size = new System.Drawing.Size(87, 23);
@@ -792,9 +794,9 @@
            // 
            this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label29.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label29.Location = new System.Drawing.Point(17, 95);
+            this.label29.Location = new System.Drawing.Point(206, 63);
            this.label29.Name = "label29";
-            this.label29.Size = new System.Drawing.Size(85, 17);
+            this.label29.Size = new System.Drawing.Size(81, 15);
            this.label29.TabIndex = 246;
            this.label29.Text = "湿度:";
            this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -908,12 +910,13 @@
            this.groupAxis.Controls.Add(this.label49);
            this.groupAxis.Enabled = false;
            this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupAxis.Location = new System.Drawing.Point(587, 6);
+            this.groupAxis.Location = new System.Drawing.Point(788, 83);
            this.groupAxis.Name = "groupAxis";
            this.groupAxis.Size = new System.Drawing.Size(653, 320);
            this.groupAxis.TabIndex = 216;
            this.groupAxis.TabStop = false;
            this.groupAxis.Text = "伺服调试";
+            this.groupAxis.Visible = false;
            // 
            // label24
            // 
@@ -1980,7 +1983,7 @@
            this.语言});
            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(1264, 29);
+            this.menuStrip1.Size = new System.Drawing.Size(1335, 29);
            this.menuStrip1.TabIndex = 257;
            this.menuStrip1.Text = "menuStrip1";
            // 
@@ -2352,11 +2355,18 @@
            this.toolStripMenuItem6.Text = "日语";
            this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
            // 
+            // axisMoveControl1
+            // 
+            this.axisMoveControl1.Location = new System.Drawing.Point(588, 1);
+            this.axisMoveControl1.Name = "axisMoveControl1";
+            this.axisMoveControl1.Size = new System.Drawing.Size(699, 402);
+            this.axisMoveControl1.TabIndex = 306;
+            // 
            // FrmStoreBox
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1264, 729);
+            this.ClientSize = new System.Drawing.Size(1335, 729);
            this.Controls.Add(this.tabControl1);
            this.Controls.Add(this.menuStrip1);
            this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -2590,6 +2600,7 @@
        private System.Windows.Forms.PictureBox picPPoint;
        private System.Windows.Forms.PictureBox picAxis4;
        private System.Windows.Forms.CheckBox chbDebug;
+        private AutoCountClient.AxisMoveControl axisMoveControl1;
    }
 }
--- a/source/ACSingleStore/FrmStoreBox.cs
查看文件 @b35ac40
+++ b/source/ACSingleStore/FrmStoreBox.cs
查看文件 @b35ac40
@@ -230,7 +230,7 @@ namespace OnlineStore.AutoInOutStore
            this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
            HideForm();
            initValue();
+            axisMoveControl1.LoadData(store);
            this.toolStripMenuItem4.Visible = StoreManager.HasDisableDoorControl;
            this.toolStripMenuItem5.Visible = StoreManager.HasDisableDoorControl;
            this.toolStripSeparator16.Visible = StoreManager.HasDisableDoorControl;
@@ -592,6 +592,9 @@ namespace OnlineStore.AutoInOutStore
        }
        int addSpeed = 0;
        int delSpeed = 0;
+        int HomeHighSpeed = 0;
+        int HomeLowSpeed = 0;
+        int HomeAddSpeed = 0;
        private void cmbAxisList_SelectedIndexChanged(object sender, EventArgs e)
        {
            if (this.cmbAxisList.SelectedIndex >= 0)
@@ -602,6 +605,9 @@ namespace OnlineStore.AutoInOutStore
                txtASpeed.Text = SlvAddr.TargetSpeed.ToString();
                addSpeed = SlvAddr.AddSpeed;
                delSpeed = SlvAddr.DelSpeed;
+                HomeHighSpeed = SlvAddr.HomeHighSpeed;
+                HomeLowSpeed = SlvAddr.HomeLowSpeed;
+                HomeAddSpeed = SlvAddr.HomeAddSpeed;
            }
        }
@@ -1157,7 +1163,7 @@ namespace OnlineStore.AutoInOutStore
            int speed = FormUtil.GetIntValue(txtASpeed);
            LogUtil.info("点击【原点返回】，端口号【" + portName + "】地址【" + SlvAddr + "】 速度【" + speed + "】");
-            ACServerManager.HomeMove(portName, SlvAddr, speed, addSpeed, delSpeed);
+            ACServerManager.HomeMove(portName, SlvAddr, HomeHighSpeed, HomeLowSpeed, HomeAddSpeed);
        }
        private void btnGetAlarm_Click(object sender, EventArgs e)
@@ -1171,6 +1177,8 @@ namespace OnlineStore.AutoInOutStore
            btnReadHomeSingle_Click(null, null);
            btnReadLimit1_Click(null, null);
            btnReadLimit2_Click(null, null);
+            //ACServerManager.GetAxisSts(slvAddr)
+            //LogUtil.info()
        }
@@ -1601,10 +1609,10 @@ namespace OnlineStore.AutoInOutStore
            string ioIP = "192.168.200.13";
            int ioIndex = 0;
            //  if (store.Config.StoreDIList.ContainsKey(IO_Type.UpdownPositionSingal))
-            if (store.Config.DILIst.ContainsKey(IO_Type.TrayCheck_Fixture))
+            if (store.Config.DILIst.ContainsKey(IO_Type.Laser_Fixture))
            {
-                ioIP = store.Config.DILIst[IO_Type.TrayCheck_Fixture].DeviceName;
+                ioIP = store.Config.DILIst[IO_Type.Laser_Fixture].DeviceName;
-                ioIndex = store.Config.DILIst[IO_Type.TrayCheck_Fixture].GetIOAddr();
+                ioIndex = store.Config.DILIst[IO_Type.Laser_Fixture].GetIOAddr();
            }
            FrmPositionTool frm = new FrmPositionTool(store.Config.UpDown_Axis, ioIP, ioIndex, PortName);
            frm.ShowDialog();

--- a/source/ACSingleStore/Properties/Resource.zh-CN.resx
查看文件 @b35ac40
+++ b/source/ACSingleStore/Properties/Resource.zh-CN.resx
查看文件 @b35ac40
--- a/source/ACSingleStore/ResourceCulture.cs
查看文件 @b35ac40
+++ b/source/ACSingleStore/ResourceCulture.cs
查看文件 @b35ac40
@@ -249,7 +249,7 @@ namespace OnlineStore.AutoInOutStore
                }
                else
                {
-                    strCurLanguage = "No id:[" + id + "], please add.";
+                    strCurLanguage = "No id:[" + id + "], please add."+ ex.ToString();
                    strCurLanguage = defaultStr;
                    NoIdLog(id, defaultStr);
                }

--- a/source/ACSingleStore/positionTool/FrmPositionTool.cs
查看文件 @b35ac40
+++ b/source/ACSingleStore/positionTool/FrmPositionTool.cs
查看文件 @b35ac40
@@ -222,6 +222,7 @@ namespace OnlineStore.AutoInOutStore
        {
            StopTimer();
            AxisManager.instance.SuddenStop(PortName, SlvAddr);
+            //formMoveStatus(false);
        }
        private IO_VALUE GetSingleValue()

--- a/source/ACSingleStore/userControl/AxisMoveControl.Designer.cs 0 → 100644
查看文件 @b35ac40
+++ b/source/ACSingleStore/userControl/AxisMoveControl.Designer.cs 0 → 100644
查看文件 @b35ac40
--- a/source/ACSingleStore/userControl/AxisMoveControl.cs 0 → 100644
查看文件 @b35ac40
+++ b/source/ACSingleStore/userControl/AxisMoveControl.cs 0 → 100644
查看文件 @b35ac40
--- a/source/ACSingleStore/userControl/AxisMoveControl.resx 0 → 100644
查看文件 @b35ac40
+++ b/source/ACSingleStore/userControl/AxisMoveControl.resx 0 → 100644
查看文件 @b35ac40
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    Version 2.0
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    Example:
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
--- a/source/Common/util/HumitureController.cs
查看文件 @b35ac40
+++ b/source/Common/util/HumitureController.cs
查看文件 @b35ac40
@@ -108,7 +108,7 @@ namespace OnlineStore.Common
            sendData[7] = 0x00;
            sendData = buildCheckData(sendData, sendData.Length-2);
            string str = AcSerialBean.byteToHexStr(sendData);
-            LogUtil.debug("温湿度控制器发送数据：" + str);
+            //LogUtil.debug("温湿度控制器发送数据：" + str);
            byte[] reviceData = new byte[9];
            bool isOk = false;
            sb.SendCommand(sendData, ref reviceData, 100, out isOk);

--- a/source/DeviceLibrary/DeviceLibrary/HC/HCAxisManager.cs
查看文件 @b35ac40
+++ b/source/DeviceLibrary/DeviceLibrary/HC/HCAxisManager.cs
查看文件 @b35ac40
@@ -64,6 +64,7 @@ namespace OnlineStore.DeviceLibrary
        public override int GetBusyStatus(string portName, short slvAddr)
        {
            AxisSts axisS = HCBoardManager.GetAxisSts(slvAddr);
+            //HCLogUtil.info(axisS.ToStr());
            return axisS.BUSY;
        }

--- a/source/DeviceLibrary/DeviceLibrary/IO/HCIOManager.cs
查看文件 @b35ac40
+++ b/source/DeviceLibrary/DeviceLibrary/IO/HCIOManager.cs
查看文件 @b35ac40
@@ -13,7 +13,8 @@ namespace OnlineStore.DeviceLibrary.IO
    {
        public override void CloseAllConnection()
-        { 
+        {
+            HCBoardManager.CloseCard();
        }
        public override void CloseAllDO()
@@ -50,7 +51,11 @@ namespace OnlineStore.DeviceLibrary.IO
        public override IO_VALUE GetIOValue(ConfigIO configIO)
        {
            short index =(short) configIO.GetIOAddr();
-            short v = HCBoardManager.GetBitDO(index);
+            short v;
+            if (configIO.ProType=="DO")
+                v= HCBoardManager.GetBitDO(index);
+            else
+                v = HCBoardManager.GetBitDI(index);
            return (IO_VALUE)v;
        }

--- a/source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @b35ac40
+++ b/source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @b35ac40
@@ -4,49 +4,50 @@ DI,复位,Reset_BTN,1,HC,0,复位,X01,DI-01,0,
 DI,自动启动,AutoRun_Single,2,HC,0,自动启动,X02,DI-02,0,
 DI,气压检测,Airpressure_Check,3,HC,0,气压检测,X03,DI-03,0,
 DI,安全光栅,SafetyLightCurtains,4,HC,0,安全光栅,X04,DI-04,0,
-DI,左侧电器维护门关闭,LeftDoorColse_Single,5,HC,0,左侧防护门关闭,X05,DI-05,0,
+DI,左侧防护门关闭,LeftDoorColse_Single,5,HC,0,左侧防护门关闭,X05,DI-05,0,
-DI,右侧电器维护门关闭,RightDoorColse_Single,6,HC,0,右侧防护门关闭,X06,DI-06,0,
+DI,右侧防护门关闭,RightDoorColse_Single,6,HC,0,右侧防护门关闭,X06,DI-06,0,
-DI,批量门关闭,DoorClose_LoadMaterial,7,HC,0,上料机构门关闭,X07,DI-07,0,
+DI,上料机构门关闭,DoorClose_LoadMaterial,7,HC,0,上料机构门关闭,X07,DI-07,0,
-DI,单料门上升端,Door_Up,8,HC,0,进料口门上升端,X08,DI-08,0,
+DI,进料口门上升端,Door_Up,8,HC,0,进料口门上升端,X08,DI-08,0,
-DI,单料门下降端,Door_Down,9,HC,0,进料口门下降端,X09,DI-09,0,
+DI,进料口门下降端,Door_Down,9,HC,0,进料口门下降端,X09,DI-09,0,
-DI,批量门锁气缸打开端,BatchDoor_Open,10,HC,0,上料机构左门锁打开端,X10,DI-10,0,
+DI,上料机构左门锁打开端,BatchDoor_Open,10,HC,0,上料机构左门锁打开端,X10,DI-10,0,
-DI,批量门锁气缸关闭端,BatchDoor_Close,11,HC,0,上料机构左门锁关闭端,X11,DI-11,0,
+DI,上料机构左门锁关闭端,BatchDoor_Close,11,HC,0,上料机构左门锁关闭端,X11,DI-11,0,
-DI,批量门锁气缸打开端2,BatchDoor_Open2,12,HC,0,上料机构右门锁打开端,X12,DI-12,0,
+DI,上料机构右门锁打开端,BatchDoor_Open2,12,HC,0,上料机构右门锁打开端,X12,DI-12,0,
-DI,批量门锁气缸关闭端2,BatchDoor_Close2,13,HC,0,上料机构右门锁关闭端,X13,DI-13,0,
+DI,上料机构右门锁关闭端,BatchDoor_Close2,13,HC,0,上料机构右门锁关闭端,X13,DI-13,0,
-DI,分料机构气缸上升端,ClampingDisc_Up,14,HC,0,抓取气缸上升端,X14,DI-14,0,
+DI,抓取气缸上升端,ClampingDisc_Up,14,HC,0,抓取气缸上升端,X14,DI-14,0,
-DI,分料机构气缸下降端,ClampingDisc_Down,15,HC,0,抓取气缸下降端,X15,DI-15,0,
+DI,抓取气缸下降端,ClampingDisc_Down,15,HC,0,抓取气缸下降端,X15,DI-15,0,
-DI,抓取机构气缸夹紧端,Clamping_Work,16,HC,0,夹爪气缸夹紧端,X16,DI-16,0,
+DI,夹爪气缸夹紧端,Clamping_Work,16,HC,0,夹爪气缸夹紧端,X16,DI-16,0,
-DI,抓取机构气缸放松端,Clamping_Relax,17,HC,0,夹爪气缸放松端,X17,DI-17,0,
+DI,夹爪气缸放松端,Clamping_Relax,17,HC,0,夹爪气缸放松端,X17,DI-17,0,
-DI,料盘宽度检测1,WidthCheck1,18,HC,0,7寸料盘检测,X18,DI-18,0,
+DI,7寸料盘检测,WidthCheck1,18,HC,0,7寸料盘检测,X18,DI-18,0,
-DI,料盘宽度检测2,WidthCheck2,19,HC,0,13寸料盘检测,X19,DI-19,0,
+DI,13寸料盘检测,WidthCheck2,19,HC,0,13寸料盘检测,X19,DI-19,0,
-DI,单料门料盘检测,TrayCheck_Door,20,HC,0,进出料口料盘检测,X20,DI-20,0,
+DI,进出料口料盘检测,TrayCheck_Door,20,HC,0,进出料口料盘检测,X20,DI-20,0,
-DI,料盘检测1（上料机构）,TrayCheck_LoadMaterial,21,HC,0,上料定位料盘检测,X21,DI-21,0,
+DI,上料定位料盘检测,TrayCheck_LoadMaterial,21,HC,0,上料定位料盘检测,X21,DI-21,0,
 DI,上料机构出料检测,OutCheck,22,HC,0,上料机构出料检测,X22,DI-22,0,
-DI,料盘检测2（夹取机构）,TrayCheck_Fixture,23,HC,0,料叉机构料盘检测,X23,DI-23,0,
+DI,料叉机构料盘检测,TrayCheck_Fixture,23,HC,0,料叉机构料盘检测,X23,DI-23,0,
+DI,激光对位检测,Laser_Fixture,24,HC,0,料叉机构料盘检测,X24,DI-24,0,
 ,,,,,,,,,,
 DO,自动指示灯,AutoRun_HddLed,0,HC,0,自动指示灯,Y00,DO-00,0,
 DO,故障指示灯,Alarm_HddLed,1,HC,0,故障指示灯,Y01,DO-01,0,
 DO,待机指示灯,RunSign_HddLed,2,HC,0,待机指示灯,Y02,DO-02,0,
 DO,报警蜂鸣器,Buzzer_Sign,3,HC,0,报警蜂鸣器,Y03,DO-03,0,
-DO,相机辅助光源打开,CameraLight_Power,4,HC,0,相机光源开启,Y04,DO-04,0,
+DO,相机光源开启,CameraLight_Power,4,HC,0,相机光源开启,Y04,DO-04,0,
-DO,设备照明打开,Device_Led,5,HC,0,设备照明开启,Y05,DO-05,0,
+DO,设备照明开启,Device_Led,5,HC,0,设备照明开启,Y05,DO-05,0,
-DO,进气口打开,StartOrStopBlow,6,HC,0,氮气阀门开启,Y06,DO-06,0,
+DO,氮气阀门开启,StartOrStopBlow,6,HC,0,氮气阀门开启,Y06,DO-06,0,
-DO,批量门锁气缸打开,BatchDoor_Open,7,HC,0,上料机构门锁打开,Y07,DO-07,0,
+DO,上料机构门锁打开,BatchDoor_Open,7,HC,0,上料机构门锁打开,Y07,DO-07,0,
-DO,批量门锁气缸关闭,BatchDoor_Close,8,HC,0,上料机构门锁关闭,Y08,DO-08,0,
+DO,上料机构门锁关闭,BatchDoor_Close,8,HC,0,上料机构门锁关闭,Y08,DO-08,0,
-DO,单料门上升,Door_Up,9,HC,0,进料口门上升,Y09,DO-09,0,
+DO,进料口门上升,Door_Up,9,HC,0,进料口门上升,Y09,DO-09,0,
-DO,单料门下降,Door_Down,10,HC,0,进料口门下降,Y10,DO-10,0,
+DO,进料口门下降,Door_Down,10,HC,0,进料口门下降,Y10,DO-10,0,
-DO,分料机构气缸上升,ClampingDisc_Up,11,HC,0,抓取气缸上升,Y11,DO-11,0,
+DO,抓取气缸上升,ClampingDisc_Up,11,HC,0,抓取气缸上升,Y11,DO-11,0,
-DO,分料机构气缸下降,ClampingDisc_Down,12,HC,0,抓取气缸下降,Y12,DO-12,0,
+DO,抓取气缸下降,ClampingDisc_Down,12,HC,0,抓取气缸下降,Y12,DO-12,0,
-DO,分料机构气缸夹紧,Clamping_Work,13,HC,0,夹爪气缸夹紧,Y13,DO-13,0,
+DO,夹爪气缸夹紧,Clamping_Work,13,HC,0,夹爪气缸夹紧,Y13,DO-13,0,
-DO,分料机构气缸放松,Clamping_Relax,14,HC,0,夹爪气缸放松,Y14,DO-14,0,
+DO,夹爪气缸放松,Clamping_Relax,14,HC,0,夹爪气缸放松,Y14,DO-14,0,
-DO,电气维护门警报关闭,DisableDoorControl,15,HC,0,门禁功能屏蔽,Y15,DO-15,0,
+DO,门禁功能屏蔽,DisableDoorControl,15,HC,0,门禁功能屏蔽,Y15,DO-15,0,
 ,,,,,,,,,,
 ,,,,,,,,,,
-AXIS,(轴一)旋转轴,Middle_Axis,1,HC,0,,,,,
+AXIS,(轴一)旋转轴,Middle_Axis,0,HC,0,,,,,
-AXIS,(轴二)升降轴轴,UpDown_Axis,2,HC,0,,,,,
+AXIS,(轴二)升降轴轴,UpDown_Axis,1,HC,0,,,,,
-AXIS,(轴三)进出轴,InOut_Axis,3,HC,0,,,,,
+AXIS,(轴三)进出轴,InOut_Axis,2,HC,0,,,,,
-AXIS,(轴四)压紧轴,Comp_Axis,4,HC,0,,,,,
+AXIS,(轴四)压紧轴,Comp_Axis,3,HC,0,,,,,
-AXIS,(轴五)批量上下料轴,Batch_Axis,5,HC,0,,,,,
+AXIS,(轴五)批量上下料轴,Batch_Axis,4,HC,0,,,,,
 ,,,,,,,,,,
 ,,,,,,,,,,
 PRO,升降轴  仓门位置P7(人工拿走盘的位置),UpDownAxis_Door_P7,343100,,,,,,,
@@ -119,7 +120,7 @@ PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,,
 PRO,需要吹气的湿度(湿度标准),Max_Humidity,5,,,,,,,
 PRO,每次吹气的时间（分钟）,BlowAir_Time,1,,,,,,,
 PRO,两次吹气间隔（分钟）,BlowAir_Interval,1,,,,,,,
-PRO,温湿度端口号,Humiture_Port,COM2,,,,,,,
+PRO,温湿度端口号,Humiture_Port,COM5,,,,,,,
 ,,,,,,,,,,
 ,,,,,,,,,,
 ,,,,,,,,,,

--- a/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @b35ac40
+++ b/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @b35ac40
@@ -21,6 +21,7 @@ namespace OnlineStore.DeviceLibrary
        private bool IsIntSlvBlock = false;
        //public bool UseBatchInout = true;
        public string CID = "";
+        public string Name = "MIMO";
        public AUTO_SA_Config Config;
        /// <summary>
        /// 记录最后一次 出库的posID,出库完成发送给服务器之后清除
@@ -725,7 +726,7 @@ namespace OnlineStore.DeviceLibrary
                if (!IsIntSlvBlock)
                {
                    ACServerManager.InitSlvAddr(portName, slvAddr, moveAxis.TargetSpeed, moveAxis.AddSpeed, moveAxis.DelSpeed);
-                    Thread.Sleep(100);
+                    //Thread.Sleep(100);
                }
                ACServerManager.AlarmClear(portName, slvAddr);
                Thread.Sleep(100);
@@ -911,7 +912,7 @@ namespace OnlineStore.DeviceLibrary
                storeStatus = StoreStatus.SuddenStop;
            } else if (alarmType.Equals(StoreAlarmType.BatchAxisAlarm))
            {
-                LogUtil.error("批量上下料轴报警，批量上料模块停止运动");
+                LogUtil.error("批量上下料 轴报警，批量上料模块停止运动");
                ACServerManager.SuddenStop(Config.Batch_Axis.DeviceName, Config.Batch_Axis.GetAxisValue());
                AutomaticBaiting.StopMove();
            }

--- a/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
查看文件 @b35ac40
+++ b/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
查看文件 @b35ac40
@@ -253,9 +253,11 @@ namespace OnlineStore.DeviceLibrary
            }
            else if (span.TotalSeconds > StoreMove.TimeOutSeconds)
            {
-                string msg = ResourceControl.GetString(ResourceControl.MoveTimeOut, "[" + StoreMove.MoveStep + "]" +
+                //string msg = string.Format(ResourceControl.GetString(ResourceControl.MoveTimeOut), "[" + StoreMove.MoveStep + "]" ,
-                    ResourceControl.GetString(ResourceControl.TimeOut, "超时") + "[" + NotOkMsg + "][" + Math.Round(span.TotalSeconds, 1) + "]");
+                //     "[" + NotOkMsg + "]","[" + Math.Round(span.TotalSeconds, 1) + "]");
-                string newType = ResourceControl.MoveTimeOut + "_" + waitType.ToString().PadLeft(2, '0');
+                string msg = ResourceControl.MoveTimeOut+ "[" + StoreMove.MoveStep + "]"+ $"[{((Wait_Type)waitType).ToString()}]"+
+                     "[" + NotOkMsg + "]"+ "[" + Math.Round(span.TotalSeconds, 1) + "]";
+                string newType = ResourceControl.MoveTimeOut;
                SetWaitWarnMsg(msg, newType, StoreMove.MoveStep + "", Math.Round(span.TotalSeconds, 1) + "");
                LogUtil.error(WarnObj.WarnMsg, 15);
                Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnObj.WarnMsg, StoreMove.MoveType);
@@ -328,7 +330,7 @@ namespace OnlineStore.DeviceLibrary
        }
        private void SI_03_AxisToP1(LineMoveP moveP)
        {
-            InStoreLog("入库：SI_03    所有轴回待机点，轴2、轴1 到P1, 轴4到P3，吸盘在上升端");
+            InStoreLog($"入库：SI_03    所有轴回待机点，轴2({moveP.UpDown_P1})、轴1({moveP.Middle_P1}) 到P1, 轴4({moveP.ComPress_P3})到P3，吸盘在上升端");
            StoreMove.NextMoveStep(StoreMoveStep.SI_03_ReturnHome);
            bool needMove = false;
            if (!ACServerManager.isInPosition(Config.Comp_Axis, moveP.ComPress_P3))
@@ -356,7 +358,7 @@ namespace OnlineStore.DeviceLibrary
        }
        private void SI_02_Move(LineMoveP moveP)
        {
-            InStoreLog("入库：SI_02_  进出轴至P1");
+            InStoreLog($"入库：SI_02_  进出轴至P1({moveP.InOut_P1})");
            StoreMove.NextMoveStep(StoreMoveStep.SI_02_InOutAxisHome);
            bool result = InOutBackToP1(moveP.InOut_P1);
            if (!result && StoreMove.IsBatchInOutStore.Equals(true))
@@ -366,7 +368,7 @@ namespace OnlineStore.DeviceLibrary
        }
        private void SI_04_DeviceToDoor()
        {
-            InStoreLog("入库：SI_04  叉子进入入料口，进出轴至P2 ");
+            InStoreLog($"入库：SI_04  叉子进入入料口，进出轴至P2({StoreMove.MoveParam.MoveP.InOut_P2}) ");
            StoreMove.NextMoveStep(StoreMoveStep.SI_04_DeviceToDoor);
            ACAxisMove(Config.InOut_Axis, StoreMove.MoveParam.MoveP.InOut_P2, Config.InOutAxis_P2_Speed);
        }
@@ -410,7 +412,8 @@ namespace OnlineStore.DeviceLibrary
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_04_DeviceToDoor)
            {
-                InStoreLog("入库：SI_05  等待吸盘放下物品");
+                InStoreLog($"入库：SI_05  等待吸盘放下物品");
+                InStoreLog(StoreManager.GetAllAxisPos());
                StoreMove.NextMoveStep(StoreMoveStep.SI_05_DoorWarToDevice);
                //  IOManager.IOMove(IO_Type.SuckingDisc_Work, IO_VALUE.LOW);
                //  StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));

--- a/source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
查看文件 @b35ac40
+++ b/source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
查看文件 @b35ac40
@@ -919,12 +919,12 @@ namespace OnlineStore.DeviceLibrary
        private static void InStoreLog(string msg)
        {
-            LogUtil.info(Name + " " + StoreMove.MoveStep + "" + "入料：" + msg);
+            LogUtil.info(Name + " " + StoreMove.MoveStep + " " + "入料：" + msg);
        }
        private static void OutStoreLog(string msg)
        {
-            LogUtil.info(Name + " " + StoreMove.MoveStep + "" + "出料：" + msg);
+            LogUtil.info(Name + " " + StoreMove.MoveStep + " " + "出料：" + msg);
        }
    }

--- a/source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
查看文件 @b35ac40
+++ b/source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
查看文件 @b35ac40
@@ -37,7 +37,7 @@ namespace OnlineStore.DeviceLibrary
        {
            moveAxis.TargetPosition = 0;
            LogUtil.debug(Name + moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回");
-            ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.AddSpeed, moveAxis.DelSpeed);
+            ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed);
            StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
        }
        private static bool ACHomeMoveIsEnd(ConfigMoveAxis moveAxis, out string msg)
@@ -54,7 +54,7 @@ namespace OnlineStore.DeviceLibrary
                    if (StoreMove.CanWhileCount > 0)
                    {
                        LogUtil.error(Name + moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + StoreMove.CanWhileCount + "]次");
-                        ACServerManager.HomeMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.AddSpeed, moveAxis.DelSpeed);
+                        ACServerManager.HomeMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed);
                        StoreMove.CanWhileCount--;
                    }
                    else

--- a/source/DeviceLibrary/acSingleStore/StoreManager.cs
查看文件 @b35ac40
+++ b/source/DeviceLibrary/acSingleStore/StoreManager.cs
查看文件 @b35ac40
@@ -152,7 +152,14 @@ namespace OnlineStore.DeviceLibrary
            }
            return host;
        }
+        public static string GetAllAxisPos() {
+            int UpDown_AxisP = AxisManager.instance.GetActualtPosition(Config.UpDown_Axis);
+            int Batch_AxisP = AxisManager.instance.GetActualtPosition(Config.Batch_Axis);
+            int Comp_AxisP = AxisManager.instance.GetActualtPosition(Config.Comp_Axis);
+            int InOut_AxisP = AxisManager.instance.GetActualtPosition(Config.InOut_Axis);
+            int Middle_AxisP = AxisManager.instance.GetActualtPosition(Config.Middle_Axis);
+            return ($"当前伺服点位：升降轴({UpDown_AxisP}),旋转轴({Middle_AxisP}),进出轴({InOut_AxisP}),压紧轴({Comp_AxisP}),批量轴({Batch_AxisP})");
+        }
    }
    public class APIInfo

--- a/source/DeviceLibrary/store/AC_Store.cs
查看文件 @b35ac40
+++ b/source/DeviceLibrary/store/AC_Store.cs
查看文件 @b35ac40
@@ -372,7 +372,7 @@ namespace OnlineStore.DeviceLibrary
            moveAxis.TargetPosition = 0;
            LogUtil.debug(LOGGER, moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回");
            StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
-            ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.AddSpeed, moveAxis.DelSpeed);
+            ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed);
        }
        /// <summary>
@@ -451,7 +451,7 @@ namespace OnlineStore.DeviceLibrary
                if (StoreMove.CanWhileCount > 0)
                {
                    LogUtil.error(LOGGER, moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + StoreMove.CanWhileCount + "]次");
-                    ACServerManager.HomeMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.AddSpeed, moveAxis.DelSpeed);
+                    ACServerManager.HomeMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed);
                    StoreMove.CanWhileCount--;
                }
                else

--- a/source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
查看文件 @b35ac40
+++ b/source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
查看文件 @b35ac40
@@ -169,7 +169,10 @@ namespace OnlineStore.LoadCSVLibrary
        /// 23料叉机构料盘检测X23DI-23
        /// </summary>
        public static string TrayCheck_Fixture = "TrayCheck_Fixture";
+        /// <summary>
+        /// 24激光对位检测X24DI-24
+        /// </summary>
+        public static string Laser_Fixture = "Laser_Fixture";
        /*