From 411eb4c1ef7d6d076074b86126778a53174364d9 Mon Sep 17 00:00:00 2001 From: 10994015 Date: Tue, 12 Dec 2023 16:06:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E7=B4=84=E6=9B=B8=E7=94=B3=E8=AB=8B?= =?UTF-8?q?=E3=80=81=E5=90=88=E7=B4=84=E6=9B=B8=E4=B8=8B=E8=BC=89=E6=B8=AC?= =?UTF-8?q?=E8=A9=A6=E7=89=88=E4=B8=8A=E5=82=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/contract/api/postContractNewApplyData.php | 11 +- wms/contract/contract-download.php | 46 +++---- wms/contract/contract-new-apply.php | 13 +- wms/contract/js/alpine.js | 19 ++- wms/contract/prviewPdf.php | 114 +++++------------- 5 files changed, 92 insertions(+), 111 deletions(-) diff --git a/wms/contract/api/postContractNewApplyData.php b/wms/contract/api/postContractNewApplyData.php index be4f9b80..a3930586 100644 --- a/wms/contract/api/postContractNewApplyData.php +++ b/wms/contract/api/postContractNewApplyData.php @@ -4,6 +4,10 @@ require_once("../conn.php"); ini_set ( 'date.timezone' , 'Asia/Taipei' ); //暫存、送審 if(isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] == 0 || $_POST['status'] == 1) ){ + if($_POST['regulations'] < 45){ + header("HTTP/1.1 500 傳送失敗!!試車時間不得低於45天"); + exit; + } $mid = $_POST['mid']; $vol_no = $_POST['vol_no']; $salesman = $_POST['salesman']; @@ -24,6 +28,7 @@ if(isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] == 0 $freedeadline = $_POST['freedeadline']; $trade_address = $_POST['tradeaddress']; $tradedeadline = $_POST['tradedeadline']; + $secondPayDeadline = $_POST['secondPayDeadline']; $pays = $_POST['pays']; $status = $_POST['status']; // 0:暫存 1:送審 2:退回 3:完成 $pays = json_decode($pays, true); @@ -40,7 +45,7 @@ if(isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] == 0 $conn->beginTransaction(); try{ if($isFirst == 1){ - $sql_str = "INSERT INTO contract_new_apply (mid, contractno, sales_man, apply_date, apply_type, case_name, customer, manager, vat, total_price, buy_fee, install_fee, contact_address, workdeadline_a, workdeadline_b, test_time, freedeadline, trade_address, tradedeadline, progress, status, person, personname, submit_date, created_at, created_by) VALUES (:mid, :contractno, :sales_man, :apply_date, :apply_type, :case_name, :customer, :manager, :vat, :total_price, :buy_fee, :install_fee, :contact_address, :workdeadline_a, :workdeadline_b, :test_time, :freedeadline, :trade_address, :tradedeadline, :progress, :status, :person, :personname, :submit_date, :created_at, :created_by)"; + $sql_str = "INSERT INTO contract_new_apply (mid, contractno, sales_man, apply_date, apply_type, case_name, customer, manager, vat, total_price, buy_fee, install_fee, contact_address, workdeadline_a, workdeadline_b, test_time, freedeadline, trade_address, tradedeadline, secondPayDeadline, progress, status, person, personname, submit_date, created_at, created_by) VALUES (:mid, :contractno, :sales_man, :apply_date, :apply_type, :case_name, :customer, :manager, :vat, :total_price, :buy_fee, :install_fee, :contact_address, :workdeadline_a, :workdeadline_b, :test_time, :freedeadline, :trade_address, :tradedeadline, :secondPayDeadline, :progress, :status, :person, :personname, :submit_date, :created_at, :created_by)"; $stmt = $conn -> prepare($sql_str); $stmt ->bindParam(':mid', $mid); $stmt ->bindParam(':contractno', $vol_no); @@ -61,6 +66,7 @@ if(isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] == 0 $stmt ->bindParam(':freedeadline', $freedeadline); $stmt ->bindParam(':trade_address', $trade_address); $stmt ->bindParam(':tradedeadline', $tradedeadline); + $stmt ->bindParam(':secondPayDeadline', $secondPayDeadline); $stmt ->bindParam(':progress', $progress); $stmt ->bindParam(':status', $status); $stmt ->bindParam(':person', $salesman); @@ -89,7 +95,7 @@ if(isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] == 0 header("HTTP/1.1 201 success!"); $conn->commit(); }else{ - $sql_str = "UPDATE contract_new_apply SET status = :status, apply_date=:apply_date, apply_type=:apply_type, case_name=:case_name, customer=:customer, manager=:manager, vat=:vat, total_price=:total_price, buy_fee=:buy_fee, install_fee=:install_fee, contact_address=:contact_address, trade_address=:trade_address, workdeadline_a=:workdeadline_a, workdeadline_b=:workdeadline_b, test_time=:test_time, freedeadline=:freedeadline, trade_address=:trade_address, trade_address=:trade_address, tradedeadline=:tradedeadline, progress=:progress, person=:person, personname=:personname, submit_date=:submit_date, updated_at=:updated_at, updated_by=:updated_by WHERE mid = :mid"; + $sql_str = "UPDATE contract_new_apply SET status = :status, apply_date=:apply_date, apply_type=:apply_type, case_name=:case_name, customer=:customer, manager=:manager, vat=:vat, total_price=:total_price, buy_fee=:buy_fee, install_fee=:install_fee, contact_address=:contact_address, trade_address=:trade_address, workdeadline_a=:workdeadline_a, workdeadline_b=:workdeadline_b, test_time=:test_time, freedeadline=:freedeadline, trade_address=:trade_address, trade_address=:trade_address, tradedeadline=:tradedeadline, secondPayDeadline=:secondPayDeadline, progress=:progress, person=:person, personname=:personname, submit_date=:submit_date, updated_at=:updated_at, updated_by=:updated_by WHERE mid = :mid"; $stmt = $conn -> prepare($sql_str); $stmt ->bindParam(':mid', $mid); $stmt ->bindParam(':status', $status); @@ -109,6 +115,7 @@ if(isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] == 0 $stmt ->bindParam(':freedeadline', $freedeadline); $stmt ->bindParam(':trade_address', $trade_address); $stmt ->bindParam(':tradedeadline', $tradedeadline); + $stmt ->bindParam(':secondPayDeadline', $secondPayDeadline); $stmt ->bindParam(':progress', $progress); $stmt ->bindParam(':person', $salesman); $stmt ->bindParam(':personname', $salesmanname); diff --git a/wms/contract/contract-download.php b/wms/contract/contract-download.php index 24fa89c0..837bde91 100644 --- a/wms/contract/contract-download.php +++ b/wms/contract/contract-download.php @@ -44,9 +44,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){ "; exit; } - - - + $buyArr = []; $buyNo2Pay = false; $buy_total_price = 0; $installArr = []; @@ -55,9 +53,16 @@ if(isset($_GET['id']) && $_GET['id']!=""){ $noteArr = array(1,1,1,1,1); $qty = $contracts[0]['item_qty']; // print_r($contracts); - print_r($contracts);exit; + // print_r($buyArr); foreach($contracts as $idx=>$amount){ $isset = false; + if($amount['pay_kind']==5 || $amount['pay_kind']==6){ + echo "111111"; + if($amount['pay_scale'] >= 0){ + $install_total_price = $install_total_price + $amount['pay_amount']; + $installArr[] = ['installment'=> $amount['pay_kind'], 'scale'=> $amount['pay_scale'], 'amount'=> $amount['pay_amount'], 'note'=>$amount['note']]; + } + } if($amount['pay_kind']==1 || $amount['pay_kind']==2 || $amount['pay_kind']==3){ if($amount['pay_scale'] > 0){ $buy_total_price = $buy_total_price + $amount['pay_amount']; @@ -73,20 +78,14 @@ if(isset($_GET['id']) && $_GET['id']!=""){ $buyNo2Pay = true; } } - } - if($amount['pay_kind']==5 || $amount['pay_kind']==6){ - echo "111111"; - if($amount['pay_scale'] > 0){ - $install_total_price = $install_total_price + $amount['pay_amount']; - $installArr[] = ['installment'=> $amount['pay_kind'], 'scale'=> $amount['pay_scale'], 'amount'=> $amount['pay_amount'], 'note'=>$amount['note']]; } + } } - // print_r($buyArr); } - }catch (PDOException $e ){ + catch (PDOException $e ){ die("ERROR!!!: ". $e->getMessage()); } echo $buy_total_price; @@ -107,15 +106,15 @@ if(isset($_GET['id']) && $_GET['id']!=""){
-
-