From 7d5d3c62d298b1a7ff5fa03168a1ad9df9029ebb Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 20 Nov 2019 18:20:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/controllers/order_finance.php | 2 +- .../trippestOrderSync/models/orderFinance_model.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/order_finance.php b/webht/third_party/trippestOrderSync/controllers/order_finance.php index 3fc68543..940fe949 100644 --- a/webht/third_party/trippestOrderSync/controllers/order_finance.php +++ b/webht/third_party/trippestOrderSync/controllers/order_finance.php @@ -495,7 +495,7 @@ class Order_finance extends CI_Controller { $ret->person_cost = bcdiv($ret->cost_sum, $ret->person_num); $ret->comment = "PVT[" . $combineNo . "],共" . $ret->person_num . "人"; $pag_sns = array_values(array_unique(array_map(function($ele) {return $ele->COLD_ServiceSN;}, $all_orders))); - $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', $pag_sns)); + $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', $pag_sns), $all_orders[0]->COLD_PlanVEI_SN); $ret->PAG_Code = implode(",", array_values(array_unique(array_map(function($ele) {return mb_strtoupper($ele->PAG_Code);}, $pags_info)))); $ret->vendor_name = implode(",", array_values(array_unique(array_map(function($ele) {return $ele->VEI2_CompanyBN;}, $pags_info)))) ; $ret->pag_name = implode("; ", array_map(function($ele) {return $ele->PAG_Title;}, $pags_info)) ; diff --git a/webht/third_party/trippestOrderSync/models/orderFinance_model.php b/webht/third_party/trippestOrderSync/models/orderFinance_model.php index 01172721..066c4c79 100644 --- a/webht/third_party/trippestOrderSync/models/orderFinance_model.php +++ b/webht/third_party/trippestOrderSync/models/orderFinance_model.php @@ -183,14 +183,15 @@ class OrderFinance_model extends CI_Model { } /** 获取产品信息:产品名称,供应商等 */ - public function get_pag_info($PAG_SN_str="") + public function get_pag_info($PAG_SN_str="", $cold_vei=null) { if ($PAG_SN_str=="") { return array(); } + $vei_sql = $cold_vei===null ? 'PAG_DefaultVEI_SN' : "isnull(PAG_DefaultVEI_SN,$cold_vei)"; $sql = "SELECT pag.PAG_SN,PAG_Code,PAG_DefaultVEI_SN,PAG_Title,vei2.VEI2_CompanyBN from BIZ_PackageInfo pag - inner join VEndorInfo2 vei2 on VEI2_VEI_SN=PAG_DefaultVEI_SN and VEI2_LGC=2 + left join VEndorInfo2 vei2 on VEI2_VEI_SN=$vei_sql and VEI2_LGC=2 where PAG_SN in ($PAG_SN_str) "; return $this->HT->query($sql)->result(); }