Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs

.gitignore

@@ -25,3 +25,4 @@ wms/mkt/WriteOffRepair.xlsx
 wms/contract/images/contracts
 wms/test.php
 app/account_log/
+wms/gary2.php

wms/api/bpm/addContract.ini

@@ -0,0 +1,246 @@
+[1702986324]
+fdSignEnable = ""
+fd_3c7b956a747f5e = ""
+docSubject = "合約入力(新梯)_合約號：D23070085"
+fd_3c7af41f068350 = "劉世華"
+fd_3c7b8fdee03432 = "Fri Dec 15 00:00:00 CST 2023"
+fd_3c7af6af1c2232 = "M0074"
+fd_3c7af42a237960 = "328桃園市觀音區崙坪村8鄰140號"
+fd_3c7bd36b993eac = "204000"
+fd_3c7bd7adce7f3e = "Thu Dec 21 00:00:00 CST 2023"
+fd_3c7b96c1b5523c = ""
+fd_3c7b96b95bb932 = "test@gmail.com"
+fd_3c7b9787f379c4 = "M0018"
+fd_3c7bb84b1e63c4 = "12"
+fd_3c7d1ee50bc354_text = "桃園市"
+fd_3c7bd6cac53216 = "0"
+fd_3c7c93e2e39832 = "1703433600100"
+fd_3c7bd7aac30e4c = "Tue Dec 19 00:00:00 CST 2023"
+fdCanCircularize = ""
+fd_3c7c7e4d52426a_text = "需要 QC + 官檢"
+fd_3c7bd6cc6292b6 = "20"
+fd_3c7af41fffd500 = "0960-625735"
+fd_3c7b9892c08350 = "A079-大地國際開發-大園10戶313住宅"
+fd_3c7b8ffee177ae = "2"
+fd_3c7c7ca07fa8ea = "3"
+fd_3c7bd36cc1ac98 = "0"
+fd_3c7d1ee50bc354 = "桃園市"
+fd_3c7af41b3bc014 = "吳嬖如"
+fd_3c7d2bac66cb4a = "MAH100-6*5-2S45;轎廂 MA019;扶手 MC002;操縱盤 ME017"
+fd_3c7b96cbd9a332 = ""
+fdNumber = "20231219002"
+fd_3c7af4170a31b4 = "D23070085"
+fd_3c7bd6cb481c76 = "50"
+fd_3c7bd36dbd6424 = "510001"
+fd_3c7c931495463e = "1020002"
+fd_3c7c7e4d52426a = "QO"
+fd_3c7bd6ccccad9e = "10"
+fd_3c7c88160cf576 = "20231219002"
+fd_3c7bd7aecd1bf2 = "Sat Dec 23 00:00:00 CST 2023"
+fd_3c7bd3704d1772 = "204001"
+fd_3c7c7daa12b3a6_text = "月保養"
+fd_3c7af41d5f0c0e = "13010305   "
+docStatus = "20"
+docCreateTime = "2023-12-19 19:44:00.0"
+fdId = "18c81e3e6fbfd27dc603c3948d6af18e"
+fd_3c7d207688e4c0 = "2"
+fd_3c7af41a3391d8 = "永融營造工程有限公司"
+fd_3c7b9787f379c4_text = "M0018_范育偉"
+fd_3c7bd7ae2619e2 = "Fri Dec 22 00:00:00 CST 2023"
+fd_3c7bd69fa6ac52 = "20"
+fd_3c7bd36f203800 = "0"
+fd_3c7bd7af873bb8 = "Mon Dec 25 00:00:00 CST 2023"
+fd_3c7b96ec571486 = "定期保養"
+fd_3c7bd7af250b76 = "Sun Dec 24 00:00:00 CST 2023"
+fd_3c7c7ca07fa8ea_text = "全包"
+fd_3c7bd6cc026d8e = "0"
+fd_3c7b8fbca98fbc = "永融營造工程有限公司"
+fdIsFiling = ""
+fd_3c7bd372804cae = "0"
+fd_3c7bd7ac5bca84 = "Wed Dec 20 00:00:00 CST 2023"
+fd_3c7af6af1c2232_text = "章又仁"
+fd_3c7bd37147ce12 = "102000"
+fd_3c7bd6cd30113a = "0"
+fd_3c7c7daa12b3a6 = "hm"
+
+[1702987657]
+fdSignEnable = ""
+fd_3c7b956a747f5e = ""
+docSubject = "合約入力(新梯)_合約號：D23070085"
+fd_3c7af41f068350 = "劉世華"
+fd_3c7b8fdee03432 = "Fri Dec 15 00:00:00 CST 2023"
+fd_3c7af6af1c2232 = "M0074"
+fd_3c7af42a237960 = "328桃園市觀音區崙坪村8鄰140號123"
+fd_3c7bd36b993eac = "204000"
+fd_3c7bd7adce7f3e = "Tue Dec 19 00:00:00 CST 2023"
+fd_3c7b96c1b5523c = ""
+fd_3c7b96b95bb932 = "test@gmail.com"
+fd_3c7b9787f379c4 = "M0045"
+fd_3c7bb84b1e63c4 = "12"
+fd_3c7d1ee50bc354_text = "桃園市"
+fd_3c7bd6cac53216 = "0"
+fd_3c7c93e2e39832 = "1703260800100"
+fd_3c7bd7aac30e4c = "Sun Dec 17 00:00:00 CST 2023"
+fdCanCircularize = ""
+fd_3c7c7e4d52426a_text = ""
+fd_3c7bd6cc6292b6 = "20"
+fd_3c7af41fffd500 = "0960-625735"
+fd_3c7b9892c08350 = "A079-大地國際開發-大園10戶313住宅"
+fd_3c7b8ffee177ae = "2"
+fd_3c7c7ca07fa8ea = "2"
+fd_3c7bd36cc1ac98 = "0"
+fd_3c7d1ee50bc354 = "桃園市"
+fd_3c7af41b3bc014 = "吳嬖如"
+fd_3c7d2bac66cb4a = "MAH100-6*5-2S45;轎廂 MA019;扶手 MC002;操縱盤 ME017"
+fd_3c7b96cbd9a332 = ""
+fdNumber = "20231219003"
+fd_3c7af4170a31b4 = "D23070085"
+fd_3c7bd6cb481c76 = "50"
+fd_3c7bd36dbd6424 = "510001"
+fd_3c7c931495463e = "1020002"
+fd_3c7c7e4d52426a = ""
+fd_3c7bd6ccccad9e = "10"
+fd_3c7c88160cf576 = "20231219003"
+fd_3c7bd7aecd1bf2 = "Thu Dec 21 00:00:00 CST 2023"
+fd_3c7bd3704d1772 = "204001"
+fd_3c7c7daa12b3a6_text = "雙週保養"
+fd_3c7af41d5f0c0e = "13010305   "
+docStatus = "20"
+docCreateTime = "2023-12-19 20:05:00.0"
+fdId = "18c81f7e09080da42588ce5471faea8d"
+fd_3c7d207688e4c0 = "2"
+fd_3c7af41a3391d8 = "永融營造工程有限公司"
+fd_3c7b9787f379c4_text = "M0045_徐振淞"
+fd_3c7bd7ae2619e2 = "Wed Dec 20 00:00:00 CST 2023"
+fd_3c7bd69fa6ac52 = "20"
+fd_3c7bd36f203800 = "0"
+fd_3c7bd7af873bb8 = "Sat Dec 23 00:00:00 CST 2023"
+fd_3c7b96ec571486 = "定期保養"
+fd_3c7bd7af250b76 = "Fri Dec 22 00:00:00 CST 2023"
+fd_3c7c7ca07fa8ea_text = "半包"
+fd_3c7bd6cc026d8e = "0"
+fd_3c7b8fbca98fbc = "永融營造工程有限公司"
+fdIsFiling = ""
+fd_3c7bd372804cae = "0"
+fd_3c7bd7ac5bca84 = "Mon Dec 18 00:00:00 CST 2023"
+fd_3c7af6af1c2232_text = "章又仁"
+fd_3c7bd37147ce12 = "102000"
+fd_3c7bd6cd30113a = "0"
+fd_3c7c7daa12b3a6 = "bw"
+
+[1702988835]
+fdSignEnable = ""
+fd_3c7b956a747f5e = ""
+docSubject = "合約入力(新梯)_合約號：D23070085"
+fd_3c7af41f068350 = "劉世華"
+fd_3c7b8fdee03432 = "Sun Dec 31 00:00:00 CST 2023"
+fd_3c7af6af1c2232 = "M0074"
+fd_3c7af42a237960 = "328桃園市觀音區崙坪村8鄰140號"
+fd_3c7bd36b993eac = "204000"
+fd_3c7b96c1b5523c = ""
+fd_3c7b96b95bb932 = "test@gmail.com"
+fd_3c7b9787f379c4 = "M0059"
+fd_3c7bb84b1e63c4 = "12"
+fd_3c7d1ee50bc354_text = "嘉義縣"
+fd_3c7bd6cac53216 = "0"
+fd_3c7c93e2e39832 = "100"
+fdCanCircularize = ""
+fd_3c7c7e4d52426a_text = "只需官檢"
+fd_3c7bd6cc6292b6 = "20"
+fd_3c7af41fffd500 = "0960-625735"
+fd_3c7b9892c08350 = "A079-大地國際開發-大園10戶313住宅"
+fd_3c7b8ffee177ae = "2"
+fd_3c7c7ca07fa8ea = "2"
+fd_3c7bd36cc1ac98 = "0"
+fd_3c7d1ee50bc354 = "嘉義縣"
+fd_3c7af41b3bc014 = "吳嬖如"
+fd_3c7d2bac66cb4a = "MAH100-6*5-2S45;轎廂 MA019;扶手 MC002;操縱盤 ME017"
+fd_3c7b96cbd9a332 = "328桃園市觀音區崙坪村8鄰140號"
+fdNumber = "20231219004"
+fd_3c7af4170a31b4 = "D23070085"
+fd_3c7bd6cb481c76 = "50"
+fd_3c7bd36dbd6424 = "510001"
+fd_3c7c931495463e = "1020002"
+fd_3c7c7e4d52426a = "O"
+fd_3c7bd6ccccad9e = "10"
+fd_3c7c88160cf576 = "20231219004"
+fd_3c7bd3704d1772 = "204001"
+fd_3c7c7daa12b3a6_text = "雙週保養"
+fd_3c7af41d5f0c0e = "13010305   "
+docStatus = "20"
+docCreateTime = "2023-12-19 20:26:00.0"
+fdId = "18c820a7decaf6dfbcf4b2d4da199d27"
+fd_3c7d207688e4c0 = "2"
+fd_3c7af41a3391d8 = "永融營造工程有限公司"
+fd_3c7b9787f379c4_text = "M0059_林永鴻"
+fd_3c7bd69fa6ac52 = "20"
+fd_3c7bd36f203800 = "0"
+fd_3c7b96ec571486 = "定期保養"
+fd_3c7c7ca07fa8ea_text = "半包"
+fd_3c7bd6cc026d8e = "0"
+fd_3c7b8fbca98fbc = "永融營造工程有限公司"
+fdIsFiling = ""
+fd_3c7bd372804cae = "0"
+fd_3c7af6af1c2232_text = "章又仁"
+fd_3c7bd37147ce12 = "102000"
+fd_3c7bd6cd30113a = "0"
+fd_3c7c7daa12b3a6 = "bw"
+
+[1702989437]
+fdSignEnable = ""
+fd_3c7b956a747f5e = ""
+docSubject = "合約入力(新梯)_合約號：M230609"
+fd_3c7af41f068350 = "曾永霖"
+fd_3c7b8fdee03432 = "Sun Nov 26 00:00:00 CST 2023"
+fd_3c7af6af1c2232 = "M0035"
+fd_3c7af42a237960 = "328桃園市觀音區崙坪村8鄰140號"
+fd_3c7bd36b993eac = "636000"
+fd_3c7b96c1b5523c = "0930005720"
+fd_3c7b96b95bb932 = "test@gmail.com"
+fd_3c7b9787f379c4 = "M0089"
+fd_3c7bb84b1e63c4 = "12"
+fd_3c7d1ee50bc354_text = "南投縣"
+fd_3c7bd6cac53216 = "0"
+fd_3c7c93e2e39832 = "100"
+fdCanCircularize = ""
+fd_3c7c7e4d52426a_text = ""
+fd_3c7bd6cc6292b6 = "20"
+fd_3c7af41fffd500 = "0930005720"
+fd_3c7b9892c08350 = "祥發開發(青砂街)"
+fd_3c7b8ffee177ae = "6"
+fd_3c7c7ca07fa8ea = "2"
+fd_3c7bd36cc1ac98 = "0"
+fd_3c7d1ee50bc354 = "南投縣"
+fd_3c7af41b3bc014 = "楊雅惠"
+fd_3c7d2bac66cb4a = "MAH100-6*4-2S45;轎廂 MA018;扶手 MC005;清安費用;其他配合費用"
+fd_3c7b96cbd9a332 = "328桃園市觀音區崙坪村8鄰140號"
+fdNumber = "20231219005"
+fd_3c7af4170a31b4 = "M230609"
+fd_3c7bd6cb481c76 = "50"
+fd_3c7bd36dbd6424 = "1590000"
+fd_3c7c931495463e = "3180000"
+fd_3c7c7e4d52426a = ""
+fd_3c7bd6ccccad9e = "10"
+fd_3c7c88160cf576 = "20231219005"
+fd_3c7bd3704d1772 = "636000"
+fd_3c7c7daa12b3a6_text = "雙週保養"
+fd_3c7af41d5f0c0e = ""
+docStatus = "20"
+docCreateTime = "2023-12-19 20:33:00.0"
+fdId = "18c82117c73aafc593e492142d28b88b"
+fd_3c7d207688e4c0 = "6"
+fd_3c7af41a3391d8 = "祥發開發(青砂街)"
+fd_3c7b9787f379c4_text = "M0089_郭玠德"
+fd_3c7bd69fa6ac52 = "20"
+fd_3c7bd36f203800 = "0"
+fd_3c7b96ec571486 = "定期保養"
+fd_3c7c7ca07fa8ea_text = "半包"
+fd_3c7bd6cc026d8e = "0"
+fd_3c7b8fbca98fbc = "祥發開發(青砂街)"
+fdIsFiling = ""
+fd_3c7bd372804cae = "0"
+fd_3c7af6af1c2232_text = "林易增"
+fd_3c7bd37147ce12 = "318000"
+fd_3c7bd6cd30113a = "0"
+fd_3c7c7daa12b3a6 = "bw"
+

wms/api/bpm/addContract.php

