diff --git a/wms/T8_APItest.php b/wms/T8_APItest.php
index 713838bf..d327c6e5 100644
--- a/wms/T8_APItest.php
+++ b/wms/T8_APItest.php
@@ -5,8 +5,8 @@ echo "ii";
\ No newline at end of file
diff --git a/wms/account-receivable-index.php b/wms/account-receivable-index.php
index e7e2afb0..6cd28f13 100644
--- a/wms/account-receivable-index.php
+++ b/wms/account-receivable-index.php
@@ -8,7 +8,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
$arrayData = [];
-echo "合約號,部門,經理,營業員,簽約款,二次款,貨抵工地款,安裝款,試車款,交車款,取得許可證約交款,取得許可函後6個月約交款,狀態";
+echo "合約號,部門,經理,營業員,客戶名稱,簽約款,二次款,貨抵工地款,安裝款,試車款,交車款,取得許可證約交款,取得許可函後6個月約交款,狀態";
// $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 . "
";
+ 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 . "
";
}