From e891eaba26ab32ed942fb4edfddc44a7d2992c51 Mon Sep 17 00:00:00 2001 From: xiangerlin <251481237@qq.com> Date: Fri, 11 Jul 2025 11:57:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/payapply/dao/ICLPayApplyDao.java | 7 +++++ .../payapply/dao/impl/CLPayApplyDaoImpl.java | 19 ++++++++++++ .../oa/payapply/entity/CLPayApplyEntity.java | 29 ++++++++++++++++++- .../oa/payapply/entity/CLPayApplyEntity.xml | 10 ++++++- 4 files changed, 63 insertions(+), 2 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/dao/ICLPayApplyDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/dao/ICLPayApplyDao.java index 7f8903d6..818f6d73 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/dao/ICLPayApplyDao.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/dao/ICLPayApplyDao.java @@ -9,4 +9,11 @@ import com.hzya.frame.plugin.oa.payapply.entity.CLPayApplyEntity; * @Date 2025/6/26 17:24 **/ public interface ICLPayApplyDao extends IBaseDao { + + /** + * 把NCC返回的付款单号更新到OA + * @param entity + * @return + */ + int execUpdateSql(String sql,CLPayApplyEntity entity)throws Exception; } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/dao/impl/CLPayApplyDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/dao/impl/CLPayApplyDaoImpl.java index ef4f3b8c..6addabf8 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/dao/impl/CLPayApplyDaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/dao/impl/CLPayApplyDaoImpl.java @@ -1,10 +1,15 @@ package com.hzya.frame.plugin.oa.payapply.dao.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.execsql.service.IExecSqlService; import com.hzya.frame.plugin.oa.payapply.dao.ICLPayApplyDao; import com.hzya.frame.plugin.oa.payapply.entity.CLPayApplyEntity; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @Description 材料付款申请 * @Author xiangerlin @@ -12,4 +17,18 @@ import org.springframework.stereotype.Repository; **/ @Repository("cLPayApplyDaoImpl") public class CLPayApplyDaoImpl extends MybatisGenericDao implements ICLPayApplyDao { + @Autowired + private IExecSqlService execSqlService; + /** + * 把NCC返回的付款单号更新到OA + * + * @param entity + * @return + */ + @DS("#entity.dataSourceCode") + @Override + public int execUpdateSql(String str, CLPayApplyEntity entity) throws Exception { + return execSqlService.execUpdateSql(str, entity.getDataSourceCode()); + } + } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/entity/CLPayApplyEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/entity/CLPayApplyEntity.java index 0b81d90f..dd144437 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/entity/CLPayApplyEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/entity/CLPayApplyEntity.java @@ -18,9 +18,11 @@ public class CLPayApplyEntity extends BaseEntity { private String field0052;//单据类型编码 private String field0059;//交易类型编码 private String field0046;//单据类型，选的是采购订单还是应付单 + private String source_bill_type;//单据类型名称，选的是采购订单还是应付单 private String field0047;//应付单号 private String field0048;//采购订单号 private String field0063;//采购订单付款计划pk + private String field0071;//本次预付金额， 预付款时用 // 明细表 @@ -52,7 +54,8 @@ public class CLPayApplyEntity extends BaseEntity { private String field0058; //上层单据类型表体PK private String field0061; //NCC采购订单/请购单表头pk private String field0062; //NCC采购订单/请购单表体pk - private String field0064;//应付单组织本币余额。付款的时候传这个值 + private String field0064;//应付单组织本币余额。应付付款的时候传这个值 + private String field0066;//本次应付金额 public String getField0001() { return field0001; } @@ -380,4 +383,28 @@ public class CLPayApplyEntity extends BaseEntity { public void setField0064(String field0064) { this.field0064 = field0064; } + + public String getSource_bill_type() { + return source_bill_type; + } + + public void setSource_bill_type(String source_bill_type) { + this.source_bill_type = source_bill_type; + } + + public String getField0071() { + return field0071; + } + + public void setField0071(String field0071) { + this.field0071 = field0071; + } + + public String getField0066() { + return field0066; + } + + public void setField0066(String field0066) { + this.field0066 = field0066; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/entity/CLPayApplyEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/entity/CLPayApplyEntity.xml index 527ee153..bb812510 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/entity/CLPayApplyEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/payapply/entity/CLPayApplyEntity.xml @@ -14,8 +14,11 @@ + + + @@ -43,6 +46,7 @@ + @@ -55,9 +59,11 @@ formmain_0266.field0052,-- 单据类型编码 formmain_0266.field0059,-- 交易类型编码 formmain_0266.field0046,-- 单据类型 + item1.SHOWVALUE as source_bill_type, -- 单据类型名称 formmain_0266.field0047,-- 应付单号 formmain_0266.field0048,-- 采购订单号 formmain_0266.field0063,-- 采购订单付款计划pk + formmain_0266.field0071,-- 预付金额 formson_0267.id, formson_0267.formmain_id, formson_0267.field0022,-- 序号 @@ -86,7 +92,8 @@ formson_0267.field0058,-- 上层单据类型表体PK formson_0267.field0061,-- NCC采购订单/应付单表头pk formson_0267.field0062,-- NCC采购订单/应付单表体pk - formson_0267.field0064-- NCC应付单单表体组织本币余额 + formson_0267.field0064,-- NCC应付单单表体组织本币余额 + formson_0267.field0066-- 本次应付金额