價審合約

wms/T8_APItest.php

@@ -12,67 +12,48 @@ echo "ii";
       console.log(validation);
 
       // var corsurl = 'http://cors-anywhere.herokuapp.com/';
-      var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALDISPATCHLIST/GetERPData?pkValue=SS20230825001';
+      var apiurl = 'https:127.0.0.1:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
       headerParam = {
         CHI_Authorization: `${validation}`,
       };
       var body = [{
-          "name": "MasterTable",
+          "name": "salIncomeApplyMaster",
           "rows": [{
             "BillNo": "Z001",
-            "BillDate": 20230930,
+            "BillDate": 20160811,
             "OrgId": "1000",
-            "TypeId": "OPV",
+            "FOrgId": "1000",
-            "BizPartnerId": "03051501",
+            "TypeId": "RR",
+            "BpOrgId": "1000",
+            "BizPartnerId": "C002",
             "CurrId": "RMB",
-            "CurrLAmount":5,
+            "CurrOAmount": 1,
-            "TaxId": "ST005",
+            "CurrLAmount": 1,
-            "PersonId": "M0012",
+            "PersonId": "T001",
-            "DeptId": "220",
+            "DtOrgId": "1000",
-            "CompId": "1001",
+            "DueToId": "C002",
-            "CreditAgeDate": 20230930,
+            "TaxId": "123",
-            "RecBizPartnerId": "03051501",
+            "CompId": "1000"
-
           }]
         },
         {
-          "name": "DetailTable",
+          "name": "salIncomeApplyDetail",
           "rows": [{
-              "BillNo": "Z001",
+            "BillNo": "Z001",
-              "RowCode": 1,
+            "IncomeId": "F203",
-              "RowNo": 1,
+            "TaxId": "ST003",
-              "ItemType": 0,
+            "RowCode": 1,
-              "MaterialId": "MX00000001",
+            "ItemType": "1",
-              "UnitId": "PCS",
+            "SPrice": 50,
-              "MaterialSpec": "",
+            "SQuantity": 1,
-              "SQuantity": 10,
+            "FromSourceTag": 0,
-              "SPrice": 141.18,
+            "FromBillNo": "123"
-              "OAmount": 1344.57,
+          }]
-              "OTax": 67.23,
-              "OAmountWithTax": 1411.8,
-              "TaxId": "ST005"
-            },
-            {
-              "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"
-            }
-          ]
         }
       ];
       var json = JSON.stringify(body);
       obj = {
-        type: 'GET',
+        type: 'POST',
         // url: `${corsurl}${apiurl}`,
         url: `${apiurl}`,
         // dataType: 'json',

wms/T8_Authorization.php

@@ -1,7 +1,7 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <?php
 $now = gmdate("YmdHis");
-$data = 'M0000.' . $now;
+$data = 'admin.' . $now;
 $sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
 
 ?>
@@ -12,10 +12,10 @@ $sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
         var validation = "";
         // var corsurl = 'http://cors-anywhere.herokuapp.com/';
         // var apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth';
-        var apiurl =  'https://erp.masada.com.tw:780/twWebAPI/GetAuth'
+        var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth'
         headerParam = {
-            UserId: 'M0000',
+            UserId: 'admin',
-            Pwd: 'M012290493119',
+            Pwd: 'chi',
             TimestampUTC: <?= $now ?>,
             Sign: '<?= $sign ?>'
         };
@@ -27,11 +27,12 @@ $sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
             headers: headerParam,
             success: function(res) {
                 validation = res.Data['CHI_Authorization'];
-                console.log("validation：",validation);
+                console.log("validation：", validation);
-                window.parent.postMessage(validation,'http://localhost:3000');
+                window.parent.postMessage(validation, 'http://localhost:3000');
                 // window.parent.postMessage(validation,'https://masada.com.tw');
             }
         };
         jQuery.ajax(obj);
+
     }
 </script>

wms/contract/api/postContractData.php