@@ -0,0 +1,169 @@
+<?php
+if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+    show405Error();
+    exit;
+}
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+
+    $request_data_json = file_get_contents('php://input');
+    $request_data = json_decode(file_get_contents('php://input'), true);
+
+    if (empty($request_data)) {
+        show400Error();
+        exit;
+    }
+
+    writePostIni($request_data);
+    writePostIniJson($request_data);
+
+    $dsn = 'mysql:host=localhost;dbname=appwms_test';
+    $username = 'masadaroot';
+    $password = 'x6h5E5p#u8y';
+
+    // fdSignEnable = ""
+    // fd_3c7b956a747f5e = ""
+    // docSubject = "合約入力(新梯)_合約號：D23070085"
+    // fd_3c7af41f068350 = "劉世華"
+    // fd_3c7b8fdee03432 = "Fri Dec 15 00:00:00 CST 2023"
+    // fd_3c7af6af1c2232 = "M0074"
+    // fd_3c7af42a237960 = "328桃園市觀音區崙坪村8鄰140號123"
+    // fd_3c7bd36b993eac = "204000"
+    // fd_3c7bd7adce7f3e = "Tue Dec 19 00:00:00 CST 2023"
+    // fd_3c7b96c1b5523c = ""
+    // fd_3c7b96b95bb932 = "test@gmail.com"
+    // fd_3c7b9787f379c4 = "M0045"
+    // fd_3c7bb84b1e63c4 = "12"
+    // fd_3c7d1ee50bc354_text = "桃園市"
+    // fd_3c7bd6cac53216 = "0"
+    // fd_3c7c93e2e39832 = "1703260800100"
+    // fd_3c7bd7aac30e4c = "Sun Dec 17 00:00:00 CST 2023"
+    // fdCanCircularize = ""
+    // fd_3c7c7e4d52426a_text = ""
+    // fd_3c7bd6cc6292b6 = "20"
+    // fd_3c7af41fffd500 = "0960-625735"
+    // fd_3c7b9892c08350 = "A079-大地國際開發-大園10戶313住宅"
+    // fd_3c7b8ffee177ae = "2"
+    // fd_3c7c7ca07fa8ea = "2"
+    // fd_3c7bd36cc1ac98 = "0"
+    // fd_3c7d1ee50bc354 = "桃園市"
+    // fd_3c7af41b3bc014 = "吳嬖如"
+    // fd_3c7d2bac66cb4a = "MAH100-6*5-2S45;轎廂 MA019;扶手 MC002;操縱盤 ME017"
+    // fd_3c7b96cbd9a332 = ""
+    // fdNumber = "20231219003"
+    // fd_3c7af4170a31b4 = "D23070085"
+    // fd_3c7bd6cb481c76 = "50"
+    // fd_3c7bd36dbd6424 = "510001"
+    // fd_3c7c931495463e = "1020002"
+    // fd_3c7c7e4d52426a = ""
+    // fd_3c7bd6ccccad9e = "10"
+    // fd_3c7c88160cf576 = "20231219003"
+    // fd_3c7bd7aecd1bf2 = "Thu Dec 21 00:00:00 CST 2023"
+    // fd_3c7bd3704d1772 = "204001"
+    // fd_3c7c7daa12b3a6_text = "雙週保養"
+    // fd_3c7af41d5f0c0e = "13010305   "
+    // docStatus = "20"
+    // docCreateTime = "2023-12-19 20:05:00.0"
+    // fdId = "18c81f7e09080da42588ce5471faea8d"
+    // fd_3c7d207688e4c0 = "2"
+    // fd_3c7af41a3391d8 = "永融營造工程有限公司"
+    // fd_3c7b9787f379c4_text = "M0045_徐振淞"
+    // fd_3c7bd7ae2619e2 = "Wed Dec 20 00:00:00 CST 2023"
+    // fd_3c7bd69fa6ac52 = "20"
+    // fd_3c7bd36f203800 = "0"
+    // fd_3c7bd7af873bb8 = "Sat Dec 23 00:00:00 CST 2023"
+    // fd_3c7b96ec571486 = "定期保養"
+    // fd_3c7bd7af250b76 = "Fri Dec 22 00:00:00 CST 2023"
+    // fd_3c7c7ca07fa8ea_text = "半包"
+    // fd_3c7bd6cc026d8e = "0"
+    // fd_3c7b8fbca98fbc = "永融營造工程有限公司"
+    // fdIsFiling = ""
+    // fd_3c7bd372804cae = "0"
+    // fd_3c7bd7ac5bca84 = "Mon Dec 18 00:00:00 CST 2023"
+    // fd_3c7af6af1c2232_text = "章又仁"
+    // fd_3c7bd37147ce12 = "102000"
+    // fd_3c7bd6cd30113a = "0"
+    // fd_3c7c7daa12b3a6 = "bw"
+
+    try {
+        $pdo = new PDO($dsn, $username, $password);
+        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $pdo->exec('SET CHARACTER SET utf8mb4');
+        
+        $pdo->beginTransaction();
+
+        $sth = $pdo->prepare("INSERT INTO account (accounttype , accountid) VALUES (?, ?)");
+        $sth->bindValue(1, 'mf_vol_no');
+        $sth->execute();
+
+
+        $pdo->commit();
+
+        showSuccessMessage();
+    } catch (PDOException $e) {
+        $pdo->rollBack();
+        echo "Transaction failed: " . $e->getMessage();
+    }
+}
+
+function showSuccessMessage()
+{
+    $response = array('status' => 'success', 'message' => 'Data received and stored successfully');
+    header('Content-Type: application/json');
+    echo json_encode($response);
+}
+
+function showErrorMessage()
+{
+    $response = array('status' => 'error', 'message' => 'Data received and stored error');
+    header('Content-Type: application/json');
+    echo json_encode($response);
+}
+
+function show400Error()
+{
+    http_response_code(400);
+    echo 'Invalid request data';
+}
+
+function show405Error()
+{
+    http_response_code(405);
+    echo 'Method Not Allowed';
+}
+
+function writePostIni($request_data)
+{
+    // 讀取現有 ini 檔案的資料
+    $ini_file = 'addContract.ini';
+    $existing_data = parse_ini_file($ini_file, true);
+
+    // 將接收到的資料加入現有資料
+    $timestamp = time(); 
+    $existing_data[$timestamp] = $request_data;
+
+    // 將資料寫入 ini 檔
+    $ini_content = '';
+    foreach ($existing_data as $key => $value) {
+        $ini_content .= "[$key]\n";
+        foreach ($value as $k => $v) {
+            $ini_content .= "$k = \"$v\"\n";
+        }
+        $ini_content .= "\n";
+    }
+
+    file_put_contents($ini_file, $ini_content);
+}
+
+
+function writePostIniJson($request_data)
+{
+    $txt_file = 'addContract.txt';
+    $txt = "";
+    $file = fopen($txt_file, 'a');
+    foreach($request_data as $k => $v){
+       $txt .= "$k = \"$v\"\n";
+    }
+    fwrite($file, $txt . PHP_EOL);
+    fclose($file);
+}

wms/api/bpm/addContract.txt

@@ -0,0 +1,242 @@
+Array
+{
+"統一編號/身分證":"13010305   ",
+"客戶電話":"",
+"主旨":"合約入力(新梯)_合約號：D23070085",
+"QC和官檢(顯示值)":"",
+"保養期限":0.0,
+"保養員":"",
+"合計":1020002.0,
+"營業員":"M0074",
+"是否歸檔":false,
+"負責人":"吳嬖如",
+"启用电子签章":false,
+"是否允許傳閱":false,
+"區域":"南投縣",
+"QC和官檢":"",
+"維修型態":"",
+"地址":"328桃園市觀音區崙坪村8鄰140號",
+"ID":"18c6ca8d4a5fafcece62472441cb1fe5",
+"創建時間":"2023-12-15 16:47:00.0",
+"規格":"MAH100-6*5-2S45;
+轎廂 MA019;
+扶手 MC002;
+操縱盤 ME017",
+"立約人":"永融營造工程有限公司",
+"2、二次款":0.0,
+"7、其它":0.0,
+"合約號碼":"D23070085",
+"3占百分比":50.0,
+"1、訂金":204000.0,
+"保養頻率":"",
+"電梯台數":2.0,
+"3、貨到工地款":510001.0,
+"2占百分比":0.0,
+"營業員(顯示值)":"章又仁",
+"保養員(顯示值)":"",
+"5、安裝完畢款":204001.0,
+"業務聯繫人電話":"0960-625735",
+"客戶名稱":"永融營造工程有限公司",
+"1占百分比":20.0,
+"6占百分比":10.0,
+"保養別":"",
+"合約簽訂時間":"Fri Dec 15 00:00:00 CST 2023",
+"明細表總台數":2.0,
+"保養頻率(顯示值)":"",
+"表單號":"20231215018",
+"7占百分比":0.0,
+"申請單編號":"20231215018",
+"加總趴數":100.0,
+"email":"",
+"案件名稱":"A079-大地國際開發-大園10戶313住宅",
+"4占百分比":0.0,
+"業務聯繫人地址":"",
+"業務聯繫人":"劉世華",
+"6、驗收款":102000.0,
+"保養別(顯示值)":"",
+"5占百分比":20.0,
+"區域(顯示值)":"南投縣",
+"4、其他":0.0,
+"文檔狀態":"20",
+"業務聯繫人Email":""
+}
+Array
+Array
+fdSignEnable = ""
+fd_3c7b956a747f5e = ""
+docSubject = "合約入力(新梯)_合約號：D23070085"
+fd_3c7af41f068350 = "劉世華"
+fd_3c7b8fdee03432 = "Fri Dec 15 00:00:00 CST 2023"
+fd_3c7af6af1c2232 = "M0074"
+fd_3c7af42a237960 = "328桃園市觀音區崙坪村8鄰140號123"
+fd_3c7bd36b993eac = "204000"
+fd_3c7bd7adce7f3e = "Tue Dec 19 00:00:00 CST 2023"
+fd_3c7b96c1b5523c = ""
+fd_3c7b96b95bb932 = "test@gmail.com"
+fd_3c7b9787f379c4 = "M0045"
+fd_3c7bb84b1e63c4 = "12"
+fd_3c7d1ee50bc354_text = "桃園市"
+fd_3c7bd6cac53216 = "0"
+fd_3c7c93e2e39832 = "1703260800100"
+fd_3c7bd7aac30e4c = "Sun Dec 17 00:00:00 CST 2023"
+fdCanCircularize = ""
+fd_3c7c7e4d52426a_text = ""
+fd_3c7bd6cc6292b6 = "20"
+fd_3c7af41fffd500 = "0960-625735"
+fd_3c7b9892c08350 = "A079-大地國際開發-大園10戶313住宅"
+fd_3c7b8ffee177ae = "2"
+fd_3c7c7ca07fa8ea = "2"
+fd_3c7bd36cc1ac98 = "0"
+fd_3c7d1ee50bc354 = "桃園市"
+fd_3c7af41b3bc014 = "吳嬖如"
+fd_3c7d2bac66cb4a = "MAH100-6*5-2S45;轎廂 MA019;扶手 MC002;操縱盤 ME017"
+fd_3c7b96cbd9a332 = ""
+fdNumber = "20231219003"
+fd_3c7af4170a31b4 = "D23070085"
+fd_3c7bd6cb481c76 = "50"
+fd_3c7bd36dbd6424 = "510001"
+fd_3c7c931495463e = "1020002"
+fd_3c7c7e4d52426a = ""
+fd_3c7bd6ccccad9e = "10"
+fd_3c7c88160cf576 = "20231219003"
+fd_3c7bd7aecd1bf2 = "Thu Dec 21 00:00:00 CST 2023"
+fd_3c7bd3704d1772 = "204001"
+fd_3c7c7daa12b3a6_text = "雙週保養"
+fd_3c7af41d5f0c0e = "13010305   "
+docStatus = "20"
+docCreateTime = "2023-12-19 20:05:00.0"
+fdId = "18c81f7e09080da42588ce5471faea8d"
+fd_3c7d207688e4c0 = "2"
+fd_3c7af41a3391d8 = "永融營造工程有限公司"
+fd_3c7b9787f379c4_text = "M0045_徐振淞"
+fd_3c7bd7ae2619e2 = "Wed Dec 20 00:00:00 CST 2023"
+fd_3c7bd69fa6ac52 = "20"
+fd_3c7bd36f203800 = "0"
+fd_3c7bd7af873bb8 = "Sat Dec 23 00:00:00 CST 2023"
+fd_3c7b96ec571486 = "定期保養"
+fd_3c7bd7af250b76 = "Fri Dec 22 00:00:00 CST 2023"
+fd_3c7c7ca07fa8ea_text = "半包"
+fd_3c7bd6cc026d8e = "0"
+fd_3c7b8fbca98fbc = "永融營造工程有限公司"
+fdIsFiling = ""
+fd_3c7bd372804cae = "0"
+fd_3c7bd7ac5bca84 = "Mon Dec 18 00:00:00 CST 2023"
+fd_3c7af6af1c2232_text = "章又仁"
+fd_3c7bd37147ce12 = "102000"
+fd_3c7bd6cd30113a = "0"
+fd_3c7c7daa12b3a6 = "bw"
+
+fdSignEnable = ""
+fd_3c7b956a747f5e = ""
+docSubject = "合約入力(新梯)_合約號：D23070085"
+fd_3c7af41f068350 = "劉世華"
+fd_3c7b8fdee03432 = "Sun Dec 31 00:00:00 CST 2023"
+fd_3c7af6af1c2232 = "M0074"
+fd_3c7af42a237960 = "328桃園市觀音區崙坪村8鄰140號"
+fd_3c7bd36b993eac = "204000"
+fd_3c7b96c1b5523c = ""
+fd_3c7b96b95bb932 = "test@gmail.com"
+fd_3c7b9787f379c4 = "M0059"
+fd_3c7bb84b1e63c4 = "12"
+fd_3c7d1ee50bc354_text = "嘉義縣"
+fd_3c7bd6cac53216 = "0"
+fd_3c7c93e2e39832 = "100"
+fdCanCircularize = ""
+fd_3c7c7e4d52426a_text = "只需官檢"
+fd_3c7bd6cc6292b6 = "20"
+fd_3c7af41fffd500 = "0960-625735"
+fd_3c7b9892c08350 = "A079-大地國際開發-大園10戶313住宅"
+fd_3c7b8ffee177ae = "2"
+fd_3c7c7ca07fa8ea = "2"
+fd_3c7bd36cc1ac98 = "0"
+fd_3c7d1ee50bc354 = "嘉義縣"
+fd_3c7af41b3bc014 = "吳嬖如"
+fd_3c7d2bac66cb4a = "MAH100-6*5-2S45;轎廂 MA019;扶手 MC002;操縱盤 ME017"
+fd_3c7b96cbd9a332 = "328桃園市觀音區崙坪村8鄰140號"
+fdNumber = "20231219004"
+fd_3c7af4170a31b4 = "D23070085"
+fd_3c7bd6cb481c76 = "50"
+fd_3c7bd36dbd6424 = "510001"
+fd_3c7c931495463e = "1020002"
+fd_3c7c7e4d52426a = "O"
+fd_3c7bd6ccccad9e = "10"
+fd_3c7c88160cf576 = "20231219004"
+fd_3c7bd3704d1772 = "204001"
+fd_3c7c7daa12b3a6_text = "雙週保養"
+fd_3c7af41d5f0c0e = "13010305   "
+docStatus = "20"
+docCreateTime = "2023-12-19 20:26:00.0"
+fdId = "18c820a7decaf6dfbcf4b2d4da199d27"
+fd_3c7d207688e4c0 = "2"
+fd_3c7af41a3391d8 = "永融營造工程有限公司"
+fd_3c7b9787f379c4_text = "M0059_林永鴻"
+fd_3c7bd69fa6ac52 = "20"
+fd_3c7bd36f203800 = "0"
+fd_3c7b96ec571486 = "定期保養"
+fd_3c7c7ca07fa8ea_text = "半包"
+fd_3c7bd6cc026d8e = "0"
+fd_3c7b8fbca98fbc = "永融營造工程有限公司"
+fdIsFiling = ""
+fd_3c7bd372804cae = "0"
+fd_3c7af6af1c2232_text = "章又仁"
+fd_3c7bd37147ce12 = "102000"
+fd_3c7bd6cd30113a = "0"
+fd_3c7c7daa12b3a6 = "bw"
+
+fdSignEnable = ""
+fd_3c7b956a747f5e = ""
+docSubject = "合約入力(新梯)_合約號：M230609"
+fd_3c7af41f068350 = "曾永霖"
+fd_3c7b8fdee03432 = "Sun Nov 26 00:00:00 CST 2023"
+fd_3c7af6af1c2232 = "M0035"
+fd_3c7af42a237960 = "328桃園市觀音區崙坪村8鄰140號"
+fd_3c7bd36b993eac = "636000"
+fd_3c7b96c1b5523c = "0930005720"
+fd_3c7b96b95bb932 = "test@gmail.com"
+fd_3c7b9787f379c4 = "M0089"
+fd_3c7bb84b1e63c4 = "12"
+fd_3c7d1ee50bc354_text = "南投縣"
+fd_3c7bd6cac53216 = "0"
+fd_3c7c93e2e39832 = "100"
+fdCanCircularize = ""
+fd_3c7c7e4d52426a_text = ""
+fd_3c7bd6cc6292b6 = "20"
+fd_3c7af41fffd500 = "0930005720"
+fd_3c7b9892c08350 = "祥發開發(青砂街)"
+fd_3c7b8ffee177ae = "6"
+fd_3c7c7ca07fa8ea = "2"
+fd_3c7bd36cc1ac98 = "0"
+fd_3c7d1ee50bc354 = "南投縣"
+fd_3c7af41b3bc014 = "楊雅惠"
+fd_3c7d2bac66cb4a = "MAH100-6*4-2S45;轎廂 MA018;扶手 MC005;清安費用;其他配合費用"
+fd_3c7b96cbd9a332 = "328桃園市觀音區崙坪村8鄰140號"
+fdNumber = "20231219005"
+fd_3c7af4170a31b4 = "M230609"
+fd_3c7bd6cb481c76 = "50"
+fd_3c7bd36dbd6424 = "1590000"
+fd_3c7c931495463e = "3180000"
+fd_3c7c7e4d52426a = ""
+fd_3c7bd6ccccad9e = "10"
+fd_3c7c88160cf576 = "20231219005"
+fd_3c7bd3704d1772 = "636000"
+fd_3c7c7daa12b3a6_text = "雙週保養"
+fd_3c7af41d5f0c0e = ""
+docStatus = "20"
+docCreateTime = "2023-12-19 20:33:00.0"
+fdId = "18c82117c73aafc593e492142d28b88b"
+fd_3c7d207688e4c0 = "6"
+fd_3c7af41a3391d8 = "祥發開發(青砂街)"
+fd_3c7b9787f379c4_text = "M0089_郭玠德"
+fd_3c7bd69fa6ac52 = "20"
+fd_3c7bd36f203800 = "0"
+fd_3c7b96ec571486 = "定期保養"
+fd_3c7c7ca07fa8ea_text = "半包"
+fd_3c7bd6cc026d8e = "0"
+fd_3c7b8fbca98fbc = "祥發開發(青砂街)"
+fdIsFiling = ""
+fd_3c7bd372804cae = "0"
+fd_3c7af6af1c2232_text = "林易增"
+fd_3c7bd37147ce12 = "318000"
+fd_3c7bd6cd30113a = "0"
+fd_3c7c7daa12b3a6 = "bw"
+

