PLC数采

RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs

@@ -156,7 +156,15 @@ namespace RIZO.Admin.WebApi.PLC.Model.Dto
 
         public string? ChipSN { get; set; }
 
-
+        public string? PinPressure1 { get; set; }
+        public string? PinStroke1 { get; set; }
+        public string? PinPressure2 { get; set; }
+        public string? PinStroke2 { get; set; }
+        public string? PressHoldTime { get; set; }
+        public string? TrayBarcode { get; set; }
+        public string? ActualOutQty { get; set; }
+        public string? QualifiedQty { get; set; }
+        public string? FailedQty { get; set; }
 
         [ExcelColumn(Name = "运行状态:1=空闲，2=运行中，3=故障；")]
         public string? RunstatusLabel { get; set; }

RIZO.Admin.WebApi/PLC/Model/PlcProductionData.cs

@@ -470,5 +470,59 @@ namespace RIZO.Admin.WebApi.PLC.Model
         /// </summary>
         [SugarColumn(ColumnName = "Product4Result")]
         public string Product4Result { get; set; }
+
+        /// <summary>
+        /// 1# 销压力
+        /// </summary>
+        [SugarColumn(ColumnName = "PinPressure1")]
+        public string PinPressure1 { get; set; }
+
+        /// <summary>
+        /// 1# 销行程
+        /// </summary>
+        [SugarColumn(ColumnName = "PinStroke1")]
+        public string PinStroke1 { get; set; }
+
+        /// <summary>
+        /// 2# 销压力
+        /// </summary>
+        [SugarColumn(ColumnName = "PinPressure2")]
+        public string PinPressure2 { get; set; }
+
+        /// <summary>
+        /// 2# 销行程
+        /// </summary>
+        [SugarColumn(ColumnName = "PinStroke2")]
+        public string PinStroke2 { get; set; }
+
+        /// <summary>
+        /// 保压时间
+        /// </summary>
+        [SugarColumn(ColumnName = "PressHoldTime")]
+        public string PressHoldTime { get; set; }
+
+        /// <summary>
+        /// 波峰焊托盘条码
+        /// </summary>
+        [SugarColumn(ColumnName = "trayBarcode")]
+        public string TrayBarcode { get; set; }
+
+        /// <summary>
+        /// 实际产量
+        /// </summary>
+        [SugarColumn(ColumnName = "actualOutQty")]
+        public string ActualOutQty { get; set; }
+
+        /// <summary>
+        /// 合格产量
+        /// </summary>
+        [SugarColumn(ColumnName = "qualifiedQty")]
+        public string QualifiedQty { get; set; }
+
+        /// <summary>
+        /// 失败产量
+        /// </summary>
+        [SugarColumn(ColumnName = "failedQty")]
+        public string FailedQty { get; set; }
     }
 }

RIZO.Admin.WebApi/PLC/Service/PlcHostedService.cs

@@ -426,7 +426,6 @@ namespace RIZO.Admin.WebApi.PLC.Service
                     }
                     else
                     {
-                        _logger.LogWarning($"[{config.PlcName}] 生产数据读取失败 | IP：{config.Ip} | 原因：{message}");
                         // 读取失败更新状态
                         status.FailCount++;
                         status.Level = status.FailCount <= 1 ? ConnectionLevel.Weak : ConnectionLevel.Disconnected;
@@ -455,7 +454,7 @@ namespace RIZO.Admin.WebApi.PLC.Service
             await Task.WhenAll(tasks);
 
             // 输出本轮轮询统计
-            _logger.LogInformation($"PLC轮询完成 | 成功：{successCount} | 失败：{failCount} | 跳过：{skipCount} | 有数据：{activeCount}");
+            //_logger.LogInformation($"PLC轮询完成 | 成功：{successCount} | 失败：{failCount} | 跳过：{skipCount} | 有数据：{activeCount}");
         }
 
         /// <summary>