From fe0a37d5a89c7d3af1fd57550f55aa79403ef5aa Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Wed, 8 Nov 2023 14:23:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E8=BF=BD=E8=B9=A4=20?= =?UTF-8?q?=E5=87=BA=E8=B2=A8=E5=9C=B0=E5=8D=80=E9=A0=90=E5=AE=9A=E6=98=8E?= =?UTF-8?q?=E7=B4=B0.xls=20=E4=B8=A6=E6=B7=BB=E5=8A=A0=E8=87=B3gitignore?= =?UTF-8?q?=202.=E4=BD=9C=E7=95=AA=E5=A4=A7=E6=97=A5=E7=A8=8B=20index=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=90=88=E7=B4=84=E4=BA=A4=E6=9C=9F(?= =?UTF-8?q?=E5=88=B0=E5=B7=A5=E5=9C=B0)=20=E6=AC=84=E4=BD=8D=203.=E5=BE=85?= =?UTF-8?q?=E7=B0=BD=E9=80=B2=E5=85=A5=E6=98=8E=E7=B4=B0=E9=A0=81=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=5Fblank=20=E9=96=8B=E5=95=9F=E5=88=86?= =?UTF-8?q?=E9=A0=81=EF=BC=8C=E4=B8=A6=E5=98=97=E8=A9=A6=E9=9A=B1=E8=97=8F?= =?UTF-8?q?=E5=B7=B2=E7=B5=90=E6=A1=88=E7=9A=84=E5=85=A7=E5=AE=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + wms/excel/estimated_shipping_date_report.xlsx | Bin 9083 -> 0 bytes wms/sign/list.php | 24 ++++++++++-------- wms/wipwhole-index-function.php | 2 +- wms/wipwhole-index-table-html.php | 7 +++++ wms/wipwhole-renovate-index-function.php | 6 ++--- wms/wipwhole-renovate-index-table-html.php | 7 +++++ 7 files changed, 33 insertions(+), 14 deletions(-) delete mode 100644 wms/excel/estimated_shipping_date_report.xlsx diff --git a/.gitignore b/.gitignore index c01aa8e5..7a04d2b0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ wms/header.php wms/loginapi.php wms/excel/gary_test.xlsx wms/excel/wipwholeintall.xlsx +wms/excel/estimated_shipping_date_report.xlsx diff --git a/wms/excel/estimated_shipping_date_report.xlsx b/wms/excel/estimated_shipping_date_report.xlsx deleted file mode 100644 index ecbd271cc6e19ad61f90a66f885717257b2dc8f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9083 zcmaJ{1ymf{mIV?5f#48m2=2k%ArRc%U4pwqa0}2taCZ&v5HvUhcY;IX?u|2@_hx?n zWByF{>Z;Y%z4xlS&$+kioL%x#FJ59oK|#Sok-H12iNy$4YeGXooxFsC!hjsr`eZG=B9KcUyiNOBTAt4J*^?eQP+`>9_tC7SPeKIr4N`22a zR@~ol8Lp5&3K?P`sP^m}aiQdN;tGAj$Guh5)ccsH*1mz3IXi1Wi)Y}^% z)638emNaCBBh1XEc(YM9MmnZJkG)>=)=IuhC;iib^h)FbE_h(iEb2Z$U z)n*7;LRBlB*PVMv6>QT)S7buITxOulojdL{Psm*OWF@_%`~h%oxeix%uW(SQNHu%@uTEgAka}FsSZ(x zkj8*TL|^E#&oA0sfNMGJNu)x@#8>zE^#HShGf&@hOnRe+dDlY%*HnzJT{?P@lr#US zNFZ62>TgB9LlnV+)FLKgTa1~kaB~f=|DqD{+KeH~} znWA>jYw^8|LZBdME^}0{X$Azm`dI4O(og2wOvW(y%2HbRRV^}dAW5Tbq zAT_C8$K@W!+e}{M60J8V;i{`nLU$w70w*n@H`i~6KrxJZ#D@dKXMhdXTan?uZvgjG z&>rDG1yWsPRZE1-Ug{T6P^b`rjBSnN9c=9!84T>~eruDiC}^|5h}r_if;na~$%Tgr zFhu1wdAonjgnV;~~y@m{W`CSc9(`}*gF zq|zSLx*FJ2S%-vdmGUVUrOM{Z=>fnXi631DXE^MFf${cPy85earmww8b&OJ-d$sC5$DgXIyuDJ;dLpd#EtqRZe7B zu5jhQk+5HD9Y>(zQ(U&d(ssf!A*@G;SOpb`i_$1Z2~Nsx`A11rDeBur15IEla#k4v z8%1|M)xX5g!K543Qr-}Hdzr{u2N>l4*iA3np$U&mTh(f%cQJP@F6iyBMm+Nc6PB=_ zAhOP=bY;+-L3~xcKZNKtp_sNMGme0&6#PY0_oV$g{|h{m`-jWzb8w-6fH$9yr$_9W z-AW1G+wxQWNt_#Bn~u&`JcqtEwO(Iby$|XAP8he16iY4O)e9;Bj|N2D&Is?M3-zY- zIn)VQZSj^=7mqpgWKCmv)4c)6X{!uU^iMGV4B`g`!AS>55YZq(MEmz38reFS{ElLN zjDlPzBWBRb1D2HDuo>L=4znmpFr|ca_l~7CgZ!`gf>!RU<3nzooVJ_VwDidea7Jy? z;r{!Zm)r54hPwv>;Pdy5I&=S znBVS{9e6vw73WbElyavazN23rQNs0Vmwn2i3WS$s)LU+j)K4xZ%cE}rN5VyvkMs4a zO9hPxHVDCDY{#7a=MHuFs>Rc`-_B>L83ZjvAJM3-ugjinFH;KuY_T{<=cX6VHz$~C zGVw>n=pTLxg=urHnrYvZy3Vt5Cxe@^R$9vY!aTKuduI_gbnbW_c@*Ex954~ZGU_ff zI6CQ4oZn6R#~HC_69xy9>j9aklfSo2ze9AWA!ob5j@f>!gxb_lZAIHms#aL4lv;skH?Ixp(Ef+7!BXX*?~)5nJ(iiDPLo`0S=S8o1A^zR zQEJ#XR&y4skNW|1G40^Y<5Pt;k3+$sF=DisvpgfNM7*~op`$NS0`d1p?Cic-6MwTq z*YCxcsQM(VIm<547{;M2Z0PUH8;#d!BqEuQS5N1a)O*G(Cjnz=L~mHCPbI{IdJR9< zJ7mL-Yv}?sH_U$7_v7-)P1?&p7$9ZoIMOn@N~6G>dXmg};uy*;5{X11dqrwm-S?8a zyVS@p&6f~q;DrfsaK3*~_?ufr+YX}<^M9Up8hE4BrL`#M>9{Pnu z+Jba)_4x&@LVbNR!maT1VI9uOwjq=+Z=?G7%WoQzy>oEdD1D@Y_7qUIsHJ6?N^RQ7 zKaGiZ5mSmIFBQUwNfW-RjrzD<-cx&A-VdC1nf9Uh@OxkET(8N!>cr!G?cABT;`KPo zk(nis>3w&0n)s<@>a_jgdbgtev%#zP_}A+tlIHF0aRCX`LUsP7)Ae_v+VZkVuDjsR3$%0Dqoh<~@G!Y0J78gM` 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 diff --git a/wms/sign/list.php b/wms/sign/list.php index b335de8c..512d7403 100644 --- a/wms/sign/list.php +++ b/wms/sign/list.php @@ -145,19 +145,23 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR)); $data) : + //嘗試將已結案隱藏起來 : 測試使用者體驗 + if ($data['flow_code'] !== 'Z') { ?> - - " > - - - - - + + "> + + + + + + - - - + diff --git a/wms/wipwhole-index-function.php b/wms/wipwhole-index-function.php index 368dc0d6..a8aeed7f 100644 --- a/wms/wipwhole-index-function.php +++ b/wms/wipwhole-index-function.php @@ -909,7 +909,7 @@ function getTabNo($user_department_id) // 由地址取得工務負責人 function getGunwuName($address) { - $north_arr = array('台北', '基隆', '新北', '桃園', '新竹'); + $north_arr = array('台北', '基隆', '新北', '桃園', '新竹', '台東', '花蓮'); $north_arr2 = array('宜蘭'); $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗'); $south_arr = array('台南', '嘉義', '屏東', '高雄'); diff --git a/wms/wipwhole-index-table-html.php b/wms/wipwhole-index-table-html.php index b6a69908..04f873a1 100644 --- a/wms/wipwhole-index-table-html.php +++ b/wms/wipwhole-index-table-html.php @@ -27,6 +27,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) { 規格 地址 工勘狀態 + 合約交期(到工地) 下單日(普來特富) 預計到廠日(觀音廠) 實際到廠日(觀音廠) @@ -150,6 +151,12 @@ if (in_array($user_id, ['M0175', 'M0079'])) { } } ?> + + + 規格 地址 工勘狀態 + 合約交期(到工地) 下單日(普來特富) 預計到廠日(觀音廠) 實際到廠日(觀音廠) @@ -157,6 +158,12 @@ if (in_array($user_id, ['M0175', 'M0079'])) { } } ?> + + +