1

source/Common/bean/Bean.cs

@@ -249,5 +249,7 @@ namespace OnlineStore.Common
         /// 批量上下料轴
         /// </summary>
         public static string batchAxis = "device_batchAxis";
+
+        public static string posName = "posName";
     }
 }

source/DeviceLibrary/DeviceLibrary/PanasonicServo/BatchAxisController.cs

@@ -50,12 +50,8 @@ namespace OnlineStore.DeviceLibrary
             {
                 LogUtil.info("批量上料轴，检测到【" + TargetIoType + "】信号，可以停止运动");
                 result = true;
-            }
-            //TimeSpan span = DateTime.Now - preTime;
-            //if (span.TotalMilliseconds > 100)
-            //{
-            else if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH))
-            //if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(1))
+            } 
+            else if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH)) 
             {
                 LogUtil.info("批量上料轴，检测到正极限信号，可以停止运动");
                 result = true; 

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1209,7 +1209,7 @@ namespace OnlineStore.DeviceLibrary
                                 if (rId.Length > 7)
                                 {
                                     readId = rId.Substring(6, rId.Length - 7);
-                                    LogUtil.info("自动出入库：查找到：RI: " + readId  );
+                                    LogUtil.debug("自动出入库：查找到：RI: " + readId  );
                                     break;
                                 }
                             }
@@ -1654,6 +1654,10 @@ namespace OnlineStore.DeviceLibrary
                 lineOperation.alarmList.Add(alarmInfo);
             }
             lineOperation.data = AutomaticBaiting.GetBtnStatus();
+            if (lineOperation.data == null)
+            {
+                lineOperation.data = new Dictionary<string, string>();
+            }
             return lineOperation;
         }
 

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -229,15 +229,15 @@ namespace OnlineStore.DeviceLibrary
             bool result = false;
             if (IOManager.IOValue(wait.IoType).Equals(IO_VALUE.HIGH))
             { 
-                LogUtil.info(wait.ToStr() + "  检测到【" + wait.IoType + "】信号，可以停止运动"); 
+                LogUtil.debug(wait.ToStr() + "  检测到【" + wait.IoType + "】信号，可以停止运动"); 
                 result = true;
             }
             else if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH))
             //else if (ACServerManager.GetLimitPositiveSingle(wait.AxisInfo).Equals(1))
             {
-                LogUtil.info(wait.ToStr() + "  检测到正极限信号，可以停止运动");
-                ACServerManager.SuddenStop(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue());
-                Thread.Sleep(50);
+                LogUtil.debug(wait.ToStr() + "  检测到正极限信号，可以停止运动");
+                //ACServerManager.SuddenStop(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue());
+                //Thread.Sleep(50);
                 result = true;
             }
             if (result)
@@ -381,33 +381,27 @@ namespace OnlineStore.DeviceLibrary
                     //HttpHelper.isLog = 1; 
                     LogUtil.info(Name + "收到二维码【 " + message + "】，发送给服务器获取入库PosID");
                     //发送扫码内容到服务器进行入库操作
-                    Operation operation = StoreManager.Store.getLineBoxStatus();
-                   
+                    Operation operation = StoreManager.Store.getLineBoxStatus(); 
                     operation.op = 1;
-                    if (operation.data == null)
-                    {
-                        operation.data = new Dictionary<string, string>();
-                    }
+                 
                     operation.data.Add("code", message);
                     operation.data.Add("boxId", StoreManager.Store.StoreID.ToString());
                     string autoposId = StoreManager.Store.GetAutoPosid(true);
                     if (StoreManager.Store.autoNext && (!String.IsNullOrEmpty(autoposId)))
                     {
-                        operation.data.Add(ParamDefine.posId, autoposId);
+                        operation.data.Add(ParamDefine.posName, autoposId);
                         LogUtil.info("添加自动入库库位号："+autoposId);
                     }
                     string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
                     Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
                       
                     if (resultOperation == null)
-                    {
-                        // CodeMsg = "二维码【" + message + "】没有收到服务器反馈";
+                    { 
                         LogUtil.info(Name + "二维码【" + message + "】没有收到服务器反馈！");
                         return;
                     }
                     else if (!string.IsNullOrEmpty(resultOperation.msg))
-                    {
-                        //如果有提示消息，直接显示提示
+                    { 
                         LogUtil.info(Name + "服务器反馈   二维码【" + message + "】【"+ autoposId + "】  ：" + resultOperation.msg);
                         return;
                     }