diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..9dc6b4df
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,48 @@
+{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Listen for Xdebug",
+ "type": "php",
+ "request": "launch",
+ "port": 9003
+ },
+ {
+ "name": "Launch currently open script",
+ "type": "php",
+ "request": "launch",
+ "program": "${file}",
+ "cwd": "${fileDirname}",
+ "port": 0,
+ "runtimeArgs": [
+ "-dxdebug.start_with_request=yes"
+ ],
+ "env": {
+ "XDEBUG_MODE": "debug,develop",
+ "XDEBUG_CONFIG": "client_port=${port}"
+ }
+ },
+ {
+ "name": "Launch Built-in web server",
+ "type": "php",
+ "request": "launch",
+ "runtimeArgs": [
+ "-dxdebug.mode=debug",
+ "-dxdebug.start_with_request=yes",
+ "-S",
+ "localhost:0"
+ ],
+ "program": "",
+ "cwd": "${workspaceRoot}",
+ "port": 9003,
+ "serverReadyAction": {
+ "pattern": "Development Server \\(http://localhost:([0-9]+)\\) started",
+ "uriFormat": "http://localhost:%s",
+ "action": "openExternally"
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/app-wipinstallation-log.php b/app/app-wipinstallation-log.php
index f1a2d1b7..c55f7f15 100644
--- a/app/app-wipinstallation-log.php
+++ b/app/app-wipinstallation-log.php
@@ -24,6 +24,150 @@ if ($user_id == 'A000000001') {
$sql = "SELECT * FROM wipinstallation where (facilityno = '$facilityno') order by id desc"; # sql語法存在變數中
} else {
$sql = "
+ SELECT
+ '0' AS id,
+ facilityno,
+ SUBSTR(real_contract_arrival_date,1,10) AS issue_time,
+ '分配安裝人員' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND real_contract_arrival_date != ''
+ AND real_contract_arrival_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '1' AS id,
+ facilityno,
+ SUBSTR(real_arrival_date,1,10) AS issue_time,
+ '已出貨' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND real_arrival_date != ''
+ AND real_arrival_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '2' AS id,
+ facilityno,
+ SUBSTR(estimate_install_start_date,1,10) AS issue_time,
+ '預計安裝日期' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND estimate_install_start_date != ''
+ AND estimate_install_start_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '3' AS id,
+ facilityno,
+ SUBSTR(install_start_date,1,10) AS issue_time,
+ '已開工' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND install_start_date != ''
+ AND install_start_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '4' AS id,
+ facilityno,
+ SUBSTR(estimate_tryrun_start_date,1,10) AS issue_time,
+ '預計試車日期' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND estimate_tryrun_start_date != ''
+ AND estimate_tryrun_start_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '5' AS id,
+ facilityno,
+ SUBSTR(tryrun_start_date,1,10) AS issue_time,
+ '開始試車' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND tryrun_start_date != ''
+ AND tryrun_start_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '6' AS id,
+ facilityno,
+ SUBSTR(end_qc_date,1,10) AS issue_time,
+ '完成QC' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND end_qc_date != ''
+ AND end_qc_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '7' AS id,
+ facilityno,
+ SUBSTR(official_check_date,1,10) AS issue_time,
+ '完成官檢' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND official_check_date != ''
+ AND official_check_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '8' AS id,
+ facilityno,
+ SUBSTR(delivery_date,1,10) AS issue_time,
+ '完成移交' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE (facilityno = '$facilityno')
+ AND delivery_date != ''
+ AND delivery_date IS NOT NULL
+
+
+ /*
SELECT
'0' AS id,
facilityno,
@@ -107,6 +251,8 @@ if ($user_id == 'A000000001') {
create_at
FROM wipwholestatus
WHERE (facilityno = '$facilityno')
+*/
+
ORDER BY id DESC
";
}
diff --git a/app/app-wipproduction-log.php b/app/app-wipproduction-log.php
index ead78b90..6f95a3d4 100644
--- a/app/app-wipproduction-log.php
+++ b/app/app-wipproduction-log.php
@@ -27,6 +27,101 @@ if ($user_id == 'A000000001') {
SELECT
'0' AS id,
facilityno,
+ '' AS issue_time,
+ '生產中' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE facilityno = '$facilityno'
+
+ UNION
+
+ SELECT
+ '1' AS id,
+ facilityno,
+ SUBSTR(estimated_shipping_date,1,10) AS issue_time,
+ '生產完成' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE facilityno = '$facilityno'
+ AND estimated_shipping_date != ''
+ AND estimated_shipping_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '2' AS id,
+ facilityno,
+ SUBSTR(estimated_shipping_schedule_date,1,10) AS issue_time,
+ '預計攬收' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE facilityno = '$facilityno'
+ AND estimated_shipping_schedule_date != ''
+ AND estimated_shipping_schedule_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '3' AS id,
+ facilityno,
+ SUBSTR(actual_tofactory_date,1,10) AS issue_time,
+ '攬收成功(桃園)' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE facilityno = '$facilityno'
+ AND actual_tofactory_date != ''
+ AND actual_tofactory_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '4' AS id,
+ facilityno,
+ SUBSTR(real_contract_arrival_date,1,10) AS issue_time,
+ '預計出貨日' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE facilityno = '$facilityno'
+ AND real_contract_arrival_date != ''
+ AND real_contract_arrival_date IS NOT NULL
+
+ UNION
+
+ SELECT
+ '5' AS id,
+ facilityno,
+ SUBSTR(real_arrival_date,1,10) AS issue_time,
+ '出貨' AS 'process',
+ 'bg-success' AS 'light_color',
+ '' AS memo,
+ creater,
+ create_at
+ FROM wipwholestatus
+ WHERE facilityno = '$facilityno'
+ AND real_arrival_date != ''
+ AND real_arrival_date IS NOT NULL
+
+
+/*
+ UNION
+ SELECT
+ '1' AS id,
+ facilityno,
SUBSTR(prattford_order_date,1,10) AS issue_time,
CASE prattford_order_date_verify
WHEN 0 THEN '生產完成'
@@ -47,7 +142,7 @@ if ($user_id == 'A000000001') {
WHERE (facilityno = '$facilityno')
UNION
SELECT
- '1' AS id,
+ '2' AS id,
facilityno,
SUBSTR(goods_type_date,1,10) AS issue_time,
CASE goods_type
@@ -71,7 +166,7 @@ if ($user_id == 'A000000001') {
WHERE (facilityno = '$facilityno')
UNION
SELECT
- '2' AS id,
+ '3' AS id,
facilityno,
SUBSTR(actual_tofactory_date,1,10) AS issue_time,
CASE arrival_date_verify
@@ -97,7 +192,7 @@ if ($user_id == 'A000000001') {
WHERE (facilityno = '$facilityno')
UNION
SELECT
- '3' AS id,
+ '4' AS id,
facilityno,
SUBSTR(real_arrival_date,1,10) AS issue_time,
IF(real_arrival_date IS NOT NULL || real_arrival_date != '','已出貨','未出貨') AS 'process',
@@ -107,6 +202,8 @@ if ($user_id == 'A000000001') {
create_at
FROM wipwholestatus
WHERE (facilityno = '$facilityno')
+*/
+
ORDER BY id DESC
";
}
diff --git a/phb/DB.php b/phb/DB.php
index a3af3704..70b44478 100644
--- a/phb/DB.php
+++ b/phb/DB.php
@@ -15,7 +15,7 @@ class DB
//私有的构造方法
function __construct($config = array())
{
- $this->host = isset($config['host']) ? $config['host'] : 'db-104.coowo.com';
+ $this->host = isset($config['host']) ? $config['host'] : 'localhost';
$this->port = isset($config['port']) ? $config['port'] : '3306';
$this->user = isset($config['user']) ? $config['user'] : 'masadaroot';
$this->pass = isset($config['pass']) ? $config['pass'] : 'x6h5E5p#u8y';
diff --git a/phb/map/tw.html b/phb/map/tw.html
index d029e751..e7991d8e 100644
--- a/phb/map/tw.html
+++ b/phb/map/tw.html
@@ -1,596 +1,637 @@
+
+
\ No newline at end of file
diff --git a/wms/account-receivable-received-create.php b/wms/account-receivable-received-create.php
new file mode 100644
index 00000000..31537102
--- /dev/null
+++ b/wms/account-receivable-received-create.php
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
= $BillData[4] ?>
+
新增收款資訊
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wms/account-receivable-received-edit.php b/wms/account-receivable-received-edit.php
new file mode 100644
index 00000000..e6100ea2
--- /dev/null
+++ b/wms/account-receivable-received-edit.php
@@ -0,0 +1,142 @@
+";
+// print_r($BillData);
+$sql_pay = "SELECT * from account_received where pay_id = '$pay_id'";
+$pay = mysqli_query($link, $sql_pay);
+$pay = mysqli_fetch_assoc($pay);
+
+?>
+
+
+
+
+
+
+
+
+
+
+
= $BillData[4] ?>
+
編輯收款資訊
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wms/account-receivable-received-submit.php b/wms/account-receivable-received-submit.php
new file mode 100644
index 00000000..b9b18f0f
--- /dev/null
+++ b/wms/account-receivable-received-submit.php
@@ -0,0 +1,96 @@
+
+
\ No newline at end of file
diff --git a/wms/account-receivable.xlsx b/wms/account-receivable.xlsx
new file mode 100644
index 00000000..8edcb4bd
Binary files /dev/null and b/wms/account-receivable.xlsx differ
diff --git a/wms/board-create.php b/wms/board-create.php
index e4bd345a..48f07efe 100644
--- a/wms/board-create.php
+++ b/wms/board-create.php
@@ -1,14 +1,13 @@
-Please fill up the required field!";
@@ -17,35 +16,65 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
}
}
*/
-?>
+ ?>
-