diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
index 8ec164926..41c14a364 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml
@@ -3859,10 +3859,10 @@
-
-
-
-
+
+
+
+
@@ -3881,7 +3881,7 @@
-
+
@@ -4005,38 +4005,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -4303,6 +4272,10 @@
+
+
+
+
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
index 668e48c6a..62739a6c3 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
@@ -46,6 +46,7 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
String HANDLING_CHARGE_MONEY_NOTAX=null;// (˰)
String HANDLING_CHARGE_MONEY_TAX=null; // (˰)
String OTHERS_MATH=null; // 豸+--֤-
+ String GPS_FEE=null; // GPS
String ACCOUNT_DATE=null; //
String FACT_DATE=null; // ʵʸ
String CONTRACT_ID=null; // ͬid
@@ -62,18 +63,25 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
String TAX_NUM=null; // ˺
String sql="";
- // ͳ
- if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2018092500000162".equals(VOUCHERNO) || "PZ2018092500000164".equals(VOUCHERNO) || "PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092500000169".equals(VOUCHERNO) || "PZ2019071800000036".equals(VOUCHERNO) || "PZ2019071800000038".equals(VOUCHERNO) || "PZ2019071800000039".equals(VOUCHERNO) || "PZ2019071800000040".equals(VOUCHERNO) || "PZ2019071800000041".equals(VOUCHERNO) || "PZ2019071800000037".equals(VOUCHERNO)){
- sql="SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS EQUIPTAX,ROUND((ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)+IFNULL(LFIT2.OTHER_MONEY, 0)),2) AS EQUIPNOTAX_OTHER,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LUL.IS_MAIN = 'Y' AND LFIT1.FLOWUNID = :FLOWUNID ";
- // ഫͳ
- }else if("PZ2019072000000077".equals(VOUCHERNO) || "PZ2019072000000078".equals(VOUCHERNO) || "PZ2019072000000079".equals(VOUCHERNO) || "PZ2019072000000080".equals(VOUCHERNO) || "PZ2019072000000081".equals(VOUCHERNO) || "PZ2019072200000112".equals(VOUCHERNO) || "PZ2019072200000113".equals(VOUCHERNO) || "PZ2019072200000114".equals(VOUCHERNO) || "PZ2019072200000115".equals(VOUCHERNO) || "PZ2019072200000116".equals(VOUCHERNO) || "PZ2019072200000117".equals(VOUCHERNO)){
- sql="SELECT ROUND((getTax (lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS EQUIPTAX,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '3' AND LUL.IS_MAIN = 'Y' AND LFIT1.FLOWUNID = :FLOWUNID ";
- }/*else if("PZ2019072000000081".equals(VOUCHERNO)){
- sql="SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEY,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,IFNULL(LCCT.GPS_FEE,0) AS GPS_FEE,(IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)-IFNULL(LCCT.GPS_FEE,0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '3' AND LUL.IS_MAIN = 'Y' AND LFIT1.FLOWUNID = :FLOWUNID ";
- }*/
+ // ͳ
+ if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2018092500000162".equals(VOUCHERNO) || "PZ2018092500000164".equals(VOUCHERNO) || "PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092500000169".equals(VOUCHERNO)){
+ sql="SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS EQUIPTAX,ROUND((ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)+IFNULL(LFIT2.OTHER_MONEY, 0)),2) AS EQUIPNOTAX_OTHER,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LFIT1.FLOWUNID = :FLOWUNID ";
+ // ͳֱ
+ }else if("PZ2019071800000036".equals(VOUCHERNO) || "PZ2019071800000038".equals(VOUCHERNO) || "PZ2019071800000039".equals(VOUCHERNO) || "PZ2019071800000040".equals(VOUCHERNO) || "PZ2019071800000041".equals(VOUCHERNO) || "PZ2019071800000037".equals(VOUCHERNO)){
+ sql="SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS EQUIPTAX,ROUND((ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)+IFNULL(LFIT2.OTHER_MONEY, 0)),2) AS EQUIPNOTAX_OTHER,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LFIT1.FLOWUNID = :FLOWUNID ";
+ // ഫͳ-
+ }else if("PZ2019072000000078".equals(VOUCHERNO) || "PZ2019072000000079".equals(VOUCHERNO) || "PZ2019072000000080".equals(VOUCHERNO) || "PZ2019072000000081".equals(VOUCHERNO)){
+ sql="SELECT ROUND((getTax(lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS MONEY,CASE WHEN IFNULL(LFIT6.CONTRIBUTIVE_MONEY,0)=0 THEN IFNULL(LCCT.unite_money,0) ELSE 0 END AS INTERESTNOTAX,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LCCT.CLEAN_LEASE_MONEY,0) + CASE WHEN IFNULL(LFIT6.CONTRIBUTIVE_MONEY,0)=0 THEN IFNULL(LCCT.unite_money,0) ELSE 0 END - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)-IFNULL(LCCT.GPS_FEE,0)) AS OTHERS_MATH,IFNULL(LCCT.GPS_FEE,0) AS GPS_FEE,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS CONTRIBUTIVE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype32' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT6 ON LFIT6.FLOWUNID = LFIT1.FLOWUNID AND LFIT6.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '3' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND LFIT1.FLOWUNID = :FLOWUNID ";
+ // ഫͳ-ֱ
+ }else if("PZ2019072200000112".equals(VOUCHERNO) || "PZ2019072200000113".equals(VOUCHERNO) || "PZ2019072200000114".equals(VOUCHERNO) || "PZ2019072200000115".equals(VOUCHERNO) || "PZ2019072200000116".equals(VOUCHERNO) || "PZ2019072200000117".equals(VOUCHERNO)){
+ sql="SELECT ROUND((getTax (lci.LEAS_FORM,'',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LFIT1.EQUIP, 0) AS EQUIP,ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS EQUIPNOTAX,(IFNULL(LFIT1.EQUIP, 0) - ROUND(IFNULL(LFIT1.EQUIP, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS EQUIPTAX,IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS FIRST_PAYMENT_NOTAX,(IFNULL(LFIT3.FIRST_PAYMENT, 0) - ROUND(IFNULL(LFIT3.FIRST_PAYMENT, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS FIRST_PAYMENT_TAX,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax(LCI.LEAS_FORM,'',LCCT.START_DATE),2) AS HANDLING_CHARGE_MONEY_NOTAX,(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) - ROUND(IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) / getTax (LCI.LEAS_FORM,'',LCCT.START_DATE),2)) AS HANDLING_CHARGE_MONEY_TAX,(IFNULL(LFIT1.EQUIP, 0) + IFNULL(LFIT2.OTHER_MONEY, 0) - IFNULL(LFIT3.FIRST_PAYMENT, 0) - IFNULL(LFIT4.GUARANTY, 0) - IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0)) AS OTHERS_MATH,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT1.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT1.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29' GROUP BY FLOWUNID,CONTRACT_ID) LFIT2 ON LFIT2.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS FIRST_PAYMENT FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID AND LFIT3.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS GUARANTY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID AND LFIT4.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(FACT_MONEY) AS HANDLING_CHARGE_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1' AND SETTLE_METHOD = 'settlemethod11' GROUP BY FLOWUNID,CONTRACT_ID) LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID AND LFIT5.CONTRACT_ID = LFIT1.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '3' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='01' AND LFIT1.FLOWUNID = :FLOWUNID ";
+ // ſ-ȷGPS-ഫͳ
+ }else if("PZ2019090500000004".equals(VOUCHERNO)){
+ sql="SELECT ROUND((getTax (lci.LEAS_FORM,'GPS',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.GPS_FEE,0) AS MONEY,ROUND(IFNULL(LCCT.GPS_FEE,0)/getTax(LCI.LEAS_FORM,'GPS',LCCT.START_DATE),2) AS INTERESTNOTAX,(IFNULL(LCCT.GPS_FEE,0)-ROUND(IFNULL(LCCT.GPS_FEE,0)/getTax(LCI.LEAS_FORM,'GPS',LCCT.START_DATE),2)) AS TAX,CASE WHEN DATE_FORMAT(NOW(), '%Y/%m') > DATE_FORMAT(LFIT.FACT_DATE, '%Y/%m') THEN DATE_FORMAT(LFIT.ACCOUNTING_DATE,'%Y/%m/%d') ELSE DATE_FORMAT(LFIT.FACT_DATE, '%Y/%m/%d') END AS ACCOUNT_DATE,DATE_FORMAT(LFIT.FACT_DATE, '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER AS ACC_NUMBER FROM (SELECT FLOWUNID,CONTRACT_ID,MAX(FACT_DATE) AS FACT_DATE,MAX(ACCOUNTING_DATE) AS ACCOUNTING_DATE,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '3' AND LUL.IS_MAIN = 'Y' AND LCI.LEAS_FORM='02' AND IFNULL(LCCT.GPS_FEE,0)>0 AND LFIT.FLOWUNID = :FLOWUNID ";
+ }
// Dzſ
- if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2019071800000036".equals(VOUCHERNO) || "PZ2019072000000077".equals(VOUCHERNO) || "PZ2019072200000112".equals(VOUCHERNO)){
+ if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2019071800000036".equals(VOUCHERNO) || "PZ2019072200000112".equals(VOUCHERNO)){
sql+=" AND (IFNULL(LFIT3.FIRST_PAYMENT,0) = 0 AND IFNULL(LFIT4.GUARANTY,0) =0 AND IFNULL(LFIT5.HANDLING_CHARGE_MONEY ,0) = 0)";
// -֧Ԥ()
}else if("PZ2018092500000162".equals(VOUCHERNO) || "PZ2019071800000038".equals(VOUCHERNO) || "PZ2019072000000078".equals(VOUCHERNO) || "PZ2019072200000113".equals(VOUCHERNO)) {
@@ -85,7 +93,7 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
}else if("PZ2018092500000166".equals(VOUCHERNO) || "PZ2019071800000040".equals(VOUCHERNO) || "PZ2019071800000041".equals(VOUCHERNO) || "PZ2019072000000080".equals(VOUCHERNO) || "PZ2019072200000115".equals(VOUCHERNO) || "PZ2019072200000116".equals(VOUCHERNO)) {
sql+=" AND IFNULL(LFIT5.HANDLING_CHARGE_MONEY ,0) <> 0 ";
// ̷ſ-ſ
- }else if("PZ2018092500000169".equals(VOUCHERNO) || "PZ2019072000000081".equals(VOUCHERNO) || "PZ2019072200000117".equals(VOUCHERNO)) {
+ }else if("PZ2018092500000169".equals(VOUCHERNO) || "PZ2019072200000117".equals(VOUCHERNO)) {
sql+=" AND (IFNULL(LFIT3.FIRST_PAYMENT,0) <> 0 OR IFNULL(LFIT4.GUARANTY,0) <> 0 OR IFNULL(LFIT5.HANDLING_CHARGE_MONEY ,0) <> 0)";
}
@@ -104,12 +112,10 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
// ѯsql, װmap
List