Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs

wms/T8_APItest.php

@@ -3,13 +3,15 @@ include "T8_Authorization.php";
 echo "ii";
 ?>
 <script>
-  get_Auth();
+  let validation = get_Auth();
-  window.addEventListener('message', function(event) {
+  // window.addEventListener('message', function(event) {
-    if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
+  // console.log('123')
+  // if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
   // if (event.origin === "https://masada.com.tw" && (typeof event.data === "string")) {
-      var validation = event.data;
+  console.log(validation)
-      console.log("event");
+  // var validation = event.data;
-      console.log(validation);
+  // console.log("event");
+  // console.log(validation);
 
   // var corsurl = 'http://cors-anywhere.herokuapp.com/';
   var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
@@ -40,12 +42,12 @@ echo "ii";
       "name": "salIncomeApplyDetail",
       "rows": [{
         "BillNo": "B23100061",
-            "IncomeId": "A40004",
+        "IncomeId": "A40003",
         "TaxId": "ST005",
-            "RowCode": 1,
+        "RowCode": 12,
         "ItemType": "1",
         "SPrice": 10000,
-            "SQuantity": 0,
+        "SQuantity": 1,
         "FromSourceTag": 0,
         "FromBillNo": ""
       }]
@@ -67,6 +69,6 @@ echo "ii";
     }
   };
   jQuery.ajax(obj);
-    }
+  // }
-  })
+  // })
 </script>

wms/T8_Authorization.php

@@ -1,21 +1,23 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <?php
-$now = gmdate("YmdHis");
+$currentTime = time();
-$data = 'admin.' . $now;
+$twoMinutesLater = $currentTime - (2 * 60);
+$now = gmdate("YmdHis", $twoMinutesLater);
+$data = 'M0000.' . $now;
 $sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
 
 ?>
 
 <script>
     function get_Auth() {
-        var api_key = 'B2D6395D2883E26C';
+        var api_key = '964C834F7BF2BB70';
         var validation = "";
         // var corsurl = 'http://cors-anywhere.herokuapp.com/';
         // var apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth';
         var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth'
         headerParam = {
-            UserId: 'admin',
+            UserId: 'M0000',
-            Pwd: 'chi',
+            Pwd: 'M012290493119',
             TimestampUTC: <?= $now ?>,
             Sign: '<?= $sign ?>'
         };
@@ -27,12 +29,15 @@ $sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
             headers: headerParam,
             success: function(res) {
                 validation = res.Data['CHI_Authorization'];
-                console.log("validation：", validation);
+                console.log(validation);
-                window.parent.postMessage(validation, 'http://localhost:3000');
+                // console.log(res);
+                // console.log()
+                // window.parent.postMessage(validation,'http://localhost:3000');
                 // window.parent.postMessage(validation,'https://masada.com.tw');
+                return validation;
             }
         };
         jQuery.ajax(obj);
-
+        // return jQuery.ajax(obj);
     }
 </script>

wms/T8_Authorization_from_bpm.php

