diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index ae090e04..8817724f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                #url: jdbc:mysql://112.4.208.194:3001/wms_xugongteji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://112.4.208.194:3001/wms_xugongteji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: developer
+#                password: developer
                 url: jdbc:mysql://10.24.0.62:3306/wms_tp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: wcs
                 password: Wcs123
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
index fea8ac01..aef4d83e 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java
@@ -180,10 +180,12 @@ public class TaskExecutor {
                     return;
                 }
                 if(appPendingStorages.isEmpty()){
-                    task.setRemark("该载具似乎未进行过码盘");
-                    appTaskService.updateAppTask(appTask); // 更新备注信息
+                    AppTask updateRemark = new AppTask();
+                    updateRemark.setTaskId(task.getTaskId());
+                    updateRemark.setRemark("该载具似乎未进行过码盘");
+                    appTaskService.updateAppTask(updateRemark); // 更新备注信息
                     AppTaskBak appTaskBak = new AppTaskBak();
-                    BeanUtils.copyProperties(appTask, appTaskBak);
+                    BeanUtils.copyProperties(task, appTaskBak);
                     appTaskBakService.insertAppTaskBak(appTaskBak); // 将任务数据归档
                     appTaskService.deleteAppTaskByTaskId(task.getTaskId()); // 删除旧数据
                     return;
@@ -211,13 +213,32 @@ public class TaskExecutor {
                     appStock.setUpdateBy(pendingStorage.getCreatePerson());
                     appStock.setRemark("");
                     appStockService.insertAppStock(appStock);
+                    appPendingStorageService.deleteAppPendingStorageByRecordId(pendingStorage.getRecordId()); // 删除码盘数据
                 });
-                task.setRemark("已插入库存");
-                appTaskService.updateAppTask(appTask); // 更新备注信息
+                AppTask updateRemark = new AppTask();
+                updateRemark.setTaskId(task.getTaskId());
+                updateRemark.setRemark("已插入库存");
+                appTaskService.updateAppTask(updateRemark); // 更新备注信息
                 AppTaskBak appTaskBak = new AppTaskBak();
-                BeanUtils.copyProperties(appTask, appTaskBak);
-                appTaskBakService.insertAppTaskBak(appTaskBak); // 将任务数据归档
+                appTaskBak.setTaskId(task.getTaskId());
+                appTaskBak.setTaskStatus(task.getTaskStatus());
+                appTaskBak.setRemark(task.getRemark());
+                appTaskBak.setTaskType(task.getTaskType());
+                appTaskBak.setTaskPriority(task.getTaskPriority());
+                appTaskBak.setVehicleId(task.getVehicleId());
+                appTaskBak.setOrigin(task.getOrigin());
+                appTaskBak.setDestination(task.getDestination());
+                appTaskBak.setWcsTaskId(task.getWcsTaskId());
+                appTaskBak.setFinishTime(task.getFinishTime());
+                appTaskBak.setGoodsId(task.getGoodsId());
+                appTaskBak.setOpNum(task.getOpNum());
+                appTaskBak.setStockNum(task.getStockNum());
+                appTaskBak.setOpUser(task.getOpUser());
+                appTaskBak.setPreTask(task.getPreTask());
+                logger.info("数据归档成功。{}", JSON.toJSONString(appTaskBak));
+                appTaskBakService.insertAppTaskBak(appTaskBak);// 数据归档
                 appTaskService.deleteAppTaskByTaskId(task.getTaskId()); // 删除旧数据
+
             }
         });
     }
diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml
index 60f45959..6d749de0 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.app.mapper.AppPendingStorageMapper">
-    
+
     <resultMap type="AppPendingStorage" id="AppPendingStorageResult">
         <result property="recordId"    column="record_id"    />
         <result property="listId"    column="list_id"    />
@@ -27,12 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppPendingStorageVo">
-        select record_id, list_id, order_type, customer_id, order_id, goods_id, goods_num, goods_code, goods_desc, unit, spare1, spare2, status, storage_type, create_time, create_person, update_time, remark from app_pending_storage
+        select record_id, list_id, vehicle_no, order_type, customer_id, order_id, goods_id, goods_num, goods_code, goods_desc, unit, spare1, spare2, status, storage_type, create_time, create_person, update_time, remark from app_pending_storage
     </sql>
 
     <select id="selectAppPendingStorageList" parameterType="AppPendingStorage" resultMap="AppPendingStorageResult">
         <include refid="selectAppPendingStorageVo"/>
-        <where>  
+        <where>
             <if test="listId != null  and listId != ''"> and list_id = #{listId}</if>
             <if test="orderType != null "> and order_type = #{orderType}</if>
             <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createPerson != null  and createPerson != ''"> and create_person = #{createPerson}</if>
         </where>
     </select>
-    
+
     <select id="selectAppPendingStorageByRecordId" parameterType="String" resultMap="AppPendingStorageResult">
         <include refid="selectAppPendingStorageVo"/>
         where record_id = #{recordId}
@@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteAppPendingStorageByRecordIds" parameterType="String">
-        delete from app_pending_storage where record_id in 
+        delete from app_pending_storage where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
@@ -186,4 +186,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </trim>
         </foreach>
     </insert>
-</mapper>
\ No newline at end of file
+</mapper>