From 24e8e12f7d50a5211041d6965278ab82f2aab1b5 Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Fri, 27 Oct 2023 08:47:42 +0800 Subject: [PATCH 01/16] =?UTF-8?q?createFacilityNo.php=201.=E5=B0=87?= =?UTF-8?q?=E8=B3=87=E6=96=99=E5=BA=AB=E9=80=A3=E7=B7=9A=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E6=94=B9=E7=82=BA=20.env=20=E6=96=B9=E5=BC=8F=202.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=AA=A2=E6=9F=A5=E4=BF=9D=E9=A4=8A=E4=BD=9C=E7=95=AA?= =?UTF-8?q?=E6=AA=A2=E6=9F=A5=E8=A6=8F=E5=89=87=20=20function=20getMakeNew?= =?UTF-8?q?BFacilityNoStatus=203.=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=94=A8=E4=B8=8D=E5=88=B0=E7=9A=84=E8=AE=8A=E6=95=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/contract/api/createFacilityNo.php | 64 ++++++++++++++++++++------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/wms/contract/api/createFacilityNo.php b/wms/contract/api/createFacilityNo.php index 4ae4adbb..3683c7fa 100644 --- a/wms/contract/api/createFacilityNo.php +++ b/wms/contract/api/createFacilityNo.php @@ -1,9 +1,12 @@ false, @@ -19,7 +41,7 @@ class CreateFacilityNo PDO::ATTR_STRINGIFY_FETCHES => false, PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', ]; - $pdo = new PDO('mysql:host=localhost;port=3306;dbname=appwms', 'masadaroot', 'x6h5E5p#u8y', $options); + $pdo = new PDO('mysql:host=' . $host . ';port=' . $dbport . ';dbname=' . $dbname . '', $dbuser, $dbpassword, $options); $pdo->exec('SET CHARACTER SET utf8mb4'); return $pdo; } catch (PDOException $e) { @@ -199,8 +221,8 @@ class CreateFacilityNo } foreach ($new_facility_no_arr as $new_facility_no) { - if ($this->getMakeNewTFacilityNoStatus($faclikity_details) !== "1") { - return $new_facility_no . ":" . $this->getMakeNewTFacilityNoStatus($faclikity_details); + if ($this->getMakeNewBFacilityNoStatus($faclikity_details) !== "1") { + return $new_facility_no . ":" . $this->getMakeNewBFacilityNoStatus($faclikity_details); } // seq +1 $this->facilitySeqAddOne("B"); @@ -215,11 +237,8 @@ class CreateFacilityNo */ function getMakeNewMFacilityNoStatus($faclikity_details) { - $Y = substr(date("Y"), 3, 1); $sale_type = $faclikity_details['sale_type']; $make_type = $faclikity_details['make_type']; - $next_seq = $this->getNextFacilitySeq("mf_vol_no"); - $new_facility_no = $Y . $sale_type . $make_type . str_pad($next_seq + 1, 5, "0", STR_PAD_LEFT); if ($this->checkSaleTypeStatus($sale_type) == false) return "銷售代號錯誤"; @@ -235,14 +254,25 @@ class CreateFacilityNo */ function getMakeNewTFacilityNoStatus($faclikity_details) { - $Y = substr(date("Y"), 3, 1); $sale_type = $faclikity_details['sale_type']; $make_type = $faclikity_details['make_type']; - $num = $faclikity_details['num']; - $next_seq = $this->getNextFacilitySeq("mf_vol_no"); - $new_facility_no = $Y . $sale_type . $make_type - . str_pad($next_seq + 1, 3, "0", STR_PAD_LEFT) - . str_pad($num, 2, "0", STR_PAD_LEFT); + + if ($this->checkSaleTypeStatus($sale_type) == false) + return "銷售代號錯誤"; + if ($this->checkMakeTypeStatus($make_type) == false) + return "製造編號類型錯誤"; + return "1"; + } + + /** + * 檢查作番編列狀態 - 保養 + * @param array $faclikity_details + * @return string $status : 1:正確 else:error message + */ + function getMakeNewBFacilityNoStatus($faclikity_details) + { + $sale_type = $faclikity_details['sale_type']; + $make_type = $faclikity_details['make_type']; if ($this->checkSaleTypeStatus($sale_type) == false) return "銷售代號錯誤"; @@ -474,8 +504,8 @@ $cfn = new CreateFacilityNo; print_r($cfn->makeMFacilityNo("M", "X", 5)); echo "

"; // 建立作番號 - 汰改 -print_r($cfn->makeTFacilityNo( "M", "X", 1)); +print_r($cfn->makeTFacilityNo("M", "X", 1)); echo "

"; // 建立作番號 - 保養 -print_r($cfn->makeBFacilityNo( "M", "X", 1)); -echo "

"; \ No newline at end of file +print_r($cfn->makeBFacilityNo("M", "X", 1)); +echo "

