Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs

1 year ago · 181cd32253
5 changed files with 162 additions and 29 deletions
--- a/mkt/database.php
+++ b/mkt/database.php
@ -20,6 +20,20 @@ $dbpassword = getenv('DB_PASSWORD');
 $dbname = getenv('DB_DATABASE');
 // exit;
 $link = mysqli_connect($host,$dbuser,$dbpassword,$dbname);
+$sqlsrv = getenv('sqlsrv');
+$Database = getenv('Database');
+$Account = getenv('Account');
+$Password = getenv('Password');
+
+try {
+    $conn = new PDO("sqlsrv:Server=$sqlsrv;Database=$Database", "$Account", "$Password");
+    if ($conn) {
+        $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    }
+} catch (PDOException $e) {
+    echo "fail";
+    echo $e->getMessage();
+}
 //print_r($link);exit;
 if($link){
    mysqli_query($link,'SET NAMES utf8');
--- a/wms/T8_purRequestOrder_create.php
+++ b/wms/T8_purRequestOrder_create.php
@ -1 +1,45 @@
 <?php
+include "./header.php";
+date_default_timezone_set('Asia/Taipei');
+
+//表頭
+$BillNo ="TEST01";
+$BillDate = 20231204;
+$PersonId = "M0122";
+$DeptId = "220";
+// $ProjectId = "3MH00545";
+$CreateTime = Date("YmdHis");
+$CurrentState = 2;
+
+//表身
+$ItemType = 0;
+$MaterialId = "MX00011078";
+$SUnitId = "PCS";
+$DemandSQty = 5;   //核准數量
+$RequestSQty = 5;  //請購數量
+$RequireDate=20231205;
+$CurrId="TWD";
+$UnTransQty = 5; //未轉採購基本數量
+$TransQty = 0; //已轉採購基本數量
+$SupplyQty = 5; //供給數量
+$ProjectId="3MH00545"; //合約號
+$SupplyId= "P"; //供應商
+$UnTransOtherSQty = 5;
+$AllowTransOtherSQty = 5;
+$CU_MaterialId="3MH00352"; //作番號 、預留標示號
+
+$sql = "INSERT INTO purRequestOrder(BillNo, BillDate, PersonId, DeptId, CreateTime, CurrentState,
+TypeId, DemandOrgId, FOrgId,CreatorId, CompId) VALUES ('$BillNo',$BillDate,'$PersonId','$DeptId',$CreateTime,$CurrentState,
+'PR','1000','1000','$user_id','1001')";
+
+$sql_sub = "INSERT INTO purApplyOrderDetail(BillNo,RowCode, RowNo, ItemType, MaterialId, SUnitId,
+DemandSQty, DemandQty, RequestSQty,RequestQty, RequireDate, IsPriceWithTax, CurrId, 
+PurOrgId, BpOrgId, SupplyId, UnTransQty, TransQty, SupplyQty, ProjectId, PlanRangeId, 
+UnTransOtherSQty, AllowTransOtherSQty,P_A_DemandOrgId, PurCompId, CU_MaterialId, MarkerNo
+) VALUES ('$BillNo',1,1,$ItemType,'$MaterialId','$SUnitId', 
+$DemandSQty, $DemandSQty, $RequestSQty, $RequestSQty, $RequireDate, 1, '$CurrId',
+'1000', '1000', '$SupplyId', $UnTransQty, $TransQty, $SupplyQty, '$ProjectId', '1000',
+$UnTransOtherSQty, $AllowTransOtherSQty,'1000','1001','$CU_MaterialId','$CU_MaterialId')";
+
+$conn ->query($sql);
+$conn ->query($sql_sub);
--- a/wms/account-receivable-index.php
+++ b/wms/account-receivable-index.php
@ -8,9 +8,10 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;

 $arrayData = [];
+$receivable_array = [];
 //4 簽約   5 二次款   6 貨抵工地   7 安裝 8 試車 9官檢 10 交車
 //arrive_num 貨抵工地   tryrun_num 試車安裝完畢 official_num 官檢完畢  delivery_num 移交  
-echo "合約號;部門;經理;營業員;客戶名稱;簽約款;二次款;貨抵工地款;安裝款;試車款;官檢款;交車款;目前應收;總作番數;貨抵;安裝試車;官檢;移交數;狀態</br>";
+// echo "合約號;部門;經理;營業員;客戶名稱;簽約款;二次款;貨抵工地款;安裝款;試車款;官檢款;交車款;目前應收;總作番數;貨抵;安裝試車;官檢;移交數;狀態</br>";

 // $T8_array = mysqli_fetch_all($T8_array, MYSQLI_ASSOC);

@ -172,5 +173,70 @@ ON d.department_id = tmp2.department_id";
            ($value[7] + $value[8]) * ($tryrun_num / $total_facility_num) + ($value[9]) * ($official_num / $total_facility_num)
            + ($value[10]) * ($delivery_num / $total_facility_num);
    }
