From 86a21b9a4062a054b95394efef0b1cb6e3f3c523 Mon Sep 17 00:00:00 2001 From: Cheng Date: Fri, 29 Dec 2023 17:32:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=83=B9=E5=AF=A9=E5=90=88=E7=B4=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/T8_APItest.php | 71 ++++++----------- wms/T8_Authorization.php | 13 +-- wms/contract/api/postContractData.php | 57 +++++++++++--- wms/contract/api/testT8API.php | 109 +++++++++++++++++--------- 4 files changed, 152 insertions(+), 98 deletions(-) diff --git a/wms/T8_APItest.php b/wms/T8_APItest.php index 6f89ee68..029c9bd2 100644 --- a/wms/T8_APItest.php +++ b/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", - "BizPartnerId": "03051501", + "FOrgId": "1000", + "TypeId": "RR", + "BpOrgId": "1000", + "BizPartnerId": "C002", "CurrId": "RMB", - "CurrLAmount":5, - "TaxId": "ST005", - "PersonId": "M0012", - "DeptId": "220", - "CompId": "1001", - "CreditAgeDate": 20230930, - "RecBizPartnerId": "03051501", - + "CurrOAmount": 1, + "CurrLAmount": 1, + "PersonId": "T001", + "DtOrgId": "1000", + "DueToId": "C002", + "TaxId": "123", + "CompId": "1000" }] }, { - "name": "DetailTable", + "name": "salIncomeApplyDetail", "rows": [{ - "BillNo": "Z001", - "RowCode": 1, - "RowNo": 1, - "ItemType": 0, - "MaterialId": "MX00000001", - "UnitId": "PCS", - "MaterialSpec": "", - "SQuantity": 10, - "SPrice": 141.18, - "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" - } - ] + "BillNo": "Z001", + "IncomeId": "F203", + "TaxId": "ST003", + "RowCode": 1, + "ItemType": "1", + "SPrice": 50, + "SQuantity": 1, + "FromSourceTag": 0, + "FromBillNo": "123" + }] } ]; var json = JSON.stringify(body); obj = { - type: 'GET', + type: 'POST', // url: `${corsurl}${apiurl}`, url: `${apiurl}`, // dataType: 'json', diff --git a/wms/T8_Authorization.php b/wms/T8_Authorization.php index f383ee47..d906dbbc 100644 --- a/wms/T8_Authorization.php +++ b/wms/T8_Authorization.php @@ -1,7 +1,7 @@ @@ -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', - Pwd: 'M012290493119', + UserId: 'admin', + Pwd: 'chi', TimestampUTC: , 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); - window.parent.postMessage(validation,'http://localhost:3000'); + console.log("validation：", validation); + window.parent.postMessage(validation, 'http://localhost:3000'); // window.parent.postMessage(validation,'https://masada.com.tw'); } }; jQuery.ajax(obj); + } \ No newline at end of file diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php index 16feeaf0..1789bfac 100644 --- a/wms/contract/api/postContractData.php +++ b/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 '
';
-        print_r($elevator);
-        echo '
'; + // echo '
';
+        // print_r($elevator);
+        // echo '
'; $sql = "INSERT INTO comMaterial - (MaterialId,MaterialCategoryId,CreatorId,CreateTime) - VALUES (:MaterialId,'E',:CreatorId,:CreateTime)"; + (FOrgid,MaterialId,MaterialTypeId,MaterialCategoryId,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) - VALUES ('10',:MaterialId,:MaterialName,'E','SET',:CreatorId,:CreateTime)"; + (MaterialTypeId,MaterialId,MaterialName,MaterialCategoryId,IsInUsed,UnitId,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) - VALUES (:MaterialId,'TWD','SET','ST005',:CreatorId,:CreateTime)"; + (Orgid,MaterialTypeId,MaterialId,CurrId,SUnitId,TaxId,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(); } + + +?> + +commit(); } diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php index e5a32c6c..7ca38a2f 100644 --- a/wms/contract/api/testT8API.php +++ b/wms/contract/api/testT8API.php @@ -1,38 +1,77 @@ -try { - $contractno = 'M0225202300'; - $user_id = 'M0225'; - // $sql = "INSERT INTO comBusinessPartner (BizPartnerId,TaxNo,CreatorId) VALUES('M0225202301','0923373895','$userid')"; - // $stmt = $connT8->prepare($sql); - // $stmt->execute(); + +'; -} -// $sql = "SELECT * FROM comCustomer WHERE BizPartnerId = :BizPartnerId"; -// $stmt = $conn->prepare($sql); -// $stmt->bindParam(':BizPartnerId', $contractno); -// $stmt->execute(); -// $result = $stmt->fetch(PDO::FETCH_NUM); -// $arr = array(); -// if (!empty($result)) { -// foreach ($result as $key => $value) { -// $arr[$key] = $value; -// } -// } -// $count = empty($result) == '' ? 0 : COUNT($result); -// echo '
';
-// print_r($result);
-// echo '
'; -// echo '
'; - -// $createTime = Date('Y-m-sH-i-s'); - -// echo str_replace('-', '', $createTime); + var json = JSON.stringify(body); + console.log(json); + // obj = { + // type: 'POST', + // // url: `${corsurl}${apiurl}`, + // url: `${apiurl}`, + // dataType: 'json', + // headers: headerParam, + // data: json, + // // dataType: "json", + // success: function(res) { + // console.log(res.Status); + // console.log(res.ErrorMsg); + // console.log(res.Data); + // } + // }; + // jQuery.ajax(obj); + // // } + // }) + $.ajax({ + url: 'https://127.0.0.1:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData', + method: 'POST', + dataType: 'json', + // headers: headerParam, + data: body, + success: function(res) { + console.log('Success'); + }, + error: function(err) { + console.log(err); + } + }) + \ No newline at end of file