From 996f76f6de1c30a7955628b737d0d44497ce51e5 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 6 Dec 2019 11:07:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E6=8E=92=E9=99=A4=E5=B7=B2=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=9A=84=E5=9B=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/controllers/vendor_money.php | 4 +++- .../trippestOrderSync/models/vendor_money_model.php | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php index 88410275..a93d39e9 100644 --- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php +++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php @@ -325,7 +325,9 @@ class Vendor_money extends CI_Controller { $xls_ht_diff = $this->diff_xls_ht_cost($xls_data, $HT_combine_cost); foreach ($xls_ht_diff['cost_error'] as $kc => $cost_error) { $colis = $this->get_gci_coli($cost_error['GCI_combineNo'], false); - if (array_sum(array_column($colis['data'], 'no_fresh')) > 0) { + if (array_sum(array_column($colis['data'], 'no_fresh')) > 0 + || array_sum(array_column($colis['data'], 'cgi_check')) > 0 + ) { continue; } foreach ($colis['data'] as $kco => $coli) { diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 70a87346..5ed9d2e3 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -688,6 +688,10 @@ ORDER BY to_be_diff.GCI_VEI_SN and DeleteFlag=0 and COLD_PlanVEI_SN not in (1343,29188,30548) ) as no_fresh + ,( + select COUNT(CGI_SN) from CK_GroupInfo k + where k.CGI_GRI_SN=GCI_GRI_SN and CGI_Checked=1 + ) as cgi_check from BIZ_ConfirmLineInfo inner join GroupCombineInfo cc on cc.GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo=?";