diff --git a/FATrace.Model/DownloadTask.cs b/FATrace.Model/DownloadTask.cs
index b9938f0..b94e7c6 100644
--- a/FATrace.Model/DownloadTask.cs
+++ b/FATrace.Model/DownloadTask.cs
@@ -16,37 +16,44 @@ namespace FATrace.Model
         public long Id { get; set; }
 
         /// <summary>
-        /// 业务条码/编号（用于与 OEMRawUse/VideoAction 关联）。
+        /// 业务条码/编号
+        /// 内袋二维码
         /// </summary>
         [Column(StringLength = 100, IsNullable = false)]
         public string? Code { get; set; }
 
         /// <summary>
-        /// 原料名称。
+        /// 原料名称
         /// </summary>
         [Column(StringLength = 100, IsNullable = false)]
         public string? RawName { get; set; }
 
         /// <summary>
-        /// 操作用户标识。
+        /// 原料条码
+        /// </summary>
+        [Column(StringLength = 100, IsNullable = false)]
+        public string? RawCode { get; set; }
+
+        /// <summary>
+        /// 操作用户标识
         /// </summary>
         [Column(StringLength = 100, IsNullable = false)]
         public string? User { get; set; }
 
         /// <summary>
-        /// 任务状态：Pending/Running/Completed/Failed/Canceled。
+        /// 任务状态：Pending/Running/Completed/Failed/Canceled
         /// </summary>
         [Column(IsNullable = false)]
         public TaskStatus Status { get; set; } = TaskStatus.Pending;
 
         /// <summary>
-        /// 下载进度 0-100。
+        /// 下载进度 0-100
         /// </summary>
         [Column(IsNullable = false)]
         public short Progress { get; set; } = 0;
 
         /// <summary>
-        /// 目标视频保存路径（生成的本地文件全路径）。
+        /// 目标视频保存路径（生成的本地文件全路径）
         /// </summary>
         [Column(StringLength = 200)]
         public string? VideoFilePath { get; set; }
@@ -58,33 +65,34 @@ namespace FATrace.Model
         public string? Error { get; set; }
 
         /// <summary>
-        /// 已尝试次数（每次 Running 前加一）。
+        /// 已尝试次数（每次 Running 前加一）
         /// </summary>
         [Column(IsNullable = false)]
         public int TryCount { get; set; } = 0;
 
         /// <summary>
-        /// NVR 下载的开始时间（默认当前时间 - 5 分钟）。
+        /// NVR 下载的开始时间（默认当前时间 - 30秒）
         /// </summary>
         [Column(IsNullable = false)]
         public DateTime NvrStartTime { get; set; }
 
         /// <summary>
-        /// NVR 下载的结束时间（默认当前时间）。
+        /// NVR 下载的结束时间（默认当前时间）
         /// </summary>
         [Column(IsNullable = false)]
         public DateTime NvrEndTime { get; set; }
 
         /// <summary>
-        /// 创建时间。
+        /// 创建时间
         /// </summary>
         [Column(ServerTime = DateTimeKind.Local, CanUpdate = true)]
         public DateTime CreateTime { get; set; }
 
         /// <summary>
-        /// 最近一次更新时间。
+        /// 最近一次更新时间
         /// </summary>
         [Column(ServerTime = DateTimeKind.Local, CanUpdate = true)]
         public DateTime UpdateTime { get; set; }
+
     }
 }
diff --git a/FATrace.Model/OEMRawUse.cs b/FATrace.Model/OEMRawUse.cs
index 1661b66..f4ef48d 100644
--- a/FATrace.Model/OEMRawUse.cs
+++ b/FATrace.Model/OEMRawUse.cs
@@ -26,10 +26,16 @@ namespace FATrace.Model
         [Column(Name = "RawName", IsNullable = false, StringLength = 100)]
         public string? RawName{ get; set; }
 
+        /// <summary>
+        /// 原料条码
+        /// </summary>
+        [Column(StringLength = 100, IsNullable = false)]
+        public string? RawCode { get; set; }
+
         /// <summary>
         /// 视频链接
         /// </summary>
-        [Column(Name = "VideoUrl", IsNullable = false, StringLength = 256)]
+        [Column(Name = "VideoUrl", IsNullable = false, StringLength = 500)]
         public string? VideoUrl{ get; set; }
 
         /// <summary>
@@ -60,6 +66,7 @@ namespace FATrace.Model
         /// ///////////////////////////////////////////导航属性 LIN 一对一///////////////////////////////////////////////////////
         /// </summary>
         public long VideoActionId { get; set; } // 外键字段，必要
