diff --git a/config/META-INF/xfire/services.xml b/config/META-INF/xfire/services.xml index a40014de0..0db277469 100644 --- a/config/META-INF/xfire/services.xml +++ b/config/META-INF/xfire/services.xml @@ -1,19 +1,20 @@ - + McontractService + com.tenwa.makeContract.McontractService + com.tenwa.makeContract.impl.McontractServiceImpl + CustomerService + com.tenwa.voucher.service.CustomerService + com.tenwa.voucher.serviceImp.CustomerServiceImpl \ No newline at end of file diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java index 35d081540..ef50eb5c6 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java @@ -45,7 +45,8 @@ public class CreateVoucherRedCompensatory { sql="SELECT IFNULL(V8.MONEY, 0) AS MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%-յ%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 LEFT JOIN LC_RENT_PLAN LRP ON LRP.ID = V8.F58 LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID WHERE LCI.BUSINESSTYPE = '1' AND IFNULL(V8.MONEY, 0) > 0 AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58=V8.F58 AND F59=1 AND MODULE_NAME LIKE '%-յ%') "; // -յϢ }else if("PZ2019071500000031".equals(VOUCHERNO)){ - sql="SELECT IFNULL(LRIT.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRIT.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%-Ϣ%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 LEFT JOIN LC_RENT_PLAN LRP ON LRP.ID = V8.F58 LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(PENALTY) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRIT ON LRIT.CONTRACT_ID=LRP.CONTRACT_ID AND LRIT.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID WHERE LCI.BUSINESSTYPE = '1' AND IFNULL(V8.MONEY, 0) > 0 AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58 = V8.F58 AND F59 = 1 AND MODULE_NAME LIKE '%-Ϣ%') "; + // sql="SELECT IFNULL(LRIT.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRIT.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%-Ϣ%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 LEFT JOIN LC_RENT_PLAN LRP ON LRP.ID = V8.F58 LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(PENALTY) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRIT ON LRIT.CONTRACT_ID=LRP.CONTRACT_ID AND LRIT.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID WHERE LCI.BUSINESSTYPE = '1' AND IFNULL(V8.MONEY, 0) > 0 AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58 = V8.F58 AND F59 = 1 AND MODULE_NAME LIKE '%-Ϣ%') "; + sql="SELECT IFNULL(LRI.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRI.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT ID,CONTRACT_ID,PLAN_LIST FROM LC_RENT_PLAN WHERE ID = '"+LRP_ID+"') LRP LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(PENALTY) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%-Ϣ%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 ON V8.F58 = LRP.ID WHERE LCI.BUSINESSTYPE = '1' AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58 = LRP.ID AND F59 = 1 AND MODULE_NAME LIKE '%-Ϣ%') "; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, null); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java index b9515b21e..1a13c937e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java @@ -69,7 +69,6 @@ public class CreateVoucherRentIncome { List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); - CreateVoucherRedCompensatory cvrc = new CreateVoucherRedCompensatory(); String VOUCHER_TYPE="1";// ƾ֤ for (int i=0;i