1

source/ACSingleStore/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SO951-HC-ACSingleStore 351f8cbf8c7888864dfefdd40ed3c316e14ecb98")]
+[assembly: AssemblyProduct("SO951-HC-ACSingleStore 20634728ddb0fddadec7768fc343bd50fb8385d8")]
 [assembly: AssemblyCopyright("Copyright ?  2017")]
 [assembly: AssemblyCopyright("Copyright ?  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyCulture("")]

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1530,10 +1530,11 @@ namespace OnlineStore.DeviceLibrary
                     IsScanCode = false;
                     IsScanCode = false;
                     return;
                     return;
                 }
                 }
-                else if (!string.IsNullOrEmpty(resultOperation.msg))
+                else if (!string.IsNullOrEmpty(resultOperation.msg) && string.IsNullOrEmpty(resultOperation.data[ParamDefine.posId]))
                 {
                 {
                     InStoreFail = true; 
                     InStoreFail = true; 
                     LogUtil.info(LOGGER, StoreName + "  二维码【" + message + "】 服务器反馈 ：" + resultOperation.msg);
                     LogUtil.info(LOGGER, StoreName + "  二维码【" + message + "】 服务器反馈 ：" + resultOperation.msg);
+                    CodeMsg = resultOperation.msg;
                     IsScanCode = false;
                     IsScanCode = false;
                     return;
                     return;
                 }
                 }
@@ -2096,16 +2097,15 @@ namespace OnlineStore.DeviceLibrary
             lineOperation.msgEn = WarnObj.WarnMsgEn;
             lineOperation.msgEn = WarnObj.WarnMsgEn;
             lineOperation.msgJp = WarnObj.WarnMsgJp;
             lineOperation.msgJp = WarnObj.WarnMsgJp;
 
 
-            //if (WarnObj.WarnMsg.Equals(""))
-            //{
-            //    boxStatus.msg = CodeMsg;
-            //    boxStatus.msgEn = CodeMsgEn;
-            // //   lineOperation.msg = CodeMsg;
-            //    lineOperation.msg = CodeMsg;
-            //    lineOperation.msgEn = CodeMsgEn;
-            //}
+            if (WarnObj.WarnMsg.Equals(""))
+            {
+                boxStatus.msg = CodeMsg;
+                boxStatus.msgEn = CodeMsgEn;
+                lineOperation.msg = CodeMsg;
+                lineOperation.msgEn = CodeMsgEn;
+            }
             //if (CodeMsg.Equals(""))
             //if (CodeMsg.Equals(""))
-            if(WarnObj.WarnMsg.Equals(""))
+            if (WarnObj.WarnMsg.Equals(""))
             {
             {
                 if (storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 if (storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 {
                 {
@@ -2122,7 +2122,7 @@ namespace OnlineStore.DeviceLibrary
             //    //如果是扫码入库失败，也发4
             //    //如果是扫码入库失败，也发4
             //    lineOperation.status = (int)StoreStatus.Warning;
             //    lineOperation.status = (int)StoreStatus.Warning;
             //}
             //}
-            CodeMsg = "";
+            //CodeMsg = "";
             //SetWarnMsg(); 
             //SetWarnMsg(); 
             //状态
             //状态
             boxStatus.status = (int)storeStatus;
             boxStatus.status = (int)storeStatus;