1

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1403,6 +1403,32 @@ namespace OnlineStore.DeviceLibrary
                     return;
                     return;
                 }
                 }
                 IsScanCode = false; 
                 IsScanCode = false; 
+               
+                if (resultOperation.op.Equals(1))
+                {
+                    ReviceInStoreProcess(message, resultOperation);
+                }
+                else if (resultOperation.op.Equals(2))
+                {
+                    ReviceOutStoreProcess(resultOperation);
+                }
+                else if (resultOperation.op.Equals(5))
+                {
+                    ProcessHumidityCMD(resultOperation);
+                }
+                else
+                {
+                    LogUtil.error("收到服务器命令：op=" + resultOperation.op + "，未找到对应处理");
+                }
+            }
+            catch (Exception ex)
+            {
+                IsScanCode = false;
+                LOGGER.Error(StoreName + ex.StackTrace);
+            }
+        }
+        private void ReviceInStoreProcess(string message, Operation resultOperation)
+        {
             Dictionary<string, string> data = resultOperation.data;
             Dictionary<string, string> data = resultOperation.data;
             if (data != null && data.ContainsKey(ParamDefine.posId) && data.ContainsKey(ParamDefine.plateH) && data.ContainsKey(ParamDefine.plateW))
             if (data != null && data.ContainsKey(ParamDefine.posId) && data.ContainsKey(ParamDefine.plateH) && data.ContainsKey(ParamDefine.plateW))
             {
             {
@@ -1446,12 +1472,7 @@ namespace OnlineStore.DeviceLibrary
                     IsScanCode = false;
                     IsScanCode = false;
                 }
                 }
             }
             }
-            }
-            catch (Exception ex)
-            {
-                IsScanCode = false;
-                LOGGER.Error(StoreName + ex.StackTrace);
-            }
+
         }
         }
 
 
         #endregion
         #endregion
@@ -1932,7 +1953,11 @@ namespace OnlineStore.DeviceLibrary
                 //判断服务端是否返回出库操作
                 //判断服务端是否返回出库操作
                 return;
                 return;
             }
             }
-            if (resultOperation.op.Equals(2))
+            if (resultOperation.op.Equals(1))
+            {
+                ReviceInStoreProcess("", resultOperation);
+            }
+            else if (resultOperation.op.Equals(2))
             {
             {
                 ReviceOutStoreProcess(resultOperation);
                 ReviceOutStoreProcess(resultOperation);
             }
             }
@@ -1971,6 +1996,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
             }
             }
         }
         }
+
         private void ReviceOutStoreProcess(Operation resultOperation) {
         private void ReviceOutStoreProcess(Operation resultOperation) {
             DateTime time = DateTime.Now;
             DateTime time = DateTime.Now;
             Dictionary<string, string> data = resultOperation.data;
             Dictionary<string, string> data = resultOperation.data;