+
         /// <summary>
         /// 视频信息
         /// </summary>
diff --git a/FATrace.Model/TaskStatus.cs b/FATrace.Model/TaskStatus.cs
index 892f894..c7a43a1 100644
--- a/FATrace.Model/TaskStatus.cs
+++ b/FATrace.Model/TaskStatus.cs
@@ -8,27 +8,27 @@ namespace FATrace.Model
     public enum TaskStatus
     {
         /// <summary>
-        /// 待处理（已入队但尚未开始）。
+        /// 待处理（已入队但尚未开始）
         /// </summary>
         Pending = 0,
 
         /// <summary>
-        /// 运行中（正在处理）。
+        /// 运行中（正在处理）
         /// </summary>
         Running = 1,
 
         /// <summary>
-        /// 已完成（处理成功）。
+        /// 已完成（处理成功）
         /// </summary>
         Completed = 2,
 
         /// <summary>
-        /// 失败（处理过程中出现错误）。
+        /// 失败（处理过程中出现错误）
         /// </summary>
         Failed = 3,
 
         /// <summary>
-        /// 已取消（由用户或系统取消处理）。
+        /// 已取消（由用户或系统取消处理）
         /// </summary>
         Canceled = 4
     }
diff --git a/FATrace.OEMApp/App.config b/FATrace.OEMApp/App.config
index 76d75c6..be2ccbf 100644
--- a/FATrace.OEMApp/App.config
+++ b/FATrace.OEMApp/App.config
@@ -8,6 +8,8 @@
 		<add key="PLCIP" value="127.0.0.1" />
 		<add key="PLCPort" value="6000" />
 		<add key="PLCScan" value="600" />
+		<add key="PDAScanCode" value="D1000" />
+		<add key="DownloadTaskMaxRetry" value="3" />
 		<add key="NVRIP" value="192.168.0.15" />
 		<add key="NVRPort" value="8000" />
 		<add key="NVRUserName" value="admin" />
@@ -22,5 +24,5 @@
 		<add key="JellyfinPollIntervalMs" value="5000" />
 		<add key="JellyfinPollMaxWaitMs" value="600000" />
 	</appSettings>
-	
+
 </configuration>
\ No newline at end of file
diff --git a/FATrace.OEMApp/MainApp.cs b/FATrace.OEMApp/MainApp.cs
index db7ba5f..04c2fec 100644
--- a/FATrace.OEMApp/MainApp.cs
+++ b/FATrace.OEMApp/MainApp.cs
@@ -42,6 +42,11 @@ namespace FATrace.OEMApp
             InitializeComponent();
         }
 
+        /// <summary>
+        /// PLC数据服务
+        /// </summary>
+        private PLCDataService PLCDataService { get; set; }
+
         /// <summary>
         /// 主窗体加载：
         /// - 初始化海康客户端与基础配置（日志目录与保存路径）
@@ -61,6 +66,10 @@ namespace FATrace.OEMApp
             //HkCameraClient.NVR_Port = ConfigHelper.GetValue("NVRPort");
             //HkCameraClient.NVR_UserName = ConfigHelper.GetValue("NVRUserName");
 
+            PLCDataService = new PLCDataService();
+            PLCDataService.PlcConnectedEventHandler += PLCDataService_PlcConnectedEventHandler;
+            PLCDataService.ScanCodeEventHandler += PLCDataService_ScanCodeEventHandler;
+
             HkCameraClient.NVRVideoSavePath = ConfigHelper.GetValue("NVRVideoSavePath");
             //NVR登录
             NVRLogin();
@@ -109,6 +118,26 @@ namespace FATrace.OEMApp
             }
         }
 
+        /// <summary>
+        /// PLC数据服务：扫描条码
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="Code"></param>
+        private void PLCDataService_ScanCodeEventHandler(object? sender, string Code)
+        {
+
+        }
+
+       /// <summary>
+       /// PLC数据服务：PLC连接
+       /// </summary>
+       /// <param name="sender"></param>
+       /// <param name="e"></param>
+        private void PLCDataService_PlcConnectedEventHandler(object? sender, string e)
+        {
+
+        }
+
         private void NVRLogin()
         {
             HkCameraClient.NVR_IP = ConfigHelper.GetValue("NVRIP");
diff --git a/FATrace.OEMApp/Services/DownloadTaskWorker.cs b/FATrace.OEMApp/Services/DownloadTaskWorker.cs
index da5b169..2256086 100644
--- a/FATrace.OEMApp/Services/DownloadTaskWorker.cs
+++ b/FATrace.OEMApp/Services/DownloadTaskWorker.cs
@@ -62,11 +62,12 @@ namespace FATrace.OEMApp.Services
                 var maxRetry = ConfigHelper.GetIntOrDefault("DownloadTaskMaxRetry", 3);
                 db.Update<DownloadTask>()
                   .Set(a => a.Status, TaskStatus.Pending)
-                  .Set(a => a.Error, null)
+                  .Set(a => a.Error, "")
                   .Set(a => a.Progress, 0)
                   .Set(a => a.UpdateTime, DateTime.Now)
                   .Where(a => a.Status == TaskStatus.Failed && a.TryCount < maxRetry)
                   .ExecuteAffrows();
+
             }
             catch { }
             _cts = new CancellationTokenSource();
