From f47f25fc888d5b29fc4c0b183a69cd5528806783 Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Fri, 19 Jan 2024 10:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E7=A4=BA=E7=B3=BB=E7=B5=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/T8_API_SALDISPATCHLIST.php | 134 ++++++ wms/T8_Authorization_curl_ver.php | 48 ++ wms/T8_Authorization_from_bpm.php | 24 +- wms/board-record-submit.php | 2 +- wms/css/function.js | 168 +++---- wms/css/view/expression-index.php | 230 ++++++++++ wms/expression-index.php | 282 ++++++++++++ wms/gary.php | 6 + wms/header.php | 21 +- wms/login.php | 2 +- wms/loginapi.php | 2 + wms/mkt/pricereview-record-update.php | 1 + wms/notice-delete.php | 3 +- wms/notice-edit.php | 17 +- wms/wipwhole-rec-invoice-edit-fileupload.php | 2 + wms/wipwhole-rec-invoice-edit-submit.php | 389 +++++++++------- wms/wipwhole-rec-invoice-edit.php | 172 ++++--- ...whole-renovate-rec-invoice-edit-submit.php | 423 +++++++++++------- wms/wipwhole-renovate-rec-invoice-edit.php | 150 ++++--- workflow/lib/DB.php | 2 +- 20 files changed, 1507 insertions(+), 571 deletions(-) create mode 100644 wms/T8_API_SALDISPATCHLIST.php create mode 100644 wms/T8_Authorization_curl_ver.php create mode 100644 wms/css/view/expression-index.php create mode 100644 wms/expression-index.php diff --git a/wms/T8_API_SALDISPATCHLIST.php b/wms/T8_API_SALDISPATCHLIST.php new file mode 100644 index 00000000..3e71fa92 --- /dev/null +++ b/wms/T8_API_SALDISPATCHLIST.php @@ -0,0 +1,134 @@ + "salDispatchListMaster", + "rows" => [ + [ + "BillNo" => "SS20230208001", + "BillDate" => 20230208, + "SupplyFOrgId" => "1000", + "FOrgId" => "1000", + "TypeId" => "SS", + "OrgId" => "1000", + "CompId" => "A", + "ModeId" => "DS", + "BizPartnerId" => "A0000001", + "PersonId" => "POS001", + "CurrId" => "TWD", + "CurrOAmount" => 1, + "CurrLAmount" => 1, + "TrusteeWarehouseId" => "", + "SendGoodsDate" => 20230208, + "DueToId" => "A0000001", + "TaxId" => "ST005", + "CreditorOrgId" => "1000", + "CreditorCompId" => "A", + "CreditorCurrOAmount" => 1, + "CreditorCurrLAmount" => 1, + "TradeConditionId" => "", + "TrusteeWarehouseBPType" => 0 + ] + ] + ], + [ + "name" => "salDispatchListDetail", + "rows" => [ + "SupplyCompId" => "A", + "SupplyOrgId" => "1000", + "DispatchCompId" => "A", + "DispatchOrgId" => "1000", + "SQuantity" => "1", + "TaxId" => "ST005", + "BillNo" => "SS20230208001", + "RowCode" => 1, + "ItemType" => 0, + "MaterialId" => "POS01CF0001", + "SUnitId" => "CAP", + "SPrice" => "100" + ] + ] +]; +createSALDISPATCHLIST($validation, $data); + +// 新增發貨單 +function createSALDISPATCHLIST($validation, $body) +{ + // 新增 + $apiurl = 'http://60.244.87.101:880/twWebAPI/V1/SALDISPATCHLIST/PostERPData'; + // $apiurl = 'http://10.10.145.2:880/twWebAPI/V1/SALDISPATCHLIST/PostERPData'; + // $apiurl = 'https://127.0.0.1:780/twWebAPI/V1/SALDISPATCHLIST/PostERPData'; + $headerParam = [ + 'CHI_Authorization: ' . $validation, + 'Content-Type: application/json' + ]; + $json = json_encode($body); + myCurl($apiurl, $headerParam, $json); +} + +// 發貨單查詢 +function getSALDISPATCHLIST($validation) +{ + // 新增 刪除 + $apiurl = 'http://60.244.87.101:880/twWebAPI/V1/SALDISPATCHLIST/GetERPData?pkValue=SS20231114001'; + // $apiurl = 'http://10.10.145.2:880/twWebAPI/V1/SALDISPATCHLIST/GetERPData'; + // $apiurl = 'https://127.0.0.1:780/twWebAPI/V1/SALDISPATCHLIST/GetERPData'; + $headerParam = [ + 'CHI_Authorization: ' . $validation, + 'Content-Type: application/json' + ]; + $body = []; + $json = json_encode($body); + myCurl($apiurl, $headerParam, $json); +} + +// 發貨單資料表結構 +function getDataSchemaDetails($validation) +{ + // 取得資料表結構 + $apiurl = 'http://60.244.87.101:880/twWebAPI/V1/SALDISPATCHLIST/GetTableSchema'; + // $apiurl = 'http://10.10.145.2:880/twWebAPI/V1/SALDISPATCHLIST/GetTableSchema'; + // $apiurl = 'https://127.0.0.1:780/twWebAPI/V1/SALDISPATCHLIST/GetTableSchema'; + $headerParam = [ + 'CHI_Authorization: ' . $validation, + 'Content-Type: application/json' + ]; + $body = []; + $json = json_encode($body); + myCurl($apiurl, $headerParam, $json); +} + +function myCurl($apiurl, $headerParam, $json) +{ + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $apiurl); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headerParam); + curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); + curl_setopt($ch, CURLOPT_POSTFIELDS, $json); + $response = curl_exec($ch); + if ($response === false) { + echo 'Curl error: ' . curl_error($ch); + } else { + $result = json_decode($response, true); + if ($result['Status'] == 'Success') { + echo json_encode($result['Data'], JSON_UNESCAPED_UNICODE); + } else { + echo $result['ErrorMsg']; + } + } + curl_close($ch); +} diff --git a/wms/T8_Authorization_curl_ver.php b/wms/T8_Authorization_curl_ver.php new file mode 100644 index 00000000..9a6beb45 --- /dev/null +++ b/wms/T8_Authorization_curl_ver.php @@ -0,0 +1,48 @@ + $title, 'content' => $content, 'permission' => $permission, - 'creater' => $creater, + 'creater' => $user_id, 'create_at' => date("Y-m-d H:i:s") ); $cn->sendx($data); diff --git a/wms/css/function.js b/wms/css/function.js index 1d952871..0f786e08 100644 --- a/wms/css/function.js +++ b/wms/css/function.js @@ -1,8 +1,8 @@ -function tan(ty){ +function tan(ty) { alert('确定添加?'); - if(ty=='f'){ - var p= document.getElementById('facility'); - var newfacility='
\n' + + if (ty == 'f') { + var p = document.getElementById('facility'); + var newfacility = '
\n' + '
\n' + ' \n' + ' \n' + @@ -85,11 +85,11 @@ function tan(ty){ '
\n' + '\n' + '
' - p.innerHTML+=newfacility; + p.innerHTML += newfacility; - }else if(ty=='s'){ - var s= document.getElementById('schedule'); - var newschedule='
\n' + + } else if (ty == 's') { + var s = document.getElementById('schedule'); + var newschedule = '
\n' + '
\n' + ' \n' + ' \n' + @@ -115,15 +115,15 @@ function tan(ty){ '
\n' + '\n' + '
' - s.innerHTML+=newschedule; - }else{ + s.innerHTML += newschedule; + } else { alert('非法操作') } } -function tijiao(){ - //作番号 - var facilitynoslist = []; +function tijiao() { + //作番号 + var facilitynoslist = []; $(".facilitynos").each(function () { facilitynoslist.push($(this).val()); }); @@ -140,52 +140,52 @@ function tijiao(){ weightslist.push($(this).val()); }); //停数 - var numberofstopslist=[]; + var numberofstopslist = []; $(".numberofstops").each(function () { numberofstopslist.push($(this).val()); }); //楼层数 - var numberoffloorslist=[]; + var numberoffloorslist = []; $(".numberoffloors").each(function () { numberoffloorslist.push($(this).val()); }); //开门方式 - var opentypeslist=[]; + var opentypeslist = []; $(".opentypes").each(function () { opentypeslist.push($(this).val()); }); //速度 - var speedslist=[]; + var speedslist = []; $(".speeds").each(function () { speedslist.push($(this).val()); }); //维护形态 - var repairtypeslist=[]; + var repairtypeslist = []; $(".repairtypes").each(function () { repairtypeslist.push($(this).val()); }); //地址 - var addressslist=[]; + var addressslist = []; $(".addresss").each(function () { addressslist.push($(this).val()); }); //经度 - var longitudeslist=[]; + var longitudeslist = []; $(".longitudes").each(function () { longitudeslist.push($(this).val()); }); //维度 - var latitudeslist=[]; + var latitudeslist = []; $(".latitudes").each(function () { latitudeslist.push($(this).val()); }); //维护工号 - var repaireridslist=[]; + var repaireridslist = []; $(".repairerids").each(function () { repaireridslist.push($(this).val()); }); //维护人员姓名 - var repairernameslist=[]; + var repairernameslist = []; $(".repairernames").each(function () { repairernameslist.push($(this).val()); }); @@ -208,28 +208,28 @@ function tijiao(){ data: { facilitynos: JSON.stringify(facilitynoslist), weights: JSON.stringify(weightslist), - numberofstops:JSON.stringify(numberofstopslist), - numberoffloors:JSON.stringify(numberoffloorslist), - opentypes:JSON.stringify(opentypeslist), - speeds:JSON.stringify(speedslist), - repairtypes:JSON.stringify(repairtypeslist), - addresss:JSON.stringify(addressslist), - longitudes:JSON.stringify(longitudeslist), - latitudes:JSON.stringify(latitudeslist), - repairerids:JSON.stringify(repaireridslist), - repairernames:JSON.stringify(repairernameslist), - type:type, - contractno:contractno, - customerid:customerid, - creater:creater, - create_at:create_at + numberofstops: JSON.stringify(numberofstopslist), + numberoffloors: JSON.stringify(numberoffloorslist), + opentypes: JSON.stringify(opentypeslist), + speeds: JSON.stringify(speedslist), + repairtypes: JSON.stringify(repairtypeslist), + addresss: JSON.stringify(addressslist), + longitudes: JSON.stringify(longitudeslist), + latitudes: JSON.stringify(latitudeslist), + repairerids: JSON.stringify(repaireridslist), + repairernames: JSON.stringify(repairernameslist), + type: type, + contractno: contractno, + customerid: customerid, + creater: creater, + create_at: create_at }, success: function (data) { - var res=eval('('+data+')'); - if(res.code=='200'){ - window.location.href='custom-create-schedule.php?accountid='+customerid+'&contractno='+contractno; - }else{ + var res = eval('(' + data + ')'); + if (res.code == '200') { + window.location.href = 'custom-create-schedule.php?accountid=' + customerid + '&contractno=' + contractno; + } else { alert('添加失败'); } @@ -241,7 +241,7 @@ function tijiao(){ } -function tijiaosch(){ +function tijiaosch() { //作番号 var facilitynoslist = []; @@ -249,24 +249,24 @@ function tijiaosch(){ facilitynoslist.push($(this).val()); }); //保养套餐 - var combonoslist=[]; + var combonoslist = []; $(".combonos").each(function () { combonoslist.push($(this).val()); }); //保养日期duedates - var duedateslist=[]; + var duedateslist = []; $(".duedates").each(function () { duedateslist.push($(this).val()); }); //保养工号 - var repaireridslist=[]; + var repaireridslist = []; $(".repairerids").each(function () { repaireridslist.push($(this).val()); }); //保养人姓名 - var repairernameslist=[]; + var repairernameslist = []; $(".repairernames").each(function () { repairernameslist.push($(this).val()); }); @@ -286,20 +286,20 @@ function tijiaosch(){ url: url, data: { facilitynos: JSON.stringify(facilitynoslist), - combonos:JSON.stringify(combonoslist), - duedates:JSON.stringify(duedateslist), - repairerids:JSON.stringify(repaireridslist), - repairernames:JSON.stringify(repairernameslist), - type:type, - contractno:contractno, - creater:creater, - create_at:create_at + combonos: JSON.stringify(combonoslist), + duedates: JSON.stringify(duedateslist), + repairerids: JSON.stringify(repaireridslist), + repairernames: JSON.stringify(repairernameslist), + type: type, + contractno: contractno, + creater: creater, + create_at: create_at }, success: function (data) { - var res=eval('('+data+')'); - if(res.code=='200'){ - window.location.href='index.php'; - }else{ + var res = eval('(' + data + ')'); + if (res.code == '200') { + window.location.href = 'index.php'; + } else { alert('添加失败，请检查数据'); } @@ -310,43 +310,49 @@ function tijiaosch(){ } -function show(id){ +function show(id) { //removeClass var t = document.getElementById('account');//选取id为test的div元素 t.style.display = 'none';// 隐藏选择的元素 t.style.display = 'block';// 以块级样式显示 } -function login(){ +function login() { var account = $('.account').val(); var password = $('.password').val(); var url = "loginapi.php"; + $.ajax({ method: 'post', url: url, data: { - account:account, - password:password + account: account, + password: password }, success: function (data) { console.log('返回的结果'); - res=eval("("+data+")"); + res = eval("(" + data + ")"); console.log(res); console.log(window.location.host); console.log(res.code); - if(res.code=='200'){ - var token=res.token; - var name=res.name; - var login=res.login; - var menu=res.menu; - //console.log(token); - //window.localStorage.setItem("token",token); - //window.localStorage.setItem("name",name); - //window.localStorage.setItem("login",login); - window.localStorage.setItem("menu_"+res.uid,menu); - window.location.href='index.php?token='+token; - }else{ - window.location.href='login.php?errno=1'; + if (res.code == '200') { + var token = res.token; + var name = res.name; + var login = res.login; + var menu = res.menu; + + var queryString = window.location.search; + var params = new URLSearchParams(queryString); + var redirect = params.get('redirect'); + + window.localStorage.setItem("menu_" + res.uid, menu); + if (redirect == '' || redirect == 'null' || redirect == null) { + window.location.href = 'index.php?token=' + token; + } else { + window.location.href = decodeURIComponent(redirect) + '&token=' + token; + } + } else { + window.location.href = 'login.php?errno=1'; } @@ -355,15 +361,15 @@ function login(){ } -function settoken(v){ - window.localStorage.setItem("token",v); +function settoken(v) { + window.localStorage.setItem("token", v); } -function gettoken(v){ +function gettoken(v) { window.localStorage.getItem("token"); } -function tttt(){ +function tttt() { //alert('無權限操作'); return "err"; } \ No newline at end of file diff --git a/wms/css/view/expression-index.php b/wms/css/view/expression-index.php new file mode 100644 index 00000000..e1f5e17e --- /dev/null +++ b/wms/css/view/expression-index.php @@ -0,0 +1,230 @@ + \ No newline at end of file diff --git a/wms/expression-index.php b/wms/expression-index.php new file mode 100644 index 00000000..85e6f33d --- /dev/null +++ b/wms/expression-index.php @@ -0,0 +1,282 @@ + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + +
+

