版本合并

source/ACSingleStore/ResourceCulture.cs

@@ -16,7 +16,7 @@ namespace OnlineStore.AutoInOutStore
 {
 {
     public class ResourceCulture
     public class ResourceCulture
     {
     {
-        public static bool ShowLog = true  ;
+        public static bool ShowLog = false   ;
         public static string China = "zh-CN";
         public static string China = "zh-CN";
         public static string English = "en-US";
         public static string English = "en-US";
         public static string German = "ge-DE";
         public static string German = "ge-DE";

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1787,6 +1787,10 @@ namespace OnlineStore.DeviceLibrary
             op.msgCode = type;
             op.msgCode = type;
             op.msgParam = param;
             op.msgParam = param;
             op.msgData = new Dictionary<string, string>();
             op.msgData = new Dictionary<string, string>();
+            if (param == null)
+            {
+                param = new string[] { };
+            }
             op.msgData.Add("zh", ResourceControl.GetStringByLan(ResourceControl.China, type, msg, param));
             op.msgData.Add("zh", ResourceControl.GetStringByLan(ResourceControl.China, type, msg, param));
             op.msgData.Add("en", ResourceControl.GetStringByLan(ResourceControl.English, type, msg, param));
             op.msgData.Add("en", ResourceControl.GetStringByLan(ResourceControl.English, type, msg, param));
             op.msgData.Add("jp", ResourceControl.GetStringByLan(ResourceControl.Japanese, type, msg, param));
             op.msgData.Add("jp", ResourceControl.GetStringByLan(ResourceControl.Japanese, type, msg, param));

source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs

@@ -454,10 +454,14 @@ namespace OnlineStore.DeviceLibrary
                             {
                             {
                                 LastWidth = 13;
                                 LastWidth = 13;
                             }
                             }
-                            else
+                            else if (IOManager.IOValue(IO_Type.WidthCheck1).Equals(IO_VALUE.HIGH))
                             {
                             {
                                 LastWidth = 7;
                                 LastWidth = 7;
                             }
                             }
+                            else
+                            {
+                                LastWidth = 13;
+                            }
                         }
                         }
                         LastHeight = GetHeight();
                         LastHeight = GetHeight();
                         BatchInStoreCount++;
                         BatchInStoreCount++;