@@ -5,16 +5,18 @@ $user_password = "M012290493119";
 
 function get_Auth($user_id = "M0000", $user_password = "M012290493119")
 {
+    $currentTime = time();
+    $twoMinutesLater = $currentTime - (2 * 60);
 
-    $now = gmdate("YmdHis");
+    $now = gmdate("YmdHis", $twoMinutesLater);
     $data = "$user_id." . $now;
     $sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
 
 
-    // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
+    // $apiurl = 'https://erp.masada.com.tw:880/twWebAPI/GetAuth';
     // $apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth';
-    $apiurl = 'http://10.10.145.2:880//twWebAPI/GetAuth';
+    // $apiurl = 'http://10.10.145.2:880//twWebAPI/GetAuth';
-    // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
+    $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
 
     $headerParam = [
         "UserId: $user_id",
@@ -29,15 +31,21 @@ function get_Auth($user_id = "M0000", $user_password = "M012290493119")
     curl_setopt($ch, CURLOPT_HTTPHEADER, $headerParam);
 
     $response = curl_exec($ch);
+    echo $response;
     if ($response === false) {
-        echo 'Curl error: ' . curl_error($ch);
+        echo '123Curl error: ' . curl_error($ch);
     } else {
         // print_r($response);
         // exit;
         $result = json_decode($response, true);
         $validation = $result['Data']['CHI_Authorization'];
+        echo '<pre>';
+        print_r($result);
+        echo '</pre>';
         return $validation;
     }
 
     curl_close($ch);
 }
+// $data = [];
+// get_Auth();

wms/account-receivable-excel.php

@@ -13,6 +13,7 @@ $Bill = json_decode(file_get_contents("php://input"), true);
 $spreadsheet = new Spreadsheet();
 $sheet = $spreadsheet->getActiveSheet();
 // file_put_contents('account-receivable.txt', json_encode($Bill));
+// file_put_contents('account-receivable.txt', json_encode($Bill));
 if ($type == 'facility') {
     $colomnHeader = [
         '作番號', '合約號', '部門', '經理', '營業員', '客戶名稱', '統一編號', '聯絡地址', '抬頭',
@@ -62,7 +63,7 @@ if ($type == 'facility') {
     $sheet->fromArray($colomnHeader, NULL, 'A1');
     $rowIndex = 2;
     foreach ($Bill as $key => $value) {
-        $sheet->fromArray($value, NULL, 'A' . $rowIndex);
+        $sheet->fromArray($value, NULL, 'A' . $rowIndex, true);
         $column = [
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
             'AA', 'AB', 'AC', 'AD', 'AE', 'AF', 'AG', 'AH', 'AI', 'AJ', 'AK', 'AL', 'AM', 'AN', 'AO', 'AP', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AV', 'AW', 'AX', 'AY', 'AZ',

wms/account-receivable-index-ing.php

@@ -103,6 +103,7 @@ if (!(in_array(accountidToDepartId($user_id), array('220', '210')))) {
     $sql_opening .= " OR person_id = '$user_id'";
     $sql .= " WHERE salesid = '$user_id'";
     $sql_contract_budget .= " AND (PersonId = '$user_id'";
+    $sql_contract_budget .= " AND (PersonId = '$user_id'";
     if (count($follower) > 0) {
         $column_str = "('$user_id'" . ",'";
         $column_str .= implode("','", $follower);
@@ -112,16 +113,19 @@ if (!(in_array(accountidToDepartId($user_id), array('220', '210')))) {
         $sql_opening .= " OR person_id IN $column_str)";
         $sql .= " OR salesid IN $column_str ORDER BY contractno";
         $sql_contract_budget .= " OR PersonId IN $column_str ORDER BY BillNo, CU_MaterialId)";
+        $sql_contract_budget .= " OR PersonId IN $column_str ORDER BY BillNo, CU_MaterialId)";
     } else {
         $sql_contract .= ")";
         // $sql_received .= ")";
         $sql_opening .= ")";
         $sql .= " ORDER BY contractno";
         $sql_contract_budget .= ")";
+        $sql_contract_budget .= ")";
     };
 } else {
     $sql .= " ORDER BY contractno";
     $sql_contract_budget .= "ORDER BY BillNo, CU_MaterialId";
+    $sql_contract_budget .= "ORDER BY BillNo, CU_MaterialId";
 }
 
 $contract = $conn->query($sql_contract);
@@ -211,6 +215,7 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo]['facilities'] = "";
         $arrayData[$BillNo]['total_facility_num'] = $arrayData[$BillNo]['delivery_num'] = $arrayData[$BillNo]['check_num'] = $arrayData[$BillNo]['tryrun_num'] = $arrayData[$BillNo]['install_num'] = $arrayData[$BillNo]['arrive_num'] = $arrayData[$BillNo]['second_num'] = $arrayData[$BillNo]['sign_num'] = $arrayData[$BillNo]['receivable_budget'] = 0;
         $arrayData[$BillNo]['total_list'] = $arrayData[$BillNo]['sign_list'] = $arrayData[$BillNo]['second_list'] = $arrayData[$BillNo]['arrive_list'] = $arrayData[$BillNo]['install_list'] = $arrayData[$BillNo]['tryrun_list'] = $arrayData[$BillNo]['check_list'] = $arrayData[$BillNo]['delivery_list'] = $arrayData[$BillNo]['final_list'] = [];
+        $arrayData[$BillNo]['total_list'] = $arrayData[$BillNo]['sign_list'] = $arrayData[$BillNo]['second_list'] = $arrayData[$BillNo]['arrive_list'] = $arrayData[$BillNo]['install_list'] = $arrayData[$BillNo]['tryrun_list'] = $arrayData[$BillNo]['check_list'] = $arrayData[$BillNo]['delivery_list'] = $arrayData[$BillNo]['final_list'] = [];
     }
     if (stristr($PayStage, '二次款') || (stristr($PayStage, '出貨前') && $PayStage != "寶佳出貨前30天") || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60') || stristr($PayStage, '寶佳出貨後10天')) {
         $arrayData[$BillNo]['second'][0] = $PayStage;
@@ -401,6 +406,7 @@ foreach ($wipwhole_array as $wip) {
         if ($arrayData[$wip['contractno']]['sign'][0] == "寶佳出貨前30天") {
             $facility_status = "";
             array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
+            array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
             $today = strtotime(date('Ymd'));
             $contractday = strtotime($arrayData[$wip['contractno']]['sign'][2]);
             $month = collect_month($contractday);
@@ -409,6 +415,7 @@ foreach ($wipwhole_array as $wip) {
             if ($today > $contractday) {
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 $facility_status = $wip['facilityno'] . " (出貨前30天" . $arrayData[$wip['contractno']]['sign'][2] . "已過)  <br>";
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
                 //二次款
@@ -419,6 +426,7 @@ foreach ($wipwhole_array as $wip) {
                 if ($today > $contractday) {
                     $arrayData[$wip['contractno']]['second_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                    array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                     $facility_status = $wip['facilityno'] . " (出貨後10天" . $arrayData[$wip['contractno']]['second'][2] . "已過)  <br>";
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
                     //貨抵工地款
@@ -431,6 +439,7 @@ foreach ($wipwhole_array as $wip) {
                         if ($today > $contractday) {
                             $arrayData[$wip['contractno']]['arrive_num'] += 1;
                             array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                            array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                             $arrayData[$wip['contractno']]['arrive'][2] = strval(date('Y-m-d', $contractday));
                             $facility_status = $wip['facilityno'] . " (貨抵工地後90天" . $arrayData[$wip['contractno']]['arrive'][2] . "已過)  <br>";
                             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -444,6 +453,7 @@ foreach ($wipwhole_array as $wip) {
                                 if ($today > $contractday) {
                                     $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                                     array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
+                                    array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                                     $arrayData[$wip['contractno']]['tryrun'][2] = strval(date('Y-m-d', $contractday));
                                     $facility_status = $wip['facilityno'] . " (試車後90天" . $arrayData[$wip['contractno']]['tryrun'][2] . "已過)  <br>";
                                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -458,6 +468,8 @@ foreach ($wipwhole_array as $wip) {
                                             $arrayData[$wip['contractno']]['delivery_num'] += 1;
                                             array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                                             array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
+                                            array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
+                                            array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                                             $arrayData[$wip['contractno']]['delivery'][2] = strval(date('Y-m-d', $contractday));
                                             $facility_status = $wip['facilityno'] . " (交車後270天" . $arrayData[$wip['contractno']]['delivery'][2] . "已過)  <br>";
                                             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -476,6 +488,7 @@ foreach ($wipwhole_array as $wip) {
         } else {
             $signtime = strtotime($arrayData[$wip['contractno']]['sign'][2]);
             array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
+            array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
             $month = collect_month($signtime);
             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['sign'][6] = $month;
             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['sign'][2] = strval(date('Ymd', $signtime));
@@ -490,14 +503,19 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['delivery_date'] . "已移交)  <br>";
                 $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
 
                 if ($arrayData[$wip['contractno']]['delivery'][0] == "交車後270天") {
                     $estimate_delivery_time = strtotime($wip['delivery_date']);
@@ -507,6 +525,8 @@ foreach ($wipwhole_array as $wip) {
                         $arrayData[$wip['contractno']]['delivery_num'] += 1;
                         array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                         array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
+                        array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
+                        array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                     }
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['delivery'][6] = $month;
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['delivery'][2] = strval(date('Ymd', $arrivetime));
@@ -518,8 +538,11 @@ foreach ($wipwhole_array as $wip) {
                     $arrayData[$wip['contractno']]['delivery_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                     array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
+                    array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
+                    array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                     $arrayData[$wip['contractno']]['check_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
+                    array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
                     $arrayData[$wip['contractno']]['delivery'][2] = strval($wip['delivery_date']);
                     $deliverytime = strtotime($wip['delivery_date']);
                     $month = collect_month($deliverytime);
@@ -591,16 +614,22 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
                 $arrayData[$wip['contractno']]['check_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
                     array_push($arrayData[$wip['contractno']]['check']['min'], strtotime(strval($wip['official_check_date'])));
                     array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
@@ -678,14 +707,19 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['tryrun_end_date'] . "試車完畢)  <br>";
                 $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
                     array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($wip['tryrun_end_date'])));
                     array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($wip['tryrun_end_date'])));
@@ -741,12 +775,16 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
                     $installtime = strtotime($wip['install_end_date']);
                     $month = collect_month($installtime);
@@ -794,10 +832,13 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
 
                 if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
                     $estimate_delivery_time = strtotime($wip['real_arrival_date']);
@@ -827,11 +868,14 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (已達二次款收款條件)  <br>";
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
             } else {
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if ($wip['real_contract_arrival_date'] != NULL) {
                     $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
@@ -870,6 +914,30 @@ foreach ($wipwhole_array as $wip) {
 //     }
 // }
 
+// foreach ($arrayData as $key => $value) {
+//     echo $key."<br>";
+//     print_r($value['total_list']);
+//     echo "   /  總   ";
+//     print_r($value['sign_list']);
+//     echo "    / 訂金  <br>";
+//     print_r($value['arrive_list']);
+//     echo "    / 貨抵  ";
+//     print_r($value['install_list']);
+//     echo "    / 安裝  <br>";
+//     print_r($value['tryrun_list']);
+//     echo "    / 試車  ";
+//     print_r($value['check_list']);
+//     echo "    / 官檢  <br>";
+//     print_r($value['delivery_list']);
+//     echo "    / 移交  ";
+//     print_r($value['final_list']);
+//     echo "   /  結案        <br>";
+//     echo "---------------------------<br>";
+//     foreach($value['sign_list'] as $fac){
+//         echo $fac."=========";
+//     }
+// }
+
 
 // 計算每個合約的應收款、作番總數
 $today_date = new DateTime(date('Y-m-d', strtotime('-1 month', strtotime(date('Y-m-d')))));
@@ -894,6 +962,25 @@ foreach ($arrayData as &$value) {
         $value['final'][3] = $value['final'][1] * $final_ratio;
         $value['receivable_budget'] = $value['sign'][3] + $value['second'][3] + $value['arrive'][3] + $value['install'][3] + $value['tryrun'][3] + $value['check'][3] + $value['delivery'][3] + $value['final'][3];
     }
+    //['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
+        $sign_ratio = get_ratio($value['sign_list'], $value[10], $contract_budget);
+        $value['sign'][3] = $value['sign'][1] * $sign_ratio;
+        $second_ratio = get_ratio($value['second_list'], $value[10], $contract_budget);
+        $value['second'][3] = $value['second'][1] * $second_ratio;
+        $arrive_ratio = get_ratio($value['arrive_list'], $value[10], $contract_budget);
+        $value['arrive'][3] = $value['arrive'][1] * $arrive_ratio;
+        $install_ratio = get_ratio($value['install_list'], $value[10], $contract_budget);
+        $value['install'][3] = $value['install'][1] * $install_ratio;
+        $tryrun_ratio = get_ratio($value['tryrun_list'], $value[10], $contract_budget);
+        $value['tryrun'][3] = $value['tryrun'][1] * $tryrun_ratio;
+        $check_ratio = get_ratio($value['check_list'], $value[10], $contract_budget);
+        $value['check'][3] = $value['check'][1] * $check_ratio;
+        $delivery_ratio = get_ratio($value['delivery_list'], $value[10], $contract_budget);
+        $value['delivery'][3] = $value['delivery'][1] * $delivery_ratio;
+        $final_ratio = get_ratio($value['final_list'], $value[10], $contract_budget);
+        $value['final'][3] = $value['final'][1] * $final_ratio;
+        $value['receivable_budget'] = $value['sign'][3] + $value['second'][3] + $value['arrive'][3] + $value['install'][3] + $value['tryrun'][3] + $value['check'][3] + $value['delivery'][3] + $value['final'][3];
+    }
     //['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
     // 計算每台作番金額與各階段應收金額
     foreach ($value['facility'] as &$val) {
@@ -1262,6 +1349,284 @@ foreach ($arrayData as $key => &$data) {
         $data['final'][7] = 0;
     }
 }
+//['sign'] 0 款項名稱   1 簽約金額   2 簽約日期 3 應收金額 4 已收金額  5 催收金額 6 已開發票金額  7 未開發票金額  min 最早應收月份   max 最晚應收月份   
+foreach ($arrayData as $key => &$data) {
+    $tmp_data = $data['received_budget'];
+    $tmp_invoice = $data['invoice_budget'];
+
+    if ($data['sign'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['sign'][3]) >= 0) {
+                $data['sign'][4] = $data['sign'][3];
+                $tmp_data -= $data['sign'][3];
+            } else {
+                $data['sign'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['sign'][5] = $data['sign'][3] - $data['sign'][4];
+        } else {
+            $data['sign'][4] = 0;
+            $data['sign'][5] = $data['sign'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['sign'][3]) >= 0) {
+                $data['sign'][6] = $data['sign'][3];
+                $tmp_invoice -= $data['sign'][3];
+            } else {
+                $data['sign'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['sign'][7] = $data['sign'][3] - $data['sign'][6];
+        } else {
+            $data['sign'][6] = 0;
+            $data['sign'][7] = $data['sign'][3];
+        }
+    } else {
+        $data['sign'][4] = 0;
+        $data['sign'][5] = 0;
+        $data['sign'][6] = 0;
+        $data['sign'][7] = 0;
+    }
+    if ($data['second'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['second'][3]) >= 0) {
+                $data['second'][4] = $data['second'][3];
+                $tmp_data -= $data['second'][3];
+            } else {
+                $data['second'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['second'][5] = $data['second'][3] - $data['second'][4];
+        } else {
+            $data['second'][4] = 0;
+            $data['second'][5] = $data['second'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['second'][3]) >= 0) {
+                $data['second'][6] = $data['second'][3];
+                $tmp_invoice -= $data['second'][3];
+            } else {
+                $data['second'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['second'][7] = $data['second'][3] - $data['second'][6];
+        } else {
+            $data['second'][6] = 0;
+            $data['second'][7] = $data['second'][3];
+        }
+    } else {
+        $data['second'][4] = 0;
+        $data['second'][5] = 0;
+        $data['second'][6] = 0;
+        $data['second'][7] = 0;
+    }
+
+    if ($data['arrive'][3] > 0) {
+
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['arrive'][1]) >= 0) {
+                $data['arrive'][4] = $data['arrive'][3];
+                $tmp_data -= $data['arrive'][3];
+            } else {
+                $data['arrive'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['arrive'][5] = $data['arrive'][3] - $data['arrive'][4];
+        } else {
+            $data['arrive'][4] = 0;
+            $data['arrive'][5] = $data['arrive'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['arrive'][3]) >= 0) {
+                $data['arrive'][6] = $data['arrive'][3];
+                $tmp_invoice -= $data['arrive'][3];
+            } else {
+                $data['arrive'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['arrive'][7] = $data['arrive'][3] - $data['arrive'][6];
+        } else {
+            $data['arrive'][6] = 0;
+            $data['arrive'][7] = $data['arrive'][3];
+        }
+    } else {
+        $data['arrive'][4] = 0;
+        $data['arrive'][5] = 0;
+        $data['arrive'][6] = 0;
+        $data['arrive'][7] = 0;
+    }
+
+    if ($data['install'][3] > 0) {
+
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['install'][1]) >= 0) {
+                $data['install'][4] = $data['install'][3];
+                $tmp_data -= $data['install'][3];
+            } else {
+                $data['install'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['install'][5] = $data['install'][3] - $data['install'][4];
+        } else {
+            $data['install'][4] = 0;
+            $data['install'][5] = $data['install'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['install'][3]) >= 0) {
+                $data['install'][6] = $data['install'][3];
+                $tmp_invoice -= $data['install'][3];
+            } else {
+                $data['install'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['install'][7] = $data['install'][3] - $data['install'][6];
+        } else {
+            $data['install'][6] = 0;
+            $data['install'][7] = $data['install'][3];
+        }
+    } else {
+        $data['install'][4] = 0;
+        $data['install'][5] = 0;
+        $data['install'][6] = 0;
+        $data['install'][7] = 0;
+    }
+
+
+    if ($data['tryrun'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['tryrun'][1]) >= 0) {
+                $data['tryrun'][4] = $data['tryrun'][3];
+                $tmp_data -= $data['tryrun'][3];
+            } else {
+                $data['tryrun'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['tryrun'][5] = $data['tryrun'][3] - $data['tryrun'][4];
+        } else {
+            $data['tryrun'][4] = 0;
+            $data['tryrun'][5] = $data['tryrun'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['tryrun'][3]) >= 0) {
+                $data['tryrun'][6] = $data['tryrun'][3];
+                $tmp_invoice -= $data['tryrun'][3];
+            } else {
+                $data['tryrun'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['tryrun'][7] = $data['tryrun'][3] - $data['tryrun'][6];
+        } else {
+            $data['tryrun'][6] = 0;
+            $data['tryrun'][7] = $data['tryrun'][3];
+        }
+    } else {
+        $data['tryrun'][4] = 0;
+        $data['tryrun'][5] = 0;
+        $data['tryrun'][6] = 0;
+        $data['tryrun'][7] = 0;
+    }
+
+    if ($data['check'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['check'][1]) >= 0) {
+                $data['check'][4] = $data['check'][3];
+                $tmp_data -= $data['check'][3];
+            } else {
+                $data['check'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['check'][5] = $data['check'][3] - $data['check'][4];
+        } else {
+            $data['check'][4] = 0;
+            $data['check'][5] = $data['check'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['check'][3]) >= 0) {
+                $data['check'][6] = $data['check'][3];
+                $tmp_invoice -= $data['check'][3];
+            } else {
+                $data['check'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['check'][7] = $data['check'][3] - $data['check'][6];
+        } else {
+            $data['check'][6] = 0;
+            $data['check'][7] = $data['check'][3];
+        }
+    } else {
+        $data['check'][4] = 0;
+        $data['check'][5] = 0;
+        $data['check'][6] = 0;
+        $data['check'][7] = 0;
+    }
+    if ($data['delivery'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['delivery'][1]) >= 0) {
+                $data['delivery'][4] = $data['delivery'][3];
+                $tmp_data -= $data['delivery'][3];
+            } else {
+                $data['delivery'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['delivery'][5] = $data['delivery'][3] - $data['delivery'][4];
+        } else {
+            $data['delivery'][4] = 0;
+            $data['delivery'][5] = $data['delivery'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['delivery'][3]) >= 0) {
+                $data['delivery'][6] = $data['delivery'][3];
+                $tmp_invoice -= $data['delivery'][3];
+            } else {
+                $data['delivery'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['delivery'][7] = $data['delivery'][3] - $data['delivery'][6];
+        } else {
+            $data['delivery'][6] = 0;
+            $data['delivery'][7] = $data['delivery'][3];
+        }
+    } else {
+        $data['delivery'][4] = 0;
+        $data['delivery'][5] = 0;
+        $data['delivery'][6] = 0;
+        $data['delivery'][7] = 0;
+    }
+
+    if ($data['final'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['final'][1]) >= 0) {
+                $data['final'][4] = $data['final'][3];
+                $tmp_data -= $data['final'][3];
+            } else {
+                $data['final'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['final'][5] = $data['final'][3] - $data['final'][4];
+        } else {
+            $data['final'][4] = 0;
+            $data['final'][5] = $data['final'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['final'][3]) >= 0) {
+                $data['final'][6] = $data['final'][3];
+                $tmp_invoice -= $data['final'][3];
+            } else {
+                $data['final'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['final'][7] = $data['final'][3] - $data['final'][6];
+        } else {
+            $data['final'][6] = 0;
+            $data['final'][7] = $data['final'][3];
+        }
+    } else {
+        $data['final'][4] = 0;
+        $data['final'][5] = 0;
+        $data['final'][6] = 0;
+        $data['final'][7] = 0;
+    }
+}
 
 //產生excel的array
 $excel_aray = array();
@@ -1289,6 +1654,8 @@ foreach ($arrayData as $key => $value) {
         $value[$i]['min'] = (empty($value[$i]['min']) || is_null($value[$i]['min'])) ? 0 : $value[$i]['min'];
         $value[$i][4] = (isset($value[$i][4])) ? $value[$i][4] : 0;
         $value[$i][5] = (isset($value[$i][5])) ? $value[$i][5] : 0;
+        $value[$i][4] = (isset($value[$i][4])) ? $value[$i][4] : 0;
+        $value[$i][5] = (isset($value[$i][5])) ? $value[$i][5] : 0;
     };
 
     if ($value['sign'][0] == "寶佳出貨前30天") {
@@ -1332,6 +1699,7 @@ foreach ($arrayData as $key => $value) {
         number_format(round($value['A40001'])), number_format(round($value['A40008'])), number_format(round($value['total_budget'])), number_format(round($value['receivable_budget'])), number_format(round($value['invoice_budget'])), number_format(round($value['received_budget'])), $value['total_facility_num'], str_replace('<br>', ';     ', $value['facilities'])
     ];
 
+
     //['sign'] 0 款項名稱   1 簽約金額   2 簽約日期 3 應收金額  min 最早應收月份   max 最晚應收月份 
     //[合約號]['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
     foreach ($value['facility'] as $valkey => $val) {

wms/account-receivable-index.php

@@ -103,6 +103,7 @@ if (!(in_array(accountidToDepartId($user_id), array('220', '210')))) {
     $sql_opening .= " OR person_id = '$user_id'";
     $sql .= " WHERE salesid = '$user_id'";
     $sql_contract_budget .= " AND (PersonId = '$user_id'";
+    $sql_contract_budget .= " AND (PersonId = '$user_id'";
     if (count($follower) > 0) {
         $column_str = "('$user_id'" . ",'";
         $column_str .= implode("','", $follower);
@@ -118,10 +119,13 @@ if (!(in_array(accountidToDepartId($user_id), array('220', '210')))) {
         $sql_opening .= ")";
         $sql .= " ORDER BY contractno";
         $sql_contract_budget .= ")";
+        $sql_contract_budget .= ")";
     };
+} else {
 } else {
     $sql .= " ORDER BY contractno";
     $sql_contract_budget .= "ORDER BY BillNo, CU_MaterialId";
+    $sql_contract_budget .= "ORDER BY BillNo, CU_MaterialId";
 }
 
 $contract = $conn->query($sql_contract);
@@ -211,6 +215,7 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo]['facilities'] = "";
         $arrayData[$BillNo]['total_facility_num'] = $arrayData[$BillNo]['delivery_num'] = $arrayData[$BillNo]['check_num'] = $arrayData[$BillNo]['tryrun_num'] = $arrayData[$BillNo]['install_num'] = $arrayData[$BillNo]['arrive_num'] = $arrayData[$BillNo]['second_num'] = $arrayData[$BillNo]['sign_num'] = $arrayData[$BillNo]['receivable_budget'] = 0;
         $arrayData[$BillNo]['total_list'] = $arrayData[$BillNo]['sign_list'] = $arrayData[$BillNo]['second_list'] = $arrayData[$BillNo]['arrive_list'] = $arrayData[$BillNo]['install_list'] = $arrayData[$BillNo]['tryrun_list'] = $arrayData[$BillNo]['check_list'] = $arrayData[$BillNo]['delivery_list'] = $arrayData[$BillNo]['final_list'] = [];
+        $arrayData[$BillNo]['total_list'] = $arrayData[$BillNo]['sign_list'] = $arrayData[$BillNo]['second_list'] = $arrayData[$BillNo]['arrive_list'] = $arrayData[$BillNo]['install_list'] = $arrayData[$BillNo]['tryrun_list'] = $arrayData[$BillNo]['check_list'] = $arrayData[$BillNo]['delivery_list'] = $arrayData[$BillNo]['final_list'] = [];
     }
     if (stristr($PayStage, '二次款') || (stristr($PayStage, '出貨前') && $PayStage != "寶佳出貨前30天") || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60') || stristr($PayStage, '寶佳出貨後10天')) {
         $arrayData[$BillNo]['second'][0] = $PayStage;
@@ -401,6 +406,7 @@ foreach ($wipwhole_array as $wip) {
         if ($arrayData[$wip['contractno']]['sign'][0] == "寶佳出貨前30天") {
             $facility_status = "";
             array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
+            array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
             $today = strtotime(date('Ymd'));
             $contractday = strtotime($arrayData[$wip['contractno']]['sign'][2]);
             $month = collect_month($contractday);
@@ -409,6 +415,7 @@ foreach ($wipwhole_array as $wip) {
             if ($today > $contractday) {
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 $facility_status = $wip['facilityno'] . " (出貨前30天" . $arrayData[$wip['contractno']]['sign'][2] . "已過)  <br>";
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
                 //二次款
@@ -419,6 +426,7 @@ foreach ($wipwhole_array as $wip) {
                 if ($today > $contractday) {
                     $arrayData[$wip['contractno']]['second_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                    array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                     $facility_status = $wip['facilityno'] . " (出貨後10天" . $arrayData[$wip['contractno']]['second'][2] . "已過)  <br>";
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
                     //貨抵工地款
@@ -431,6 +439,7 @@ foreach ($wipwhole_array as $wip) {
                         if ($today > $contractday) {
                             $arrayData[$wip['contractno']]['arrive_num'] += 1;
                             array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                            array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                             $arrayData[$wip['contractno']]['arrive'][2] = strval(date('Y-m-d', $contractday));
                             $facility_status = $wip['facilityno'] . " (貨抵工地後90天" . $arrayData[$wip['contractno']]['arrive'][2] . "已過)  <br>";
                             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -444,6 +453,7 @@ foreach ($wipwhole_array as $wip) {
                                 if ($today > $contractday) {
                                     $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                                     array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
+                                    array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                                     $arrayData[$wip['contractno']]['tryrun'][2] = strval(date('Y-m-d', $contractday));
                                     $facility_status = $wip['facilityno'] . " (試車後90天" . $arrayData[$wip['contractno']]['tryrun'][2] . "已過)  <br>";
                                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -458,6 +468,8 @@ foreach ($wipwhole_array as $wip) {
                                             $arrayData[$wip['contractno']]['delivery_num'] += 1;
                                             array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                                             array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
+                                            array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
+                                            array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                                             $arrayData[$wip['contractno']]['delivery'][2] = strval(date('Y-m-d', $contractday));
                                             $facility_status = $wip['facilityno'] . " (交車後270天" . $arrayData[$wip['contractno']]['delivery'][2] . "已過)  <br>";
                                             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -476,6 +488,7 @@ foreach ($wipwhole_array as $wip) {
         } else {
             $signtime = strtotime($arrayData[$wip['contractno']]['sign'][2]);
             array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
+            array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
             $month = collect_month($signtime);
             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['sign'][6] = $month;
             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['sign'][2] = strval(date('Ymd', $signtime));
@@ -490,14 +503,19 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['delivery_date'] . "已移交)  <br>";
                 $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
 
                 if ($arrayData[$wip['contractno']]['delivery'][0] == "交車後270天") {
                     $estimate_delivery_time = strtotime($wip['delivery_date']);
@@ -507,6 +525,8 @@ foreach ($wipwhole_array as $wip) {
                         $arrayData[$wip['contractno']]['delivery_num'] += 1;
                         array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                         array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
+                        array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
+                        array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                     }
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['delivery'][6] = $month;
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['delivery'][2] = strval(date('Ymd', $arrivetime));
@@ -518,8 +538,11 @@ foreach ($wipwhole_array as $wip) {
                     $arrayData[$wip['contractno']]['delivery_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                     array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
+                    array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
+                    array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                     $arrayData[$wip['contractno']]['check_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
+                    array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
                     $arrayData[$wip['contractno']]['delivery'][2] = strval($wip['delivery_date']);
                     $deliverytime = strtotime($wip['delivery_date']);
                     $month = collect_month($deliverytime);
@@ -591,16 +614,22 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
                 $arrayData[$wip['contractno']]['check_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
                     array_push($arrayData[$wip['contractno']]['check']['min'], strtotime(strval($wip['official_check_date'])));
                     array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
@@ -741,12 +770,16 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
                     $installtime = strtotime($wip['install_end_date']);
                     $month = collect_month($installtime);
@@ -794,10 +827,13 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
 
                 if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
                     $estimate_delivery_time = strtotime($wip['real_arrival_date']);
@@ -827,11 +863,14 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (已達二次款收款條件)  <br>";
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
             } else {
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
+                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if ($wip['real_contract_arrival_date'] != NULL) {
                     $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
@@ -870,6 +909,30 @@ foreach ($wipwhole_array as $wip) {
 //     }
 // }
 
+// foreach ($arrayData as $key => $value) {
+//     echo $key."<br>";
+//     print_r($value['total_list']);
+//     echo "   /  總   ";
+//     print_r($value['sign_list']);
+//     echo "    / 訂金  <br>";
+//     print_r($value['arrive_list']);
+//     echo "    / 貨抵  ";
+//     print_r($value['install_list']);
+//     echo "    / 安裝  <br>";
+//     print_r($value['tryrun_list']);
+//     echo "    / 試車  ";
+//     print_r($value['check_list']);
+//     echo "    / 官檢  <br>";
+//     print_r($value['delivery_list']);
+//     echo "    / 移交  ";
+//     print_r($value['final_list']);
+//     echo "   /  結案        <br>";
+//     echo "---------------------------<br>";
+//     foreach($value['sign_list'] as $fac){
+//         echo $fac."=========";
+//     }
+// }
+
 
 // 計算每個合約的應收款、作番總數
 $today_date = new DateTime(date('Y-m-d', strtotime('-1 month', strtotime(date('Y-m-d')))));
@@ -894,6 +957,25 @@ foreach ($arrayData as &$value) {
         $value['final'][3] = $value['final'][1] * $final_ratio;
         $value['receivable_budget'] = $value['sign'][3] + $value['second'][3] + $value['arrive'][3] + $value['install'][3] + $value['tryrun'][3] + $value['check'][3] + $value['delivery'][3] + $value['final'][3];
     }
+    //['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
+        $sign_ratio = get_ratio($value['sign_list'], $value[10], $contract_budget);
+        $value['sign'][3] = $value['sign'][1] * $sign_ratio;
+        $second_ratio = get_ratio($value['second_list'], $value[10], $contract_budget);
+        $value['second'][3] = $value['second'][1] * $second_ratio;
+        $arrive_ratio = get_ratio($value['arrive_list'], $value[10], $contract_budget);
+        $value['arrive'][3] = $value['arrive'][1] * $arrive_ratio;
+        $install_ratio = get_ratio($value['install_list'], $value[10], $contract_budget);
+        $value['install'][3] = $value['install'][1] * $install_ratio;
+        $tryrun_ratio = get_ratio($value['tryrun_list'], $value[10], $contract_budget);
+        $value['tryrun'][3] = $value['tryrun'][1] * $tryrun_ratio;
+        $check_ratio = get_ratio($value['check_list'], $value[10], $contract_budget);
+        $value['check'][3] = $value['check'][1] * $check_ratio;
+        $delivery_ratio = get_ratio($value['delivery_list'], $value[10], $contract_budget);
+        $value['delivery'][3] = $value['delivery'][1] * $delivery_ratio;
+        $final_ratio = get_ratio($value['final_list'], $value[10], $contract_budget);
+        $value['final'][3] = $value['final'][1] * $final_ratio;
+        $value['receivable_budget'] = $value['sign'][3] + $value['second'][3] + $value['arrive'][3] + $value['install'][3] + $value['tryrun'][3] + $value['check'][3] + $value['delivery'][3] + $value['final'][3];
+    }
     //['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
     // 計算每台作番金額與各階段應收金額
     foreach ($value['facility'] as &$val) {
@@ -1262,6 +1344,284 @@ foreach ($arrayData as $key => &$data) {
         $data['final'][7] = 0;
     }
 }
+//['sign'] 0 款項名稱   1 簽約金額   2 簽約日期 3 應收金額 4 已收金額  5 催收金額 6 已開發票金額  7 未開發票金額  min 最早應收月份   max 最晚應收月份   
+foreach ($arrayData as $key => &$data) {
+    $tmp_data = $data['received_budget'];
+    $tmp_invoice = $data['invoice_budget'];
+
+    if ($data['sign'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['sign'][3]) >= 0) {
+                $data['sign'][4] = $data['sign'][3];
+                $tmp_data -= $data['sign'][3];
+            } else {
+                $data['sign'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['sign'][5] = $data['sign'][3] - $data['sign'][4];
+        } else {
+            $data['sign'][4] = 0;
+            $data['sign'][5] = $data['sign'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['sign'][3]) >= 0) {
+                $data['sign'][6] = $data['sign'][3];
+                $tmp_invoice -= $data['sign'][3];
+            } else {
+                $data['sign'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['sign'][7] = $data['sign'][3] - $data['sign'][6];
+        } else {
+            $data['sign'][6] = 0;
+            $data['sign'][7] = $data['sign'][3];
+        }
+    } else {
+        $data['sign'][4] = 0;
+        $data['sign'][5] = 0;
+        $data['sign'][6] = 0;
+        $data['sign'][7] = 0;
+    }
+    if ($data['second'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['second'][3]) >= 0) {
+                $data['second'][4] = $data['second'][3];
+                $tmp_data -= $data['second'][3];
+            } else {
+                $data['second'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['second'][5] = $data['second'][3] - $data['second'][4];
+        } else {
+            $data['second'][4] = 0;
+            $data['second'][5] = $data['second'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['second'][3]) >= 0) {
+                $data['second'][6] = $data['second'][3];
+                $tmp_invoice -= $data['second'][3];
+            } else {
+                $data['second'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['second'][7] = $data['second'][3] - $data['second'][6];
+        } else {
+            $data['second'][6] = 0;
+            $data['second'][7] = $data['second'][3];
+        }
+    } else {
+        $data['second'][4] = 0;
+        $data['second'][5] = 0;
+        $data['second'][6] = 0;
+        $data['second'][7] = 0;
+    }
+
+    if ($data['arrive'][3] > 0) {
+
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['arrive'][1]) >= 0) {
+                $data['arrive'][4] = $data['arrive'][3];
+                $tmp_data -= $data['arrive'][3];
+            } else {
+                $data['arrive'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['arrive'][5] = $data['arrive'][3] - $data['arrive'][4];
+        } else {
+            $data['arrive'][4] = 0;
+            $data['arrive'][5] = $data['arrive'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['arrive'][3]) >= 0) {
+                $data['arrive'][6] = $data['arrive'][3];
+                $tmp_invoice -= $data['arrive'][3];
+            } else {
+                $data['arrive'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['arrive'][7] = $data['arrive'][3] - $data['arrive'][6];
+        } else {
+            $data['arrive'][6] = 0;
+            $data['arrive'][7] = $data['arrive'][3];
+        }
+    } else {
+        $data['arrive'][4] = 0;
+        $data['arrive'][5] = 0;
+        $data['arrive'][6] = 0;
+        $data['arrive'][7] = 0;
+    }
+
+    if ($data['install'][3] > 0) {
+
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['install'][1]) >= 0) {
+                $data['install'][4] = $data['install'][3];
+                $tmp_data -= $data['install'][3];
+            } else {
+                $data['install'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['install'][5] = $data['install'][3] - $data['install'][4];
+        } else {
+            $data['install'][4] = 0;
+            $data['install'][5] = $data['install'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['install'][3]) >= 0) {
+                $data['install'][6] = $data['install'][3];
+                $tmp_invoice -= $data['install'][3];
+            } else {
+                $data['install'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['install'][7] = $data['install'][3] - $data['install'][6];
+        } else {
+            $data['install'][6] = 0;
+            $data['install'][7] = $data['install'][3];
+        }
+    } else {
+        $data['install'][4] = 0;
+        $data['install'][5] = 0;
+        $data['install'][6] = 0;
+        $data['install'][7] = 0;
+    }
+
+
+    if ($data['tryrun'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['tryrun'][1]) >= 0) {
+                $data['tryrun'][4] = $data['tryrun'][3];
+                $tmp_data -= $data['tryrun'][3];
+            } else {
+                $data['tryrun'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['tryrun'][5] = $data['tryrun'][3] - $data['tryrun'][4];
+        } else {
+            $data['tryrun'][4] = 0;
+            $data['tryrun'][5] = $data['tryrun'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['tryrun'][3]) >= 0) {
+                $data['tryrun'][6] = $data['tryrun'][3];
+                $tmp_invoice -= $data['tryrun'][3];
+            } else {
+                $data['tryrun'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['tryrun'][7] = $data['tryrun'][3] - $data['tryrun'][6];
+        } else {
+            $data['tryrun'][6] = 0;
+            $data['tryrun'][7] = $data['tryrun'][3];
+        }
+    } else {
+        $data['tryrun'][4] = 0;
+        $data['tryrun'][5] = 0;
+        $data['tryrun'][6] = 0;
+        $data['tryrun'][7] = 0;
+    }
+
+    if ($data['check'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['check'][1]) >= 0) {
+                $data['check'][4] = $data['check'][3];
+                $tmp_data -= $data['check'][3];
+            } else {
+                $data['check'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['check'][5] = $data['check'][3] - $data['check'][4];
+        } else {
+            $data['check'][4] = 0;
+            $data['check'][5] = $data['check'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['check'][3]) >= 0) {
+                $data['check'][6] = $data['check'][3];
+                $tmp_invoice -= $data['check'][3];
+            } else {
+                $data['check'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['check'][7] = $data['check'][3] - $data['check'][6];
+        } else {
+            $data['check'][6] = 0;
+            $data['check'][7] = $data['check'][3];
+        }
+    } else {
+        $data['check'][4] = 0;
+        $data['check'][5] = 0;
+        $data['check'][6] = 0;
+        $data['check'][7] = 0;
+    }
+    if ($data['delivery'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['delivery'][1]) >= 0) {
+                $data['delivery'][4] = $data['delivery'][3];
+                $tmp_data -= $data['delivery'][3];
+            } else {
+                $data['delivery'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['delivery'][5] = $data['delivery'][3] - $data['delivery'][4];
+        } else {
+            $data['delivery'][4] = 0;
+            $data['delivery'][5] = $data['delivery'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['delivery'][3]) >= 0) {
+                $data['delivery'][6] = $data['delivery'][3];
+                $tmp_invoice -= $data['delivery'][3];
+            } else {
+                $data['delivery'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['delivery'][7] = $data['delivery'][3] - $data['delivery'][6];
+        } else {
+            $data['delivery'][6] = 0;
+            $data['delivery'][7] = $data['delivery'][3];
+        }
+    } else {
+        $data['delivery'][4] = 0;
+        $data['delivery'][5] = 0;
+        $data['delivery'][6] = 0;
+        $data['delivery'][7] = 0;
+    }
+
+    if ($data['final'][3] > 0) {
+        if ($tmp_data > 0) {
+            if (($tmp_data - $data['final'][1]) >= 0) {
+                $data['final'][4] = $data['final'][3];
+                $tmp_data -= $data['final'][3];
+            } else {
+                $data['final'][4] = $tmp_data;
+                $tmp_data = 0;
+            }
+            $data['final'][5] = $data['final'][3] - $data['final'][4];
+        } else {
+            $data['final'][4] = 0;
+            $data['final'][5] = $data['final'][3];
+        }
+        if ($tmp_invoice > 0) {
+            if (($tmp_invoice - $data['final'][3]) >= 0) {
+                $data['final'][6] = $data['final'][3];
+                $tmp_invoice -= $data['final'][3];
+            } else {
+                $data['final'][6] = $tmp_invoice;
+                $tmp_invoice = 0;
+            }
+            $data['final'][7] = $data['final'][3] - $data['final'][6];
+        } else {
+            $data['final'][6] = 0;
+            $data['final'][7] = $data['final'][3];
+        }
+    } else {
+        $data['final'][4] = 0;
+        $data['final'][5] = 0;
+        $data['final'][6] = 0;
+        $data['final'][7] = 0;
+    }
+}
 
 //產生excel的array
 $excel_aray = array();
@@ -1332,6 +1692,7 @@ foreach ($arrayData as $key => $value) {
         number_format(round($value['A40001'])), number_format(round($value['A40008'])), number_format(round($value['total_budget'])), number_format(round($value['receivable_budget'])), number_format(round($value['invoice_budget'])), number_format(round($value['received_budget'])), $value['total_facility_num'], str_replace('<br>', ';     ', $value['facilities'])
     ];
 
+
     //['sign'] 0 款項名稱   1 簽約金額   2 簽約日期 3 應收金額  min 最早應收月份   max 最晚應收月份 
     //[合約號]['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
     foreach ($value['facility'] as $valkey => $val) {
@@ -1389,6 +1750,7 @@ $average_A40001 = round($sum_A40001 / $sum_facility, 2);
 $average_A40008 = round($sum_A40008 / $sum_facility, 2);
 $average_budget = round($sum_total_budget / $sum_facility, 2);
 
+$total_data = json_encode($excel_aray);
 $total_data = json_encode($excel_aray);
 $boga_data = json_encode($boga_array);
 $exclude_boga_data = json_encode($exclude_boga_array);
@@ -1448,6 +1810,7 @@ $facility_exclude_boga_data = json_encode($facility_exclude_boga_array);
         <button type="button" style="width: 12%;" onclick="downloadFacilityData('ExcludeData')" class="btn btn-info btn-md">不含寶佳作番收款明細<span class="glyphicon glyphicon-download-alt"></span></button>
         <button type="button" style="width: 12%;" onclick="downloadFacilityData('BogaData')" class="btn btn-warning btn-md">寶佳作番收款明細<span class="glyphicon glyphicon-download-alt"></span></button>
 
+
     </div>
 </div>
 
@@ -1642,11 +2005,13 @@ include "./footer.php";
         }
         xhr.send(JSON.stringify({
             Bill: <?= $total_data ?>
+            Bill: <?= $total_data ?>
         }));
 
     }
 
     function bogaData() {
+        console.log(<?= $boga_data ?>);
         var xhr = new XMLHttpRequest();
         var url = window.location.origin + "/wms/account-receivable-excel.php?type=boga&<?= $token_link ?>";
         xhr.open('POST', url, true);
@@ -1675,9 +2040,11 @@ include "./footer.php";
         if (content == 'AllData') {
             var BillData = <?= $facility_data ?>;
             var filename = "作番應收帳款" + "<?= date('Y-m-d-Hm') ?>" + ".xlsx";
+        } else if (content == 'ExcludeData') {
         } else if (content == 'ExcludeData') {
             var BillData = <?= $facility_exclude_boga_data ?>;
             var filename = "不含寶佳作番應收帳款" + "<?= date('Y-m-d-Hm') ?>" + ".xlsx";
+        } else if (content == 'BogaData') {
         } else if (content == 'BogaData') {
             var BillData = <?= $facility_boga_data ?>;
             var filename = "寶佳作番應收帳款" + "<?= date('Y-m-d-Hm') ?>" + ".xlsx";

wms/cont/sign_list.php

@@ -3,34 +3,77 @@ require_once "../header.php";
 // 載入db.php來連結資料庫
 
 $table = 'con_maintance_examine_apply';
-$para = "function_name=pricereview&" . $token_link;
+// 待我簽核進入
+if (!empty($_GET['system_id']) && !empty($_GET['flow_id'])) {
+    $system_id =  $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['system_id'] :  @$_POST['system_id'];
+    $where_system_id =  " and   a.system_id  like '" .  $system_id . "%'";
+
+    $flow_id =  $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['flow_id'] :  @$_POST['flow_id'];
+    $where_flow_id =  " and   b.flow_id  like '" .  $flow_id . "%'";
+
+    $sql_get = "SELECT  d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c.current_assigner,
+            concat(c.current_assigner ,'-',f_return_name(c.current_assigner)) current_assigner_name ,
+            flow_name,c.update_date ,c.create_date,b.path,d.flow_code  FROM system_main a,flow_main b ,subflow 
+             c,flow d
+            WHERE a.system_id=b.system_id 
+            AND b.flow_id=d.flow_id
+            AND c.current_assigner='$user_id'
+            AND d.flow_id=b.flow_id
+            AND c.form_key=d.form_key
+    $where_system_id
+    $where_flow_id
+    ";
+    // echo '<pre>';
+    // print_r($sql_get);
+    // echo '</pre>';
 
-$status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "YN" => "結案不同意"];
+    $result = mysqli_query($link, $sql_get);
+    if ($result == false) {
+        die(mysqli_error($link));
+    }
+    $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC);
 
-#可編輯的列
-// $editableColumn = [
-//     'apply_key' => [
-//         'label' => "評審單號", "value" => "", "tag" => 'text',
-//         'attr' => [
-//             'readonly=true ',
-//             'class' => 'form-control form-control-sm'
-//         ]
-//     ],
-//     'vol_no' => ['label' => "卷號", "value" => "", "tag" => 'text', 'attr' => ['readonly=true ', 'class' => 'form-control form-control-sm']],
-//     'address' => ['label' => "現場地址", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
-//     'case_name' => ['label' => "現場名稱", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
-//     'brand' => ['label' => "電梯品牌", "value" => "", "tag" => 'select', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
-//     'num' => ['label' => "電梯臺數", "value" => "", "tag" => 'number', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
-//     'salesman' => ['label' => "營業員", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
-//     'maintain_kind' => ['label' => "保養方式", "value" => "", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm']],
-//     'contract_begin_date' => ['label' => "契約期限開始", "value" => "", "tag" => 'date', 'attr' => ['required', 'class' => 'date form-control form-control-sm']],
-//     'contract_end_date' => ['label' => "契約期限結束", "value" => "", "tag" => 'date', 'attr' => ['required', 'class' => 'date form-control form-control-sm']],
-//     'contract_kind' => ['label' => "契約性質", "value" => "", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm']],
-//     'platform_company' => ['label' => "加盟公司名稱", "value" => "", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
-//     'platforom_company_tel' => ['label' => "加盟公司電話", "value" => "", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
-//     //'payment_kind' => ['label' => "付款方式", "value" => "", "tag" => 'select', 'attr' => ['required', 'class' => 'form-control form-control-sm'], 'options' => $payment_kind_opt],
 
-// ];
+    foreach ($res_get as $key => $data) {
+        // 結案隱藏
+        if ($data['flow_code'] !== 'Z') {
+            $test = $data['form_key'];
+            // $sql = "SELECT mid FROM pricereview_sign WHERE id = $test";
+            // $result = mysqli_fetch_all(mysqli_query($link, $sql), MYSQLI_ASSOC);
+            // echo '<pre>';
+            // print_r($result);
+            // echo '</pre>';
+            $id[] =  $test;
+        }
+    }
+    $inClause = implode(',', $id);
+}
+
+
+#可編輯的列
+$editableColumn = [
+    'apply_key' => [
+        'label' => "評審單號", "value" => "", "tag" => 'text',
+        'attr' => [
+            'readonly=true ',
+            'class' => 'form-control form-control-sm'
+        ]
+    ],
+    'vol_no' => ['label' => "卷號", "value" => "", "tag" => 'text', 'attr' => ['readonly=true ', 'class' => 'form-control form-control-sm']],
+    'address' => ['label' => "現場地址", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
+    'case_name' => ['label' => "現場名稱", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
+    'brand' => ['label' => "電梯品牌", "value" => "", "tag" => 'select', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
+    'num' => ['label' => "電梯臺數", "value" => "", "tag" => 'number', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
+    'salesman' => ['label' => "營業員", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
+    'maintain_kind' => ['label' => "保養方式", "value" => "", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm']],
+    'contract_begin_date' => ['label' => "契約期限開始", "value" => "", "tag" => 'date', 'attr' => ['required', 'class' => 'date form-control form-control-sm']],
+    'contract_end_date' => ['label' => "契約期限結束", "value" => "", "tag" => 'date', 'attr' => ['required', 'class' => 'date form-control form-control-sm']],
+    'contract_kind' => ['label' => "契約性質", "value" => "", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm']],
+    'platform_company' => ['label' => "加盟公司名稱", "value" => "", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
+    'platforom_company_tel' => ['label' => "加盟公司電話", "value" => "", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
+    //'payment_kind' => ['label' => "付款方式", "value" => "", "tag" => 'select', 'attr' => ['required', 'class' => 'form-control form-control-sm'], 'options' => $payment_kind_opt],
+
+];
 // 設置一個空陣列來放資料
 $data = array();
 
@@ -45,7 +88,7 @@ $res = mysqli_query($link, $sql);
 $row = mysqli_fetch_row($res);
 $user_department_id = $row[0];
 mysqli_free_result($res);
-if (in_array($user_department_id, $depart_arr) || $user_id == "M0008" || $user_id == "M0012" || $user_id == "M0006" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "M0225") $where = "";
+if (in_array($user_department_id, $depart_arr) || $user_id == "M0008" || $user_id == "M0012" || $user_id == "M0006" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") $where = "";
 
 // 電梯廠牌
 $elevator_brand_arr = [];
@@ -55,7 +98,25 @@ while ($row = mysqli_fetch_row($res)) {
     $elevator_brand_arr[$row[0]] = $row[1];
 }
 mysqli_free_result($res);
+if (!empty($res_get)) {
+    $sql = "SELECT  
+    apply_key,
+    vol_no,
+    address,
+    case_name,
+    brand ,
+    num ,
+    f_return_name(salesman) salesman,
+    f_return_content('maintain_kind',maintain_kind ) maintain_kind,
+    date_format(contract_begin_date,'%Y/%m/%d')  contract_begin_date,
+    date_format(contract_end_date,'%Y/%m/%d') contract_end_date  ,
+    f_return_content('contract_kind',contract_kind ) contract_kind,
+    platform_company,
+    platforom_company_tel,
+    form_key,
 
+    f_return_content('payment_kind',payment_kind ) payment_kind  FROM $table WHERE form_key IN ($inClause) ";
+} else {
     $sql = "SELECT  
     apply_key,
     vol_no,
@@ -63,7 +124,6 @@ $sql = "SELECT
     case_name,
     brand ,
     num ,
-salesman as salesman_id,
     f_return_name(salesman) salesman,
     f_return_content('maintain_kind',maintain_kind ) maintain_kind,
     date_format(contract_begin_date,'%Y/%m/%d')  contract_begin_date,
@@ -72,15 +132,15 @@ f_return_content('contract_kind',contract_kind ) contract_kind,
     platform_company,
     platforom_company_tel,
     form_key,
-status,
+
     f_return_content('payment_kind',payment_kind ) payment_kind  FROM $table 
     where 1=1 $where ORDER BY vol_no";
+}
+// echo $sql;
 $data = mysqli_query($link, $sql);
 // echo '<pre>';
-// print_r($sql);
+// print_r($data);
 // echo '</pre>';
-
-
 ?>
 
 <?php
@@ -96,171 +156,55 @@ if ($data) :
     }
 
 ?>
-    <!-- <link rel="stylesheet" href="common.css"> -->
+    <link rel="stylesheet" href="common.css">
-    <style>
-        #table_index2 {
-            table-layout: fixed;
-            width: 100%;
-        }
-
-        #table_index2_filter {
-            float: right;
-        }
-
-        #table_index2_paginate {
-            float: right;
-        }
-
-        div.dataTables_scrollHead table.dataTable {
-            margin-bottom: 0 !important;
-            border-bottom-width: 0;
-        }
 
-        div.dataTables_scrollBody table.dataTable {
+    <div style="overflow-x:auto;">
-            border-top-width: 0;
+        <form method='get' action='#'>
-        }
+            <table class='table query-table table-striped table-bordered display  compact' style='width:98%;text-align:center;margin:0 auto'>
-
+                <thead>
-        /*
+                    <tr>
-.col-sm-12 {
+                        <td colspan="8">
-    width: auto;
+                            <h3 style='text-align:center'>(契約)價審單查詢</h3>
-}
+                        </td>
-*/
+                    </tr>
-        img {
-            width: 125px;
-        }
-
-        .width_style_1 {
-            width: 125px;
-        }
-
-        label {
-            display: inline-flex;
-            margin-bottom: .5rem;
-            margin-top: .5rem;
-
-        }
-
-        div a:hover {
-            text-decoration: none;
-        }
 
-        .btn-sm {
+                </thead>
-            font-size: 14px;
-            margin: 2px 0;
-            line-height: 90%;
-        }
 
-        .glyphicon-ok,
+            </table>
-        .glyphicon-ban-circle {
+            <table id="table_index" class="table table-striped table-bordered" style="width:98%">
-            font-size: 130%;
+                <thead>
-        }
+                    <?php
+                    echo "<tr>";
+                    foreach ($editableColumn as $key => $val) {
 
-        .btn-secondary {
+                        echo "<th>" . $val['label'] . "</th>";
-            color: #fff;
-            background-color: #6c757d;
-            border-color: #6c757d;
                     }
-
+                    echo "<th>是否結案</th>";
-        .btn-secondary:hover {
+                    //   echo "<th>刪除</th>";
-            color: #fff;
+                    echo "</tr>";
-            background-color: #5a6268;
+                    ?>
-            border-color: #545b62;
+                </thead>
+                <tbody>
+                    <?php foreach ($data as $row) : ?>
+                        <tr>
+                            <?php
+                            foreach ($editableColumn as $key => $val) {
+                                if ($key == 'apply_key') {
+                                    echo "<td> <a href='query_form.php?apply_key=$row[$key]&token=" . $_GET['token'] . "'>" . $row[$key] . "</td>";
+                                } elseif ($key == 'brand') {
+                                    echo "<td>" . (!empty($row[$key]) ? $elevator_brand_arr[$row[$key]] : "") . "</td>";
+                                } else {
+                                    echo "<td>" . $row[$key] . "</td>";
                                 }
-
-        .applybtn {
-            color: #fff;
-            background-color: #1484c4;
-            display: block;
-            border-radius: 4px;
-            padding: 4px 2px;
-            font-size: 13px;
-
                             }
+                            //list($signer)=DB::fields(");
+                            //echo " select  f_return_name(current_assigner) signer  from subflow where form_key='". $row['form_key'] ."'"; ". (is_array($row['form_key'])?'': $row['form_key']) ."
+                            list($signer) = mysqli_fetch_array(mysqli_query($link, "select   max(f_return_name(current_assigner) ) signer from subflow where form_key='" . $row['form_key'] . "'"));
 
-        .applybtn:hover {
+                            echo "<td>" . (empty($signer) ? "結案" : "N") . "</td>";
-            background-color: #1494f9;
-            color: #fff;
-        }
-    </style>
-    <script>
-        $(function() {
-            $('#table_index2').DataTable({
-                "scrollX": true,
-                "pageLength": 50
-            });
-            /*
-            var api = $('#table_index').dataTable().api();
-            //var order = api.order();
-            //console.log(order);
-            api
-                .order([0, "desc"])
-                .draw();
-            */
-        });
-    </script>
-    <link rel="stylesheet" href="../crm/common.css">
 
-    <div style="overflow-x:auto; white-space:nowrap;">
-        <table id="table_index2" class="table table-striped table-bordered" style="width:100%">
-            <thead>
-                <tr>
-                    <th>評審單號</th>
-                    <th>卷號</th>
-                    <th>現場地址</th>
-                    <th>現場名稱</th>
-                    <th>電梯品牌</th>
-                    <th>電梯台數</th>
-                    <th>營業員</th>
-                    <th>保養方式</th>
-                    <th>契約期限開始</th>
-                    <th>契約期限結束</th>
-                    <th>契約性質</th>
-                    <th>加盟公司名稱</th>
-                    <th>加盟公司電話</th>
-                    <!-- <th>加盟公司電話</th> -->
-                    <th>是否結案</th>
-                    <th>合約下載</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach ($data as $row) :
-                    $oneself = ($row['salesman'] == $user_id) ? 1 : 0;
                             ?>
-                    <tr>
-                        <td><a href="query_form.php?apply_key=<?= $row['apply_key'] ?>&token=<?= $_GET['token'] ?>"><?= $row['apply_key'] ?></a></td>
-                        <td><?php echo $row['vol_no'] ?></td>
-                        <td><?php echo $row['address'] ?></td>
-                        <td><?php echo $row['case_name'] ?></td>
-                        <td><?php echo $row['brand'] ?></td>
-                        <td><?php echo $row['num'] ?></td>
-                        <td><?php echo $row['salesman'] ?></td>
-                        <td><?php echo $row['maintain_kindd'] ?></td>
-                        <td><?php echo $row['contract_begin_date'] ?></td>
-                        <td><?php echo $row['contract_end_date'] ?></td>
-                        <td><?php echo $row['contract_kind'] ?></td>
-                        <td><?php echo $row['platform_company'] ?></td>
-                        <td><?php echo $row['platforom_company_tel'] ?></td>
 
-                        <?php list($signer) = mysqli_fetch_array(mysqli_query($link, "select   max(f_return_name(current_assigner) ) signer from subflow where form_key='" . $row['form_key'] . "'")); ?>
-                        <td><?php echo empty($signer) ? '結案' : 'N' ?></td>
-                        <td>
-                            <a class="applybtn" href="../contract-repair/contract_maintance.php?apply_key=<?php echo $row['apply_key'] . '&' . $para; ?>">
-                                <?php if (($row['status'] == 'YY' && $oneself)) {
-                                    echo '申請';
-                                } else {
-                                    echo '檢視';
-                                } ?>
-                            </a>
-                            <?php if ($row['status'] == 'YY' && ($user_id == "M0060" || $user_id == "M0107" || $user_id == "M0174" || $user_id == 'M0225') && $row['applystatus'] == 1) : ?>
-                                <a class="applybtn" href="../contract-repaire/contract_maintance.php?id=<?php echo $row['id'] . '&' . $para; ?>">待簽核</a><br>
-                            <?php endif; ?>
-                            <?php if ($row['status'] != 'Y1') : ?>
-                                <span style="font-size:13px;font-weight:600">--</span>
-                            <?php endif; ?>
-                            <?php if (($row['status'] === 'YY' && $row['applystatus'] == 3 && ($user_id == "M0107" || $user_id == "M0060")) || $user_id == "M0174" || $user_id == 'M0225') : ?>
-                                <a class="applybtn" href="../contract-repair/contract-download.php?apply_key=<?php echo $row['apply_key'] . '&' . $para ?>">下載</a>
-                            <?php endif; ?>
-                        </td>
                         </tr>
                     <?php endforeach; ?>
                 </tbody>

wms/contract/api/T8salIncomeApply.php

@@ -0,0 +1,41 @@
+<?php
+require_once("../../T8_Authorization_from_bpm.php");
+
+function T8API($data)
+{
+    // echo '<pre>';
+    // print_r(json_encode($data));
+    // echo '</pre>';
+
+    $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
+    $validation = get_Auth();
+    $header = [
+        "CHI_Authorization :" . $validation
+    ];
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $api_url); // 设置请求的URL
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+    curl_setopt($ch, CURLOPT_POST, 1); // 使用 POST
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
+    $response = curl_exec($ch);
+    if ($response === false) {
+        echo 'Curl error: ' . curl_error($ch);
+    } else {
+        $result = json_decode($response, true);
+        // 若 API 傳入失敗。
+        if ($result['Status'] == 'Erroe') {
+            echo 'API傳入失敗，' . $result['ErrorMsg'];
+            return $result;
+        } else {
+            // echo '<pre>';
+            // print_r($result);
+            // echo '</pre>';
+            return $result;
+        }
+    }
+
+    curl_close($ch);
+}
+// T8API($data);

wms/contract/api/postContractData.php

@@ -327,7 +327,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         // $stmt->bindParam(':CreateTime', $createTime);
 
         // $stmt->execute();
-        // T8insert($_POST, $facilityno);
+        T8insert($_POST, $facilityno);
 
         header('Content-Type: application/json');
         $jsonData = json_encode($files);
@@ -344,7 +344,8 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
 function T8insert($data, $facilityno)
 {
     require_once("../connt8.php");
-    // include "../../T8_Authorization.php";
+    // 引入 T8 API 連線
+    require_once("./T8salIncomeApply.php");
 
     $contractno = !empty($data['contractno']) ? $data['contractno'] : null; // 合約號
     $address = !empty($data['address']) ? $data['address'] : null; // 客戶地址
@@ -360,6 +361,7 @@ function T8insert($data, $facilityno)
     $num = !empty($data['num']) ? $data['num'] : null; // 電梯數量
     $elevators = !empty($data['elevators']) ? json_decode($data['elevators'], true) : []; //電梯
     $area = !empty($data['area']) ? $data['area'] : null; //縣市 Ex. A->台北 , B-> ..。
+    $payType = !empty($data['payType']) ? $data['payType'] : null;
 
     $user_id = !empty($_POST['user_id']) ? $_POST['user_id'] : null;
 
@@ -372,7 +374,9 @@ function T8insert($data, $facilityno)
     $stmt->execute();
     $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
     $date = date('Y-m-sH-s-i');
+    $date_1 = date('Y-m-s');
     $createTime = str_replace("-", '', $date);
+    $insertTime = str_replace('-', '', $date_1);
     $beginDate = str_replace("-", '', $contract_begin_date);
     $endDate = str_replace("-", '', $contract_end_date);
     if ($contractno == '') {
@@ -464,11 +468,13 @@ function T8insert($data, $facilityno)
             $type = 'C5';
         }
     }
-    // echo '<pre>';
+    $sql = "SELECT * FROM comProject WHERE ProjectId = :ProjectId";
-    // print_r($type);
+    $stmt = $connT8->prepare($sql);
-    // echo '</pre>';
+    $stmt->bindParam(':ProjectId', $contractno);
-
+    $stmt->execute();
-    // //新增於 comProject。合約 table
+    $resultProject = $stmt->fetchAll(PDO::FETCH_ASSOC);
+    if (empty($resultProject)) {
+        //新增於 comProject。合約 table
         $sql = "INSERT INTO comProject(ProjectId,ProjectName,TypeId,ValidityFromDate,ValidityToDate,CreateTime,CreatorId,IsInUsed) 
         VALUES(:ProjectId,:ProjectName,:TypeId,:ValidityFromDate,:ValidityToDate,:CreateTime,:CreatorId,1)";
         $stmt = $connT8->prepare($sql);
@@ -480,7 +486,7 @@ function T8insert($data, $facilityno)
         $stmt->bindParam(':CreateTime', $createTime);
         $stmt->bindParam(':CreatorId', $user_id);
         $stmt->execute();
-
+    }
 
     // // 新增電梯數
     foreach ($elevators as $index => $elevator) {
@@ -515,36 +521,76 @@ function T8insert($data, $facilityno)
         $stmt->bindParam(':CreatorId', $user_id);
         $stmt->bindParam(':CreateTime', $createTime);
         $stmt->execute();
-    }
-
 
-?>
+        // 分期代碼計算
-    <!-- <script src="./js/axios/axios.min.js"></script>
+        $IncomeId = [
-    <script>
+            'A40006' => 1,
-        const form = new FormData();
+            'A40007' => 4,
-        form.append('BillNo', <?php echo $contractno ?>);
+            'A40003' => 12,
-        form.append('BillDate', );
+            'A40004' => 6,
-        form.append('');
+            'A40005' => 2
-        form.append('');
+        ];
-        form.append('');
+        //分幾期 => 總共保養月 / 分期月
-        form.append('');
+        $SQuantity = $elevator['maintain_months'] / $IncomeId[$payType];
-        form.append('');
+
-        axios.post('https://127.0.0.1:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData', form).then(res => {
+        // 依每台電梯去加入各個的付款項
-            console.log(res.status);
+        for ($i = 1; $i <= $IncomeId[$payType]; $i++) {
-            if (res.status == 200) {
+            $rows_data = [
-                alert('成功');
+                "BillNo" => "$contractno",
-            }
+                "IncomeId" => "$payType",
-        }).catch(err => {
+                "TaxId" => "ST005",
-            console.log(err);
+                "RowCode" => $i,
-            let code = err.response.data;
+                "RowNo" => $i,
-            if (code == 422) {
+                "ItemType" => 1,
-                console.log(err);
+                "SPrice" =>  $elevator['sold_price'],
+                "SQuantity" => $SQuantity,
+                "ProjectId" => "$contractno",
+                "FromSourceTag" => 0,
+                "CU_MaterialId" => "$facilityno[$index]"
+            ];
+            $salIncomeApplyDetail_rows[] = $rows_data;
         }
-            if (code == 500) {
-                alert('儲存失敗!可能為下載錯誤:\n' + error.response.data);
     }
-        })
+
-    </script> -->
-<?php
     $connT8->commit();
+
+
+    // $insertime = settype($insertTime, 'integer');
+    $salIncomeApplyMaster_rows = [
+        "BillNo" => "$contractno",
+        "BillDate" => $insertTime,
+        "OrgId" => "1000",
+        "FOrgId" => "1000",
+        "TypeId" => "RAS",
+        "BpOrgId" => "1000",
+        "BizPartnerId" => "$contractno",
+        "CurrId" => "TWD",
+        "CurrOAmount" => 1,
+        "CurrLAmount" => 1,
+        "PersonId" => "$salesman",
+        "DtOrgId" => "1000",
+        "DueToId" => "$contractno",
+        "TaxId" => "ST005",
+        "CompId" => "1001",
+        "CreatorId" => "$user_id"
+    ];
+
+    $salIncomeApplyMaster = [
+        'name' => "salIncomeApplyMaster",
+        'rows' => [$salIncomeApplyMaster_rows]
+    ];
+
+    $salIncomeApplyDetail = [
+        'name' => "salIncomeApplyDetail",
+        'rows' => $salIncomeApplyDetail_rows
+    ];
+    $API_body[] = $salIncomeApplyMaster;
+    $API_body[] = $salIncomeApplyDetail;
+    // 呼叫 API
+    $result = T8API($API_body);
+
+    if ($result['Status'] == 'Error') {
+        http_response_code(404);
+        die('Error!:' . $result['ErrorMsg']);
+    }
 }

wms/contract/api/test.json

@@ -0,0 +1,186 @@
+[
+    {
+        "name": "salIncomeApplyMaster",
+        "rows": [
+            {
+                "BillNo": "B23100060",
+                "BillDate": "20240122",
+                "OrgId": "1000",
+                "FOrgId": "1000",
+                "TypeId": "RAS",
+                "BpOrgId": "1000",
+                "BizPartnerId": "B23100060",
+                "CurrId": "TWD",
+                "CurrOAmount": 1,
+                "CurrLAmount": 1,
+                "PersonId": "M0065",
+                "DtOrgId": "1000",
+                "DueToId": "B23100060",
+                "TaxId": "ST005",
+                "CompId": "1001",
+                "CreatorId": "M0225"
+            }
+        ]
+    },
+    {
+        "name": "salIncomeApplyDetail",
+        "rows": [
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 1,
+                "RowNo": 1,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 2,
+                "RowNo": 2,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 3,
+                "RowNo": 3,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 4,
+                "RowNo": 4,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 5,
+                "RowNo": 5,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 6,
+                "RowNo": 6,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 7,
+                "RowNo": 7,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 8,
+                "RowNo": 8,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 9,
+                "RowNo": 9,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 10,
+                "RowNo": 10,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 11,
+                "RowNo": 11,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            },
+            {
+                "BillNo": "B23100060",
+                "IncomeId": "A40003",
+                "TaxId": "ST005",
+                "RowCode": 12,
+                "RowNo": 12,
+                "ItemType": 1,
+                "SPrice": 1250,
+                "SQuantity": 1,
+                "ProjectId": "B23100060",
+                "FromSourceTag": 0,
+                "CU_MaterialId": "4TH53801"
+            }
+        ]
+    }
+]

wms/contract/api/testT8API.php

@@ -1,77 +1,86 @@
 <?php
-$now = gmdate("YmdHis");
+require_once('../../T8_Authorization_from_bpm.php');
-$data = 'M0000.' . $now;
+require_once('../connt8.php');
-$sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
+$sql = "SELECT * FROM salIncomeApplyMaster WHERE BillNo = '3TX10701' ";
-?>
+$stmt = $connT8->prepare($sql);
+$stmt->execute();
+$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+echo '<pre>';
+print_r($result);
+echo '</pre>';
+// $date = date("Y-m-d");
+// $date1 = str_replace('-', '', $date);
 
-<script src="https://code.jquery.com/jquery-3.4.1.js" integrity="sha256-WpOohJOqMqqyKL9FccASB9O0KwACQJpFTUBLTYOVvVU=" crossorigin="anonymous"></script>
+// $arr = [
-<script>
+//     "date" => $date1
-    var body = [{
+// ];
-            "name": "salIncomeApplyMaster",
-            "rows": [{
-                "BillNo": "Z001",
-                "BillDate": 20160811,
-                "OrgId": "1000",
-                "FOrgId": "1000",
-                "TypeId": "RR",
-                "BpOrgId": "1000",
-                "BizPartnerId": "C002",
-                "CurrId": "RMB",
-                "CurrOAmount": 1,
-                "CurrLAmount": 1,
-                "PersonId": "T001",
-                "DtOrgId": "1000",
-                "DueToId": "C002",
-                "TaxId": "123",
-                "CompId": "1000"
-            }]
-        },
-        {
-            "name": "salIncomeApplyDetail",
-            "rows": [{
-                "BillNo": "Z001",
-                "IncomeId": "F203",
-                "TaxId": "ST003",
-                "RowCode": 1,
-                "ItemType": "1",
-                "SPrice": 50,
-                "SQuantity": 1,
-                "FromSourceTag": 0,
-                "FromBillNo": "123"
-            }]
-        }
-    ]
 
-    var json = JSON.stringify(body);
+// echo '<pre>';
-    console.log(json);
+// print_r($arr);
-    //     obj = {
+// echo '</pre>';
-    //         type: 'POST',
+// $validation = get_Auth();
-    //         // url: `${corsurl}${apiurl}`,
+// $data = [
-    //         url: `${apiurl}`,
+//     [
-    //         dataType: 'json',
+//         "name" => "OtherStockOutMtable",
-    //         headers: headerParam,
+//         "rows" => [
-    //         data: json,
+//             [
-    //         // dataType: "json",
+//                 "BillNo" => "00850110", // 單據編號 varchar(20)
-    //         success: function(res) {
+//                 "BillDate" => 20210427, // 單據日期 int
-    //             console.log(res.Status);
+//                 "OrgId" => "1000",      //組織  varchar(20)
-    //             console.log(res.ErrorMsg);
+//                 "FOrgId" => "1000",     //核算組織 varchar(20)
-    //             console.log(res.Data);
+//                 "TypeId" => "OS",       //單據類型  varchar(10)
+//                 "BizPartnerId" => "",   //往來對象(供應商) 可為空
+//                 "PersonId" => "C0003",  // 經辦人員 varchar(20)
+//                 "DeptId" => "250",      // 經辦部門 varchar(20)
+//                 "CompId" => "1001"      // 公司 varchar(20)
+//             ]
+//         ]
+//     ], [
+//         "name" => "OtherStockOutDetail",
+//         "rows" => [
+//             [
+//                 "BillNo" => "00850110", //單據編號 varchar(20)
+//                 "RowCode" => 1,         // 序號  int(10)
+//                 "MaterialId" => "MX00021003",  // 產品代碼 -> 產品集成 varchar(40)
+//                 "SupplyOrgId" => "1000", // 供貨組織代碼 varchar(20)
+//                 "SQuantity" => 1,       // 交易數量 numeric(19)
+//                 "WarehouseId" => "100"  // 倉庫代碼 varchar(20)
+//             ]
+//         ]
+//     ]
+// ];
+// $data = file_get_contents('test.json');
+// echo '<pre>';
+// print_r($data);
+// echo '</pre>';
+// $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKOTHERSTOCKOUT/PostERPData';
+// $header = [
+//     "CHI_Authorization :" . $validation
+// ];
+// $ch = curl_init();
+// curl_setopt($ch, CURLOPT_URL, $api_url); // 设置请求的URL
+// curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+// curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+// curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+// curl_setopt($ch, CURLOPT_POST, 1);
+// curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
+
+// $response = curl_exec($ch);
+// if ($response === false) {
+//     echo 'Curl error: ' . curl_error($ch);
+// } else {
+//     $result = json_decode($response, true);
+//     if ($result['Status'] == 'Error') {
+//         echo '<pre>';
+//         print_r($result);
+//         echo '</pre>';
+//         echo 'API 傳入錯誤，' . $result['ErrorMsg'];
+//     } else {
+//         echo '<pre>';
+//         print_r($result['Status']);
+//         echo '</pre>';
+//         return $result;
+//     }
 // }
-    //     };
+
-    //     jQuery.ajax(obj);
+// curl_close($ch);
-    //     // }
-    // })
-    $.ajax({
-        url: 'https://127.0.0.1:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData',
-        method: 'POST',
-        dataType: 'json',
-        // headers: headerParam,
-        data: body,
-        success: function(res) {
-            console.log('Success');
-        },
-        error: function(err) {
-            console.log(err);
-        }
-    })
-</script>

wms/contract/js/alpine.js

@@ -964,7 +964,7 @@ const contractInput = () => {
             num: '', //電梯數量
             disabled: false, //資料庫是否有電梯數量資料
             elevators: [], //機種、載重、人乘、樓停、樓層、速度、緯度、經度、開門方式、保養別、廠牌、竣檢日、許可證日期
-            payType: ''
+            payType: '' //付款方式
         },
         customize: false,
         step: 1,
@@ -1037,7 +1037,7 @@ const contractInput = () => {
                     this.data.disabled = (res.data.num > 0) ? true : false;
                     this.data.elevators = res.data.elevators
                     let cityIndex = this.data.address.indexOf('市');
-                    console.log(cityIndex);
+                    // console.log(cityIndex);
                     if (cityIndex == -1) {
                         // cityIndex = this.data.address.indexOf('縣');
                     }
@@ -1122,7 +1122,7 @@ const contractInput = () => {
                 form.append('files[]', this.data.files[i]);
             }
             axios.post('./api/postContractData.php', form).then(res => {
-                console.log(res);
+                // console.log(res);
                 if (res.status === 200) {
                     alert('儲存成功');
                     this.step = 1

wms/frame/api_getdata.php

@@ -166,6 +166,7 @@ function get_pending($token)
 
     $res = mysqli_query($link, $sql);
     while ($row = mysqli_fetch_row($res)) {
+        // print_r($row);
         $data[$i]["sid"] = $row[0];
         $data[$i]["sname"] = $row[1];
         $data[$i]["fid"] = $row[2];

wms/frame/pending.php

@@ -3,6 +3,7 @@ $token = $_REQUEST["token"];
 ?>
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, viewport-fit=cover" />
@@ -15,31 +16,39 @@ $token = $_REQUEST["token"];
         .content-wrapper {
             background-color: #fff;
         }
+
         .col-lg-6 {
             padding: 8px 0 0 0 !important;
         }
+
         .card {
             height: 90vh;
             line-height: 14 px;
             font-size: 14px;
         }
+
         .card-header {
             background-color: #f4f6f9;
             padding-left: 16px;
         }
+
         .card-body ol {
             font-size: 14px;
             margin-left: -30px;
         }
+
         .nav-pills .nav-link {
             color: #446887;
         }
+
         h5 svg {
             vertical-align: baseline;
         }
+
         h5 a {
             color: #000;
         }
+
         @media screen and (max-width: 992px) {
             .card {
                 height: 95vh;
@@ -47,6 +56,7 @@ h5 a {
         }
     </style>
 </head>
+
 <body>
     <div class="wrapper">
         <!-- Content Wrapper. Contains page content -->
@@ -59,8 +69,12 @@ h5 a {
                         <div class="col-lg-6">
                             <div class="card">
                                 <div class="card-header">
-                            <h5 class="card-title m-0"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil-square" viewBox="0 0 16 16"><path d="M15.502 1.94a.5.5 0 0 1 0 .706L14.459 3.69l-2-2L13.502.646a.5.5 0 0 1 .707 0l1.293 1.293zm-1.75 2.456-2-2L4.939 9.21a.5.5 0 0 0-.121.196l-.805 2.414a.25.25 0 0 0 .316.316l2.414-.805a.5.5 0 0 0 .196-.12l6.813-6.814z"/><path fill-rule="evenodd" d="M1 13.5A1.5 1.5 0 0 0 2.5 15h11a1.5 1.5 0 0 0 1.5-1.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 1-.5.5h-11a.5.5 0 0 1-.5-.5v-11a.5.5 0 0 1 .5-.5H9a.5.5 0 0 0 0-1H2.5A1.5 1.5 0 0 0 1 2.5v11z"/></svg>
+                                    <h5 class="card-title m-0"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil-square" viewBox="0 0 16 16">
-                            <a href="/wms/sign/list.php?function_name=show&token=<?php echo $token; ?>" target="_parent">待我簽核</a></h5>
+                                            <path d="M15.502 1.94a.5.5 0 0 1 0 .706L14.459 3.69l-2-2L13.502.646a.5.5 0 0 1 .707 0l1.293 1.293zm-1.75 2.456-2-2L4.939 9.21a.5.5 0 0 0-.121.196l-.805 2.414a.25.25 0 0 0 .316.316l2.414-.805a.5.5 0 0 0 .196-.12l6.813-6.814z" />
+                                            <path fill-rule="evenodd" d="M1 13.5A1.5 1.5 0 0 0 2.5 15h11a1.5 1.5 0 0 0 1.5-1.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 1-.5.5h-11a.5.5 0 0 1-.5-.5v-11a.5.5 0 0 1 .5-.5H9a.5.5 0 0 0 0-1H2.5A1.5 1.5 0 0 0 1 2.5v11z" />
+                                        </svg>
+                                        <a href="/wms/sign/list.php?function_name=show&token=<?php echo $token; ?>" target="_parent">待我簽核</a>
+                                    </h5>
                                 </div>
                                 <div class="card-body p-0">
                                     Loading...
@@ -85,17 +99,28 @@ function here() {
             var URL = 'api_getdata.php';
             $.ajax({
                 type: "GET",
-        data: {p: 'pending', token: '<?php echo $token; ?>'},
+                data: {
+                    p: 'pending',
+                    token: '<?php echo $token; ?>'
+                },
                 url: URL,
                 success: function(msg) {
                     var obj = JSON.parse(msg);
-            console.log(obj);
+                    console.log(msg);
                     var myhtml = '';
                     if (obj.st == 'ok') {
                         myhtml += '<ul class="nav nav-pills flex-column">';
                         for (i = 1; i <= Object.keys(obj.content).length; i++) {
+                            if (obj.content[i].fname == '新梯價審流程') {
+                                myhtml += '<li class="nav-item"><a href="/wms/mkt/pricereview-index.php?system_id=' + obj.content[i].sid + '&flow_id=' + obj.content[i].fid + '&function_name=show&token=<?php echo $token; ?>" class="nav-link" target="_parent">' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')</a></li>';
+                            } else if (obj.content[i].fname == '汰改價審流程') {
+                                myhtml += '<li class="nav-item"><a href="/wms/mkt/pricereview_renovate-index.php?system_id=' + obj.content[i].sid + '&flow_id=' + obj.content[i].fid + '&function_name=show&token=<?php echo $token; ?>" class="nav-link" target="_parent">' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')</a></li>';
+                            } else if (obj.content[i].fname == '契约價審流程') {
+                                myhtml += '<li class="nav-item"><a href="/wms/cont/sign_list.php?system_id=' + obj.content[i].sid + '&flow_id=' + obj.content[i].fid + '&function_name=show&token=<?php echo $token; ?>" class="nav-link" target="_parent">' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')</a></li>';
+                            } else {
                                 myhtml += '<li class="nav-item"><a href="/wms/sign/list.php?system_id=' + obj.content[i].sid + '&flow_id=' + obj.content[i].fid + '&function_name=show&token=<?php echo $token; ?>" class="nav-link" target="_parent">' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')</a></li>';
                             }
+                        }
                         if (Object.keys(obj.content).length == 6) {
                             myhtml += '<li class="nav-item"><a href="/wms/sign/list.php?function_name=show&token=<?php echo $token; ?>" class="nav-link" target="_parent">.... 顯示更多</a></li>';
                         }
@@ -107,4 +132,5 @@ function here() {
         }
     </script>
 </body>
+
 </html>

wms/fun_global.php

@@ -91,21 +91,29 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee)
     $res = mysqli_query($link, $sql);
     while ($row = mysqli_fetch_assoc($res)) {
         if ($row["manager"] == "M0001") return; // 董事長略過
+        if ($user_id == 'TEST01') {
+            $ret[1] =   "test04,,";
+            $ret[2] =   "test02,,";
+            $ret[3] =   "test03,,";
+            $ret[4] =   "test05,,";
+            return $ret;
+        } else {
             if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
                 $ret[1] = $row["manager"] . ",,";
                 pricereview_class($rate, $row["manager"], $ret,  $special_fee);
             } else {
-            $ret[2] = "M0175,,<##>M0107,,";         // 業務部專員：M0024許伃廷、M0107許紓晴 M0175陳君敏 (第2關有多位審核人)
+                $ret[2] = "M0024,,<##>M0107,,";         // 業務部專員：M0024許伃廷、M0107許紓晴(第2關有多位審核人)
                 $ret[3] = "M0060,,";                    // 業務協理
                 if ($rate < 80 || $special_fee > 0) {
                     $ret[4] = "M0006,,";    // 總經理
                 }
             }
-    }
-    mysqli_free_result($res);
 
             return $ret;
         }
+    }
+    mysqli_free_result($res);
+}
 /**
  * 汰改(契約)價審簽核順位
  * @param string $rate:破價比
@@ -122,12 +130,20 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
     $res = mysqli_query($link, $sql);
     if ($row = mysqli_fetch_assoc($res)) {
         if ($row["manager"] == "M0001") return; // 董事長略過
+        if ($row["manager"] == "TEST04" || $user_id = 'TEST01') {
+            $ret[1] =   "test04,,";
+            $ret[2] =   "test02,,";
+            $ret[3] =   "test03,,";
+            $ret[4] =   "test05,,";
+            return $ret;
+        } else {
             if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
                 $ret[1] = $row["manager"];
             } else {
                 $ret[1] = $user_id;
             }
         }
+    }
     $ret[1] = "M0029";
     mysqli_free_result($res);
     $ret[2] = 'M0012';

wms/mkt/pricereview-check.php

@@ -58,7 +58,7 @@ foreach ($res as $data) {
     mysqli_free_result($res_a);
     // 瀏覽MI權限
     $depart_id = accountidToDepartId($user_id);
-    if ($depart_id == "320" || $depart_id == "321" || $depart_id == "20") $viewmi = 1;
+    if ($depart_id == "320" || $depart_id == "321" || $depart_id == "20" || $user_id == 'TEST04') $viewmi = 1;
     else $viewmi = 0;
 
     $sql = "select * from pricereview_sign where mid = '$id'";
@@ -68,6 +68,9 @@ foreach ($res as $data) {
     if (!empty($row_s["sign1"])) list($person1, $status1, $dtte1)  = explode(",", $row_s["sign1"]);
     else $person1 = $status1 = $dtte1 = "";
     if (!empty($row_s["sign2"])) {
+        if ($user_id == "TEST02") {
+            list($person2, $status2, $dtte2)  = explode(",", $row_s["sign2"]);
+        } else {
             if ($st == 2 && (preg_match("/Y/", $row_s["sign2"]) || preg_match("/N/", $row_s["sign2"]))) {
                 echo "<script>";
                 echo "alert('請勿重覆審核!');";
@@ -86,6 +89,7 @@ foreach ($res as $data) {
                     break;
                 }
             }
+        }
     } else $person2 = $status2 = $dtte2 = "";
     if (!empty($row_s["sign3"])) list($person3, $status3, $dtte3)  = explode(",", $row_s["sign3"]);
     else $person3 = $status3 = $dtte3 = "";
@@ -118,13 +122,13 @@ foreach ($res as $data) {
     if ($st == 1 && ($person1 == $user_id) && ($status1 == "") || $user_id == 'TEST04') {
         $sign_on = 1;
     }
-    if ($st == 2 && ($person2 == $user_id || (isset($person2_arr) && in_array($user_id, $person2_arr))) && ($status2 == "")) {
+    if ($st == 2 && ($person2 == $user_id || (isset($person2_arr) && in_array($user_id, $person2_arr))) && ($status2 == "") || $user_id == 'TEST02') {
         $sign_on = 1;
     }
-    if ($st == 3 && ($person3 == $user_id) && ($status3 == "")) {
+    if ($st == 3 && ($person3 == $user_id) && ($status3 == "") || $user_id == 'TEST03') {
         $sign_on = 1;
     }
-    if ($st == 4 && ($person4 == $user_id) && ($status4 == "")) {
+    if ($st == 4 && ($person4 == $user_id) && ($status4 == "") || $user_id == 'TEST05') {
         $sign_on = 1;
     }
     // $sign_total=關卡數
@@ -254,6 +258,7 @@ foreach ($res as $data) {
         function getMI(id) {
             var formdata = new FormData();
             formdata.append('pa', id);
+            // formdata.append('user_id', <?= $user_id ?>);
             var xhr = new XMLHttpRequest();
             xhr.onreadystatechange = function() {
                 if (this.readyState == 4 && this.status == 200) {
@@ -1016,7 +1021,7 @@ foreach ($res as $data) {
                     <input type="text" name="checker" id="checker" value="<?= $user_id; ?>" readonly>
                     <button type="submit" name="status" id="status_n" value="N" onclick="if (!confirm('確定不同意？')) return false;"><?php echo ($sign_total == $st) ? "結案(不同意)" : "不同意(退回)"; ?></button>
                     <button type="submit" name="status" id="status_y" value="Y" onclick="if (!confirm('確定同意？')) return false;">同意(上呈)</button>
-                    <?php if ($st == 3) : ?>
+                    <?php if ($st == 3 || $st == 4) : ?>
                         <button type="submit" name="status" id="status_yy" value="YY" onclick="if (!confirm('確定同意？')) return false;">同意(結案)</button>
                     <?php endif; ?>
                 <?php } else { ?>

wms/mkt/pricereview-index.php

@@ -5,8 +5,61 @@ include "../header.php";
 $accountname_arr = accountid2name();
 
 $status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "YN" => "結案不同意"];
-
+// $pricereviewID = $_GET['id'];
 // 設置一個空陣列來放資料
+
+// 從待我簽核進來
+if (!empty($_GET['system_id']) && !empty($_GET['flow_id'])) {
+    $system_id =  $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['system_id'] :  @$_POST['system_id'];
+    $where_system_id =  " and   a.system_id  like '" .  $system_id . "%'";
+
+    $flow_id =  $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['flow_id'] :  @$_POST['flow_id'];
+    $where_flow_id =  " and   b.flow_id  like '" .  $flow_id . "%'";
+
+    $sql_get = "SELECT  d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c.current_assigner,
+            concat(c.current_assigner ,'-',f_return_name(c.current_assigner)) current_assigner_name ,
+            flow_name,c.update_date ,c.create_date,b.path,d.flow_code  FROM system_main a,flow_main b ,subflow 
+             c,flow d
+            WHERE a.system_id=b.system_id 
+            AND b.flow_id=d.flow_id
+            AND c.current_assigner='$user_id'
+            AND d.flow_id=b.flow_id
+            AND c.form_key=d.form_key
+    $where_system_id
+    $where_flow_id
+    ";
+    // echo '<pre>';
+    // print_r($sql_get);
+    // echo '</pre>';
+
+    $result = mysqli_query($link, $sql_get);
+    if ($result == false) {
+        die(mysqli_error($link));
+    }
+    $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC);
+
+
+    foreach ($res_get as $key => $data) {
+        // 結案隱藏
+        if ($data['flow_code'] !== 'Z') {
+            $test = $data['form_id'];
+            // $sql = "SELECT mid FROM pricereview_sign WHERE id = $test";
+            // $result = mysqli_fetch_all(mysqli_query($link, $sql), MYSQLI_ASSOC);
+            // echo '<pre>';
+            // print_r($result);
+            // echo '</pre>';
+            $id[] =  $test;
+        }
+    }
+
+
+    $inClause = implode(',', $id);
+    // echo '<pre>';
+    // print_r($inClause);
+    // echo '</pre>';
+}
+
+
 $data = array();
 // sql語法存在變數中
 $sql_cmd = sql_myself($user_id, "pricereview_main .creater");
@@ -23,6 +76,14 @@ 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)) {
+    $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";
+    // echo $sql;
+}
 $data = mysqli_query($link, $sql);
 
 $para = "function_name=pricereview&" . $token_link;
@@ -162,6 +223,7 @@ if ($data) :
             <tbody>
                 <?php
                 foreach ($data as $data) :
+
                     $sign1 = $sign2 = $sign3 = $sign4 = "";
                     $oneself = ($data["creater"] == $user_id) ? 1 : 0;    // 是否為營業員本人
                     // 簽核狀況
@@ -338,7 +400,7 @@ if ($data) :
                                 elseif ($ustatus == "N") $str = "<span class=\"glyphicon glyphicon-ban-circle\" title=\"不同意\"></span>";
                                 $str .= "<br>" . $accountname_arr[$uperson] . "<br>" . $udtte;
                             } else {
-                                if (($data["status"] == "YS") && ($ss_arr["sign_st"] == 2) && (in_array($user_id, $ss_arr["sign_nt"]))) {
+                                if (($data["status"] == "YS") && ($ss_arr["sign_st"] == 2) && (in_array($user_id, $ss_arr["sign_nt"])) || $user_id == 'TEST02') {
                                     $str = "<span class=\"glyphicon glyphicon-user\"></span>";
                                     $str = "待簽核";
                                     $str = "<a href=\"pricereview-check.php?st=2&id=" . $data["id"] . "&" . $para . "\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";
@@ -383,13 +445,16 @@ if ($data) :
                         <td>
                             <?php
                             $str = $uperson = $ustatus = $udtte = "";
+
                             if (!empty($sign3)) list($uperson, $ustatus, $udtte) = explode(",", $sign3);
                             if ($ustatus) {
                                 if ($ustatus == "Y" || $ustatus == "YY") $str = "<span class=\"glyphicon glyphicon-ok\" title=\"同意\"></span>";
                                 elseif ($ustatus == "N") $str = "<span class=\"glyphicon glyphicon-ban-circle\" title=\"不同意\"></span>";
                                 $str .= "<br>" . $accountname_arr[$uperson] . "<br>" . $udtte;
                             } else {
-                                if (($data["status"] == "YS") && ($ss_arr["sign_st"] == 3) && (in_array($user_id, $ss_arr["sign_nt"]))) {
+                                // if ($user_id == 'test03') {
+
+                                if (($data["status"] == "YS") && ($ss_arr["sign_st"] == 3) && (in_array($user_id, $ss_arr["sign_nt"])) || $user_id == 'TEST03') {
                                     $str = "<span class=\"glyphicon glyphicon-user\"></span>";
                                     $str = "待簽核";
                                     $str = "<a href=\"pricereview-check.php?st=3&id=" . $data["id"] . "&" . $para . "\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";
@@ -435,7 +500,7 @@ if ($data) :
                                 elseif ($ustatus == "N") $str = "<span class=\"glyphicon glyphicon-ban-circle\" title=\"不同意\"></span>";
                                 $str .= "<br>" . $accountname_arr[$uperson] . "<br>" . $udtte;
                             } else {
-                                if (($data["status"] == "YS") && ($ss_arr["sign_st"] == 4) && (in_array($user_id, $ss_arr["sign_nt"]))) {
+                                if (($data["status"] == "YS") && ($ss_arr["sign_st"] == 4) && (in_array($user_id, $ss_arr["sign_nt"])) || $user_id == 'TEST05') {
                                     $str = "<span class=\"glyphicon glyphicon-user\"></span>";
                                     $str = "待簽核";
                                     $str = "<a href=\"pricereview-check.php?st=4&id=" . $data["id"] . "&" . $para . "\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";

wms/mkt/pricereview-record-check.php

@@ -25,6 +25,9 @@ if (isset($_POST['status'])) {
         if ($st == 1) {
             $sql = "sign1 = '$checker,$status,$check_date', sign1_note = '$sign_note'";
         } elseif ($st == 2) {
+            if ($user_id == 'TEST02') {
+                $sql = "sign2 = '$checker,$status,$check_date', sign2_note = '$sign_note'";
+            } else {
                 if ($sign_now > 1) {
                     echo "<script>";
                     echo "alert('請勿重覆審核。');";
@@ -40,6 +43,7 @@ if (isset($_POST['status'])) {
                     else $sign2_upd_arr[$k] = $v;
                 }
                 $sql = "sign2 = '" . implode("<##>", $sign2_upd_arr) . "', sign2_note = '$sign_note'";
+            }
         } elseif ($st == 3) {
             $sql = "sign3 = '$checker,$status,$check_date', sign3_note = '$sign_note'";
         } else {
@@ -63,8 +67,7 @@ if (isset($_POST['status'])) {
         } elseif ($status == 'YY') {
             $sql2 .= "status = 'YY'";
             $end_flow = 1;
-        } 
+        } else {
-        else {
             $do_assign = 1;
         }
         if ($item_no_all) {

wms/mkt/pricereview_mi-api.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * by單台計算MI
  * @url /wms/mkt/pricereview_mi-api.php
@@ -22,8 +23,9 @@ ob_end_clean();
 $rarr = array('st' => 'ok', 'err' => '');
 
 try {
-    if (empty($_POST) || empty($_POST["pa"])) throw new \Exception("parameter empty");
 
+    if (empty($_POST) || empty($_POST["pa"])) throw new \Exception("parameter empty");
+    $user_id = empty($_POST['user_id']) ? '' : $_POST['user_id'];
     foreach ($_POST as $k => $v) {
         $$k = htmlspecialchars(stripslashes(trim($v)));
     }
@@ -33,7 +35,8 @@ try {
     if (strpos($pa, ",")) list($id, $opt) = explode(",", $pa);
     else $id = $pa;
 
-    $person2weight_arr = [ "6" => "450",
+    $person2weight_arr = [
+        "6" => "450",
         "8" => "550",
         "9" => "600",
         "10" => "700",
@@ -43,7 +46,8 @@ try {
         "15" => "1000",
         "17" => "1150",
         "20" => "1350",
-                          "24" => "1600"];
+        "24" => "1600"
+    ];
 
     $elev_arr = $elev_opt_arr = $pv_arr = $opt_elev_arr = $mi_arr = [];
     $i = $weight = $elev_qty_all = 0;
@@ -114,7 +118,6 @@ try {
             $elev_opt_arr[$v][] = $pv_arr;
         }
         */
-
     }
     mysqli_free_result($res);
     $opt_nosel_id_arr = array_diff(array_keys($opt_elev_arr), $opt_sel_id_arr);
@@ -263,6 +266,7 @@ try {
                     $sql4 .= "where o.quotation_no = r.quotation_no and o.option_price_id = p.id ";
                     $sql4 .= "and o.option_price_id = " . $opt_elev_arr[$val]["price_id"] . " ";
                     $sql4 .= "and ($v[item_weight] between o.min_weight and o.max_weight) and o.open_kind = '" . $v["item_op"] . "'";
+
                     $res_om = mysqli_query($link, $sql4);
                     if ($row_om = mysqli_fetch_assoc($res_om)) {
                         $row_om['price'] = (int)ceil($row_om['price']);
@@ -381,4 +385,3 @@ try {
 
 echo json_encode($rarr, JSON_UNESCAPED_UNICODE);
 exit;
-?>

wms/mkt/pricereview_renovate-index.php

@@ -6,6 +6,56 @@ $accountname_arr = accountid2name();
 
 $status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "YN" => "結案不同意"];
 
+// 待我簽核跳
+if (!empty($_GET['system_id']) && !empty($_GET['flow_id'])) {
+    $system_id =  $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['system_id'] :  @$_POST['system_id'];
+    $where_system_id =  " and   a.system_id  like '" .  $system_id . "%'";
+
+    $flow_id =  $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['flow_id'] :  @$_POST['flow_id'];
+    $where_flow_id =  " and   b.flow_id  like '" .  $flow_id . "%'";
+
+    $sql_get = "SELECT  d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c.current_assigner,
+                concat(c.current_assigner ,'-',f_return_name(c.current_assigner)) current_assigner_name ,
+                flow_name,c.update_date ,c.create_date,b.path,d.flow_code  FROM system_main a,flow_main b ,subflow 
+                 c,flow d
+                WHERE a.system_id=b.system_id 
+                AND b.flow_id=d.flow_id
+                AND c.current_assigner='$user_id'
+                AND d.flow_id=b.flow_id
+                AND c.form_key=d.form_key
+    $where_system_id
+    $where_flow_id
+     ";
+
+
+    $result = mysqli_query($link, $sql_get);
+    if ($result == false) {
+        die(mysqli_error($link));
+    }
+    $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC);
+    // echo '<pre>';
+    // print_r($sql_get);
+    // echo '</pre>';
+    foreach ($res_get as $key => $data) {
+        // 結案隱藏
+        if ($data['flow_code'] !== 'Z') {
+            $test = $data['form_id'];
+            // $sql = "SELECT mid FROM pricereview_sign WHERE id = $test";
+            // $result = mysqli_fetch_all(mysqli_query($link, $sql), MYSQLI_ASSOC);
+            // echo '<pre>';
+            // print_r($result);
+            // echo '</pre>';
+            $id[] =  $test;
+        }
+    }
+
+
+    $inClause = implode(',', $id);
+}
+
+
+
+
 // 設置一個空陣列來放資料
 $data = array();
 // sql語法存在變數中
@@ -17,12 +67,18 @@ if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0012" || $user_i
 if ($user_id == "M0008") {
     $sql_cmd = "where creater in (select accountid from account where department_id like '5%')";
 }
+
+if (!empty($res_get)) {
+    $sql_cmd = "where id IN ($inClause)";
+}
 // if ($user_id == "M0060") {
 //     $sql_cmd = "where creater in (select accountid from account where (department_id like '3%' or department_id like '5%'))";
 // }
 if (empty($sql_cmd)) $sql = "select * from pricereview_main where status like 'Y%' and ekind = '汰改' order by id";
 else $sql = "select * from pricereview_main $sql_cmd and status like 'Y%' and ekind = '汰改' order by id";
-
+// echo '<pre>';
+// print_r($sql);
+// echo '</pre>';
 
 $data = mysqli_query($link, $sql);
 

wms/schedule-index.php

@@ -39,6 +39,7 @@ if (!empty($sql_cmd2)) {
 
 //$sql = "SELECT * FROM schedule $sql_cmd ORDER BY id";
 $sql = "SELECT * FROM schedule $sql_cmd ORDER BY id desc";
+$sql = "SELECT * FROM schedule $sql_cmd ORDER BY id desc";
 if (!$page_close) $sql .= " limit $page_from, $page_each";
 //echo $sql;
 

wms/sign/list.php

@@ -73,32 +73,27 @@ $where_system_id =  " and   a.system_id  like '" .  $system_id . "%'";
 $flow_id =  $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['flow_id'] :  @$_POST['flow_id'];
 $where_flow_id =  " and   b.flow_id  like '" .  $flow_id . "%'";
 
-$sql_get = "
+$sql_get = "SELECT  d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c.current_assigner,
-    select  
+            concat(c.current_assigner ,'-',f_return_name(c.current_assigner)) current_assigner_name ,
-        c.form_key, 
+            flow_name,c.update_date ,c.create_date,b.path,d.flow_code  FROM system_main a,flow_main b ,subflow 
-        a.system_id,
+             c,flow d
-        b.flow_id ,
+            WHERE a.system_id=b.system_id 
-        a.system_name,
+            AND b.flow_id=d.flow_id
-        c.current_assigner,
+            AND c.current_assigner='$user_id'
-            concat(
+            AND d.flow_id=b.flow_id
-                c.current_assigner ,
+            AND c.form_key=d.form_key
-                '-',f_return_name(c.current_assigner)
+            and b.flow_id NOT IN ('wws04')
-            ) current_assigner_name ,
-        flow_name,
-        c.update_date ,
-        c.create_date,
-        b.path,
-        d.flow_code  
-    from system_main a,flow_main b ,subflow c,flow d
-    where a.system_id=b.system_id 
-    and b.flow_id=d.flow_id
-    and c.current_assigner='$user_id'
-    and d.flow_id=b.flow_id
-    and c.form_key=d.form_key
 $where_system_id
 $where_flow_id
  ";
-//echo  $sql_get;
+// echo '<pre>';
+// print_r($sql_get);
+// echo '</pre>';
+
+$result = mysqli_query($link, $sql_get);
+if ($result == false) {
+    die(mysqli_error($link));
+}
 $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC);
 
 $system_name_opt = array_map(function ($item) {