"; From 1a2e9c43cce963bf38b828a91187af568b4da38c Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Fri, 27 Oct 2023 13:33:27 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BD=9C=E7=95=AA=E5=A4=A7=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=20=E7=A7=BB=E9=99=A4=E6=A5=AD=E5=8B=99=E7=B7=A8?= =?UTF-8?q?=E8=BC=AF=E4=B8=8A=E6=96=B9=E5=90=88=E7=B4=84=E8=B3=87=E6=96=99?= =?UTF-8?q?=E7=9A=84=E6=AC=8A=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/wipwhole-rec-invoice-edit-submit.php | 38 +++++++++--------- wms/wipwhole-rec-invoice-edit.php | 32 +++++++-------- ...whole-renovate-rec-invoice-edit-submit.php | 40 +++++++++---------- wms/wipwhole-renovate-rec-invoice-edit.php | 34 ++++++++-------- 4 files changed, 72 insertions(+), 72 deletions(-) diff --git a/wms/wipwhole-rec-invoice-edit-submit.php b/wms/wipwhole-rec-invoice-edit-submit.php index daa90180..35d9cf59 100644 --- a/wms/wipwhole-rec-invoice-edit-submit.php +++ b/wms/wipwhole-rec-invoice-edit-submit.php @@ -383,25 +383,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { } } 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 .= " + // 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' , diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php index 15cf7a1a..6fba7b73 100644 --- a/wms/wipwhole-rec-invoice-edit.php +++ b/wms/wipwhole-rec-invoice-edit.php @@ -90,7 +90,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; 合約號 - " > + " disabled> 作番號 - " > + " disabled> 客戶名稱 - " > + " disabled> 號機 - " > + " disabled> 經度 - " > + " disabled> 緯度 - " > + " disabled> 地址 - " > + " disabled> 工地地址
機型 - " > + " disabled> 開門方式 - 速度 > - " > + " disabled> 工地負責人 - " > + " disabled> 載重 - " > + " disabled> 人乘 - " > + " disabled> 樓停 - " > + " disabled> 樓層 - " > + " disabled> 合約交期
(到工地) - > + 預計交期(到工地)
diff --git a/wms/wipwhole-renovate-rec-invoice-edit-submit.php b/wms/wipwhole-renovate-rec-invoice-edit-submit.php index cad732c1..5b519cb8 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit-submit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit-submit.php @@ -360,26 +360,26 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { } } else if ($user_department_id == 321) { // 共用更新 - $updatesql .= " - contractno = '$contractno', - facility_temp_no = '$facility_temp_no', - renovate_type = '$renovate_type', - 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 .= " + // contractno = '$contractno', + // facility_temp_no = '$facility_temp_no', + // renovate_type = '$renovate_type', + // 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 .= " diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php index 27d2dd88..1819bfa6 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit.php @@ -87,7 +87,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 合約號 - " > + " disabled> 作番號 - " > + " disabled> 汰改種類 - @@ -122,21 +122,21 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 合約交期
(到工地) - > + 客戶名稱 - " > + " disabled> 號機 - " > + " disabled> 工地負責人 - " > + " disabled> 預計交期(到工地)
@@ -152,15 +152,15 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 經度 - " > + " disabled> 緯度 - " > + " disabled> 地址 - " > + " disabled> 工地地址
載重 - " > + " disabled> 人乘 - " > + " disabled> 樓停 - " > + " disabled> 樓層 - " > + " disabled> 機型 - " > + " disabled> 開門方式 - 速度 - " > + " disabled> 簽核狀況 From 2ed72098ec8d17354ab94ec2d1873f76c9325357 Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Fri, 27 Oct 2023 17:32:13 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=A4=A7=E6=97=A5=E7=A8=8B=20datatable?= =?UTF-8?q?=20=E5=84=AA=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/css/dataTables.fixedColumns.min.js | 4 + wms/wipwhole-index-table-html.php | 30 +++---- wms/wipwhole-index.php | 19 ++++- wms/wipwhole-renovate-index-table-html.php | 30 +++---- wms/wipwhole-renovate-index.php | 78 +++++-------------- wms/wipwholeinstall-index-table-html.php | 36 ++++----- wms/wipwholeinstall-index.php | 32 ++++++-- ...wholeinstall-renovate-index-table-html.php | 35 ++++----- wms/wipwholeinstall-renovate-index.php | 50 +++++------- 9 files changed, 146 insertions(+), 168 deletions(-) create mode 100644 wms/css/dataTables.fixedColumns.min.js diff --git a/wms/css/dataTables.fixedColumns.min.js b/wms/css/dataTables.fixedColumns.min.js new file mode 100644 index 00000000..f8202b8e --- /dev/null +++ b/wms/css/dataTables.fixedColumns.min.js @@ -0,0 +1,4 @@ +/*! FixedColumns 4.3.0 + * © SpryMedia Ltd - datatables.net/license + */ +!function(e){var i,o;"function"==typeof define&&define.amd?define(["jquery","datatables.net"],function(t){return e(t,window,document)}):"object"==typeof exports?(i=require("jquery"),o=function(t,s){s.fn.dataTable||require("datatables.net")(t,s)},"undefined"==typeof window?module.exports=function(t,s){return t=t||window,s=s||i(t),o(t,s),e(s,0,t.document)}:(o(window,i),module.exports=e(i,window,window.document))):e(jQuery,window,document)}(function(o,t,s,F){"use strict";var A,i,e,l,d=o.fn.dataTable;function r(t,s){var e=this;if(i&&i.versionCheck&&i.versionCheck("1.10.0"))return t=new i.Api(t),this.classes=A.extend(!0,{},r.classes),this.c=A.extend(!0,{},r.defaults,s),s&&s.left!==F||this.c.leftColumns===F||(this.c.left=this.c.leftColumns),s&&s.right!==F||this.c.rightColumns===F||(this.c.right=this.c.rightColumns),this.s={barWidth:0,dt:t,rtl:"rtl"===A("body").css("direction")},s={bottom:"0px",display:"block",position:"absolute",width:this.s.barWidth+1+"px"},this.dom={leftBottomBlocker:A("
").css(s).css("left",0).addClass(this.classes.leftBottomBlocker),leftTopBlocker:A("
").css(s).css({left:0,top:0}).addClass(this.classes.leftTopBlocker),rightBottomBlocker:A("
").css(s).css("right",0).addClass(this.classes.rightBottomBlocker),rightTopBlocker:A("
").css(s).css({right:0,top:0}).addClass(this.classes.rightTopBlocker)},this.s.dt.settings()[0]._bInitComplete?(this._addStyles(),this._setKeyTableListener()):t.one("init.dt.dtfc",function(){e._addStyles(),e._setKeyTableListener()}),t.on("column-sizing.dt.dtfc",function(){return e._addStyles()}),t.settings()[0]._fixedColumns=this,t.on("destroy",function(){return e._destroy()}),this;throw new Error("FixedColumns requires DataTables 1.10 or newer")}function h(t,s){void 0===s&&(s=null);t=new d.Api(t),s=s||t.init().fixedColumns||d.defaults.fixedColumns;new e(t,s)}return r.prototype.left=function(t){return t!==F?(0<=t&&t<=this.s.dt.columns().count()&&(this.c.left=t,this._addStyles()),this):this.c.left},r.prototype.right=function(t){return t!==F?(0<=t&&t<=this.s.dt.columns().count()&&(this.c.right=t,this._addStyles()),this):this.c.right},r.prototype._addStyles=function(){this.s.dt.settings()[0].oScroll.sY&&(s=A(this.s.dt.table().node()).closest("div.dataTables_scrollBody")[0],e=this.s.dt.settings()[0].oBrowser.barWidth,s.offsetWidth-s.clientWidth>=e?this.s.barWidth=e:this.s.barWidth=0,this.dom.rightTopBlocker.css("width",this.s.barWidth+1),this.dom.leftTopBlocker.css("width",this.s.barWidth+1),this.dom.rightBottomBlocker.css("width",this.s.barWidth+1),this.dom.leftBottomBlocker.css("width",this.s.barWidth+1));for(var t=null,s=this.s.dt.column(0).header(),e=null,i=(null!==s&&(e=(s=A(s)).outerHeight()+1,t=A(s.closest("div.dataTables_scroll")).css("position","relative")),this.s.dt.column(0).footer()),o=null,l=(null!==i&&(o=(i=A(i)).outerHeight(),null===t)&&(t=A(i.closest("div.dataTables_scroll")).css("position","relative")),this.s.dt.columns().data().toArray().length),d=0,r=0,h=A(this.s.dt.table().node()).children("tbody").children("tr"),n=0,a=new Map,c=0;c=l-this.c.right){if(A(this.s.dt.table().node()).addClass(this.classes.tableFixedRight),t.addClass(this.classes.tableFixedRight),c+1+ye.left)&&(l=r.scrollLeft(),r.scrollLeft(l-(e.left-(d.left+o))))}),this.s.dt.on("draw.dt.dtfc",function(){h._addStyles()}),this.s.dt.on("column-reorder.dt.dtfc",function(){h._addStyles()}),this.s.dt.on("column-visibility.dt.dtfc",function(t,s,e,i,o){o&&!s.bDestroying&&setTimeout(function(){h._addStyles()},50)})},r.version="4.3.0",r.classes={fixedLeft:"dtfc-fixed-left",fixedRight:"dtfc-fixed-right",leftBottomBlocker:"dtfc-left-bottom-blocker",leftTopBlocker:"dtfc-left-top-blocker",rightBottomBlocker:"dtfc-right-bottom-blocker",rightTopBlocker:"dtfc-right-top-blocker",tableFixedLeft:"dtfc-has-left",tableFixedRight:"dtfc-has-right"},r.defaults={i18n:{button:"FixedColumns"},left:1,right:0},e=r,i=(A=o).fn.dataTable,o.fn.dataTable.FixedColumns=e,o.fn.DataTable.FixedColumns=e,(l=d.Api.register)("fixedColumns()",function(){return this}),l("fixedColumns().left()",function(t){var s=this.context[0];return t!==F?(s._fixedColumns.left(t),this):s._fixedColumns.left()}),l("fixedColumns().right()",function(t){var s=this.context[0];return t!==F?(s._fixedColumns.right(t),this):s._fixedColumns.right()}),d.ext.buttons.fixedColumns={action:function(t,s,e,i){o(e).attr("active")?(o(e).removeAttr("active").removeClass("active"),s.fixedColumns().left(0),s.fixedColumns().right(0)):(o(e).attr("active","true").addClass("active"),s.fixedColumns().left(i.config.left),s.fixedColumns().right(i.config.right))},config:{left:1,right:0},init:function(t,s,e){t.settings()[0]._fixedColumns===F&&h(t.settings(),e),o(s).attr("active","true").addClass("active"),t.button(s).text(e.text||t.i18n("buttons.fixedColumns",t.settings()[0]._fixedColumns.c.i18n.button))},text:null},o(s).on("plugin-init.dt",function(t,s){"dt"!==t.namespace||!s.oInit.fixedColumns&&!d.defaults.fixedColumns||s._fixedColumns||h(s,null)}),d}); \ No newline at end of file diff --git a/wms/wipwhole-index-table-html.php b/wms/wipwhole-index-table-html.php index d83fdd65..85d7fff0 100644 --- a/wms/wipwhole-index-table-html.php +++ b/wms/wipwhole-index-table-html.php @@ -8,23 +8,23 @@ $tableArr = array( "Z" => "table_index7" ); ?> - +
- - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/wms/wipwhole-index.php b/wms/wipwhole-index.php index 0e95ce49..2822b43a 100644 --- a/wms/wipwhole-index.php +++ b/wms/wipwhole-index.php @@ -237,8 +237,20 @@ foreach ($dataArr as $key => $val) { // 結束連線 mysqli_close($link); ?> - - + + + + + + - + + + \ No newline at end of file diff --git a/wms/wipwholeinstall-renovate-index-table-html.php b/wms/wipwholeinstall-renovate-index-table-html.php index b44ea48b..6de246ce 100644 --- a/wms/wipwholeinstall-renovate-index-table-html.php +++ b/wms/wipwholeinstall-renovate-index-table-html.php @@ -2,24 +2,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/wms/wipwholeinstall-renovate-index.php b/wms/wipwholeinstall-renovate-index.php index ccbd9fd6..80b675a5 100644 --- a/wms/wipwholeinstall-renovate-index.php +++ b/wms/wipwholeinstall-renovate-index.php @@ -177,8 +177,22 @@ foreach ($dataArr as $key => $val) { // 結束連線 mysqli_close($link); ?> - - + + + +"; - } -} - if ($_SERVER["REQUEST_METHOD"] == "POST") { if ($_POST['form_name'] == 'update_install_date_form') { foreach ($_POST as $k => $v) diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php index 6fba7b73..8f6080b8 100644 --- a/wms/wipwhole-rec-invoice-edit.php +++ b/wms/wipwhole-rec-invoice-edit.php @@ -1,5 +1,5 @@ options 開門方式 @@ -264,6 +264,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
  • 工務確認項
  • 生管確認項
  • 品證確認項
    • +
  • 工務助理確認項
    • 合約號電梯編號客戶姓名規格地址工勘狀態下單日
    (普來特富)    		預計到廠日
    (觀音廠)    		實際到廠日
    (觀音廠)    		預計出貨日
    (到工地)    		營業/契約確認設計確認工務確認生管(業 務)確認合約號電梯編號客戶姓名規格地址工勘狀態下單日(普來特富)預計到廠日(觀音廠)實際到廠日(觀音廠)預計出貨日(到工地)營業確認設計確認工務確認生管(業務)確認
    汰改
    種類    		電梯編號客戶姓名合約地址地工地址預計出貨日發包廠商(工勘)發包日期(工勘)預計開工日(工勘)實際開工日(工勘)預計完工日(工勘)實際完工日(工勘)QC日(品證)QC合格日(品證)官檢日(品證)移交日(營業)營業人員編輯電梯編號客戶姓名合約地址地工地址預計出貨日發包廠商(工勘)發包日期(工勘)預計開工日(工勘)實際開工日(工勘)預計完工日(工勘)實際完工日(工勘)QC日(品證)QC合格日(品證)官檢日(品證)移交日(營業)營業人員編輯
    @@ -341,9 +342,9 @@ include "wipwhole-rec-invoice-edit-submit.php"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    附件 > @@ -834,162 +835,6 @@ include "wipwhole-rec-invoice-edit-submit.php"; ?>
    - 預計安裝及試車日程 -
    - (工務助理項目) -
    安裝發包廠商 - /> - 確認人 - -
    安裝發包日 -
    - > - - - -
    -     		確認人 - -
    預計安裝開工日 -
    - > - - - -
    -     		確認人 - -
    預計安裝完工日 -
    - > - - - -
    -     		確認人 - -
    試車發包廠商 - /> - 確認人 - -
    試車發包日 -
    - > - - - -
    -     		確認人 - -
    預計試車開工日 -
    - > - - - -
    -     		確認人 - -
    預計試車完工日 -
    - > - - - -
    -     		確認人 - -
    備註 - -
    - 存檔"; - ?> -
    實際安裝及試車日程 @@ -1350,7 +1195,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
    實際出貨日(到工地) - > + > @@ -1439,6 +1284,174 @@ include "wipwhole-rec-invoice-edit-submit.php";
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + 預計安裝及試車日程 +
    + (工務助理項目) +
    安裝發包廠商 + /> + 確認人 + +
    安裝發包日 +
    + > + + + +
    +     		確認人 + +
    預計安裝開工日 +
    + > + + + +
    +     		確認人 + +
    預計安裝完工日 +
    + > + + + +
    +     		確認人 + +
    試車發包廠商 + /> + 確認人 + +
    試車發包日 +
    + > + + + +
    +     		確認人 + +
    預計試車開工日 +
    + > + + + +
    +     		確認人 + +
    預計試車完工日 +
    + > + + + +
    +     		確認人 + +
    備註 + +
    計劃圖附件 + > + 下載附件" : ""; + ?> +
    + 存檔"; + ?> +
    +
    @@ -1471,26 +1484,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
    -
    - - - - - - - - - - - - - - - - - - -
    +
    @@ -1579,14 +1573,20 @@ include "wipwhole-rec-invoice-edit-submit.php"; }); var oursourcer_input_arr = [ - 'install_outsourcer', - 'install_outsourcer_date', 'install_start_date', 'install_end_date', - 'tryrun_outsourcer', - 'tryrun_outsourcer_date', 'tryrun_start_date', 'tryrun_end_date', + ] + for (var i = 0; i < oursourcer_input_arr.length; i++) { + inputChangeOutsourcer(oursourcer_input_arr[i]); + } + + var oursourcer_input_arr = [ + 'install_outsourcer', + 'install_outsourcer_date', + 'tryrun_outsourcer', + 'tryrun_outsourcer_date', 'estimate_install_outsourcer', 'estimate_install_start_date', 'estimate_install_end_date', @@ -1595,7 +1595,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; 'estimate_tryrun_end_date', ] for (var i = 0; i < oursourcer_input_arr.length; i++) { - inputChangeOutsourcer(oursourcer_input_arr[i]); + inputChangeOutsourcer2(oursourcer_input_arr[i]); } }); @@ -1613,6 +1613,12 @@ include "wipwhole-rec-invoice-edit-submit.php"; }); } + function inputChangeOutsourcer2(input_name) { + $("#" + input_name).on("change", function() { + $("#" + input_name + "_owner").val(""); + }); + } + function formatDate() { var timestamp = Date.now(); var date = new Date(timestamp); @@ -1829,29 +1835,6 @@ include "wipwhole-rec-invoice-edit-submit.php"; } } - function saveEstimateInstallData() { - if (confirm('確定要更改預計安裝日程嗎?') == true) { - $("#install_outsourcer").val($("#install_outsourcer_tmp").val()); - $("#install_outsourcer_owner").val($("#install_outsourcer_owner_tmp").val()); - $("#install_outsourcer_date").val($("#install_outsourcer_date_tmp").val()); - $("#install_outsourcer_date_owner").val($("#install_outsourcer_date_owner_tmp").val()); - $("#estimate_install_start_date").val($("#estimate_install_start_date_tmp").val()); - $("#estimate_install_start_date_owner").val($("#estimate_install_start_date_owner_tmp").val()); - $("#estimate_install_end_date").val($("#estimate_install_end_date_tmp").val()); - $("#estimate_install_end_date_owner").val($("#estimate_install_end_date_owner_tmp").val()); - $("#tryrun_outsourcer").val($("#tryrun_outsourcer_tmp").val()); - $("#tryrun_outsourcer_owner").val($("#tryrun_outsourcer_owner_tmp").val()); - $("#tryrun_outsourcer_date").val($("#tryrun_outsourcer_date_tmp").val()); - $("#tryrun_outsourcer_date_owner").val($("#tryrun_outsourcer_date_owner_tmp").val()); - $("#estimate_tryrun_start_date").val($("#estimate_tryrun_start_date_tmp").val()); - $("#estimate_tryrun_start_date_owner").val($("#estimate_tryrun_start_date_owner_tmp").val()); - $("#estimate_tryrun_end_date").val($("#estimate_tryrun_end_date_tmp").val()); - $("#estimate_tryrun_end_date_owner").val($("#estimate_tryrun_end_date_owner_tmp").val()); - $("#warehouse_assistant_remark").val($("#warehouse_assistant_remark_tmp").val()); - $('#update_estimate_install_date_form').submit(); - } - } - function saveInstallData() { if (confirm('確定要更改實際安裝日程嗎?') == true) { $("#install_start_date").val($("#install_start_date_tmp").val()); diff --git a/wms/wipwhole-rec-invoice.php b/wms/wipwhole-rec-invoice.php index 3d1b0207..787a92d6 100644 --- a/wms/wipwhole-rec-invoice.php +++ b/wms/wipwhole-rec-invoice.php @@ -770,11 +770,11 @@ if ($department_id == "321" || $department_id == "220") { 合約交期
    (到工地) - + 預計交期
    (到工地) - + diff --git a/wms/wipwhole-renovate-rec-invoice-edit-submit.php b/wms/wipwhole-renovate-rec-invoice-edit-submit.php index 277fd3f4..ed3df4f3 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit-submit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit-submit.php @@ -93,6 +93,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $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']; + // 工務助理 + $install_outsourcer = $_POST['install_outsourcer']; + $install_outsourcer_owner = $_POST['install_outsourcer_owner']; + $install_outsourcer_date = $_POST['install_outsourcer_date']; + $install_outsourcer_date_owner = $_POST['install_outsourcer_date_owner']; + $estimate_install_start_date = $_POST['estimate_install_start_date']; + $estimate_install_start_date_owner = $_POST['estimate_install_start_date_owner']; + $estimate_install_end_date = $_POST['estimate_install_end_date']; + $estimate_install_end_date_owner = $_POST['estimate_install_end_date_owner']; + $tryrun_outsourcer = $_POST['tryrun_outsourcer']; + $tryrun_outsourcer_owner = $_POST['tryrun_outsourcer_owner']; + $tryrun_outsourcer_date = $_POST['tryrun_outsourcer_date']; + $tryrun_outsourcer_date_owner = $_POST['tryrun_outsourcer_date_owner']; + $estimate_tryrun_start_date = $_POST['estimate_tryrun_start_date']; + $estimate_tryrun_start_date_owner = $_POST['estimate_tryrun_start_date_owner']; + $estimate_tryrun_end_date = $_POST['estimate_tryrun_end_date']; + $estimate_tryrun_end_date_owner = $_POST['estimate_tryrun_end_date_owner']; + $warehouse_assistant_remark = $_POST['warehouse_assistant_remark']; + // 工勘變更通知繪圖人員 if ($site_survey_contact_verify !== $old_site_survey_contact_verify) { $site_survey_status = array( @@ -448,6 +467,30 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { echo "暫無權限"; exit(); } + + // 工務助理 + $updatesql .= " + install_outsourcer = '$install_outsourcer', + install_outsourcer_owner = '$install_outsourcer_owner', + install_outsourcer_date = '$install_outsourcer_date', + install_outsourcer_date_owner = '$install_outsourcer_date_owner', + estimate_install_start_date = '$estimate_install_start_date', + estimate_install_start_date_owner = '$estimate_install_start_date_owner', + estimate_install_end_date = '$estimate_install_end_date', + estimate_install_end_date_owner = '$estimate_install_end_date_owner', + tryrun_outsourcer = '$tryrun_outsourcer', + tryrun_outsourcer_owner = '$tryrun_outsourcer_owner', + tryrun_outsourcer_date = '$tryrun_outsourcer_date', + tryrun_outsourcer_date_owner = '$tryrun_outsourcer_date_owner', + estimate_tryrun_start_date = '$estimate_tryrun_start_date', + estimate_tryrun_start_date_owner = '$estimate_tryrun_start_date_owner', + estimate_tryrun_end_date = '$estimate_tryrun_end_date', + estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner', + warehouse_assistant_remark = '$warehouse_assistant_remark', + "; + if (!empty($plan_diagram_file)) + $updatesql .= "plan_diagram_file = '$plan_diagram_file', "; + $updatesql .= " creater = '$creater', create_at = '$create_at' @@ -689,62 +732,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { } -if ($_SERVER["REQUEST_METHOD"] == "POST") { - if ($_POST['form_name'] == 'update_estimate_install_date_form') { - foreach ($_POST as $k => $v) - $$k = htmlspecialchars(stripslashes(trim($v))); - - $install_outsourcer = $_POST['install_outsourcer']; - $install_outsourcer_owner = $_POST['install_outsourcer_owner']; - $install_outsourcer_date = $_POST['install_outsourcer_date']; - $install_outsourcer_date_owner = $_POST['install_outsourcer_date_owner']; - $estimate_install_start_date = $_POST['estimate_install_start_date']; - $estimate_install_start_date_owner = $_POST['estimate_install_start_date_owner']; - $estimate_install_end_date = $_POST['estimate_install_end_date']; - $estimate_install_end_date_owner = $_POST['estimate_install_end_date_owner']; - $tryrun_outsourcer = $_POST['tryrun_outsourcer']; - $tryrun_outsourcer_owner = $_POST['tryrun_outsourcer_owner']; - $tryrun_outsourcer_date = $_POST['tryrun_outsourcer_date']; - $tryrun_outsourcer_date_owner = $_POST['tryrun_outsourcer_date_owner']; - $estimate_tryrun_start_date = $_POST['estimate_tryrun_start_date']; - $estimate_tryrun_start_date_owner = $_POST['estimate_tryrun_start_date_owner']; - $estimate_tryrun_end_date = $_POST['estimate_tryrun_end_date']; - $estimate_tryrun_end_date_owner = $_POST['estimate_tryrun_end_date_owner']; - $warehouse_assistant_remark = $_POST['warehouse_assistant_remark']; - - $updatesql = " - UPDATE wipwholestatus - SET - install_outsourcer = '$install_outsourcer', - install_outsourcer_owner = '$install_outsourcer_owner', - install_outsourcer_date = '$install_outsourcer_date', - install_outsourcer_date_owner = '$install_outsourcer_date_owner', - estimate_install_start_date = '$estimate_install_start_date', - estimate_install_start_date_owner = '$estimate_install_start_date_owner', - estimate_install_end_date = '$estimate_install_end_date', - estimate_install_end_date_owner = '$estimate_install_end_date_owner', - tryrun_outsourcer = '$tryrun_outsourcer', - tryrun_outsourcer_owner = '$tryrun_outsourcer_owner', - tryrun_outsourcer_date = '$tryrun_outsourcer_date', - tryrun_outsourcer_date_owner = '$tryrun_outsourcer_date_owner', - estimate_tryrun_start_date = '$estimate_tryrun_start_date', - estimate_tryrun_start_date_owner = '$estimate_tryrun_start_date_owner', - estimate_tryrun_end_date = '$estimate_tryrun_end_date', - estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner', - warehouse_assistant_remark = '$warehouse_assistant_remark' - WHERE id = '$id' - "; - // echo $updatesql; - // exit; - mysqli_query($link, $updatesql); - - echo ""; - } -} - if ($_SERVER["REQUEST_METHOD"] == "POST") { if ($_POST['form_name'] == 'update_install_date_form') { foreach ($_POST as $k => $v) diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php index da0c6662..ba056c99 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit.php @@ -1,5 +1,5 @@ options 開門方式 @@ -253,6 +253,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
  • 設計確認項
  • 生管確認項
  • 品証確認項
    • +
  • 工務助理確認項
    • @@ -436,162 +437,6 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - 預計安裝及試車日程 -
    - (工務助理項目) -
    安裝發包廠商 - /> - 確認人 - -
    安裝發包日 -
    - > - - - -
    -     		確認人 - -
    預計安裝開工日 -
    - > - - - -
    -     		確認人 - -
    預計安裝完工日 -
    - > - - - -
    -     		確認人 - -
    試車發包廠商 - /> - 確認人 - -
    試車發包日 -
    - > - - - -
    -     		確認人 - -
    預計試車開工日 -
    - > - - - -
    -     		確認人 - -
    預計試車完工日 -
    - > - - - -
    -     		確認人 - -
    備註 - -
    - 存檔"; - ?> -
    實際安裝及試車日程 @@ -1345,7 +1190,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
    實際出貨日(到工地) - > + > @@ -1436,6 +1281,174 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + 預計安裝及試車日程 +
    + (工務助理項目) +
    安裝發包廠商 + /> + 確認人 + +
    安裝發包日 +
    + > + + + +
    +     		確認人 + +
    預計安裝開工日 +
    + > + + + +
    +     		確認人 + +
    預計安裝完工日 +
    + > + + + +
    +     		確認人 + +
    試車發包廠商 + /> + 確認人 + +
    試車發包日 +
    + > + + + +
    +     		確認人 + +
    預計試車開工日 +
    + > + + + +
    +     		確認人 + +
    預計試車完工日 +
    + > + + + +
    +     		確認人 + +
    備註 + +
    計劃圖附件 + > + 下載附件" : ""; + ?> +
    + 存檔"; + ?> +
    +
    @@ -1468,26 +1481,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
    -
    - - - - - - - - - - - - - - - - - - -
    +
    @@ -1577,15 +1571,22 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; $("#arrival_date_verify_tmp,#actual_tofactory_date_tmp").on("change", function() { $("#arrival_date_owner_tmp").val(""); }); + var oursourcer_input_arr = [ - 'install_outsourcer', - 'install_outsourcer_date', 'install_start_date', 'install_end_date', - 'tryrun_outsourcer', - 'tryrun_outsourcer_date', 'tryrun_start_date', 'tryrun_end_date', + ] + for (var i = 0; i < oursourcer_input_arr.length; i++) { + inputChangeOutsourcer(oursourcer_input_arr[i]); + } + + var oursourcer_input_arr = [ + 'install_outsourcer', + 'install_outsourcer_date', + 'tryrun_outsourcer', + 'tryrun_outsourcer_date', 'estimate_install_outsourcer', 'estimate_install_start_date', 'estimate_install_end_date', @@ -1594,7 +1595,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 'estimate_tryrun_end_date', ] for (var i = 0; i < oursourcer_input_arr.length; i++) { - inputChangeOutsourcer(oursourcer_input_arr[i]); + inputChangeOutsourcer2(oursourcer_input_arr[i]); } }); @@ -1612,6 +1613,12 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; }); } + function inputChangeOutsourcer2(input_name) { + $("#" + input_name).on("change", function() { + $("#" + input_name + "_owner").val(""); + }); + } + function formatDate() { var timestamp = Date.now(); var date = new Date(timestamp); diff --git a/wms/wipwhole-renovate-rec-invoice.php b/wms/wipwhole-renovate-rec-invoice.php index ff440b4b..bf65e236 100644 --- a/wms/wipwhole-renovate-rec-invoice.php +++ b/wms/wipwhole-renovate-rec-invoice.php @@ -808,11 +808,11 @@ if ($department_id == "321" || $department_id == "220") { 合約交期
    (到工地) - + 預計交期
    (到工地) - + From f8f352229f3758d02202bb5cbea4f0e78d7ed9a0 Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Thu, 2 Nov 2023 17:01:16 +0800 Subject: [PATCH 14/16] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=A3=9C=E4=B8=81=20?= =?UTF-8?q?//=20=E8=A3=9C=E4=B8=81=20=E9=BB=83=E5=AD=9F=E6=BE=A4=20&=20?= =?UTF-8?q?=E8=91=89=E5=8D=9A=E6=BE=84=20=E6=AC=8A=E9=99=90=E7=AD=89?= =?UTF-8?q?=E6=96=BC=20=E6=9D=8E=E7=83=98=E9=8A=98=E3=80=82=202.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9A=AB=E6=99=82=E5=88=AA=E9=99=A4=E5=8F=8A=E7=B7=A8?= =?UTF-8?q?=E8=BC=AF=E6=AC=8A=E9=99=90=20(M0175=E5=8F=8AM0079)=E3=80=82=20?= =?UTF-8?q?3.=E6=96=B0=E5=A2=9E=20=E5=AE=89=E8=A3=9D=E5=9C=96=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=99=82=EF=BC=8C=E5=90=8C=E6=99=82=E5=AF=AB=E5=85=A5?= =?UTF-8?q?=E5=82=99=E8=A8=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/wipwhole-index-function.php | 44 ++++++++++++- wms/wipwhole-index-table-html.php | 11 ++++ wms/wipwhole-index.php | 21 ++++++- wms/wipwhole-rec-invoice-edit-submit.php | 30 ++++++++- wms/wipwhole-rec-invoice-edit.php | 41 +++++++----- wms/wipwhole-renovate-index-function.php | 63 +++++++++++++++---- wms/wipwhole-renovate-index-table-html.php | 11 ++++ wms/wipwhole-renovate-index.php | 20 +++++- ...whole-renovate-rec-invoice-edit-submit.php | 32 +++++++++- wms/wipwhole-renovate-rec-invoice-edit.php | 45 +++++++------ wms/wipwholeinstall-index-function.php | 34 +++++++++- ...ipwholeinstall-renovate-index-function.php | 34 +++++++++- 12 files changed, 328 insertions(+), 58 deletions(-) diff --git a/wms/wipwhole-index-function.php b/wms/wipwhole-index-function.php index 81804787..2c895426 100644 --- a/wms/wipwhole-index-function.php +++ b/wms/wipwhole-index-function.php @@ -5,6 +5,7 @@ function getWipwholestatusData($link, $id) $db_query = " SELECT * FROM wipwholestatus WHERE id='$id' + AND status = '1' "; $receivabledata = mysqli_query($link, $db_query); return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC); @@ -125,11 +126,16 @@ function getDataSql($department_id, $role_id, $user_id) '511', '512', '513', '514' ]; + // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘 + if(in_array($user_id,['M0166','M0091'])){ + $user_id = 'M0086'; + } + $sql_cmd = sql_myself($user_id, "salesid"); $sql = " SELECT * FROM wipwholestatus $sql_cmd "; - $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'"; + $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : " AND status = '1' AND contract_type = '$contract_type'"; $sql .= getWipwholeSearchSql(); $sql .= "ORDER BY real_contract_arrival_date DESC "; @@ -145,6 +151,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -155,6 +162,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -165,6 +173,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -175,6 +184,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -185,6 +195,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -206,6 +217,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -217,6 +229,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " AND SUBSTR(address,1,2) in ('宜蘭') @@ -229,6 +242,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹') @@ -241,6 +255,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗') @@ -253,6 +268,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄') @@ -265,6 +281,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date DESC @@ -276,6 +293,13 @@ function getDataSql($department_id, $role_id, $user_id) function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) { + + // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘 + if(in_array($user_id,['M0166','M0091'])){ + $user_id = 'M0086'; + } + + $flow_code_tmp = explode(',', $flow_code); $flow_code = implode("','", $flow_code_tmp); // 合約類型 @@ -293,6 +317,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -303,6 +328,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -313,6 +339,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -323,6 +350,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -333,6 +361,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -345,6 +374,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) "; $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'"; $sql .= " + AND status = '1' AND id IN ( SELECT form_id AS id @@ -372,6 +402,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' AND id IN ( SELECT @@ -392,6 +423,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -412,6 +444,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -432,6 +465,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -452,6 +486,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -472,6 +507,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -568,6 +604,7 @@ function checkYingYeok($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -588,6 +625,7 @@ function checkSheJiok($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -605,6 +643,7 @@ function checkSheJiokLeader($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -622,6 +661,7 @@ function checkGongWuok($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -645,6 +685,7 @@ function checkShengGuanok($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -676,6 +717,7 @@ function getGongWuokNo($link) SUBSTR(address,1,2) FROM `wipwholestatus` WHERE id = '$id' + AND status = '1' "; $result = mysqli_query($link, $sql); $row = mysqli_fetch_array($result); diff --git a/wms/wipwhole-index-table-html.php b/wms/wipwhole-index-table-html.php index 9e4155d3..b6a69908 100644 --- a/wms/wipwhole-index-table-html.php +++ b/wms/wipwhole-index-table-html.php @@ -7,10 +7,20 @@ $tableArr = array( "CH" => "table_index6", "Z" => "table_index7" ); + +// 暫時可編輯及刪除權限 +$update_delete_status = false; +if (in_array($user_id, ['M0175', 'M0079'])) { + $update_delete_status = true; +} + ?> + 刪除" : ""; + ?> @@ -101,6 +111,7 @@ $tableArr = array( ?> + " : ""; ?>
    合約號 電梯編號 客戶姓名
    +