Merge branch 'kaiyu'

wms/T8_assemble_apply.php

@@ -0,0 +1,71 @@
+<?php
+//外購組裝單 (組裝申請單)
+include "T8_Authorization.php";
+?>
+<script>
+    get_Auth();
+    window.addEventListener('message', function(event) {
+        if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
+            var validation = event.data;
+            console.log(validation);
+            var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKASSY/PostERPData';
+            headerParam = {
+                CHI_Authorization: `${validation}`,
+            };
+            var body = [{
+                "name":"stkAssyMast",
+                "rows":[
+                    {
+                        "BillNo":"TEST02",
+                        "OrgId":"1000",
+                        "TypeId":"CA",
+                        "MaterialId":"3MH00302",
+                        "PersonId":"M0122",
+                        "CompId":"1001",
+                        "DeptId":"220",
+                        "SQuantity":1,
+                        "SUnitId":"SET",
+                        "CurrentState":2,
+                        "CreatorId":"M0122"
+                    }
+                ]
+            },{
+                "name":"stkAssySubMatInfo",
+                "rows":[
+                    {
+                        "BillNo":"TEST02",
+                        "MaterialId":"3MH00302P",
+                        "ComponentBaseQty":1,
+                        "UnitQty":1,
+                        "SUnitId":"SET",
+                        "MarkerNo":"3MH00302",
+                        "CU_MaterialId":"3MH00302"
+                    },{
+                        "BillNo":"TEST02",
+                        "MaterialId":"MX00000001",
+                        "ComponentBaseQty":1,
+                        "UnitQty":3,
+                        "SUnitId":"PCS",
+                        "MarkerNo":"3MH00302",
+                        "CU_MaterialId":"3MH00302"
+                    }
+                ]
+            }];
+            var json = JSON.stringify(body);
+            obj = {
+                type:'POST',
+                url:`${apiurl}`,
+                headers:headerParam,
+                data: json,
+                dataType:"json",
+                success: function(res){
+                    console.log(res.Status);
+                    console.log(res.ErrorMsg);
+                    console.log(res.Data);
+                }
+            };
+            jQuery.ajax(obj);
+
+        }
+    })
+</script>

wms/T8_purBillOrder_search.php

@@ -0,0 +1,23 @@
+<?php
+include "./header.php";
+//假設供應商代碼為P
+$BizPartnerId = "P";
+$sql_purBillOrder = "
+SELECT * FROM purBillOrderMaster WHERE BizPartnerId = '$BizPartnerId' AND CurrentState = 2";
+$purMaster = $conn->query($sql_purBillOrder);
+//每筆採購單資料
+foreach($purMaster as $master){
+    //print_r($master); 
+    $BillNo = $master['BillNo'];
+
+    //每筆採購單明細資料
+    $sql_purDetail = "
+    SELECT * FROM purBillOrderDetail WHERE BillNo = '$BillNo'";
+    $purDetail = $conn->query($sql_purDetail);
+    foreach($purDetail as $detail){
+        print_r($detail);
+    }
+    echo "<br>----------------------<br>";
+
+}
+

wms/account-receivable-contract.php

@@ -0,0 +1,39 @@
+<?php
+include "header.php";
+// 合約收款款別名稱
+$arrayData = [];
+echo "合約號;客戶名稱;1款;金額;2款;金額;3款;金額;4款;金額;5款;金額;6款;金額;7款;金額;8款;金額;9款;金額;10款;金額;11款;金額;12款</br>";
+$sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt,s.BizPartnerId,c.BizPartnerName 
+FROM salOrderStagePay AS a 
+LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo 
+LEFT JOIN comBusinessPartner as c ON s.BizPartnerId=c.BizPartnerId 
+WHERE s.ModeId = 'M' AND (s.CurrentState=2 OR s.CurrentState=4)";
+
+$contract = $conn->query($sql_contract);
+foreach ($contract as $cont) {
+    if ($cont['BillNo'] == 'SO20230801002') {
+        $BillNo = 'M231067';
+    }else{
+        $BillNo = $cont['BillNo'];
+    };
+    $PayStage = $cont['PayStage'];
+    $PayAmount = $cont['PlanPayAmt'];
+    $partnerName = $cont['BizPartnerName'];
+    if(isset($arrayData[$BillNo])){
+        array_push($arrayData[$BillNo], $PayStage);
+        array_push($arrayData[$BillNo], $PayAmount);
+        
+    }else{
+        $arrayData[$BillNo][0] = $BillNo;
+        $arrayData[$BillNo][1] = $partnerName;
+        array_push($arrayData[$BillNo], $PayStage);
+        array_push($arrayData[$BillNo], $PayAmount);
+
+    }
+};
+foreach($arrayData as $data){
+    foreach($data as $value){
+        echo $value.";";
+    }
+    echo "</br>";
+}

wms/header.php

@@ -21,7 +21,7 @@ if (isset($_REQUEST["function_name"])) {
  * 連線T8 MSSQL
  */
 try {
-  $conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8MASADA", "masada", "@m222222");
+  $conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8TEST", "masada", "@m222222");
   if ($conn) {
       $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
   }

wms/rib-feeapply-test.php

@@ -0,0 +1,12 @@
+<?php
+include "./header.php";
+$BillNo = 'CM0122231106';
+$rib_query = "SELECT * FROM rib WHERE BillNo = '$BillNo'";
+$rib = mysqli_query($link, $rib_query);
+foreach ($rib as $rib){
+    $rib_id = $rib['rib_id'];
+    $BillDate = $rib['BillDate'];
+    
+}
+$OrgId = $FOrgId ='1000';
+echo $rib_id."<br>".$BillDate."<br>".$OrgId;

wms/rib02-business-create.php

@@ -400,7 +400,7 @@ $conn = null;
                     $("#FeeDate").val('');
                 } else {
                     now.setMonth(now.getMonth() - 2);
-                    now.setDate(01);
+                    now.setDate(1);
                     now.setDate(now.getDate() - 1)
                     if (feedate < now) {
                         alert("超過兩個月的費用無法進行報銷");