Quellcode durchsuchen

RFID业务代码提交

oyq28 vor 2 Jahren
Ursprung
Commit
3324856191
2 geänderte Dateien mit 18 neuen und 10 gelöschten Zeilen
  1. 17 9
      IMCS_CCS/Service/Impl/HttpRequestService.cs
  2. 1 1
      IMCS_CCS/Utils/ToolUtils.cs

+ 17 - 9
IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -2115,16 +2115,22 @@ namespace IMCS.CCS.Services
                         
                         if (string.IsNullOrEmpty(actionAddress.Value))
                         {
-                            var resultBytes = s7.Read(actionAddress.Value, 40); 
+                            var resultBytes = s7.Read(actionAddress.Address, 360); 
                             responseData.result = ToolUtils.ReturnStringByBytes(resultBytes.Content);
-                        } 
+                            req.data.content = responseData.result;
+                        }
+                        else
+                        {
+                            s7.Write(actionAddress.Address, Convert.ToInt16(actionAddress.Value));
+                        }
+
                     }
                 }
 
                 s7.ConnectClose();
  
-                Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.ReadRFID) + "读取RFID故障===>>" + JsonConvert.SerializeObject(req)
-                   , EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker));
+                Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.ReadRFID) + " 读取RFID成功===>>" + JsonConvert.SerializeObject(req)
+                   , EnumHelper.GetDescription(ActionTypeEnum.ReadRFID));
                 return responseData;
             }
             catch (Exception ex)
@@ -2183,20 +2189,22 @@ namespace IMCS.CCS.Services
 
                         if (string.IsNullOrEmpty(actionAddress.Value))
                         { 
-                             s7.Write(actionAddress.Address, ToolUtils.ReturnBtyesWtitString(req.data.content, 128));
+                             s7.Write(actionAddress.Address, ToolUtils.ReturnBtyesWtitString(req.data.content, 360));
+                             //var resultBytes = s7.Read("DB200.868", 40);
+                             //Console.WriteLine(ToolUtils.ReturnStringByBytes(resultBytes.Content));
                         }
                         else
                         {
-                            s7.Write(actionAddress.Address, actionAddress.Value);
+                            s7.Write(actionAddress.Address, Convert.ToInt16(actionAddress.Value));
                         }
                         Thread.Sleep(SLEEP_TIME);
                     }
                 }
 
                 s7.ConnectClose();
-
-                Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.WriteRFID) + "写RFID故障===>>" + JsonConvert.SerializeObject(req)
-                   , EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker));
+                
+                Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.WriteRFID) + " 写RFID成功===>>" + JsonConvert.SerializeObject(req)
+                   , EnumHelper.GetDescription(ActionTypeEnum.WriteRFID));
                 return responseData;
             }
             catch (Exception ex)

+ 1 - 1
IMCS_CCS/Utils/ToolUtils.cs

@@ -17,7 +17,7 @@ namespace IMCS_CCS.Utils
         public static byte[] ReturnBtyesWtitString(string value, int byteleng = 30)
         {
             byte[] bt = new byte[byteleng];
-            byte[] item = Encoding.ASCII.GetBytes(value.Clone().ToString());
+            byte[] item = Encoding.Default.GetBytes(value.Clone().ToString());
             Array.Copy(item, bt, item.Length);
             return bt;
         }