From 4e02c5ba538fa04b481b095ee8edc9a2e4112c4a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 18 Nov 2021 10:48:31 +0800
Subject: [PATCH] * Fix product issues during replication sprint.

---
 module/execution/control.php          |  4 ++++
 module/execution/view/create.html.php | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index c427af1184..49ff183f3c 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1398,6 +1398,10 @@ class execution extends control
         $this->view->qdUsers             = $qdUsers;
         $this->view->rdUsers             = $rdUsers;
         $this->view->users               = $this->loadModel('user')->getPairs('nodeleted|noclosed');
+        $this->view->PO                  = isset($copyExecution->PO) ? $copyExecution->PO : '';
+        $this->view->QD                  = isset($copyExecution->QD) ? $copyExecution->QD : '';
+        $this->view->PM                  = isset($copyExecution->PM) ? $copyExecution->PM : '';
+        $this->view->RD                  = isset($copyExecution->RD) ? $copyExecution->RD : '';
         $this->view->from                = $this->app->tab;
         $this->display();
     }
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index a9ce44a861..065e19c1d0 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -105,16 +105,18 @@
             <div class='row'>
               <?php $i = 0;?>
               <?php foreach($products as $product):?>
+              <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
+              <?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
               <div class='col-sm-4'>
-                <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
                 <div class="input-group<?php if($hasBranch) echo ' has-branch';?>">
                   <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "'");?>
                   <span class='input-group-addon fix-border'></span>
-                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], $product->branch, "class='form-control chosen' onchange=\"loadPlans('#products{$i}', this.value)\"");?>
+                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], $branchID, "class='form-control chosen' onchange=\"loadPlans('#products{$i}', this.value)\"");?>
                 </div>
               </div>
               <?php $i++;?>
               <?php endforeach;?>
+              <?php endforeach;?>
               <div class='col-sm-4'>
                 <div class="input-group">
                   <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
@@ -161,13 +163,13 @@
           <td>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->execution->PO;?></span>
-              <?php echo html::select('PO', $poUsers, '', "class='form-control chosen'");?>
+              <?php echo html::select('PO', $poUsers, $PO, "class='form-control chosen'");?>
             </div>
           </td>
           <td>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->execution->QD;?></span>
-              <?php echo html::select('QD', $qdUsers, '', "class='form-control chosen'");?>
+              <?php echo html::select('QD', $qdUsers, $QD, "class='form-control chosen'");?>
             </div>
           </td>
         </tr>
@@ -175,13 +177,13 @@
           <td>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->execution->PM;?></span>
-              <?php echo html::select('PM', $pmUsers, '', "class='form-control chosen'");?>
+              <?php echo html::select('PM', $pmUsers, $PM, "class='form-control chosen'");?>
             </div>
           </td>
           <td>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->execution->RD;?></span>
-              <?php echo html::select('RD', $rdUsers, '', "class='form-control chosen'");?>
+              <?php echo html::select('RD', $rdUsers, $RD, "class='form-control chosen'");?>
             </div>
           </td>
         </tr>