commit ceda8bea0aad2ae90c889c3ffdd5054bd0d1c273 (HEAD -> cheng) Author: Cheng Date: Fri Jan 19 09:29:14 2024 +0800 簽核BUG(修正) commit ee1dfafd156a8fdbccf640265aa8c2a0dd60e35c (origin/cheng) Merge: 72f73cea 5ca075f3 Author: Cheng Date: Fri Jan 19 08:28:11 2024 +0800 Merge branch 'cheng' of http://10.10.1.6:3080/masada-admin/httpdocs into cheng commit 72f73cea964067027f449470854fa3e13937c898 Author: Cheng Date: Fri Jan 19 08:24:48 2024 +0800 240119 commit e3e2bc642d799c81d2d4ccec086be855930ab1db Author: Cheng Date: Wed Jan 17 17:42:52 2024 +0800 契約價審 commit 6f8663cc171cc431595505006abadcc93ff78d73 Author: Cheng Date: Tue Jan 16 18:42:39 2024 +0800 契約價審 commit 7afe75396f35d7a28a896f98b72e75051b44db25 (origin/main, origin/HEAD, main) Merge: 8568a7ab 45d7cf42 Author: 10994015 Date: Wed Jan 17 17:46:52 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 8568a7ab8a2a8ec5d150b2a4bfbf088edf6b3ab7 Author: 10994015 Date: Wed Jan 17 17:46:43 2024 +0800 價審新梯MI、牌價、BUG 解決 0117 commit 45d7cf42d149b01a9b66ec656a5ad975c66f1768 Merge: c2385ba5 67f239d5 Author: Ellin Date: Tue Jan 16 17:28:29 2024 +0800 Merge branch 'kaiyu' commit 67f239d5cfbc17c2c22ff49f8186a7c68198b569 Author: Ellin Date: Tue Jan 16 17:28:04 2024 +0800 應收帳款系統(汰改)分類階段收款種類 commit c2385ba5489925d88452f45ec6e375f37861b574 Author: Cheng Date: Tue Jan 16 16:33:52 2024 +0800 電梯價格調整(1) commit 8f4e1e663ea622753185f6246de93a2ed211e5f7 Author: 10994015 Date: Tue Jan 16 16:30:41 2024 +0800 價審 mi = 設備+ option commit 0fa092ddc25a235de3ee33f841f048fdaff8431d Merge: 1a17c3d4 4858704d Author: 10994015 Date: Tue Jan 16 14:59:35 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 1a17c3d4e3fe05ffabf2e107191891a79ef85b2d Author: 10994015 Date: Tue Jan 16 14:56:16 2024 +0800 服務費+MI commit 4858704d5e07dac786195f4a0b29d98e7e37ea9c Merge: 4c0c1aa8 84802c0b Author: Cheng Date: Tue Jan 16 13:24:14 2024 +0800 Merge branch 'cheng' commit 84802c0beda8fde0cf1dffa6b831ce324c3182d6 Author: Cheng Date: Tue Jan 16 13:23:57 2024 +0800 MI+服務費 commit 4c0c1aa8aac948ea1cc5cd237c1971a6e4448ce8 Merge: 264347b2 72bf093d Author: Cheng Date: Tue Jan 16 08:46:59 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 264347b2ece628100363b645840f9777e9a0f262 Author: Cheng Date: Tue Jan 16 08:44:11 2024 +0800 MI check commit 04d0e55f980018152d3e5cfa8d730f5826732dd2 Author: Ellin Date: Mon Jan 15 17:45:44 2024 +0800 應收帳款(新梯)解bug commit a1fa0938ea1497e438f048a2cae77a02c8946fbf Author: Cheng Date: Mon Jan 15 18:06:50 2024 +0800 pricereview-check update commit 72bf093d1ceb315bb9455b88454bc078edf63859 (origin/kaiyu) Author: Ellin Date: Mon Jan 15 17:45:44 2024 +0800 應收帳款(新梯)解bug commit d6dd098b156f49f5967776c1cf9dafd33c35d02c Author: Cheng Date: Mon Jan 15 16:30:57 2024 +0800 option id debug commit b180f0a1812ffcfb7950f3eed0d164ec820be572 Author: Cheng Date: Fri Jan 12 17:39:04 2024 +0800 20240112 commit 5ca075f37b529ff3e58c472b903ec616fc016cb3 Author: Cheng Date: Mon Jan 15 16:30:57 2024 +0800 option id debug commit a9dbbbf02f43c88dddf5865cd94c9a34a1c9ea95 Author: 10994015 Date: Mon Jan 15 16:28:07 2024 +0800 加價=> 選配 commit 7c213a13b4d5bd4083bdf0bf483dcf6fca1dc159 Merge: e64dcd1a a9de179e Author: 10994015 Date: Mon Jan 15 16:27:10 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit e64dcd1aaf16fc77b99dc245e2061279cc71ef65 Author: 10994015 Date: Mon Jan 15 16:26:40 2024 +0800 1115 M0174價審 commit 62ce64fad6351cee0718895b6417461a1782468d Author: Cheng Date: Fri Jan 12 17:39:04 2024 +0800 20240112 commit a9de179e591e5f5aad34765f8212da50ec595a54 Merge: 36818799 abbc299b Author: Cheng Date: Thu Jan 11 17:53:43 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 36818799fcd4a1a21c2659fcd7b42e1e097be420 Author: Cheng Date: Thu Jan 11 17:53:13 2024 +0800 OPTION commit abbc299be043a3b652dbe4445f6dddd72e941bd5 Merge: ee8ce6ce 46b11bda Author: Ellin Date: Thu Jan 11 17:44:45 2024 +0800 應收帳款系統解決衝突 commit 46b11bda0354fce7f631e1fe9c3e8ee4b91c93a8 Author: Ellin Date: Thu Jan 11 17:30:20 2024 +0800 作番發票金額 commit 0f577d08e4e26ce23dccfba7f4d00ab63017872a Merge: c072ea4d ee8ce6ce Author: 10994015 Date: Thu Jan 11 14:10:56 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit c072ea4dd48d95e0f742b91f795a18c559ae160e Author: 10994015 Date: Thu Jan 11 14:10:53 2024 +0800 merge commit ee8ce6cec46e9e03e9c9eda8b6b029eda4a50c33 Merge: 76c868d1 db61e429 Author: Cheng Date: Thu Jan 11 14:07:29 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 76c868d1076821e27b79ffd881254ead20bacc9c Author: Cheng Date: Thu Jan 11 14:07:22 2024 +0800 20240111 commit db61e429afa5eabbf53c2fe6b41745ea4b24476b Merge: ade42c64 a03f0a11 Author: Ellin Date: Thu Jan 11 08:42:11 2024 +0800 Merge branch 'kaiyu' commit a03f0a11a17840e78a7680af116e5392039028a6 Author: Ellin Date: Thu Jan 11 08:41:53 2024 +0800 衝突 commit ade42c64f255e5b319c3bb9d9856e1f92fd3d82b Merge: 5e304d74 d600fa0a Author: Ellin Date: Thu Jan 11 08:39:04 2024 +0800 Merge branch 'kaiyu' commit d600fa0a57cf7489e9c21e8d1f392557edd13866 Author: Ellin Date: Wed Jan 10 18:58:43 2024 +0800 應收帳款系統(系統)增加T8單據日期、催收金額、已收金額與催收次數 commit 5e304d74e97429808b18b23462176931760f8f30 Author: Cheng Date: Wed Jan 10 13:32:32 2024 +0800 有望客戶資料須填寫齊全才能轉價審 commit 5c09b0de460115473e1099a722869f7ff260f50e Author: Cheng Date: Wed Jan 10 11:00:45 2024 +0800 修正 commit 5cd6023f3a5ab5f440c2e47aa78a0a49c3637b56 Author: Cheng Date: Wed Jan 10 10:58:51 2024 +0800 轉價審判斷客戶資料是否齊全 commit 13d66e606c1538e24f5284eb2b1650ff8e5297ac Author: Cheng Date: Wed Jan 10 09:53:34 2024 +0800 額外項目匹配電梯 commit 84ba97294890a260f9747109eb78071b740da578 Merge: a2df7a4f d56cee43 Author: Cheng Date: Wed Jan 10 08:50:30 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit d56cee43d3fc5e711d315ed035c885d1416b7f6c Merge: cf6c136a 88cfa3d3 Author: Ellin Date: Tue Jan 9 18:22:51 2024 +0800 Merge branch 'kaiyu' commit 88cfa3d385359a67be36b5751e44a6657ca41407 Author: Ellin Date: Tue Jan 9 18:22:31 2024 +0800 新梯統整 commit a2df7a4f618dcb427758ef3f534852c6e37951a0 Author: Cheng Date: Tue Jan 9 18:07:41 2024 +0800 除外費用 commit cf6c136a630ab035c5f686a0b3f4e116608d4131 Merge: a7aaf948 5083ca93 Author: 10994015 Date: Tue Jan 9 18:06:23 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit a7aaf948958dba5cb8ae1edfe360200bfc48107c Author: 10994015 Date: Tue Jan 9 18:05:54 2024 +0800 更改option 0109 commit 5083ca938eafd479b8c4d5cee2cf07b3847281e1 Author: Cheng Date: Tue Jan 9 15:54:32 2024 +0800 解決衝突 commit 7d9db7289417c5b01dfa685412751ae321a39d0b Merge: 7275655c 56e7e01a Author: Cheng Date: Tue Jan 9 15:33:16 2024 +0800 Merge branch 'cheng' commit 56e7e01afbbb21147f8e152f7a2a202d0241f867 Author: Cheng Date: Tue Jan 9 15:32:39 2024 +0800 修正 commit 7275655cacaee652a4bf5ab84d75d0fbd22047ed Merge: 2840d81d b820452c Author: Cheng Date: Tue Jan 9 15:25:07 2024 +0800 合併衝突 commit 2840d81dd23a77c405c65695854bf4873f73d9c6 Merge: ae9c51c8 f5af8df1 Author: Cheng Date: Tue Jan 9 14:52:51 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit b820452c06f537b7bcac312ef64c0c240e0d7d17 Author: Cheng Date: Tue Jan 9 14:51:01 2024 +0800 簽核流程更新 commit f5af8df1cd7985eacaa32a61917aadea61783b3f Merge: db32b217 c22e9185 Author: 10994015 Date: Tue Jan 9 14:50:09 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit db32b217f3f354666e0f93fa087b970df7eec207 Author: 10994015 Date: Tue Jan 9 14:50:02 2024 +0800 修正價審mi commit c22e9185470cc1b57694858e6348519bb3531a65 (origin/gary) Author: gary_chen\gary_chen Date: Tue Jan 9 14:36:03 2024 +0800 蘇孝倫: 江協理好：麻煩請開各區工事經理能輸入＂移交日＂的權限，麻煩新增輸入儲存後有MAIL通知營業人員！ commit bf264625ee33faac8579c745f3153517f978beb7 Merge: 665009aa 726cf73f Author: gary_chen\gary_chen Date: Tue Jan 9 10:16:30 2024 +0800 Merge branch 'main' into gary commit 665009aae8bf991a891b3ebb252b76683328f4d0 Author: gary_chen\gary_chen Date: Tue Jan 9 10:16:08 2024 +0800 修正版本 commit f3ef413e43a26a535f813431bcd5640727d3e45a Author: 10994015 Date: Tue Jan 9 08:45:22 2024 +0800 更改M0175審核權限與M0107相同 commit 0ed07f3d289f350221a61f439f0d64970305d713 Author: gary_chen\gary_chen Date: Tue Jan 9 08:43:11 2024 +0800 新增公告時 推播通知給公司所有人 commit 69cbb7ecaa948c4e66f0b6ed71f86b6002eaadc0 Author: Cheng Date: Tue Jan 9 08:41:28 2024 +0800 合約入T8(完成) commit ca072875178f875c91c59f54b6ede3f4042898d3 Author: Ellin Date: Fri Jan 5 19:57:53 2024 +0800 應收帳款(新梯)增加合約各款項未開發票金額、已開發票金額、未收金額、催收金額 commit 3d2a4b590ca421c0919b9a31bbe9f20801b07b5a Author: 10994015 Date: Thu Jan 4 17:34:43 2024 +0800 價審option 新增分類、搜尋 commit c9f94a4301752d82cb4b716cee0f7438fe49bfe1 Author: 10994015 Date: Thu Jan 4 11:11:39 2024 +0800 選取option 增加分類、搜尋 commit 17dab7f60d3a5f4ed170ce1bedb81d8eabefb4fc Author: 10994015 Date: Wed Jan 3 13:15:50 2024 +0800 rollback commit aefb5de1e1d6de9d96c812d74c863c59a8e3543b Author: Ellin Date: Thu Jan 4 20:27:02 2024 +0800 新增拉每個作番的金額 commit ae9c51c87477f089869eb7045ad6f20d22f9f5e1 Merge: 15ab88ca 726cf73f Author: Cheng Date: Tue Jan 9 08:41:46 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 726cf73f6b71726e2a9449761a94b984bc30adb5 Merge: 3c67fe91 7a46348d Author: Ellin Date: Mon Jan 8 18:13:50 2024 +0800 Merge branch 'kaiyu' commit 7a46348dae88432e36f1408d9042f2375bbbd091 Author: Ellin Date: Mon Jan 8 18:12:59 2024 +0800 rib02-check的feetype改抓T8 ; 應收帳款系統(新梯)增加設備與安裝金額、增加平均金額於前端畫面 commit 3c67fe91296615df8995c3384f320947c525a82f Author: 10994015 Date: Mon Jan 8 18:07:42 2024 +0800 汰改審核區處長改為陳家文經理 commit 52bf43c3e698a437498ea6ca3528597d2d2ddffd Merge: 8b185324 a3f38e6d Author: 10994015 Date: Mon Jan 8 17:53:02 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 8b185324fa81f73c35b660853f1eca0bb77641fc Author: 10994015 Date: Mon Jan 8 17:52:51 2024 +0800 option更新 commit 15ab88cae77704c6c50f3eb0a61da71d1da407b9 Merge: 73a8b906 a3f38e6d Author: Cheng Date: Mon Jan 8 08:34:16 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit a3f38e6d94e510432943d41238e1ea8b5026955b Author: Ellin Date: Fri Jan 5 19:57:53 2024 +0800 應收帳款(新梯)增加合約各款項未開發票金額、已開發票金額、未收金額、催收金額 commit 73a8b906d0618d4a60da3b339a99856556130a43 Author: Cheng Date: Fri Jan 5 17:53:17 2024 +0800 API合約保養 commit aa2b339ae46ae52822a47787dbcacd8d9c97cb76 Merge: 629f228d 4d43d552 Author: gary_chen\gary_chen Date: Fri Jan 5 15:53:37 2024 +0800 Merge branch 'main' into gary # Conflicts: # wms/schedule-index.php commit 629f228d9763d2a3d7dc20bd590b93b336dbd3ce Author: gary_chen\gary_chen Date: Fri Jan 5 15:52:23 2024 +0800 通知功能修改 commit 4d43d55201726cbca202a5ffc6996695ba080ea2 Merge: 459a0140 1046a5d7 Author: Ellin Date: Thu Jan 4 20:27:22 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 459a014003e87e08d4716585ac860d697297e36e Author: Ellin Date: Thu Jan 4 20:27:02 2024 +0800 新增拉每個作番的金額 commit 18aca7810f9164c3c2f373b637ee891e57d92caf Author: Cheng Date: Thu Jan 4 17:43:35 2024 +0800 T8API commit 1046a5d7916b021a896c121ae7a21e0b77f8560c Author: 10994015 Date: Thu Jan 4 17:34:43 2024 +0800 價審option 新增分類、搜尋 commit 099e2efcdc7e0843b8187a51586a10f504add34e Merge: a67a2093 ae3338f7 Author: 10994015 Date: Thu Jan 4 11:14:11 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit ae3338f7549132fe8fa5b4303885c3677d4531f9 Author: Cheng Date: Thu Jan 4 11:11:49 2024 +0800 T8api commit a67a20930f712d66510f0826190f47b1ba5ed3bb Author: 10994015 Date: Thu Jan 4 11:11:39 2024 +0800 選取option 增加分類、搜尋 commit a4627cd9f7b8b86f750eb1a1ff54868bbd484a66 Author: Cheng Date: Wed Jan 3 17:48:09 2024 +0800 保養合約 commit 2c46dd0e938745ccfef8275e4be52e93369ad036 Merge: 806f5e87 144d41b4 Author: Ellin Date: Wed Jan 3 18:10:17 2024 +0800 Merge branch 'kaiyu' commit 144d41b4dfcbb3a7f021a6a921741fdbed0d3346 Author: Ellin Date: Wed Jan 3 18:09:50 2024 +0800 增加account-receivable-index-ing.php commit 839f08e140da1dd63a115eb42d7dad32d8510474 Author: 10994015 Date: Wed Jan 3 13:15:50 2024 +0800 rollback commit 806f5e87db5d549113a4c48b44e6494f1d106dbf Author: Cheng Date: Wed Jan 3 11:48:48 2024 +0800 新梯退回調整 commit d931e568b072015baab84c941f09d5da931f31ee Merge: 44b04b4f f02ec613 Author: Cheng Date: Wed Jan 3 11:18:36 2024 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 44b04b4fa7f3e0707dc691ad00f8584728597ac1 Author: Cheng Date: Wed Jan 3 11:17:08 2024 +0800 '合約入立(修理)進T8' commit f02ec6134de7d8cd17a8bcd78b6b27fd1899cfe9 Merge: 56218c35 3b50ce1d Author: 10994015 Date: Wed Jan 3 11:15:36 2024 +0800 merge conflict commit 56218c35d20b91336319971a796f1b0db80c7502 Author: 10994015 Date: Wed Jan 3 11:11:40 2024 +0800 價審新梯、api修正0103 commit 3b50ce1d4ae2fd4fbbf1d514bb1ca62a660cecd5 Merge: a81f3f8a 75854227 Author: Ellin Date: Tue Jan 2 18:02:45 2024 +0800 Merge branch 'kaiyu' commit 75854227fc3a2e87bcb50f1b55d86f042c812e72 Author: Ellin Date: Tue Jan 2 18:01:44 2024 +0800 查詢重複報銷發票; rib02設定不可以重複報銷 commit 86a21b9a4062a054b95394efef0b1cb6e3f3c523 Author: Cheng Date: Fri Dec 29 17:32:07 2023 +0800 價審合約 commit a81f3f8a9c34d55ffc5d702c031a913d50f645d2 Author: Cheng Date: Fri Dec 29 09:00:26 2023 +0800 代簽修正 commit a8b0ee243e45fba2bdd1182ac5ab8f74438cb90f Merge: 4fb67d25 e46b34d6 Author: Cheng Date: Fri Dec 29 08:40:10 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 4fb67d254da4b9e606a8a30029196354d4ccb6ab Author: Cheng Date: Thu Dec 28 17:51:35 2023 +0800 更新電梯標準價查詢 commit e46b34d64b513566283c56f2cee9b8d1d300a85a Merge: 601934ed 8b49e556 Author: Ellin Date: Thu Dec 28 17:46:11 2023 +0800 Merge branch 'kaiyu' commit 8b49e556ed2d0020ca962cfe15fc32db6c814a9e Author: Ellin Date: Thu Dec 28 17:45:50 2023 +0800 修改費用報銷單發票號碼改為空的錯誤問題; 應收帳款(新梯)依照作番產生金額excel已完成，尚未將寶佳的資料分開 commit 601934ed62bb85d427823f9fffcea367ce00af37 Author: Cheng Date: Thu Dec 28 11:59:01 2023 +0800 新梯價審付款辦法修改 commit 9df2804299105784fe3f930fb06676b50f328782 Author: Cheng Date: Thu Dec 28 10:52:25 2023 +0800 T8 寫入客戶資料 commit 3b101388988dc67fabd66327118018207e3e1ae6 Author: Cheng Date: Wed Dec 27 17:52:13 2023 +0800 maintance insert into T8 commit 92e9f241b75cd426f2fe5e5dbd09fbbe228bad73 Author: Cheng Date: Tue Dec 26 17:53:39 2023 +0800 合約簽回寫入t8 commit 916908b6ccd8d10696e458d8785fe1e7657681b4 Merge: 2fb91af1 00c4a5eb Author: 10994015 Date: Thu Dec 28 10:42:03 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 2fb91af1616bce545fdd6a3cd19665eb72febaef Author: 10994015 Date: Thu Dec 28 09:27:20 2023 +0800 新梯價審option修正1227 commit 78b7ddfd4b2c5a90d0636dae4baf665b73a79971 Author: 10994015 Date: Thu Dec 28 09:26:43 2023 +0800 新梯價審option修正1227 commit 00c4a5eb6bd59f1986b8d35007ea0e9c734fb1c6 Merge: 1af4168c f7d77b2b Author: Ellin Date: Wed Dec 27 18:47:14 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 1af4168cee2bccabc956cfdf97e0f4ff8159f6b5 Author: Ellin Date: Wed Dec 27 18:46:55 2023 +0800 增加作番個別資訊(應收日期與次數)在account-receivable-index-ing.php commit f7d77b2b783986369647c369c4faeb0f5de19c81 Author: gary_chen\gary_chen Date: Tue Dec 26 15:52:48 2023 +0800 fix_bug commit ed20a74e468a5dc5d21b83a7a353a6fdef38a003 Merge: d79deb0e 62302cd4 Author: gary_chen\gary_chen Date: Tue Dec 26 09:38:49 2023 +0800 Merge branch 'main' into gary # Conflicts: # wms/estimated_shipping_date_report.php # wms/wipwhole-change-contractdate-submit.php # wms/wipwhole-index-function.php # wms/wipwhole-rec-invoice.php # wms/wipwhole-renovate-rec-invoice-edit-submit.php # wms/wipwhole-renovate-rec-invoice-edit.php # wms/wipwhole-renovate-rec-invoice.php # wms/wipwholeinstall-index-function.php # wms/wipwholeinstall-renovate-index-function.php commit d79deb0e19e898d77fd18b555089f1dca9f28f57 Author: gary_chen\gary_chen Date: Tue Dec 26 09:30:38 2023 +0800 1.作番大日程地址新增下縣市拉選擇器 2.大日程index提醒字更正 3.大日程新增trigger更改create_at 為 date("Y-m-d H:i:s") 4.大日程流程 wws04 計劃圖申請單停用 5.新增密碼產生器 6.新增接收bpm rest 範例 commit 432c530fe41ce219ff5f7356670846ca022fd736 Author: 10994015 Date: Mon Dec 25 18:10:08 2023 +0800 合約書申請 1225 聖誕節快樂 commit 62302cd4c1ac18c13c957af6cd02333e3614f66f Author: Ellin Date: Mon Dec 25 18:03:02 2023 +0800 excel根據是否為寶佳與全部分別匯出; 調整合約詳細資料 commit 61d905e4707ac74fe1684c34bf2833ccd10968e1 Merge: 6b11b846 9da56cd5 Author: Cheng Date: Mon Dec 25 09:40:10 2023 +0800 Merge branch 'cheng' commit 6b11b84608ded2e29f6c4f2ef5ae3a9bad1bbf64 Merge: 36f16831 2db03cd0 Author: Cheng Date: Mon Dec 25 09:38:27 2023 +0800 解決衝突 commit 36f1683178373eab59b34511a7e2c679c96c68f2 Author: Cheng Date: Mon Dec 25 09:36:00 2023 +0800 解決衝突 commit 2db03cd047f837782fc9e83208c5c8c7882d1372 Merge: 3c328966 55ad03d4 Author: 10994015 Date: Mon Dec 25 09:33:34 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 9da56cd58c44ddcc48896a16d88f5b83c74c2364 Author: Cheng Date: Fri Dec 22 17:33:54 2023 +0800 契約價審合約 commit 3c328966b8e6a84d3bd6cccc19bc93e97b5fd227 Author: 10994015 Date: Thu Dec 21 17:54:38 2023 +0800 1221 commit bdd1d83a82751b5014715fe6c583c27a47159555 Merge: 063b566d 105e4581 Author: Cheng Date: Thu Dec 21 17:48:24 2023 +0800 Merge branch 'cheng' of http://10.10.1.6:3080/masada-admin/httpdocs into cheng commit 063b566defec7af7d79346e85340788bb3816828 Author: Cheng Date: Thu Dec 21 17:47:10 2023 +0800 契約價審 commit 1074ee6896ec63a7b8af5df8e037a895b9817e63 Author: Cheng Date: Wed Dec 20 18:07:19 2023 +0800 保養契約價格審核 commit df7e24efb47ccdc3e13a981f23d6a43717d2873f Author: Cheng Date: Wed Dec 20 11:52:14 2023 +0800 價審 commit 392852f3d6bd2871268aceed351abf4159c60752 Author: Cheng Date: Wed Dec 20 10:26:54 2023 +0800 價審流程 commit 36d27a98bbed1cfcc3892f85ea88db4bf587609e Author: Cheng Date: Tue Dec 19 17:04:20 2023 +0800 契約管理 commit 55ad03d4d85cf0caec432414e35e713e2c8760ff Merge: 103ea60b b0a04ee2 Author: Ellin Date: Wed Dec 20 19:27:17 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 103ea60b7a40ee80a5dbb6fa216f3001e326c47d Author: Ellin Date: Wed Dec 20 19:26:49 2023 +0800 應收帳款(新梯)匯出excel成功 commit 5b8d7555ae9d8e9868ec6a22269b32392280634f (origin/yan) Author: 10994015 Date: Wed Dec 20 18:05:29 2023 +0800 刪除files 完成 commit b0a04ee28530c32fae0d6e8ec643e51c43102667 Author: 10994015 Date: Wed Dec 20 10:40:30 2023 +0800 合約書附件bug修正 commit 4dd5b8189ac9e53ec194930d09924c1df85990b5 Merge: 39ce14a8 3d3c3600 Author: 10994015 Date: Tue Dec 19 18:36:40 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 39ce14a8d670c6252ae7d894a95a9d2ba5d4215a Author: 10994015 Date: Tue Dec 19 18:36:29 2023 +0800 合約書生成 附件上傳完成 commit 3d3c3600aea682775b7b3ab4651f9e63daa99a9d Merge: 0aa460d2 e2fa8d75 Author: Ellin Date: Tue Dec 19 18:02:20 2023 +0800 Merge branch 'kaiyu' commit e2fa8d75caa4b1aaa0e9629a53cd6ab090e78194 Author: Ellin Date: Tue Dec 19 17:57:49 2023 +0800 合約作番金額明細excel commit 105e458133b04f4085cfc93a1c98fad661299010 Author: Cheng Date: Tue Dec 19 17:04:20 2023 +0800 契約管理 commit 0aa460d275b32eb140f5ec22b7a7f38bb4f92fe3 Author: 10994015 Date: Tue Dec 19 17:03:09 2023 +0800 edit header commit 2a1d009390256ceeaf59cc332d6b2bdb4c9ac9e7 Merge: 623d0dcb 78021c5e Author: 10994015 Date: Tue Dec 19 17:02:50 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 623d0dcbf76bc367c74be8a1510bb39cf3461bfa Author: 10994015 Date: Tue Dec 19 16:51:57 2023 +0800 新增測試帳號 commit b65ceaf62f49f8b17a99b7fc3ec2caaa5f40316a Author: 10994015 Date: Tue Dec 19 14:17:49 2023 +0800 123 commit 78021c5ef8f62e634991a2dc012c94c6463e5ae8 Merge: e08dab05 3e740a90 Author: Cheng Date: Tue Dec 19 10:20:29 2023 +0800 option mi 開權限 commit e08dab0543c398af3a96525284ef0cc40092fe7a Author: Cheng Date: Tue Dec 19 10:06:34 2023 +0800 option mi 開權限 commit 737b61683191e4e0b8243f57de5a44011b33de3e Merge: 05f150ac 3e740a90 Author: 10994015 Date: Tue Dec 19 09:39:42 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 05f150ace602d0581a6e727b97315f5cf9641edc Author: 10994015 Date: Tue Dec 19 09:39:31 2023 +0800 option 加上看mi的權限 commit d99684fb76ad77f546fde7e0b9b62441be843ec4 Merge: b4b5778f 3e740a90 Author: gary_chen\gary_chen Date: Mon Dec 18 19:09:13 2023 +0800 Merge branch 'main' into gary commit b4b5778f162efeb59331df263e4dbf3af7215da4 Author: gary_chen\gary_chen Date: Mon Dec 18 19:08:50 2023 +0800 1.修正安裝大日程 edit 按鈕 2.出貨日調整單 地址新增縣市下拉式選單 3.出貨地區預定明細 新增全部作番 的表 4.index 狀態新增營業經理確認中 的選項 5.大日程新增 林靜雯 檢視權限 commit 00cc9c7ef617f84b01a0fbaee0c190e34472abb5 Author: Cheng Date: Mon Dec 18 17:56:48 2023 +0800 價審(修改) commit 3e740a90bf729a8a60a7142b32d1431344ea60da Merge: c18e1e26 56eda3c4 Author: Ellin Date: Fri Dec 15 20:52:02 2023 +0800 Merge branch 'kaiyu' commit 56eda3c4328a8deb51f47852d1b8ea05c79e6fb6 Author: Ellin Date: Fri Dec 15 20:51:13 2023 +0800 應收帳款(新梯)下載格式; 應收帳款(新梯)index列出各款項與催收次數 commit 2fb0526cdd6f562815fa90290d44df78d2503d29 Author: 10994015 Date: Fri Dec 15 17:51:03 2023 +0800 1215 合約書申請完成 commit 3c407d134a481059e5f9aeeefb84b2162853ea3f Author: 10994015 Date: Fri Dec 15 10:32:19 2023 +0800 1215 commit 價審bug commit 42aaeb5ab73e2ce6a585b0e0b64418218f2aedab Author: 10994015 Date: Thu Dec 14 17:55:03 2023 +0800 合約書申請 資料抓不到bug 修正 1214 commit 3cf6007657460d83c132d0cf2c8c4b9f691358c3 Author: Cheng Date: Thu Dec 14 17:55:44 2023 +0800 契約價審單 commit c18e1e26def7ff6094545b7e2739e01bb21da538 Author: gary_chen\gary_chen Date: Thu Dec 14 08:52:12 2023 +0800 1.header 重新上板(正確版本) 2.app env路徑修正 3.gitignore 新增忽略 app 登入產生的 .log 4.app 針對合約號 M220104 作假資料 commit 11294b35f1821bcb75a2848f4de6e58a0bcf8279 Author: 10994015 Date: Wed Dec 13 18:08:02 2023 +0800 合約書申請完成、新梯有望客戶修復 commit 75a7bf5a5d279afa0e2404deeef1993cc1c8fff1 Author: Cheng Date: Wed Dec 13 11:00:18 2023 +0800 header commit 4011e624a86ea8094b891d28672905a7b1f872ec Merge: 96fe7358 593f0ac9 Author: Cheng Date: Wed Dec 13 10:52:10 2023 +0800 Merge branch 'main' into cheng commit 593f0ac96cf9153b75f5272c6591459c39ca608f Merge: 19420d3d 22e75650 Author: Cheng Date: Wed Dec 13 10:51:35 2023 +0800 Merge branch 'cheng' of http://10.10.1.6:3080/masada-admin/httpdocs commit 96fe735830452eb490395e779ce6835d52562a50 Author: Cheng Date: Wed Dec 13 10:51:06 2023 +0800 123 commit 22e75650a12071d53ccd0347e72618703761847d Author: Cheng Date: Tue Dec 12 17:52:26 2023 +0800 規格調查(新梯、汰改)修整頁面 commit 70c7703e6e38ee8ecf4f97ec25f4dd8b9b94431c Merge: f0ea9d82 69c0c616 Author: 10994015 Date: Tue Dec 12 17:50:13 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit f0ea9d8211b6c5a4577f98645d099d1fc60e6a9b Author: 10994015 Date: Tue Dec 12 17:49:12 2023 +0800 1212合約書申請 流程控制 commit f8065a9e96897befb511230c492abc4d1f7536a6 Author: 10994015 Date: Tue Dec 12 17:47:23 2023 +0800 1212 合約書申請，權限控制 commit 69c0c6160f0bb03ea2db2e5fc3cd1a12763f2d76 Merge: bdd04b16 854fec3e Author: Ellin Date: Tue Dec 12 17:34:34 2023 +0800 Merge branch 'kaiyu' commit 854fec3e26b80d68ac1c46c67ff2c3606ee1b953 Author: Ellin Date: Tue Dec 12 17:34:06 2023 +0800 應收帳款(新梯)銷售訂單資料已完成 commit 411eb4c1ef7d6d076074b86126778a53174364d9 Author: 10994015 Date: Tue Dec 12 16:06:09 2023 +0800 合約書申請、合約書下載測試版上傳 commit bdd04b161bad2f1f63544e118b7198272bf23d12 Merge: 3f533669 fd491fab Author: gary_chen\gary_chen Date: Tue Dec 12 10:44:26 2023 +0800 Merge branch 'gary' of http://git.masada.com.tw/masada-admin/httpdocs into gary commit 3f533669f4982c74315bea5a4f541033b09a6582 Merge: 752d3a77 ddbbc166 Author: gary_chen\gary_chen Date: Tue Dec 12 10:43:33 2023 +0800 Merge branch 'main' into gary commit fd491faba1e72f64814c8a454c19ebee7f7b5b54 Merge: 752d3a77 ddbbc166 Author: gary_chen\gary_chen Date: Tue Dec 12 10:43:33 2023 +0800 Merge branch 'main' into gary commit 752d3a7734254e5778b1dff3bd87d27211ea87c3 Author: gary_chen\gary_chen Date: Tue Dec 12 10:43:10 2023 +0800 1.新增分布圖假保養資料補丁 2.header 新增判斷是否從藍凌過來的判斷方法 3.wms登入判斷強制改為大寫 4.大日程select優化 5.生管(業務)從M0024 改為 M0079 6.新增 BPM API 到 BPM測試檔案 7.首頁通知顯示bug修正 8.戰情室分布圖 工地 連接資料庫檔案修正及程式排版 commit ddbbc16682cc4d97bfb55ce0d5d2cbdaf29bfcec Author: Ellin Date: Mon Dec 11 18:39:13 2023 +0800 rib01-create收款人改selectize(); 應收帳款(新梯)excel自動換行; 應收帳款(新梯)index修改 commit 279388a0aff9bc8cb2eeadf6bf6a628a03644816 Author: 10994015 Date: Mon Dec 11 17:55:03 2023 +0800 合約下載 1211 commit 26318a60040a16cee371c740da2681d09e0cb68c Author: Cheng Date: Mon Dec 11 17:33:49 2023 +0800 價審欄位添加服務費 commit fd89ea5305b6eca86eb2eb97ac3adbf70b7ff5cd Author: Cheng Date: Mon Dec 11 09:18:19 2023 +0800 bug修復 commit 288487bc13d77796a769680f6e23c45a9ae55ab9 Author: 10994015 Date: Mon Dec 11 08:36:08 2023 +0800 1211 merge commit 0c1d0414586e713514e651c8b2958ee56cdb79c7 Merge: adc75b7f 612b2374 Author: Ellin Date: Fri Dec 8 17:38:09 2023 +0800 Merge branch 'kaiyu' commit 612b237401a4d2126466d32c7f20233d0c874ee4 Author: Ellin Date: Fri Dec 8 17:37:46 2023 +0800 應收帳款excel測試 commit adc75b7f46c80fe0330c006e487316f3e63d44f7 Merge: 9461fa3b f74d72e6 Author: gary_chen\gary_chen Date: Thu Dec 7 19:12:42 2023 +0800 Merge branch 'main' into gary commit 9461fa3b777b7708fdfa368c43ade9734fd25732 Author: gary_chen\gary_chen Date: Thu Dec 7 19:12:28 2023 +0800 1.新增APP生產進度及安裝進度與作番大日程日期關聯 2.待簽新增判定 flow_code = 'Z' 不顯示 3.大日程地址顯示優先抓取 real_address 再抓取 address 4.新增個欄位維護人 modal 5.修正 在裝中統計表 總計 bug 6.展廳 分布圖 新增補丁code 超過兩個月沒保養的會帶入假資料 commit f74d72e66cdb2d2aaf9dcbf57d9acb7e469f923d Author: Ellin Date: Thu Dec 7 17:45:07 2023 +0800 應收帳款(新梯) commit 19420d3dcaf29e000a10aae2ba2a028e0bdc1118 Merge: e5a9c0a9 f3a58188 Author: Cheng Date: Thu Dec 7 08:36:32 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit f3a581888e5d301a766a96ece04e3b3d8b5027ec Author: Ellin Date: Wed Dec 6 19:08:06 2023 +0800 應收帳款(新梯); rib01-check修撤回按鈕bug commit b1dfd4f9247f7e301dfdab3acbae4f5ab8f001e6 Author: Cheng Date: Wed Dec 6 17:49:40 2023 +0800 修理契約管理 commit 729d49bc69374c907060952237a658f32c54c32d Author: Cheng Date: Wed Dec 6 09:01:25 2023 +0800 合約簽核(修理) commit 6daab8e7c0f77e5e9f5b8caba9be7b131f618965 Merge: e4a1200c 1e6352f4 Author: Cheng Date: Wed Dec 6 08:56:29 2023 +0800 合約簽核(修理) commit e4a1200cee36ff0ab0bb2abd08328e7a496f9844 Author: Cheng Date: Wed Dec 6 08:46:35 2023 +0800 231205.cheng commit fec7c90fc916ad31f5af14827a631654be088f82 Author: Cheng Date: Mon Dec 4 17:26:49 2023 +0800 231204.cheng commit 3581830afc7b6067247967c733f394712abbf690 Author: Cheng Date: Mon Dec 4 15:19:36 2023 +0800 test commit c754accfe99af6809f76879bb8faa3d516daf634 Author: izumi.wang Date: Mon Dec 4 15:04:43 2023 +0800 test commit e5a9c0a9ae9155800562f4b639ef0e360dd3e7f1 Merge: 181cd322 e7c13119 Author: Cheng Date: Wed Dec 6 08:51:44 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit e7c1311974e17c58f322f5722e15bf4d7795909f Author: Ellin Date: Tue Dec 5 18:51:09 2023 +0800 應收帳款(新梯)系統index跟check commit 46f481c4359f19e12cf2d258122e0201c57ff3aa Author: 10994015 Date: Tue Dec 5 18:00:11 2023 +0800 合約書申請 commit d0d05e4193f914857cb194d0c1a0b824e28b83fd Merge: b7f073bf d009c1bf Author: gary_chen\gary_chen Date: Tue Dec 5 11:17:26 2023 +0800 Merge branch 'main' into gary commit b7f073bfbfde806a8f2b9e87c16ff1e8e81a9cad Author: gary_chen\gary_chen Date: Tue Dec 5 11:16:58 2023 +0800 暫時commit commit 181cd32253d17ca631239fcf543f00a17dbe7909 Merge: f8265345 d009c1bf Author: Cheng Date: Tue Dec 5 09:01:15 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 97b31d4a1379159c063497b62c101239e4f96a93 Author: 10994015 Date: Tue Dec 5 08:35:52 2023 +0800 remove wms.zip commit 24ed7c286ad6e16dd10b311479f4eaf8f298003c Author: 10994015 Date: Mon Dec 4 18:13:42 2023 +0800 1204 commit d009c1bfb77d4267dfa9ce57464c60c0dc32641b Author: Ellin Date: Mon Dec 4 18:06:45 2023 +0800 T8連線改env;請購單 commit 1e6352f45c1f05ebbeb9736555124e07ff5fc958 Author: Cheng Date: Mon Dec 4 17:26:49 2023 +0800 231204.cheng commit b4e44ac1bd29f2b537c46c6da4ff6a1d981613bf Author: Cheng Date: Mon Dec 4 15:19:36 2023 +0800 test commit 321a00eacb7617ce90d52f773bcd2429cd119c67 Author: izumi.wang Date: Mon Dec 4 15:04:43 2023 +0800 test commit f82653454260a34a737a4ee3b7d7cb3b98dcc607 Author: izumi.wang Date: Mon Dec 4 15:00:10 2023 +0800 init commit 5f66622cffd57d214d563478c2b730127573fefa Merge: ec672acc 3e3a03fe Author: gary_chen\gary_chen Date: Mon Dec 4 00:35:21 2023 +0800 Merge branch 'main' into gary commit ec672accd1c85813626ff4dce47db2391ed6364e Author: gary_chen\gary_chen Date: Mon Dec 4 00:33:55 2023 +0800 代簽新增大日程的合約號及作番號 公告新增 modal 顯示 funglobal 登入失敗從 alert 改成 php exit header 新增藍凌過來的 token 解析 t8 ip 連線改成內網連線 大日程根據會議議程更改計畫圖流程(新增經理階段) 大日程單獨開通林慧姍的調整日期權限 commit 3e3a03fe11258d8fa5f98a8bbe2d94380b9c84f8 Merge: bbea0b78 fd905c76 Author: 10994015 Date: Fri Dec 1 17:42:40 2023 +0800 修復 價審 業務部mi bug commit fd905c76042b463af4d601cb474a39e9a57e1393 Merge: fa3fb17b 215a4347 Author: 10994015 Date: Fri Dec 1 17:40:29 2023 +0800 Merge branch 'yan' of http://10.10.1.6:3080/masada-admin/httpdocs into yan commit fa3fb17bb7e254f3da6ca3086b9e25ef0bba91b9 Author: 10994015 Date: Fri Dec 1 17:40:17 2023 +0800 修復價審業務mi Bug commit bbea0b78717f07eff2873874096f924838cfb6db Merge: cb9f8853 8f0ab0aa Author: Ellin Date: Thu Nov 30 19:07:56 2023 +0800 Merge branch 'kaiyu' commit 8f0ab0aaa270da3896e6adf4f714fcd4056d618c Author: Ellin Date: Thu Nov 30 19:07:31 2023 +0800 應收帳款修改 commit 8821a1dc661fa13b981d45a9bd66e6598ed6c2d7 Author: 10994015 Date: Thu Nov 30 17:54:25 2023 +0800 合約簽核 commit 6da62c29e6d50e23487610b867f5fd1411f11e57 Author: 10994015 Date: Thu Nov 30 14:19:34 2023 +0800 衝突解決 commit 53dfdc5ec95dd64774eb23865182371043306484 Author: 10994015 Date: Thu Nov 30 13:50:54 2023 +0800 新梯價審簽核加上同意(上呈)、同意(結案) commit cb9f8853b1e4829b1664b89b5dd354bb2393fe9e Merge: 9400da8a ef4a6183 Author: Ellin Date: Wed Nov 29 17:56:42 2023 +0800 Merge branch 'kaiyu' commit 9400da8ae04cce74598a3ff50b7c5c8f116e7f22 Merge: b512dfc1 9cf3bfa1 Author: Ellin Date: Wed Nov 29 17:56:35 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit ef4a618347fdf4b4fc93af8dec43777766cef7a9 Author: Ellin Date: Wed Nov 29 17:56:03 2023 +0800 增加查詢採購單跟新增外購組裝單 commit 9b45b4db297d89831aea7b70a0aadfe69fe08a4f Author: 10994015 Date: Wed Nov 29 17:21:52 2023 +0800 option final commit 26f850a5290835c71c53ae684b49f60b03c3ecf8 Author: 10994015 Date: Wed Nov 29 17:18:55 2023 +0800 合併衝突 commit 215a43477a9d3268bb14ff2038f44645046d3179 Merge: 56b8a9fc 0b7ddd78 Author: 10994015 Date: Wed Nov 29 17:17:52 2023 +0800 合併衝突 commit 9cf3bfa102576098558da1a24256f3564fe24bee Merge: 56b8a9fc d2abcf12 Author: 10994015 Date: Wed Nov 29 17:12:52 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 56b8a9fce778688ff853d1281f89667d844e5a94 Author: 10994015 Date: Wed Nov 29 17:11:46 2023 +0800 option 更新完成 commit 074a4bb4e50405c13fbdb99a47abc55d08202a24 Author: 10994015 Date: Tue Nov 28 17:23:33 2023 +0800 更新option commit 23ec9ed89d093a690b2512d15c7996e7cf1d8de7 Merge: 54c4ce2c d2abcf12 Author: gary_chen\gary_chen Date: Tue Nov 28 09:44:19 2023 +0800 Merge branch 'main' into gary commit 54c4ce2cd99f84d706fdebcbc737db83ad0777ba Author: gary_chen\gary_chen Date: Tue Nov 28 09:43:52 2023 +0800 1.選單新增部門可以批次可讀可寫 2.修正大日程倉管的edit標籤 3.系統改為網址有帶入 token 即可自動登入系統 4.新增在裝中統計表 commit b512dfc1218a9666aea257d8c8c22158a6249c31 Merge: d2abcf12 7c02e776 Author: Ellin Date: Mon Nov 27 18:13:17 2023 +0800 Merge branch 'kaiyu' commit 7c02e7768f249ad28db36437095debe9ca77c033 Author: Ellin Date: Mon Nov 27 18:12:42 2023 +0800 測試發貨單API commit 2ccb0f743f7d057dcf2554b72d1ab1e3880821c2 Author: 10994015 Date: Fri Nov 24 17:40:10 2023 +0800 合約書申請 暫存成功 commit d2abcf120e2a3358b99c5859237cc4c669150fba Author: jrbin Date: Fri Nov 24 16:09:27 2023 +0800 開放李盈瑩瀏覽權限 commit 5874e1f953ef457a3e4bc4ba1d6e86b3691c9aa0 Author: gary_chen\gary_chen Date: Fri Nov 24 15:50:19 2023 +0800 新增 寄新人手冊的功能 commit 1221f77c720788ecab0de7931a2214d350b067af Author: jrbin Date: Fri Nov 24 15:18:25 2023 +0800 1.統編改非必填 2.修改瀏覽權限 commit 924ae65e53a7119de213fd78e9b290555b0eee5e Author: 10994015 Date: Fri Nov 24 13:19:29 2023 +0800 未存檔 commit 1d73940bd4028e9ff372ba65763732d6f9a35a50 Author: 10994015 Date: Wed Nov 22 17:35:06 2023 +0800 1122 commit 8ddf2034076d89dbc943ed44259d1adcb4343fd3 Author: 10994015 Date: Wed Nov 22 14:10:40 2023 +0800 1122 commit 9e5facb1986e8f95eddbe926e0388e2982570300 Author: 10994015 Date: Tue Nov 21 17:38:37 2023 +0800 新梯合約申請 1121 commit 7588bf6b7556954a6c493c0675ae2f7c155e5bba Author: 10994015 Date: Fri Nov 17 17:55:13 2023 +0800 新梯合約申請1117 commit ace03b7038d939a30fe0cce76f77fc2c74143d16 Author: 10994015 Date: Thu Nov 16 18:05:41 2023 +0800 合約書申請 新梯 1116 commit 0e039c6ddb997f86c1f88c286bb8f7e109a7a801 Merge: aa7a680e 8f80993f Author: Ellin Date: Thu Nov 23 18:12:31 2023 +0800 Merge branch 'kaiyu' commit 8f80993f79d89b156ffebebc033aeb93ade7f1e2 Author: Ellin Date: Thu Nov 23 18:11:57 2023 +0800 修改發票日期判斷與依據幣別作整數或取小數點後兩位 commit aa7a680e156480631a772137e4e397b02688ee55 Author: jrbin Date: Thu Nov 23 13:39:59 2023 +0800 加上option項目狀態判斷 commit 9dc6ea134529ef018a282c91225855aa8a41c6b8 Author: jrbin Date: Thu Nov 23 11:50:11 2023 +0800 option刪除 修正 commit c49500f90630b990eaf5b460824cb4920655689a Author: jrbin Date: Thu Nov 23 09:55:49 2023 +0800 汰改簽核bug fix commit 038bde23ae7575a255c9e5cb2d3f27578fd92076 Merge: 0ee85f44 04972d80 Author: gary_chen\gary_chen Date: Thu Nov 23 09:27:05 2023 +0800 Merge branch 'main' into gary commit 0ee85f441167f4e21dd14ed80f42730212e41c18 Author: gary_chen\gary_chen Date: Thu Nov 23 09:26:51 2023 +0800 不良單新增 sr sq 種類 commit 04972d8014d053af6bf64f02fa4343fef4f33178 Merge: e42c7eb2 3da57613 Author: Ellin Date: Wed Nov 22 19:31:31 2023 +0800 Merge branch 'kaiyu' commit 3da5761322b56d1b8d62288e79b931253b3b39d9 Author: Ellin Date: Wed Nov 22 19:31:01 2023 +0800 費用報銷單創建人傳入T8 commit e4c9c41a2600e16e0b5197d1911c3660b40b6f78 Author: gary_chen\gary_chen Date: Wed Nov 22 19:15:01 2023 +0800 新增通知用的 class commit fe95d9b2efee1a861082be30f9f57bd7379afd58 Author: gary_chen\gary_chen Date: Wed Nov 22 19:03:00 2023 +0800 品質不良單新增權限判斷 commit e42c7eb2c8c2e827ecfc69f37bcdb992edd5c503 Merge: f96b4fa1 a13010fe Author: gary_chen\gary_chen Date: Wed Nov 22 16:16:28 2023 +0800 Merge branch 'main' into gary commit f96b4fa198c8471ee26d8ec9aa8485cc5df7e038 Author: gary_chen\gary_chen Date: Wed Nov 22 16:16:06 2023 +0800 1.品質不良單 2.修正 mkt/database.php 的 .env 路徑 commit 4341362d2834a8fade7fb986838e0f48c8c3cc94 Author: gary_chen\gary_chen Date: Wed Nov 22 16:12:47 2023 +0800 修正作番大日程倉管權限 commit a13010fe1839b5f9c7f258b2e74744a464730f99 Author: 10994015 Date: Wed Nov 22 15:07:09 2023 +0800 特殊費用欄位順序更改 commit a5f15b73546141bc81ec81acc708356a2b10efea Author: jrbin Date: Wed Nov 22 14:09:07 2023 +0800 1.把特殊費用納進成本 2.「加價」先隱藏，不納入成本 commit f8258019456c0adcbc625f1e2555b48bee3a6a68 Merge: af0e179c 59379de7 Author: Ellin Date: Tue Nov 21 17:56:26 2023 +0800 Merge branch 'kaiyu' commit 59379de7a775f9245afc5f87f041ef9b78aed252 Author: Ellin Date: Tue Nov 21 17:56:01 2023 +0800 修改費用報銷單BUG(增加財會人員審核階段新增刪除權限) commit 0b7ddd7828a8ca376d9c4c6479e2b10e24c29f7c Author: 10994015 Date: Tue Nov 21 17:38:37 2023 +0800 新梯合約申請 1121 commit 6d143e28275916d7dd6ee9809e46cf82808876d1 Merge: 719a39a2 af0e179c Author: gary_chen\gary_chen Date: Tue Nov 21 13:40:45 2023 +0800 Merge branch 'main' into gary commit 719a39a2e3ceba73438fc546c66ba712f77a0dbf Author: gary_chen\gary_chen Date: Tue Nov 21 13:40:30 2023 +0800 修正計劃圖檔案上傳問題 bug commit af0e179cbdb72743041859e97329fc30bfa7bd11 Author: jrbin Date: Mon Nov 20 21:27:59 2023 +0800 remove test email commit 083d7ce4e8ffb5db96233e2e561d7bb6a77a58af Author: Ellin Date: Mon Nov 20 18:49:07 2023 +0800 修改費用報銷單會計取T8費用項目的內容，應收帳款明細新增該階段應收金額 commit d27e98d1f4c9a71a69938e90e08fcf7561889d20 Merge: 6b9cfc3e c347bdce Author: gary_chen\gary_chen Date: Mon Nov 20 10:18:46 2023 +0800 Merge branch 'main' into gary commit 6b9cfc3e9758d6b5441e78e60dbef1feed601ed0 Author: gary_chen\gary_chen Date: Mon Nov 20 10:17:53 2023 +0800 工務助理發包合約上傳 bug 修正 commit 46c952dfd3e57c238ffd3ec694fe084e09368b8d Author: gary_chen\gary_chen Date: Mon Nov 20 10:17:10 2023 +0800 品質不良單功能 (泉勝) commit b9b9d6af62bda9e49d6644c8f3ae2546810f50f9 Author: gary_chen\gary_chen Date: Mon Nov 20 09:52:21 2023 +0800 通知已讀後要消失 commit c347bdce2ac6c3a624d99db8e139fb4b834bab7d Merge: 49907527 58322e73 Author: Ellin Date: Fri Nov 17 18:53:08 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 499075276da6ec848eed91429d072b89f2632518 Author: Ellin Date: Fri Nov 17 18:52:39 2023 +0800 對帳增加客戶名稱 commit 7c77b46b757e6e61266df4e3c81da50a0614f0b3 Author: 10994015 Date: Fri Nov 17 17:55:13 2023 +0800 新梯合約申請1117 commit 58322e733ce01c5d8fc892b4938e299b1f132855 Author: jrbin Date: Fri Nov 17 17:44:19 2023 +0800 價審bug fix commit f863da5b683e8de2d127ff21041e8f05aa15ef26 Author: Ellin Date: Fri Nov 17 15:27:47 2023 +0800 對帳系統跟更新T8 API commit fdbca9e9ddaadb8d7d6201673d2f235a46d72f66 Author: gary_chen\gary_chen Date: Fri Nov 17 09:37:23 2023 +0800 系統 wms 及 app 新增維護模式 commit 7b37600f41cc4845375cb236b783fbe3f6618944 Author: 10994015 Date: Thu Nov 16 18:05:41 2023 +0800 合約書申請 新梯 1116 commit 59d0453b1ebfdc776b8cd477283d501e6c3e8cb2 Merge: 6542c15e 8b3e3a79 Author: Ellin Date: Thu Nov 16 18:01:40 2023 +0800 Merge branch 'main' into kaiyu commit 6542c15ec16e0b09c49fc5866d310f652c16a0ea Author: Ellin Date: Thu Nov 16 18:00:33 2023 +0800 新增對帳系統 commit 8b3e3a793dd06facf49fcb670e7fb6262e21ad7c Merge: cca05cbc 7dac3835 Author: gary_chen\gary_chen Date: Thu Nov 16 17:31:08 2023 +0800 Merge branch 'main' into gary commit cca05cbc8a2a1d780b31b2d44f75cfecf1825fe1 Author: gary_chen\gary_chen Date: Thu Nov 16 17:30:43 2023 +0800 大日程新增 外包合約上傳系統 完工驗收單上傳系統 commit 7dac3835def9a2523b81d50d319c17c9f63450e9 Author: jrbin Date: Thu Nov 16 14:47:41 2023 +0800 修正退回後重送問題 commit 5f34a6d94524776d88338d94fa21d0800dda1975 Author: jrbin Date: Thu Nov 16 11:25:33 2023 +0800 判斷來源程式 commit e380f5f410aa023d10821aad3a924756b9b45108 Author: jrbin Date: Thu Nov 16 11:19:56 2023 +0800 1.excel-upload.php:增加電梯機型 2.契約價審檢查提交資料 commit 96490286bb31e3ad9d6fd1f2a4a296068bdde344 Merge: d19d28da 9a000651 Author: gary_chen\gary_chen Date: Thu Nov 16 10:08:58 2023 +0800 Merge branch 'main' into gary commit d19d28da4d9bdd5ab8fd330a952fdf6648987be5 Author: gary_chen\gary_chen Date: Thu Nov 16 10:08:35 2023 +0800 作番大日程新增"警示"欄位及篩選功能 commit 53ba49b59977c0318b68d4f369598946cb0490f3 Author: Ellin Date: Wed Nov 15 18:12:51 2023 +0800 測試對帳系統資料 commit 9a0006516d77178c16975c62cf69dde0d3a832b5 Merge: af27759c 5f43d5ce Author: 10994015 Date: Wed Nov 15 18:00:42 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit af27759cefa0aeba9cddcbad8c449218026585f0 Author: 10994015 Date: Wed Nov 15 17:59:55 2023 +0800 新梯合約簽回1115 commit 6a8a53a029436dac27eca6c0ea948affeddb9506 Merge: 246da5d7 2f452a6c Author: 10994015 Date: Tue Nov 14 17:46:54 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 246da5d796afbff59a57104f8b6fb29c546a7111 Author: 10994015 Date: Tue Nov 14 17:46:05 2023 +0800 新梯合約管理 commit 5f43d5cec59abf5ae03b400f7a4c1c8b14ede056 Merge: 2f452a6c 420a6645 Author: Ellin Date: Tue Nov 14 17:41:27 2023 +0800 Merge branch 'kaiyu' commit 420a66459aad303c61f8eea239c73be6cd354306 Author: Ellin Date: Tue Nov 14 17:40:53 2023 +0800 測試採購單API commit 8e1053e106fd5ad75d7b98e93cc6f7b88b7e7e49 Merge: 478a1d70 8851a834 Author: gary_chen\gary_chen Date: Tue Nov 14 15:07:39 2023 +0800 Merge branch 'gary' of http://10.10.1.6:3080/masada-admin/httpdocs into gary commit 478a1d70702b12222832500cbf3604a6cf198621 Author: gary_chen\gary_chen Date: Tue Nov 14 15:06:50 2023 +0800 大日程新增自動帶入預計發包日期功能 修正營業無法調整移交日bug 新增安裝大日程警示功能 commit 11abc3ceef9e61a3d023d5a2550143470ebf9e8e Author: gary_chen\gary_chen Date: Mon Nov 13 16:03:22 2023 +0800 更改大日程申請計畫圖上傳簽核流程 commit 004aefd7505bc1acd553b381a1b3bdc0d57f9394 Author: gary_chen\gary_chen Date: Mon Nov 13 09:58:48 2023 +0800 修正大日程出貨日申請單批次申請bug commit 8851a83459996e8db1bebfd655c72b78c9b877a7 Author: gary_chen\gary_chen Date: Tue Nov 14 15:06:50 2023 +0800 大日程新增自動帶入預計發包日期功能 修正營業無法調整移交日bug 新增安裝大日程警示功能 commit 2f452a6c266b1d39583076ad5fc8a5aa507228ec Author: jrbin Date: Tue Nov 14 09:22:12 2023 +0800 何維光開放瀏覽 commit 3f8aa33bd0e2df2744fdb7ccbf333b22068dd10b Merge: 24240f5c 83623b55 Author: 10994015 Date: Mon Nov 13 17:49:07 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 24240f5c6358bc0b7611d0012b9febbab190f929 Author: 10994015 Date: Mon Nov 13 17:48:27 2023 +0800 rm cached images/contracts commit 01482e59db5137bb2b4af2c6bb6126905842e298 Author: 10994015 Date: Mon Nov 13 17:44:42 2023 +0800 新梯合約上傳完成 commit 83623b559f4fb4491fc20eeb1a805cd9b908a2b7 Author: jrbin Date: Mon Nov 13 16:05:26 2023 +0800 規調查詢bug fix commit 44e910cbb413f94a5b4301418d55f13e574d24b2 Author: gary_chen\gary_chen Date: Mon Nov 13 16:03:22 2023 +0800 更改大日程申請計畫圖上傳簽核流程 commit 8d551637775669fb1f2ffef667799b2ac6c662a4 Author: gary_chen\gary_chen Date: Mon Nov 13 09:58:48 2023 +0800 修正大日程出貨日申請單批次申請bug commit ad352146e92d684536bb8840a7dc41b3be644f84 Author: gary_chen Date: Mon Nov 13 01:47:35 2023 +0000 更新 wms/contract/api/getFacilityNo.php commit 66bb5a97d029d9614227bb7e8d2df16eb9708eb0 Author: gary_chen Date: Mon Nov 13 01:47:23 2023 +0000 更新 wms/contract/api/getFacilityNo.php commit 238b86c82f56d9e0808b3b69bdf276d75fde3e7d Merge: 7eceefa0 8327ea8c Author: gary_chen\gary_chen Date: Mon Nov 13 09:44:55 2023 +0800 Merge branch 'main' into gary # Conflicts: # wms/contract/contract-input.php commit 7eceefa0cfc7d56f9d137e47c64c6b8d852e2e65 Author: gary_chen\gary_chen Date: Mon Nov 13 09:40:09 2023 +0800 no message commit 948586dc442c92e993508b580d7ab6ec188e8303 Author: gary_chen\gary_chen Date: Mon Nov 13 09:37:59 2023 +0800 修正編列作番 class 規則 commit 5721447be59aea327212e64ccea959829e2cc98b Merge: bac1d6e8 3c5c6f7e Author: gary_chen\gary_chen Date: Mon Nov 13 09:30:45 2023 +0800 Merge remote-tracking branch 'origin/yan' into gary commit bac1d6e8aceb43f02d0227ff3e353a6303fb2ec3 Author: gary_chen\gary_chen Date: Mon Nov 13 09:30:23 2023 +0800 修正大日程 bug commit 3c5c6f7e6a2ad2789d401d3de12feb1426f9eeeb Merge: cb0bab16 4ca030cd Author: 10994015 Date: Mon Nov 13 09:28:55 2023 +0800 merge commit 8327ea8cfa9eb83f92780654dd370d97133eac58 Author: 10994015 Date: Mon Nov 13 09:27:32 2023 +0800 merge commit cb0bab16fe42f1590a2a31490d08f3e03e77a87c Author: 10994015 Date: Mon Nov 13 09:26:54 2023 +0800 1113 commit 24b93402f654e900db3d008e162a448d57f93b23 Merge: a27bb543 7b26b8d5 Author: 10994015 Date: Mon Nov 13 09:03:15 2023 +0800 merge commit a27bb543aee677640f9944524baa1d3dd2d20bd0 Merge: 6342bcd4 3035bf4e Author: 10994015 Date: Fri Nov 10 18:00:02 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 7b26b8d540933378927980691c40776c1de837c2 Author: 10994015 Date: Fri Nov 10 17:59:41 2023 +0800 1110 commit 3035bf4e051e4916c064e0b4aa58b465b4112737 Merge: 040552fe 2cbf5613 Author: gary_chen\gary_chen Date: Fri Nov 10 17:22:17 2023 +0800 Merge branch 'main' into gary commit 040552fe8ef7f12e84e9a944bd2151bc397cca59 Author: gary_chen\gary_chen Date: Fri Nov 10 17:21:44 2023 +0800 作番編列 函數參數 $sale_type, $make_type改成陣列 (第一版) 只有改保養的 commit 7e7723fd58c106741693a5c71fdee904111ddc21 Author: gary_chen\gary_chen Date: Fri Nov 10 17:02:10 2023 +0800 修正大日程 工務助理項目 bug commit 2cbf56132057ad904f3793d96812bdcd3425db06 Author: jrbin Date: Fri Nov 10 16:30:08 2023 +0800 保養人員過濾 commit 31c891cba1aa38784d34fd55a1b68d23c70f89d3 Author: jrbin Date: Fri Nov 10 16:20:10 2023 +0800 客戶資料查詢 commit 92aaf1993796a0727438da092d2fd6bb59796cf3 Author: jrbin Date: Fri Nov 10 15:53:34 2023 +0800 1.欄位檢查 2.新增圖片 commit 566886363a93f844c8319d1549646ee9ab2a5839 Author: jrbin Date: Fri Nov 10 15:18:08 2023 +0800 價審_修改 功能上版 commit 89a6bcb05ac4f0e85aab99d288cbeb7fcae99436 Author: jrbin Date: Fri Nov 10 13:20:42 2023 +0800 mi計算式修正 commit 4c177f24b52548723d257d29ecb71ae1ce15e206 Author: 10994015 Date: Mon Nov 6 17:51:19 2023 +0800 1106 commit 949b37e3308a6e310fde32c4e294b20fbfce0d71 Author: 10994015 Date: Fri Nov 10 08:57:02 2023 +0800 1110 commit 6342bcd477a7b985d83363c144c92b1fba21b24e Author: 10994015 Date: Fri Nov 10 08:49:11 2023 +0800 rebase commit 4ca030cdc4f28aa1930c96757f88c8f095a5b5cb Merge: 0e2ccacc f6b04618 Author: 10994015 Date: Thu Nov 9 17:56:48 2023 +0800 合約入力 修改1109 commit 0e2ccacc04092c5fb357a34e6174f90542bc6cc2 Author: 10994015 Date: Thu Nov 9 17:46:35 2023 +0800 合約入力修改1109 commit 4081028775aefd99c12934674d9074e00de4f47d Author: jrbin Date: Thu Nov 9 11:35:30 2023 +0800 bug fix commit a748df3512ed25d3ffe9e22c8b4cf059dc3a07c6 Author: jrbin Date: Thu Nov 9 11:12:41 2023 +0800 規調子項目序號 commit 822549a4533cd0cc2dcf7381b4a1a0648f81f6d6 Author: gary_chen\gary_chen Date: Thu Nov 9 09:30:07 2023 +0800 修正部分大日程 申請計劃圖上傳 的流程 commit 1f0f2acd176a7371f597c82efa8fd257b748d4f1 Author: 10994015 Date: Thu Nov 9 09:14:05 2023 +0800 新增合約書下載註解 commit cb974a7c19ceb03a25e862277fc67748189c2d31 Author: 10994015 Date: Wed Nov 8 20:00:59 2023 +0800 合約入立wms 完成 commit dcb74c084f4ce72041ebc470bce7dbcf61200885 Author: 10994015 Date: Tue Nov 7 08:36:25 2023 +0800 createFacilityNo.php => getFacilityNo.php commit a56cbd8387996a5db8339d2bd65ce30c5c2fc87b Author: 10994015 Date: Mon Nov 6 17:51:19 2023 +0800 1106 commit a68ca316230cb5b3a844a0367b8552cb554b5048 Merge: 963df7d0 dc86fcc5 Author: 10994015 Date: Thu Nov 9 08:53:30 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit dc86fcc58537a9722d4963307f1847b0b53f1c2c Merge: c59adb60 a8e9365d Author: gary_chen\gary_chen Date: Thu Nov 9 08:51:57 2023 +0800 Merge branch 'main' into gary commit c59adb60bc2ca281cc99cb050d9ca86dc6b42261 Author: gary_chen\gary_chen Date: Thu Nov 9 08:51:29 2023 +0800 1."申請計劃圖上傳功能" 新增上船附件功能 2.大日程開放許協理的編輯權限 commit e2c5b7c9129d45f887840a9cdb55c0d1a3912d59 Author: gary_chen\gary_chen Date: Thu Nov 9 08:45:40 2023 +0800 calander 新增 .env 連線資料庫方式 commit a8e9365d122d7467118bff0a43b13221029db57a Author: jrbin Date: Wed Nov 8 15:02:57 2023 +0800 +鄭伊岑權限 commit fe0a37d5a89c7d3af1fd57550f55aa79403ef5aa Author: gary_chen\gary_chen Date: Wed Nov 8 14:23:55 2023 +0800 1.取消追蹤 出貨地區預定明細.xls 並添加至gitignore 2.作番大日程 index 新增 合約交期(到工地) 欄位 3.待簽進入明細頁 新增 _blank 開啟分頁，並嘗試隱藏已結案的內容。 commit 061a770e055622c35df9799676e9acb6f04ca900 Author: gary_chen\gary_chen Date: Wed Nov 8 14:20:20 2023 +0800 修正出貨地區預定明細報表 commit 8a24ec4e0793ccbb5d492edffa8a32da1d46de40 Merge: 2e291501 d2318ee6 Author: jrbin Date: Wed Nov 8 11:32:33 2023 +0800 Merge branch 'jrbin' commit d2318ee66210b81836e07f1554c06b780357ff4b Author: jrbin Date: Wed Nov 8 11:32:15 2023 +0800 簽核bug修正 commit fb4710f63730b985cd1a701e0d8baeadc9d64c53 Author: gary_chen\gary_chen Date: Wed Nov 8 10:11:23 2023 +0800 1.修正未上傳檔案卻產生日期戳記bug 2.大日程新增許協理更改業務項目的權限 commit 2e29150184c455df3bfeabbab22bb1380d1fc323 Merge: 6e912866 57136fa5 Author: gary_chen\gary_chen Date: Wed Nov 8 09:13:40 2023 +0800 Merge branch 'main' into gary commit 6e912866abf6a19f452e2ed18c21b59e224dbddb Author: gary_chen\gary_chen Date: Wed Nov 8 09:12:41 2023 +0800 gitignore 排除大日程產生的excel commit 57136fa53213875d96b2e8675becf58c64ca25b4 Author: jrbin Date: Wed Nov 8 09:08:38 2023 +0800 sql調整 commit fbad7dff721bec0a449232efa6a2c818f3190e7b Author: gary_chen\gary_chen Date: Wed Nov 8 09:06:34 2023 +0800 大日程 工務助理新增 M0188 commit 2029ab132ffd981df07fb82b348c5db19154be26 Author: gary_chen\gary_chen Date: Wed Nov 8 09:05:55 2023 +0800 大日程系統匯出excel 新增依照地址判斷區域的欄位 commit 9da64863c224ce5063ab75659614ff80ebba000c Author: Ellin Date: Tue Nov 7 15:04:12 2023 +0800 註解掉header.php連T8資料庫的echo commit 963df7d03f4a1a0b4c72d547958b42c7de22590b Merge: c51ffad0 df4c26cc Author: 10994015 Date: Tue Nov 7 08:36:37 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit df4c26cc3c231d37d1cea518979c3e00b1efb7a5 Merge: 7780a7e4 c6dffadf Author: Ellin Date: Tue Nov 7 08:26:43 2023 +0800 Merge branch 'main' into kaiyu commit 7780a7e46c657bfcab437849ca3a1e3aaca25164 Author: Ellin Date: Tue Nov 7 08:25:27 2023 +0800 修改rib01-check權限 commit f6b04618b5c0fe1a754f7bff02349ad84038fcb9 Author: 10994015 Date: Mon Nov 6 17:51:19 2023 +0800 1106 commit db70e5c63276acf6a223ad5fa049b996bbc9a670 Author: gary_chen\gary_chen Date: Mon Nov 6 11:04:17 2023 +0800 新增作番大日程工務部門"經理"權限 commit 72d8aa05287a4ebf29f093b208c5632d7d4191b4 Author: Ellin Date: Mon Nov 6 10:05:19 2023 +0800 新增會計人員權限; 修改通知 commit c51ffad0c16a9af6d1f6bf7f985919290f145e0b Merge: ccc89c52 c6dffadf Author: 10994015 Date: Mon Nov 6 09:14:05 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit ccc89c52d795b4fcb8e54076b036b38a91ca92b7 Author: 10994015 Date: Mon Nov 6 09:13:29 2023 +0800 1116 commit c6dffadf02be1b91147e61b9aee95d6dd714d2ff Merge: 4ecac3c3 6a15faab Author: gary_chen\gary_chen Date: Mon Nov 6 08:44:21 2023 +0800 Merge branch 'gary' commit 4ecac3c39f711bddbeba784acd45f187d7e23854 Merge: d90196db 6d7b8a48 Author: Ellin Date: Fri Nov 3 18:15:53 2023 +0800 Merge branch 'kaiyu' commit 6d7b8a483489343b974b9583cbc520145c0d45f4 Author: Ellin Date: Fri Nov 3 18:15:31 2023 +0800 rib02-edit可看到廠商統編; rib01-business調統編 commit 7db6bb3b294895d661f6d4cc2b8f1dc24ae95ddf Merge: 068e494c a9ee5768 Author: 10994015 Date: Fri Nov 3 18:12:33 2023 +0800 解決衝突 commit 068e494cef35928aeb5c77530770acc10eb9dee5 Author: 10994015 Date: Fri Nov 3 18:01:14 2023 +0800 合約入力 commit 6b1ddc734d18b2ee1af8d6b33e0d64568482aa14 Author: 10994015 Date: Fri Nov 3 18:07:05 2023 +0800 衝突已解決 commit 22b677e3b165786de3a0024b5ae42e21da855944 Merge: 7760a826 d90196db Author: 10994015 Date: Fri Nov 3 18:03:21 2023 +0800 11/3 pull commit 6a15faab1649e3b906b0c34c1c7c5957cf5b04e6 Merge: 67ed3452 d90196db Author: gary_chen\gary_chen Date: Fri Nov 3 18:02:55 2023 +0800 Merge branch 'main' into gary commit 67ed34527e4d6c79d9ce43bd5b59cdba6862fad8 Author: gary_chen\gary_chen Date: Fri Nov 3 18:02:31 2023 +0800 報表修正bug commit d90196db1370c09ff8a50f4628c87216bdfb6c89 Author: jrbin Date: Fri Nov 3 09:30:58 2023 +0800 文字 commit c506fcbed0b34e2b64571a36a74a49ccc670ee99 Author: jrbin Date: Fri Nov 3 09:25:30 2023 +0800 改文字 commit d760420c4b5293314b9463496c6a541a47e2b99c Author: gary_chen\gary_chen Date: Fri Nov 3 09:03:53 2023 +0800 修正大日程 index 頁面顯示錯誤 commit a9ee576846985e37915e9de0e73db8763786d2aa Author: 10994015 Date: Thu Nov 2 17:40:12 2023 +0800 合約入力 11/2 commit 2e7982bdd82b8b8583a7fa8ea27f8960932daac7 Merge: 78acda0d a7258c17 Author: Ellin Date: Thu Nov 2 17:30:36 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 78acda0d8a0a7ac23d0e02f1a865becad322eaca Author: Ellin Date: Thu Nov 2 17:28:30 2023 +0800 改連MSSQL程式碼放的位置; 改供應商偵測 commit f8f352229f3758d02202bb5cbea4f0e78d7ed9a0 Author: gary_chen\gary_chen Date: Thu Nov 2 17:01:16 2023 +0800 1.新增補丁 // 補丁 黃孟澤 & 葉博澄 權限等於 李烘銘。 2.新增暫時刪除及編輯權限 (M0175及M0079)。 3.新增 安裝圖附件時，同時寫入備註。 commit a7258c1784cd33c32a01bd3f0f71d486f3ff0e41 Author: jrbin Date: Thu Nov 2 14:52:31 2023 +0800 開放工務助理專員查詢保養行程 commit 16ce8773d0d955140ba5c65f4928f06df00a513c Author: jrbin Date: Thu Nov 2 11:12:54 2023 +0800 汰改bug fix commit 6fa1926fce6ede2d3bed3de793b171565cc9bae9 Author: jrbin Date: Thu Nov 2 09:53:47 2023 +0800 bug fix commit 3427043146de1691dd3f32ba3251649ada9f8813 Author: jrbin Date: Thu Nov 2 09:35:00 2023 +0800 bug fix commit 63414f7f485c90cd771542ff3ebdcbbe41745cf7 Merge: 8ff78fa7 576814b4 Author: gary_chen\gary_chen Date: Thu Nov 2 09:33:01 2023 +0800 Merge branch 'main' into gary commit 8ff78fa72f04977aeae681009c4db0703d833763 Author: gary_chen\gary_chen Date: Thu Nov 2 09:32:40 2023 +0800 1.新增工務助理確認項分頁 2.新增計畫圖上傳功能 commit 576814b49b9deb01474fcd0651acbee98439b22f Author: jrbin Date: Wed Nov 1 13:01:45 2023 +0800 拆梯&美容成本平均分到每台 commit cabdb2cacd80f233f01201e6b027961ee1968b96 Merge: 17cf832b b00da108 Author: Ellin Date: Wed Nov 1 10:37:36 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 17cf832b9a068464ffea3f5234cbb1d7df081bfa Author: Ellin Date: Wed Nov 1 10:36:05 2023 +0800 將連線T8資料庫存到fun_global內 commit b00da108ef49e7e50fe8cfb7760cece0255119b6 Author: jrbin Date: Wed Nov 1 09:19:44 2023 +0800 開放新梯客戶瀏覽權限：林慧珊 commit b6fff9abec53352bb0173a713b863f905b2c3b19 Author: gary_chen\gary_chen Date: Wed Nov 1 09:14:01 2023 +0800 大日程 實際出貨日(到工地) 變更會通知營業人員 commit 90cf5ce5183072788541ba421bca43ca8f5b77f6 Author: jrbin Date: Tue Oct 31 19:18:10 2023 +0800 remove mkt/mkt/*.* commit 51ff33c86c253a3331dce03504d3afe5e5a01524 Author: jrbin Date: Tue Oct 31 18:12:41 2023 +0800 修正Undefined offset commit ea90ec18fb104fc3d7595408ab1d9041e85860b0 Author: gary_chen\gary_chen Date: Tue Oct 31 17:47:10 2023 +0800 調整大日程欄位大小 commit 05218e934f7ba1761025fb94cad0205056e15ef5 Author: jrbin Date: Tue Oct 31 16:43:35 2023 +0800 電梯拆台計算MI：修改價審及規調功能 commit 7c999a831a0d2d5c6ca2d5920f0310a26febb8a0 Author: gary_chen\gary_chen Date: Tue Oct 31 13:27:15 2023 +0800 新增 datatable 排序功能 commit 065209f768eb1d4019f3ccd678c3bbc8619835c1 Author: gary_chen\gary_chen Date: Tue Oct 31 09:53:17 2023 +0800 Merge branch 'gary' of http://10.10.1.6:3080/masada-admin/httpdocs into gary # Conflicts: # wms/wipwhole-index-function.php # wms/wipwhole-renovate-index-function.php # wms/wipwhole-renovate-rec-invoice-edit.php commit 0e373c1ea518c226188a2a3e245917285c463723 Merge: 082a80bb cb7c2458 Author: gary_chen\gary_chen Date: Tue Oct 31 09:51:35 2023 +0800 Merge branch 'gary' of http://10.10.1.6:3080/masada-admin/httpdocs into gary commit 082a80bb01798fbcacd7526ba439662aebae0e90 Author: gary_chen\gary_chen Date: Mon Oct 30 17:20:44 2023 +0800 補 select2 缺的 js檔 commit cb7c2458c4857455ee1461af02167d36d7959ddd Author: gary_chen\gary_chen Date: Mon Oct 30 17:20:44 2023 +0800 補 select2 缺的 js檔 commit 38847a4d1b2256daf0e236ee918dbe9f0bcbbcc1 Author: gary_chen\gary_chen Date: Mon Oct 30 17:20:14 2023 +0800 no message commit a754755e66cbf9a07637eaccd16bde92f3768705 Author: gary_chen\gary_chen Date: Mon Oct 30 17:19:42 2023 +0800 增加宜蘭工務組長 大日程(實際安裝及試車日程)權限 commit 97c9be8dd081267d4e42cf620d629e37f77cea35 Merge: e7909828 9f4f5b7f Author: gary_chen\gary_chen Date: Mon Oct 30 10:02:52 2023 +0800 Merge branch 'main' into gary commit 9f4f5b7f87744185b08ecc2cb2173a13be642857 Author: Ellin Date: Mon Oct 30 09:48:37 2023 +0800 .env跟T8資料庫連線 commit e7909828a6704c457b554877f88ba4ff6594bfb7 Author: gary_chen\gary_chen Date: Mon Oct 30 09:46:12 2023 +0800 1,作番號製作 範例註解掉 2.保養行程功能製作中 commit 00f569aefeb5757481700079c6f0d01923dd4175 Author: Ellin Date: Mon Oct 30 08:57:08 2023 +0800 rm cache commit 7760a826a4e14c649141ad3d392be8c2bf9d2ec2 Merge: c60b3056 24e99f2d Author: 10994015 Date: Mon Oct 30 08:33:04 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 2ed72098ec8d17354ab94ec2d1873f76c9325357 Author: gary_chen\gary_chen Date: Fri Oct 27 17:32:13 2023 +0800 大日程 datatable 優化 commit 24e99f2d7cc6275c80e71b9a56ad5c14a230ee97 Author: Ellin Date: Fri Oct 27 17:30:55 2023 +0800 改MSSQL密碼 commit 1a2e9c43cce963bf38b828a91187af568b4da38c Author: gary_chen\gary_chen Date: Fri Oct 27 13:33:27 2023 +0800 作番大日程 移除業務編輯上方合約資料的權限 commit 2b8ea61f4071e8b1e94d361e823f713cb36bc7b9 Merge: 24e8e12f 3d86e5d3 Author: gary_chen\gary_chen Date: Fri Oct 27 08:50:01 2023 +0800 Merge remote-tracking branch 'origin/kaiyu' into gary commit 24e8e12f7d50a5211041d6965278ab82f2aab1b5 Author: gary_chen\gary_chen Date: Fri Oct 27 08:47:42 2023 +0800 createFacilityNo.php 1.將資料庫連線方式改為 .env 方式 2.新增檢查保養作番檢查規則 function getMakeNewBFacilityNoStatus 3.移除部分用不到的變數 commit c60b30561c00ed6da3aaff89771ee179ece3fea5 Merge: 473a6f87 0994df4a Author: 10994015 Date: Thu Oct 26 17:59:15 2023 +0800 database update commit 0994df4a881b540667cb543aca09dd23cd6b17da Merge: 8fa28313 95f1891f Author: 10994015 Date: Thu Oct 26 17:57:49 2023 +0800 1026test commit 8fa28313ba509836c2ee8af4d2b453710bc1ae45 Author: 10994015 Date: Thu Oct 26 17:55:38 2023 +0800 1026 test commit 3d86e5d3fa329080842d4270dab17dbce34b8e53 Merge: 5d9db5b6 2a3bf2c3 Author: Ellin Date: Thu Oct 26 17:50:45 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 5d9db5b6948b70a5c0ab70e028105bbc36c191ed Author: Ellin Date: Thu Oct 26 17:48:24 2023 +0800 測試應付確認單API commit 7f3381aeaeaa78275f516165243ebd0c4403c013 Author: 10994015 Date: Thu Oct 26 16:34:20 2023 +0800 commit commit 2a3bf2c364c0a7d3d66207064f673fad1cfeaa4a Author: jrbin Date: Thu Oct 26 16:10:44 2023 +0800 bug fix commit 473a6f87dbab9053542960e2f1fa87d0ff937c23 Merge: 36400ef5 c4c294be Author: gary_chen\gary_chen Date: Thu Oct 26 15:25:27 2023 +0800 Merge branch 'gary' commit 36400ef581edd9945e910a1741e395b6ee22f3e4 Author: gary_chen\gary_chen Date: Thu Oct 26 15:03:46 2023 +0800 hahaha commit c4c294be5830f4c84bff152396cc50e91812ecd6 Merge: dfd1fb5b 2300cf78 Author: gary_chen\gary_chen Date: Thu Oct 26 15:02:03 2023 +0800 Merge branch 'gary' of http://10.10.1.6:3080/masada-admin/httpdocs into gary commit dfd1fb5b693c2b6a175ead2cb42c87641de8f003 Author: gary_chen\gary_chen Date: Thu Oct 26 14:14:59 2023 +0800 建立作番小程式更換路徑至 /wms/createFacilityNo.php => /wms/contract/api/createFacilityNo.php commit 226c45986021395700c485377daf99e5861182e0 Author: gary_chen\gary_chen Date: Thu Oct 26 11:24:33 2023 +0800 優化"申請單"其他裝置登入解析token並自動登入的程式碼 commit 7f6a2aaa4ec39327768b4ba98f04846ea043ca93 Author: gary_chen\gary_chen Date: Thu Oct 26 10:45:26 2023 +0800 修正大日程 品證部門 修改權限bug commit 4630d8f2a2279c23721a570c3301468ecd56cbe5 Author: IA2301\IA_2301 Date: Wed Oct 25 17:40:28 2023 +0800 新增藝匠圖申請表 功能 commit d93ed666e5759131a26e59756b903c1c52fc8107 Merge: cc3d67c6 4599a508 Author: 10994015 Date: Thu Oct 26 14:59:09 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit cc3d67c6fdaea71bffbfe0de5398d8cf013bf112 Author: 10994015 Date: Thu Oct 26 14:59:02 2023 +0800 remove follow .env commit 4599a5081d567acb7880975c3a536b643cb64901 Author: cy9577 Date: Thu Oct 26 06:55:42 2023 +0000 刪除 .env commit e3cad5b60b30968033b23bdecffee877fd71c7df Author: cy9577 Date: Thu Oct 26 06:55:19 2023 +0000 更新 .gitignore commit 7439c3a6a7a71fc7082cf7398dfead8ac7d2f155 Author: cy9577 Date: Thu Oct 26 06:51:05 2023 +0000 新增 .env commit 27c98411d02e1994f7bdbe289f48922780c35730 Author: 10994015 Date: Thu Oct 26 14:41:08 2023 +0800 create env commit b4576c56afb02ad4b4d17a2748f7c850ba9093d4 Author: gary_chen Date: Thu Oct 26 06:30:11 2023 +0000 更新 wms/database.php commit 2300cf7837fb19282141ea9aa98e16ec29a046e1 Author: gary_chen\gary_chen Date: Thu Oct 26 14:29:30 2023 +0800 修正database.php commit 8398630705a14cb86206ebfd8afd323ecc573d57 Merge: a7d1a881 2bb51ce0 Author: gary_chen\gary_chen Date: Thu Oct 26 14:15:46 2023 +0800 Merge branch 'main' into gary commit a7d1a8812f5bc480863beaa822a1f2d95db69520 Author: gary_chen\gary_chen Date: Thu Oct 26 14:14:59 2023 +0800 建立作番小程式更換路徑至 /wms/createFacilityNo.php => /wms/contract/api/createFacilityNo.php commit 2bb51ce0ccfd1a67465c2f3362b5ef65f85ce32d Merge: 95e01ba1 28103d73 Author: jrbin Date: Thu Oct 26 14:06:42 2023 +0800 Merge branch 'jrbin' # Conflicts: # .gitignore commit 28103d739f6cdb1bab802ea136da6b10589b2999 Author: jrbin Date: Thu Oct 26 14:04:37 2023 +0800 update .gitignore commit 95e01ba19a7b17f4f321bca8b297198a1a462e1f Merge: c81b0473 15772786 Author: Ellin Date: Thu Oct 26 13:53:57 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit c81b047335dbf11e8c75759e8dccd76cadfb8690 Author: Ellin Date: Thu Oct 26 13:51:39 2023 +0800 rib01不給改單據編號 commit b79f798f5bd77a14512bcc2f3d18a8266df21a3e Author: Ellin Date: Thu Oct 26 13:32:37 2023 +0800 rib還原為與正式上線版一樣 commit 157727866d588e920a0dfc1284a9098ae4170adf Merge: d85c0191 a53c1baa Author: jrbin Date: Thu Oct 26 11:35:03 2023 +0800 Merge branch 'jrbin' commit a53c1baa286ca6d524c0c40ffd3d87bd4347272d Author: jrbin Date: Thu Oct 26 11:34:13 2023 +0800 電梯廠牌中文 commit d85c01914805f84a3e837082f40f854be4de4b91 Merge: 049aebbc a9e4407b Author: 10994015 Date: Thu Oct 26 11:27:55 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 049aebbcede42fe677aac80a3810ac2fcdfdc6da Author: 10994015 Date: Thu Oct 26 11:27:37 2023 +0800 remove follow .env commit 5936797d46d790ecd42b19bd62e044ec43717019 Author: gary_chen\gary_chen Date: Thu Oct 26 11:24:33 2023 +0800 優化"申請單"其他裝置登入解析token並自動登入的程式碼 commit 76167f4bae073e9ff79b9f85634ba9a1a88b5224 Author: gary_chen\gary_chen Date: Thu Oct 26 10:45:26 2023 +0800 修正大日程 品證部門 修改權限bug commit a9e4407b85c6171d0df723a73f6806fec150d0d2 Author: jrbin Date: Thu Oct 26 10:28:08 2023 +0800 契約價審修改 commit 31fb83dc50e215276869c48e9c4d100de5876165 Author: 10994015 Date: Thu Oct 26 09:41:12 2023 +0800 update .env commit 41f4e98e9d29af11fd653936871d70a7ddcddf1b Author: 10994015 Date: Thu Oct 26 09:35:44 2023 +0800 update env commit 0427d641adaee76cc18fd64ba6183e7583f34e21 Author: cy9577 Date: Thu Oct 26 01:34:38 2023 +0000 新增 .env commit 0aef1d77403843f8aa9da2e13852195f0a03e547 Author: 10994015 Date: Thu Oct 26 09:33:38 2023 +0800 remove .env follow commit d71bcede33247110a611b148077ce47f92dcc2a7 Author: 10994015 Date: Thu Oct 26 09:29:22 2023 +0800 remove .env follow commit e8770beb86a782ee053ee88ff1218977af1c6826 Author: cy9577 Date: Thu Oct 26 01:27:01 2023 +0000 新增 .env commit 271ada6ec630c22eaef26eba479b36e25835d5f0 Merge: 51acf567 e8c6befa Author: 10994015 Date: Thu Oct 26 09:26:32 2023 +0800 Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs commit 51acf567c7ee0dc066617396662aca91caab64ea Author: 10994015 Date: Thu Oct 26 09:26:06 2023 +0800 remove .env follow commit e8c6befa4f3dc463c46c77371cfa46ffc863e4d6 Author: cy9577 Date: Thu Oct 26 01:25:43 2023 +0000 新增 .env commit 9526f04355f3cf1ec03c2df1219a6482e1627a74 Author: cy9577 Date: Thu Oct 26 01:25:30 2023 +0000 刪除 .env commit 3226deb0191222a7b8716d76a5f8cd05e7bd1c74 Author: cy9577 Date: Thu Oct 26 01:23:02 2023 +0000 新增 .gitignore commit 2a1935ae9d60a51d6eee9abb605f73978e147b82 Author: cy9577 Date: Thu Oct 26 01:22:49 2023 +0000 刪除 ..gitignore commit a7c3d5ecfe7594c480dab56fda6ea62cb09c6e5d Author: cy9577 Date: Thu Oct 26 01:22:28 2023 +0000 新增 ..gitignore create .gitignore commit c5d399caa5db30a9c9cc73fd69b4722ff91a271f Author: cy9577 Date: Thu Oct 26 01:21:40 2023 +0000 新增 .env create .env commit d5b966d0245e33598b6c8c30febb2de6c49cddac Author: 10994015 Date: Thu Oct 26 09:20:45 2023 +0800 remove follow .env commit 2d727ec6f6b216f87c5c4479c3f280d103ab0aca Author: 10994015 Date: Thu Oct 26 09:19:54 2023 +0800 update .env commit a929373ad93785e4fd37d746eab537e9e295e4d8 Author: cy9577 Date: Thu Oct 26 01:19:17 2023 +0000 更新 .env commit 5f68c3c17ba5a5a57734ae2a64ac7c1fa4126a45 Author: 10994015 Date: Thu Oct 26 09:17:22 2023 +0800 remove follow wms/contract/.env & wms/account_log commit ae33d8bca3b10254684a70b7d38ad5393650b0ae Merge: 5ec527af a6ce9d57 Author: 10994015 Date: Thu Oct 26 09:03:31 2023 +0800 Merge branch 'main' into yan commit a6ce9d57f83ddae5ce214264655b08bc403a5f68 Author: 10994015 Date: Thu Oct 26 09:00:49 2023 +0800 取消.env &.gitignore追蹤 commit aec5443d6ee324bbaf957022cdc2db077c5f7766 Author: gary_chen\gary_chen Date: Thu Oct 26 09:00:46 2023 +0800 gary branch 拿掉 .env commit 5ec527afbaa57a2ba0596e65fafed8f74275a6b7 Merge: ecaad54f d1ffb81d Author: 10994015 Date: Thu Oct 26 08:43:04 2023 +0800 Merge branch 'main' into yan commit ecaad54f77826556904773ebc805899bd1ee68e8 Author: 10994015 Date: Thu Oct 26 08:41:28 2023 +0800 update .env commit 9862f67c2eaa645f4247640f56acd7aa4a6bcd12 Author: Ellin Date: Thu Oct 26 08:39:31 2023 +0800 放回去rib02-edit commit d1ffb81df18b7e95af86d39d2ef22e84a30bea13 Author: Ellin Date: Wed Oct 25 18:40:43 2023 +0800 rebase commit 59555bbf8f167448290e3a2ab711b206ba00c331 Merge: cfb1ee98 d427e9e1 Author: Ellin Date: Wed Oct 25 18:39:32 2023 +0800 Merge branch 'kaiyu' commit d427e9e1111c0867cbbe77aa228ee6b34f10a518 Author: Ellin Date: Wed Oct 25 18:38:08 2023 +0800 :rm api commit a1dc11deec65809034c316b8958292f2ab8394d9 Author: Ellin Date: Wed Oct 25 18:36:46 2023 +0800 api commit d170df6ab95b744a930bcb0a2c5415ec93818de8 Author: IA2301\IA_2301 Date: Wed Oct 25 17:40:28 2023 +0800 新增藝匠圖申請表 功能 commit cfb1ee98a3194f04b3fc2930a3552249029c236a Author: 10994015 Date: Wed Oct 25 17:53:14 2023 +0800 1025合約書生成修改完成 commit 7e706bdc13d0d8862c16b22293e76ff5931cef2c Author: 10994015 Date: Tue Oct 24 17:44:19 2023 +0800 合約生成增加升降設備除外工程表 commit 95f1891ff530ebdfea438e55771128ca085434cb Author: 10994015 Date: Wed Oct 25 17:53:14 2023 +0800 1025合約書生成修改完成 commit 1c3369a7d324b6fae93c6be4863c52c0b7632e67 Author: gary_chen Date: Wed Oct 25 09:35:52 2023 +0000 更新 .gitignore commit bffd22b9f93ec35956908bc316c28c5c9f55e3cd Author: jrbin Date: Wed Oct 25 15:47:54 2023 +0800 con->cont commit 8dabb2fedb5bb7ed57bf42513f2cb956125c8fe6 Author: jrbin Date: Wed Oct 25 14:37:39 2023 +0800 _con->con commit 7a00d65044f4e4a7ff268e266ca16db7e30739ca Author: jrbin Date: Wed Oct 25 14:26:31 2023 +0800 update .gitignore commit 6873908b7b14a7c856ba95e556e5e95f1eac9866 Author: jrbin Date: Wed Oct 25 14:17:25 2023 +0800 con->cont commit 730741e5ed2eff34817715201d992baaf91ee5ed Author: jrbin Date: Wed Oct 25 13:20:13 2023 +0800 add workflow commit a983f4069c00a0d2e6e726552e85f341caa5c8d4 Author: jrbin Date: Wed Oct 25 13:14:08 2023 +0800 add con commit 09920d716bf7249d37cc897c5b1ddc969a4a6a33 Author: jrbin Date: Wed Oct 25 12:19:45 2023 +0800 restore workflow commit 10648d42c3eeca85cfdf890d1a89a0aeea998637 (origin/jrbin) Author: jrbin Date: Wed Oct 25 11:54:42 2023 +0800 update workflow commit a496c672de3e594699ffdf686314fc0ff504d185 Author: jrbin Date: Wed Oct 25 11:33:50 2023 +0800 add .gitignore commit 7195447afac7ca23d06fba91c1b2b8349122a9e3 Author: Ellin Date: Wed Oct 25 09:29:28 2023 +0800 rebase commit bf7fbf679029efc85c64ef3aab6d608fe648a232 Author: Ellin Date: Wed Oct 25 09:22:56 2023 +0800 rebase commit 00cd453203ad58262905515325607c5905885ae3 Author: cy9577 Date: Wed Oct 25 01:18:16 2023 +0000 更新 .env commit 1840416a69be35f039c5d5f0791fd45a6a4d9ab6 Merge: 481a368d 4001cbb5 Author: Ellin Date: Wed Oct 25 08:27:21 2023 +0800 Merge branch 'kaiyu' of http://10.10.1.6:3080/masada-admin/httpdocs into kaiyu commit 481a368df57d3cfd034aa258631e1ac0a223acee Author: Ellin Date: Tue Oct 24 18:17:47 2023 +0800 修改business index；01edit commit 51d54ee0bf5d3fbe793daae0e8887e86a8107df7 Author: 10994015 Date: Tue Oct 24 17:44:19 2023 +0800 合約生成增加升降設備除外工程表 commit 3dd205d5810f864169bd69ad73b745509fb014b4 Author: 10994015 Date: Tue Oct 24 16:31:09 2023 +0800 create .gitignore commit 3a5cab5f8af2557bd645ee58c8f1f5cafb8512d9 Author: 10994015 Date: Tue Oct 24 15:50:04 2023 +0800 create env commit 51292af6bf46b875efb7cd9fd88189a4665a7f4c Author: 10994015 Date: Tue Oct 24 15:41:41 2023 +0800 create env commit 91eb3c486ef6b88f977c38a2573f8034ba1c5275 Author: 10994015 Date: Tue Oct 24 15:39:26 2023 +0800 還原env commit 17981a99ae3f522da4a733ad9b994b95d86f38d9 Author: 10994015 Date: Tue Oct 24 14:22:01 2023 +0800 db connect info 本地改成戰國策 upload mkt upload wms/mkt commit 4001cbb5a9e38f990ef7a21044d83fed033a8a73 Merge: 82751c74 4ec14a02 Author: Ellin Date: Tue Oct 24 13:14:56 2023 +0800 Merge branch 'kaiyu' of http://10.10.1.6:3080/masada-admin/httpdocs into kaiyu commit 82751c74b0233285e2955eca20aa524ac0fccfca Author: Ellin Date: Tue Oct 24 11:52:55 2023 +0800 會計審核時修改金額與稅率 commit 80604cee860db5d0ede345f84b82446b18a251e0 Author: Ellin Date: Tue Oct 24 10:11:27 2023 +0800 test commit 4ec14a027c864e326ed9f7fe4274fe47ef0654c9 Author: Ellin Date: Tue Oct 24 11:52:55 2023 +0800 會計審核時修改金額與稅率 commit 1631ad2d561a596c96f522a4feb1286044570b3f Author: 10994015 Date: Tue Oct 24 11:50:04 2023 +0800 upload wms/mkt commit 02a1b5b55d209b10ed32b8b05447f23c85fb872b Author: Ellin Date: Tue Oct 24 10:11:27 2023 +0800 test commit c157aacff575664ed047c42ff34d0ef3dda0bcd7 Author: IA2301\M0117 Date: Tue Oct 24 09:54:06 2023 +0800 20231024(二)更新CODE commit 10b79f71d630964172200cf7df331e266af55b4c Author: 10994015 Date: Tue Oct 24 09:45:25 2023 +0800 測試 commit 3484b050d654f7e5a80a052259a9cf855a51a286 Merge: fc707e25 e2f03013 Author: a0980758238 Date: Tue Oct 24 01:34:13 2023 +0000 Merge pull request 'added push message to line group' (#1) from a0980758238/httpdocs:main into main Reviewed-on: http://10.10.1.6:3080/masada-admin/httpdocs/pulls/1 commit e2f030136b24e30b47632a1d123e19ac8186df0a Author: izumi.wang Date: Tue Oct 24 09:26:46 2023 +0800 added push message to line group commit fc707e25130ffdede984a0e7d357b9ba1f4dc005 (tag: wms/app) Author: izumi.wang Date: Mon Oct 23 18:35:12 2023 +0800 first commit