wms/api/bpm/addContract_form.php

@@ -0,0 +1,4 @@
+<form action="addContract.php" method="post">
+    <input type='text' name='id' value='123' />
+    <input type='submit' />
+</form>

wms/api/bpm/download.php

@@ -0,0 +1,108 @@
+<?php
+ini_set('display_errors', 'on');
+
+class Bpm_Download_files
+{
+    /** 
+     * 連接資料庫
+     */
+    function connectionDB()
+    {
+        $envFile = __DIR__ . '/../../../.env';
+        if (file_exists($envFile)) {
+            $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+            if ($lines !== false) {
+                foreach ($lines as $line) {
+                    list($key, $value) = explode('=', $line, 2);
+                    $key = trim($key);
+                    $value = trim($value);
+                    putenv("$key=$value");
+                }
+            }
+        }
+        date_default_timezone_set("Asia/Taipei");
+        $host = getenv('DB_BPM_HOST');
+        $dbport = getenv('DB_BPM_PORT');
+        $dbuser = getenv('DB_BPM_USERNAME');
+        $dbpassword = getenv('DB_BPM_PASSWORD');
+        $dbname = getenv('DB_BPM_DATABASE');
+
+        try {
+            $options = [
+                PDO::ATTR_PERSISTENT => false,
+                PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+                PDO::ATTR_EMULATE_PREPARES => false,
+                PDO::ATTR_STRINGIFY_FETCHES => false,
+                PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
+            ];
+            $pdo = new PDO('mysql:host=' . $host . ';port=' . $dbport . ';dbname=' . $dbname . '', $dbuser, $dbpassword, $options);
+            $pdo->exec('SET CHARACTER SET utf8mb4');
+            return $pdo;
+        } catch (PDOException $e) {
+            die("Something wrong: {$e->getMessage()}");
+        }
+    }
+
+    /** 
+     * 結束資料庫連線
+     */
+    function endConnectionDB($pdo)
+    {
+        unset($pdo);
+    }
+
+    // /**
+    //  * 取得下一個新的作番
+    //  * @param string $facility_type : M：新梯 T：汰改 B：保養
+    //  * @return array $new_facility_arr 
+    //  */
+    function downloadBPMFilesByFormNo($tablename, $form_column_name, $form_no)
+    {
+        $fd_id = $this->getFd_id($tablename, $form_column_name, $form_no);
+
+        $pdo = $this->connectionDB();
+        $pdo->exec('SET CHARACTER SET utf8mb4');
+        $sql = "
+            SELECT * FROM sys_att_main AS b 
+            LEFT JOIN sys_att_file AS c 
+            ON b.fd_file_id = c.fd_id 
+            WHERE b.fd_model_id = :fd_id
+        ";
+        $sth = $pdo->prepare($sql);
+        $sth->bindParam(':fd_id', $fd_id);
+        $sth->execute();
+        $result = $sth->fetchAll();
+        
+        foreach ($result as $row) {
+            $fd_file_name = $row['fd_file_name'];
+            $fd_file_path = "/public/bpm/" . $row['fd_file_path'];
+            // $filePath = $_SERVER['DOCUMENT_ROOT'] . $fd_file_path;
+            $str = "";
+            $str .= '<a href="' . $fd_file_path . '" download="' . $fd_file_name . '">' . $fd_file_name . '</a>';
+            $str .= "<br/>";
+            echo $str;
+        }
+        return $result;
+    }
+
+    function getFd_id($tablename, $form_column_name, $form_no)
+    {
+        $pdo = $this->connectionDB();
+        $pdo->exec('SET CHARACTER SET utf8mb4');
+        $sth = $pdo->prepare('SELECT fd_id FROM ' . $tablename . ' WHERE ' . $form_column_name . ' = ? ');
+        $sth->bindValue(1, $form_no);
+        $sth->execute();
+        $result = $sth->fetch();
+        return $result['fd_id'];
+    }
+}
+
+
+$bdf = new Bpm_Download_files;
+// 映射的 table name
+$tablename = "ekp_test";
+// 映射的 表單表單編號欄位名稱
+$form_column_name = "fd_shen1";
+// 映射的 表單編號
+$form_no = "20231221001";
+$bdf->downloadBPMFilesByFormNo($tablename, $form_column_name, $form_no);

wms/api/bpm/requests.ini

@@ -0,0 +1,6 @@
+[1702622618]
+id = "123"
+
+[1702622646]
+id = "123"
+

wms/class/Cnotice.php

@@ -96,14 +96,14 @@ class Cnotice
     }
 }
 
-$cn = new Cnotice();
+// $cn = new Cnotice();
-$data = array(
+// $data = array(
-    'kind' => 1,
+//     'kind' => 1,
-    'related_id' => 1,
+//     'related_id' => 1,
-    'title' => "標題",
+//     'title' => "標題",
-    'content' => "內容",
+//     'content' => "內容",
-    'permission' => "M0117",
+//     'permission' => "M0117",
-    'creater' => "M0117",
+//     'creater' => "M0117",
-    'create_at' => date("Y-m-d H:i:s")
+//     'create_at' => date("Y-m-d H:i:s")
-);
+// );
-$cn->sendx($data);
+// $cn->sendx($data);

wms/estimated_shipping_date_report.php

@@ -148,6 +148,27 @@ while ($row = $result->fetch_assoc()) {
     $data2[] = $row;
 }
 
