diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskDetHis.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskDetHis.java
index 4aacdeb..1a88c74 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskDetHis.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/TaskDetHis.java
@@ -91,8 +91,8 @@ public class TaskDetHis extends Model<TaskDetHis> {
     /**
      * 历史任务id，关联当前任务表：t_task_his
      */
-    @TableField("task_id")
-    private Long taskId;
+    @TableField("curr_task_id")
+    private Long currTaskId;
 
     /**
      * 订单号
@@ -163,7 +163,7 @@ public class TaskDetHis extends Model<TaskDetHis> {
 
     public static final String TASK_CODE = "task_code";
 
-    public static final String TASK_ID = "task_id";
+    public static final String CURR_TASK_ID = "curr_task_id";
 
     public static final String ORDER_NO = "order_no";
 
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskDetHisMapper.xml b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskDetHisMapper.xml
index 47b3a7b..d85f5cb 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskDetHisMapper.xml
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/TaskDetHisMapper.xml
@@ -14,7 +14,7 @@
         <result column="status" property="status" />
         <result column="inter_code" property="interCode" />
         <result column="task_code" property="taskCode" />
-        <result column="task_id" property="taskId" />
+        <result column="curr_task_id" property="currTaskId" />
         <result column="order_no" property="orderNo" />
         <result column="iden_card_num" property="idenCardNum" />
         <result column="product_name" property="productName" />
@@ -27,7 +27,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, task_id, order_no, iden_card_num, product_name, material_des, craft_ill, unit, weight, quantity
+        id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, task_code, curr_task_id, order_no, iden_card_num, product_name, material_des, craft_ill, unit, weight, quantity
     </sql>
 
 </mapper>
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
index 2f89597..4a70dbd 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
@@ -152,7 +152,7 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
         List<CurrTaskDet> taskDetailsByMainId = currTaskDetService.getTaskDetailsByMainId(IdParam.builder().id(byId.getId()).build());
         List<TaskDetHis> taskDetHis = com.mt.wms.core.utils.BeanUtils.copyList(taskDetailsByMainId, TaskDetHis.class);
         taskDetHis.forEach(detHis -> {
-            detHis.setTaskId(save.getData().getId());
+            detHis.setCurrTaskId(save.getData().getId());
         });
         //将详细任务信息放入详细历史表
         taskDetHisService.saveList(taskDetHis);
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
index 52fef9e..9ccc2e2 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
@@ -72,7 +72,7 @@ public class TaskDetHisServiceImpl extends BaseService implements TaskDetHisServ
                 .eq(TaskDetHis.VALID, 1);
         List<TaskDetHis> list = taskDetHisServiceBiz.list(queryWrapper);
         list.forEach(e -> {
-            CurrTaskVo byId = taskhisService.getById(IdParam.builder().id(e.getTaskId()).build());
+            CurrTaskVo byId = taskhisService.getById(IdParam.builder().id(e.getCurrTaskId()).build());
             //如果加工类型是复加工，或者任务作废。移除对象
             if (byId.getProcessType().equals(2) || byId.getValid() != 1)
             {
@@ -90,7 +90,7 @@ public class TaskDetHisServiceImpl extends BaseService implements TaskDetHisServ
     @Override
     public R<PageVo<TaskHisDetVo>> getTaskDetailsPage(CurrTaskDetQueryParam currTaskId) {
         QueryWrapper<TaskDetHis> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(TaskDetHis.TASK_ID, currTaskId.getCurrTaskId())
+        queryWrapper.eq(TaskDetHis.CURR_TASK_ID, currTaskId.getCurrTaskId())
                 .eq(TaskDetHis.VALID, 1);
         Page<TaskDetHis> page = taskDetHisServiceBiz.page(new Page<>(currTaskId.getCurrent(), currTaskId.getSize()), queryWrapper);
         PageVo<TaskHisDetVo> taskHisDetVoPageVo = new PageVo<>(page, TaskHisDetVo.class);
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskHisServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskHisServiceImpl.java
index 1f2761b..f14da71 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskHisServiceImpl.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskHisServiceImpl.java
@@ -44,7 +44,8 @@ public class TaskHisServiceImpl extends BaseService implements TaskHisService {
 
     @Override
     public CurrTaskVo getById(IdParam id) {
-        TaskHis byId = taskHisService.getById(id.getId());
+        //TaskHis byId = taskHisService.getById(id.getId());
+        TaskHis byId = taskHisService.getOne(new QueryWrapper<TaskHis>().eq(TaskHis.TASK_ID, id.getId()));
         CurrTaskVo build = CurrTaskVo.builder().build();
         BeanUtils.copyProperties(byId, build);
         return build;
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
index a802400..3829e4f 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
@@ -36,7 +36,6 @@ import static org.bouncycastle.asn1.x500.style.RFC4519Style.l;
  * @Version 1.0
  */
 @Component
-@Transactional
 public class RunTaskUtils {
     private Logger logger = LoggerFactory.getLogger(getClass());
     @Resource