代码合并

source/HCSingleStore/App.config

@@ -19,9 +19,9 @@
     <add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
     <add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
     <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_1" value="line-ac-01" />
-    <add key="Store_CID_2" value="line-ac-02" /> 
+    <add key="Store_CID" value="D8" />
+    <add key="Store_CID_1" value="line-ac-16" />
+    <add key="Store_CID_2" value="line-ac-15" /> 
     <!--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/FrmInOutStore.Designer.cs

@@ -130,7 +130,7 @@
             // comboBoxSize
             // comboBoxSize
             // 
             // 
             this.comboBoxSize.FormattingEnabled = true;
             this.comboBoxSize.FormattingEnabled = true;
-            this.comboBoxSize.Location = new System.Drawing.Point(15, 112);
+            this.comboBoxSize.Location = new System.Drawing.Point(15, 121);
             this.comboBoxSize.Name = "comboBoxSize";
             this.comboBoxSize.Name = "comboBoxSize";
             this.comboBoxSize.Size = new System.Drawing.Size(150, 25);
             this.comboBoxSize.Size = new System.Drawing.Size(150, 25);
             this.comboBoxSize.TabIndex = 5;
             this.comboBoxSize.TabIndex = 5;
@@ -206,6 +206,7 @@
             this.cmbPosition.Name = "cmbPosition";
             this.cmbPosition.Name = "cmbPosition";
             this.cmbPosition.Size = new System.Drawing.Size(150, 25);
             this.cmbPosition.Size = new System.Drawing.Size(150, 25);
             this.cmbPosition.TabIndex = 2;
             this.cmbPosition.TabIndex = 2;
+            this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
             // 
             // 
             // btnStartAuto
             // btnStartAuto
             // 
             // 

source/HCSingleStore/FrmInOutStore.cs

@@ -142,10 +142,6 @@ namespace OnlineStore.ACSingleStore
                 comboBoxSize.SelectedIndex = 0;
                 comboBoxSize.SelectedIndex = 0;
             }
             }
 
 
-            cmbPosition.DataSource = PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
-            PositionNumList = PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
-            cmbPosition.SelectedIndex = 0;
-
         }
         }
 
 
         /// <summary>
         /// <summary>
@@ -161,7 +157,7 @@ namespace OnlineStore.ACSingleStore
                 store.StartRun();
                 store.StartRun();
                 if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
                 if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
                 {
                 {
-                    StoreOpenStatus(true);
+                    //StoreOpenStatus(true);
                 }
                 }
             }
             }
             else
             else
@@ -179,7 +175,8 @@ namespace OnlineStore.ACSingleStore
                 return;
                 return;
             }
             }
             preOpen = isOpen;
             preOpen = isOpen;
-
+            cmbPosition.Enabled = !isOpen;
+            comboBoxSize.Enabled = !isOpen;
             btnOutStore.Enabled = !isOpen;
             btnOutStore.Enabled = !isOpen;
 
 
             btnStoreStart.Enabled = !isOpen;
             btnStoreStart.Enabled = !isOpen;
@@ -192,20 +189,6 @@ namespace OnlineStore.ACSingleStore
             {
             {
                 if (btnStartAuto.Text == StartAuto)
                 if (btnStartAuto.Text == StartAuto)
                 {
                 {
-                    if (needToInStoreNumList.Count > 0)
-                    {
-                        needToInStoreNumList.Clear();
-                    }
-                    if (PositionNumList.Count > 0)
-                    {
-                        PositionNumList.Clear();
-                    }
-                    for (int i = cmbPosition.SelectedIndex; i < store.PositionNumList.Count; i++)
-                    {
-                        needToInStoreNumList.Add(store.PositionNumList[i]);
-                        PositionNumList.Add(store.PositionNumList[i]);
-                    }
-
                     IsRun = true;
                     IsRun = true;
                     StoreOpenStatus(true);
                     StoreOpenStatus(true);
                     btnStartAuto.Text = StopAuto;
                     btnStartAuto.Text = StopAuto;
@@ -1207,9 +1190,26 @@ namespace OnlineStore.ACSingleStore
         private void comboBoxSize_SelectedIndexChanged(object sender, EventArgs e)
         private void comboBoxSize_SelectedIndexChanged(object sender, EventArgs e)
         {
         {
             cmbPosition.DataSource = PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
             cmbPosition.DataSource = PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
-            PositionNumList=PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
             cmbPosition.SelectedIndex = 0;
             cmbPosition.SelectedIndex = 0;
         }
         }
+
+        private void cmbPosition_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (needToInStoreNumList.Count > 0)
+            {
+                needToInStoreNumList.Clear();
+            }
+            if (PositionNumList.Count > 0)
+            {
+                PositionNumList.Clear();
+            }
+
+            for (int i = cmbPosition.SelectedIndex; i < cmbPosition.Items.Count; i++)
+            {
+                needToInStoreNumList.Add(cmbPosition.Items[i].ToString());
+                PositionNumList.Add(cmbPosition.Items[i].ToString());
+            }
+        }
     }
     }
 
 
     class PositionInfo
     class PositionInfo