+$sql = "
+    SELECT
+        new_order.facility_kind,
+        COUNT(new_order.facility_kind) AS facility_count
+    FROM(
+        SELECT 
+            w.facility_kind
+        FROM wipwholestatus AS w
+        WHERE 1=1
+        AND status = '1'
+        AND contract_type = 'A'
+    ) AS new_order
+    WHERE 1 = 1
+    GROUP BY new_order.facility_kind
+";
+$result = mysqli_query($link, $sql);
+$data4 = [];
+while ($row = $result->fetch_assoc()) {
+    $data4[] = $row;
+}
+
 function findFacilityTypeAllCount($data2)
 {
     $count = 0;
@@ -187,6 +208,20 @@ while ($row = $result->fetch_assoc()) {
     $data3[] = $row;
 }
 
+$sql = "
+    SELECT 
+        w.renovate_type
+    FROM wipwholestatus AS w
+    WHERE 1=1
+    AND status = '1'
+    AND contract_type = 'B'
+";
+$result = mysqli_query($link, $sql);
+$data5 = [];
+while ($row = $result->fetch_assoc()) {
+    $data5[] = $row;
+}
+
 // 分開計算
 
 // $M1 = 0;
@@ -222,6 +257,16 @@ foreach ($data3 as $row) {
     $m_type_arr[implode("+", json_decode($row['renovate_type']))]++;
 }
 
+$M_count2 = count($data5);
+$m_type_arr2 = [];
+$m_type_arr2[''] = 0;
+foreach ($data5 as $row) {
+    $m_type_arr2[implode("+", json_decode($row['renovate_type']))] = 0;
+}
+foreach ($data5 as $row) {
+    $m_type_arr2[implode("+", json_decode($row['renovate_type']))]++;
+}
+
 
 //數字轉英文(0=>A、1=>B、26=>AA...以此類推)
 function num2alpha($n)
@@ -1183,13 +1228,13 @@ if($_SERVER["REQUEST_METHOD"] == 'POST'){
     </table>
 </div>
 
-<br /><br />
 
+<div class="row">
     <div class="col-12 col-md-8">
         <table class="table table-striped">
             <thead>
                 <tr>
-                <td colsapn="<?php echo count($data2); ?>">受定規格分析</td>
+                    <td colsapn="<?php echo count($data2); ?>">受定規格分析(時間區間)</td>
                 </tr>
             </thead>
             <tbody>
@@ -1233,13 +1278,12 @@ if($_SERVER["REQUEST_METHOD"] == 'POST'){
         </table>
     </div>
 
-<br /><br />
 
     <div class="col-12 col-md-4">
         <table class="table table-striped">
             <thead>
                 <tr>
-                <td>舊改受訂規格分析</td>
+                    <td colspan='3'>舊改受訂規格分析(時間區間)</td>
                 </tr>
             </thead>
             <tbody>
@@ -1274,6 +1318,97 @@ if($_SERVER["REQUEST_METHOD"] == 'POST'){
             </tbody>
         </table>
     </div>
+</div>
+<br /><br />
+<div class="row">
+    <div class="col-12 col-md-8">
+        <table class="table table-striped">
+            <thead>
+                <tr>
+                    <td colsapn="<?php echo count($data4); ?>">受定規格分析(全部)</td>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>代碼</th>
+                    <?php
+                    foreach ($data4 as $row) {
+                        echo "<td>" . $row['facility_kind'] . "</td>";
+                    }
+                    ?>
+                    <th></th>
+                </tr>
+                <tr>
+                    <th>機種</th>
+                    <?php
+                    foreach ($data4 as $row) {
+                        echo "<td>" . getFacilityNamebyType($row['facility_kind']) . "</td>";
+                    }
+                    ?>
+                    <th>合計</th>
+                </tr>
+                <tr>
+                    <th>數量</th>
+                    <?php
+                    foreach ($data4 as $row) {
+                        echo "<td>" . $row['facility_count'] . "</td>";
+                    }
+                    ?>
+                    <th><?php echo findFacilityTypeAllCount($data4); ?></th>
+                </tr>
+                <tr>
+                    <th>百分比</th>
+                    <?php
+                    foreach ($data4 as $row) {
+                        echo "<td>" . (round($row['facility_count'] / findFacilityTypeAllCount($data4), 4) * 100) . "%" . "</td>";
+                    }
+                    ?>
+                    <th><?php echo "100%"; ?></th>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
+    <div class="col-12 col-md-4">
+        <table class="table table-striped">
+            <thead>
+                <tr>
+                    <td colspan='3'>舊改受訂規格分析(全部)</td>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>類型</th>
+                    <?php
+                    foreach ($m_type_arr2 as $key => $val) {
+                        $title_tmp = empty($key) ? '未分類' : $key;
+                        echo "<th>" . $title_tmp . "</th>";
+                    }
+                    ?>
+                    <th>合計</th>
+                </tr>
+                <tr>
+                    <th>數量</th>
+                    <?php
+                    foreach ($m_type_arr2 as $key => $val) {
+                        echo "<th>" . $val . "</th>";
+                    }
+                    ?>
+                    <th><?php echo $M_count2; ?></th>
+                </tr>
+                <tr>
+                    <th>百分比</th>
+                    <?php
+                    foreach ($m_type_arr2 as $key => $val) {
+                        echo "<th>" . round($val / $M_count2, 4) * 100 . "%" . "</th>";
+                    }
+                    ?>
+                    <th>100%</th>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
 <script>
     const formData = new FormData();
     formData.append("start_month", $("#start_month").val());

wms/frame/api_getdata.php

@@ -124,7 +124,9 @@ function get_pending($token)
                 flow f,
                 flow_main m,
                 system_main y
-            WHERE EXISTS (
+            WHERE 1=1
+            AND m.flow_id NOT IN ('wws04')
+            AND EXISTS (
                 SELECT form_key,
                     MAX(seq)
                 FROM subflow

wms/gary_psd.php

@@ -0,0 +1,60 @@
+<?php
+
+function encrypt($data, $key)
+{
+    $encrypted = '';
+    for ($i = 0; $i < strlen($data); $i++) {
+        $encrypted .= $data[$i] ^ $key[$i % strlen($key)];
+    }
+    return base64_encode($encrypted);
+}
+
+function decrypt($data, $key)
+{
+    $data = base64_decode($data);
+    $decrypted = '';
+    for ($i = 0; $i < strlen($data); $i++) {
+        $decrypted .= $data[$i] ^ $key[$i % strlen($key)];
+    }
+    return $decrypted;
+}
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $data = $_POST['data'] ?? '';
+    $key = $_POST['key'] ?? '';
+
+    if (!empty($data) && !empty($key)) {
+        if (isset($_POST['encrypt'])) {
+            $encrypted_data = encrypt($data, $key);
+            echo "加密後的資料：" . $encrypted_data . "<br>";
+        } elseif (isset($_POST['decrypt'])) {
+            $decrypted_data = decrypt($data, $key);
+            echo "解密後的資料：" . $decrypted_data . "<br>";
+        }
+    } else {
+        echo "請輸入資料和金鑰。";
+    }
+}
+?>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>加密解密表單</title>
+</head>
+
+<body>
+    <form method="post" action="">
+        <label for="data">請輸入要加密或解密的資料：</label><br>
+        <input type="text" id="data" name="data"><br><br>
+
+        <label for="key">請輸入金鑰：</label><br>
+        <input type="text" id="key" name="key" value="masada@<?php echo date("Y"); ?>"><br><br>
+
+        <input type="submit" name="encrypt" value="加密資料">
+        <input type="submit" name="decrypt" value="解密資料">
+    </form>
+</body>
+
+</html>

wms/wipwhole-change-contractdate-function.php

@@ -674,3 +674,23 @@ function checkStatus($link, $cid, $user_id)
     $res = mysqli_query($link, $sql);
     return $res->num_rows > 0 ? false : true;
 }
+
+/**
+ * 取台灣縣市select 
+ * @param object $link:資料庫連線
+ * @return object 回傳 mysqli_fetch_all
+ */
+function getCity($link)
+{
+    $sql = "
+        SELECT
+            content,
+            code_name
+        FROM code
+        WHERE field_name = 'taiwan_city'
+    ";
+    $result = mysqli_query($link, $sql);
+    $data = mysqli_fetch_all($result, MYSQLI_ASSOC);
+    mysqli_free_result($result);
+    return $data;
+}

wms/wipwhole-change-contractdate-submit.php

@@ -8,7 +8,12 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             $all_contractno_change = empty($_POST['all_contractno_change']) ? null : $_POST['all_contractno_change'];
             $real_contract_arrival_date  = $_POST['real_contract_arrival_date'];
             $contract_arrival_date  = $_POST['contract_arrival_date'];
+            $city = $_POST['city'];
+            if (!empty($_POST['real_address'])) {
+                $real_address  = $city . $_POST['real_address'];
+            } else {
                 $real_address = $_POST['real_address'];
+            }
             $old_real_address  = $_POST['old_real_address'];
             $estimated_shipping_schedule_date  = $_POST['estimated_shipping_schedule_date'];
             $contractno = $_POST['contractno'];

wms/wipwhole-change-contractdate.php

@@ -283,7 +283,13 @@ if (!empty(checkNowFormStatus($link)))
                         <td colspan="3">
                             <?php
                             if (empty(checkNowFormStatus($link))) {
-                                echo "<input type='text' name='real_address' />";
+                                echo "<select id='city' name='city'  required>";
+                                $citys = getCity($link);
+                                echo "<option value=''>請選擇</option>";
+                                foreach ($citys as $city)
+                                    echo "<option value='" . $city['content'] . "'>" . $city['content'] . "</option>";
+                                echo "</select>";
+                                echo "<input type='text' id='real_address' name='real_address' />";
                             } else {
                                 echo $row2["real_address"];
                                 echo "<input type='hidden' name='real_address' value='" . $row2["real_address"] . "' />";

wms/wipwhole-index-function.php

@@ -9,8 +9,8 @@
 function getWipwholestatusDetail($link, $id)
 {
     $db_query = "
-        SELECT * FROM 
+        SELECT * FROM wipwholestatus 
-        wipwholestatus WHERE id = '$id'
+        WHERE id = '$id'
         AND status = '1'
     ";
     $receivabledata = mysqli_query($link, $db_query);
@@ -117,8 +117,11 @@ function getEditFlag($department_id, $role_id, $user_id)
     if ($user_id == 'M0113' || $user_id == 'M0158')
         return  4;
     // 南區工務組長    
-    if ($user_id == 'M0039' || $user_id == 'M0078')
+    if ($user_id == 'M0078')
+        return  4;
+    if ($user_id == 'M0188') {
         return 4;
+    }
     // 工務部門
     if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
         return  4;
@@ -147,10 +150,25 @@ function getDataSql($department_id, $role_id, $user_id)
     if (in_array($user_id, ['M0166', 'M0091'])) {
         $user_id = 'M0086';
     }
+    // 補丁 許馨文 權限 = 李烘銘
+    if (in_array($user_id, ['M0115'])) {
+        $user_id = 'M0086';
+    }
     // 補丁 孫仲凱 = 林瑋隆
     if (in_array($user_id, ['M0159'])) {
         $user_id = 'M0113';
     }
+    // 補丁 林修賢 = 鄭存邑
+    if (in_array($user_id, ['M0188'])) {
+        $user_id = 'M0102';
+        $department_id = '545';
+        $role_id = '6';
+    }
+
+    // 補丁 林靜雯 權限 = 劉永德 新梯 北區+桃竹
+    if (in_array($user_id, ['M0189'])) {
+        $user_id = 'M0137';
+    }
 
     $sql_cmd = sql_myself($user_id, "salesid");
     $sql = "
@@ -164,10 +182,23 @@ function getDataSql($department_id, $role_id, $user_id)
         // 北區營銷部 營銷專案經理 311 1
         //           新梯營銷經理 311 3
         // 桃竹營銷部 銷售專案經理 312 1
+        // 桃竹契約部 經理        512 3
         // 中區營銷部 新梯營銷經理 313 1
         // 南區營銷部 銷售專案經理 314 2
         // 花東區營銷部 銷售專案經理 315 1
 
+        if ($department_id == '512' && (in_array($role_id, ['3']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+
         if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
             $sql = "
                 SELECT * FROM wipwholestatus
@@ -285,7 +316,7 @@ function getDataSql($department_id, $role_id, $user_id)
         return $sql;
     }
     // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
+    if ($user_id == 'M0078') {
         $sql = "
             SELECT * FROM  wipwholestatus 
             WHERE 1=1 
@@ -319,30 +350,73 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
     if (in_array($user_id, ['M0166', 'M0091'])) {
         $user_id = 'M0086';
     }
+    // 補丁 許馨文 權限 = 李烘銘
+    if (in_array($user_id, ['M0115'])) {
+        $user_id = 'M0086';
+    }
     // 補丁 孫仲凱 = 林瑋隆
     if (in_array($user_id, ['M0159'])) {
         $user_id = 'M0113';
     }
 
+    // 補丁 林靜雯 權限 = 劉永德 新梯 北區+桃竹
+    if (in_array($user_id, ['M0189'])) {
+        $user_id = 'M0137';
+    }
+    // 補丁 林修賢 = 鄭存邑
+    if (in_array($user_id, ['M0188'])) {
+        $user_id = 'M0102';
+        $department_id = '545';
+        $role_id = '6';
+    }
+
     $flow_code_tmp = explode(',', $flow_code);
     $flow_code = implode("','", $flow_code_tmp);
     // 合約類型
     $contract_type = 'A';
     // 營業員主管或營業員
-    $department_arr = ['310', '311', '312', '313', '314', '315'];
+    $department_arr = ['310', '311', '312', '313', '314', '315', '512'];
     if (in_array($department_id, $department_arr)) {
         // 北區營銷部 營銷專案經理 311 1
         //           新梯營銷經理 311 3
         // 桃竹營銷部 銷售專案經理 312 1
+        // 桃竹契約部 經理        512 3
         // 中區營銷部 新梯營銷經理 313 1
         // 南區營銷部 銷售專案經理 314 2
         // 花東區營銷部 銷售專案經理 315 1
+        if ($department_id == '512' && (in_array($role_id, ['3']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+                AND id IN (
+                    SELECT 
+                        form_id AS id
+                    FROM flow 
+                    WHERE system_id = 'wws' 
+                    AND flow_id = 'wws01' 
+                    AND flow_code IN ('$flow_code')        
+                )
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
         if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
             $sql = "
                 SELECT * FROM wipwholestatus
                 WHERE 1=1 
                 AND status = '1'
                 AND contract_type = '$contract_type'
+                AND id IN (
+                    SELECT 
+                        form_id AS id
+                    FROM flow 
+                    WHERE system_id = 'wws' 
+                    AND flow_id = 'wws01' 
+                    AND flow_code IN ('$flow_code')        
+                )
             " . getWipwholeSearchSql() . "
                 ORDER BY real_contract_arrival_date ASC
             ";
@@ -354,6 +428,14 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
                 WHERE 1=1 
                 AND status = '1'
                 AND contract_type = '$contract_type'
+                AND id IN (
+                    SELECT 
+                        form_id AS id
+                    FROM flow 
+                    WHERE system_id = 'wws' 
+                    AND flow_id = 'wws01' 
+                    AND flow_code IN ('$flow_code')        
+                )
             " . getWipwholeSearchSql() . "
                 ORDER BY real_contract_arrival_date ASC
             ";
@@ -365,6 +447,14 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
                 WHERE 1=1 
                 AND status = '1'
                 AND contract_type = '$contract_type'
+                AND id IN (
+                    SELECT 
+                        form_id AS id
+                    FROM flow 
+                    WHERE system_id = 'wws' 
+                    AND flow_id = 'wws01' 
+                    AND flow_code IN ('$flow_code')        
+                )
             " . getWipwholeSearchSql() . "
                 ORDER BY real_contract_arrival_date ASC
             ";
@@ -376,6 +466,14 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
                 WHERE 1=1 
                 AND status = '1'
                 AND contract_type = '$contract_type'
+                AND id IN (
+                    SELECT 
+                        form_id AS id
+                    FROM flow 
+                    WHERE system_id = 'wws' 
+                    AND flow_id = 'wws01' 
+                    AND flow_code IN ('$flow_code')        
+                )
             " . getWipwholeSearchSql() . "
                 ORDER BY real_contract_arrival_date ASC
             ";
@@ -387,6 +485,14 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
                 WHERE 1=1 
                 AND status = '1'
                 AND contract_type = '$contract_type'
+                AND id IN (
+                    SELECT 
+                        form_id AS id
+                    FROM flow 
+                    WHERE system_id = 'wws' 
+                    AND flow_id = 'wws01' 
+                    AND flow_code IN ('$flow_code')        
+                )
             " . getWipwholeSearchSql() . "
                 ORDER BY real_contract_arrival_date ASC
             ";
@@ -845,8 +951,8 @@ function getYewuStatus($link, $user_department_id, $role_id)
 // 取得工務的欄位權限
 function getWarehouseStatus($link, $user_department_id, $role_id, $status)
 {
-    // if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 50, 501, 311, 313, 314, 521, 315, 912])) {
+    if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 50, 501, 311, 313, 314, 521, 315, 912])) {
-    if (getSaveEstimateInstallData($user_department_id, $role_id)) {
+        // if (getSaveEstimateInstallData($user_department_id, $role_id)) {
         if ($status == 1) {
             return checkNowFormGStatus($link) == 'G' ? "" : "disabled";
         } else {
@@ -1221,3 +1327,24 @@ function getAllCustomerPlanningVerify($link, $id)
     ";
     return mysqli_query($link, $sql);
 }
+
+// 各區營銷(契約)經理判斷程式
+function checkUseridIsManager($user_id)
+{
+    // 北區 劉永德
+    if (in_array($user_id, ['M0137']))
+        return true;
+    // 中區 李烘銘	
+    if (in_array($user_id, ['M0086']))
+        return true;
+    // 桃竹 張莉凱	
+    if (in_array($user_id, ['M0026']))
+        return true;
+    // 宜花東 陳志文
+    if (in_array($user_id, ['M0054']))
+        return true;
+    // 南區 吳育宗
+    if (in_array($user_id, ['M0033']))
+        return true;
+    return false;
+}

wms/wipwhole-index.php

@@ -67,7 +67,8 @@ $tableArr = array(
     "B" => "B",
     "G" => "G",
     "CH" => "C,H",
-    "Z" => "Z"
+    "Z" => "Z",
+    "I" => "I",
 );
 
 if (empty($sheetNum) || $sheetNum == "All") {
@@ -212,6 +213,9 @@ $data = mysqli_query($link, $sql);
                     <li>
                         <a href="#" onclick="showATable()">營業確認中</a>
                     </li>
+                    <li>
+                        <a href="#" onclick="showITable()">營業主管確認中</a>
+                    </li>
                     <li>
                         <a href="#" onclick="showBTable()">設計確認中</a>
                     </li>
@@ -433,14 +437,20 @@ mysqli_close($link);
         window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
     }
 
+    function showITable() {
+        sheetNum = "I";
+        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
+    }
+
     function showTable(code) {
         var tmp_arr = {
             "All": "1",
             "A": "2",
-            "B": "3",
+            "I": "3",
-            "G": "4",
+            "B": "4",
-            "CH": "5",
+            "G": "5",
-            "Z": "6",
+            "CH": "6",
+            "Z": "7",
         }
         $("nav.navbar.navbar-tabs  div > ul > li").attr("class", "");
         $("nav.navbar.navbar-tabs  div > ul > li:nth-child(" + tmp_arr[code] + ")").attr("class", "active");

wms/wipwhole-rec-invoice-edit-submit.php

@@ -1,149 +1,104 @@
 <?php
-ini_set('display_errors', 'on');
+
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'main_form') {
+    include("class/Cnotice.php");
+    $cn = new Cnotice();
 
+    if ($_POST['form_name'] == 'main_form') {
         foreach ($_POST as $k => $v) {
             if ($k !== 'desin_taiwan_items_no' && $k !== 'desin_taiwan_items_name')
                 $$k = htmlspecialchars(stripslashes(trim($v)));
         }
 
-        // 時間戳記
         $datetime = date("Y-m-d H:i:s");
-
-        // 合約號
         $contractno = $_POST['contractno'];
-        // 號機
         $facility_temp_no = $_POST['facility_temp_no'];
-        // 作番號
         $facilityno =  $_POST['facilityno'];
-        // 客戶名稱
         $custom = $_POST['custom'];
-        // 工地負責人
         $site_manager = $_POST['site_manager'];
-        // 緯度
         $latitude = $_POST['latitude'];
-        // 經度
         $longitude = $_POST['longitude'];
         $weight = $_POST['weight'];
-        // 人乘
         $numberofpassenger = $_POST['numberofpassenger'];
-        // 樓停
         $numberofstop = $_POST['numberofstop'];
-        // 樓層
         $numberoffloor = $_POST['numberoffloor'];
-        // 開門方式
         $opentype = $_POST['opentype'];
-        // 速度
         $speed = $_POST['speed'];
-        // 機型
         $facility_kind = $_POST['facility_kind'];
-        // 地址
         $address = $_POST['address'];
-        // 工地地址
         $real_address = $_POST['real_address'];
-        //合約到貨日
         $contract_arrival_date = $_POST['contract_arrival_date'];
-        //合約到貨日
         $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
-
-        //营业规格确认
         $sales_spec_verify = $_POST['sales_spec_verify'];
         $sales_spec_verify_at = $_POST['sales_spec_verify_at'] ?: $row['sales_spec_verify_at'];
         $sales_spec_verify_owner = $_POST['sales_spec_verify_owner'] ?: $row['sales_spec_verify_owner'];
-        //客户计划图确认
         $real_custom_name = $_POST['real_custom_name'] ?: $row['real_custom_name'];
         $customer_planning_verify = $_POST['customer_planning_verify'];
         $customer_planning_verify_at = $_POST['customer_planning_verify_at'] ?: $row['customer_planning_verify_at'];
         $customer_planning_verify_owner = $_POST['customer_planning_verify_owner'] ?: $row['customer_planning_verify_owner'];
-        //客户颜色确认
         $customer_color_verify = $_POST['customer_color_verify'];
         $customer_color_verify_at = $_POST['customer_color_verify_at'] ?: $row['customer_color_verify_at'];
         $customer_color_verify_owner = $_POST['customer_color_verify_owner'] ?: $row['customer_color_verify_owner'];
-        //客户颜色确认
         $customer_style_verify = $_POST['customer_style_verify'];
         $customer_style_verify_at = $_POST['customer_style_verify_at'] ?: $row['customer_style_verify_at'];
         $customer_style_verify_owner = $_POST['customer_style_verify_owner'] ?: $row['customer_style_verify_owner'];
-        //工勘聯絡表	
         $site_survey_contact_form_verify = $_POST['site_survey_contact_form_verify'];
         $site_survey_contact_form_verify_at = $_POST['site_survey_contact_form_verify_at'] ?: $row['site_survey_contact_form_verify_at'];
         $site_survey_contact_form_verify_owner = $_POST['site_survey_contact_form_verify_owner'] ?: $row['site_survey_contact_form_verify_owner'];
-
-        //设计规格确认
         $desin_spec_verify = $_POST['desin_spec_verify'];
         $desin_spec_verify_at = $_POST['desin_spec_verify_at'] ?: $row['desin_spec_verify_at'];
         $desin_spec_verify_owner = $_POST['desin_spec_verify_owner'] ?: $row['desin_spec_verify_owner'];
-        //设计计划图确认
         $desin_planning_verify = $_POST['desin_planning_verify'];
         $desin_planning_verify_at = $_POST['desin_planning_verify_at'] ?: $row['desin_planning_verify_at'];
         $desin_planning_verify_owner = $_POST['desin_planning_verify_owner'] ?: $row['desin_planning_verify_owner'];
-        //设计颜色确认
         $desin_color_verify = $_POST['desin_color_verify'];
         $desin_color_verify_at = $_POST['desin_color_verify_at'] ?: $row['desin_color_verify_at'];
         $desin_color_verify_owner = $_POST['desin_color_verify_owner'] ?: $row['desin_color_verify_owner'];
-        //设计仕样确认
         $desin_style_verify = $_POST['desin_style_verify'];
         $desin_style_verify_at = $_POST['desin_style_verify_at'] ?: $row['desin_style_verify_at'];
         $desin_style_verify_owner = $_POST['desin_style_verify_owner'] ?: $row['desin_style_verify_owner'];
-        //设计主管確認
         $desin_leader_verify = $_POST['desin_leader_verify'];
         $desin_leader_verify_at = $_POST['desin_leader_verify_at'] ?: $row['desin_leader_verify_at'];
         $desin_leader_verify_owner = $_POST['desin_leader_verify_owner'] ?: $row['desin_leader_verify_owner'];
-        //楼高通报
         $building_heigh_verify = $_POST['building_heigh_verify'];
         $building_heigh_verify_at = $_POST['building_heigh_verify_at'] ?: $row['building_heigh_verify_at'];
         $building_heigh_verify_owner = $_POST['building_heigh_verify_owner'] ?: $row['building_heigh_verify_owner'];
-        //工勘
         $site_survey_contact_verify = $_POST['site_survey_contact_verify'];
         $site_survey_contact_verify_at = $_POST['site_survey_contact_verify_at'] ?: $row['site_survey_contact_verify_at'];
         $site_survey_contact_verify_owner = $_POST['site_survey_contact_verify_owner'] ?: $row['site_survey_contact_verify_owner'];
         $old_site_survey_contact_verify = $_POST['old_site_survey_contact_verify'];
-
-        //是否齊備
         $shengguanok_status = $_POST['shengguanok_status'];
         $shengguanok_status_at = $_POST['shengguanok_status_at'];
         $shengguanok_status_owner = $_POST['shengguanok_status_owner'] ?: $row['shengguanok_status_owner'];
-        //下單日(普萊特富)
         $prattford_order_date_verify = $_POST['prattford_order_date_verify'];
         $prattford_order_date = $_POST['prattford_order_date'];
         $prattford_order_date_owner = $_POST['prattford_order_date_owner'] ?: $row['prattford_order_date_owner'];
-        // 預計發貨日(到港日)
         $estimated_shipping_date_verify = $_POST['estimated_shipping_date_verify'];
         $estimated_shipping_date = $_POST['estimated_shipping_date'];
         $estimated_shipping_date_owner = $_POST['estimated_shipping_date_owner'] ?: $row['estimated_shipping_date_owner'];
-        // 預計船期(改成預計到廠日)
         $estimated_shipping_schedule_date_verify = $_POST['estimated_shipping_schedule_date_verify'];
         $estimated_shipping_schedule_date = $_POST['estimated_shipping_schedule_date'];
         $estimated_shipping_schedule_date_owner = $_POST['estimated_shipping_schedule_date_owner'] ?: $row['estimated_shipping_schedule_date_owner'];
-        // 普來特富發貨類別
         $goods_type = $_POST['goods_type'] ?: $row['goods_type'];
         $goods_type_date = $_POST['goods_type_date'] ?: $row['goods_type_date'];
         $goods_type_owner = $_POST['goods_type_owner'] ?: $row['goods_type_owner'];
-        // 台灣自理發貨類別
         $taiwan_goods_type = $_POST['taiwan_goods_type'] ?: $row['taiwan_goods_type'];
         $taiwan_goods_type_date = $_POST['taiwan_goods_type_date'];
         $taiwan_goods_type_owner = $_POST['taiwan_goods_type_owner'] ?: $row['taiwan_goods_type_owner'];
-        // 實際到貨日
         $arrival_date_verify = $_POST['arrival_date_verify'] ?: $row['arrival_date_verify'];
         $actual_tofactory_date = $_POST['actual_tofactory_date'];
         $arrival_date_owner = $_POST['arrival_date_owner'] ?: $row['arrival_da
         te_owner'];
-
-        // 各部門備註
         $marketing_remark = $_POST['marketing_remark'] ?: $row['marketing_remark'];
         $desin_remark = $_POST['desin_remark'] ?: $row['desin_remark'];
         $desin_leader_remark = $_POST['desin_leader_remark'] ?: $row['desin_leader_remark'];
         $warehouse_remark = $_POST['warehouse_remark'] ?: $row['warehouse_remark'];
         $yewu_remark = $_POST['yewu_remark'] ?: $row['yewu_remark'];
         $shengguan_remark = $_POST['shengguan_remark'] ?: $row['shengguan_remark'];
-
-        // 台製件
         $desin_taiwan_items_no = json_encode($_POST['desin_taiwan_items_no'], JSON_UNESCAPED_UNICODE);
         $desin_taiwan_items_name = json_encode($_POST['desin_taiwan_items_name'], JSON_UNESCAPED_UNICODE);
         $desin_taiwan_items_no = $desin_taiwan_items_no == 'null' ? null : $desin_taiwan_items_no;
         $desin_taiwan_items_name = $desin_taiwan_items_name == 'null' ? null : $desin_taiwan_items_name;
-
-        // 品証部
         $qc_date = $_POST['qc_date'] ?: $row['qc_date'];
         $qc_date_owner = $_POST['qc_date_owner'] ?: $row['qc_date_owner'];
         $end_qc_date = $_POST['end_qc_date'] ?: $row['end_qc_date'];
@@ -154,8 +109,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         $delivery_date = $_POST['delivery_date'] ?: $row['delivery_date'];
         $delivery_date_owner = $_POST['delivery_date_owner'] ?: $row['delivery_date_owner'];
         $qc_official_type = $_POST['qc_official_type'] ?: $row['qc_official_type'];
-
-        // 工務助理
         $outsourcer_type = $_POST['outsourcer_type'];
         $install_outsourcer = $_POST['install_outsourcer'];
         $install_outsourcer_owner = $_POST['install_outsourcer_owner'];
@@ -175,8 +128,9 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         $estimate_tryrun_end_date_owner = $_POST['estimate_tryrun_end_date_owner'];
         $warehouse_assistant_remark = $_POST['warehouse_assistant_remark'];
 
-        $creater = $_POST['creater'];
+        // $creater = $_POST['creater'];
-        $create_at = date("Y-m-fd H:i:s");
+        $creater = $user_id;
+        $create_at = date("Y-m-d H:i:s");
 
         // 上傳附件
         include "wipwhole-rec-invoice-edit-fileupload.php";
@@ -197,29 +151,16 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                     $content = "客戶:$custom 
     作番:$facilityno 
     官檢日 $old_official_check_date => $official_check_date";
-
+                    $data = array(
-                    $sql = "
+                        'kind' => 1,
-                        INSERT INTO notice(
+                        'related_id' => $id,
-                            kind,
+                        'title' => $title,
-                            related_id,
+                        'content' => $content,
-                            title,
+                        'permission' => $permission,
-                            content,
+                        'creater' => $creater,
-                            haveread,
+                        'create_at' => date("Y-m-d H:i:s")
-                            permission,
-                            creater,
-                            create_at
-                        )VALUES(
-                            '1',
-                            '$id',
-                            '$title',
-                            '$content',
-                            null,
-                            '$permission',
-                            '$creater',
-                            '" . date("Y-m-d H:i:s") . "'
                     );
-                    ";
+                    $cn->sendx($data);
-                    mysqli_query($link, $sql);
                 }
             }
         }
@@ -265,62 +206,44 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 作番:$facilityno 
 工勘狀態 $site_survey_status[$old_site_survey_contact_verify] => $site_survey_status[$site_survey_contact_verify]";
 
-                $sql = "
+                $data = array(
-                    INSERT INTO notice(
+                    'kind' => 1,
-                        kind,
+                    'related_id' => $id,
-                        related_id,
+                    'title' => $title,
-                        title,
+                    'content' => $content,
-                        content,
+                    'permission' => $permission,
-                        haveread,
+                    'creater' => $creater,
-                        permission,
+                    'create_at' => date("Y-m-d H:i:s")
-                        creater,
-                        create_at
-                    )VALUES(
-                        '1',
-                        '$id',
-                        '$title',
-                        '$content',
-                        null,
-                        '$permission',
-                        '$creater',
-                        '$create_at'
                 );
-                ";
+                $cn->sendx($data);
-                mysqli_query($link, $sql);
             }
         }
 
         if (!empty($desin_documents_verify_file)) {
-            echo $sql = "
+            $title = "合約號:$contract_no 作番號:$facilityno 設計上傳追加技術文件";
-                INSERT INTO notice(
+            $content = "合約號:$contract_no 作番號:$facilityno 設計上傳追加技術文件";
-                    kind,
+            $data = array(
-                    related_id,
+                'kind' => 1,
-                    title,
+                'related_id' => $id,
-                    content,
+                'title' => $title,
-                    haveread,
+                'content' => $content,
-                    permission,
+                'permission' => "M0168",
-                    creater,
+                'creater' => $creater,
-                    create_at
+                'create_at' => date("Y-m-d H:i:s")
-                )VALUES(
-                    '1',
-                    '$id',
-                    '合約號:$contract_no 作番號:$facilityno 設計上傳追加技術文件',
-                    '合約號:$contract_no 作番號:$facilityno 設計上傳追加技術文件',
-                    null,
-                    'M0168',
-                    '$creater',
-                    '$create_at'
             );
-            ";
+            $cn->sendx($data);
-            mysqli_query($link, $sql);
         }
 
         $updatesql = "
             UPDATE wipwholestatus 
             SET 
         ";
-        if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545])) {
+
-            // 工務更新;
+        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', 
@@ -339,7 +262,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 $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', ";
-        } else if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315) {
+        } else if (in_array($user_department_id, [311, 312, 313, 314, 315])) {
             // 營業更新;
             $updatesql .= "
                 sales_spec_verify = '$sales_spec_verify', 
@@ -430,26 +353,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                     $updatesql .= "desin_documents_verify_file = '$desin_documents_verify_file', ";
             }
         } else if ($user_department_id == 321) {
-            // 共用更新 
-            // $updatesql .= "
-            //     contractno = '$contractno', 
-            //     facility_temp_no = '$facility_temp_no', 
-            //     facilityno = '$facilityno',
-            //     custom='$custom' ,
-            //     latitude = '$latitude', 
-            //     longitude = '$longitude',
-            //     weight = '$weight', 
-            //     numberofpassenger = '$numberofpassenger', 
-            //     numberofstop = '$numberofstop', 
-            //     numberoffloor = '$numberoffloor', 
-            //     opentype = '$opentype', 
-            //     speed = '$speed', 
-            //     site_manager = '$site_manager',
-            //     address = '$address',
-            //     real_address = '$real_address', 
-            //     contract_arrival_date = '$contract_arrival_date', 
-            //     facility_kind = '$facility_kind',
-            // ";
             // 業務更新
             $updatesql .= "
                 prattford_order_date_verify = '$prattford_order_date_verify' ,
@@ -540,9 +443,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 
         // 工務助理
         if (
-            in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188', 'M0117'])
+            in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188', 'M0117', 'M0054'])
             || in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545])
-            || $user_id == 'M0054'
         ) {
 
             $qc_official_type = $_POST['qc_official_type2'] ?: $row['qc_official_type'];
@@ -566,9 +468,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             $tryrun_end_date_owner = $_POST['tryrun_end_date2_owner'] ?: $row['tryrun_end_date_owner'];
 
             $updatesql .= "
-
                 qc_official_type = '$qc_official_type',
-
                 install_start_date = '$install_start_date',
                 install_start_date_owner = '$install_start_date_owner',
                 install_end_date = '$install_end_date',
@@ -577,7 +477,6 @@ 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',
-
                 delivery_date = '$delivery_date',
                 delivery_date_owner = '$delivery_date_owner',
                 qc_date = '$qc_date',
@@ -586,7 +485,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 end_qc_date_owner = '$end_qc_date_owner',
                 official_check_date = '$official_check_date',
                 official_check_date_owner = '$official_check_date_owner',
-
                 outsourcer_type = '$outsourcer_type',
                 install_outsourcer = '$install_outsourcer',
                 install_outsourcer_owner = '$install_outsourcer_owner',
@@ -739,6 +637,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
     if ($_POST['form_name'] == 'update_contract_date_form') {
         foreach ($_POST as $k => $v)
             $$k = htmlspecialchars(stripslashes(trim($v)));
@@ -746,8 +645,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         $contractno = $_POST['contractno'];
         $facilityno = $_POST['facilityno'];
         $custom = $_POST['custom'];
-        $creater = $_POST['creater'];
+        // $creater = $_POST['creater'];
-        $create_at = $_POST['create_at'];
+        $creater = $user_id;
+        // $create_at = $_POST['create_at'];
+        $create_at = date("Y-m-d H:i:s");
         $old_real_contract_arrival_date = $_POST['old_real_contract_arrival_date'];
         $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
         $salesid = $_POST['salesid'];
@@ -762,54 +663,33 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         ";
         mysqli_query($link, $updatesql);
 
+        $title = "作番大日程(新梯)出貨日調整通知 > " . $facilityno;
         $content = "合約號 : $contractno
 作番號 : $facilityno
 出貨日期微調: " . substr($old_real_contract_arrival_date, 0, 10) . "  =>  " . substr($real_contract_arrival_date, 0, 10);
 
-        $sql = "
+
-            INSERT INTO notice (
+        $data = array(
-                kind, 
+            'kind' => 1,
-                related_id,
+            'related_id' => $id,
-                title,
+            'title' => $title,
-                content,
+            'content' => $content,
-                haveread,
+            'permission' => $salesid,
-                permission,
+            'creater' => 'system',
-                creater,
+            'create_at' => date("Y-m-d H:i:s")
-                create_at
+        );
-            ) VALUES(
+        $cn->sendx($data);
-                '1', 
+
-                '$id', 
+        $data = array(
-                '作番大日程(新梯)出貨日調整通知 > " . $facilityno . "', 
+            'kind' => 1,
-                '$content', 
+            'related_id' => $id,
-                NULL,
+            'title' => $title,
-                '$salesid', 
+            'content' => $content,
-                'system', 
+            'permission' => $gongWuokid,
-                '" . date("Y-m-d H:i:s") . "'
+            'creater' => 'system',
-            )
+            'create_at' => date("Y-m-d H:i:s")
-        ";
+        );
-        mysqli_query($link, $sql);
+        $cn->sendx($data);
-        $sql = "
-            INSERT INTO notice (
-                kind, 
-                related_id,
-                title,
-                content,
-                haveread,
-                permission,
-                creater,
-                create_at
-            ) VALUES(
-                '1', 
-                '$id', 
-                '作番大日程(新梯)出貨日調整通知 > " . $facilityno . "', 
-                '$content', 
-                NULL,
-                '$gongWuokid', 
-                'system', 
-                '" . date("Y-m-d H:i:s") . "'
-            )
-        ";
-        mysqli_query($link, $sql);
 
         $sql = "
             INSERT INTO wipwhole_change_contractdate_details (
@@ -839,6 +719,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
     if ($_POST['form_name'] == 'update_date_form') {
 
         $creater = $user_id;
@@ -874,28 +755,16 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 作番:$facilityno
 實際出貨日(到工地):$real_arrival_date";
 
-            $sql = "
+            $data = array(
-                INSERT INTO notice(
+                'kind' => 1,
-                    kind,
+                'related_id' => $id,
-                    related_id,
+                'title' => $title,
-                    title,
+                'content' => $content,
-                    content,
+                'permission' => $permission,
-                    haveread,
+                'creater' => $creater,
-                    permission,
+                'create_at' => date("Y-m-d H:i:s")
-                    creater,
-                    create_at
-                )VALUES(
-                    '1',
-                    '$id',
-                    '$title',
-                    '$content',
-                    null,
-                    '$permission',
-                    '$creater',
-                    '" . date("Y-m-d H:i:s") . "'
             );
-            ";
+            $cn->sendx($data);
-            mysqli_query($link, $sql);
         }
 
         echo "<script type ='text/JavaScript'>";
@@ -954,7 +823,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         foreach ($_POST as $k => $v)
             $$k = htmlspecialchars(stripslashes(trim($v)));
 
-        $creater = $_POST['creater'];
+        // $creater = $_POST['creater'];
+        $creater = $user_id;
         $datetime = date("Y-m-d H:i:s");
         $shengguan_remark = $_POST['shengguan_remark'];
         $updatesql = "
@@ -995,40 +865,6 @@ function write_note($link, $id, $user_id, $content)
     mysqli_query($link, $updatesql);
 }
 
-// function getWipwholestatusDetail($link, $id)
-// {
-//     $sql = "
-//         SELECT *
-//         FROM wipwholestatus
-//         WHERE 1=1
-//         AND id = '$id'
-//         AND status = '1'
-//     ";
-//     $result = mysqli_query($link, $sql);
-//     $row = mysqli_fetch_assoc($result);
-//     return $row;
-// }
-
-// 各區營銷(契約)經理判斷程式
-function checkUseridIsManager($user_id)
-{
-    // 北區 劉永德
-    if (in_array($user_id, ['M0137']))
-        return true;
-    // 中區 李烘銘	
-    if (in_array($user_id, ['M0086']))
-        return true;
-    // 桃竹 張莉凱	
-    if (in_array($user_id, ['M0026']))
-        return true;
-    // 宜花東 陳志文
-    if (in_array($user_id, ['M0054']))
-        return true;
-    // 南區 吳育宗
-    if (in_array($user_id, ['M0033']))
-        return true;
-    return false;
-}
 
 // 表單簽核狀態檢查主程式
 function checkWwsAssianStatus($link, $user_id, $id = null)

wms/wipwhole-rec-invoice-edit.php

@@ -158,6 +158,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
                             521, 531, 220, 250,
                             541, 542, 543, 544, 545
                         ];
+                        if ($user_id !== 'M0115')
                             if (in_array($user_department_id, $show_tmp_arr))
                                 echo "<a target='_blank' href='wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id'>工地地址調整</a>";
                         ?>
@@ -227,6 +228,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
                             521, 531, 220, 250,
                             541, 542, 543, 544, 545
                         ];
+                        if ($user_id !== 'M0115')
                             if (in_array($user_department_id, $show_tmp_arr))
                                 echo "<a target='_blank' href='wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id'>出貨日調整</a>";
                         ?>
@@ -298,6 +300,17 @@ include "wipwhole-rec-invoice-edit-submit.php";
                 <tbody style="font-weight: bolder;margin-bottom: 20px">
                     <tr>
                         <td>營業人員確認項</td>
+                        <td>
+                            <?php
+                            echo "營業擔當:" . $row['salesid'] . accountid2name()[$row['salesid']];
+                            ?>
+                            <br />
+                            <?php
+                            if (!checkUseridIsManager($row['salesid'])) {
+                                echo "營業擔當主管:" . manage_class($row['salesid'])[0] . accountid2name(manage_class($row['salesid'])[0])[manage_class($row['salesid'])[0]];
+                            }
+                            ?>
+                        </td>
                     </tr>
                     <tr>
                         <td style="vertical-align: middle;width:auto;">營業/契約確認規格</td>
@@ -507,6 +520,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
                             <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
                             <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>">
                             <?php
+                            if ($user_id !== 'M0115') {
                                 if (checkNowFormYDStatus($link) == 'A' && in_array($user_department_id, [220, 311, 312, 313, 314, 315])) {
                             ?>
                                     <button onclick="doMarketingAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">
@@ -526,6 +540,9 @@ include "wipwhole-rec-invoice-edit-submit.php";
                                 ?>
                                 <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?= $marketing2; ?>>存檔</button>
                                 <span class="text-danger pull-right">若無工勘資料請勿移交至設計階段！</span>
+                            <?php
+                            }
+                            ?>
                         </td>
                     </tr>
                 </tbody>
@@ -877,7 +894,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
                             <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>" readonly>
                             <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>" readonly>
                             <?php
-                            if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 220])) {
+                            if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 220]) || in_array($user_id, ['M0188'])) {
                                 echo "<button onclick='savedata()' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
                                 if (checkNowFormGStatus($link) == 'G')
                                     echo "<button onclick='doWarhouseAssign()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>提交至生管</button>";

wms/wipwhole-rec-invoice.php

@@ -434,7 +434,7 @@ if ($department_id == "321" || $department_id == "220") {
         // 建立人
         $creater = postCheck('creater');
         // 建立時間	
-        $create_at = postCheck('create_at');
+        $create_at = date('Y-m-d H:i:s');
 
 
         //插入數據庫數據  gary_version

wms/wipwhole-renovate-index.php

@@ -65,7 +65,8 @@ $tableArr = array(
     "B" => "B",
     "C" => "C",
     "D" => "D",
-    "Z" => "Z"
+    "Z" => "Z",
+    "F" => "F",
 );
 
 if (empty($sheetNum) || $sheetNum == "All") {
@@ -210,6 +211,9 @@ $data = mysqli_query($link, $sql);
                 <li>
                     <a href="#" onclick="showBTable()">營業確認中</a>
                 </li>
+                <li>
+                    <a href="#" onclick="showFTable()">營業主管確認中</a>
+                </li>
                 <li>
                     <a href="#" onclick="showCTable()">設計確認中</a>
                 </li>
@@ -444,6 +448,11 @@ mysqli_close($link);
         window.location.href = "<?php echo "wipwhole-renovate-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
     }
 
+    function showFTable() {
+        sheetNum = "F";
+        window.location.href = "<?php echo "wipwhole-renovate-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
+    }
+
     function showBTable() {
         sheetNum = "B";
         window.location.href = "<?php echo "wipwhole-renovate-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
@@ -469,9 +478,10 @@ mysqli_close($link);
             "All": "1",
             "A": "2",
             "B": "3",
-            "C": "4",
+            "F": "4",
-            "D": "5",
+            "C": "5",
-            "Z": "6",
+            "D": "6",
+            "Z": "7",
         }
         $("nav.navbar.navbar-tabs  div > ul > li").attr("class", "");
         $("nav.navbar.navbar-tabs  div > ul > li:nth-child(" + tmp_arr[code] + ")").attr("class", "active");

wms/wipwhole-renovate-rec-invoice-edit-submit.php

@@ -1,4 +1,5 @@
 <?php
+// ini_set('display_errors', 'on');
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     if ($_POST['form_name'] == 'main_form') {
 
@@ -9,6 +10,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 
         // 時間戳記
         $datetime = date("Y-m-d H:i:s");
+        $create_at = date("Y-m-d H:i:s");
 
         // 合約號
         $contractno = $_POST['contractno'];
@@ -234,7 +236,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         $delivery_date_owner = $_POST['delivery_date_owner'] ?: $row['delivery_date_owner'];
 
         $creater = $_POST['creater'];
-        $create_at = $_POST['create_at'];
+        $create_at = date("Y-m-d H:i:s");
 
         // 上傳附件
         include "wipwhole-rec-invoice-edit-fileupload.php";
@@ -282,7 +284,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 
         $updatesql = "update wipwholestatus set ";
 
-        if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545])) {
+        if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545]) || $user_id == 'M0054') {
             // 工務更新;
             $updatesql .= "
                 building_heigh_verify = '$building_heigh_verify', 
@@ -935,6 +937,23 @@ function checkWwsAssianStatus($link, $user_id)
         $form_key = isset($_GET['form_key']) ? $_GET['form_key'] : getForm_key($link, $id);
     }
 
+    include "./class/Cmail.php";
+    $cmail = new Cmail();
+    $data = getWipwholestatusDetail($link, $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['designname'] = accountid2name("M0023")["M0023"];
+    $data['designmail'] = accountid2email(["M0023"])["M0023"];
+    $data['designleadername'] = accountid2name(getSheJiokLeaderNo($link))[getSheJiokLeaderNo($link)];
+    $data['designleadermail'] = accountid2email([getSheJiokLeaderNo($link)])[getSheJiokLeaderNo($link)];
+    $data['gongwokname'] = accountid2name(getGongWuokNo($link))[getGongWuokNo($link)];
+    $data['gongwokmail'] = accountid2email([getGongWuokNo($link)])[getGongWuokNo($link)];
+    $data['shengguanname'] = accountid2name(getShengGuanokLeaderNo($link))[getShengGuanokLeaderNo($link)];
+    $data['shengguanmail'] = accountid2email([getShengGuanokLeaderNo($link)])[getShengGuanokLeaderNo($link)];
+
     // 確認工務階段 進入營業階段
     if (checkNowFormStatus($link) == 'A' && checkGongWuok($link, $id) == '0') {
         write_note($link, $id, $user_id, "<em>工務提交至營業階段</em>");
@@ -944,10 +963,58 @@ function checkWwsAssianStatus($link, $user_id)
 
     // 確認營業階段 進入設計人員(汰改:林坤翰 M0052 改 林昭翰 M0173)階段
     if (checkNowFormStatus($link) == 'B' && checkYingYeok($link, $id) == '0') {
+        if (checkUseridIsManager($user_id)) {
             write_note($link, $id, $user_id, "<em>營業提交至設計階段</em>");
+            $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至設計階段";
+            $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至設計階段";
+            $cmail->sendx(
+                $mail_title,
+                $mail_content,
+                [
+                    [$data['salesname'], $data['salesmail']],
+                    [$data['designname'], $data['designmail']]
+                ],
+                "永佳捷科技"
+            );
             do_wws_next_assign("M0173", $form_key, 'C');
             return;
+        } else {
+            write_note($link, $id, $user_id, "<em>營業提交至營業經理階段</em>");
+            $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至營業經理階段";
+            $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至營業經理階段";
+            $cmail->sendx(
+                $mail_title,
+                $mail_content,
+                [
+                    [$data['salesname'], $data['salesmail']],
+                    [$data['salesmanagername'], $data['salesmanagermail']]
+                ],
+                "永佳捷科技"
+            );
+            do_wws_next_assign(manage_class($data['salesid'])[0], $form_key, 'F');
         }
+    }
+
+    // 確認營業主管階段 進入設計人員(汰改:林昭翰 M0173)階段
+    if (checkNowFormStatus($link) == 'F' && checkYingYeok($link, $id) == '0') {
+        if (checkUseridIsManager($user_id)) {
+            write_note($link, $id, $user_id, "<em>營業經理提交至設計階段</em>");
+            $mail_title = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業經理提交至設計階段";
+            $mail_content = "作番大日程(汰改)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業經理提交至設計階段";
+            $cmail->sendx(
+                $mail_title,
+                $mail_content,
+                [
+                    [$data['salesname'], $data['salesmail']],
+                    [$data['designname'], $data['designmail']]
+                ],
+                "永佳捷科技"
+            );
+            do_wws_next_assign("M0173", $form_YD_key, 'C');
+            return true;
+        }
+    }
+
     // 確認設計人員(汰改:林坤翰 M0052 改 林昭翰 M0173)階段 進入設計主管階段
     if (checkNowFormStatus($link) == 'C' && checkSheJiok($link, $id) == '0') {
         write_note($link, $id, $user_id, "<em>設計提交至設計主管階段</em>");

wms/wipwhole-renovate-rec-invoice-edit.php

@@ -153,6 +153,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                     <td style="vertical-align: middle">預計交期(到工地)
                         <br />
                         <?php
+                        if ($user_id !== 'M0115')
                             if (getWipwholeChangeButtonStatus($user_department_id))
                                 echo "<a target='_blank' href='wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id'>出貨日調整</a>";
                         ?>
@@ -176,6 +177,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                     </td>
                     <td style="vertical-align: middle">工地地址<br />
                         <?php
+                        if ($user_id !== 'M0115')
                             if (getWipwholeChangeButtonStatus($user_department_id))
                                 echo "<a target='_blank' href='wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id'>工地地址調整</a>";
                         ?>
@@ -458,12 +460,12 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                         <td colspan="8">
                             <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>" readonly>
                             <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>" readonly>
-                            <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?= $warehouse2; ?>>存檔</button>
+                            <!-- <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?= $warehouse2; ?>>存檔</button> -->
-                            <?php
-                            if (checkNowFormStatus($link) == 'A' && in_array($user_department_id, [220, 521, 531, 541, 542, 543, 544, 545])) {
-                            ?>
-                                <button onclick="doWarhouseAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">提交至營業</button>
                             <?php
+                            if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 220]) || in_array($user_id, ['M0188'])) {
+                                echo "<button onclick='savedata()' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
+                                if (checkNowFormStatus($link) == 'A')
+                                    echo "<button onclick='doWarhouseAssign()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>提交至營業</button>";
                             }
                             ?>
                         </td>
@@ -711,14 +713,28 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                             <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
                             <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>">
                             <?php
+                            if ($user_id !== 'M0115') {
                                 if (checkNowFormStatus($link) == 'B' && in_array($user_department_id, [220, 311, 312, 313, 314, 315, 511, 512, 513, 514])) {
                             ?>
-                                <button onclick="doMarketingAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">提交至設計部門</button>
+                                    <button onclick="doMarketingAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">
+                                        提交至<?php echo checkUseridIsManager($user_id) ? "設計部門" : "營業主管"; ?>
+                                    </button>
                                     <button onclick="doBackWarhouseAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回工務部門</button>
                                 <?php
+                                } else if (checkNowFormStatus($link) == 'F' && checkUseridIsManager($user_id)) {
+                                ?>
+                                    <button onclick="doBackMarketingAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;" <?= $marketing2; ?>>退回營業</button>
+                                    <button onclick="doMarketingAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">
+                                        提交至設計部門
+                                    </button>
+                                <?php
                                 }
                                 ?>
                                 <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?= $marketing2; ?>>存檔</button>
+                                <span class="text-danger pull-right">若無工勘資料請勿移交至設計階段！</span>
+                            <?php
+                            }
+                            ?>
                         </td>
                     </tr>
                 </tbody>

wms/wipwhole-renovate-rec-invoice.php

@@ -440,7 +440,7 @@ if ($department_id == "321" || $department_id == "220") {
         // 建立人
         $creater = postCheck('creater');
         // 建立時間	
-        $create_at = postCheck('create_at');
+        $create_at = date("Y-m-d H:i:s");
 
         //插入數據庫數據  gary_version
         $insertsql = "

wms/wipwhole-wipinstallstatus-index.php

@@ -1,22 +1,6 @@
 <?php
 // ini_set('display_errors', 'on');
 
-// 新梯
-// $Adata
-// 出貨台數 = 有實際出貨日期
-// $Adata2
-// 在裝台數 = 已出貨且官檢日跟移交日都沒填日期
-// $Adata3
-// 工收台數 = 已出貨且官檢日或移交日其中一個有日期
-
-// 合計
-// $data
-// 出貨台數 = 有實際出貨日期
-// $data2
-// 在裝台數 = 已出貨且官檢日跟移交日都沒填日期
-// $data3
-// 工收台數 = 已出貨且官檢日或移交日其中一個有日期
-
 $real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? date("Y") . '-01' : $_REQUEST['real_arrival_date_start'];
 $real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? date("Y-m") : $_REQUEST['real_arrival_date_end'];
 $radsY = SUBSTR($real_arrival_date_start, 0, 4);
@@ -26,287 +10,117 @@ $radeM = SUBSTR($real_arrival_date_end, 5, 2);
 
 include "header.php";
 
-// 新梯-出貨台數
+// 出貨台數
+function getShipping($type, $mtype, $radsY, $radsM, $year, $month)
+{
+    global $link;
     $sql = "
         SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
+            count(*) AS all_count
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
         FROM wipwholestatus 
         WHERE status = '1'
-    AND contract_type = 'A'
         AND (
             real_arrival_date IS NOT NULL
             AND real_arrival_date != ''
         )  
-    GROUP BY year, month
+        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%'" : "";
+    // echo $sql . "<br/>";
     $result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
+    $data = mysqli_fetch_array($result, MYSQLI_ASSOC);
-$Adata = $result->fetch_all(MYSQLI_ASSOC);
+    return $data['all_count'];
+}
 
-// 新梯-在裝台數
+// 試車完台數
+function getInstalling($type, $mtype, $radsY, $radsM, $year, $month)
+{
+    global $link;
     $sql = "
         SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
+            count(*) AS all_count
-        SUBSTR(real_arrival_date,6,2) AS month,
+            -- real_arrival_date,
-        COUNT(real_arrival_date) AS all_count
+            -- tryrun_end_date
         FROM wipwholestatus 
         WHERE status = '1'
-    AND contract_type = 'A'
         AND (
             real_arrival_date IS NOT NULL
             AND real_arrival_date != ''
-    )AND (
-        delivery_date IS NULL
-        OR delivery_date = ''
-    )AND (
-        official_check_date IS NULL
-        OR official_check_date = ''
         )  
-    GROUP BY year, month
+        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%'" : "";
+    // echo $sql."<br/>";
     $result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
+    $data = mysqli_fetch_array($result, MYSQLI_ASSOC);
-$Adata2 = $result->fetch_all(MYSQLI_ASSOC);
+    return $data['all_count'];
-
+}
-// 新梯-工收台數 
-$sql = "
-    SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
-    FROM wipwholestatus 
-    WHERE status = '1'
-    AND contract_type = 'A'
-    AND (
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
-    )AND ((
-        delivery_date IS NOT NULL
-        AND delivery_date != ''
-    )OR (
-        official_check_date IS NOT NULL
-        AND official_check_date  != ''
-    ))
-    GROUP BY year, month
-";
-$result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
-$Adata3 = $result->fetch_all(MYSQLI_ASSOC);
 
 
-// M1-出貨台數
+// 工收台數 
+function getEnding($type, $mtype, $radsY, $radsM, $year, $month)
+{
+    global $link;
     $sql = "
         SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
+            count(
-        SUBSTR(real_arrival_date,6,2) AS month,
+                *
-        COUNT(real_arrival_date) AS all_count
+            ) AS all_count
+            -- real_arrival_date,
+            -- delivery_date,
+            -- official_check_date
         FROM wipwholestatus 
         WHERE status = '1'
-    AND contract_type = 'B'
+        AND real_arrival_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31'
-    AND renovate_type like '%M1%'
+        AND (delivery_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31'
-    AND (
+            OR
-        real_arrival_date IS NOT NULL 
+            official_check_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31'
-        AND real_arrival_date != ''
         )
-    GROUP BY year, month
     ";
+    $sql .= !empty($type) ? " AND contract_type = '$type'" : "";
+    $sql .= !empty($mtype) ? " AND renovate_type Like '%$mtype%'" : "";
+    // echo $sql . "<br/>";
     $result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
+    $data = mysqli_fetch_array($result, MYSQLI_ASSOC);
-$M1data = $result->fetch_all(MYSQLI_ASSOC);
+    return $data['all_count'];
+}
 
-// M1-在裝台數
+// 在裝中台數
+function getInstalling2($type, $mtype, $radsY, $radsM, $year, $month)
+{
+    global $link;
     $sql = "
         SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
+            count(*) AS all_count
-        SUBSTR(real_arrival_date,6,2) AS month,
+            -- delivery_date,
-        COUNT(real_arrival_date) AS all_count
+            -- official_check_date    
         FROM wipwholestatus 
         WHERE status = '1'
-    AND contract_type = 'B'
+        AND real_arrival_date BETWEEN '$radsY-$radsM-01' AND '$year-$month-31'
-    AND renovate_type like '%M1%'
         AND (
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
-    )AND (
             delivery_date IS NULL
             OR delivery_date = ''
-    )AND (
+            OR delivery_date >= '$year-$month-31'
-        official_check_date IS NULL
-        OR official_check_date = ''
-    )
-    GROUP BY year, month
-";
-$result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
-$M1data2 = $result->fetch_all(MYSQLI_ASSOC);
-
-// M1-工收台數 
-$sql = "
-    SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
-    FROM wipwholestatus 
-    WHERE status = '1'
-    AND contract_type = 'B'
-    AND renovate_type like '%M1%'
-    AND (
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
-    )AND ((
-        delivery_date IS NOT NULL
-        AND delivery_date != ''
-    )OR (
-        official_check_date IS NOT NULL
-        AND official_check_date  != ''
-    ))
-    GROUP BY year, month
-";
-$result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
-$M1data3 = $result->fetch_all(MYSQLI_ASSOC);
-
-
-// MA-出貨台數
-$sql = "
-    SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
-    FROM wipwholestatus 
-    WHERE status = '1'
-    AND contract_type = 'B'
-    AND renovate_type like '%MA%'
-    AND (
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
         )
-    GROUP BY year, month
-";
-$result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
-$Madata = $result->fetch_all(MYSQLI_ASSOC);
-
-// MA-在裝台數
-$sql = "
-    SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
-    FROM wipwholestatus 
-    WHERE status = '1'
-    AND contract_type = 'B'
-    AND renovate_type like '%MA%'
         AND( 
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
-    )AND (
-        delivery_date IS NULL
-        OR delivery_date = ''
-    )AND (
             official_check_date IS NULL
             OR official_check_date = ''
+            OR official_check_date >= '$year-$month-31'
         )
-    GROUP BY year, month
-";
-$result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
-$Madata2 = $result->fetch_all(MYSQLI_ASSOC);
-
-// MA-工收台數 
-$sql = "
-    SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
-    FROM wipwholestatus 
-    WHERE status = '1'
-    AND contract_type = 'B'
-    AND renovate_type like '%MA%'
-    AND (
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
-    )AND ((
-        delivery_date IS NOT NULL
-        AND delivery_date != ''
-    )OR (
-        official_check_date IS NOT NULL
-        AND official_check_date  != ''
-    ))
-    GROUP BY year, month
-";
-$result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
-$Madata3 = $result->fetch_all(MYSQLI_ASSOC);
-
-
-// 合計-出貨台數
-$sql = "
-    SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
-    FROM wipwholestatus 
-    WHERE status = '1'
-    AND (
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
-    )
-    GROUP BY year, month
     ";
+    $sql .= !empty($type) ? " AND contract_type = '$type'" : "";
+    $sql .= !empty($mtype) ? " AND renovate_type Like '%$mtype%'" : "";
     $result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
+    $data = mysqli_fetch_array($result, MYSQLI_ASSOC);
-$data = $result->fetch_all(MYSQLI_ASSOC);
+    return $data['all_count'];
+}
 
-// 合計-在裝台數
-$sql = "
-    SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
-    FROM wipwholestatus 
-    WHERE status = '1'
-    AND (
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
-    )AND (
-        delivery_date IS NULL
-        OR delivery_date = ''
-    )AND (
-        official_check_date IS NULL
-        OR official_check_date = ''
-    )
-    GROUP BY year, month
-";
-$result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
-$data2 = $result->fetch_all(MYSQLI_ASSOC);
 
-// 合計-工收台數 
-$sql = "
-    SELECT 
-        SUBSTR(real_arrival_date,1,4) AS year,
-        SUBSTR(real_arrival_date,6,2) AS month,
-        COUNT(real_arrival_date) AS all_count
-    FROM wipwholestatus 
-    WHERE status = '1'
-    AND (
-        real_arrival_date IS NOT NULL 
-        AND real_arrival_date != ''
-    )AND ((
-        delivery_date IS NOT NULL
-        AND delivery_date != ''
-    )OR (
-        official_check_date IS NOT NULL
-        AND official_check_date  != ''
-    ))
-    GROUP BY year, month
-";
-$result = mysqli_query($link, $sql);
-$data_count = $result->num_rows;
-$data3 = $result->fetch_all(MYSQLI_ASSOC);
 
 ?>
 <form id='myForm' method='post' action='wipwhole-wipinstallstatus-index.php?<?= $token_link ?>'>
@@ -371,11 +185,11 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) {
                     $end_month = $radeM;
                 }
             ?>
-                <th style='text-align:center;' colspan="<?php echo $end_month * 3 ?>"><?php echo $radsYi . '年'; ?></th>
+                <th style='text-align:center;' colspan="<?php echo $end_month * 4 ?>"><?php echo $radsYi . '年'; ?></th>
             <?php
             }
             ?>
-            <th style='width:200px' colspan="3" rowspan="2">總計(全部)</th>
+            <!-- <th style='width:200px' colspan="3" rowspan="2">總計(全部)</th> -->
         </tr>
         <tr>
             <!-- <th style="width:150px;"></th> -->
@@ -398,7 +212,7 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) {
 
                 for ($start_month; $start_month <= $end_month; $start_month++) {
             ?>
-                    <th style='width:200px' colspan="3"><?php echo (int)$start_month . '月'; ?></th>
+                    <th style='width:200px;text-align:center;' colspan="4"><?php echo (int)$start_month . '月'; ?></th>
                 <?php
                 }
                 ?>
@@ -430,16 +244,17 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) {
             ?>
                     <th style="background-color:#CECECE;">出貨</th>
                     <th style="background-color:#DEDEDE;">工收</th>
-                    <th>在裝</th>
+                    <th style="background-color:#EEEEEE;">試車完</th>
+                    <th style="background-color:#FFFFFF;">在裝中</th>
                 <?php
                 }
                 ?>
             <?php
             }
             ?>
-            <th style="background-color:#FF8040;">出貨</th>
+            <!-- <th style="background-color:#FF8040;">出貨</th>
             <th style="background-color:#FFAF60;">工收</th>
-            <th style="background-color:#9D9D9D;">在裝</th>
+            <th style="background-color:#9D9D9D;">試車完</th> -->
         </tr>
     </thead>
     <tbody>
@@ -465,40 +280,33 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) {
                 }
 
                 for ($start_month; $start_month <= $end_month; $start_month++) {
+
+                    // 新梯出貨
                     $all_count = 0;
-                    foreach ($Adata as $row) {
+                    $all_count = getShipping("A", "", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
-                            $all_count = $row['all_count'];
-                            $a_count += $all_count;
-                            break;
-                        }
-                    }
                     echo "<td style='background-color:#CECECE;'>$all_count</td>";
+
+                    // 新梯工收
                     $all_count = 0;
-                    foreach ($Adata3 as $row) {
+                    $all_count = getEnding("A", "", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
-                            $all_count = $row['all_count'];
-                            $b_count += $all_count;
-                            break;
-                        }
-                    }
                     echo "<td style='background-color:#DEDEDE;'>$all_count</td>";
+
+                    // 新梯試車完
                     $all_count = 0;
-                    foreach ($Adata2 as $row) {
+                    $all_count = getInstalling("A", "", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
+                    echo "<td style='background-color:#EEEEEE;'>$all_count</td>";
-                            $all_count = $row['all_count'];
+
-                            $c_count += $all_count;
+                    // 新梯在裝中
-                            break;
+                    $all_count = 0;
-                        }
+                    $all_count = getInstalling2("A", "", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                    }
+                    echo "<td style='background-color:#FFFFFF;'>$all_count</td>";
-                    echo "<td>$all_count</td>";
                 }
             ?>
             <?php
             }
-            echo "<td style='background-color:#FF8040;'>$a_count</td>";
+            // echo "<td style='background-color:#FF8040;'>$a_count</td>";
-            echo "<td style='background-color:#FFAF60;'>$b_count</td>";
+            // echo "<td style='background-color:#FFAF60;'>$b_count</td>";
-            echo "<td style='background-color:#9D9D9D;'>$c_count</td>";
+            // echo "<td style='background-color:#9D9D9D;'>$c_count</td>";
             ?>
         </tr>
         <tr>
@@ -523,40 +331,33 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) {
                 }
 
                 for ($start_month; $start_month <= $end_month; $start_month++) {
+
+                    // M1出貨
                     $all_count = 0;
-                    foreach ($M1data as $row) {
+                    $all_count = getShipping("B", "M1", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
-                            $all_count = $row['all_count'];
-                            $a_count += $all_count;
-                            break;
-                        }
-                    }
                     echo "<td style='background-color:#CECECE;'>$all_count</td>";
+
+                    // M1工收
                     $all_count = 0;
-                    foreach ($M1data3 as $row) {
+                    $all_count = getEnding("B", "M1", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
-                            $all_count = $row['all_count'];
-                            $b_count += $all_count;
-                            break;
-                        }
-                    }
                     echo "<td style='background-color:#DEDEDE;'>$all_count</td>";
+
+                    // M1試車完
                     $all_count = 0;
-                    foreach ($M1data2 as $row) {
+                    $all_count = getInstalling("B", "M1", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
+                    echo "<td style='background-color:#EEEEEE;'>$all_count</td>";
-                            $all_count = $row['all_count'];
+
-                            $c_count += $all_count;
+                    // M1在裝中
-                            break;
+                    $all_count = 0;
-                        }
+                    $all_count = getInstalling2("B", "M1", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                    }
+                    echo "<td style='background-color:#FFFFFF;'>$all_count</td>";
-                    echo "<td>$all_count</td>";
                 }
             ?>
             <?php
             }
