From 17cf832b9a068464ffea3f5234cbb1d7df081bfa Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Wed, 1 Nov 2023 10:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=87=E9=80=A3=E7=B7=9AT8=E8=B3=87=E6=96=99?=
 =?UTF-8?q?=E5=BA=AB=E5=AD=98=E5=88=B0fun=5Fglobal=E5=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore         |  2 ++
 wms/fun_global.php | 13 ++++++++++
 wms/header.php     |  2 +-
 wms/loginapi.php   |  3 ++-
 wms/rib-test.php   | 63 +++++++++++++++++++++++++++-------------------
 5 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2227fb1c..098a9a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ wms/contract/.env
 /pdfs/
 wms/database.php
 workflow/log/
+wms/header.php
+wms/loginapi.php
diff --git a/wms/fun_global.php b/wms/fun_global.php
index 48f952b0..38e16855 100644
--- a/wms/fun_global.php
+++ b/wms/fun_global.php
@@ -28,6 +28,19 @@ function sql_myself($user_id, $column="creater") {
 
     return $sql_cmd;
 }
+/**
+ * 連線T8 MSSQL
+ */
+try {
+    $conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8MASADA", "masada", "@m222222");
+    if ($conn) {
+        $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    }
+} catch (PDOException $e) {
+    echo "fail";
+    echo $e->getMessage();
+}
+
 
 /**
  * 下屬列表
diff --git a/wms/header.php b/wms/header.php
index dd637333..9a25c3de 100644
--- a/wms/header.php
+++ b/wms/header.php
@@ -1,6 +1,6 @@
 <?php
 // ini_set('display_errors', 'off');
-require_once dirname(__FILE__) . "/database.php";
+require_once dirname(__FILE__) . "/../mkt/database.php";
 include "fun_global.php";
 if (isset($_REQUEST["function_name"])) {
   $function_name = $_REQUEST["function_name"];
diff --git a/wms/loginapi.php b/wms/loginapi.php
index 8090d486..63a1cbb2 100644
--- a/wms/loginapi.php
+++ b/wms/loginapi.php
@@ -3,7 +3,8 @@
 // error_reporting(E_ALL);#
 ini_set("display_errors","On");
 date_default_timezone_set("Asia/Taipei");
-require_once "database.php";
+// require_once "database.php";
+require_once dirname(__FILE__) . "/../mkt/database.php";
 include 'IncludeCommon.php';
 
 if(!empty($_REQUEST["account"])&& !empty($_REQUEST["password"])) {
diff --git a/wms/rib-test.php b/wms/rib-test.php
index 191dba3b..80737f7e 100644
--- a/wms/rib-test.php
+++ b/wms/rib-test.php
@@ -18,55 +18,66 @@ echo "ii";
       var body = [{
           "name": "MasterTable",
           "rows": [{
-            "BillNo": "Z001",
+            "BillNo": "Z003",
             "BillDate": 20230930,
             "OrgId": "1000",
             "TypeId": "OPV",
+            "IsPriceWithTax":1,
+            "IsCounteract":1,
             "BizPartnerId": "03051501",
             "CurrId": "RMB",
-            "CurrLAmount":5,
+            "CurrOAmount":1,
+            "CurrLAmount":4,
             "TaxId": "ST005",
             "PersonId": "M0012",
             "DeptId": "220",
             "CompId": "1001",
             "CreditAgeDate": 20230930,
-            "RecBizPartnerId": "03051501",
-
+            "RecBizPartnerId": "03051501"
           }]
         },
         {
           "name": "DetailTable",
           "rows": [{
-              "BillNo": "Z001",
+              "BillNo": "Z003",
               "RowCode": 1,
               "RowNo": 1,
               "ItemType": 0,
+              "TaxId": "ST005",
               "MaterialId": "MX00000001",
               "UnitId": "PCS",
               "MaterialSpec": "",
-              "SQuantity": 10,
-              "SPrice": 141.18,
-              "OAmount": 1344.57,
-              "OTax": 67.23,
-              "OAmountWithTax": 1411.8,
-              "TaxId": "ST005"
+              "SQuantity":10,
+              "SPrice":105,
             },
-            {
-              "BillNo": "Z001",
-              "RowCode": 2,
-              "RowNo": 2,
-              "ItemType": 0,
-              "MaterialId": "MX00000001",
-              "UnitId": "PCS",
-              "MaterialSpec": "",
-              "SQuantity": 15,
-              "SPrice": 141.18,
-              "OAmount": 2016.86,
-              "OTax": 100.84,
-              "OAmountWithTax": 2117.7,
-              "TaxId": "ST005"
-            }
+            // {
+            //   "BillNo": "Z002",
+            //   "RowCode": 2,
+            //   "RowNo": 2,
+            //   "ItemType": 0,
+            //   "MaterialId": "MX00000001",
+            //   "UnitId": "PCS",
+            //   "MaterialSpec": "",
+            //   "SQuantity": 15,
+            //   // "SPrice": 210,
+            //   "OAmountWithTax": 3150,
+            //   // "OTax": 100.84,
+            //   // "OAmountWithTax": 2117.7,
+            //   "TaxId": "ST005"
+            // }
           ]
+        },
+        {
+          "name":"apCheckBillInvInfo",
+          "rows":[{
+            "BillNo":"Z003",
+            "RowCode":1,
+            "RowNo":1,
+            "InvoiceNo":"ap12345678",
+            "InvoiceId":25,
+            "TaxId":"ST005",
+            "LAmountWithTax":105
+          }]
         }
       ];
       var json = JSON.stringify(body);