永佳捷 - 普萊特富 規格聯繫

+
合約號電梯編號 + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
合約號作翻號樓高通報工勘確認設計規格設計計劃圖設計顏色設計樣式
+ + + + + + 下載附件" : ""; + ?> + + "請選擇", + "0" => "已確認", + "2" => "無工勘需求", + "A" => "未動工", + "B" => "地下室施工", + "C" => "打樁", + "D" => "地基", + "E" => "挖土", + "G" => "機房", + "H" => "機械式淨高", + "M" => "樓中樓", + "OH" => "最高層(頂樓高度)", + "P" => "PIT(機坑深度)", + "R" => "R 樓", + "S" => "停工", + "T" => "TOP", + "TC" => "頂部間隙", + "TS" => "行程", + "TH" => "全高", + "Y" => "已搭、已出", + "YB" => "退購結案", + "YF" => "既有建物", + "YN" => "已搭、未出" + ); + for ($i = 1; $i < 200; $i++) { + $site_survey_status[$i . "F"] = $i . "F"; + } + ?> + + 下載附件" : ""; + ?> + + + 下載附件" : ""; + ?> + + + 下載附件_" . $data['create_at'] . "
"; + endforeach; + ?> + 		+ + 下載附件" : ""; + ?> + + + 下載附件" : ""; + ?> +
+
+ +There is no record!"; +endif; + +#代表結束連線 +mysqli_close($link); + +include "footer.php"; +?> \ No newline at end of file diff --git a/wms/gary.php b/wms/gary.php index 5855934d..edaef7d9 100644 --- a/wms/gary.php +++ b/wms/gary.php @@ -1,4 +1,10 @@ +永佳捷外事系統 +setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); -// } -// } catch (PDOException $e) { -// //echo "fail"; -// //echo $e->getMessage(); -// } +try { + // $conn = new PDO("sqlsrv:Server=220.130.203.251;Database=T8MASADA", "masada", "@m222222"); + // $conn = new PDO("sqlsrv:Server=10.10.145.2;Database=T8MASADA", "masada", "@m222222"); + // if ($conn) { + // $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + // } +} catch (PDOException $e) { + //echo "fail"; + //echo $e->getMessage(); +} @@ -210,7 +211,7 @@ $user_auth = check_user_permission($user_id, $token); - + - + diff --git a/wms/loginapi.php b/wms/loginapi.php index 59241cf1..07fb7211 100644 --- a/wms/loginapi.php +++ b/wms/loginapi.php @@ -10,6 +10,7 @@ include 'IncludeCommon.php'; if (!empty($_REQUEST["account"]) && !empty($_REQUEST["password"])) { $account = $_REQUEST["account"]; $password = $_REQUEST["password"]; + $redirect = empty($_REQUEST["redirect"]) ? "" : $_REQUEST["redirect"]; $includecommon = new IncludeCommon(); $data = array(); # 设置一个空阵列来放资料is $sql = "SELECT * FROM account where ((accountid = '$account') and (pwd = '$password'))"; # sql语法存在变数中 @@ -60,6 +61,7 @@ if (!empty($_REQUEST["account"]) && !empty($_REQUEST["password"])) { $jsonres['login'] = date("Y-m-d H:i:s"); // 登入時間 $jsonres['uid'] = $account; $jsonres['menu'] = $response_menu; + $jsonres['redirect'] = $redirect; echo json_encode($jsonres); } else { $jsonres['code'] = '1'; diff --git a/wms/mkt/pricereview-record-update.php b/wms/mkt/pricereview-record-update.php index 8baeb778..227ace2f 100644 --- a/wms/mkt/pricereview-record-update.php +++ b/wms/mkt/pricereview-record-update.php @@ -387,6 +387,7 @@ if(isset($_POST['pmstatus'])) { // 小於80%呈至總經理審核. ($price_rate) // 上級主管 > 伃廷 > MAX > 總經理 if ($status == "YS") { + $manager_arr = pricereview_class($price_rate, $user_id); if ($manager_arr) { $sign1 = $sign2 = $sign3 = $sign4 = ""; diff --git a/wms/notice-delete.php b/wms/notice-delete.php index f86c3f94..682eca04 100644 --- a/wms/notice-delete.php +++ b/wms/notice-delete.php @@ -6,6 +6,7 @@ $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.'); $db_query = "update notice set haveread = 1 where id = '$id'"; $res = mysqli_query($link, $db_query); -header("Refresh:0; url=notice-index.php?function_name=notice&".$token_link); +// header("Refresh:0; url=notice-index.php?function_name=notice&".$token_link); +header("Refresh:0; url=index.php?".$token_link); ob_end_flush(); ?> \ No newline at end of file diff --git a/wms/notice-edit.php b/wms/notice-edit.php index d43440db..637efcd9 100644 --- a/wms/notice-edit.php +++ b/wms/notice-edit.php @@ -7,12 +7,12 @@ $db_query = "select * from notice where id = '$id'"; $data = mysqli_query($link, $db_query); // 進入等於已讀 -$sql = " -UPDATE notice SET - haveread = 1 -WHERE id = '$id' -"; -mysqli_query($link, $sql); +// $sql = " +// UPDATE notice SET +// haveread = 1 +// WHERE id = '$id' +// "; +// mysqli_query($link, $sql); foreach ($data as $data) : ?> @@ -46,7 +46,10 @@ foreach ($data as $data) :

