1

source/ACSingleStore/FrmStoreBox.cs

@@ -147,13 +147,23 @@ namespace OnlineStore.AutoInOutStore
         private bool LoadOk = false;
         private void FrmTest_Load(object sender, EventArgs e)
         {
-            int slvAddrStr = 1;
-        
+            
             LogUtil.logBox = this.richTextBox1;
             this.ShowInTaskbar = true;
             this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
             HideForm();
             initValue();
+
+
+            //string msg = "=1+0x0-7x8 =700020106;4500866784;20;1804162053;10000;XVB38DV4##";
+            //AutomaticBaiting.GetInStorePosId(msg);
+            //DateTime time = DateTime.Now;
+            ////构建发送给服务器的对象
+            //Operation lineOperation =store.getLineBoxStatus(); 
+            //string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
+            //Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), lineOperation, false);
+
+
             txtTempPort.Text = store.Config.Humiture_Port;
             LoadOk = true;
             cmbHomeType.SelectedIndex = 1;

source/Common/util/HttpHelper.cs

@@ -106,6 +106,7 @@ namespace OnlineStore.Common
                     wc.Headers.Add("Content-Type", "application/json;charset=UTF-8");
                 wc.Encoding = encoding;
 
+                //paramData = Uri.EscapeDataString(paramData);
                 result = wc.UploadString(url, "POST", paramData);
                 //LogUtil.info(result);
             }

source/DeviceLibrary/PanasonicServo/ACServerManager.cs

@@ -300,28 +300,32 @@ namespace OnlineStore.DeviceLibrary
                 int homeSingle = GetHomeSingle(portName, slvAddr);
                 if (homeSingle.Equals(1))
                 {
-                    int value = 2000;
-                    if (portName.Equals(StoreManager.Config.Batch_Axis.DeviceName))
+                    int isHomeEnd = GetHomeEndStatus(portName, slvAddr);
+                    if (isHomeEnd.Equals(1))
                     {
-                        value = 8000;
-                    }
-                    LogUtil.info("轴【" + portName + "】原点返回时发现原点已亮，需要先相对走" + value);
-                    RelMove(portName, slvAddr, value);
-                    bool isStop = false;
-                    for (int i = 0; i <= 10; i++)
-                    {
-                        Thread.Sleep(200);
-                        if (GetBusyStatus(portName, slvAddr).Equals(0))
+                        int value = 2000;
+                        if (portName.Equals(StoreManager.Config.Batch_Axis.DeviceName))
                         {
-                            isStop = true;
-                            LogUtil.info("轴【" + portName + "】 相对走" + value + "已结束");
-                            break;
+                            value = 8000;
+                        }
+                        LogUtil.info("轴【" + portName + "】原点返回时发现原点已亮且回过原点，需要先相对走" + value);
+                        RelMove(portName, slvAddr, value);
+                        bool isStop = false;
+                        for (int i = 0; i <= 10; i++)
+                        {
+                            Thread.Sleep(200);
+                            if (GetBusyStatus(portName, slvAddr).Equals(0))
+                            {
+                                isStop = true;
+                                LogUtil.info("轴【" + portName + "】 相对走" + value + "已结束");
+                                break;
+                            }
+                        }
+                        if (!isStop)
+                        {
+                            LogUtil.info("轴【" + portName + "】 相对走" + value + "已等待2分钟，直接停止");
+                            SuddenStop(portName, slvAddr);
                         }
-                    }
-                    if (!isStop)
-                    {
-                        LogUtil.info("轴【" + portName + "】 相对走" + value + "已等待2分钟，直接停止");
-                        SuddenStop(portName, slvAddr);
                     }
                 }
             }catch(Exception ex)

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -330,7 +330,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (!code.Equals(""))
                 {
-                    msg = msg + "=1+0x0-" + LastSize + "x" + LastHeight + " =" + code + spiltStr + spiltStr;
+                    msg = msg + "=1+0x0-" + LastSize + "x" + LastHeight + "=" + code + spiltStr + spiltStr;
                 }
             }
             return msg;