From d17d7cf2d0649774527d2e0bc3b387004c4319ec Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Wed, 24 Jan 2024 14:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=83=B9=E5=AF=A9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=89=E9=88=95(=E7=B5=90=E6=A1=88=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E3=80=81=E4=B8=8D=E5=90=8C=E6=84=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/contract-repair/api/putContractData.php   | 85 ++++++++++---------
 wms/contract-repair/contract-repair-input.php |  1 +
 .../contract-repair-management.php            |  2 +-
 wms/mkt/pricereview-index.php                 | 60 ++++++++++---
 4 files changed, 91 insertions(+), 57 deletions(-)

diff --git a/wms/contract-repair/api/putContractData.php b/wms/contract-repair/api/putContractData.php
index 1b960e02..05417f59 100644
--- a/wms/contract-repair/api/putContractData.php
+++ b/wms/contract-repair/api/putContractData.php
@@ -56,7 +56,7 @@ if (isset($_POST['contracttype']) && $_POST['contracttype'] == 'r' && isset($_PO
         // echo json_encode($sql);
         // exit;
         $stmt->execute();
-        t8Insert($_POST);
+        // t8Insert($_POST);
         // header("HTTP/1.1 204 NO Content");
 
         $conn->commit();
@@ -67,49 +67,50 @@ if (isset($_POST['contracttype']) && $_POST['contracttype'] == 'r' && isset($_PO
     }
 }
 
-function t8Insert($data)
-{
-    require_once('../../contract/connt8.php');
-    $create_date = date('Y-m-dH-i-s');
-    $repair_no = !empty($data['repair_no']) ? $data['repair_no'] : null; // 報價單號
-    $company = !empty($data['company']) ? $data['company'] : null; //立約人
-    $repaireid = !empty($data['repaireid']) ? $data['repaireid'] : null; //維保人員
-    $facilityno = !empty($data['facilityno']) ? $data['facilityno'] : null; // 電梯編號
-    $type = !empty($data['type']) ? $data['type'] : null; //工程進度
-    $sign_date = !empty($data['sign_date']) ? $data['sign_date'] : null; //簽訂時間
-    $invoice = !empty($data['invoice']) ? $data['invoice'] : null; // 發票抬頭
-    $taxid = !empty($data['taxid']) ? $data['taxid'] : null; //統編
-    $address = !empty($data['address']) ? $data['address'] : null; //工程地址
-    $contract_status = !empty($data['contract_status']) ? $data['contract_status'] : null;
-    $user_id = !empty($_data['user_id']) ? $data['user_id'] : null;
+// 塞保養合約進T8的 API function
+// function t8Insert($data)
+// {
+//     require_once('../../contract/connt8.php');
+//     $create_date = date('Y-m-dH-i-s');
+//     $repair_no = !empty($data['repair_no']) ? $data['repair_no'] : null; // 報價單號
+//     $company = !empty($data['company']) ? $data['company'] : null; //立約人
+//     $repaireid = !empty($data['repaireid']) ? $data['repaireid'] : null; //維保人員
+//     $facilityno = !empty($data['facilityno']) ? $data['facilityno'] : null; // 電梯編號
+//     $type = !empty($data['type']) ? $data['type'] : null; //工程進度
+//     $sign_date = !empty($data['sign_date']) ? $data['sign_date'] : null; //簽訂時間
+//     $invoice = !empty($data['invoice']) ? $data['invoice'] : null; // 發票抬頭
+//     $taxid = !empty($data['taxid']) ? $data['taxid'] : null; //統編
+//     $address = !empty($data['address']) ? $data['address'] : null; //工程地址
+//     $contract_status = !empty($data['contract_status']) ? $data['contract_status'] : null;
+//     $user_id = !empty($_data['user_id']) ? $data['user_id'] : null;
 
-    $sign = str_replace("-", '', $sign_date);
-    $create = str_replace('-', '', $create_date);
+//     $sign = str_replace("-", '', $sign_date);
+//     $create = str_replace('-', '', $create_date);
 
-    $sql = "INSERT INTO comBusinessPartner
-    (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,BizToDate,TaxNo,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId)
-    VALUES(:BizPartnerId,:BizPartnerName,1,'TW',99999999,:TaxNo,:ContactAddress,:CreatorId,:CreateTime,'10')";
-    $stmt = $connT8->prepare($sql);
-    $stmt->bindParam(':BizPartnerId', $repair_no); //報價單編號
-    $stmt->bindParam(':BizPartnerName', $company);
-    $stmt->bindParam(':TaxNo', $taxid);
-    $stmt->bindParam(':ContactAddress', $address);
-    $stmt->bindParam(':CreatorId', $user_id);
-    $stmt->bindParam(':CreateTime', $create);
-    $stmt->execute();
+//     $sql = "INSERT INTO comBusinessPartner
+//     (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,BizToDate,TaxNo,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId)
+//     VALUES(:BizPartnerId,:BizPartnerName,1,'TW',99999999,:TaxNo,:ContactAddress,:CreatorId,:CreateTime,'10')";
+//     $stmt = $connT8->prepare($sql);
+//     $stmt->bindParam(':BizPartnerId', $repair_no); //報價單編號
+//     $stmt->bindParam(':BizPartnerName', $company);
+//     $stmt->bindParam(':TaxNo', $taxid);
+//     $stmt->bindParam(':ContactAddress', $address);
+//     $stmt->bindParam(':CreatorId', $user_id);
+//     $stmt->bindParam(':CreateTime', $create);
+//     $stmt->execute();
 
-    $sql = "INSERT INTO comCustomer
-    (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime)
-    VALUES('1000','10','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime)";
-    $stmt = $connT8->prepare($sql);
-    $stmt->bindParam(':BizPartnerId', $repair_no);
-    $stmt->bindParam(':PersonId', $salesman);
-    $stmt->bindParam(':CreatorId', $user_id);
-    $stmt->bindParam(':InvoiceAddress', $address);
-    $stmt->bindParam(':CreateTime', $create);
-    $stmt->execute();
+//     $sql = "INSERT INTO comCustomer
+//     (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime)
+//     VALUES('1000','10','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime)";
+//     $stmt = $connT8->prepare($sql);
+//     $stmt->bindParam(':BizPartnerId', $repair_no);
+//     $stmt->bindParam(':PersonId', $salesman);
+//     $stmt->bindParam(':CreatorId', $user_id);
+//     $stmt->bindParam(':InvoiceAddress', $address);
+//     $stmt->bindParam(':CreateTime', $create);
+//     $stmt->execute();
 
-    $sql = "INSERT INTO ";
+//     $sql = "INSERT INTO ";
 
-    $connT8->commit();
-}
+//     $connT8->commit();
+// }
diff --git a/wms/contract-repair/contract-repair-input.php b/wms/contract-repair/contract-repair-input.php
index 525e7ab3..67c069e4 100644
--- a/wms/contract-repair/contract-repair-input.php
+++ b/wms/contract-repair/contract-repair-input.php
@@ -78,6 +78,7 @@ $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修
                                 <input type="text" x-model="data.company" />
                                 <p class="alerttext" x-show="data.company==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
+
                             <td style="vertical-align: middle">維保人員</td>
                             <td style="vertical-align: middle">
                                 <select class="repaireid" id="repaireid" x-model="data.repairerid">
diff --git a/wms/contract-repair/contract-repair-management.php b/wms/contract-repair/contract-repair-management.php
index 8aed456e..92283545 100644
--- a/wms/contract-repair/contract-repair-management.php
+++ b/wms/contract-repair/contract-repair-management.php
@@ -64,7 +64,7 @@ $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 echo '修理完成';
                             }
                             ?></th>
-                        <td><?php echo $contract['create_user'] ?></td>
+                        <td><?php echo $contract['create_userid'] ?></td>
                         <td><?php echo $contract['create_date'] ?></td>
                         <td style="width:30px">
                             <p>
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index df5394a7..677038fa 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -57,13 +57,9 @@ if (!empty($_GET['system_id']) && !empty($_GET['flow_id'])) {
             $id[] =  $test;
         }
     }
-
-
     $inClause = implode(',', $id);
-    // echo '<pre>';
-    // print_r($inClause);
-    // echo '</pre>';
 }
+// 查看已經簽核的單號。
 if (!empty($_GET['check']) && $_GET['check'] == '1') {
     if ($user_id == 'M0026' || $user_id == 'M0033') {
         $sign = "sign1";
@@ -77,6 +73,14 @@ if (!empty($_GET['check']) && $_GET['check'] == '1') {
         $sign = "sign3";
         $clause = "sign3 like '%$user_id%' ";
     }
+    if (empty($sign)) {
+        echo "
+        <script> 
+        alert('沒有該單號');
+        window.history.back(); 
+        </script>
+        ";
+    }
     $sql = "SELECT mid,$sign FROM pricereview_sign WHERE $clause ORDER BY mid";
 
     $stmt = $conn->prepare($sql);
@@ -85,15 +89,11 @@ if (!empty($_GET['check']) && $_GET['check'] == '1') {
 
     foreach ($results as $result) {
         if (strlen($result[$sign]) > 30 && $sign == 'sign2') {
-            // echo "<pre>";
-            // print_r(($result[$sign]));
-            // echo '</pre>';
-
-            $id[] = $result['mid'];
-        }
-        if (strlen($result[$sign]) != 7 && $sign != 'sign2') {
-            echo '123';
             $id[] = $result['mid'];
+        } else {
+            if (strlen($result[$sign]) != 7 && $sign != 'sign2') {
+                $id[] = $result['mid'];
+            }
         }
     }
     $inClause = implode(',', $id);
@@ -115,7 +115,7 @@ if ($user_id == "M0060") {
 if (empty($sql_cmd)) $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 else $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on  contract_new_apply.mid = pricereview_main.id $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 
-if (!empty($res_get) || !empty($_GET['check'])) {
+if (!empty($res_get)) {
     $sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress 
     from pricereview_main 
     left join contract_new_apply on  contract_new_apply.mid = pricereview_main.id 
@@ -125,6 +125,35 @@ if (!empty($res_get) || !empty($_GET['check'])) {
 }
 $data = mysqli_query($link, $sql);
 
+// 若結案不同意
+if (!empty($_GET['check']) && $_GET['check'] == 2) {
+    foreach ($data as $data) {
+        if ($data['status'] == 'YY') {
+            $agree[] = $data['id'];
+        }
+    }
+    $inClause = implode(',', $agree);
+    $sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress 
+    from pricereview_main 
+    left join contract_new_apply on  contract_new_apply.mid = pricereview_main.id 
+    $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.id IN ($inClause) AND pricereview_main.ekind = '新梯' order by pricereview_main.id";
+    $data = mysqli_query($link, $sql);
+}
+// 若結案同意
+if (!empty($_GET['check']) && $_GET['check'] == 3) {
+    foreach ($data as $data) {
+        if ($data['status'] == 'YN') {
+            $agree[] = $data['id'];
+        }
+    }
+    $inClause = implode(',', $agree);
+    $sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress 
+    from pricereview_main 
+    left join contract_new_apply on  contract_new_apply.mid = pricereview_main.id 
+    $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.id IN ($inClause) AND pricereview_main.ekind = '新梯' order by pricereview_main.id";
+    $data = mysqli_query($link, $sql);
+}
+
 $para = "function_name=pricereview&" . $token_link;
 
 ?>
@@ -310,6 +339,9 @@ if ($data) :
         <a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 所有價審</a>
         <a href="/wms/mkt/pricereview-index.php?system_id=<?= $result[1]['sid'] ?>&flow_id=<?= $result[1]['fid'] ?>&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 待我簽核</a>
         <a href="/wms/mkt/pricereview-index.php?check=1&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 簽核完畢</a>
+        <a href="/wms/mkt/pricereview-index.php?check=2&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 結案同意</a>
+        <a href="/wms/mkt/pricereview-index.php?check=3&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 結案不同意</a>
+
         <table id="table_index" class="table table-striped table-bordered" style="width:100%">
             <thead>
                 <tr>