M0117
/
gary_wms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'main' into gary

gary
gary_chen\gary_chen 1 year ago
parent
cca05cbc8a 7dac3835de
commit
8b3e3a793d
6 changed files with 16 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      wms/cont/apply_form.php
  2. 1
      wms/cont/sign_form.php
  3. 9
      wms/cont/submit.php
  4. 1
      wms/excel-upload.php
  5. 4
      wms/mkt/pricereview-create.php
  6. 4
      wms/mkt/pricereview_renovate-create.php

1
wms/cont/apply_form.php
View File

@ -524,6 +524,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
<input type="hidden" name="form_key" value='<?php echo $form_key; ?>' /> <input type="hidden" name="form_key" value='<?php echo $form_key; ?>' />
<input type="hidden" name="token" value='<?= $_GET['token'] ?>' /> <input type="hidden" name="token" value='<?= $_GET['token'] ?>' />
<input type="hidden" name="reg_del" id="reg_del"> <input type="hidden" name="reg_del" id="reg_del">
<input type="hidden" name="form_src" id="form_src" value="apply_form">
<!--表單start--> <!--表單start-->
<div class=" form container-fluid pt-5"> <div class=" form container-fluid pt-5">
<div class="row form_head "> <div class="row form_head ">

1
wms/cont/sign_form.php
View File

@ -295,6 +295,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
<input type="hidden" name="form_key" value='<?php echo $form_key; ?>' /> <input type="hidden" name="form_key" value='<?php echo $form_key; ?>' />
<input type="hidden" name="apply_key" value='<?php echo $data['apply_key']; ?>' /> <input type="hidden" name="apply_key" value='<?php echo $data['apply_key']; ?>' />
<input type="hidden" name="token" value='<?php echo $token; ?>' /> <input type="hidden" name="token" value='<?php echo $token; ?>' />
<input type="hidden" name="form_src" id="form_src">
<!--表單start--> <!--表單start-->
<div class=" form container-fluid pt-5"> <div class=" form container-fluid pt-5">

9
wms/cont/submit.php
View File

@ -6,6 +6,15 @@ require_once './model/ConMaintanceExamineClearModel.php';
//print_r($_POST);exit; //print_r($_POST);exit;
$request = $_SERVER['REQUEST_METHOD'] == "GET" ? $_GET : $_POST; $request = $_SERVER['REQUEST_METHOD'] == "GET" ? $_GET : $_POST;
$tosign = ($request["btn_save"] == "tosign") ? 1 : 0; // 1:提交 $tosign = ($request["btn_save"] == "tosign") ? 1 : 0; // 1:提交
if ($request["form_src"] == "apply_form" && $tosign && (!isset($request["register_code"]) || empty($request["register_code"][0]) || !isset($request["next_users"]) || empty($request["next_users"]))) {
echo "<script type = 'text/JavaScript'>";
echo "alert('請確認電梯資料或未選擇下位簽核者！');";
echo "history.go(-1);";
echo "</script>";
exit;
}
//更新表单ConMaintanceExamineApplyModel //更新表单ConMaintanceExamineApplyModel
$cmea = new ConMaintanceExamineApplyModel(); $cmea = new ConMaintanceExamineApplyModel();
$apply_key=$request['apply_key']; $apply_key=$request['apply_key'];

1
wms/excel-upload.php
View File