@@ -341,6 +341,8 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
 function T8insert($data, $facilityno)
 {
     require_once("../connt8.php");
+    // include "../../T8_Authorization.php";
+
     $contractno = !empty($data['contractno']) ? $data['contractno'] : null; // 合約號
     $address = !empty($data['address']) ? $data['address'] : null; // 客戶地址
     $customer = !empty($data['customer']) ? $data['customer'] : null; //企業名稱
@@ -354,7 +356,7 @@ function T8insert($data, $facilityno)
     $contract_end_date = !empty($data['contract_end_date']) ? $data['contract_end_date'] : null;
     $num = !empty($data['num']) ? $data['num'] : null; // 電梯數量
     $elevators = !empty($data['elevators']) ? json_decode($data['elevators'], true) : []; //電梯
-    $area = !empty($_POST['area']) ? $_POST['area'] : null; //縣市 Ex. A->台北 , B-> ..。
+    $area = !empty($data['area']) ? $data['area'] : null; //縣市 Ex. A->台北 , B-> ..。
 
     $user_id = !empty($_POST['user_id']) ? $_POST['user_id'] : null;
 
@@ -370,6 +372,9 @@ function T8insert($data, $facilityno)
     $createTime = str_replace("-", '', $date);
     $beginDate = str_replace("-", '', $contract_begin_date);
     $endDate = str_replace("-", '', $contract_end_date);
+    if ($contractno == '') {
+        echo 'Error';
+    }
     if (empty($result)) {
         // 若 客戶資料為空，新增一筆到 comCustomer
         // 新增客戶資料
@@ -474,39 +479,67 @@ function T8insert($data, $facilityno)
 
     // // 新增電梯數
     foreach ($elevators as $index => $elevator) {
-        echo '<pre>';
+        // echo '<pre>';
-        print_r($elevator);
+        // print_r($elevator);
-        echo '</pre>';
+        // echo '</pre>';
 
         $sql = "INSERT INTO comMaterial
-        (MaterialId,MaterialCategoryId,CreatorId,CreateTime) 
+        (FOrgid,MaterialId,MaterialTypeId,MaterialCategoryId,CreatorId,CreateTime) 
-        VALUES (:MaterialId,'E',:CreatorId,:CreateTime)";
+        VALUES ('1000',:MaterialId,'10','E',:CreatorId,:CreateTime)";
         $stmt = $connT8->prepare($sql);
         $stmt->bindParam(':MaterialId', $facilityno[$index]);
         $stmt->bindParam(':CreatorId', $user_id);
         $stmt->bindParam(':CreateTime', $createTime);
         $stmt->execute();
-        /// 還沒修完
 
         $sql = "INSERT INTO comMaterialGroup
-        (MaterialTypeId,MaterialId,MaterialName,MaterialCategoryId,UnitId,CreatorId,CreateTime) 
+        (MaterialTypeId,MaterialId,MaterialName,MaterialCategoryId,IsInUsed,UnitId,CreatorId,CreateTime) 
-        VALUES ('10',:MaterialId,:MaterialName,'E','SET',:CreatorId,:CreateTime)";
+        VALUES ('10',:MaterialId,:MaterialName,'E',1,'SET',:CreatorId,:CreateTime)";
         $stmt = $connT8->prepare($sql);
         $stmt->bindParam(':MaterialId', $facilityno[$index]);
         $stmt->bindParam(':MaterialName', $customer);
         $stmt->bindParam(':CreatorId', $user_id);
         $stmt->bindParam(':CreateTime', $createTime);
         $stmt->execute();
-        /// 還沒修完
 
         $sql = "INSERT INTO comMaterialPurchases
-        (MaterialId,CurrId,SUnitId,TaxId,CreatorId,CreateTime) 
+        (Orgid,MaterialTypeId,MaterialId,CurrId,SUnitId,TaxId,CreatorId,CreateTime) 
-        VALUES (:MaterialId,'TWD','SET','ST005',:CreatorId,:CreateTime)";
+        VALUES ('1000','10',:MaterialId,'TWD','SET','ST005',:CreatorId,:CreateTime)";
         $stmt = $connT8->prepare($sql);
         $stmt->bindParam(':MaterialId', $facilityno[$index]);
         $stmt->bindParam(':CreatorId', $user_id);
         $stmt->bindParam(':CreateTime', $createTime);
         $stmt->execute();
     }
+
+
+?>
+    <!-- <script src="./js/axios/axios.min.js"></script>
+    <script>
+        const form = new FormData();
+        form.append('BillNo', <?php echo $contractno ?>);
+        form.append('BillDate', );
+        form.append('');
+        form.append('');
+        form.append('');
+        form.append('');
+        form.append('');
+        axios.post('https://127.0.0.1:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData', form).then(res => {
+            console.log(res.status);
+            if (res.status == 200) {
+                alert('成功');
+            }
+        }).catch(err => {
+            console.log(err);
+            let code = err.response.data;
+            if (code == 422) {
+                console.log(err);
+            }
+            if (code == 500) {
+                alert('儲存失敗!可能為下載錯誤:\n' + error.response.data);
+            }
+        })
+    </script> -->
+<?php
     $connT8->commit();
 }

wms/contract/api/testT8API.php

@@ -1,38 +1,77 @@
 <?php
-require_once("../connt8.php");
+$now = gmdate("YmdHis");
+$data = 'M0000.' . $now;
+$sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
+?>
 
-try {
+<script src="https://code.jquery.com/jquery-3.4.1.js" integrity="sha256-WpOohJOqMqqyKL9FccASB9O0KwACQJpFTUBLTYOVvVU=" crossorigin="anonymous"></script>
-    $contractno = 'M0225202300';
+<script>
-    $user_id = 'M0225';
+    var body = [{
-    // $sql = "INSERT INTO comBusinessPartner (BizPartnerId,TaxNo,CreatorId) VALUES('M0225202301','0923373895','$userid')";
+            "name": "salIncomeApplyMaster",
-    // $stmt = $connT8->prepare($sql);
+            "rows": [{
-    // $stmt->execute();
+                "BillNo": "Z001",
+                "BillDate": 20160811,
+                "OrgId": "1000",
+                "FOrgId": "1000",
+                "TypeId": "RR",
+                "BpOrgId": "1000",
+                "BizPartnerId": "C002",
+                "CurrId": "RMB",
+                "CurrOAmount": 1,
+                "CurrLAmount": 1,
+                "PersonId": "T001",
+                "DtOrgId": "1000",
+                "DueToId": "C002",
+                "TaxId": "123",
+                "CompId": "1000"
+            }]
+        },
+        {
+            "name": "salIncomeApplyDetail",
+            "rows": [{
+                "BillNo": "Z001",
+                "IncomeId": "F203",
+                "TaxId": "ST003",
+                "RowCode": 1,
+                "ItemType": "1",
+                "SPrice": 50,
+                "SQuantity": 1,
+                "FromSourceTag": 0,
+                "FromBillNo": "123"
+            }]
+        }
+    ]
 
-    $sql = "UPDATE comBusinessPartner SET WorkTelNo = '' WHERE BizPartnerId= 'M0225202301'";
+    var json = JSON.stringify(body);
-    $stmt = $connT8->prepare($sql);
+    console.log(json);
-    $stmt->execute();
+    //     obj = {
-
+    //         type: 'POST',
-    echo 'Success';
+    //         // url: `${corsurl}${apiurl}`,
-} catch (PDOException $e) {
+    //         url: `${apiurl}`,
-    echo '<script>alert("更新失敗")</script>';
+    //         dataType: 'json',
-}
+    //         headers: headerParam,
-// $sql = "SELECT * FROM comCustomer WHERE BizPartnerId = :BizPartnerId";
+    //         data: json,
-// $stmt = $conn->prepare($sql);
+    //         // dataType: "json",
-// $stmt->bindParam(':BizPartnerId', $contractno);
+    //         success: function(res) {
-// $stmt->execute();
+    //             console.log(res.Status);
-// $result = $stmt->fetch(PDO::FETCH_NUM);
+    //             console.log(res.ErrorMsg);
-// $arr = array();
+    //             console.log(res.Data);
-// if (!empty($result)) {
+    //         }
-//     foreach ($result as $key => $value) {
+    //     };
-//         $arr[$key] = $value;
+    //     jQuery.ajax(obj);
-//     }
+    //     // }
-// }
+    // })
-// $count = empty($result) == '' ? 0 : COUNT($result);
+    $.ajax({
-// echo '<pre>';
+        url: 'https://127.0.0.1:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData',
-// print_r($result);
+        method: 'POST',
-// echo '</pre>';
+        dataType: 'json',
-// echo '<br/>';
+        // headers: headerParam,
-
+        data: body,
-// $createTime = Date('Y-m-sH-i-s');
+        success: function(res) {
-
+            console.log('Success');
-// echo str_replace('-', '', $createTime);
+        },
+        error: function(err) {
+            console.log(err);
+        }
+    })
+</script>