diff --git a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php index 22124efc..747649a7 100644 --- a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php +++ b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php @@ -103,12 +103,13 @@ class Tulanduo extends CI_Controller $change_info = $change_arr[0][0]; } $change_info = str_replace("\n", "
", $change_info); - $agcOrderNo = $vas->GRI_Name; $grd_info = $this->Group_model->get_vendor_plan_info($gri_sn, $vei_sn); $all_day_no = array_map(function($ele){return $ele->GRD_DayNo;}, $grd_info); - $routeType = "桂林海纳国旅"; // todo + $routeType = "桂林海纳国旅"; // todo 线路类型 $arrange_info = $this->Group_model->get_arrange_info($gri_sn, $vei_sn); - $routeName = "中华游" . $arrange_info[0]->tocity . "线路"; // todo + $routeName = "中华游" . $arrange_info[0]->tocity . "线路"; // todo 线路名称 + $agcOrderNo = $vas->GRI_Name . "-" . $arrange_info[0]->citycode; + $agcOrderNo .= "(" . $vas->operator . ")"; $first_date = $grd_info[0]->day_no_raw; $last_date = count($grd_info)-1; $end_date = $grd_info[$last_date]->day_no_raw; diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php index 2ddce070..dc8d46f7 100644 --- a/webht/third_party/vendorPlanSync/models/Group_model.php +++ b/webht/third_party/vendorPlanSync/models/Group_model.php @@ -15,6 +15,7 @@ class Group_model extends CI_Model { $sql = "SELECT $top_sql VAS_IsConfirm, VAS_SendVary, GRI_OrderType, GRI_SN, GRI_No, GRI_operator,GRI_Name, (select OPI_DEI_SN from OperatorInfo where OPI_SN=GRI_operator) as department, + (select OPI2_Name from OperatorInfo2 where OPI2_OPI_SN=GRI_operator and OPI2_LGC=2) as operator, vas.* from VendorArrangeState vas inner join Eva_ObjectInfo eoi on EOI_GRI_SN=VAS_GRI_SN and EOI_Type=1 and EOI_ObjSN=VAS_VEI_SN @@ -113,6 +114,8 @@ class Group_model extends CI_Model { where CII2_CII_SN=ACI_FromCity and CII2_LGC=2) as fromcity, (select CII2_Name from CItyInfo2 where CII2_CII_SN=ACI_ToCity and CII2_LGC=2) as tocity, + (select CII_PKCode from CItyInfo + where CII_SN=ACI_ToCity ) as citycode, * from ArrangeConfirmInfo aci where 1=1