diff --git a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java
index 63ce8300..edf3f0b2 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java
@@ -29,8 +29,24 @@ public class ReceiptForEntity extends BaseEntity {
private String ddh;
private String bbhl;
private String contractno;
+ private String djlxbm;//交易类型编码
+ private String pj_jsfs;//结算方式编码
+ public String getPj_jsfs() {
+ return pj_jsfs;
+ }
+ public void setPj_jsfs(String pj_jsfs) {
+ this.pj_jsfs = pj_jsfs;
+ }
+
+ public String getDjlxbm() {
+ return djlxbm;
+ }
+
+ public void setDjlxbm(String djlxbm) {
+ this.djlxbm = djlxbm;
+ }
public String getDfbbje() {
return dfbbje;
diff --git a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml
index 2aab8a1a..9659424c 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml
@@ -12,6 +12,8 @@
+
+
@@ -70,6 +72,9 @@
field0013 as r_dfbbje,
field0011 as r_dfybje,
field0019 as r_fph,
+ 'D2' as djlxbm,
+ field0095 as pj_jsfs,
+ field0014 as bfyhzh,
field0059 as r_zy,
field0073 as r_bzbm_code,
field0001 as r_djbh,
@@ -83,6 +88,7 @@
field0092 as r_ywybm
from formmain_0045
where field0089 is null
+ and finishedflag = '1'
and id like concat('%',#{id},'%')
diff --git a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java
index 1308f412..36564a0f 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java
@@ -203,6 +203,7 @@ public class ReceiptForServiceImpl extends BaseService
parentvo.put("dwbm",rec.getDwbm());
parentvo.put("hbbm",rec.getHbbm());
parentvo.put("lrr",rec.getLrr());
+ parentvo.put("djlxbm",rec.getDjlxbm());//交易类型编码
parentvo.put("shr",rec.getShr());
parentvo.put("shrq",rec.getShrq().substring(0,10));
@@ -210,8 +211,9 @@ public class ReceiptForServiceImpl extends BaseService
//parentvo.put("wldx",rec.getWldx());
parentvo.put("deptid",rec.getDeptid());
//parentvo.put("ywybm",rec.getYwybm());
- //parentvo.put("bfyhzh",rec.getBfyhzh());
- parentvo.put("skyhmc",rec.getSkyhmc());
+ parentvo.put("bfyhzh",rec.getBfyhzh());
+ parentvo.put("skyhmc",rec.getSkyhmc());//收款银行账号
+ parentvo.put("pj_jsfs",rec.getPj_jsfs());//结算方式
//parentvo.put("dfyhzh",rec.getDfyhzh());
parentvo.put("fkyhmc",rec.getFkyhmc());
parentvo.put("bzbm",rec.getBzbm());