Merge branch 'feature/plan-auto-send-release'

webht/third_party/vendorPlanSync/models/BIZ_orders_model.php

@@ -138,11 +138,12 @@ class BIZ_Orders_model extends CI_Model {
     {
         $sql = "SELECT COLD_TotalPrice, dbo.GetSSJEFromSQJE(
             (select top 1 GAI_Type from BIZ_GroupAccountInfo b where gai_coli_sn=cold.COLD_COLI_SN and b.DeleteFlag=0)
-            ,'USD',COLD_TotalPrice) as CNY_price
+            ,coli.COLI_Currency,COLD_TotalPrice) as CNY_price
             ,(select top 1 GAI_Type from BIZ_GroupAccountInfo b where gai_coli_sn=cold.COLD_COLI_SN and b.DeleteFlag=0)
             as payment_type
             -- ,cold.*
         from BIZ_ConfirmLineDetail cold
+        inner join BIZ_ConfirmLineInfo coli on coli.COLI_SN=cold.COLD_COLI_SN
         where cold.COLD_SN in ($COLD_SN_str)
             and not exists (
                 select 1 from BIZ_PackageOrderInfo where POI_COLD_SN=cold.COLD_SN and POI_QuotationType=4