From dea8f62e45846e1bd8eeb7d39bee41ec539e32e6 Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Fri, 26 Jan 2024 13:08:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E9=A0=90=E8=A8=88=E5=87=BA=E8=B2=A8?= =?UTF-8?q?=E5=A0=B1=E8=A1=A8=E4=BF=AE=E6=AD=A3bug=202.=E5=A4=A7=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=20manage=5Fclass=20=E6=94=B9=E7=94=A8=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E7=89=88=E6=9C=AC=203.=E4=BF=AE=E6=AD=A3=E6=A1=83?= =?UTF-8?q?=E7=AB=B9=E5=8D=80=E7=87=9F=E6=A5=AD=E5=93=A1=E9=9A=8E=E6=AE=B5?= =?UTF-8?q?bug=204.=E6=96=B0=E5=A2=9E=E7=87=9F=E6=A5=AD=E5=93=A1=E5=88=A4?= =?UTF-8?q?=E6=96=B7=E5=8D=94=E6=AA=A2=E5=8A=9F=E8=83=BD=205.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=87=89=E6=94=B6=E5=B8=B3=E6=AC=BE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?(=E4=BF=9D=E9=A4=8A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/api/bpm/draw_update.php | 8 + wms/estimated_shipping_date_report.php | 12 +- wms/maintainance_contract_payment_status.php | 399 ++++++++++++++++++ wms/wipwhole-index-function.php | 21 +- wms/wipwhole-rec-invoice-edit-submit.php | 15 +- wms/wipwhole-rec-invoice-edit.php | 41 +- wms/wipwhole-renovate-index-function.php | 21 +- ...whole-renovate-rec-invoice-edit-submit.php | 16 +- wms/wipwhole-renovate-rec-invoice-edit.php | 41 +- wms/wipwhole-wipinstallstatus-index-modal.php | 92 +++- wms/wipwhole-wipinstallstatus-index.php | 23 + wms/wipwholeinstall-index-export-excel.php | 2 +- wms/wipwholeinstall-index-table-html.php | 8 +- ...oleinstall-renovate-index-export-excel.php | 2 +- ...wholeinstall-renovate-index-table-html.php | 8 +- 15 files changed, 655 insertions(+), 54 deletions(-) create mode 100644 wms/api/bpm/draw_update.php create mode 100644 wms/maintainance_contract_payment_status.php diff --git a/wms/api/bpm/draw_update.php b/wms/api/bpm/draw_update.php new file mode 100644 index 00000000..f22bbc31 --- /dev/null +++ b/wms/api/bpm/draw_update.php @@ -0,0 +1,8 @@ + true +], JSON_UNESCAPED_UNICODE); + + +?> diff --git a/wms/estimated_shipping_date_report.php b/wms/estimated_shipping_date_report.php index 606b06b7..920a7ecf 100644 --- a/wms/estimated_shipping_date_report.php +++ b/wms/estimated_shipping_date_report.php @@ -8,8 +8,8 @@ use PhpOffice\PhpSpreadsheet\Style\Fill; include "header.php"; -$start_y = empty($_POST['start_month']) ? '2023' : substr($_POST['start_month'], 0, 4); -$end_y = empty($_POST['end_month']) ? '2023' : substr($_POST['end_month'], 0, 4); +$start_y = empty($_POST['start_month']) ? date("Y") : substr($_POST['start_month'], 0, 4); +$end_y = empty($_POST['end_month']) ? date("Y") : substr($_POST['end_month'], 0, 4); $start_m = empty($_POST['start_month']) ? '01' : substr($_POST['start_month'], 5, 2); $end_m = empty($_POST['end_month']) ? '12' : substr($_POST['end_month'], 5, 2); @@ -29,8 +29,8 @@ $sql = " w.contract_type FROM wipwholestatus AS w WHERE status = '1' - AND real_contract_arrival_date >= '$start_y-$start_m-1' - AND real_contract_arrival_date <= '$end_y-$end_m-31' + AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$start_y-$start_m-01' + AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$end_y-$end_m-31' ) AS this_order WHERE 1 = 1 GROUP BY this_order.contract_type, @@ -38,6 +38,7 @@ $sql = " this_order.date_year, this_order.date_month "; + $result = mysqli_query($link, $sql); $data = []; while ($row = $result->fetch_assoc()) { @@ -286,7 +287,8 @@ function alpha2num($a) return $n - 1; } if ($_SERVER["REQUEST_METHOD"] == 'POST') { - if ($_POST['excel_output'] == 'excel_output') { + $excel_output = !empty($_POST['excel_output']) ? $_POST['excel_output'] : ''; + if ($excel_output == 'excel_output') { $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet(); $sheet->setTitle('出貨總表'); diff --git a/wms/maintainance_contract_payment_status.php b/wms/maintainance_contract_payment_status.php new file mode 100644 index 00000000..4c4cda2a --- /dev/null +++ b/wms/maintainance_contract_payment_status.php @@ -0,0 +1,399 @@ +query($sql); + +function getContractnoDetails($link, $user_id, $contractno = null) +{ + $sql = " + SELECT + c.contractno + FROM contract AS c + LEFT JOIN con_maintance_examine_apply AS cmea + ON c.contractno = cmea.vol_no + WHERE 1 = 1 + AND cmea.salesman IN (" . getAccountids($link, $user_id) . ") + "; + if (!empty($contractno)) { + $sql .= " + AND c.contractno = '$contractno' + "; + } + $result = mysqli_query($link, $sql); + $data = []; + foreach ($result as $row) { + array_push($data, $row['contractno']); + } + return "'" . implode("','", $data) . "'"; +} + +function getSalesmanNo($link, $contractno) +{ + $sql = " + SELECT + cmea.salesman + FROM contract AS c + LEFT JOIN con_maintance_examine_apply AS cmea + ON c.contractno = cmea.vol_no + WHERE 1 = 1 + AND c.contractno IN ('$contractno') + "; + $result = mysqli_query($link, $sql); + $data = []; + foreach ($result as $row) + return $row['salesman']; + return ""; +} +function getSalesmanName($link, $contractno) +{ + $sql = " + SELECT + a.name + FROM contract AS c + LEFT JOIN con_maintance_examine_apply AS cmea + ON c.contractno = cmea.vol_no + LEFT JOIN account AS a + ON cmea.salesman = a.accountid + WHERE 1 = 1 + AND c.contractno IN ('$contractno') + "; + $result = mysqli_query($link, $sql); + $data = []; + foreach ($result as $row) + return $row['name']; + return ""; +} + +function getAccountids($link, $user_id) +{ + $sql = " + SELECT + accountid + FROM account + WHERE 1 = 1 + AND (accountid = '$user_id' + OR accountid IN ( + SELECT + accountid + FROM account + WHERE 1 = 1 + AND manager = '$user_id' + AND accounttype IN ('B','E','M','W') + ) + ) + "; + $result = mysqli_query($link, $sql); + $data = []; + foreach ($result as $row) { + array_push($data, $row['accountid']); + } + return "'" . implode("','", $data) . "'"; +} + +function checkArCheckBillStatus($row) +{ + $CU_EstPayDate = $row['CU_EstPayDate']; + $BillNo2 = $row['BillNo2']; + if (substr($CU_EstPayDate, 0, 6) <= date("Ym")) { + if (empty($BillNo2)) { + return "未轉應收確認單"; + } else { + return "已轉應收確認單"; + } + } else { + return "時間未到"; + } +} + +function arSellInvoiceMaterial($row) +{ + + $CU_EstPayDate = $row['CU_EstPayDate']; + $InvoiceName = $row['InvoiceName']; + + if (substr($CU_EstPayDate, 0, 6) <= date("Ym")) { + if (empty($InvoiceName)) { + return "未開發票"; + } else { + return "已開發票"; + } + } else { + return "時間未到"; + } +} + +function checkArWriteOffBill($conn, $row) +{ + $BillNo = $row['BillNo2']; + + $sql = " + SELECT + * + -- a.BillNo, + -- a.WriteOffBizPartnerId, + -- a.PayWriteOffOAmount, + -- b.FromBillDate AS ReceivedDate, + -- b.CurrWOFeeOAmt AS Fee, + -- c.OrderBillNo, + -- c.checkBillNo, + -- c.InvoiceNo, + -- 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 = '$BillNo' + "; + + $del = $conn->query($sql); + $i = 0; + foreach ($del as $row) + $i++; + if (empty($i)) { + return "未收款"; + } else { + return "已收款"; + } +} + +?> + + + + + + + + +
+
+ + + + + + + + + + + + + +
+

