M0117
/
gary_wms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

0205衝突

gary
Ellin 1 year ago
parent
4e42a14298
commit
ad01146025
4 changed files with 9 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 96
      wms/account-receivable-renovate-index.php
  2. 11
      wms/account-receivable-repair-index.php
  3. 6
      wms/excel/import.php
  4. 4
      wms/mkt/pricereview_mi-api.php

96
wms/account-receivable-renovate-index.php
View File

@ -59,10 +59,6 @@ SELECT * FROM account_received ";
// 設定權限：看到自己的/下屬的，資訊處跟財會處可以看全部的
if ((in_array($user_id, array('M0060', 'M0175'))) || (in_array(accountidToDepartId($user_id), array('220', '210')))) {
} else {
<<<<<<< HEAD
// $sql_received .= " AND (PersonId = '$user_id'";
=======
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$sql_opening .= " OR person_id = '$user_id'";
$sql_contractNumber .= " AND (PersonId = '$user_id'";
if (count($follower) > 0) {
@ -72,10 +68,6 @@ if ((in_array($user_id, array('M0060', 'M0175'))) || (in_array(accountidToDepart
$sql_contractNumber .= " OR PersonId IN $column_str)";
$sql_opening .= " OR person_id IN $column_str)";
} else {
<<<<<<< HEAD
// $sql_received .= ")";
=======
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$sql_opening .= ")";
$sql_contractNumber .= ")";
};
@ -386,77 +378,46 @@ foreach ($arrayData as &$value) {
switch ($facility['PayStage'][$stage]['name']) {
case (stristr($facility['PayStage'][$stage]['name'], '試車')):
if (isset($wipwhole_status[$fakey]['tryrun_end_date']) && $wipwhole_status[$fakey]['tryrun_end_date'] !== NULL && !empty($wipwhole_status[$fakey]['tryrun_end_date'])) {
<<<<<<< HEAD
$haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
=======
$haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['tryrun_end_date'])));
}
break;
case (stristr($facility['PayStage'][$stage]['name'], '完工')):
if (isset($wipwhole_status[$fakey]['delivery_date']) && $wipwhole_status[$fakey]['delivery_date'] !== NULL && !empty($wipwhole_status[$fakey]['delivery_date'])) {
<<<<<<< HEAD
$haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
=======
$haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['delivery_date'])));
}
break;
case (stristr($facility['PayStage'][$stage]['name'], '尾款')):
if (isset($wipwhole_status[$fakey]['delivery_date']) && $wipwhole_status[$fakey]['delivery_date'] !== NULL && !empty($wipwhole_status[$fakey]['delivery_date'])) {
<<<<<<< HEAD
$haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
=======
$haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['delivery_date'])));
}
break;
case (stristr($facility['PayStage'][$stage]['name'], '交車')):
if (isset($wipwhole_status[$fakey]['delivery_date']) && $wipwhole_status[$fakey]['delivery_date'] !== NULL && !empty($wipwhole_status[$fakey]['delivery_date'])) {
<<<<<<< HEAD
$haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
=======
$haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['delivery_date'])));
}
break;
case (stristr($facility['PayStage'][$stage]['name'], '驗收')):
if (isset($wipwhole_status[$fakey]['delivery_date']) && $wipwhole_status[$fakey]['delivery_date'] !== NULL && !empty($wipwhole_status[$fakey]['delivery_date'])) {
<<<<<<< HEAD
$haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
=======
$haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['delivery_date'])));
}
break;
case (stristr($facility['PayStage'][$stage]['name'], '安裝')):
if (isset($wipwhole_status[$fakey]['install_end_date']) && $wipwhole_status[$fakey]['install_end_date'] !== NULL && !empty($wipwhole_status[$fakey]['install_end_date'])) {
<<<<<<< HEAD
$haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
=======
$haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['install_end_date'])));
}
break;
case (stristr($facility['PayStage'][$stage]['name'], '貨抵工地')):
if (isset($wipwhole_status[$fakey]['real_arrival_date']) && $wipwhole_status[$fakey]['real_arrival_date'] !== NULL && !empty($wipwhole_status[$fakey]['real_arrival_date'])) {
<<<<<<< HEAD
$haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['real_arrival_date'])));
} elseif (isset($wipwhole_status[$fakey]['real_contract_arrival_date']) && $wipwhole_status[$fakey]['real_contract_arrival_date'] !== NULL && !empty($wipwhole_status[$fakey]['real_contract_arrival_date'])) {
$haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
=======
$haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['real_arrival_date'])));
} elseif (isset($wipwhole_status[$fakey]['real_contract_arrival_date']) && $wipwhole_status[$fakey]['real_contract_arrival_date'] !== NULL && !empty($wipwhole_status[$fakey]['real_contract_arrival_date'])) {
$haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['real_contract_arrival_date'])));
}
break;
@ -550,35 +511,6 @@ foreach ($final_paystage as $key => &$payStage) {
}
}
<<<<<<< HEAD
// foreach ($arrayData as &$value) {
// if (is_iterable($value['facility'])) {
// foreach ($value['facility'] as $fakey => &$facility) {
// // foreach ($facility['PayStage'] as $index => &$payStage) {
// // // $payStage['sequenceNumber'] = $allPayStages[$value[10]][$index]['sequenceNumber'];
// // echo $index." => ";
// // print_r($payStage);
// // echo "<br>";
// // }
// echo $fakey." => ";
// print_r($facility);
// echo "<br>";
// }
// }
// print_r($value);
// echo "---------------------<br>";
// }
// foreach ($final_paystage as $key => $payStage) {
// echo $key . "<br>";
// for ($sequence = 1; $sequence <= count($payStage); $sequence++) {
// print_r($payStage[$sequence]);
// echo "<br>";
// }
// echo "---------------------<br>";
// }
// exit();
=======
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
// 0 部門id 1 部門名稱 2 經理名稱 3 營業員id 4 營業員名稱 5 客戶名稱 6 抬頭 7 統編 8 通訊地址 9 T8單據日期 10 合約號
// 0 合約號 1 作番號 2 部門id 3 部門名稱 4 經理名稱 5 營業員id 6 營業員名稱 7 客戶名稱 8 抬頭 9 統編 10 通訊地址
// 11 收款階段名稱 12 應收日期 13 收款金額 14 已開金額 15 已收金額 16 催收次數
@ -587,10 +519,6 @@ $today = strtotime(date('Ymt'));
foreach ($arrayData as $key => $value) {
if (isset($final_paystage[$key])) {
for ($sequence = 1; $sequence <= count($final_paystage[$key]); $sequence++) {
<<<<<<< HEAD
$keyname = $key . $final_paystage[$key][$sequence]['sequenceNumber'];
=======
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$value[4] = (isset($value[4]) && !empty($value[4])) ? $value[4] : '--';
$value[5] = (isset($value[5]) && !empty($value[5])) ? $value[5] : '--';
$value[6] = (isset($value[6]) && !empty($value[6])) ? $value[6] : '--';
@ -599,23 +527,16 @@ foreach ($arrayData as $key => $value) {
$value[11] = (isset($value[11]) && !empty($value[11])) ? $value[11] : '--';
$value[12] = (isset($value[12]) && !empty($value[12])) ? date('Y/m/d', strtotime($value[12])) : '--';
$thisPayStage = $final_paystage[$key][$sequence];
<<<<<<< HEAD
$havetopay = ($today >= $thisPayStage['PlanPayDate']) ? "V" : "--";
=======
$keyname = $key . "/" . $final_paystage[$key][$sequence]['facilityno'] . "/" . $value[5];
$havetopay = ($today >= strtotime($thisPayStage['PlanPayDate'])) ? "V" : "--";
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
switch ($havetopay) {
case "V":
$unInvoiceAmount = $thisPayStage['PayAmount'] - $thisPayStage['InvoiceAmount'];
$unReceivedAmount = $thisPayStage['PayAmount'] - $thisPayStage['receivedAmount'];
break;
default:
<<<<<<< HEAD
=======
$unInvoiceAmount = 0;
$unReceivedAmount = 0;
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
break;
}
$excel_aray[$keyname] = [
@ -689,11 +610,6 @@ $total_data = json_encode($excel_aray);
<h3><strong>合約 (汰改)統整資訊</strong></h3>
</div>
</div>
<<<<<<< HEAD
<div style="overflow-x:auto;">
<table id="table_index" class="table table-striped table-bordered" style="width:100%">
=======
<?php
include "./footer.php";
?>
@ -703,7 +619,6 @@ include "./footer.php";
</div>
<div style="width: 98%; margin:1%;" style="overflow-x:auto;">
<table class="table table-striped table-bordered" style="width:100%">
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
<thead>
<tr>
<th style='text-align:center;vertical-align: middle;width:120px'>合約號</th>
@ -724,13 +639,8 @@ include "./footer.php";
</tr>
</thead>
<tbody>
<<<<<<< HEAD
<?php foreach ($excel_aray as $row) { ?>
<tr>
=======
<?php foreach ($excel_aray as $key => $row) { ?>
<tr class="data-row" style="display: '';" id="<?= $key; ?>">
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
<td><?= $row[0]; ?></td>
<td><?= $row[1]; ?></td>
<td><?= $row[2] . "<br>" . $row[3]; ?></td>
@ -753,8 +663,6 @@ include "./footer.php";
</div>
<script>
<<<<<<< HEAD
=======
function searchData() {
var searchTerm = document.getElementById('search').value.toLowerCase();
var rows = document.getElementsByClassName('data-row');
@ -770,7 +678,6 @@ include "./footer.php";
}
}
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
function downloadData() {
var xhr = new XMLHttpRequest();
var url = window.location.origin + "/wms/account-receivable-renovate-excel.php?type=all&<?= $token_link ?>";
@ -794,12 +701,9 @@ include "./footer.php";
}));
}
<<<<<<< HEAD
=======
function check(searchname) {
console.log(searchname);
}
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
</script>

11
wms/account-receivable-repair-index.php
View File

@ -22,6 +22,11 @@ $receivable_array = [];
// T8所有合約號
$sql_contractNumber = "SELECT Distinct BillNo FROM salSalesOrder WHERE TypeId = 'SP' AND (CurrentState=2 OR CurrentState=4) ";
// T8 銷售訂單 作番金額
$sql_contract_budget = "SELECT A.BillNo,A.MaterialId, A.OAmountWithTax,A.CU_MaterialId FROM salSalesOrderDetail AS A
LEFT JOIN salSalesOrder AS B ON A.BillNo=B.BillNo
WHERE B.ModeId='T' AND A.ItemType=1 ";
// T8發票 (有專案的發票)
$sql_invoice = "SELECT DISTINCT
a.InvoiceNo, a.InvoiceTime,a.OAmountWithTax,a.InvoiceState,
@ -76,8 +81,6 @@ if ((in_array($user_id, array('M0060', 'M0175'))) || (in_array(accountidToDepart
$contractNumbers = array();
$query_contract_number = $conn->query($sql_contractNumber);
foreach ($query_contract_number as $contract_numbers) {
echo $contract_numbers['BillNo'];
echo "<br>";
array_push($contractNumbers, $contract_numbers['BillNo']);
$str_numbers = "('" . implode("','", $contractNumbers) . "')";
}
@ -91,10 +94,6 @@ if (isset($str_numbers)) {
}
// T8 銷售訂單 作番金額
$sql_contract_budget = "SELECT A.BillNo,A.MaterialId, A.OAmountWithTax,A.CU_MaterialId FROM salSalesOrderDetail AS A
LEFT JOIN salSalesOrder AS B ON A.BillNo=B.BillNo
WHERE B.ModeId='T' AND A.ItemType=1 ";
if (isset($str_numbers)) {
$sql_contract_budget .= "AND A.BillNo IN $str_numbers ";
}

6
wms/excel/import.php
View File

@ -1,5 +1,6 @@
<?php
require 'vendor/autoload.php';
namespace PhpOffice\PhpSpreadsheet;
use PhpOffice\PhpSpreadsheet\Reader\IReader;
@ -30,7 +31,7 @@ abstract class IOFactory
public const WRITER_CSV = 'Csv';
public const WRITER_HTML = 'Html';
/** @var string[] */
/** @var string[] */
private static $readers = [
self::READER_XLSX => Reader\Xlsx::class,
self::READER_XLS => Reader\Xls::class,
@ -54,6 +55,7 @@ abstract class IOFactory
return new $className();
}
}
$object = new IOFactory();
$spreadsheet = $object::createReader('Xlsx')->load('1.xlsx');
echo "success";
echo "success";

4
wms/mkt/pricereview_mi-api.php
View File

@ -488,13 +488,9 @@ try {
}
}
// $rarr["content"][] = $exceptArr;
<<<<<<< HEAD
foreach ($rarr["content"] as $idx => &$item) {
=======
print_r($rarr["content"]);
exit;
foreach($rarr["content"] as $idx=>&$item){
>>>>>>> ea503fbee65cc2bb5ce9442e618db9c6878a09cb
$newTotal = 0;
$item[16] = [];
$item[14] = [];

Write Preview
Loading…
Cancel
Save