diff --git a/wms/wipwhole-index-function.php b/wms/wipwhole-index-function.php
index 3f8c6d67..66d0e67b 100644
--- a/wms/wipwhole-index-function.php
+++ b/wms/wipwhole-index-function.php
@@ -831,18 +831,68 @@ function getWarehouseStatus($link, $user_department_id, $role_id, $status)
}
// 取得營業或契約的欄位權限
-function getMarketingStatus($link, $user_department_id, $role_id)
+function getMarketingStatus($link, $user_department_id, $role_id, $status)
{
if ($user_department_id == 220)
return "";
- if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)
- return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
- if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514)
- return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
-
+ if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315) {
+ if ($status == 1) {
+ return checkNowFormStatus($link) == 'A' ? "" : "disabled";
+ } else {
+ return "";
+ }
+ }
+ if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514) {
+ if ($status == 1) {
+ return checkNowFormStatus($link) == 'A' ? "" : "disabled";
+ } else {
+ return "";
+ }
+ }
return "disabled";
}
+// 確認目前狀態
+function checkNowFormStatus($link)
+{
+ if (isset($_GET['id']) || isset($_GET['form_key'])) {
+ $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+ $form_key = getForm_key($link, $id);
+ }
+ $sql = "
+ SELECT
+ flow_code
+ FROM flow
+ WHERE form_id = '$id'
+ AND form_key = '$form_key'
+ AND system_id = 'wws'
+ AND flow_id = 'wws01'
+ ";
+ $result = mysqli_query($link, $sql);
+ $row = mysqli_fetch_array($result);
+ return $row['0'];
+}
+
+// 取得本次簽核的表單form_key值
+function getForm_key($link, $form_id)
+{
+ $sql = "
+ SELECT
+ f.form_key
+ FROM flow AS f
+ LEFT JOIN subflow AS s
+ ON f.form_key = s.form_key
+ WHERE 1=1
+ AND f.form_id = '$form_id'
+ AND f.flow_code IN ('A','B','C','D','E')
+ AND f.system_id = 'wws'
+ AND f.flow_id = 'wws01'
+ ";
+ $result = mysqli_query($link, $sql);
+ $row = mysqli_fetch_array($result);
+ return $row['form_key'];
+}
+
// 取得設計的欄位權限
function getDesinStatus($link, $user_department_id, $role_id)
{
diff --git a/wms/wipwhole-rec-invoice-edit-submit.php b/wms/wipwhole-rec-invoice-edit-submit.php
index a9456aab..af4823a0 100644
--- a/wms/wipwhole-rec-invoice-edit-submit.php
+++ b/wms/wipwhole-rec-invoice-edit-submit.php
@@ -154,6 +154,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
$delivery_date_owner = $_POST['delivery_date_owner'] ?: $row['delivery_date_owner'];
// 工務助理
+ $outsourcer_type = $_POST['outsourcer_type'];
$install_outsourcer = $_POST['install_outsourcer'];
$install_outsourcer_owner = $_POST['install_outsourcer_owner'];
$install_outsourcer_date = $_POST['install_outsourcer_date'];
@@ -511,24 +512,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
// 工務助理
if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188'])) {
$updatesql .= "
- install_outsourcer = '$install_outsourcer',
- install_outsourcer_owner = '$install_outsourcer_owner',
- install_outsourcer_date = '$install_outsourcer_date',
- install_outsourcer_date_owner = '$install_outsourcer_date_owner',
- estimate_install_start_date = '$estimate_install_start_date',
- estimate_install_start_date_owner = '$estimate_install_start_date_owner',
- estimate_install_end_date = '$estimate_install_end_date',
- estimate_install_end_date_owner = '$estimate_install_end_date_owner',
- tryrun_outsourcer = '$tryrun_outsourcer',
- tryrun_outsourcer_owner = '$tryrun_outsourcer_owner',
- tryrun_outsourcer_date = '$tryrun_outsourcer_date',
- tryrun_outsourcer_date_owner = '$tryrun_outsourcer_date_owner',
- estimate_tryrun_start_date = '$estimate_tryrun_start_date',
- estimate_tryrun_start_date_owner = '$estimate_tryrun_start_date_owner',
- estimate_tryrun_end_date = '$estimate_tryrun_end_date',
- estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner',
- warehouse_assistant_remark = '$warehouse_assistant_remark',
- ";
+ outsourcer_type = '$outsourcer_type',
+ install_outsourcer = '$install_outsourcer',
+ install_outsourcer_owner = '$install_outsourcer_owner',
+ install_outsourcer_date = '$install_outsourcer_date',
+ install_outsourcer_date_owner = '$install_outsourcer_date_owner',
+ estimate_install_start_date = '$estimate_install_start_date',
+ estimate_install_start_date_owner = '$estimate_install_start_date_owner',
+ estimate_install_end_date = '$estimate_install_end_date',
+ estimate_install_end_date_owner = '$estimate_install_end_date_owner',
+ tryrun_outsourcer = '$tryrun_outsourcer',
+ tryrun_outsourcer_owner = '$tryrun_outsourcer_owner',
+ tryrun_outsourcer_date = '$tryrun_outsourcer_date',
+ tryrun_outsourcer_date_owner = '$tryrun_outsourcer_date_owner',
+ estimate_tryrun_start_date = '$estimate_tryrun_start_date',
+ estimate_tryrun_start_date_owner = '$estimate_tryrun_start_date_owner',
+ estimate_tryrun_end_date = '$estimate_tryrun_end_date',
+ estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner',
+ warehouse_assistant_remark = '$warehouse_assistant_remark',
+ ";
if (!empty($plan_diagram_file)) {
$updatesql .= "plan_diagram_file = '$plan_diagram_file', ";
@@ -823,6 +825,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
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'];
@@ -843,8 +847,12 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
tryrun_start_date_owner = '$tryrun_start_date_owner',
tryrun_end_date = '$tryrun_end_date',
tryrun_end_date_owner = '$tryrun_end_date_owner'
- WHERE id = '$id'
";
+ if (empty($change_all_contractno)) {
+ $updatesql .= "WHERE id = '$id' ";
+ } else {
+ $updatesql .= "WHERE contractno = '$contractno' ";
+ }
// echo $updatesql;
// exit;
mysqli_query($link, $updatesql);
diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php
index 945ef6ec..c4398a84 100644
--- a/wms/wipwhole-rec-invoice-edit.php
+++ b/wms/wipwhole-rec-invoice-edit.php
@@ -1,5 +1,5 @@
合約號 |
- " >
+ " >
移交日 |
- >
+ >
-
+
|
@@ -507,10 +508,10 @@ include "wipwhole-rec-invoice-edit-submit.php";
if (checkNowFormYDStatus($link) == 'A' && ($user_department_id == 220 || $user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)) {
?>
-
+
@@ -953,8 +954,11 @@ include "wipwhole-rec-invoice-edit-submit.php";
存檔";
+ echo "";
+ echo "";
+ }
?>
|
@@ -1337,17 +1341,20 @@ include "wipwhole-rec-invoice-edit-submit.php";
發包類型 |
-
+ />
-
+ />
-
+ />
-
-
+
+
@@ -1356,7 +1363,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
|
安裝發包廠商 |
- />
+ />
|
確認人 |
@@ -1423,7 +1430,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
|
試車發包廠商 |
- />
+ />
|
確認人 |
@@ -1546,6 +1553,8 @@ include "wipwhole-rec-invoice-edit-submit.php";
|
工地負責人 |
diff --git a/wms/wipwhole-rec-renovate-invoice.php b/wms/wipwhole-rec-renovate-invoice.php
index 6878f90a..1550676d 100644
--- a/wms/wipwhole-rec-renovate-invoice.php
+++ b/wms/wipwhole-rec-renovate-invoice.php
@@ -540,7 +540,7 @@ if ($department_id == "321" || $department_id == "220") {
'$facility_kind',
'$address',
'$contract_arrival_date',
- '$real_contract_arrival_date',
+ '$contract_arrival_date',
'$sales_spec_verify',
'$sales_spec_verify_file',
'$sales_spec_verify_at',
@@ -771,10 +771,10 @@ if ($department_id == "321" || $department_id == "220") {
|
- 預計交期 (到工地) |
+
工地負責人 |
diff --git a/wms/wipwhole-renovate-rec-invoice-edit-submit.php b/wms/wipwhole-renovate-rec-invoice-edit-submit.php
index 17c21cb5..a7133eb6 100644
--- a/wms/wipwhole-renovate-rec-invoice-edit-submit.php
+++ b/wms/wipwhole-renovate-rec-invoice-edit-submit.php
@@ -94,6 +94,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
$old_site_survey_contact_verify = $_POST['old_site_survey_contact_verify'];
// 工務助理
+ $outsourcer_type = $_POST['outsourcer_type'];
$install_outsourcer = $_POST['install_outsourcer'];
$install_outsourcer_owner = $_POST['install_outsourcer_owner'];
$install_outsourcer_date = $_POST['install_outsourcer_date'];
@@ -491,24 +492,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
// 工務助理
if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188'])) {
$updatesql .= "
- install_outsourcer = '$install_outsourcer',
- install_outsourcer_owner = '$install_outsourcer_owner',
- install_outsourcer_date = '$install_outsourcer_date',
- install_outsourcer_date_owner = '$install_outsourcer_date_owner',
- estimate_install_start_date = '$estimate_install_start_date',
- estimate_install_start_date_owner = '$estimate_install_start_date_owner',
- estimate_install_end_date = '$estimate_install_end_date',
- estimate_install_end_date_owner = '$estimate_install_end_date_owner',
- tryrun_outsourcer = '$tryrun_outsourcer',
- tryrun_outsourcer_owner = '$tryrun_outsourcer_owner',
- tryrun_outsourcer_date = '$tryrun_outsourcer_date',
- tryrun_outsourcer_date_owner = '$tryrun_outsourcer_date_owner',
- estimate_tryrun_start_date = '$estimate_tryrun_start_date',
- estimate_tryrun_start_date_owner = '$estimate_tryrun_start_date_owner',
- estimate_tryrun_end_date = '$estimate_tryrun_end_date',
- estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner',
- warehouse_assistant_remark = '$warehouse_assistant_remark',
- ";
+ outsourcer_type = '$outsourcer_type',
+ install_outsourcer = '$install_outsourcer',
+ install_outsourcer_owner = '$install_outsourcer_owner',
+ install_outsourcer_date = '$install_outsourcer_date',
+ install_outsourcer_date_owner = '$install_outsourcer_date_owner',
+ estimate_install_start_date = '$estimate_install_start_date',
+ estimate_install_start_date_owner = '$estimate_install_start_date_owner',
+ estimate_install_end_date = '$estimate_install_end_date',
+ estimate_install_end_date_owner = '$estimate_install_end_date_owner',
+ tryrun_outsourcer = '$tryrun_outsourcer',
+ tryrun_outsourcer_owner = '$tryrun_outsourcer_owner',
+ tryrun_outsourcer_date = '$tryrun_outsourcer_date',
+ tryrun_outsourcer_date_owner = '$tryrun_outsourcer_date_owner',
+ estimate_tryrun_start_date = '$estimate_tryrun_start_date',
+ estimate_tryrun_start_date_owner = '$estimate_tryrun_start_date_owner',
+ estimate_tryrun_end_date = '$estimate_tryrun_end_date',
+ estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner',
+ warehouse_assistant_remark = '$warehouse_assistant_remark',
+ ";
if (!empty($plan_diagram_file)) {
$updatesql .= "plan_diagram_file = '$plan_diagram_file', ";
$updatesql .= "
@@ -797,6 +799,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
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'];
@@ -817,8 +821,12 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
tryrun_start_date_owner = '$tryrun_start_date_owner',
tryrun_end_date = '$tryrun_end_date',
tryrun_end_date_owner = '$tryrun_end_date_owner'
- WHERE id = '$id'
";
+ if (empty($change_all_contractno)) {
+ $updatesql .= "WHERE id = '$id' ";
+ } else {
+ $updatesql .= "WHERE contractno = '$contractno' ";
+ }
// echo $updatesql;
// exit;
mysqli_query($link, $updatesql);
diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php
index acba025d..a47ed372 100644
--- a/wms/wipwhole-renovate-rec-invoice-edit.php
+++ b/wms/wipwhole-renovate-rec-invoice-edit.php
@@ -99,7 +99,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
合約號 |
- " >
+ " >
| 作番號 |
- " >
+ " >
|
汰改種類 |
- |
合約交期 (到工地) |
- >
+ >
|
客戶名稱 |
- " >
+ " >
|
號機 |
- " >
+ " >
|
工地負責人 |
- " >
+ " >
|
預計交期(到工地)
@@ -158,21 +158,21 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
?>
|
-
+
|
經度 |
- " >
+ " >
|
緯度 |
- " >
+ " >
|
地址 |
- " >
+ " >
|
工地地址
| 載重 |
- " >
+ " >
|
人乘 |
- " >
+ " >
|
樓停 |
- " >
+ " >
|
樓層 |
- " >
+ " >
|
機型 |
- " >
+ " >
|
開門方式 |
- >
+ >
速度 |
- " >
+ " >
|
簽核狀況 |
@@ -550,8 +550,11 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
|
存檔";
+ echo "";
+ echo "";
+ }
?>
|
@@ -689,9 +692,9 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
移交日 |
- >
+ >
-
+
|
@@ -1146,8 +1149,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
|
+
+ 發包類型 |
+
+ />
+
+ />
+
+ />
+
+
+
+
+
+ |
+
安裝發包廠商 |
- />
+ />
|
確認人 |
@@ -1402,7 +1426,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
|
試車發包廠商 |
- />
+ />
|
確認人 |
@@ -1525,6 +1549,8 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
|