|
|
|
@ -130,7 +130,7 @@ class Orders_model extends CI_Model {
|
|
|
|
|
*/
|
|
|
|
|
public function get_groupCombineInfo($coli_sn=0, $get_vendorID=null, $startDate=null, $endDate=NULL)
|
|
|
|
|
{
|
|
|
|
|
$sql = "SELECT top 1000 coli.COLI_ID, coli.COLI_SN, coli.COLI_GRI_SN, cold.COLD_SN, coli.COLI_OrderDetailText, coli.COLI_Memo,coli.COLI_State,coli.COLI_OPI_ID,
|
|
|
|
|
$sql = "SELECT top 10 coli.COLI_ID, coli.COLI_SN, coli.COLI_GRI_SN, cold.COLD_SN, coli.COLI_OrderDetailText, coli.COLI_Memo,coli.COLI_State,coli.COLI_OPI_ID,
|
|
|
|
|
cold.COLD_PlanVEI_SN, gci.*
|
|
|
|
|
FROM GroupCombineInfo gci
|
|
|
|
|
LEFT JOIN BIZ_ConfirmLineInfo coli ON coli.COLI_GRI_SN=gci.GCI_GRI_SN and coli.COLI_State NOT IN ('30','40','50')
|
|
|
|
@ -143,8 +143,9 @@ class Orders_model extends CI_Model {
|
|
|
|
|
$sql .= " and GCI_VendorOrderId='$get_vendorID' ";
|
|
|
|
|
}
|
|
|
|
|
if ($startDate !== NULL) {
|
|
|
|
|
$sql .= " and gci.GCI_travelDate between '$startDate' and '$endDate' "; // test
|
|
|
|
|
$sql .= " and gci.GCI_travelDate between '$startDate' and '$endDate' ";
|
|
|
|
|
}
|
|
|
|
|
$sql .= " order by GCI_createTime asc ";
|
|
|
|
|
// $sql .= "UNION SELECT top 50
|
|
|
|
|
// coli.COLI_ID, coli.COLI_SN, coli.COLI_GRI_SN, cold.COLD_SN, coli.COLI_OrderDetailText, coli.COLI_Memo,coli.COLI_State,coli.COLI_OPI_ID,
|
|
|
|
|
// cold.COLD_PlanVEI_SN, gci.*
|
|
|
|
|