错误修改

source/ACSingleStore/FrmStoreBox.cs

@@ -52,14 +52,7 @@ namespace OnlineStore.ACSingleStore
             HideForm();
             HideForm();
             this.Opacity = 1;
             this.Opacity = 1;
             txtTempPort.Text = store.Config.Humiture_Port;
             txtTempPort.Text = store.Config.Humiture_Port;
-            if (HumitureController.HumitureControllerType.Equals(1))
-            {
-                groupHistory.Visible = true;
-            }
-            else
-            {
-                groupHistory.Visible = false;
-            }
+           
             LoadOk = true;
             LoadOk = true;
         }
         }
         private void LoadStore()
         private void LoadStore()
@@ -191,6 +184,10 @@ namespace OnlineStore.ACSingleStore
             //ReadPosistion();
             //ReadPosistion();
             if (store.storeRunStatus > StoreRunStatus.Wait)
             if (store.storeRunStatus > StoreRunStatus.Wait)
             {
             {
+                if (store.OutCheckAlarm())
+                {
+                    btnCon.Visible = true ;
+                }
                 if (btnStoreStart.Enabled.Equals(true))
                 if (btnStoreStart.Enabled.Equals(true))
                 {
                 {
                     StoreOpenStatus(true);
                     StoreOpenStatus(true);
@@ -299,6 +296,7 @@ namespace OnlineStore.ACSingleStore
                 lblThisSta.Text = "等待启动";
                 lblThisSta.Text = "等待启动";
                 lblWarnMsg.Text = "";
                 lblWarnMsg.Text = "";
                 btnStartAuTo.Text = "开始自动出入库";
                 btnStartAuTo.Text = "开始自动出入库";
+                btnCon.Visible = false;
             } 
             } 
         }
         }
 
 
@@ -1284,23 +1282,7 @@ namespace OnlineStore.ACSingleStore
             }
             }
         }
         }
 
 
-        private void btnSelHistory_Click(object sender, EventArgs e)
-        {
-            int count = HumitureController.QueryHistoryCount();
-            txtHistoryCount.Text = count.ToString();
-
-            int cuCount = HumitureController.QueryCurrCount();
-            txtCurrCount.Text = cuCount.ToString();
-
-            List<object> data = HumitureController.QueryHistory();
-            if (data.Count >= 3)
-            {
-                txtHistoryTemp.Text = data[0].ToString();
-                txtHistoryHum.Text = data[1].ToString();
-                txtHistoryTime.Text = data[2].ToString();
-            }
-        }
-
+      
         private void btnCloseDoor_Click(object sender, EventArgs e)
         private void btnCloseDoor_Click(object sender, EventArgs e)
         {
         {
             //IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
             //IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
@@ -1481,5 +1463,10 @@ namespace OnlineStore.ACSingleStore
             }
             }
         }
         }
 
 
+        private void btnCon_Click(object sender, EventArgs e)
+        {
+            btnCon.Visible = false;
+            store.ContinueOut();
+        }
     }
     }
 }
 }

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Inventory.cs

@@ -69,7 +69,8 @@ namespace OnlineStore.DeviceLibrary
                 paramMap.Add("pos", StoreMove.MoveParam.PosInfo.PosId);   // 库位
                 paramMap.Add("pos", StoreMove.MoveParam.PosInfo.PosId);   // 库位
                 paramMap.Add("hasReel", reelIsExist.ToString());  // 是否有料
                 paramMap.Add("hasReel", reelIsExist.ToString());  // 是否有料
                 string server = StoreManager.GetAddr(StoreManager.Addr_posReelCheck, paramMap);
                 string server = StoreManager.GetAddr(StoreManager.Addr_posReelCheck, paramMap);
-                string resultStr = HttpHelper.Post(server, "");
+                bool timeOut = false;
+                string resultStr = HttpHelper.Post(server, "", Encoding.UTF8, out timeOut);
                 CheckPositionLog("盘点仓位: [CID=" + CID + "] [" + StoreMove.MoveParam.PosInfo.PosId + "] [IO_Type.reelIsExist=" + reelIsExist.ToString() + "] [resultStr=" + resultStr + "]");
                 CheckPositionLog("盘点仓位: [CID=" + CID + "] [" + StoreMove.MoveParam.PosInfo.PosId + "] [IO_Type.reelIsExist=" + reelIsExist.ToString() + "] [resultStr=" + resultStr + "]");
                 reelIsExist = false;
                 reelIsExist = false;
             }
             }