From 83623b559f4fb4491fc20eeb1a805cd9b908a2b7 Mon Sep 17 00:00:00 2001
From: jrbin <jrbin@masada.com.tw>
Date: Mon, 13 Nov 2023 16:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=8F=E8=AA=BF=E6=9F=A5=E8=A9=A2bug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/mkt/pricereview-check.php          | 16 ++++++++++++----
 wms/mkt/pricereview_renovate-check.php | 16 ++++++++++++----
 wms/mkt/specsurvey-index.php           |  5 +++--
 wms/mkt/specsurvey-view.php            | 11 +++++++----
 wms/mkt/specsurvey_renovate-index.php  |  5 +++--
 wms/mkt/specsurvey_renovate-view.php   | 11 +++++++----
 6 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/wms/mkt/pricereview-check.php b/wms/mkt/pricereview-check.php
index e9b4758b..8c7f4d6a 100644
--- a/wms/mkt/pricereview-check.php
+++ b/wms/mkt/pricereview-check.php
@@ -192,6 +192,12 @@ foreach ($res as $data) {
             $item_arr[$row['item_no']]['note'] = $row['note'];
             $item_arr[$row['item_no']]['mi_fix'] = $row['mi_fix'];
             $data["qty_total"] += $row["item_qty"];
+            $sql_spec = "select sub_item_id from specsurvey_main where mid = '$mid' and pr_item_id = '".$row['item_no']."' order by sub_item_id";
+            $res_spec = mysqli_query($link, $sql_spec);
+            while ($row_spec = mysqli_fetch_row($res_spec)) {
+                $item_arr[$row['item_no']]['sub_item_id'][] = $row_spec[0];
+            }
+            mysqli_free_result($res_spec);
         } elseif ($row['item_group'] == "B") {
             $option_arr[$row['item_no']]['item_spec'] = $row['item_spec'];
             $option_arr[$row['item_no']]['item_unit_price'] = $row['item_unit_price'];
@@ -324,10 +330,12 @@ $(function () {
 
     $('#tb1').on('focus', 'tr[name=facil_templ] a', function(){
         $(this).unbind().click(function(){
-            // 價審單序號,電梯項次
+            // 價審單序號,電梯項次,子項次
             var pa = '';
             pa  = '<?php echo $id; ?>'+',';
-            pa += $(this).closest('td').prev().find('input[name=item_no]').val();
+            pa += $(this).closest('td').prev().find('input[name=item_no]').val()+',';
+            pa += ',';
+            pa += $(this).closest('td').prev().find('input[name=sub_item_id]').val();
             var plink = '<iframe src="specsurvey-view.php?pa='+pa+'&noheader=1&<?php echo $token_link;?>" width="100%" height="500" frameborder="0" title=""></iframe>';
             $('.modal-footer').find('button').prop('disabled',false);
             //$('.navbar').hide();
@@ -457,7 +465,7 @@ hr {
                             for ($i=0; $i<$val["item_qty"]; $i++) {
                     ?>
                     <tr name="facil_templ">
-                        <td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"></td>
+                        <td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"><input type="hidden" name="sub_item_id" value="<?php if (isset($val["sub_item_id"])) echo implode("@", $val["sub_item_id"]); ?>"></td>
                         <td nowrap><a href="" data-toggle="modal"><?=$val["item_spec"];?> [規調]</a></td>
                         <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?=number_format($val["item_unit_price"]);?>"></td>
                         <td><input type="text" name="item_qty" class="form-control" size="2" value="1"></td>
@@ -480,7 +488,7 @@ hr {
                         } else {
                     ?>
                     <tr name="facil_templ">
-                        <td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"></td>
+                        <td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"><input type="hidden" name="sub_item_id" value="<?php if (isset($val["sub_item_id"])) echo implode("@", $val["sub_item_id"]); ?>"></td>
                         <td nowrap><a href="" data-toggle="modal"><?=$val["item_spec"];?> [規調]</a></td>
                         <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?=number_format($val["item_unit_price"]);?>"></td>
                         <td><input type="text" name="item_qty" class="form-control" size="2" value="<?=number_format($val["item_qty"]);?>"></td>
diff --git a/wms/mkt/pricereview_renovate-check.php b/wms/mkt/pricereview_renovate-check.php
index 96731be2..c28dac8b 100644
--- a/wms/mkt/pricereview_renovate-check.php
+++ b/wms/mkt/pricereview_renovate-check.php
@@ -192,6 +192,12 @@ foreach ($res as $data) {
             $item_arr[$row['item_no']]['note'] = $row['note'];
             $item_arr[$row['item_no']]['mi_fix'] = $row['mi_fix'];
             $data["qty_total"] += $row["item_qty"];
+            $sql_spec = "select sub_item_id from specsurvey_main where mid = '$mid' and pr_item_id = '".$row['item_no']."' order by sub_item_id";
+            $res_spec = mysqli_query($link, $sql_spec);
+            while ($row_spec = mysqli_fetch_row($res_spec)) {
+                $item_arr[$row['item_no']]['sub_item_id'][] = $row_spec[0];
+            }
+            mysqli_free_result($res_spec);
         } elseif ($row['item_group'] == "B") {
             $option_arr[$row['item_no']]['item_spec'] = $row['item_spec'];
             $option_arr[$row['item_no']]['item_unit_price'] = $row['item_unit_price'];
@@ -326,10 +332,12 @@ $(function () {
 
     $('#tb1').on('focus', 'tr[name=facil_templ] a', function(){
         $(this).unbind().click(function(){
-            // 價審單序號,電梯項次
+            // 價審單序號,電梯項次,子項次
             var pa = '';
             pa  = '<?php echo $id; ?>'+',';
-            pa += $(this).closest('td').prev().find('input[name=item_no]').val();
+            pa += $(this).closest('td').prev().find('input[name=item_no]').val()+',';
+            pa += ',';
+            pa += $(this).closest('td').prev().find('input[name=sub_item_id]').val();
             var plink = '<iframe src="specsurvey_renovate-view.php?pa='+pa+'&noheader=1&<?php echo $token_link;?>" width="100%" height="500" frameborder="0" title=""></iframe>';
             $('.modal-footer').find('button').prop('disabled',false);
             //$('.navbar').hide();
@@ -459,7 +467,7 @@ hr {
                             for ($i=0; $i<$val["item_qty"]; $i++) {
                     ?>
                     <tr name="facil_templ">
-                        <td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"></td>
+                        <td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"><input type="hidden" name="sub_item_id" value="<?php if (isset($val["sub_item_id"])) echo implode("@", $val["sub_item_id"]); ?>"></td>
                         <td nowrap><a href="" data-toggle="modal"><?=$val["item_spec"];?> [規調]</a></td>
                         <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?=number_format($val["item_unit_price"]);?>"></td>
                         <td><input type="text" name="item_qty" class="form-control" size="2" value="1"></td>
@@ -482,7 +490,7 @@ hr {
                         } else {
                     ?>
                     <tr name="facil_templ">
-                        <td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"></td>
+                        <td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"><input type="hidden" name="sub_item_id" value="<?php if (isset($val["sub_item_id"])) echo implode("@", $val["sub_item_id"]); ?>"></td>
                         <td nowrap><a href="" data-toggle="modal"><?=$val["item_spec"];?> [規調]</a></td>
                         <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?=number_format($val["item_unit_price"]);?>"></td>
                         <td><input type="text" name="item_qty" class="form-control" size="2" value="<?=number_format($val["item_qty"]);?>"></td>
diff --git a/wms/mkt/specsurvey-index.php b/wms/mkt/specsurvey-index.php
index d99e607d..2a806f21 100644
--- a/wms/mkt/specsurvey-index.php
+++ b/wms/mkt/specsurvey-index.php
@@ -7,7 +7,8 @@ $data = array();
 $sql_cmd = sql_myself($user_id, "s.creater");
 if ($user_id == "M0060") $sql_cmd = "";
 $sql2 = (empty($sql_cmd)) ? "where" : "and";
-$sql2 .= " s.mid = p.id and p.ekind = '新梯'";
+$sql2 .= " s.mid = p.id and p.ekind = '新梯' ";
+$sql2 .= "and (s.mid, s.pr_item_id, s.sub_item_id, s.version) in (select s.mid, s.pr_item_id, s.sub_item_id, max(s.version) from specsurvey_main s, pricereview_main p where s.mid = p.id group by s.mid, s.pr_item_id, s.sub_item_id)";
 $sql = "select s.* from specsurvey_main s, pricereview_main p $sql_cmd $sql2 order by s.id";
 // 用mysqli_query方法執行(sql語法)將結果存在變數中
 $data = mysqli_query($link, $sql);
@@ -125,7 +126,7 @@ $(function () {
             <td><?php echo $class_arr[$data['class']]; ?></td>
             <td><?php echo $data['creater']; ?></td>
             <td><?php echo $data['create_at']; ?></td>
-            <td><a href="specsurvey-view.php?pa=<?php echo $data['mid'].",".$data['pr_item_id'],",".$data['version']; ?>&function=specsurvey&<?php echo $token_link; ?>" class="btn btn-warning btn-sm">檢視</a></td>
+            <td><a href="specsurvey-view.php?pa=<?php echo $data['mid'].",".$data['pr_item_id'],",".$data['version'].",".$data['sub_item_id']; ?>&function=specsurvey&<?php echo $token_link; ?>" class="btn btn-warning btn-sm">檢視</a></td>
             <!--<td>
                 <p>
                     <a href="specsurvey-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
diff --git a/wms/mkt/specsurvey-view.php b/wms/mkt/specsurvey-view.php
index 4705d541..1ad9c980 100644
--- a/wms/mkt/specsurvey-view.php
+++ b/wms/mkt/specsurvey-view.php
@@ -1,15 +1,18 @@
 <?php
 include "../header.php";
 
-// 價審單序號,電梯項次,版號
+// 價審單序號,電梯項次,版號,子項次
 $pa = explode(",", $_REQUEST["pa"]);
 $prid = $pa[0];
 $item_no = $pa[1];
 $version = (empty($pa[2])) ? "" : $pa[2];
+$sid = (empty($pa[3])) ? "" : $pa[3];
+if (!empty($sid)) $sid = str_replace("@", "','", $sid);
+
 $noheader = (empty($_REQUEST["noheader"])) ? 0 : 1;
 
-if (empty($version)) $sql = "select mid, pr_item_id, max(version) from specsurvey_main where mid = '$prid' and pr_item_id = '$item_no'";
-else $sql = "select mid, pr_item_id, version from specsurvey_main where mid = '$prid' and pr_item_id = '$item_no' and version = '$version'";
+if (empty($version)) $sql = "select mid, pr_item_id, sub_item_id, max(version) from specsurvey_main where mid = '$prid' and pr_item_id = '$item_no' and sub_item_id in ('$sid') group by mid, pr_item_id, sub_item_id";
+else $sql = "select mid, pr_item_id, sub_item_id, version from specsurvey_main where mid = '$prid' and pr_item_id = '$item_no' and version = '$version' and sub_item_id in ('$sid')";
 
 if ($noheader) {
 ?>
@@ -19,7 +22,7 @@ if ($noheader) {
 <?php
 }
 $data = array();
-$db_query = "select * from specsurvey_main where (mid, pr_item_id, version) in ($sql)";
+$db_query = "select * from specsurvey_main where (mid, pr_item_id, sub_item_id, version) in ($sql)";
 $res = mysqli_query($link, $db_query);
 if (0 == $res->num_rows) {
     //echo '<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button><h4 class="modal-title">Modal title</h4></div><div class="modal-body">';
diff --git a/wms/mkt/specsurvey_renovate-index.php b/wms/mkt/specsurvey_renovate-index.php
index 0dbf71f7..1478118c 100644
--- a/wms/mkt/specsurvey_renovate-index.php
+++ b/wms/mkt/specsurvey_renovate-index.php
@@ -7,7 +7,8 @@ $data = array();
 $sql_cmd = sql_myself($user_id, "s.creater");
 if ($user_id == "M0060") $sql_cmd = "";
 $sql2 = (empty($sql_cmd)) ? "where" : "and";
-$sql2 .= " s.mid = p.id and p.ekind = '汰改'";
+$sql2 .= " s.mid = p.id and p.ekind = '汰改' ";
+$sql2 .= "and (s.mid, s.pr_item_id, s.sub_item_id, s.version) in (select s.mid, s.pr_item_id, s.sub_item_id, max(s.version) from specsurvey_main s, pricereview_main p where s.mid = p.id group by s.mid, s.pr_item_id, s.sub_item_id)";
 $sql = "select s.* from specsurvey_main s, pricereview_main p $sql_cmd $sql2 order by s.id";
 // 用mysqli_query方法執行(sql語法)將結果存在變數中
 $data = mysqli_query($link, $sql);
@@ -125,7 +126,7 @@ $(function () {
             <td><?php echo $class_arr[$data['class']]; ?></td>
             <td><?php echo $data['creater']; ?></td>
             <td><?php echo $data['create_at']; ?></td>
-            <td><a href="specsurvey_renovate-view.php?pa=<?php echo $data['mid'].",".$data['pr_item_id'],",".$data['version']; ?>&function=specsurvey_renovate&<?php echo $token_link; ?>" class="btn btn-warning btn-sm">檢視</a></td>
+            <td><a href="specsurvey_renovate-view.php?pa=<?php echo $data['mid'].",".$data['pr_item_id'],",".$data['version'].",".$data['sub_item_id']; ?>&function=specsurvey_renovate&<?php echo $token_link; ?>" class="btn btn-warning btn-sm">檢視</a></td>
             <!--<td>
                 <p>
                     <a href="specsurvey-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
diff --git a/wms/mkt/specsurvey_renovate-view.php b/wms/mkt/specsurvey_renovate-view.php
index 7495e0c7..2745f218 100644
--- a/wms/mkt/specsurvey_renovate-view.php
+++ b/wms/mkt/specsurvey_renovate-view.php
@@ -1,15 +1,18 @@
 <?php
 include "../header.php";
 
-// 價審單序號,電梯項次,版號
+// 價審單序號,電梯項次,版號,子項次
 $pa = explode(",", $_REQUEST["pa"]);
 $prid = $pa[0];
 $item_no = $pa[1];
 $version = (empty($pa[2])) ? "" : $pa[2];
+$sid = (empty($pa[3])) ? "" : $pa[3];
+if (!empty($sid)) $sid = str_replace("@", "','", $sid);
+
 $noheader = (empty($_REQUEST["noheader"])) ? 0 : 1;
 
-if (empty($version)) $sql = "select mid, pr_item_id, max(version) from specsurvey_main where mid = '$prid' and pr_item_id = '$item_no'";
-else $sql = "select mid, pr_item_id, version from specsurvey_main where mid = '$prid' and pr_item_id = '$item_no' and version = '$version'";
+if (empty($version)) $sql = "select mid, pr_item_id, sub_item_id, max(version) from specsurvey_main where mid = '$prid' and pr_item_id = '$item_no' and sub_item_id in ('$sid') group by mid, pr_item_id, sub_item_id";
+else $sql = "select mid, pr_item_id, sub_item_id, version from specsurvey_main where mid = '$prid' and pr_item_id = '$item_no' and version = '$version' and sub_item_id in ('$sid')";
 
 if ($noheader) {
 ?>
@@ -19,7 +22,7 @@ if ($noheader) {
 <?php
 }
 $data = array();
-$db_query = "select * from specsurvey_main where (mid, pr_item_id, version) in ($sql)";
+$db_query = "select * from specsurvey_main where (mid, pr_item_id, sub_item_id, version) in ($sql)";
 $res = mysqli_query($link, $db_query);
 if (0 == $res->num_rows) {
     //echo '<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button><h4 class="modal-title">Modal title</h4></div><div class="modal-body">';