- + 回上頁 + + 已讀 +
diff --git a/wms/wipwhole-rec-invoice-edit-fileupload.php b/wms/wipwhole-rec-invoice-edit-fileupload.php index 3f7ce8ac..66f68f4c 100644 --- a/wms/wipwhole-rec-invoice-edit-fileupload.php +++ b/wms/wipwhole-rec-invoice-edit-fileupload.php @@ -63,6 +63,8 @@ $building_heigh_verify_file = fileIUpload("building_heigh_verify_file"); $site_survey_contact_verify_file = fileIUpload("site_survey_contact_verify_file"); $plan_diagram_file = fileIUpload("plan_diagram_file"); $completion_acceptance_file = fileIUpload("completion_acceptance_file"); +$delivery_date_file = fileIUpload("delivery_date_file"); + // 生管 $shengguanok_status_file = fileIUpload("shengguanok_status_file"); // 工務助理 diff --git a/wms/wipwhole-rec-invoice-edit-submit.php b/wms/wipwhole-rec-invoice-edit-submit.php index e3e07ea5..a75b65b8 100644 --- a/wms/wipwhole-rec-invoice-edit-submit.php +++ b/wms/wipwhole-rec-invoice-edit-submit.php @@ -1,10 +1,11 @@ $v) { if ($k !== 'desin_taiwan_items_no' && $k !== 'desin_taiwan_items_name') $$k = htmlspecialchars(stripslashes(trim($v))); @@ -128,10 +129,20 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $estimate_tryrun_end_date = $_POST['estimate_tryrun_end_date']; $estimate_tryrun_end_date_owner = $_POST['estimate_tryrun_end_date_owner']; $warehouse_assistant_remark = $_POST['warehouse_assistant_remark']; - $warehouseid = $_POST['warehouseid'] ?: $row['warehouseid']; $old_warehouseid = $_POST['old_warehouseid'] ?: $row['warehouseid']; + $salesid = $_POST['salesid'] ?: $row['salesid']; + $install_start_date = $_POST['install_start_date']; + $install_start_date_owner = $_POST['install_start_date_owner']; + $install_end_date = $_POST['install_end_date']; + $install_end_date_owner = $_POST['install_end_date_owner']; + $tryrun_start_date = $_POST['tryrun_start_date']; + $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']; + $salesname = accountid2name($salesid)[$salesid]; + $salesmail = accountid2email([$salesid])[$salesid]; // $creater = $_POST['creater']; $creater = $user_id; $create_at = date("Y-m-d H:i:s"); @@ -287,57 +298,64 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $cn->sendx($data); } } + if (!empty($delivery_date)) { if ($delivery_date !== $old_delivery_date) { - $permission = "M0168"; - $title = "移交日變更 客戶:$custom 作番:$facilityno"; - $content = "客戶:$custom + $permission_arr = ['M0168', 'M0012']; + foreach ($permission_arr as $permission) { + $title = "移交日變更 客戶:$custom 作番:$facilityno"; + $content = "客戶:$custom 作番:$facilityno 移交日 $old_delivery_date => $delivery_date"; - $data = array( - 'kind' => 1, - 'related_id' => $id, - 'title' => $title, - 'content' => $content, - 'permission' => $permission, - 'creater' => $creater, - 'create_at' => date("Y-m-d H:i:s") - ); - $cn->sendx($data); + $data = array( + 'kind' => 1, + 'related_id' => $id, + 'title' => $title, + 'content' => $content, + 'permission' => $permission, + 'creater' => $creater, + 'create_at' => date("Y-m-d H:i:s") + ); + $cn->sendx($data); + } } } + if (!empty($delivery_date)) { + if ($old_delivery_date !== $delivery_date) { + + if (empty($change_all_contractno)) { + $mail_title = "作番大日程(新梯)合約號:" . $contractno . "-移交日變更通知"; + $mail_content = "作番大日程(新梯) + 合約號:" . $contractno + . " + 移交日:" . $old_delivery_date . " => " . $delivery_date; + } else { + $mail_title = "作番大日程(新梯)合約號:" . $contractno . "作番號:" . $facilityno . "-移交日變更通知"; + $mail_content = "作番大日程(新梯) + 合約號:" . $contractno + . " + 作番號:" . $facilityno + . " + 移交日:" . $old_delivery_date . " => " . $delivery_date; + } + $cmail->sendx( + $mail_title, + $mail_content, + [ + [$salesname, $salesmail] + // ['gary', 'gary_chen@masada.com.tw'] + ], + "永佳捷科技" + ); + } + } $updatesql = " UPDATE wipwholestatus SET "; - if ( - in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188', 'M0117', 'M0054']) - || in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545]) - ) { - // 工務助理 工務更新 - $updatesql .= " - building_heigh_verify = '$building_heigh_verify', - building_heigh_verify_at = '$building_heigh_verify_at', - building_heigh_verify_owner = '$building_heigh_verify_owner', - site_survey_contact_verify = '$site_survey_contact_verify', - site_survey_contact_verify_at = '$site_survey_contact_verify_at', - site_survey_contact_verify_owner = '$site_survey_contact_verify_owner', - warehouse_remark = '', - "; - if (!empty(trim($warehouse_remark))) { - $updatesql .= " - all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "
" . $warehouse_remark . "

