From 86b2808b9ca8d01ba9bd858f36a3f675359e7eef Mon Sep 17 00:00:00 2001 From: yuqh <123456> Date: Fri, 5 Jul 2024 09:17:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E4=BB=98=E6=AC=BE=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seeyon/paybill/entity/PayBillEntity.xml | 20 ++++++++++ .../seeyon/recbill/entity/RecBillEntity.java | 27 ++++++++++++++ .../seeyon/recbill/entity/RecBillEntity.xml | 37 +++++++++++-------- .../service/impl/RecBillServiceImpl.java | 13 +++++-- 4 files changed, 78 insertions(+), 19 deletions(-) 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 and id = #{id} 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 @@ + + 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 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 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);//表头