保養合約-應收款項明細

+
合約號 + + + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
營業人員/契約人員合約號標示號電梯編號預計請款日催收次數應收申請單狀態請款金額(未轉應收)請款金額(已轉應收)應收申請單號發票狀態發票單標示號發票單號發票明細發票金額發票號碼核銷
+ "; + echo getSalesmanName($link, $row['BillNo']); + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +There is no record!"; +endif; + +#代表結束連線 +mysqli_close($link); + +include "footer.php"; +?> \ No newline at end of file diff --git a/wms/wipwhole-index-function.php b/wms/wipwhole-index-function.php index f1dba89d..af5a1964 100644 --- a/wms/wipwhole-index-function.php +++ b/wms/wipwhole-index-function.php @@ -1337,8 +1337,8 @@ function checkUseridIsManager($user_id) // 中區 李烘銘 if (in_array($user_id, ['M0086'])) return true; - // 桃竹 張莉凱 - if (in_array($user_id, ['M0026'])) + // 桃竹 張莉凱 改 陳家文 + if (in_array($user_id, ['M0029'])) return true; // 宜花東 陳志文 if (in_array($user_id, ['M0054'])) @@ -1348,3 +1348,20 @@ function checkUseridIsManager($user_id) return true; return false; } + +function manage_class_gary_ver($user_id) +{ + global $link; + + $sql = " + SELECT manager + FROM account + WHERE accountid = '$user_id'"; + $res = mysqli_query($link, $sql); + $row = mysqli_fetch_assoc($res); + $manager = $row["manager"]; + mysqli_free_result($res); + if ($manager == "M0001") + return ""; // 董事長略過 + return $manager; +} diff --git a/wms/wipwhole-rec-invoice-edit-submit.php b/wms/wipwhole-rec-invoice-edit-submit.php index a75b65b8..28512a7e 100644 --- a/wms/wipwhole-rec-invoice-edit-submit.php +++ b/wms/wipwhole-rec-invoice-edit-submit.php @@ -140,6 +140,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $tryrun_start_date_owner = $_POST['tryrun_start_date_owner']; $tryrun_end_date = $_POST['tryrun_end_date']; $tryrun_end_date_owner = $_POST['tryrun_end_date_owner']; + $association_check_type = $_POST['association_check_type']; $salesname = accountid2name($salesid)[$salesid]; $salesmail = accountid2email([$salesid])[$salesid]; @@ -378,6 +379,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { delivery_date_owner = '$delivery_date_owner', marketing_remark = '', real_custom_name = '$real_custom_name', + association_check_type = '$association_check_type', "; if (!empty(trim($marketing_remark))) { $updatesql .= " @@ -1018,7 +1020,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { // 外示系統寄信 if ($_SERVER["REQUEST_METHOD"] == "POST") { if ($_POST['form_name'] == 'send_expression_mail_to_platform_form') { - + include "./class/Cmail.php"; $cmail = new Cmail(); @@ -1080,8 +1082,8 @@ function checkWwsAssianStatus($link, $user_id, $id = null) $data['salesname'] = accountid2name($data['salesid'])[$data['salesid']]; $data['salesmail'] = accountid2email([$data['salesid']])[$data['salesid']]; - $data['salesmanagername'] = accountid2name(manage_class($data['salesid'])[0])[manage_class($data['salesid'])[0]]; - $data['salesmanagermail'] = accountid2email([manage_class($data['salesid'])[0]])[manage_class($data['salesid'])[0]]; + $data['salesmanagername'] = accountid2name(manage_class_gary_ver($data['salesid']))[manage_class_gary_ver($data['salesid'])]; + $data['salesmanagermail'] = accountid2email([manage_class_gary_ver($data['salesid'])])[manage_class_gary_ver($data['salesid'])]; $data['designname'] = accountid2name("M0023")["M0023"]; $data['designmail'] = accountid2email(["M0023"])["M0023"]; $data['designleadername'] = accountid2name(getSheJiokLeaderNo($link))[getSheJiokLeaderNo($link)]; @@ -1123,7 +1125,12 @@ function checkWwsAssianStatus($link, $user_id, $id = null) ], "永佳捷科技" ); - do_wws_next_assign(manage_class($data['salesid'])[0], $form_YD_key, 'I'); + // 如果是桃竹區 主管是家文的新梯 簽到劉永德經理那 + if (manage_class_gary_ver($data['salesid']) == 'M0029') { + do_wws_next_assign("M0137", $form_YD_key, 'I'); + } else { + do_wws_next_assign(manage_class_gary_ver($data['salesid']), $form_YD_key, 'I'); + } return true; } } diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php index e764404f..4cc4847c 100644 --- a/wms/wipwhole-rec-invoice-edit.php +++ b/wms/wipwhole-rec-invoice-edit.php @@ -300,18 +300,27 @@ include "wipwhole-rec-invoice-edit-submit.php"; 營業人員確認項 - +
+ + 官檢類型 + + /> + + /> + + + 營業/契約確認規格 @@ -384,7 +393,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; 附件 - 客戶姓名:" placeholder="輸入後即可上傳附件" /> + 客戶姓名:" placeholder="輸入後即可上傳附件" />
)" style="margin-left:3px;">寄送普來特富外示系統信件 @@ -1437,12 +1446,12 @@ include "wipwhole-rec-invoice-edit-submit.php"; QC及官檢類型 - /> - - /> - - /> - + /> + + /> + + /> + @@ -1467,9 +1476,9 @@ include "wipwhole-rec-invoice-edit-submit.php"; QC合格日
- > + > - +
@@ -1485,10 +1494,10 @@ include "wipwhole-rec-invoice-edit-submit.php"; 官檢日
- > - + > + > - +
@@ -1503,7 +1512,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; 官檢附件 - > + > 下載附件" : ""; ?> diff --git a/wms/wipwhole-renovate-index-function.php b/wms/wipwhole-renovate-index-function.php index 628649c9..e3b997d6 100644 --- a/wms/wipwhole-renovate-index-function.php +++ b/wms/wipwhole-renovate-index-function.php @@ -1279,8 +1279,8 @@ function checkUseridIsManager($user_id) // 中區 李烘銘 if (in_array($user_id, ['M0086'])) return true; - // 桃竹 張莉凱 - if (in_array($user_id, ['M0026'])) + // 桃竹 張莉凱 改 陳家文 + if (in_array($user_id, ['M0029'])) return true; // 宜花東 陳志文 if (in_array($user_id, ['M0054'])) @@ -1290,3 +1290,20 @@ function checkUseridIsManager($user_id) return true; return false; } + +function manage_class_gary_ver($user_id) +{ + global $link; + + $sql = " + SELECT manager + FROM account + WHERE accountid = '$user_id'"; + $res = mysqli_query($link, $sql); + $row = mysqli_fetch_assoc($res); + $manager = $row["manager"]; + mysqli_free_result($res); + if ($manager == "M0001") + return ""; // 董事長略過 + return $manager; +} diff --git a/wms/wipwhole-renovate-rec-invoice-edit-submit.php b/wms/wipwhole-renovate-rec-invoice-edit-submit.php index 30ea4047..f5f56830 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit-submit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit-submit.php @@ -128,9 +128,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $delivery_date = $_POST['delivery_date'] ?: $row['delivery_date']; $old_delivery_date = $_POST['old_delivery_date'] ?: $row['old_delivery_date']; $delivery_date_owner = $_POST['delivery_date_owner'] ?: $row['delivery_date_owner']; - + $salesid = $_POST['salesid'] ?: $row['salesid']; $warehouseid = $_POST['warehouseid'] ?: $row['warehouseid']; $old_warehouseid = $_POST['old_warehouseid'] ?: $row['warehouseid']; + $association_check_type = $_POST['association_check_type'] ?: $row['association_check_type']; + + $salesname = accountid2name($salesid)[$salesid]; + $salesmail = accountid2email([$salesid])[$salesid]; $creater = $_POST['creater']; $create_at = date("Y-m-d H:i:s"); @@ -328,11 +332,12 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { . " 移交日:" . $old_delivery_date . " => " . $delivery_date; } + $cmail->sendx( $mail_title, $mail_content, [ - [$salesname, $salesmail] + [$salesname, $salesmail], // ['gary', 'gary_chen@masada.com.tw'] ], "永佳捷科技" @@ -382,6 +387,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { customer_planning_verify = '$customer_planning_verify', customer_planning_verify_at = '$customer_planning_verify_at', customer_planning_verify_owner = '$customer_planning_verify_owner', + association_check_type = '$association_check_type', marketing_remark = '', "; if (!empty(trim($marketing_remark))) { @@ -1149,8 +1155,8 @@ function checkWwsAssianStatus($link, $user_id) $data['salesname'] = accountid2name($data['salesid'])[$data['salesid']]; $data['salesmail'] = accountid2email([$data['salesid']])[$data['salesid']]; - $data['salesmanagername'] = accountid2name(manage_class($data['salesid'])[0])[manage_class($data['salesid'])[0]]; - $data['salesmanagermail'] = accountid2email([manage_class($data['salesid'])[0]])[manage_class($data['salesid'])[0]]; + $data['salesmanagername'] = accountid2name(manage_class_gary_ver($data['salesid']))[manage_class_gary_ver($data['salesid'])]; + $data['salesmanagermail'] = accountid2email([manage_class_gary_ver($data['salesid'])])[manage_class_gary_ver($data['salesid'])]; $data['designname'] = accountid2name("M0023")["M0023"]; $data['designmail'] = accountid2email(["M0023"])["M0023"]; $data['designleadername'] = accountid2name(getSheJiokLeaderNo($link))[getSheJiokLeaderNo($link)]; @@ -1197,7 +1203,7 @@ function checkWwsAssianStatus($link, $user_id) ], "永佳捷科技" ); - do_wws_next_assign(manage_class($data['salesid'])[0], $form_key, 'F'); + do_wws_next_assign(manage_class_gary_ver($data['salesid']), $form_key, 'F'); } } diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php index 2af5e630..6e149369 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit.php @@ -613,11 +613,21 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
+ + + 官檢類型 + + /> + + /> + + + 營業確認規格 @@ -693,7 +703,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 附件 - 客戶姓名:" placeholder="輸入後即可上傳附件" /> + 客戶姓名:" placeholder="輸入後即可上傳附件" />
QC及官檢類型 - /> - - /> - - /> - + /> + + /> + + /> + @@ -1478,10 +1488,10 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 官檢日
- > - > + > + > - +
@@ -1496,7 +1506,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 官檢附件 - > + > 下載附件" : ""; ?> @@ -2054,6 +2064,11 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 'install_end_date2', 'tryrun_start_date2', 'tryrun_end_date2', + 'install_start_date', + 'install_end_date', + 'tryrun_start_date', + 'tryrun_end_date', + 'delivery_date' ] for (var i = 0; i < catchTime_input_arr.length; i++) { inputChangeCatchTime(catchTime_input_arr[i]); @@ -2369,7 +2384,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; } } - function sendExpressionMailToPlatform(id){ + function sendExpressionMailToPlatform(id) { if (confirm('確定要發送郵件嗎?') == true) { $("#wipwholestatusid").val(id); $('#send_expression_mail_to_platform_form').submit(); diff --git a/wms/wipwhole-wipinstallstatus-index-modal.php b/wms/wipwhole-wipinstallstatus-index-modal.php index 38f61862..42fa0027 100644 --- a/wms/wipwhole-wipinstallstatus-index-modal.php +++ b/wms/wipwhole-wipinstallstatus-index-modal.php @@ -19,7 +19,14 @@ if ($method == 'getInstallingDetails') if ($method == 'getInstalling2Details') echo getInstalling2Details($type, $mtype, $radsY, $radsM, $year, $month); - +if ($method == 'getShippingDetailsSql') + echo getShippingDetailsSql($type, $mtype, $radsY, $radsM, $year, $month); +if ($method == 'getEndingDetailsSql') + echo getEndingDetailsSql($type, $mtype, $radsY, $radsM, $year, $month); +if ($method == 'getInstallingDetailsSql') + echo getInstallingDetailsSql($type, $mtype, $radsY, $radsM, $year, $month); +if ($method == 'getInstalling2DetailsSql') + echo getInstalling2DetailsSql($type, $mtype, $radsY, $radsM, $year, $month); // 出貨台數 @@ -44,6 +51,25 @@ function getShippingDetails($type, $mtype, $radsY, $radsM, $year, $month) return json_encode($data, JSON_UNESCAPED_UNICODE); } +function getShippingDetailsSql($type, $mtype, $radsY, $radsM, $year, $month) +{ + global $link; + $sql = " + SELECT + * + FROM wipwholestatus + WHERE status = '1' + AND ( + real_arrival_date IS NOT NULL + AND real_arrival_date != '' + ) + AND real_arrival_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31' + "; + $sql .= !empty($type) ? " AND contract_type = '$type'" : ""; + $sql .= !empty($mtype) ? " AND renovate_type Like '%$mtype%'" : ""; + return $sql; +} + // 工收台數 function getEndingDetails($type, $mtype, $radsY, $radsM, $year, $month) @@ -67,6 +93,24 @@ function getEndingDetails($type, $mtype, $radsY, $radsM, $year, $month) return json_encode($data, JSON_UNESCAPED_UNICODE); } +function getEndingDetailsSql($type, $mtype, $radsY, $radsM, $year, $month) +{ + global $link; + $sql = " + SELECT + * + FROM wipwholestatus + WHERE status = '1' + AND real_arrival_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31' + AND (delivery_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31' + OR + official_check_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31' + ) + "; + $sql .= !empty($type) ? " AND contract_type = '$type'" : ""; + $sql .= !empty($mtype) ? " AND renovate_type Like '%$mtype%'" : ""; + return $sql; +} // 試車完台數 function getInstallingDetails($type, $mtype, $radsY, $radsM, $year, $month) @@ -93,6 +137,27 @@ function getInstallingDetails($type, $mtype, $radsY, $radsM, $year, $month) return json_encode($data, JSON_UNESCAPED_UNICODE); } +function getInstallingDetailsSql($type, $mtype, $radsY, $radsM, $year, $month) +{ + global $link; + $sql = " + SELECT + * + FROM wipwholestatus + WHERE status = '1' + AND ( + real_arrival_date IS NOT NULL + AND real_arrival_date != '' + ) + AND real_arrival_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31' + AND tryrun_end_date <= '$year-$month-31' + AND tryrun_end_date != '' + AND tryrun_end_date IS NOT NULL + "; + $sql .= !empty($type) ? " AND contract_type = '$type'" : ""; + $sql .= !empty($mtype) ? " AND renovate_type Like '%$mtype%'" : ""; + return $sql; +} // 在裝中台數 function getInstalling2Details($type, $mtype, $radsY, $radsM, $year, $month) @@ -121,3 +186,28 @@ function getInstalling2Details($type, $mtype, $radsY, $radsM, $year, $month) $data = mysqli_fetch_all($result, MYSQLI_ASSOC); return json_encode($data, JSON_UNESCAPED_UNICODE); } + +function getInstalling2DetailsSql($type, $mtype, $radsY, $radsM, $year, $month) +{ + global $link; + $sql = " + SELECT + * + FROM wipwholestatus + WHERE status = '1' + AND real_arrival_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31' + AND ( + delivery_date IS NULL + OR delivery_date = '' + OR delivery_date >= '$year-$month-31' + ) + AND( + official_check_date IS NULL + OR official_check_date = '' + OR official_check_date >= '$year-$month-31' + ) + "; + $sql .= !empty($type) ? " AND contract_type = '$type'" : ""; + $sql .= !empty($mtype) ? " AND renovate_type Like '%$mtype%'" : ""; + return $sql; +} diff --git a/wms/wipwhole-wipinstallstatus-index.php b/wms/wipwhole-wipinstallstatus-index.php index eb35d2c3..a8f0e15f 100644 --- a/wms/wipwhole-wipinstallstatus-index.php +++ b/wms/wipwhole-wipinstallstatus-index.php @@ -617,6 +617,29 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) { function showDetails(method, contract_type, renovate_type, radsY, radsM, radsYi, start_month) { $("#myModal").show(); + + $.ajax({ + type: "POST", + dataType: "html", + url: "wipwhole-wipinstallstatus-index-modal.php", + data: { + method: method+'Sql', + contract_type: contract_type, + renovate_type: renovate_type, + radsY: radsY, + radsM: radsM, + radsYi: radsYi, + start_month: start_month + }, + success: function(data) { + console.log(data); + }, + error: function(data) { + console.log(data); + } + }) + + $.ajax({ type: "POST", dataType: "json", diff --git a/wms/wipwholeinstall-index-export-excel.php b/wms/wipwholeinstall-index-export-excel.php index f47ffa72..c3a0b4ea 100644 --- a/wms/wipwholeinstall-index-export-excel.php +++ b/wms/wipwholeinstall-index-export-excel.php @@ -175,7 +175,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { substr($row['tryrun_end_date'], 0, 10), substr($row['qc_date'], 0, 10), substr($row['end_qc_date'], 0, 10), - substr($row['official_check_date'], 0, 10), + $row['association_check_type'] == '1' ? "-" : substr($row['official_check_date'], 0, 10), substr($row['delivery_date'], 0, 10), accountidToName($row['salesid']) ]; diff --git a/wms/wipwholeinstall-index-table-html.php b/wms/wipwholeinstall-index-table-html.php index 2311eca7..b5c9bcda 100644 --- a/wms/wipwholeinstall-index-table-html.php +++ b/wms/wipwholeinstall-index-table-html.php @@ -172,8 +172,12 @@ diff --git a/wms/wipwholeinstall-renovate-index-export-excel.php b/wms/wipwholeinstall-renovate-index-export-excel.php index 41342d30..a5598afa 100644 --- a/wms/wipwholeinstall-renovate-index-export-excel.php +++ b/wms/wipwholeinstall-renovate-index-export-excel.php @@ -177,7 +177,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { substr($row['tryrun_end_date'], 0, 10), substr($row['qc_date'], 0, 10), substr($row['end_qc_date'], 0, 10), - substr($row['official_check_date'], 0, 10), + $row['association_check_type'] == '1' ? "-" : substr($row['official_check_date'], 0, 10), substr($row['delivery_date'], 0, 10), accountidToName($row['salesid']) ]; diff --git a/wms/wipwholeinstall-renovate-index-table-html.php b/wms/wipwholeinstall-renovate-index-table-html.php index 2f3dc8f4..7a9715ea 100644 --- a/wms/wipwholeinstall-renovate-index-table-html.php +++ b/wms/wipwholeinstall-renovate-index-table-html.php @@ -155,8 +155,12 @@ From 3f7479106a9db52405c4495e698bdb64d005285b Mon Sep 17 00:00:00 2001 From: 10994015 Date: Fri, 26 Jan 2024 16:56:46 +0800 Subject: [PATCH 2/2] =?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 "