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

wms/account-receivable-test.php

@@ -374,9 +374,17 @@ $P_all = "
 //     echo $value['facilityno']. ";" . $value['actual_tofactory_date'] . "<br>";
 // }
 
-$sql_paystage = "SELECT A.PayStage, A.BillNo FROM salOrderStagePay AS A
+// $sql_paystage = "SELECT A.PayStage, A.BillNo FROM salOrderStagePay AS A
-LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo WHERE s.ModeId = 'T' AND (s.CurrentState=2 OR s.CurrentState=4)";
+// LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo WHERE s.ModeId = 'T' AND (s.CurrentState=2 OR s.CurrentState=4)";
-$query_paystage = $conn->query($sql_paystage);
+// $query_paystage = $conn->query($sql_paystage);
-foreach($query_paystage as $key => $value) {
+// foreach($query_paystage as $key => $value) {
-    echo $value['PayStage'] .";".$value['BillNo']. "<br>";
+//     echo $value['PayStage'] .";".$value['BillNo']. "<br>";
+// }
+
+$sql = "SELECT A.BillNo,B.CU_MaterialId, B.ProjectId FROM salSalesOrder AS A 
+LEFT JOIN salSalesOrderDetail AS B ON A.BillNo=B.BillNo
+WHERE A.ModeId='T' AND B.ItemType=0 AND A.BillNo != B.ProjectId AND A.CurrentState=4";
+$query = $conn->query($sql);
+foreach($query as $key => $value) {
+    echo $value['BillNo'] .";".$value['CU_MaterialId'].";".$value['ProjectId']. "<br>";
 }