-    echo $key . ";" . $value[0] . ";" . $value[1] . ";" . $value[2] . ";" . $value[3] . ";" . $value[4] . ";" . $value[5] . ";" . $value[6] . ";" . $value[7] . ";" . $value[8] . ";" . $value[9].";" . $value[10] . ";" . $receivable_budget . ";" . $total_facility_num . ";" . $arrive_num . ";". $tryrun_num . ";" .$official_num.";". $delivery_num . ";" . $facitities . "<br>";
+    array_push($receivable_array, [$key, $value[0], $value[1], $value[2], $value[3], $value[4], $value[5], $value[6], $value[7], $value[8], $value[9], $value[10], $receivable_budget, $facitities]);
+    // echo $key . ";" . $value[0] . ";" . $value[1] . ";" . $value[2] . ";" . $value[3] . ";" . $value[4] . ";" . $value[5] . ";" . $value[6] . ";" . $value[7] . ";" . $value[8] . ";" . $value[9].";" . $value[10] . ";" . $receivable_budget . ";" . $total_facility_num . ";" . $arrive_num . ";". $tryrun_num . ";" .$official_num.";". $delivery_num . ";" . $facitities . "<br>";
 }
+
+// echo "合約號;部門;經理;營業員;客戶名稱;簽約款;二次款;貨抵工地款;安裝款;試車款;官檢款;交車款;目前應收;總作番數;貨抵;安裝試車;官檢;移交數;狀態</br>";
+?>
+<div id="account-receivable" style="overflow-x:auto;">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%;table-layout:fixed">
+        <thead>
+            <tr>
+                <th style="width: 100px;">合約號</th>
+                <th style="width: 150px;">部門</th>
+                <th style="width: 100px;">經理</th>
+                <th>營業員</th>
+                <th>客戶名稱</th>
+                <th>簽約款</th>
+                <th>二次款</th>
+                <th>貨抵工地款</th>
+                <th>安裝款</th>
+                <th>試車款</th>
+                <th>官檢款</th>
+                <th>交車款</th>
+                <th>目前應收</th>
+                <th>狀態</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php
+            foreach ($receivable_array as $contract) {
+            ?>
+                <tr>
+                    <th><?= $contract[0] ?></th>
+                    <td><?= $contract[1] ?></td>
+                    <td><?= $contract[2] ?></td>
+                    <td><?= $contract[3] ?></td>
+                    <td><?= $contract[4] ?></td>
+                    <td><?= $contract[5] ?></td>
+                    <td><?= $contract[6] ?></td>
+                    <td><?= $contract[7] ?></td>
+                    <td><?= $contract[8] ?></td>
+                    <td><?= $contract[9] ?></td>
+                    <td><?= $contract[10] ?></td>
+                    <td><?= $contract[11] ?></td>
+                    <td><?= $contract[12] ?></td>
+                    <td style="text-align: start;"><?= $contract[13] ?></td>
+                </tr>
+            <?php
+            }
+            ?>
+        </tbody>
+    </table>
+</div>
+
+<style>
+        th{
+            word-wrap: break-word;
+            text-align: center;
+        }
+        td {
+            word-wrap: break-word;
+            text-align: center;
+        }
+
+        img {
+            width: 125px;
+        }
+    </style>
--- a/wms/database.php
+++ b/wms/database.php
@ -21,13 +21,22 @@ $dbpassword = getenv('DB_PASSWORD');
 $dbname = getenv('DB_DATABASE');
 $link = mysqli_connect($host, $dbuser, $dbpassword, $dbname);

+$sqlsrv = getenv('sqlsrv');
+$Database = getenv('Database');
+$Account = getenv('Account');
+$Password = getenv('Password');
+try {
+    $conn = new PDO("sqlsrv:Server=$sqlsrv;Database=$Database", "$Account", "$Password");
+    if ($conn) {
+        $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    }
+} catch (PDOException $e) {
+    echo "fail";
+    echo $e->getMessage();
+}
 if ($link) {
    mysqli_query($link, 'SET NAMES utf8');
    // echo "正確連接資料庫";
-}
-else {
+} else {
    echo "不正確連接資料庫</br>" . mysqli_connect_error();
 }
-
-?>
-
--- a/wms/header.php
+++ b/wms/header.php
@ -32,15 +32,15 @@ if (isset($_REQUEST["function_name"])) {
 /**
 * 連線T8 MSSQL
 */
-try {
-  $conn = new PDO("sqlsrv:Server=10.10.145.2;Database=T8MASADA", "masada", "@m222222");
-  if ($conn) {
-    $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-  }
-} catch (PDOException $e) {
-  //echo "fail";
-  //echo $e->getMessage();
-}
+// try {
+//   $conn = new PDO("sqlsrv:Server=10.10.145.2;Database=T8MASADA", "masada", "@m222222");
+//   if ($conn) {
+//     $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+//   }
+// } catch (PDOException $e) {
+//   //echo "fail";
+//   //echo $e->getMessage();
+// }