From 8be3a86203eddb96def505c1d0329ee9ecd7e007 Mon Sep 17 00:00:00 2001 From: Cheng Date: Wed, 24 Jan 2024 16:18:25 +0800 Subject: [PATCH 01/17] 0124 --- wms/mkt/pricereview-index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php index 65398195..ceff0cdb 100644 --- a/wms/mkt/pricereview-index.php +++ b/wms/mkt/pricereview-index.php @@ -116,7 +116,7 @@ if ($user_id == "M0060") { if (empty($sql_cmd)) $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id"; else $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on contract_new_apply.mid = pricereview_main.id $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id"; -if (!empty($res_get) || $_GET['check'] == 1) { +if (!empty($res_get) || (!empty($_GET['check']) && $_GET['check'] == 1)) { $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 From 3f7479106a9db52405c4495e698bdb64d005285b Mon Sep 17 00:00:00 2001 From: 10994015 Date: Fri, 26 Jan 2024 16:56:46 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E7=B5=A6=E5=AD=90=E6=88=90=E5=90=88?= =?UTF-8?q?=E4=BD=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/contract-repair/insertFacility.php | 2 +- wms/contract/contract-download.php | 8 +- .../contract-maintainance-management.php | 114 ++++++++++++++++++ wms/contract/contract-new-apply.php | 18 ++- wms/contract/js/alpine.js | 1 + wms/contract/option/facility.xlsx | Bin 11704 -> 12281 bytes wms/contract/prviewPdf.php | 5 + wms/contract/restoremi.php | 2 +- wms/database.php | 20 +-- wms/fun_global.php | 8 +- wms/mkt/assets/js/alpine.js | 1 + wms/mkt/pricereview-index.php | 29 +++-- wms/mkt/pricereview_mi-api.php | 90 ++++++++++++-- 13 files changed, 260 insertions(+), 38 deletions(-) create mode 100644 wms/contract/contract-maintainance-management.php diff --git a/wms/contract-repair/insertFacility.php b/wms/contract-repair/insertFacility.php index 788976f3..c15206f1 100644 --- a/wms/contract-repair/insertFacility.php +++ b/wms/contract-repair/insertFacility.php @@ -5,7 +5,7 @@ ini_set('data.timezone', 'Asia/Taipei'); use PhpOffice\PhpSpreadsheet\IOFactory; -$filePath = './facility/facility.xlsx'; +// $filePath = './facility/facility.xlsx'; try { $spreadsheet = IOFactory::load($filePath); diff --git a/wms/contract/contract-download.php b/wms/contract/contract-download.php index 3693ab7d..3ae40fa2 100644 --- a/wms/contract/contract-download.php +++ b/wms/contract/contract-download.php @@ -24,6 +24,7 @@ if (isset($_GET['id']) && $_GET['id'] != "") { $stmt->bindParam(':id', $id); $stmt->execute(); $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC); + $contract = $contracts[0]; $contract_apply_id = $contract['id']; if (($contract['status'] !== "YY" && $user_id != 'M0107' && $user_id != "TEST02" && $user_id == "TEST01") && $user_id != 'M0174' && $user_id != 'M0225') { @@ -52,7 +53,8 @@ if (isset($_GET['id']) && $_GET['id'] != "") { $install_total_price = 0; // $noteArr = explode(",", $contracts[0]['note']); $noteArr = array(1, 1, 1, 1, 1); - $qty = $contracts[0]['total_items']; + // $qty = $contracts[0]['total_items']; + $qty = 1; foreach ($contracts as $idx => $amount) { $isset = false; if ($amount['pay_kind'] == 5 || $amount['pay_kind'] == 6) { @@ -413,8 +415,8 @@ if (isset($_GET['id']) && $_GET['id'] != "") { - - + + diff --git a/wms/contract/contract-maintainance-management.php b/wms/contract/contract-maintainance-management.php new file mode 100644 index 00000000..c0f94479 --- /dev/null +++ b/wms/contract/contract-maintainance-management.php @@ -0,0 +1,114 @@ +prepare($sql_str); +$stmt->execute(); +$contracts= $stmt->fetchAll(PDO::FETCH_ASSOC); + +?> + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
項次合約號客戶名稱統編營業員合約開始時間合約終止時間狀態建檔者建立時間操作
+ diff($endDate); + if ($interval->days <= 60) { + echo "60天以內。"; + } else { + echo "指定日期與當前日期相差超過60天。"; + } + + ?> + +

+ + + + + + +

+
+
+ + + \ No newline at end of file diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php index 8c8d4628..c6e8ee2c 100644 --- a/wms/contract/contract-new-apply.php +++ b/wms/contract/contract-new-apply.php @@ -97,13 +97,14 @@ if (empty($contract_new_apply)) { $stmt->bindParam(':contract_id', $id); $stmt->execute(); $files = $stmt->fetchAll(PDO::FETCH_ASSOC); - print_r($files); + // print_r($files); } $secondPayDeadline = $contract['secondPayDeadline'] ?? 0; $status = isset($contract['status']) ? $contract['status'] : -1; $progress = isset($contract['progress']) ? $contract['progress'] : 0; $person = $contract['person']; +$para = "function_name=pricereview&" . $token_link; ?> @@ -129,7 +130,8 @@ $person = $contract['person']; - + + @@ -702,4 +704,14 @@ $person = $contract['person']; } - \ No newline at end of file + + + \ No newline at end of file diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js index c93e56a0..d13d8389 100644 --- a/wms/contract/js/alpine.js +++ b/wms/contract/js/alpine.js @@ -1381,6 +1381,7 @@ const contractNewApply = () => { form.append('status', 1); form.append('review_comment', this.data.review_comment); form.append('description', this.data.description); + form.append('progress', 0); for (var i = 0; i < this.data.files.length; i++) { form.append('files[]', this.data.files[i]); } diff --git a/wms/contract/option/facility.xlsx b/wms/contract/option/facility.xlsx index 929a328d97e38352029426fd941b891003ce2636..f51a39441a3f490f6de5bb93603dcccf68a56b70 100644 GIT binary patch delta 6409 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 delta 5789 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 JGjRUh{2w8@B diff --git a/wms/contract/prviewPdf.php b/wms/contract/prviewPdf.php index 6c57d5e9..1d311b0a 100644 --- a/wms/contract/prviewPdf.php +++ b/wms/contract/prviewPdf.php @@ -19,6 +19,7 @@ if($_POST['list']){ $total_price = $_POST['total_price']; $person = $_POST['person']; $personid = $_POST['personid']; + echo "----->" . $personid; $delivery_term = $_POST['delivery_term']; $install_period = $_POST['install_period']; $free_maintainance = $_POST['free_maintainance']; @@ -45,6 +46,10 @@ if($_POST['list']){ $stmt->bindParam(':vol_no', $partyAcontractno); $stmt->execute(); $customer = $stmt->fetch(PDO::FETCH_ASSOC); + if(empty($customer)){ + echo "有望客戶資料有誤！"; + exit; + } if(count($customer) <= 0 ){ echo " +There is no record!"; +endif; + +#代表結束連線 +mysqli_close($link); + +include "footer.php"; +?> \ No newline at end of file diff --git a/wms/bons/maintance/maintenance_contract_bonus_v2_0.php b/wms/bons/maintance/maintenance_contract_bonus_v2_0.php new file mode 100644 index 00000000..c2cadb3e --- /dev/null +++ b/wms/bons/maintance/maintenance_contract_bonus_v2_0.php @@ -0,0 +1,248 @@ +$ver, #獎金版本 + "result_status"=>"success", #計算結果 + "$bonus_array"=>$bonus_array #所有獎金水庫 + ]; + +*/ + + + +function maintenance_contract_bonus_v2_0($ver, $contract_type, $contract_years, $discount, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_manger_id, $regular_contract_manger_id){ + $bonus_array = []; + if ($ver == "2.0"){ + + #契約總類($contract_type)：新簽約(new)、免保轉有費(free_to_charge)、續簽約(原價或僅契約金額異動)(renew_priceissue) + switch ($contract_type){ + case "new": + #契約員獎金($sales_bonus) + switch ($fee_per_st) { + case ($fee_per_st <= 3000): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.6; + break; + case ($fee_per_st >= 3001 and $fee_per_st <= 3499): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.7; + break; + case ($fee_per_st >= 3500 and $fee_per_st <= 3999): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.8; + break; + case ($fee_per_st >= 4000): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.9; + break; + }; + #地區經理經理獎金($region_manager_bonus) + $region_manager_bonus = 170; + #專任契約經理獎金($regular_contract_manger_bonus) + $regular_contract_manger_bonus = 300; + break; + + case "free_to_charge": + switch ($fee_per_st) { + case ($fee_per_st <= 3000): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.3; + break; + case ($fee_per_st >= 3001 and $fee_per_st <= 3499): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.35; + break; + case ($fee_per_st >= 3500 and $fee_per_st <= 3999): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.4; + break; + case ($fee_per_st >= 4000): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.5; + break; + }; + #地區經理經理獎金($region_manager_bonus) + $region_manager_bonus = 100; + #專任契約經理獎金($regular_contract_manger_bonus) + $regular_contract_manger_bonus = 100; + break; + + case "renew_priceissue": + switch ($fee_per_st) { + case ($fee_per_st <= 3000): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.25; + break; + case ($fee_per_st >= 3001 and $fee_per_st <= 3499): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.3; + break; + case ($fee_per_st >= 3500 and $fee_per_st <= 3999): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.35; + break; + case ($fee_per_st >= 4000): + $sales_bonus = ($fee_per_st - $commission_fee) * 0.4; + break; + }; + #地區經理經理獎金($region_manager_bonus) + $region_manager_bonus = 100; + #專任契約經理獎金($regular_contract_manger_bonus) + $regular_contract_manger_bonus = 100; + break; + }; + + #合約折扣率($discount)：大於80%以上(含)(above_80)、60-79%(含)以上(60_to_79)、折扣率59% (含)以下(below_59) + switch ($discount) { + case ($discount < 0.6): + $sales_bonus = $sales_bonus * 0.7; + break; + case ($discount >= 0.6 and $discount < 0.8): + $sales_bonus = $sales_bonus * 0.8; + break; + case ($discount >= 0.8): + $sales_bonus = $sales_bonus * 1.0; + break; + }; + + #簽約年數($contract_years)：1年(1)，超過1年(above) + + switch ($contract_years){ + case $contract_years == "one": + #契約員獎金 + array_push($bonus_array,[ + "bonus_type" => "契約員獎金", #獎金名稱 + "bonus_receiver" => $sales_id, #發放人員 + "bonus_amount" => round($sales_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + + #地區經理經理獎金 + array_push($bonus_array,[ + "bonus_type" => "地區經理獎金", #獎金名稱 + "bonus_receiver" => $region_manger_id, #發放人員 + "bonus_amount" => round($region_manager_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + + #專任契約經理獎金 + array_push($bonus_array,[ + "bonus_type" => "專任契約經理獎金", #獎金名稱 + "bonus_receiver" => $regular_contract_manger_id, #發放人員 + "bonus_amount" => round($regular_contract_manger_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + + $result_array = [ + "ver"=>$ver, #獎金版本 + "result_status"=>"success", #計算結果 + "bonus_array"=>$bonus_array #獎金水庫 + ]; + break; + + case $contract_years == "above_two": + /*** 以下第1年獎金 ***/ + #契約員獎金 + array_push($bonus_array,[ + "bonus_type" => "契約員獎金", #獎金名稱 + "bonus_receiver" => $sales_id, #發放人員 + "bonus_amount" => round($sales_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + + #地區經理經理獎金 + array_push($bonus_array,[ + "bonus_type" => "地區經理獎金", #獎金名稱 + "bonus_receiver" => $region_manger_id, #發放人員 + "bonus_amount" => round($region_manager_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + + #專任契約經理獎金 + array_push($bonus_array,[ + "bonus_type" => "專任契約經理獎金", #獎金名稱 + "bonus_receiver" => $regular_contract_manger_id, #發放人員 + "bonus_amount" => round($regular_contract_manger_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + /*** 以上第1年獎金 ***/ + + /*** 以下第2年獎金 ***/ + #第2年契約員獎金 + array_push($bonus_array,[ + "bonus_type" => "契約員獎金", #獎金名稱 + "bonus_receiver" => $sales_id, #發放人員 + "bonus_amount" => round($sales_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +13 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + + #第2年地區經理經理獎金 + array_push($bonus_array,[ + "bonus_type" => "地區經理獎金", #獎金名稱 + "bonus_receiver" => $region_manger_id, #發放人員 + "bonus_amount" => round($region_manager_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +13 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + + #第2年專任契約經理獎金 + array_push($bonus_array,[ + "bonus_type" => "專任契約經理獎金", #獎金名稱 + "bonus_receiver" => $regular_contract_manger_id, #發放人員 + "bonus_amount" => round($regular_contract_manger_bonus), #金額 + "pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +13 months")), #預計發放時間 + "bonus_regulation" => "合約簽回及保養款項收回的次月一次性發" #發放規定 + ]); + /*** 以上第2年獎金 ***/ + + $result_array = [ + "ver"=>$ver, #獎金版本 + "result_status"=>"success", #計算結果 + "bonus_array"=>$bonus_array #獎金水庫 + ]; + break; + } + }else{ + array_push($bonus_array,[ + "bonus_type" => "error", #獎金名稱 + "bonus_receiver" => "error", #發放人員 + "bonus_amount" => 0, #金額 + "pay_day_due" => "9999-1-1", #預計發放時間 + "bonus_regulation" => "error" #發放規定 + ]); + $result_array = [ + "ver"=>$ver, #獎金版本 + "result_status"=>"error", #計算結果 + "bonus_array"=>$bonus_array #獎金水庫 + ]; + } + + return $result_array; +}; + + +?> diff --git a/wms/bons/maintance/maintenance_contract_bonus_v2_0_examination.php b/wms/bons/maintance/maintenance_contract_bonus_v2_0_examination.php new file mode 100644 index 00000000..de316b53 --- /dev/null +++ b/wms/bons/maintance/maintenance_contract_bonus_v2_0_examination.php @@ -0,0 +1,156 @@ +$ver, #獎金版本 + "result_status"=>"success", #計算結果 + "$bonus_array"=>$bonus_array #所有獎金水庫 + ]; + +*/ + + +require_once("maintenance_contract_bonus_v2_0.php"); + + + +#獎金測試 +$examination_array = [ + #錯誤版本 + ["1.0","new","one",0.8,4000,333, "2014-07-01", "M0001", "M0002", "M0003"], + #新簽約 + ["2.0","new","one",0.8,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3000元 + ["2.0","new","one",0.8,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3200元 + ["2.0","new","one",0.8,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3500元 + ["2.0","new","one",0.8,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、4000元 + ["2.0","new","one",0.7,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3000元 + ["2.0","new","one",0.7,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3200元 + ["2.0","new","one",0.7,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3500元 + ["2.0","new","one",0.7,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、4000元 + ["2.0","new","one",0.6,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3000元 + ["2.0","new","one",0.6,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3200元 + ["2.0","new","one",0.6,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3500元 + ["2.0","new","one",0.6,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、4000元 + ["2.0","new","above_two",0.8,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3000元 + ["2.0","new","above_two",0.8,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3200元 + ["2.0","new","above_two",0.8,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3500元 + ["2.0","new","above_two",0.8,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、4000元 + ["2.0","new","above_two",0.7,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3000元 + ["2.0","new","above_two",0.7,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3200元 + ["2.0","new","above_two",0.7,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3500元 + ["2.0","new","above_two",0.7,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、4000元 + ["2.0","new","above_two",0.6,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3000元 + ["2.0","new","above_two",0.6,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3200元 + ["2.0","new","above_two",0.6,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3500元 + ["2.0","new","above_two",0.6,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、4000元 + + #免保轉有費(free_to_charge) + ["2.0","free_to_charge","one",0.8,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3000元 + ["2.0","free_to_charge","one",0.8,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3200元 + ["2.0","free_to_charge","one",0.8,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3500元 + ["2.0","free_to_charge","one",0.8,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、4000元 + ["2.0","free_to_charge","one",0.7,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3000元 + ["2.0","free_to_charge","one",0.7,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3200元 + ["2.0","free_to_charge","one",0.7,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3500元 + ["2.0","free_to_charge","one",0.7,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、4000元 + ["2.0","free_to_charge","one",0.6,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3000元 + ["2.0","free_to_charge","one",0.6,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3200元 + ["2.0","free_to_charge","one",0.6,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3500元 + ["2.0","free_to_charge","one",0.6,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、4000元 + ["2.0","free_to_charge","above_two",0.8,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3000元 + ["2.0","free_to_charge","above_two",0.8,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3200元 + ["2.0","free_to_charge","above_two",0.8,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3500元 + ["2.0","free_to_charge","above_two",0.8,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、4000元 + ["2.0","free_to_charge","above_two",0.7,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3000元 + ["2.0","free_to_charge","above_two",0.7,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3200元 + ["2.0","free_to_charge","above_two",0.7,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3500元 + ["2.0","free_to_charge","above_two",0.7,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、4000元 + ["2.0","free_to_charge","above_two",0.6,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3000元 + ["2.0","free_to_charge","above_two",0.6,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3200元 + ["2.0","free_to_charge","above_two",0.6,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3500元 + ["2.0","free_to_charge","above_two",0.6,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、4000元 + + #續簽約(原價或僅契約金額異動)(renew_priceissue) + ["2.0","renew_priceissue","one",0.8,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3000元 + ["2.0","renew_priceissue","one",0.8,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3200元 + ["2.0","renew_priceissue","one",0.8,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、3500元 + ["2.0","renew_priceissue","one",0.8,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.8、4000元 + ["2.0","renew_priceissue","one",0.7,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3000元 + ["2.0","renew_priceissue","one",0.7,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3200元 + ["2.0","renew_priceissue","one",0.7,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、3500元 + ["2.0","renew_priceissue","one",0.7,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.7、4000元 + ["2.0","renew_priceissue","one",0.6,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3000元 + ["2.0","renew_priceissue","one",0.6,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3200元 + ["2.0","renew_priceissue","one",0.6,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、3500元 + ["2.0","renew_priceissue","one",0.6,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、1年、折扣率0.6、4000元 + ["2.0","renew_priceissue","above_two",0.8,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3000元 + ["2.0","renew_priceissue","above_two",0.8,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3200元 + ["2.0","renew_priceissue","above_two",0.8,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、3500元 + ["2.0","renew_priceissue","above_two",0.8,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.8、4000元 + ["2.0","renew_priceissue","above_two",0.7,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3000元 + ["2.0","renew_priceissue","above_two",0.7,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3200元 + ["2.0","renew_priceissue","above_two",0.7,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、3500元 + ["2.0","renew_priceissue","above_two",0.7,4000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.7、4000元 + ["2.0","renew_priceissue","above_two",0.6,3000,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3000元 + ["2.0","renew_priceissue","above_two",0.6,3200,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3200元 + ["2.0","renew_priceissue","above_two",0.6,3500,333,"2014-07-01", "M0001", "M0002", "M0003"], #新簽約、2年以上、折扣率0.6、3500元 + ["2.0","renew_priceissue","above_two",0.6,4000,333,"2014-07-01", "M0001", "M0002", "M0003"] #新簽約、2年以上、折扣率0.6、4000元 +]; + + + +for($i = 0; $i"; + echo "計算結果:" . $result["result_status"] . "
"; + echo "輸入參數：" . $examination_array[$i][1] . " " . $examination_array[$i][2] . " " . $examination_array[$i][3] . " " . $examination_array[$i][4] . " " + . $examination_array[$i][5] . " " . $examination_array[$i][6] . " " . $examination_array[$i][7]. " " . $examination_array[$i][8] . "
"; + for($j = 0; $j"; + }; + echo "-------------------------" . "
"; + +}; + + +?> diff --git a/wms/contract/api/T8salIncomeApply.php b/wms/contract/api/T8salIncomeApply.php index 96246a7c..0a3d7698 100644 --- a/wms/contract/api/T8salIncomeApply.php +++ b/wms/contract/api/T8salIncomeApply.php @@ -29,9 +29,7 @@ function T8API($data) echo 'API傳入失敗，' . $result['ErrorMsg']; return $result; } else { - // echo '
';
             // print_r($result);
-            // echo '
'; return $result; } } diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php index d9b9f8b8..5f099f45 100644 --- a/wms/contract/api/postContractData.php +++ b/wms/contract/api/postContractData.php @@ -459,12 +459,12 @@ function T8insert($data, $facilityno) // print_r($elevators['maintainance']); // echo ''; foreach ($elevators as $index => $elevator) { - $type[] = $elevator['maintainance']; - if ($type[$index] == 'A') { + $type = $elevator['maintainance']; + if ($type == 'A') { $type = 'C3'; - } else if ($type[$index] == 'B') { + } else if ($type == 'B') { $type = 'C4'; - } else if ($type[$index] == 'C') { + } else if ($type == 'C') { $type = 'C5'; } } @@ -537,8 +537,8 @@ function T8insert($data, $facilityno) for ($i = 0; $i < $IncomeId[$payType]; $i++) { // 計算分期款的收款月份 $paymonth = $i * $SQuantity; - $payday = date('Y-m-d', strtotime("$date_1 + $paymonth months")); - + $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months")); + $payDay = str_replace('-', '', $countDay); $rows_data = [ "BillNo" => "$contractno", "IncomeId" => "$payType", @@ -551,7 +551,7 @@ function T8insert($data, $facilityno) "ProjectId" => "$contractno", "FromSourceTag" => 0, "CU_MaterialId" => "$facilityno[$index]", - "CU_EstPayDate" => "$payday" + "CU_EstPayDate" => "$payDay" ]; $salIncomeApplyDetail_rows[] = $rows_data; } @@ -594,7 +594,7 @@ function T8insert($data, $facilityno) // 呼叫 API $result = T8API($API_body); - if ($result['Status'] == 'Error') { + if ($result['Status'] == 'Error' || $result['Status'] == 'Fails') { http_response_code(404); die('Error!:' . $result['ErrorMsg']); } diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php index 3718df5d..e468654f 100644 --- a/wms/contract/api/testT8API.php +++ b/wms/contract/api/testT8API.php @@ -2,13 +2,18 @@ $date = Date('Y-m-d'); $date1 = Date('Y-m-d', strtotime("$date +1 months")); - +// $countDay = date('Ymd', strtotime("$date1 + 1 months")); +// echo '
';
+// print_r($countDay);
+// echo '
'; +// exit(); $a = 1; -$b = 12 / $a; +$b = 24 / $a; for ($i = 0; $i < $b; $i++) { $c = $i * $a; $date1 = Date('Y-m-d', strtotime("$date + $c months")); + $date2 = str_replace('-', '', $date1); echo '
';
-    print_r($date1);
+    print_r($date2);
     echo '
'; } diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js index d13d8389..35f81f58 100644 --- a/wms/contract/js/alpine.js +++ b/wms/contract/js/alpine.js @@ -734,7 +734,7 @@ const contractDownload = () => { this.standardData.list.plaintext[10].text = '電梯保養：
一、乙方完工交車後，期後 ' + this.installfill2 + ' 個月內應負責免費定期保養，及履行免費保固，於免費保養期間屆至後，雙方再協商嗣後保養事宜。
二、如因可歸責乙方因素致安裝產品有所瑕疵時，乙方應負責修復或修繕，惟非因乙方因素致有修復產品需要時，乙方仍負責修復或修繕，惟得向甲方酌收基本材料與人工費用。
三、另依法令規定，非經竣工檢查合格後取得使用許可證之電梯，依法不得使用。' this.onstandardViewData.list.plaintext[10].text = '電梯保養：
一、乙方完工交車後，期後 ' + this.installfill2 + ' 個月內應負責免費定期保養，及履行免費保固，於免費保養期間屆至後，雙方再協商嗣後保養事宜。
二、如因可歸責乙方因素致安裝產品有所瑕疵時，乙方應負責修復或修繕，惟非因乙方因素致有修復產品需要時，乙方仍負責修復或修繕，惟得向甲方酌收基本材料與人工費用。
三、另依法令規定，非經竣工檢查合格後取得使用許可證之電梯，依法不得使用。' }, - errorFn(){ + errorFn() { alert("資料有誤，請先填完整資料進行保存") }, sendBuyInputFn() { diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php index 0919e468..3fff3ce6 100644 --- a/wms/mkt/pricereview-index.php +++ b/wms/mkt/pricereview-index.php @@ -332,10 +332,14 @@ function get_pending($token) $result = get_pending($token); // print_r($result); +<<<<<<< HEAD if (count($result) > 0) { $result[1]['sid'] = !empty($result) ? $result[1]['sid'] : 'prm'; $result[1]['fid'] = !empty($result) ? $result[1]['fid'] : 'prm01'; } +======= + +>>>>>>> 5b4e2536 (0125) if ($data) : /* From 805865a89aeca81fd5337fea495a52b292187a18 Mon Sep 17 00:00:00 2001 From: Cheng Date: Fri, 26 Jan 2024 09:12:39 +0800 Subject: [PATCH 05/17] 0125 --- wms/contract/api/postContractData.php | 15 ++++++++------- wms/contract/api/testT8API.php | 18 +++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php index 5f099f45..569644b7 100644 --- a/wms/contract/api/postContractData.php +++ b/wms/contract/api/postContractData.php @@ -459,12 +459,12 @@ function T8insert($data, $facilityno) // print_r($elevators['maintainance']); // echo ''; foreach ($elevators as $index => $elevator) { - $type = $elevator['maintainance']; - if ($type == 'A') { + $maintainance_type = $elevator['maintainance']; + if ($maintainance_type == 'A') { $type = 'C3'; - } else if ($type == 'B') { + } else if ($maintainance_type == 'B') { $type = 'C4'; - } else if ($type == 'C') { + } else if ($maintainance_type == 'C') { $type = 'C5'; } } @@ -487,7 +487,7 @@ function T8insert($data, $facilityno) $stmt->bindParam(':CreatorId', $user_id); $stmt->execute(); } - + $row = 0; // // 新增電梯數 foreach ($elevators as $index => $elevator) { // echo '
';
@@ -535,6 +535,7 @@ function T8insert($data, $facilityno)
 
         // 依每台電梯去加入各個的付款項
         for ($i = 0; $i < $IncomeId[$payType]; $i++) {
+            $row++;
             // 計算分期款的收款月份
             $paymonth = $i * $SQuantity;
             $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
@@ -543,8 +544,8 @@ function T8insert($data, $facilityno)
                 "BillNo" => "$contractno",
                 "IncomeId" => "$payType",
                 "TaxId" => "ST005",
-                "RowCode" => $i + 1,
-                "RowNo" => $i + 1,
+                "RowCode" => $row,
+                "RowNo" => $row,
                 "ItemType" => 1,
                 "SPrice" =>  $elevator['sold_price'],
                 "SQuantity" => $SQuantity,
diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php
index e468654f..e7a85071 100644
--- a/wms/contract/api/testT8API.php
+++ b/wms/contract/api/testT8API.php
@@ -7,13 +7,13 @@ $date1 = Date('Y-m-d', strtotime("$date +1 months"));
 // print_r($countDay);
 // echo '
'; // exit(); -$a = 1; -$b = 24 / $a; -for ($i = 0; $i < $b; $i++) { - $c = $i * $a; - $date1 = Date('Y-m-d', strtotime("$date + $c months")); - $date2 = str_replace('-', '', $date1); - echo '
';
-    print_r($date2);
-    echo '
'; +$a = 0; +// $b = 24 / $a; +for ($i = 0; $i < 2; $i++) { + for ($j = 0; $j < 12; $j++) { + $a++; + echo '
';
+        print_r($a);
+        echo '
'; + } } From 4e2ce3009ed358fddbbf43e0a3d7f0206a8b2f80 Mon Sep 17 00:00:00 2001 From: Cheng Date: Fri, 26 Jan 2024 16:59:48 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E7=8D=8E=E9=87=91=E8=A8=88=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/bons/api/get.php | 69 + wms/bons/bons_index.php | 118 + wms/contract-repair/contract-repair-input.php | 3 +- wms/contract-repair/js/alpine.js | 77 + wms/contract/api/postContractData.php | 1 + wms/contract/connt8.php | 2 +- wms/contract/connt8_test.php | 15 + wms/mkt/pricereview-edit.php | 3292 +++++++++-------- 8 files changed, 2002 insertions(+), 1575 deletions(-) create mode 100644 wms/bons/api/get.php create mode 100644 wms/bons/bons_index.php create mode 100644 wms/contract/connt8_test.php diff --git a/wms/bons/api/get.php b/wms/bons/api/get.php new file mode 100644 index 00000000..90490197 --- /dev/null +++ b/wms/bons/api/get.php @@ -0,0 +1,69 @@ +prepare($sql); + $stmt->execute(); + $data = $stmt->fetch(PDO::FETCH_ASSOC); + $data['amount'] = intval($data['amount']); + $checkBillNo = $data['CBno']; + + + $sql = "SELECT + c.BillDate AS CheckBillDate + FROM arWriteOffBill AS a + LEFT JOIN arWriteOffBillRec AS b ON a.BillNo=b.BillNo + LEFT JOIN + (SELECT temp1.*,arWriteOffBillDetail.* FROM arWriteOffBillDetail + LEFT JOIN + (SELECT + arCheckBill.BillNo AS checkBillNo, arCheckBill.BillDate,arCheckBillInvInfo.InvoiceNo + FROM arCheckBill + LEFT JOIN arCheckBillInvInfo + ON arCheckBill.InvoiceBillNo=arCheckBillInvInfo.InvoiceBillNo) AS temp1 + ON temp1.checkBillNo = arWriteOffBillDetail.FromBillNo) AS c + ON a.BillNo=c.BillNo + WHERE c.checkBillNo = '$checkBillNo' + "; + + $stmt = $connT8->prepare($sql); + $stmt->execute(); + $check = $stmt->fetch(PDO::FETCH_ASSOC); + + + $sql = "SELECT SQuantity FROM salIncomeApplyMaster WHERE BillNo = '$contract_no'"; + $stmt = $connT8->prepare($sql); + $stmt->execute(); + $result = $stmt->fetch(PDO::FETCH_ASSOC); + $count = COUNT($result); + $data['maintain_month'] = intval($conunt * $result['Squantity']) + + + + + if (!empty($check['CheckBillDate'])) { + header('Content-Type: application/json'); + echo json_encode($data); + } else { + echo false; + exit; + } +} diff --git a/wms/bons/bons_index.php b/wms/bons/bons_index.php new file mode 100644 index 00000000..56f7af52 --- /dev/null +++ b/wms/bons/bons_index.php @@ -0,0 +1,118 @@ + + + + + + + + + + + +
+
+ +
+ + + + + + + + + +
+

獎金計算

+
+ + + + +
+
+
\ No newline at end of file diff --git a/wms/contract-repair/contract-repair-input.php b/wms/contract-repair/contract-repair-input.php index 67c069e4..d85fa1bd 100644 --- a/wms/contract-repair/contract-repair-input.php +++ b/wms/contract-repair/contract-repair-input.php @@ -48,7 +48,6 @@ $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修 報價單編號 -