Commit Graph

Select branches

Hide Pull Requests

gary

main

Mono Color

• 3581830afc test Cheng 2023-12-04 15:19:36 +0800
• c754accfe9 test izumi.wang 2023-12-04 15:04:43 +0800
• e5a9c0a9ae Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs Cheng 2023-12-06 08:51:44 +0800
• e7c1311974 應收帳款(新梯)系統index跟check Ellin 2023-12-05 18:51:09 +0800
• 46f481c435 合約書申請 10994015 2023-12-05 18:00:11 +0800
• d0d05e4193 Merge branch 'main' into gary gary_chen\gary_chen 2023-12-05 11:17:26 +0800
• b7f073bfbf 暫時commit gary_chen\gary_chen 2023-12-05 11:16:58 +0800
• 181cd32253 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs Cheng 2023-12-05 09:01:15 +0800
• 97b31d4a13 remove wms.zip 10994015 2023-12-05 08:35:52 +0800
• 24ed7c286a 1204 10994015 2023-12-04 18:13:42 +0800
• d009c1bfb7 T8連線改env;請購單 Ellin 2023-12-04 18:06:45 +0800
• 1e6352f45c 231204.cheng Cheng 2023-12-04 17:26:49 +0800
• b4e44ac1bd test Cheng 2023-12-04 15:19:36 +0800
• 321a00eacb test izumi.wang 2023-12-04 15:04:43 +0800
• f826534542 init izumi.wang 2023-12-04 15:00:10 +0800
• 5f66622cff Merge branch 'main' into gary gary_chen\gary_chen 2023-12-04 00:35:21 +0800
• ec672accd1 代簽新增大日程的合約號及作番號 公告新增 modal 顯示 funglobal 登入失敗從 alert 改成 php exit header 新增藍凌過來的 token 解析 t8 ip 連線改成內網連線 大日程根據會議議程更改計畫圖流程(新增經理階段) 大日程單獨開通林慧姍的調整日期權限 gary_chen\gary_chen 2023-12-04 00:33:55 +0800
• 3e3a03fe11 修復 價審 業務部mi bug 10994015 2023-12-01 17:42:40 +0800
• fd905c7604 Merge branch 'yan' of http://10.10.1.6:3080/masada-admin/httpdocs into yan 10994015 2023-12-01 17:40:29 +0800
• fa3fb17bb7 修復價審業務mi Bug 10994015 2023-12-01 17:40:17 +0800
• bbea0b7871 Merge branch 'kaiyu' Ellin 2023-11-30 19:07:56 +0800
• 8f0ab0aaa2 應收帳款修改 Ellin 2023-11-30 19:07:31 +0800
• 8821a1dc66 合約簽核 10994015 2023-11-30 17:54:25 +0800
• 6da62c29e6 衝突解決 10994015 2023-11-30 14:19:34 +0800
• 53dfdc5ec9 新梯價審簽核加上同意(上呈)、同意(結案) 10994015 2023-11-30 13:50:54 +0800
• cb9f8853b1 Merge branch 'kaiyu' Ellin 2023-11-29 17:56:42 +0800
• 9400da8ae0 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs Ellin 2023-11-29 17:56:35 +0800
• ef4a618347 增加查詢採購單跟新增外購組裝單 Ellin 2023-11-29 17:56:03 +0800
• 9b45b4db29 option final 10994015 2023-11-29 17:21:52 +0800
• 26f850a529 合併衝突 10994015 2023-11-29 17:18:55 +0800
• 215a43477a 合併衝突 10994015 2023-11-29 17:17:52 +0800
• 9cf3bfa102 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs 10994015 2023-11-29 17:12:52 +0800
• 56b8a9fce7 option 更新完成 10994015 2023-11-29 17:11:46 +0800
• 074a4bb4e5 更新option 10994015 2023-11-28 17:23:33 +0800
• 23ec9ed89d Merge branch 'main' into gary gary_chen\gary_chen 2023-11-28 09:44:19 +0800
• 54c4ce2cd9 1.選單新增部門可以批次可讀可寫 2.修正大日程倉管的edit標籤 3.系統改為網址有帶入 token 即可自動登入系統 4.新增在裝中統計表 gary_chen\gary_chen 2023-11-28 09:43:52 +0800
• b512dfc121 Merge branch 'kaiyu' Ellin 2023-11-27 18:13:17 +0800
• 7c02e7768f 測試發貨單API Ellin 2023-11-27 18:12:42 +0800
• 2ccb0f743f 合約書申請 暫存成功 10994015 2023-11-24 17:40:10 +0800
• d2abcf120e 開放李盈瑩瀏覽權限 jrbin 2023-11-24 16:09:27 +0800
• 5874e1f953 新增 寄新人手冊的功能 gary_chen\gary_chen 2023-11-24 15:50:19 +0800
• 1221f77c72 1.統編改非必填 2.修改瀏覽權限 jrbin 2023-11-24 15:18:25 +0800
• 924ae65e53 未存檔 10994015 2023-11-24 13:19:29 +0800
• 1d73940bd4 1122 10994015 2023-11-22 17:35:06 +0800
• 8ddf203407 1122 10994015 2023-11-22 14:10:40 +0800
• 9e5facb198 新梯合約申請 1121 10994015 2023-11-21 17:38:37 +0800
• 7588bf6b75 新梯合約申請1117 10994015 2023-11-17 17:55:13 +0800
• ace03b7038 合約書申請 新梯 1116 10994015 2023-11-16 18:05:41 +0800
• 0e039c6ddb Merge branch 'kaiyu' Ellin 2023-11-23 18:12:31 +0800
• 8f80993f79 修改發票日期判斷與依據幣別作整數或取小數點後兩位 Ellin 2023-11-23 18:11:57 +0800
• aa7a680e15 加上option項目狀態判斷 jrbin 2023-11-23 13:39:59 +0800
• 9dc6ea1345 option刪除 修正 jrbin 2023-11-23 11:50:11 +0800
• c49500f906 汰改簽核bug fix jrbin 2023-11-23 09:55:49 +0800
• 038bde23ae Merge branch 'main' into gary gary_chen\gary_chen 2023-11-23 09:27:05 +0800
• 0ee85f4411 不良單新增 sr sq 種類 gary_chen\gary_chen 2023-11-23 09:26:51 +0800
• 04972d8014 Merge branch 'kaiyu' Ellin 2023-11-22 19:31:31 +0800
• 3da5761322 費用報銷單創建人傳入T8 Ellin 2023-11-22 19:31:01 +0800
• e4c9c41a26 新增通知用的 class gary_chen\gary_chen 2023-11-22 19:15:01 +0800
• fe95d9b2ef 品質不良單新增權限判斷 gary_chen\gary_chen 2023-11-22 19:03:00 +0800
• e42c7eb2c8 Merge branch 'main' into gary gary_chen\gary_chen 2023-11-22 16:16:28 +0800
• f96b4fa198 1.品質不良單 2.修正 mkt/database.php 的 .env 路徑 gary_chen\gary_chen 2023-11-22 16:16:06 +0800
• 4341362d28 修正作番大日程倉管權限 gary_chen\gary_chen 2023-11-22 16:12:47 +0800
• a13010fe18 特殊費用欄位順序更改 10994015 2023-11-22 15:07:09 +0800
• a5f15b7354 1.把特殊費用納進成本 2.「加價」先隱藏，不納入成本 jrbin 2023-11-22 14:09:07 +0800
• f825801945 Merge branch 'kaiyu' Ellin 2023-11-21 17:56:26 +0800
• 59379de7a7 修改費用報銷單BUG(增加財會人員審核階段新增刪除權限) Ellin 2023-11-21 17:56:01 +0800
• 0b7ddd7828 新梯合約申請 1121 10994015 2023-11-21 17:38:37 +0800
• 6d143e2827 Merge branch 'main' into gary gary_chen\gary_chen 2023-11-21 13:40:45 +0800
• 719a39a2e3 修正計劃圖檔案上傳問題 bug gary_chen\gary_chen 2023-11-21 13:40:30 +0800
• af0e179cbd remove test email jrbin 2023-11-20 21:27:59 +0800
• 083d7ce4e8 修改費用報銷單會計取T8費用項目的內容，應收帳款明細新增該階段應收金額 Ellin 2023-11-20 18:49:07 +0800
• d27e98d1f4 Merge branch 'main' into gary gary_chen\gary_chen 2023-11-20 10:18:46 +0800
• 6b9cfc3e97 工務助理發包合約上傳 bug 修正 gary_chen\gary_chen 2023-11-20 10:17:53 +0800
• 46c952dfd3 品質不良單功能 (泉勝) gary_chen\gary_chen 2023-11-20 10:17:10 +0800
• b9b9d6af62 通知已讀後要消失 gary_chen\gary_chen 2023-11-20 09:52:21 +0800
• c347bdce2a Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs Ellin 2023-11-17 18:53:08 +0800
• 499075276d 對帳增加客戶名稱 Ellin 2023-11-17 18:52:39 +0800
• 7c77b46b75 新梯合約申請1117 10994015 2023-11-17 17:55:13 +0800
• 58322e733c 價審bug fix jrbin 2023-11-17 17:44:19 +0800
• f863da5b68 對帳系統跟更新T8 API Ellin 2023-11-17 15:27:47 +0800
• fdbca9e9dd 系統 wms 及 app 新增維護模式 gary_chen\gary_chen 2023-11-17 09:37:23 +0800
• 7b37600f41 合約書申請 新梯 1116 10994015 2023-11-16 18:05:41 +0800
• 59d0453b1e Merge branch 'main' into kaiyu Ellin 2023-11-16 18:01:40 +0800
• 6542c15ec1 新增對帳系統 Ellin 2023-11-16 18:00:33 +0800
• 8b3e3a793d Merge branch 'main' into gary gary_chen\gary_chen 2023-11-16 17:31:08 +0800
• cca05cbc8a 大日程新增 外包合約上傳系統 完工驗收單上傳系統 gary_chen\gary_chen 2023-11-16 17:30:43 +0800
• 7dac3835de 修正退回後重送問題 jrbin 2023-11-16 14:47:41 +0800
• 5f34a6d945 判斷來源程式 jrbin 2023-11-16 11:25:33 +0800
• e380f5f410 1.excel-upload.php:增加電梯機型 2.契約價審檢查提交資料 jrbin 2023-11-16 11:19:56 +0800
• 96490286bb Merge branch 'main' into gary gary_chen\gary_chen 2023-11-16 10:08:58 +0800
• d19d28da4d 作番大日程新增"警示"欄位及篩選功能 gary_chen\gary_chen 2023-11-16 10:08:35 +0800
• 53ba49b599 測試對帳系統資料 Ellin 2023-11-15 18:12:51 +0800
• 9a0006516d Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs 10994015 2023-11-15 18:00:42 +0800
• af27759cef 新梯合約簽回1115 10994015 2023-11-15 17:59:55 +0800
• 6a8a53a029 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs 10994015 2023-11-14 17:46:54 +0800
• 246da5d796 新梯合約管理 10994015 2023-11-14 17:46:05 +0800
• 5f43d5cec5 Merge branch 'kaiyu' Ellin 2023-11-14 17:41:27 +0800
• 420a66459a 測試採購單API Ellin 2023-11-14 17:40:53 +0800
• 8e1053e106 Merge branch 'gary' of http://10.10.1.6:3080/masada-admin/httpdocs into gary gary_chen\gary_chen 2023-11-14 15:07:39 +0800
• 478a1d7070 大日程新增自動帶入預計發包日期功能 修正營業無法調整移交日bug 新增安裝大日程警示功能 gary_chen\gary_chen 2023-11-14 15:06:50 +0800