初期稳定版本260119

FATrace.WPLApp/Services/DataServices.cs

@@ -36,8 +36,8 @@ namespace FATrace.WPLApp.Services
             StartPlcScan();
             //var DD= RevData("DYG05030013,20250923,802,3,01,0001,");
 
-           //var dd1= RevData("DYG05030013,251111,10193,6,01,3");
-           //var dd2 = RevData("DYG05030013,251111,2116,6,01,3");
+            //var dd1= RevData("DYG05030013,251111,10193,6,01,3");
+            //var dd2 = RevData("DYG05030013,251111,2116,6,01,3");
 
         }
 
@@ -64,6 +64,7 @@ namespace FATrace.WPLApp.Services
                 var BoxSprayCodeSource = CodeItem!.Code + ",A";
                 var BoxSprayCodeRev = RevData(BoxSprayCodeSource);
 
+                BoxSprayCode = BoxSprayCodeSource;
                 KeyencePlcMcNet.Write("D1150", BoxSprayCodeRev);
 
                 Console.WriteLine($"外箱喷码:{BoxSprayCodeSource}-发送OK");
@@ -90,7 +91,7 @@ namespace FATrace.WPLApp.Services
         }
 
         /// <summary>
-        /// 箱子扫描码请求
+        /// 外箱扫描码请求
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -125,12 +126,14 @@ namespace FATrace.WPLApp.Services
                     {
                         Console.WriteLine($"外箱扫描码:{BoxScanCode}-删除临时队列数据成功");
                         LogService.Info($"外箱扫描码:{BoxScanCode}-删除临时队列数据成功");
+                        try { EventAggregator?.GetEvent<DashboardRefreshEvent>()?.Publish(true); } catch { }
                     }
                     else
                     {
                         Console.WriteLine($"外箱扫描码:{BoxScanCode}-删除临时队列数据失败");
                         LogService.Info($"外箱扫描码:{BoxScanCode}-删除临时队列数据失败");
                         AddAlarm("外箱扫描", $"{BoxScanCode}-删除临时队列数据失败");
+                        try { EventAggregator?.GetEvent<DashboardRefreshEvent>()?.Publish(true); } catch { }
                     }
 
                     var UpdatedResult = FreeSql.Update<RawProUse>()
@@ -184,13 +187,10 @@ namespace FATrace.WPLApp.Services
                 KeyencePlcMcNet.Write("D1250", new Int16[30]);
             });
 
-            //try { EventAggregator?.GetEvent<DashboardRefreshEvent>()?.Publish(true); } catch { }
-
-
         }
 
         /// <summary>
-        /// 称重扫描码请求数据
+        /// 称重 内包扫描码请求数据
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -217,6 +217,14 @@ namespace FATrace.WPLApp.Services
                     {
                         Code = WeightScanCode
                     }).ExecuteAffrows();
+                    try
+                    {
+                        EventAggregator?.GetEvent<DashboardRefreshEvent>()?.Publish(true);
+                    }
+                    catch
+                    {
+                      
+                    }
 
                     var Result = FreeSql.Update<RawProUse>()
                      .Set(p => p.WeightScanTime, DateTime.Now)
@@ -304,6 +312,17 @@ namespace FATrace.WPLApp.Services
         }
 
 
+        private string _boxSprayCode;
+        /// <summary>
+        /// 最近一次下发给 PLC 的外箱喷码数据（源字符串，不做 RevData 对调处理）
+        /// </summary>
+        public string BoxSprayCode
+        {
+            get { return _boxSprayCode; }
+            set { _boxSprayCode = value; RaisePropertyChanged(); }
+        }
+
+
 
         // 扫描控制
         private CancellationTokenSource? _plcScanCts;

FATrace.WPLApp/Services/NavigationServices.cs

@@ -101,6 +101,13 @@ namespace FATrace.WPLApp.Services
                             IsParent = false,
                         },
                         new NavItemDto()
+                        {
+                            Name = "称重用户",
+                            CmdPar = "称重用户",
+                            Icon = "\uec46",
+                            IsParent = false,
+                        },
+                        new NavItemDto()
                         {
                             Name = "使用手册",
                             CmdPar = "使用手册",

FATrace.WPLApp/Services/ReadFileServices.cs

@@ -590,14 +590,15 @@ namespace FATrace.WPLApp.Services
                     InTime = GetCellString(row, 0, formatter),
                     OutTime = GetCellString(row, 1, formatter),
                     Origin = GetCellString(row, 2, formatter),
-                    RawCode = GetCellString(row, 3, formatter),
-                    RawName = GetCellString(row, 4, formatter),
-                    TotalInCase = GetCellString(row, 5, formatter),
-                    TotalOutCase = GetCellString(row, 6, formatter),
-                    RemainCase = GetCellString(row, 7, formatter)
+                    Batch = GetCellString(row, 3, formatter),
+                    RawCode = GetCellString(row, 4, formatter),
+                    RawName = GetCellString(row, 5, formatter),
+                    TotalInCase = GetCellString(row, 6, formatter),
+                    TotalOutCase = GetCellString(row, 7, formatter),
+                    RemainCase = GetCellString(row, 8, formatter)
                 };
 
-                if (IsAllEmpty(entity.InTime, entity.OutTime, entity.Origin, entity.RawCode, entity.RawName,
+                if (IsAllEmpty(entity.InTime, entity.OutTime, entity.Origin, entity.Batch, entity.RawCode, entity.RawName,
                                entity.TotalInCase, entity.TotalOutCase, entity.RemainCase))
                     continue;