diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.java
index 8616ce45..5666f00d 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.java
@@ -45,6 +45,11 @@ public class FeClaimBillBEntity extends BaseEntity {
*/
private String explain;
private String bssm;
+ /**
+ * 外币服务费
+ */
+ private String wbfwf;
+
/**
* 汇率
*/
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.xml
index 3584ef43..1fc464b9 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.xml
@@ -13,6 +13,7 @@
+
@@ -47,7 +48,8 @@
,currency_name
,money
,bssm
- ,rate
+ ,wbfwf
+ ,rate
,wldx
,business_type
,kxxz
@@ -86,6 +88,7 @@
and currency_name = #{currencyName}
and money = #{money}
and bssm = #{bssm}
+ and wbfwf = #{wbfwf}
and rate = #{rate}
and wldx = #{wldx}
and business_type = #{businessType}
@@ -128,6 +131,7 @@
and currency_name = #{currencyName}
and money = #{money}
and bssm = #{bssm}
+ and wbfwf = #{wbfwf}
and rate = #{rate}
and wldx = #{wldx}
and business_type = #{businessType}
@@ -176,6 +180,7 @@
and money like concat('%',#{money},'%')
and bssm like concat('%',#{bssm},'%')
+ and wbfwf like concat('%',#{wbfwf},'%')
and rate like concat('%',#{rate},'%')
and wldx like concat('%',#{wldx},'%')
and business_type like
@@ -222,6 +227,7 @@
or currency_name = #{currencyName}
or money = #{money}
or bssm = #{bssm}
+ or wbfwf = #{wbfwf}
or rate = #{rate}
or wldx = #{wldx}
or business_type = #{businessType}
@@ -264,6 +270,7 @@
currency_name ,
money ,
bssm ,
+ wbfwf ,
rate ,
wldx ,
business_type ,
@@ -301,6 +308,7 @@
#{currencyName} ,
#{money} ,
#{bssm} ,
+ #{wbfwf} ,
#{rate} ,
#{wldx} ,
#{businessType} ,
@@ -393,6 +401,7 @@
currency_name = #{currencyName},
money = #{money},
bssm = #{bssm},
+ wbfwf = #{wbfwf},
rate = #{rate},
wldx = #{wldx},
business_type = #{businessType},
@@ -441,6 +450,7 @@
and currency_name = #{currencyName}
and money = #{money}
and bssm = #{bssm}
+ and wbfwf = #{wbfwf}
and rate = #{rate}
and wldx = #{wldx}
and business_type = #{businessType}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java
index d789a437..2f65230b 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java
@@ -19,6 +19,9 @@ import com.hzya.frame.sysnew.user.entity.SysUserEntity;
import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDBQueryVODAO;
import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDbFiledVODAO;
import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO;
+import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao;
+import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastDao;
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastEntity;
import com.hzya.frame.voucher.ae.generate.core.vo.CreateVoucherVO;
import com.hzya.frame.voucher.ae.push.service.IAePushVoucherLogService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +60,10 @@ public class IClaimSKServiceImpl implements IClaimSKService {
private ISysUserDao sysUserDao;
@Autowired
private ISysPersonDao sysPersonDao;
+ @Autowired
+ private IAeConfSubjectContrastDao contrastDao;
+ @Autowired
+ private IAeConfSubjectContrastBDao contrastBDao;
@@ -181,7 +188,9 @@ public class IClaimSKServiceImpl implements IClaimSKService {
/**
* 自动归集
- * 1、
+ * 1、根据对照表（SK/FK 收款付款对照）选择 收付款模板
+ * 2、根据模板字段选择方案或者具体数值
+ * 3、组装认领单
*/
@Override
public FeClaimBillHEntity autoCollection(MdmDBQueryVO vo) {
@@ -202,6 +211,26 @@ public class IClaimSKServiceImpl implements IClaimSKService {
Assert.state(false, "自动归集失败，流水已认领，流水id：{}。", id);
}
+ //根据对照表（SK/FK 收款付款对照）选择 收付款模板
+ //认领类型 SK/FK D-借；C-贷 转入/转出标志
+ String outflag = kkBankflow.getOutflag();
+ if ("D".equals(outflag)) {
+ feClaimBillHEntity.setClaimType("SK");
+ } else if ("C".equals(outflag)) {
+ feClaimBillHEntity.setClaimType("FK");
+ }
+ AeConfSubjectContrastEntity aeConfSubjectContrastEntity = new AeConfSubjectContrastEntity();
+ aeConfSubjectContrastEntity.setCode("SK/FK");
+ aeConfSubjectContrastEntity.setName("收款付款对照");
+ List contrastEntityList = contrastDao.query(aeConfSubjectContrastEntity);
+ System.out.println(contrastEntityList);
+ if(contrastEntityList.size()==0){
+ Assert.state(false,"根据编码：{}，名称：{}，未查到收付款模板","SK/FK","收款付款对照");
+ }
+ String contrastId = contrastEntityList.get(0).getId();
+
+
+
//认领日期
LocalDateTime now = LocalDateTime.now();
String billDate = now.format(formatter);
@@ -285,14 +314,6 @@ public class IClaimSKServiceImpl implements IClaimSKService {
map.put("explain",null);
- //认领类型 SK/FK D-借；C-贷 转入/转出标志
- String outflag = kkBankflow.getOutflag();
- if ("D".equals(outflag)) {
- feClaimBillHEntity.setClaimType("SK");
- } else if ("C".equals(outflag)) {
- feClaimBillHEntity.setClaimType("FK");
- }
-
//来源单据号
String transeqno1 = kkBankflow.getTranseqno1();
feClaimBillHEntity.setSourceFlowBankId(transeqno1);
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java
index 77be60b5..01eda3cc 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java
@@ -108,6 +108,7 @@ public class IClaimServiceImpl implements IClaimService {
//描述说明
map.put("explain", feClaimBillB.getExplain());
map.put("bssm", feClaimBillB.getBssm());
+ map.put("wbfwf", feClaimBillB.getWbfwf());
return feClaimBillH;
@@ -193,32 +194,20 @@ public class IClaimServiceImpl implements IClaimService {
List> detailList = feClaimBillHEntity.getDetailList();
Map map = detailList.get(0);
- String zy = map.get("zy");
+ String zy = map.get("zy");//摘要
feClaimBillHEntity.setZy(zy);
- String kxxz = map.get("kxxz");
+ String kxxz = map.get("kxxz");//款项性质
feClaimBillHEntity.setKxxz(kxxz);
- String type = map.get("type");
+ String type = map.get("type");//款项类别
feClaimBillHEntity.setType(type);
- String currencyName = map.get("currencyName");
+ String currencyName = map.get("currencyName");//币种
feClaimBillHEntity.setCurrencyName(currencyName);
- String money = map.get("money");
+ String money = map.get("money");//金额
feClaimBillHEntity.setMoney(money);
- String bssm = map.get("bssm");
+ String bssm = map.get("bssm");//描述说明
feClaimBillHEntity.setBssm(bssm);
-
-
-// //摘要
-// map.put("zy",kkBankflow.getZy());
-// //款项性质
-// map.put("nature",null);
-// //款项类别
-// map.put("type",null);
-// //币种
-// map.put("currencyName",kkBankflow.getCcy());
-// //金额
-// map.put("money",kkBankflow.getTranamt());
-// //描述说明
-// map.put("explain",null);
+ String wbfwf = map.get("wbfwf");//外币服务费
+ feClaimBillHEntity.setWbfwf(wbfwf);
//保存认领单
@@ -234,6 +223,7 @@ public class IClaimServiceImpl implements IClaimService {
feClaimBillBEntity.setCurrencyName(currencyName);
feClaimBillBEntity.setMoney(money);
feClaimBillBEntity.setBssm(bssm);
+ feClaimBillBEntity.setWbfwf(wbfwf);
claimBillBDao.save(feClaimBillBEntity);
//更新流水认领单号以及认领状态
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/impl/FeConfBillTemplateServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/impl/FeConfBillTemplateServiceImpl.java
index c9b5ca39..819a6f7c 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/impl/FeConfBillTemplateServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/impl/FeConfBillTemplateServiceImpl.java
@@ -4,6 +4,8 @@ import cn.hutool.core.lang.Assert;
import com.hzya.frame.finance.conf.billtemplate.entity.FeConfBillTemplateEntity;
import com.hzya.frame.finance.conf.billtemplate.dao.IFeConfBillTemplateDao;
import com.hzya.frame.finance.conf.billtemplate.service.IFeConfBillTemplateService;
+import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDBQueryVODAO;
+import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO;
import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectClassificationService;
import org.springframework.stereotype.Service;
@@ -36,6 +38,8 @@ public class FeConfBillTemplateServiceImpl extends BaseService queryAll(FeConfBillTemplateEntity billTemplateEntity) {
@@ -101,6 +105,16 @@ public class FeConfBillTemplateServiceImpl extends BaseService {
List> queryMdmDateBySK(MdmDBQueryVO entity);
List> queryFlowDataByDate(MdmDBQueryVO entity);
+
+ void inserDataVO(MdmDBQueryVO mdmDBQueryVO);
+ void deleteDataVO(MdmDBQueryVO mdmDBQueryVO);
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java
index 145db274..15a5a45e 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java
@@ -88,4 +88,13 @@ public class MdmDBQueryVODAOImpl extends MybatisGenericDao
List> maps = (List>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryFlowDataByDate", entity);
return maps;
}
+
+ @Override
+ public void inserDataVO(MdmDBQueryVO mdmDBQueryVO) {
+ insert("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.inserDataVO",mdmDBQueryVO);
+ }
+ @Override
+ public void deleteDataVO(MdmDBQueryVO mdmDBQueryVO) {
+ insert("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.deleteDataVO",mdmDBQueryVO);
+ }
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
index db58bd1e..68833547 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
@@ -300,5 +300,58 @@
+
+ insert into ${tablename}(
+ id,
+ data_status,
+ sts,
+
+ ${prop1},
+ ${prop2},
+ ${prop3},
+ ${prop4},
+ ${prop5},
+ ${prop6},
+ ${prop7},
+ ${prop8},
+ ${prop9},
+ ${prop10},
+
+ )values(
+ UUID(),
+ 'Y',
+ 'Y',
+
+ #{propValue1},
+ #{propValue2},
+ #{propValue3},
+ #{propValue4},
+ #{propValue5},
+ #{propValue6},
+ #{propValue7},
+ #{propValue8},
+ #{propValue9},
+ #{propValue10},
+
+ )
+
+
+
+ delete from
+ ${tablename}
+ where
+ 1=1
+ and ${prop1} = #{propValue1}
+ and ${prop2} = #{propValue2}
+ and ${prop3} = #{propValue3}
+ and ${prop4} = #{propValue4}
+ and ${prop5} = #{propValue5}
+ and ${prop6} = #{propValue6}
+ and ${prop7} = #{propValue7}
+ and ${prop8} = #{propValue8}
+ and ${prop9} = #{propValue9}
+ and ${prop10} = #{propValue10}
+
+
diff --git a/pom.xml b/pom.xml
index 430a5b73..881fdea3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,23 +358,23 @@
-
- org.codehaus.mojo
- flatten-maven-plugin
- 1.4.1
-
-
- flatten
- process-resources
-
- flatten
-
-
- true
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+