',IF(all_remark IS NULL,'',all_remark)), - "; - } - if (!empty($building_heigh_verify_file)) - $updatesql .= "building_heigh_verify_file = '$building_heigh_verify_file', "; - if (!empty($site_survey_contact_verify_file)) - $updatesql .= "site_survey_contact_verify_file = '$site_survey_contact_verify_file', "; - } - if (in_array($user_department_id, [311, 312, 313, 314, 315])) { // 營業更新; $updatesql .= " @@ -523,45 +541,26 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { || in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545]) ) { - // $outsourcer_type = $_POST['outsourcer_type']; - // $qc_official_type = $_POST['qc_official_type2'] ?: $row['qc_official_type']; - // $qc_date = $_POST['qc_date2'] ?: $row['qc_date']; - // $qc_date_owner = $_POST['qc_date2_owner'] ?: $row['qc_date_owner']; - // $end_qc_date = $_POST['end_qc_date2'] ?: $row['end_qc_date']; - // $end_qc_date_owner = $_POST['end_qc_date2_owner'] ?: $row['end_qc_date_owner']; - // $official_check_date = $_POST['official_check_date2'] ?: $row['official_check_date']; - // $old_official_check_date = $_POST['old_official_check_date2'] ?: $row['old_official_check_date']; - // $official_check_date_owner = $_POST['official_check_date2_owner'] ?: $row['official_check_date_owner']; - // $delivery_date = $_POST['delivery_date2'] ?: $row['delivery_date']; - // $delivery_date_owner = $_POST['delivery_date2_owner'] ?: $row['delivery_date_owner']; - // $install_start_date = $_POST['install_start_date2'] ?: $row['install_start_date']; - // $install_start_date_owner = $_POST['install_start_date2_owner'] ?: $row['install_start_date_owner']; - // $install_end_date = $_POST['install_end_date2'] ?: $row['install_end_date']; - // $install_end_date_owner = $_POST['install_end_date2_owner'] ?: $row['install_end_date_owner']; - // $tryrun_start_date = $_POST['tryrun_start_date2'] ?: $row['tryrun_start_date']; - // $tryrun_start_date_owner = $_POST['tryrun_start_date2_owner'] ?: $row['tryrun_start_date_owner']; - // $tryrun_end_date = $_POST['tryrun_end_date2'] ?: $row['tryrun_end_date']; - // $tryrun_end_date_owner = $_POST['tryrun_end_date2_owner'] ?: $row['tryrun_end_date_owner']; - - $outsourcer_type = isset($_POST['outsourcer_type']) ? $_POST['outsourcer_type'] : $row['outsourcer_type']; - $qc_official_type = isset($_POST['qc_official_type2']) ? $_POST['qc_official_type2'] : $row['qc_official_type']; - $qc_date = isset($_POST['qc_date2']) ? $_POST['qc_date2'] : $row['qc_date']; - $qc_date_owner = isset($_POST['qc_date2_owner']) ? $_POST['qc_date2_owner'] : $row['qc_date_owner']; + $outsourcer_type = isset($_POST['outsourcer_type']) ? $_POST['outsourcer_type'] : $outsourcer_type; + $qc_official_type = isset($_POST['qc_official_type2']) ? $_POST['qc_official_type2'] : $qc_official_type; + $qc_date = isset($_POST['qc_date2']) ? $_POST['qc_date2'] : $qc_date; + $qc_date_owner = isset($_POST['qc_date2_owner']) ? $_POST['qc_date2_owner'] : $qc_date_owner; $end_qc_date = isset($_POST['end_qc_date2']) ? $_POST['end_qc_date2'] : $row['end_qc_date']; - $end_qc_date_owner = isset($_POST['end_qc_date2_owner']) ? $_POST['end_qc_date2_owner'] : $row['end_qc_date_owner']; - $official_check_date = isset($_POST['official_check_date2']) ? $_POST['official_check_date2'] : $row['official_check_date']; - $old_official_check_date = isset($_POST['old_official_check_date2']) ? $_POST['old_official_check_date2'] : $row['old_official_check_date']; - $official_check_date_owner = isset($_POST['official_check_date2_owner']) ? $_POST['official_check_date2_owner'] : $row['official_check_date_owner']; - $delivery_date = isset($_POST['delivery_date2']) ? $_POST['delivery_date2'] : $row['delivery_date']; - $delivery_date_owner = isset($_POST['delivery_date2_owner']) ? $_POST['delivery_date2_owner'] : $row['delivery_date_owner']; - $install_start_date = isset($_POST['install_start_date2']) ? $_POST['install_start_date2'] : $row['install_start_date']; - $install_start_date_owner = isset($_POST['install_start_date2_owner']) ? $_POST['install_start_date2_owner'] : $row['install_start_date_owner']; - $install_end_date = isset($_POST['install_end_date2']) ? $_POST['install_end_date2'] : $row['install_end_date']; - $install_end_date_owner = isset($_POST['install_end_date2_owner']) ? $_POST['install_end_date2_owner'] : $row['install_end_date_owner']; - $tryrun_start_date = isset($_POST['tryrun_start_date2']) ? $_POST['tryrun_start_date2'] : $row['tryrun_start_date']; - $tryrun_start_date_owner = isset($_POST['tryrun_start_date2_owner']) ? $_POST['tryrun_start_date2_owner'] : $row['tryrun_start_date_owner']; - $tryrun_end_date = isset($_POST['tryrun_end_date2']) ? $_POST['tryrun_end_date2'] : $row['tryrun_end_date']; - $tryrun_end_date_owner = isset($_POST['tryrun_end_date2_owner']) ? $_POST['tryrun_end_date2_owner'] : $row['tryrun_end_date_owner']; + $end_qc_date_owner = isset($_POST['end_qc_date2_owner']) ? $_POST['end_qc_date2_owner'] : $end_qc_date_owner; + $official_check_date = isset($_POST['official_check_date2']) ? $_POST['official_check_date2'] : $official_check_date; + $old_official_check_date = isset($_POST['old_official_check_date2']) ? $_POST['old_official_check_date2'] : $old_official_check_date; + $official_check_date_owner = isset($_POST['official_check_date2_owner']) ? $_POST['official_check_date2_owner'] : $official_check_date_owner; + + $delivery_date = isset($_POST['delivery_date2']) ? $_POST['delivery_date2'] : $delivery_date; + $delivery_date_owner = isset($_POST['delivery_date2_owner']) ? $_POST['delivery_date2_owner'] : $delivery_date_owner; + $install_start_date = isset($_POST['install_start_date2']) ? $_POST['install_start_date2'] : $install_start_date; + $install_start_date_owner = isset($_POST['install_start_date2_owner']) ? $_POST['install_start_date2_owner'] : $install_start_date_owner; + $install_end_date = isset($_POST['install_end_date2']) ? $_POST['install_end_date2'] : $install_end_date; + $install_end_date_owner = isset($_POST['install_end_date2_owner']) ? $_POST['install_end_date2_owner'] : $install_end_date_owner; + $tryrun_start_date = isset($_POST['tryrun_start_date2']) ? $_POST['tryrun_start_date2'] : $tryrun_start_date; + $tryrun_start_date_owner = isset($_POST['tryrun_start_date2_owner']) ? $_POST['tryrun_start_date2_owner'] : $tryrun_start_date_owner; + $tryrun_end_date = isset($_POST['tryrun_end_date2']) ? $_POST['tryrun_end_date2'] : $tryrun_end_date; + $tryrun_end_date_owner = isset($_POST['tryrun_end_date2_owner']) ? $_POST['tryrun_end_date2_owner'] : $tryrun_end_date_owner; $updatesql .= " @@ -600,8 +599,24 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { estimate_tryrun_end_date = '$estimate_tryrun_end_date', estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner', warehouse_assistant_remark = '$warehouse_assistant_remark', + building_heigh_verify = '$building_heigh_verify', + building_heigh_verify_at = '$building_heigh_verify_at', + building_heigh_verify_owner = '$building_heigh_verify_owner', + site_survey_contact_verify = '$site_survey_contact_verify', + site_survey_contact_verify_at = '$site_survey_contact_verify_at', + site_survey_contact_verify_owner = '$site_survey_contact_verify_owner', + warehouse_remark = '', + install_start_date = '$install_start_date', + install_start_date_owner = '$install_start_date_owner', + install_end_date = '$install_end_date', + install_end_date_owner = '$install_end_date_owner', + tryrun_start_date = '$tryrun_start_date', + tryrun_start_date_owner = '$tryrun_start_date_owner', + tryrun_end_date = '$tryrun_end_date', + tryrun_end_date_owner = '$tryrun_end_date_owner', + delivery_date = '$delivery_date', + delivery_date_owner = '$delivery_date_owner', "; - if (!empty($plan_diagram_file)) { $updatesql .= "plan_diagram_file = '$plan_diagram_file', "; $updatesql .= " @@ -617,6 +632,17 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { if (!empty($outsourcer_contract_file)) { echo $updatesql .= "outsourcer_contract_file = '$outsourcer_contract_file', "; } + if (!empty(trim($warehouse_remark))) { + $updatesql .= " + all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "
" . $warehouse_remark . "

',IF(all_remark IS NULL,'',all_remark)), + "; + } + if (!empty($building_heigh_verify_file)) + $updatesql .= "building_heigh_verify_file = '$building_heigh_verify_file', "; + if (!empty($site_survey_contact_verify_file)) + $updatesql .= "site_survey_contact_verify_file = '$site_survey_contact_verify_file', "; + if (!empty($delivery_date_file)) + $updatesql .= "delivery_date_file = '$delivery_date_file', "; } // 許協更新業務確認項目權限 @@ -871,89 +897,89 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { } } -if ($_SERVER["REQUEST_METHOD"] == "POST") { - if ($_POST['form_name'] == 'update_install_date_form') { - include "./class/Cmail.php"; - $cmail = new Cmail(); - foreach ($_POST as $k => $v) - $$k = htmlspecialchars(stripslashes(trim($v))); - - $change_all_contractno = $_POST['change_all_contractno']; - $contractno2 = $_POST['contractno2']; - $install_start_date = $_POST['install_start_date']; - $install_start_date_owner = $_POST['install_start_date_owner']; - $install_end_date = $_POST['install_end_date']; - $install_end_date_owner = $_POST['install_end_date_owner']; - $tryrun_start_date = $_POST['tryrun_start_date']; - $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']; - $old_delivery_date = $_POST['old_delivery_date']; - $delivery_date = $_POST['delivery_date']; - $delivery_date_owner = $_POST['delivery_date_owner']; - $contractno = $_POST['contractno']; - $facilityno = $_POST['facilityno']; - $salesid = $_POST['salesid']; - - $salesname = accountid2name($salesid)[$salesid]; - $salesmail = accountid2email([$salesid])[$salesid]; - - if ($old_delivery_date !== $delivery_date) { - - if (empty($change_all_contractno)) { - $mail_title = "作番大日程(新梯)合約號:" . $contractno . "-移交日變更通知"; - $mail_content = "作番大日程(新梯) - 合約號:" . $contractno - . " - 移交日:" . $old_delivery_date . " => " . $delivery_date; - } else { - $mail_title = "作番大日程(新梯)合約號:" . $contractno . "作番號:" . $facilityno . "-移交日變更通知"; - $mail_content = "作番大日程(新梯) - 合約號:" . $contractno - . " - 作番號:" . $facilityno - . " - 移交日:" . $old_delivery_date . " => " . $delivery_date; - } - $cmail->sendx( - $mail_title, - $mail_content, - [ - [$salesname, $salesmail] - ], - "永佳捷科技" - ); - } - - $updatesql = " - UPDATE wipwholestatus - SET - install_start_date = '$install_start_date', - install_start_date_owner = '$install_start_date_owner', - install_end_date = '$install_end_date', - install_end_date_owner = '$install_end_date_owner', - tryrun_start_date = '$tryrun_start_date', - tryrun_start_date_owner = '$tryrun_start_date_owner', - tryrun_end_date = '$tryrun_end_date', - tryrun_end_date_owner = '$tryrun_end_date_owner', - delivery_date = '$delivery_date', - delivery_date_owner = '$delivery_date_owner' - "; - if (empty($change_all_contractno)) { - $updatesql .= "WHERE id = '$id' "; - } else { - $updatesql .= "WHERE contractno = '$contractno2' "; - } - // echo $updatesql; - // exit; - mysqli_query($link, $updatesql); - - echo ""; - } -} +// if ($_SERVER["REQUEST_METHOD"] == "POST") { +// if ($_POST['form_name'] == 'update_install_date_form') { +// include "./class/Cmail.php"; +// $cmail = new Cmail(); +// foreach ($_POST as $k => $v) +// $$k = htmlspecialchars(stripslashes(trim($v))); + +// $change_all_contractno = $_POST['change_all_contractno']; +// $contractno2 = $_POST['contractno2']; +// $install_start_date = $_POST['install_start_date']; +// $install_start_date_owner = $_POST['install_start_date_owner']; +// $install_end_date = $_POST['install_end_date']; +// $install_end_date_owner = $_POST['install_end_date_owner']; +// $tryrun_start_date = $_POST['tryrun_start_date']; +// $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']; +// $old_delivery_date = $_POST['old_delivery_date']; +// $delivery_date = $_POST['delivery_date']; +// $delivery_date_owner = $_POST['delivery_date_owner']; +// $contractno = $_POST['contractno']; +// $facilityno = $_POST['facilityno']; +// $salesid = $_POST['salesid']; + +// $salesname = accountid2name($salesid)[$salesid]; +// $salesmail = accountid2email([$salesid])[$salesid]; + +// if ($old_delivery_date !== $delivery_date) { + +// if (empty($change_all_contractno)) { +// $mail_title = "作番大日程(新梯)合約號:" . $contractno . "-移交日變更通知"; +// $mail_content = "作番大日程(新梯) +// 合約號:" . $contractno +// . " +// 移交日:" . $old_delivery_date . " => " . $delivery_date; +// } else { +// $mail_title = "作番大日程(新梯)合約號:" . $contractno . "作番號:" . $facilityno . "-移交日變更通知"; +// $mail_content = "作番大日程(新梯) +// 合約號:" . $contractno +// . " +// 作番號:" . $facilityno +// . " +// 移交日:" . $old_delivery_date . " => " . $delivery_date; +// } +// $cmail->sendx( +// $mail_title, +// $mail_content, +// [ +// [$salesname, $salesmail] +// ], +// "永佳捷科技" +// ); +// } + +// $updatesql = " +// UPDATE wipwholestatus +// SET +// install_start_date = '$install_start_date', +// install_start_date_owner = '$install_start_date_owner', +// install_end_date = '$install_end_date', +// install_end_date_owner = '$install_end_date_owner', +// tryrun_start_date = '$tryrun_start_date', +// tryrun_start_date_owner = '$tryrun_start_date_owner', +// tryrun_end_date = '$tryrun_end_date', +// tryrun_end_date_owner = '$tryrun_end_date_owner', +// delivery_date = '$delivery_date', +// delivery_date_owner = '$delivery_date_owner' +// "; +// if (empty($change_all_contractno)) { +// $updatesql .= "WHERE id = '$id' "; +// } else { +// $updatesql .= "WHERE contractno = '$contractno2' "; +// } +// // echo $updatesql; +// // exit; +// mysqli_query($link, $updatesql); + +// echo ""; +// } +// } if ($_SERVER["REQUEST_METHOD"] == "POST") { if ($_POST['form_name'] == 'update_shengguan_form') { @@ -989,6 +1015,41 @@ 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(); + + $id = $_POST['id']; + $sql = " + SELECT * FROM wipwholestatus WHERE id = '$id' + AND status = '1' + "; + $data = mysqli_fetch_assoc(mysqli_query($link, $sql)); + + $encodedString = urlencode("expression-index.php?function_name=expression&id=$id"); + $href = "永佳捷 - 普萊特富 規格聯繫"; + $mail_title = "外示系統通知 合約號:" . $data['contractno'] . "作番號:" . $data['facilityno']; + $mail_content = "外示系統通知 合約號:" . $data['contractno'] + . " +作番號:" . $data['facilityno'] . " +$href +"; + $cmail->sendx( + $mail_title, + $mail_content, + [ + ["gary", "gary_chen@masada.com.tw"], + ["owen", "owen@masada.com.tw"], + ["舒立成", "shulicheng@platform-cn.com"] + ], + "永佳捷科技" + ); + } +} + function write_note($link, $id, $user_id, $content) { diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php index e458cb2d..e764404f 100644 --- a/wms/wipwhole-rec-invoice-edit.php +++ b/wms/wipwhole-rec-invoice-edit.php @@ -940,7 +940,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; } ?> - " /> + " /> 附件 @@ -985,20 +985,19 @@ include "wipwhole-rec-invoice-edit-submit.php"; (項目經理項目) - 實際安裝開工日
- > + > - +
確認人 - @@ -1008,15 +1007,15 @@ include "wipwhole-rec-invoice-edit-submit.php"; 實際安裝完工日
- > + > - +
確認人 - @@ -1026,15 +1025,15 @@ include "wipwhole-rec-invoice-edit-submit.php"; 實際試車開工日
- > + > - +
確認人 - @@ -1044,15 +1043,15 @@ include "wipwhole-rec-invoice-edit-submit.php"; 實際試車完工日
- > + > - +
確認人 - @@ -1062,31 +1061,46 @@ include "wipwhole-rec-invoice-edit-submit.php"; 移交日
- > + " max="" id="delivery_date" name="delivery_date" value="" > + - +
確認人 - + + + 移交日附件(核准函) + + > + 下載附件" : ""; + ?> + + + - 有官檢日或QC合格日後才可填寫 +

1.有官檢日或QC合格日後才可填寫。

+

2.注意填寫後不可更改！

+

3.只能維護當前月份。

存檔"; - echo ""; - echo ""; + echo ""; + // echo ""; + // echo ""; + // echo ""; } ?> @@ -1270,7 +1284,13 @@ include "wipwhole-rec-invoice-edit-submit.php"; " readonly> + +
> - > + @@ -1566,7 +1586,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
> - > + @@ -1923,7 +1943,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; -
+ @@ -1950,6 +1970,10 @@ include "wipwhole-rec-invoice-edit-submit.php";
+
+ + +
@@ -1963,6 +1987,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; + "; - } -} +// if ($_SERVER["REQUEST_METHOD"] == "POST") { +// if ($_POST['form_name'] == 'update_install_date_form') { +// include "./class/Cmail.php"; +// $cmail = new Cmail(); +// foreach ($_POST as $k => $v) +// $$k = htmlspecialchars(stripslashes(trim($v))); + +// $change_all_contractno = $_POST['change_all_contractno']; +// $contractno = $_POST['contractno2']; +// $install_start_date = $_POST['install_start_date']; +// $install_start_date_owner = $_POST['install_start_date_owner']; +// $install_end_date = $_POST['install_end_date']; +// $install_end_date_owner = $_POST['install_end_date_owner']; +// $tryrun_start_date = $_POST['tryrun_start_date']; +// $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']; +// $old_delivery_date = $_POST['old_delivery_date']; +// $delivery_date = $_POST['delivery_date']; +// $delivery_date_owner = $_POST['delivery_date_owner']; +// $contractno = $_POST['contractno']; +// $facilityno = $_POST['facilityno']; +// $salesid = $_POST['salesid']; + +// $salesname = accountid2name($salesid)[$salesid]; +// $salesmail = accountid2email([$salesid])[$salesid]; + +// if ($old_delivery_date !== $delivery_date) { + +// if (empty($change_all_contractno)) { +// $mail_title = "作番大日程(汰改)合約號:" . $contractno . "-移交日變更通知"; +// $mail_content = "作番大日程(汰改)$salesname$salesmail +// 合約號:" . $contractno +// . " +// 移交日:" . $old_delivery_date . " => " . $delivery_date; +// } else { +// $mail_title = "作番大日程(汰改)合約號:" . $contractno . "作番號:" . $facilityno . "-移交日變更通知"; +// $mail_content = "作番大日程(汰改) +// 合約號:" . $contractno +// . " +// 作番號:" . $facilityno +// . " +// 移交日:" . $old_delivery_date . " => " . $delivery_date; +// } +// $cmail->sendx( +// $mail_title, +// $mail_content, +// [ +// [$salesname, $salesmail] +// ], +// "永佳捷科技" +// ); +// } + +// $updatesql = " +// UPDATE wipwholestatus +// SET +// install_start_date = '$install_start_date', +// install_start_date_owner = '$install_start_date_owner', +// install_end_date = '$install_end_date', +// install_end_date_owner = '$install_end_date_owner', +// tryrun_start_date = '$tryrun_start_date', +// tryrun_start_date_owner = '$tryrun_start_date_owner', +// tryrun_end_date = '$tryrun_end_date', +// tryrun_end_date_owner = '$tryrun_end_date_owner', +// delivery_date = '$delivery_date', +// delivery_date_owner = '$delivery_date_owner' +// "; +// if (empty($change_all_contractno)) { +// $updatesql .= "WHERE id = '$id' "; +// } else { +// $updatesql .= "WHERE contractno = '$contractno' "; +// } +// // echo $updatesql; +// // exit; +// mysqli_query($link, $updatesql); + +// echo ""; +// } +// } if ($_SERVER["REQUEST_METHOD"] == "POST") { @@ -1010,6 +1053,42 @@ 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(); + + $id = $_POST['id']; + $sql = " + SELECT * FROM wipwholestatus WHERE id = '$id' + AND status = '1' + "; + $data = mysqli_fetch_assoc(mysqli_query($link, $sql)); + + $encodedString = urlencode("expression-index.php?function_name=expression&id=$id"); + $href = "永佳捷 - 普萊特富 規格聯繫"; + $mail_title = "外示系統通知 合約號:" . $data['contractno'] . "作番號:" . $data['facilityno']; + $mail_content = "外示系統通知 合約號:" . $data['contractno'] + . " +作番號:" . $data['facilityno'] . " +$href +"; + $cmail->sendx( + $mail_title, + $mail_content, + [ + ["gary", "gary_chen@masada.com.tw"], + ["owen", "owen@masada.com.tw"], + ["舒立成", "shulicheng@platform-cn.com"], + ], + "永佳捷科技" + ); + } +} + // 退回至工務階段 function backWarehouse($link, $user_id) { diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php index f458ab65..2af5e630 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit.php @@ -482,15 +482,15 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 實際安裝開工日
- > + > - +
確認人 - @@ -500,15 +500,15 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 實際安裝完工日
- > + > - +
確認人 - @@ -518,15 +518,15 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 實際試車開工日
- > + > - +
確認人 - @@ -536,15 +536,15 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 實際試車完工日
- > + > - +
確認人 - @@ -554,31 +554,46 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 移交日
- > + " max="" id="delivery_date" name="delivery_date" value="" > + - +
確認人 - + + + 移交日附件(客戶確認單) + + > + 下載附件" : ""; + ?> + + + - 有官檢日或QC合格日後才可填寫 +

1.有官檢日或QC合格日後才可填寫。

+

2.注意填寫後不可更改！

+

3.只能維護當前月份。

存檔"; - echo ""; - echo ""; + echo ""; + // echo ""; + // echo ""; + // echo ""; } ?> @@ -1272,6 +1287,11 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; " readonly> + + @@ -1918,7 +1938,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; -
+ @@ -1945,6 +1965,10 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
+
+ + +
@@ -1987,12 +2011,15 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; } function checkDeliveryDateKeyinStatus() { - $("#delivery_date,#delivery_date_tmp").prop("disabled", true); + $("#delivery_date").prop("disabled", true); if ($("#end_qc_date").val() !== "") { - $("#delivery_date,#delivery_date_tmp").prop("disabled", false); + $("#delivery_date").prop("disabled", false); } if ($("#official_check_date").val() !== "") { - $("#delivery_date,#delivery_date_tmp").prop("disabled", false); + $("#delivery_date").prop("disabled", false); + } + if ($("#delivery_date").val() !== "") { + $("#delivery_date").prop("disabled", true); } } $(function() { @@ -2018,10 +2045,10 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 'qc_date', 'end_qc_date', 'official_check_date', - // 'delivery_date', 'qc_date2', 'end_qc_date2', 'official_check_date2', + 'delivery_date', 'delivery_date2', 'install_start_date2', 'install_end_date2', @@ -2342,42 +2369,49 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; } } - function saveInstallData() { - if (confirm('確定要更改實際安裝日程嗎?') == true) { - if ($("#change_all_contractno_tmp").prop('checked')) { - if ($("#contractno").val() == '' || $("#contractno").val() == null) { - alert("合約號空白"); - } else { - $("#change_all_contractno").val($("#change_all_contractno_tmp").prop('checked')); - $("#contractno2").val($("#contractno").val()); - $("#install_start_date").val($("#install_start_date_tmp").val()); - $("#install_start_date_owner").val($("#install_start_date_owner_tmp").val()); - $("#install_end_date").val($("#install_end_date_tmp").val()); - $("#install_end_date_owner").val($("#install_end_date_owner_tmp").val()); - $("#tryrun_start_date").val($("#tryrun_start_date_tmp").val()); - $("#tryrun_start_date_owner").val($("#tryrun_start_date_owner_tmp").val()); - $("#tryrun_end_date").val($("#tryrun_end_date_tmp").val()); - $("#tryrun_end_date_owner").val($("#tryrun_end_date_owner_tmp").val()); - $("#delivery_date").val($("#delivery_date_tmp").val()); - $("#delivery_date_owner").val($("#delivery_date_owner_tmp").val()); - $('#update_install_date_form').submit(); - } - } else { - $("#install_start_date").val($("#install_start_date_tmp").val()); - $("#install_start_date_owner").val($("#install_start_date_owner_tmp").val()); - $("#install_end_date").val($("#install_end_date_tmp").val()); - $("#install_end_date_owner").val($("#install_end_date_owner_tmp").val()); - $("#tryrun_start_date").val($("#tryrun_start_date_tmp").val()); - $("#tryrun_start_date_owner").val($("#tryrun_start_date_owner_tmp").val()); - $("#tryrun_end_date").val($("#tryrun_end_date_tmp").val()); - $("#tryrun_end_date_owner").val($("#tryrun_end_date_owner_tmp").val()); - $("#delivery_date").val($("#delivery_date_tmp").val()); - $("#delivery_date_owner").val($("#delivery_date_owner_tmp").val()); - $('#update_install_date_form').submit(); - } + function sendExpressionMailToPlatform(id){ + if (confirm('確定要發送郵件嗎?') == true) { + $("#wipwholestatusid").val(id); + $('#send_expression_mail_to_platform_form').submit(); } } + // function saveInstallData() { + // if (confirm('確定要更改實際安裝日程嗎?') == true) { + // if ($("#change_all_contractno_tmp").prop('checked')) { + // if ($("#contractno").val() == '' || $("#contractno").val() == null) { + // alert("合約號空白"); + // } else { + // $("#change_all_contractno").val($("#change_all_contractno_tmp").prop('checked')); + // $("#contractno2").val($("#contractno").val()); + // $("#install_start_date").val($("#install_start_date_tmp").val()); + // $("#install_start_date_owner").val($("#install_start_date_owner_tmp").val()); + // $("#install_end_date").val($("#install_end_date_tmp").val()); + // $("#install_end_date_owner").val($("#install_end_date_owner_tmp").val()); + // $("#tryrun_start_date").val($("#tryrun_start_date_tmp").val()); + // $("#tryrun_start_date_owner").val($("#tryrun_start_date_owner_tmp").val()); + // $("#tryrun_end_date").val($("#tryrun_end_date_tmp").val()); + // $("#tryrun_end_date_owner").val($("#tryrun_end_date_owner_tmp").val()); + // $("#delivery_date").val($("#delivery_date_tmp").val()); + // $("#delivery_date_owner").val($("#delivery_date_owner_tmp").val()); + // $('#update_install_date_form').submit(); + // } + // } else { + // $("#install_start_date").val($("#install_start_date_tmp").val()); + // $("#install_start_date_owner").val($("#install_start_date_owner_tmp").val()); + // $("#install_end_date").val($("#install_end_date_tmp").val()); + // $("#install_end_date_owner").val($("#install_end_date_owner_tmp").val()); + // $("#tryrun_start_date").val($("#tryrun_start_date_tmp").val()); + // $("#tryrun_start_date_owner").val($("#tryrun_start_date_owner_tmp").val()); + // $("#tryrun_end_date").val($("#tryrun_end_date_tmp").val()); + // $("#tryrun_end_date_owner").val($("#tryrun_end_date_owner_tmp").val()); + // $("#delivery_date").val($("#delivery_date_tmp").val()); + // $("#delivery_date_owner").val($("#delivery_date_owner_tmp").val()); + // $('#update_install_date_form').submit(); + // } + // } + // } + function setOutSourcerDate() { diff --git a/workflow/lib/DB.php b/workflow/lib/DB.php index ca316873..193f49cb 100644 --- a/workflow/lib/DB.php +++ b/workflow/lib/DB.php @@ -19,7 +19,7 @@ if (file_exists($envFile)) { class DB { private static $ds = array( - 'default' => array('host' => '127.0.0.1', 'db_name' => 'appwms', 'user' => 'masadaroot', 'pwd' => '') + 'default' => array('host' => '127.0.0.1', 'db_name' => 'appwms', 'user' => 'masadaroot', 'pwd' => 'x6h5E5p#u8y') ); public static $instance; /**