存储机构-视觉对位

source/DeviceLibrary/manager/model/DeviceStep.cs

@@ -372,35 +372,43 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// 存储机构自动对位：开始对位
         /// </summary>
-        SA_Drawer_Start_Find_Pos = 401,
+        SA_01_Pos_Start_Find_Pos = 401,
         /// <summary>
         /// 存储机构自动对位：去抽屉起始点
         /// </summary>
-        SA_01_To_Drawer_StartPoint,
+        SA_02_Pos_To_Drawer_StartPoint,
         /// <summary>
         /// 存储机构自动对位:取图(正向)
         /// </summary>
-        SA_02_Pos_AcqImg,
+        SA_03_Pos_AcqImg,
         /// <summary>
         /// 存储机构自动对位:对位(正向)
         /// </summary>
-        SA_03_Pos_AdjPos,
+        SA_04_Pos_AdjPos,
         /// <summary>
         /// 存储机构自动对位:到下一个抽屉(正向)
         /// </summary>
-        SA_04_Pos_NextDrawer,
+        SA_05_Pos_NextDrawer,
+        /// <summary>
+        /// 存储机构自动对位：开始对位
+        /// </summary>
+        SA_06_Neg_Start_Find_Pos,
+        /// <summary>
+        /// 存储机构自动对位：去抽屉起始点
+        /// </summary>
+        SA_07_Neg_To_Drawer_StartPoint,
         /// <summary>
         /// 存储机构自动对位:取图(反向)
         /// </summary>
-        SA_05_Neg_AcqImg,
+        SA_08_Neg_AcqImg,
         /// <summary>
         /// 存储机构自动对位:对位(反向)
         /// </summary>
-        SA_06_Neg_AdjPos,
+        SA_09_Neg_AdjPos,
         /// <summary>
         /// 存储机构自动对位:到下一个抽屉(反向)
         /// </summary>
-        SA_07_Neg_NextDrawer,
+        SA_10_Neg_NextDrawer,
         #endregion
 
         #region 入料模块复位 1000 开始

source/DeviceLibrary/storeBean/boxBean/EyemLibDemo.cs

@@ -432,9 +432,9 @@ namespace eyemLib_Sharp
         [StructLayout(LayoutKind.Sequential)]
         public struct EyemOcsFXYR                   // 用于表示圆
         {
-            float fX;                               // Ｘ坐标
-            float fY;                               // Ｙ坐标
-            float fR;                               // 半径
+            public float fX;                               // Ｘ坐标
+            public float fY;                               // Ｙ坐标
+            public float fR;                               // 半径
         }
 
         [StructLayout(LayoutKind.Sequential)]

source/LoadCVSLibrary/storeConfig/config/BoxEquip_Config.cs

@@ -75,22 +75,22 @@ namespace OnlineStore.LoadCSVLibrary
         ///  抽屉Mark_X坐标
         /// </summary>
         [ConfigProAttribute("Drawer_X")]
-        public double Drawer_X { get; set; }
+        public float Drawer_X { get; set; }
         /// <summary>
         ///  抽屉Mark_Y坐标
         /// </summary>
         [ConfigProAttribute("Drawer_Y")]
-        public double Drawer_Y { get; set; }
+        public float Drawer_Y { get; set; }
         /// <summary>
         /// 抽屉Mark_X方向误差范围
         /// </summary>
         [ConfigProAttribute("Drawer_X_Error")]
-        public string Drawer_X_Error { get; set; }
+        public float Drawer_X_Error { get; set; }
         /// <summary>
         /// 抽屉Mark_Y方向误差范围
         /// </summary>
         [ConfigProAttribute("Drawer_Y_Error")]
-        public string Drawer_Y_Error { get; set; }
+        public float Drawer_Y_Error { get; set; }
         /// <summary>
         /// 抽屉行间距
         /// </summary>
@@ -111,7 +111,6 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         [ConfigProAttribute("Drawer_Columns")]
         public int Drawer_Columns { get; set; }
-
         /// <summary>
         ///  PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,,,,,
         /// </summary>

source/XLRStoreClient/App.config

@@ -22,7 +22,7 @@
     <add key="ConfigPath_BoxPosition" value="\Config\linePositions.csv" />
     <add key="ConfigPath_DrawerPosition" value="\Config\DrawerPosition.csv" />
     <add key="ConfigPath_TrayList" value="\LineConfig\TrayList.data"  />
-    <add key="Line_CID" value="so827" />
+    <add key="Line_CID" value="05" />
     <!--end one store config--> 
     <!--二维码类型列表配置，用#分割，一维码=Barcode  二维码： QR Code#Data Matrix ECC 200#Micro QR Code-->
     <add key="CodeType" value="Data Matrix ECC 200#QR Code" />

source/XLRStoreClient/boxForm/FrmAutoFindPos.resx

@@ -117,4 +117,7 @@
   <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

source/XLRStoreClient/boxForm/FrmAxisMove.Designer.cs

@@ -1613,7 +1613,7 @@
             this.groupBox23.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupBox23.Location = new System.Drawing.Point(0, 191);
             this.groupBox23.Name = "groupBox23";
-            this.groupBox23.Size = new System.Drawing.Size(492, 248);
+            this.groupBox23.Size = new System.Drawing.Size(492, 209);
             this.groupBox23.TabIndex = 12;
             this.groupBox23.TabStop = false;
             this.groupBox23.Text = "页面切换操作";

source/XLRStoreClient/boxForm/FrmBoxEquip.cs

@@ -22,8 +22,8 @@ namespace OnlineStore.XLRStore
 {
     internal partial class FrmBoxEquip : FrmBase
     {
+        FrmAxisMove frmAxisMove = null;
         private bool IsLoad = false;
-        FrmAxisMove frmAxisMove =null;
         private BoxEquip boxBean;
         internal FrmBoxEquip(BoxEquip moveEquip)
         { 
@@ -41,6 +41,8 @@ namespace OnlineStore.XLRStore
             lblName.Text = boxBean.Name;
             this.Text = boxBean.Name;
             chbDebug.Checked = boxBean.IsDebug;
+            FrmAutoFindPos frmAutoFindPos = new FrmAutoFindPos();
+            AddForm(tabControl1, " 视觉对位 ", frmAutoFindPos);
             IsLoad = true;
         }
         protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();