增加rfid参数

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1221,30 +1221,30 @@ namespace OnlineStore.DeviceLibrary
         }
         }
 
 
 
 
-        public bool ReviceLineCheckInStoreCMD(string posId, string plateH, string plateW, string message)
+        public bool ReviceLineCheckInStoreCMD(string posId, string plateH, string plateW, string message, string rfid)
         {
         {
             string logName = "入库库位验证【 " + message + "】【" + posId + "】：";
             string logName = "入库库位验证【 " + message + "】【" + posId + "】：";
             try
             try
             {
             {
-               
+
                 if (storeRunStatus.Equals(StoreRunStatus.Wait))
                 if (storeRunStatus.Equals(StoreRunStatus.Wait))
                 {
                 {
-                    LogUtil.info(LOGGER,  logName+ " 设备未启动，验证失败");
+                    LogUtil.info(LOGGER, logName + " 设备未启动，验证失败");
                     return false;
                     return false;
                 }
                 }
                 // CodeMsg = "收到二维码【 " + message + "】，发送给服务器获取入库PosID";
                 // CodeMsg = "收到二维码【 " + message + "】，发送给服务器获取入库PosID";
-                LogUtil.debug(LOGGER, logName+"发送给服务器验证入库PosID");
+                LogUtil.debug(LOGGER, logName + "发送给服务器验证入库PosID");
                 //发送扫码内容到服务器进行入库操作
                 //发送扫码内容到服务器进行入库操作
                 Operation operation = getLineBoxStatus();
                 Operation operation = getLineBoxStatus();
                 operation.op = 1;
                 operation.op = 1;
-                operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", StoreID.ToString() } };
+                operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", StoreID.ToString() }, { "rfid", rfid } };
                 operation.data.Add("inPos", posId);
                 operation.data.Add("inPos", posId);
                 string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
                 string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
                 Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
                 Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
                 if (resultOperation == null)
                 if (resultOperation == null)
                 {
                 {
                     // CodeMsg = "二维码【" + message + "】没有收到服务器反馈";
                     // CodeMsg = "二维码【" + message + "】没有收到服务器反馈";
-                    LogUtil.info(LOGGER, logName +  " 没有收到服务器反馈 ");
+                    LogUtil.info(LOGGER, logName + " 没有收到服务器反馈 ");
                 }
                 }
                 else if (!string.IsNullOrEmpty(resultOperation.msg))
                 else if (!string.IsNullOrEmpty(resultOperation.msg))
                 {
                 {
@@ -1265,13 +1265,13 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
-        public void ReviceLineInStoreCMD(string posId, string plateH, string plateW, string message)
+        public void ReviceLineInStoreCMD(string posId, string plateH, string plateW, string message,string rfid)
         {
         {
             string logName = "流水线入库命令【 " + message + "】【" + posId + "】：";
             string logName = "流水线入库命令【 " + message + "】【" + posId + "】：";
             if (!LineConnect.WaitInStoreList.Contains(posId))
             if (!LineConnect.WaitInStoreList.Contains(posId))
             {
             {
                 LogUtil.error(logName + "库位未验证通过，重新验证库位");
                 LogUtil.error(logName + "库位未验证通过，重新验证库位");
-                bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message);
+                bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message,rfid);
                 if (!result)
                 if (!result)
                 {
                 {
                     return;
                     return;
@@ -1293,7 +1293,10 @@ namespace OnlineStore.DeviceLibrary
             //TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器；
             //TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器；
             if (CanStarInOut())
             if (CanStarInOut())
             {
             {
-                InOutParam param = new InOutParam(new InOutPosInfo( message, posId, plateH, plateW));
+                InOutPosInfo inout = new InOutPosInfo(message, posId, plateH, plateW);
+                inout.rfid = rfid;
+                InOutParam param = new InOutParam(inout);
+               
                 LogUtil.info(logName + "  开始入库！");
                 LogUtil.info(logName + "  开始入库！");
                 StartInStoreMove(param);
                 StartInStoreMove(param);
                 //如果当前正在出入库中，需要记录下来，等待空闲时执行
                 //如果当前正在出入库中，需要记录下来，等待空闲时执行

source/DeviceLibrary/lineConnect/LineConnect.cs

@@ -111,7 +111,7 @@ namespace OnlineStore.DeviceLibrary
                     if (cmd.Equals(cmd_startIn))
                     if (cmd.Equals(cmd_startIn))
                     {
                     {
                         LogUtil.info("收到流水线入库消息：" + message);
                         LogUtil.info("收到流水线入库消息：" + message);
-                        StoreManager.Store.ReviceLineInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode);
+                        StoreManager.Store.ReviceLineInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode,reviceInfo.rfid);
                     }
                     }
                     else if (cmd.Equals(cmd_updateDebug))
                     else if (cmd.Equals(cmd_updateDebug))
                     {
                     {
@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
                         //    LineConnect.WaitInStoreList.Remove(reviceInfo.PosId);
                         //    LineConnect.WaitInStoreList.Remove(reviceInfo.PosId);
                         //}
                         //}
 
 
-                        bool result = StoreManager.Store.ReviceLineCheckInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode);
+                        bool result = StoreManager.Store.ReviceLineCheckInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode,reviceInfo.rfid);
                         if (result && (!WaitInStoreList.Contains(reviceInfo.PosId)))
                         if (result && (!WaitInStoreList.Contains(reviceInfo.PosId)))
                         {
                         {
                             LineConnect.WaitInStoreList.Add(reviceInfo.PosId);
                             LineConnect.WaitInStoreList.Add(reviceInfo.PosId);
@@ -198,6 +198,7 @@ namespace OnlineStore.DeviceLibrary
         public string PlateW = "0";
         public string PlateW = "0";
         public string WareCode = "";
         public string WareCode = "";
         public int IsDebug = 0;
         public int IsDebug = 0;
+        public string rfid = "";
     }
     }
     public class StoreSendBean
     public class StoreSendBean
     {
     {