diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
index 8e4c56ec..02ea2854 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
@@ -73,6 +73,26 @@
FROM formmain_0094 main
LEFT JOIN formson_0223 body ON main.id = body.formmain_id
WHERE field0053 IS NOT NULL and finishedflag = '1'
+ union all
+ SELECT
+ main.id as id,
+ field0002 as bill_code,
+ field0058 AS bill_date,
+ sum(field0019) AS primal_money,
+ field0051 AS pk_oppaccount,
+ 'GGKH' AS pk_supplier,
+ field0048 AS pk_org,
+ field0060 AS pk_balatype,
+ '' AS pk_recproject,
+ field0047 AS memo,
+ 'formmain_0224' as table_name,
+ 'field0055' as field_name,
+ field0055 as send_state
+ FROM formmain_0224 main
+ LEFT JOIN formson_0225 body ON main.id = body.formmain_id
+ WHERE field0058 IS NOT NULL and finishedflag = '1'
+ group by main.id,field0002,field0058,field0051,field0048
+ ,field0060,field0055,field0047
)m1 left join formmain_0236 on m1.pk_recproject_code = formmain_0236.field0002
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
diff --git a/service/src/main/java/com/hzya/frame/seeyon/recbill/entity/RecBillEntity.java b/service/src/main/java/com/hzya/frame/seeyon/recbill/entity/RecBillEntity.java
index b8eff35c..eaeb8f83 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/recbill/entity/RecBillEntity.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/recbill/entity/RecBillEntity.java
@@ -24,6 +24,33 @@ public class RecBillEntity extends BaseEntity {
private String billmaker;//组织
private String billCode;//单据编号
private String queryState;
+ private String pkBalatype;//结算方式
+ private String pkRecproject;//收款方名称
+ private String memo;//摘要
+
+ public String getPkBalatype() {
+ return pkBalatype;
+ }
+
+ public void setPkBalatype(String pkBalatype) {
+ this.pkBalatype = pkBalatype;
+ }
+
+ public String getPkRecproject() {
+ return pkRecproject;
+ }
+
+ public void setPkRecproject(String pkRecproject) {
+ this.pkRecproject = pkRecproject;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
public String getQueryState() {
return queryState;
diff --git a/service/src/main/java/com/hzya/frame/seeyon/recbill/entity/RecBillEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/recbill/entity/RecBillEntity.xml
index 87315232..01e16a73 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/recbill/entity/RecBillEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/recbill/entity/RecBillEntity.xml
@@ -13,27 +13,34 @@
<result property="tableName" column="table_name" jdbcType="VARCHAR"/>
<result property="fieldName" column="field_name" jdbcType="VARCHAR"/>
<result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
+ <result property="memo" column="memo" jdbcType="VARCHAR"/>
+ <result property="pkRecproject" column="pk_recproject" jdbcType="VARCHAR"/>
</resultMap>
<!--工程项目查询-->
<select id="RecBillEntity_list_base" resultMap="get-RecBillEntity-result" parameterType="com.hzya.frame.seeyon.recbill.entity.RecBillEntity">
- SELECT
- id AS id,
- field0005 AS bill_code,
- field0002 AS pk_org,
- field0006 AS bill_date,
- field0009 AS primal_money,
- field0001 AS pk_account,
- field0013 AS pk_customer,
- field0012 AS pk_oppaccount,
+ SELECT
+ main.id AS id,
+ main.field0005 AS bill_code,
+ org.field0002 AS pk_org,
+ main.field0006 AS bill_date,
+ main.field0009 AS primal_money,
+ main.field0001 AS pk_account,
+ case when cust.field0013 is null then 'GGKH' else cust.field0013 end AS pk_customer,
+ main.field0012 AS pk_oppaccount,
'formmain_0233' as table_name,
- 'field0016' as field_name
- FROM formmain_0233
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="queryState != null and queryState != ''"> and field0016 IS null </if>
- </trim>
+ 'field0016' as field_name,
+ concat(cust.field0014,main.field0010) as memo,
+ cost.field0003 as pk_recproject
+ FROM formmain_0233 main
+ left join formmain_0235 org on main.field0002 = org.field0001
+ left join formmain_0177 cust on main.field0013 = cust.field0014
+ left join formmain_0236 cost on cost.field0001 = main.field0010
+ where 1=1
+ <if test="id != null and id != ''"> and main.id = #{id} </if>
+ <if test="queryState != null and queryState != ''"> and main.field0016 IS null </if>
+ and org.field0002 is not null
</select>
<!--通过主键修改方法-->
diff --git a/service/src/main/java/com/hzya/frame/seeyon/recbill/service/impl/RecBillServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/recbill/service/impl/RecBillServiceImpl.java
index f6f536e2..8778998e 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/recbill/service/impl/RecBillServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/seeyon/recbill/service/impl/RecBillServiceImpl.java
@@ -123,13 +123,15 @@ public class RecBillServiceImpl extends BaseService<PaymentEntity,String> implem
@NotNull
private JSONObject bindingAdd(RecBillEntity pay) {
+ String dateSte = pay.getBillDate()+" 00:00:00";
+
JSONObject head = new JSONObject();
head.put("pk_org",pay.getPkOrg());//所属组织
head.put("pk_group","ycjf");//集团
head.put("bill_type","F4");//单据类型 默认F5
head.put("trade_type","D4");//付款结算类型 默认D5
head.put("source_flag","2");//付款结算类型 默认2
- head.put("bill_date",pay.getBillDate());//单据日期
+ head.put("bill_date",dateSte);//单据日期
head.put("primal_money",pay.getPrimalMoney());//付款原币金额
head.put("pk_currtype","CNY");//币种
head.put("billmaker","yonyou");//制单人 //先临时使用管理员账户，后续在确认
@@ -137,17 +139,20 @@ public class RecBillServiceImpl extends BaseService<PaymentEntity,String> implem
JSONArray detailsArr = new JSONArray();
JSONObject body = new JSONObject();
body.put("pk_org",pay.getPkOrg());//所属组织
+ body.put("pk_balatype",pay.getPkBalatype());//结算方式
body.put("pk_group","ycjf");//集团
body.put("bill_type","F4");//单据类型 默认F5
body.put("trade_type","D4");//付款结算类型 默认D5
body.put("pk_currtype","CNY");//币种
- body.put("bill_date",pay.getBillDate());//单据日期
- body.put("pay_primal",pay.getPrimalMoney());//付款原币金额
- body.put("creationtime",pay.getBillDate());//创建时间
+ body.put("bill_date",dateSte);//单据日期
+ body.put("rec_primal",pay.getPrimalMoney());//付款原币金额
+ body.put("creationtime",dateSte);//创建时间
body.put("direction","-1");//方向 :1=收;-1=付;
body.put("objecttype","0");//交易对象
body.put("pk_customer",pay.getPkCustomer());//客户
body.put("pk_account",pay.getPkAccount());//收款银行账号
+ body.put("pk_recproject",pay.getPkRecproject());//收支项目
+ body.put("memo",pay.getMemo());//摘要
detailsArr.add(body);
JSONObject main = new JSONObject();
main.put("head",head);//表头