@ -134,6 +134,7 @@ if (move_uploaded_file($temp_file_name, $target_file)) {
//创建作番信息 //创建作番信息
switch ($facilityno) { switch ($facilityno) {
case (preg_match('/TX/', $facilityno) ? true : false): case (preg_match('/TX/', $facilityno) ? true : false):
case (preg_match('/JX/', $facilityno) ? true : false):
$facility_kind = "MAE100"; $facility_kind = "MAE100";
break; break;
case (preg_match('/TW/', $facilityno) ? true : false): case (preg_match('/TW/', $facilityno) ? true : false):

4
wms/mkt/pricereview-create.php
View File

@ -1308,7 +1308,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
<td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?php echo number_format($v["item_unit_price"]); ?>" readonly></td> <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?php echo number_format($v["item_unit_price"]); ?>" readonly></td>
<td><input type="text" name="item_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["item_qty"]; ?>"><input type="hidden" name="item_qty_ori" value="<?php echo $v["item_qty"]; ?>"></td> <td><input type="text" name="item_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["item_qty"]; ?>"><input type="hidden" name="item_qty_ori" value="<?php echo $v["item_qty"]; ?>"></td>
<td><input type="text" name="item_price_bp" class="form-control dollar-right" size="12" value="<?php echo number_format($v["item_price_bp"]); ?>" readonly></td> <td><input type="text" name="item_price_bp" class="form-control dollar-right" size="12" value="<?php echo number_format($v["item_price_bp"]); ?>" readonly></td>
<td nowrap><input type="text" name="item_price_ct" class="form-control dollar-right" size="12" value="<?php echo $v["spec_price"]*$v["spec_num"]; ?>" required> <td nowrap><input type="text" name="item_price_ct" class="form-control dollar-right" size="12" value="<?php echo number_format($v["item_price_ct"]); ?>" required>
<input type="hidden" name="item_group" value="A"><input type="hidden" name="fp_id"> <input type="hidden" name="item_group" value="A"><input type="hidden" name="fp_id">
<input type="hidden" name="gross_profit"> <input type="hidden" name="gross_profit">
<input type="hidden" name="item_price"> <input type="hidden" name="item_price">
@ -1514,7 +1514,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
<td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?php echo $v["spec_price"]; ?>" readonly></td> <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?php echo $v["spec_price"]; ?>" readonly></td>
<td><input type="text" name="item_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["spec_num"]; ?>"><input type="hidden" name="item_qty_ori" value="<?php echo $v["spec_num"]; ?>"></td> <td><input type="text" name="item_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["spec_num"]; ?>"><input type="hidden" name="item_qty_ori" value="<?php echo $v["spec_num"]; ?>"></td>
<td><input type="text" name="item_price_bp" class="form-control dollar-right" size="12" value="<?php echo number_format($v["spec_price"]*$v["spec_num"]); ?>" readonly></td> <td><input type="text" name="item_price_bp" class="form-control dollar-right" size="12" value="<?php echo number_format($v["spec_price"]*$v["spec_num"]); ?>" readonly></td>
<td nowrap><input type="text" name="item_price_ct" class="form-control dollar-right" size="12" value="<?php echo $v["spec_price"]*$v["spec_num"]; ?>" required> <td nowrap><input type="text" name="item_price_ct" class="form-control dollar-right" size="12" value="<?php echo number_format($v["spec_price"]*$v["spec_num"]); ?>" required>
<input type="hidden" name="item_group" value="A"><input type="hidden" name="fp_id"> <input type="hidden" name="item_group" value="A"><input type="hidden" name="fp_id">
<input type="hidden" name="gross_profit"> <input type="hidden" name="gross_profit">
<input type="hidden" name="item_price"> <input type="hidden" name="item_price">

4
wms/mkt/pricereview_renovate-create.php
View File

@ -1405,7 +1405,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
<td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?php echo number_format($v["item_unit_price"]); ?>" readonly></td> <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?php echo number_format($v["item_unit_price"]); ?>" readonly></td>
<td><input type="text" name="item_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["item_qty"]; ?>"><input type="hidden" name="item_qty_ori" value="<?php echo $v["item_qty"]; ?>"></td> <td><input type="text" name="item_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["item_qty"]; ?>"><input type="hidden" name="item_qty_ori" value="<?php echo $v["item_qty"]; ?>"></td>
<td><input type="text" name="item_price_bp" class="form-control dollar-right" size="12" value="<?php echo number_format($v["item_price_bp"]); ?>" readonly></td> <td><input type="text" name="item_price_bp" class="form-control dollar-right" size="12" value="<?php echo number_format($v["item_price_bp"]); ?>" readonly></td>
<td nowrap><input type="text" name="item_price_ct" class="form-control dollar-right" size="12" value="<?php echo $v["spec_price"]*$v["spec_num"]; ?>" required> <td nowrap><input type="text" name="item_price_ct" class="form-control dollar-right" size="12" value="<?php echo number_format($v["item_price_ct"]); ?>" required>
<input type="hidden" name="item_group" value="A"><input type="hidden" name="fp_id"> <input type="hidden" name="item_group" value="A"><input type="hidden" name="fp_id">
<input type="hidden" name="item_price"><input type="hidden" name="gross_profit"> <input type="hidden" name="item_price"><input type="hidden" name="gross_profit">
<input type="hidden" name="item_weight"> <input type="hidden" name="item_weight">
@ -1619,7 +1619,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
<td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?php echo $v["spec_price"]; ?>" readonly></td> <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?php echo $v["spec_price"]; ?>" readonly></td>
<td><input type="text" name="item_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["spec_num"]; ?>"><input type="hidden" name="item_qty_ori" value="<?php echo $v["spec_num"]; ?>"></td> <td><input type="text" name="item_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["spec_num"]; ?>"><input type="hidden" name="item_qty_ori" value="<?php echo $v["spec_num"]; ?>"></td>
<td><input type="text" name="item_price_bp" class="form-control dollar-right" size="12" value="<?php echo number_format($v["spec_price"]*$v["spec_num"]); ?>" readonly></td> <td><input type="text" name="item_price_bp" class="form-control dollar-right" size="12" value="<?php echo number_format($v["spec_price"]*$v["spec_num"]); ?>" readonly></td>
<td nowrap><input type="text" name="item_price_ct" class="form-control dollar-right" size="12" value="<?php echo $v["spec_price"]*$v["spec_num"]; ?>" required> <td nowrap><input type="text" name="item_price_ct" class="form-control dollar-right" size="12" value="<?php echo number_format($v["spec_price"]*$v["spec_num"]); ?>" required>
<input type="hidden" name="item_group" value="A"><input type="hidden" name="fp_id"> <input type="hidden" name="item_group" value="A"><input type="hidden" name="fp_id">
<input type="hidden" name="item_price"><input type="hidden" name="gross_profit"> <input type="hidden" name="item_price"><input type="hidden" name="gross_profit">
<input type="hidden" name="item_weight"> <input type="hidden" name="item_weight">

Write Preview
Loading…
Cancel
Save