diff --git a/module/programplan/model.php b/module/programplan/model.php
index 3b17aceb87..69642c12f0 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -909,7 +909,7 @@ class programplanModel extends model
      * @access public
      * @return bool|array
      */
-    public function update(int $planID = 0, int $projectID = 0, $plan = null): bool|array
+    public function update(int $planID = 0, int $projectID = 0, object $plan = null): bool|array
     {
         $oldPlan = $this->getByID($planID);
 
@@ -1255,15 +1255,13 @@ class programplanModel extends model
     public function computeProgress(int $stageID, string $action = '', bool $isParent = false): bool
     {
         $this->loadModel('execution');
-        $this->loadModel('project');
-        $this->loadModel('action');
 
         $stage   = $this->execution->getByID($stageID);
-        $project = $this->project->getByID($stage->project);
-
-        if(isset($project->model) && $project->model != 'waterfall' && $project->model != 'waterfallplus') return false;
         if(empty($stage) || empty($stage->path)) return false;
 
+        $project = $this->loadModel('project')->getByID($stage->project);
+        if(isset($project->model) && $project->model != 'waterfall' && $project->model != 'waterfallplus') return false;
+
         $action       = strtolower($action);
         $parentIdList = explode(',', trim($stage->path, ','));
         $parentIdList = array_reverse($parentIdList);
@@ -1301,7 +1299,7 @@ class programplanModel extends model
             if(isset($newParent) && $newParent)
             {
                 $this->dao->update(TABLE_EXECUTION)->data($newParent)->where('id')->eq($id)->exec();
-                $this->action->create('execution', $id, $parentAction, '', $parentAction);
+                $this->loadModel('action')->create('execution', $id, $parentAction, '', $parentAction);
             }
             unset($newParent, $parentAction);
         }
diff --git a/module/programplan/tao.php b/module/programplan/tao.php
index 7f9b6fd0af..c17ed5f3c5 100644
--- a/module/programplan/tao.php
+++ b/module/programplan/tao.php
@@ -23,21 +23,21 @@ class programplanTao extends programplanModel
     protected function updateRow(object $plan, array $conditions): bool
     {
         $requiredFields = $conditions['requiredFields'] ?? '';
-        $ids            = $conditions['ids'] ?? '';
+        $projectIDList  = $conditions['relatedExecutionsID'] ?? '';
         $project        = $conditions['project'] ?? '';
         $parentStage    = $conditions['parentStage'] ?? '';
         $parent         = $conditions['parent'] ?? '';
         $setCode        = $conditions['setCode'] ?? '';
 
         $getName = false;
-        if($ids && $project && $parentStage  && $parent) $getName = true;
+        if($projectIDList && $project && $parentStage && $parent) $getName = true;
 
         $this->dao->update(TABLE_PROJECT)->data($plan)
             ->autoCheck()
             ->batchCheckIF($requiredFields, $requiredFields, 'notempty')
             ->checkIF($plan->end != '0000-00-00', 'end', 'ge', $plan->begin)
             ->checkIF(!empty($plan->percent), 'percent', 'float')
-            ->checkIF(!empty($plan->name) && $getName, 'name', 'unique', "id in ({$ids}) and type in ('sprint','stage') and `project` = {$project} and `deleted` = '0'" . ($parentStage ? " and `parent` = {$parent}" : ''))
+            ->checkIF(!empty($plan->name) && $getName, 'name', 'unique', "id in ({$projectIDList}) and type in ('sprint','stage') and `project` = {$project} and `deleted` = '0'" . ($parentStage ? " and `parent` = {$parent}" : ''))
             ->checkIF(!empty($plan->code) and $setCode, 'code', 'unique', "id != {$plan->id} and type in ('sprint','stage','kanban') and `deleted` = '0'")
             ->where('id')->eq($plan->id)
             ->exec();
@@ -88,11 +88,12 @@ class programplanTao extends programplanModel
         $count        = count($statusCount);
         $newParent    = null;
         $parentAction = '';
+        $this->loadModel('execution');
         if(isset($statusCount['wait']) && $count == 1 && helper::isZeroDate($parent->realBegan) && $startTasks == 0)
         {
             if($parent->status != 'wait')
             {
-                $newParent    = $this->loadModel('execution')->buildExecutionByStatus('wait');
+                $newParent    = $this->execution->buildExecutionByStatus('wait');
                 $parentAction = 'waitbychild';
             }
         }
@@ -100,7 +101,7 @@ class programplanTao extends programplanModel
         {
             if($parent->status != 'closed')
             {
-                $newParent    = $this->loadModel('execution')->buildExecutionByStatus('closed');
+                $newParent    = $this->execution->buildExecutionByStatus('closed');
                 $parentAction = 'closedbychild';
             }
         }
@@ -108,7 +109,7 @@ class programplanTao extends programplanModel
         {
             if($parent->status != 'suspended')
             {
-                $newParent    = $this->loadModel('execution')->buildExecutionByStatus('suspended');
+                $newParent    = $this->execution->buildExecutionByStatus('suspended');
                 $parentAction = 'suspendedbychild';
             }
         }
@@ -116,7 +117,7 @@ class programplanTao extends programplanModel
         {
             if($parent->status != 'doing')
             {
-                $newParent    = $this->loadModel('execution')->buildExecutionByStatus('doing');
+                $newParent    = $this->execution->buildExecutionByStatus('doing');
                 $parentAction = $parent->status == 'wait' ? 'startbychildstart' : 'startbychild' . $action;
             }
         }
@@ -187,7 +188,7 @@ class programplanTao extends programplanModel
             $childrenIDList = $this->dao->select('id')->from(TABLE_PROJECT)->where('parent')->eq($oldPlan->id)->fetchAll('id');
             if(!empty($childrenIDList)) $this->dao->update(TABLE_PROJECT)->set('acl')->eq($plan->acl)->where('id')->in(array_keys($childrenIDList))->exec();
 
-            /* 父阶段不能那个超过100。 */
+            /* 相同父阶段的子阶段工作量占比之和不超过100%。 */
             /* The workload of the parent plan cannot exceed 100%. */
             $oldPlan->parent = $plan->parent;
             if($setPercent)
diff --git a/module/programplan/test/tao/getnewparentandaction.php b/module/programplan/test/tao/getnewparentandaction.php
index c61160fa76..e9217bd1db 100644
--- a/module/programplan/test/tao/getnewparentandaction.php
+++ b/module/programplan/test/tao/getnewparentandaction.php
@@ -25,20 +25,20 @@ $programplan = new programplanTest();
 $tester->loadModel('programplan')->programplanTao;
 
 $project = $programplan->getByIdTest(2);
-$result  = $tester->programplan->getNewParentAndAction(['wait' => 1], $project, 0, 'edit');
+$result  = $tester->programplan->getNewParentAndAction(array('wait' => 1), $project, 0, 'edit');
 $parent1 = $result['newParent'];
 
 
 $project = $programplan->getByIdTest(5);
-$result  = $tester->programplan->getNewParentAndAction(['closed' => 1], $project, 0, 'edit');
+$result  = $tester->programplan->getNewParentAndAction(array('closed' => 1), $project, 0, 'edit');
 $parent2 = $result['newParent'];
 
 $project = $programplan->getByIdTest(8);
-$result  = $tester->programplan->getNewParentAndAction(['suspended' => 1], $project, 0, 'edit');
+$result  = $tester->programplan->getNewParentAndAction(array('suspended' => 1), $project, 0, 'edit');
 $parent3 = $result['newParent'];
 
 $project = $programplan->getByIdTest(11);
-$result  = $tester->programplan->getNewParentAndAction(['wait' => 2, 'closed' => 1], $project, 0, 'edit');
+$result  = $tester->programplan->getNewParentAndAction(array('wait' => 2, 'closed' => 1), $project, 0, 'edit');
 $parent4 = $result['newParent'];