-            echo "<td style='background-color:#FF8040;'>$a_count</td>";
+            // echo "<td style='background-color:#FF8040;'>$a_count</td>";
-            echo "<td style='background-color:#FFAF60;'>$b_count</td>";
+            // echo "<td style='background-color:#FFAF60;'>$b_count</td>";
-            echo "<td style='background-color:#9D9D9D;'>$c_count</td>";
+            // echo "<td style='background-color:#9D9D9D;'>$c_count</td>";
             ?>
         </tr>
         <tr>
@@ -581,40 +382,33 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) {
                 }
 
                 for ($start_month; $start_month <= $end_month; $start_month++) {
+
+                    // MA出貨
                     $all_count = 0;
-                    foreach ($Madata as $row) {
+                    $all_count = getShipping("B", "MA", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
-                            $all_count = $row['all_count'];
-                            $a_count += $all_count;
-                            break;
-                        }
-                    }
                     echo "<td style='background-color:#CECECE;'>$all_count</td>";
+
+                    // MA工收
                     $all_count = 0;
-                    foreach ($Madata3 as $row) {
+                    $all_count = getEnding("B", "MA", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
-                            $all_count = $row['all_count'];
-                            $b_count += $all_count;
-                            break;
-                        }
-                    }
                     echo "<td style='background-color:#DEDEDE;'>$all_count</td>";
+
+                    // MA試車完
                     $all_count = 0;
-                    foreach ($Madata2 as $row) {
+                    $all_count = getInstalling("B", "MA", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
+                    echo "<td style='background-color:#EEEEEE;'>$all_count</td>";
-                            $all_count = $row['all_count'];
+
-                            $c_count += $all_count;
+                    // MA在裝中
-                            break;
+                    $all_count = 0;
-                        }
+                    $all_count = getInstalling2("B", "MA", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                    }
+                    echo "<td style='background-color:#FFFFFF;'>$all_count</td>";
-                    echo "<td>$all_count</td>";
                 }
             ?>
             <?php
             }
