Merge branch 'master' of gitee.com:hainatravel/information-system

webht/third_party/trippestOrderSync/models/vendor_money_model.php

@@ -413,14 +413,14 @@ class Vendor_money_model extends CI_Model {
                 (select isnull(SUM(cast(GCI_priceCNY as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo<>'cancel' ) as TLD_total_price,
                 (select isnull(SUM(cast(GCI_agencyReceipt as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo is not null ) as TLD_agency_receipt,
                 (select isnull(SUM(cast(GAI_SSJE as decimal(10,2))),0) from BIZ_GroupAccountInfo where GAI_COLI_SN=COLI_SN
-                    and GAI_Type in (" . PAY_OTHER . ")
+                    --and GAI_Type in (" . PAY_OTHER . ")
                     AND GAI_VEI_SN in ($all_vendor,1343) -- 图兰朵的代收
                     and DeleteFlag=0
                 ) as HT_agency_receipt,
                 (select isnull(SUM(cast(GAI_SSJE as decimal(10,2))),0) from BIZ_GroupAccountInfo where GAI_COLI_SN=COLI_SN
-                    and GAI_Type not in (" . PAY_OTHER . ")
+                    --and GAI_Type not in (" . PAY_OTHER . ")
                     and DeleteFlag=0
-                    --and isnull(GAI_VEI_SN,0) in (0,)
+                    and isnull(GAI_VEI_SN,30561) = 30561
                 ) as HT_haina_receipt,
                 (select top 1 CONVERT(varchar(10),ISNULL( GAI_SQJE,0)) + isnull(GAI_SQJECurrency,'')+',' + isnull(GAI_Memo,'') from BIZ_GroupAccountInfo ga where ga.DeleteFlag=0 and GAI_COLI_SN=COLI_SN
                     and GAI_SQJE>0 and isnull(GAI_SSJE,0)=0

webht/third_party/trippestOrderSync/views/vendor_money_sum.php

@@ -344,6 +344,7 @@
                         </th>
                         <th class="text-left">
                             <p class="text-center"> 财务表读取总成本</p>
+                            <p>读取相同拼团号下的订单的财务表, 列出存在财务表数据未根据实际成本计算的.</p>
                             <ol class="info-primary">
                                 <li> 数据为空: 虚拟订单没有团号, 无法计算. 如:
                                     <ul>
@@ -362,13 +363,14 @@
                         </th>
                         <th class="text-left">
                             <p class="text-center"> 财务表计算总成本</p>
-                            <!-- <ol class="info-primary">
-                                <li> 与左列值不相等
+                            <p>计算相同拼团号下所有订单的财务表中的产品成本总和, 判断是否存在数据未根据实际成本计算.</p>
+                            <ol class="info-primary">
+                                <li> 与左列值不相等，且左列值正确
                                     <ul>
-                                        <li> 拼团下个别订单需要重新生成账单. </li>
+                                        <li> 拼团下个别订单需要重新生成账单，未采用实际成本计算并且订单已审核账单（不会自动重新生成）. </li>
                                     </ul>
                                 </li>
-                            </ol> -->
+                            </ol>
                         </th>
                     </tr>
                 </thead>