@@ -125,9 +126,9 @@ namespace FATrace.OEMApp.Services
         }
 
         /// <summary>
-        /// 后台主循环：定期拉取最早的 Pending 任务并顺序处理。
+        /// 后台主循环：定期拉取最早的 Pending 任务并顺序处理
         /// </summary>
-        /// <param name="token">取消令牌。</param>
+        /// <param name="token">取消令牌</param>
         private async Task RunAsync(CancellationToken token)
         {
             while (!token.IsCancellationRequested)
@@ -211,8 +212,9 @@ namespace FATrace.OEMApp.Services
                 .ExecuteAffrowsAsync();
 
             // 事件 -> TCS
-            // 订阅两个事件：进度与完成。进度事件写回数据库；完成事件用于唤醒等待。
+            // 订阅两个事件：进度与完成。进度事件写回数据库；完成事件用于唤醒等待
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+            
             void OnProgress(object? s, short p)
             {
                 try
diff --git a/FATrace.OEMApp/Services/PLCDataService.cs b/FATrace.OEMApp/Services/PLCDataService.cs
index bf40bd8..a99c0d8 100644
--- a/FATrace.OEMApp/Services/PLCDataService.cs
+++ b/FATrace.OEMApp/Services/PLCDataService.cs
@@ -19,12 +19,17 @@ namespace FATrace.OEMApp.Services
 
         public PLCDataService()
         {
-
-
             PLCLinkInitial();
             StartPlcScan();
+
+            PadCodeAddress= ConfigHelper.GetStringOrDefault("PDAScanCode", "D1050");
         }
 
+        /// <summary>
+        /// PAD地址
+        /// </summary>
+        private string PadCodeAddress { get; set; }
+
         /// <summary>
         /// 扫码事件
         /// </summary>
@@ -53,11 +58,11 @@ namespace FATrace.OEMApp.Services
                 {
                     if (value)
                     {
-                        PlcConnectedEventHandler.Invoke(this, "OK");
+                        if (PlcConnectedEventHandler != null) PlcConnectedEventHandler.Invoke(this, "OK");
                     }
                     else
                     {
-                        PlcConnectedEventHandler.Invoke(this, "NG");
+                        if (PlcConnectedEventHandler != null) PlcConnectedEventHandler.Invoke(this, "NG");
                     }
                     _PlcConnected = value;
                 }
@@ -65,6 +70,37 @@ namespace FATrace.OEMApp.Services
         }
 
 
+        private string _ScanCode = string.Empty;
+        /// <summary>
+        /// 扫描结果
+        /// </summary>
+        public string ScanCode
+        {
+            get { return _ScanCode; }
+            set
+            {
+                if (_ScanCode != value)
+                {
+                    if (!string.IsNullOrEmpty(value))
+                    {
+                        if (ScanCodeEventHandler != null) ScanCodeEventHandler.Invoke(this, value);
+                    }
+                    else
+                    {
+                        Logger.Error($"PLC条码数据为空: 数据改变但是数据为空");
+                    }
+
+                    _ScanCode = value;
+                }
+
+            }
+        }
+
+        /// <summary>
+        /// 扫描结果
+        /// </summary>
+        private OperateResult<string> OperateResultPDAScanCode { get; set; }
+
         // 扫描控制
         private CancellationTokenSource? _plcScanCts;
         private Task? _plcScanTask;
@@ -175,6 +211,12 @@ namespace FATrace.OEMApp.Services
                         PLCLinkInitial();
                     }
 
+                    //内包扫码
+                    OperateResultPDAScanCode = KeyencePlcMcNet!.ReadString(PadCodeAddress, 40);
+                    if (OperateResultPDAScanCode.IsSuccess)
+                    {
+                        ScanCode = RevData(OperateResultPDAScanCode.Content).Replace("\r", "").Replace("\n", "").Trim();
+                    }
                 }
                 catch (OperationCanceledException)
                 {