-            echo "<td style='background-color:#FF8040;'>$a_count</td>";
+            // echo "<td style='background-color:#FF8040;'>$a_count</td>";
-            echo "<td style='background-color:#FFAF60;'>$b_count</td>";
+            // echo "<td style='background-color:#FFAF60;'>$b_count</td>";
-            echo "<td style='background-color:#9D9D9D;'>$c_count</td>";
+            // echo "<td style='background-color:#9D9D9D;'>$c_count</td>";
             ?>
         </tr>
         <tr>
@@ -639,40 +433,33 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) {
                 }
 
                 for ($start_month; $start_month <= $end_month; $start_month++) {
+
+                    // 出貨
                     $all_count = 0;
-                    foreach ($data as $row) {
+                    $all_count = getShipping("", "", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
-                            $all_count = $row['all_count'];
-                            $a_count += $all_count;
-                            break;
-                        }
-                    }
                     echo "<td style='background-color:#CECECE;'>$all_count</td>";
+
+                    // 工收
                     $all_count = 0;
-                    foreach ($data3 as $row) {
+                    $all_count = getEnding("", "", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
-                            $all_count = $row['all_count'];
-                            $b_count += $all_count;
-                            break;
-                        }
-                    }
                     echo "<td style='background-color:#DEDEDE;'>$all_count</td>";
+
+                    // 試車完
                     $all_count = 0;
-                    foreach ($data2 as $row) {
+                    $all_count = getInstalling("", "", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                        if ($radsYi == $row['year'] && $start_month == $row['month']) {
+                    echo "<td style='background-color:#EEEEEE;'>$all_count</td>";
-                            $all_count = $row['all_count'];
+
-                            $c_count += $all_count;
+                    // 在裝中
-                            break;
+                    $all_count = 0;
-                        }
+                    $all_count = getInstalling2("", "", $radsY, $radsM, $radsYi, str_pad($start_month, 2, "0", STR_PAD_LEFT));
-                    }
+                    echo "<td style='background-color:#FFFFFF;'>$all_count</td>";
-                    echo "<td>$all_count</td>";
                 }
             ?>
             <?php
             }
