對帳增加客戶名稱

wms/T8_APItest.php

@@ -5,8 +5,8 @@ echo "ii";
 <script>
   get_Auth();
   window.addEventListener('message', function(event) {
-    // if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
-      if (event.origin === "https://masada.com.tw" && (typeof event.data === "string")) {
+    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("event");
       console.log(validation);

wms/T8_Authorization.php

@@ -27,11 +27,11 @@ $sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
             headers: headerParam,
             success: function(res) {
                 validation = res.Data['CHI_Authorization'];
-                // window.parent.postMessage(validation,'http://localhost:3000');
-                window.parent.postMessage(validation,'https://masada.com.tw');
+                console.log("validation：",validation);
+                window.parent.postMessage(validation,'http://localhost:3000');
+                // window.parent.postMessage(validation,'https://masada.com.tw');
             }
         };
         jQuery.ajax(obj);
-        console.log(validation);
     }
 </script>

wms/account-receivable-index.php

@@ -8,7 +8,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 $arrayData = [];
-echo "合約號,部門,經理,營業員,簽約款,二次款,貨抵工地款,安裝款,試車款,交車款,取得許可證約交款,取得許可函後6個月約交款,狀態</br>";
+echo "合約號,部門,經理,營業員,客戶名稱,簽約款,二次款,貨抵工地款,安裝款,試車款,交車款,取得許可證約交款,取得許可函後6個月約交款,狀態</br>";
 
 // $T8_array = mysqli_fetch_all($T8_array, MYSQLI_ASSOC);
 
@@ -17,8 +17,10 @@ echo "合約號,部門,經理,營業員,簽約款,二次款,貨抵工地款,安
 // $deptype = mysqli_fetch_all($dept_query, MYSQLI_ASSOC);
 
 
-$sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt FROM salOrderStagePay AS a 
-LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo WHERE s.ModeId = 'M' AND (s.CurrentState=2 OR s.CurrentState=4) ";
+$sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt,s.BizPartnerId,c.BizPartnerName FROM salOrderStagePay AS a 
+LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo 
+LEFT JOIN comBusinessPartner as c ON s.BizPartnerId=c.BizPartnerId 
+WHERE s.ModeId = 'M' AND (s.CurrentState=2 OR s.CurrentState=4)  ";
 $contract = $conn->query($sql_contract);
 foreach ($contract as $cont) {
     // print_r($cont);
@@ -26,6 +28,7 @@ foreach ($contract as $cont) {
     $BillNo =  $cont['BillNo'];
     $PayStage = $cont['PayStage'];
     $PayAmount = $cont['PlanPayAmt'];
+    $partnerName = $cont['BizPartnerName'];
 
     if (isset($arrayData[$BillNo])) {
         if (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60')) {
@@ -49,6 +52,7 @@ foreach ($contract as $cont) {
         }
     } else {
         $arrayData[$BillNo] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+        $arrayData[$BillNo][3] = $partnerName;
         if (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60')) {
             $arrayData[$BillNo][5] = $PayAmount;
         } elseif ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金')) {
@@ -105,7 +109,7 @@ FROM department
 
 ) AS d
 ON d.department_id = tmp2.department_id";
-$facitities = "";
+    $facitities = "";
 
     $wipwhole_array = mysqli_query($link, $sql);
     foreach ($wipwhole_array as $wip) {
@@ -119,14 +123,14 @@ $facitities = "";
         } elseif ($wip['install_end_date'] != NULL) {
             $facitities .= $wip['facilityno'] . "(" . $wip['install_end_date'] . "安裝完畢);\n";
         } elseif ($wip['real_arrival_date'] != NULL) {
-            $facitities .= $wip['facilityno'] . "(".$wip['real_arrival_date'] . "貨抵工地);\n";
+            $facitities .= $wip['facilityno'] . "(" . $wip['real_arrival_date'] . "貨抵工地);\n";
         } elseif ($wip['actual_tofactory_date'] != NULL) {
             $facitities .= $wip['facilityno'] . "(" . $wip['actual_tofactory_date'] . "實際到觀音日);\n";
-        }elseif ($wip['estimated_shipping_date'] != NULL) {
+        } elseif ($wip['estimated_shipping_date'] != NULL) {
             $facitities .= $wip['facilityno'] . "(" . $wip['estimated_shipping_date'] . "預計到港);\n";
-        }else {
+        } else {
             $facitities .= $wip['facilityno'] . "(預計到港日待確認);\n";
         }
     }
-    echo $key . "," . $value[0] . "," . $value[1] . "," . $value[2] . "," . $value[4] . "," . $value[5] . "," . $value[6] . "," . $value[7] . "," . $value[8] . "," . $value[9] . "," . $value[10] . "," . $value[11] . ",". $facitities . "<br>";
+    echo $key . "," . $value[0] . "," . $value[1] . "," . $value[2] . "," . $value[3] . "," . $value[4] . "," . $value[5] . "," . $value[6] . "," . $value[7] . "," . $value[8] . "," . $value[9] . "," . $value[10] . "," . $value[11] . "," . $facitities . "<br>";
 }