代码合并

source/HCSingleStore/App.config

@@ -20,8 +20,8 @@
     <add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
     <add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
     <add key="Store_Type" value="RC_AC_SA" />
     <add key="Store_Type" value="RC_AC_SA" />
     <add key="Store_CID" value="D1" />
     <add key="Store_CID" value="D1" />
-    <add key="Store_CID_1" value="line-ac-01" />
-    <add key="Store_CID_2" value="line-ac-02" /> 
+    <add key="Store_CID_1" value="line-ac-05" />
+    <add key="Store_CID_2" value="line-ac-06" /> 
     <!--end one store config-->
     <!--end one store config-->
     <add key="ACBaudRate" value="115200" />
     <add key="ACBaudRate" value="115200" />
     <add key="InOutDefaultPosition" value="5000" />
     <add key="InOutDefaultPosition" value="5000" />

source/HCSingleStore/FrmBox.cs

@@ -1103,7 +1103,7 @@ namespace OnlineStore.ACSingleStore
         private void btnInOutTest_Click(object sender, EventArgs e)
         private void btnInOutTest_Click(object sender, EventArgs e)
         {
         {
             FrmInOutStore frmInOutStore = new FrmInOutStore(boxBean);
             FrmInOutStore frmInOutStore = new FrmInOutStore(boxBean);
-            frmInOutStore.ShowDialog();
+            frmInOutStore.Show();
         }
         }
     }
     }
 }
 }

source/HCSingleStore/FrmInOutStore.cs

@@ -115,6 +115,7 @@ namespace OnlineStore.ACSingleStore
         {
         {
             InitializeComponent();
             InitializeComponent();
             this.store = store;
             this.store = store;
+            this.Text = "D"+store.Config.GetStoreId()+" 自动跑位";
             lastStageInOutStep = new LastStageInOutStep();
             lastStageInOutStep = new LastStageInOutStep();
             generalInOutStep = new GeneralInOutStep();
             generalInOutStep = new GeneralInOutStep();
             moveToStartPosStep = new MoveToStartPosStep();
             moveToStartPosStep = new MoveToStartPosStep();
@@ -180,7 +181,6 @@ namespace OnlineStore.ACSingleStore
             preOpen = isOpen;
             preOpen = isOpen;
 
 
             btnOutStore.Enabled = !isOpen;
             btnOutStore.Enabled = !isOpen;
-            cmbPosition.Enabled = !isOpen;
 
 
             btnStoreStart.Enabled = !isOpen;
             btnStoreStart.Enabled = !isOpen;
 
 
@@ -1232,7 +1232,7 @@ namespace OnlineStore.ACSingleStore
                 bool result = ACStorePosition.CheckPosition(position, boxBean.Config);
                 bool result = ACStorePosition.CheckPosition(position, boxBean.Config);
                 if (result && position.StoreId.Equals(boxBean.Config.GetStoreId()))
                 if (result && position.StoreId.Equals(boxBean.Config.GetStoreId()))
                 {
                 {
-                    size = position.BagHigh + "*" + position.BagWidth;
+                    size = position.BagWidth + "*" + position.BagHigh;
                     if (PositionDic.ContainsKey(size))
                     if (PositionDic.ContainsKey(size))
                     {
                     {
                         PositionDic[size].Add(position.PositionNum);
                         PositionDic[size].Add(position.PositionNum);