-            echo "<td style='background-color:#FF8040;'>$a_count</td>";
+            // echo "<td style='background-color:#FF8040;'>$a_count</td>";
-            echo "<td style='background-color:#FFAF60;'>$b_count</td>";
+            // echo "<td style='background-color:#FFAF60;'>$b_count</td>";
-            echo "<td style='background-color:#9D9D9D;'>$c_count</td>";
+            // echo "<td style='background-color:#9D9D9D;'>$c_count</td>";
             ?>
         </tr>
     </tbody>

wms/wipwholeinstall-index-function.php

@@ -92,7 +92,7 @@ function getEditFlag($department_id, $role_id, $user_id)
         return 4;
     // 設計
     if ($department_id == "911")
-        return 2;
+        return 4;
     // 宜蘭工務
     if ($user_id == 'M0087')
         return  4;
@@ -1057,9 +1057,9 @@ function warningMessage($data)
     $waringMessageArr = array(
         '1' => '',
         '2' => '沒有預計出貨日(到工地)',
-        '3' => '有實際完工工日，實際開工日未填寫',
+        '3' => '有實際完工日，實際開工日未填寫',
-        '4' => '有實際完工工日，未填寫QC日',
+        '4' => '有實際完工日，未填寫QC日',
-        '5' => '有實際完工工日，移交日未填寫',
+        '5' => '有實際完工日，移交日未填寫',
         '6' => '官檢日未填寫',
         '7' => '官檢日不在移交日的60天內',
         '8' => '移交日不是實際完工日+14天',
@@ -1115,12 +1115,12 @@ function getWarningMessageStatus($data)
         if (empty($tryrun_start_date))
             return "3";
     }
-    // 有實際完工工日，要有QC日
+    // 有實際完工日，要有QC日
     if (!empty($install_end_date) || !empty($tryrun_end_date)) {
         if (empty($qc_date) && empty($end_qc_date))
             return "4";
     }
-    // 有實際完工工日，移交日未填寫
+    // 有實際完工日，移交日未填寫
     if (!empty($install_end_date) || !empty($tryrun_end_date)) {
         if (empty($delivery_date)) {
             return "5";
@@ -1139,7 +1139,7 @@ function getWarningMessageStatus($data)
     //         return "7";
     // }
 
-    // 有實際完工工日，移交日若不是實際完工日+14天
+    // 有實際完工日，移交日若不是實際完工日+14天
     // if (!empty($install_end_date) || !empty($tryrun_end_date)) {
     //     $date = floor((strtotime($install_end_date) - strtotime($delivery_date)) / 86400);
     //     if ($date <= 0 || $date > 14)

wms/wipwholeinstall-renovate-index-function.php

@@ -92,7 +92,7 @@ function getEditFlag($department_id, $role_id, $user_id)
         return 4;
     // 設計
     if ($department_id == "911")
-        return 2;
+        return 4;
     // 品証
     if ($department_id == "912")
         return 4;
@@ -1079,9 +1079,9 @@ function warningMessage($data)
     $waringMessageArr = array(
         '1' => '',
         '2' => '沒有預計出貨日(到工地)',
-        '3' => '有實際完工工日，實際開工日未填寫',
+        '3' => '有實際完工日，實際開工日未填寫',
-        '4' => '有實際完工工日，未填寫QC日',
+        '4' => '有實際完工日，未填寫QC日',
-        '5' => '有實際完工工日，移交日未填寫',
+        '5' => '有實際完工日，移交日未填寫',
         '6' => '官檢日未填寫',
         '7' => '官檢日不在移交日的60天內',
         '8' => '移交日不是實際完工日+14天',
@@ -1137,12 +1137,12 @@ function getWarningMessageStatus($data)
         if (empty($tryrun_start_date))
             return "3";
     }
-    // 有實際完工工日，要有QC日
+    // 有實際完工日，要有QC日
     if (!empty($install_end_date) || !empty($tryrun_end_date)) {
         if (empty($qc_date) && empty($end_qc_date))
             return "4";
     }
-    // 有實際完工工日，移交日未填寫
+    // 有實際完工日，移交日未填寫
     if (!empty($install_end_date) || !empty($tryrun_end_date)) {
         if (empty($delivery_date)) {
             return "5";
@@ -1161,7 +1161,7 @@ function getWarningMessageStatus($data)
     //         return "7";
     // }
 
-    // 有實際完工工日，移交日若不是實際完工日+14天
+    // 有實際完工日，移交日若不是實際完工日+14天
     // if (!empty($install_end_date) || !empty($tryrun_end_date)) {
     //     $date = floor((strtotime($install_end_date) - strtotime($delivery_date)) / 86400);
     //     if ($date <= 0 || $date > 14)