diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IPrepaymentSuppDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IPrepaymentSuppDao.java new file mode 100644 index 00000000..bfcd294a --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IPrepaymentSuppDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.plugin.dgx.u9c.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentSuppEntity; + +/** + * @Description 德广信U9C预付单明细表 第一个页签 供应商明细 + * @Author xiangerlin + * @Date 2024/10/14 13:41 + **/ +public interface IPrepaymentSuppDao extends IBaseDao { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/PrepaymentSuppDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/PrepaymentSuppDaoImpl.java new file mode 100644 index 00000000..05a2a710 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/PrepaymentSuppDaoImpl.java @@ -0,0 +1,13 @@ +package com.hzya.frame.plugin.dgx.u9c.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.plugin.dgx.u9c.dao.IPrepaymentSuppDao; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentSuppEntity; + +/** + * @Description 德广信U9C预付单明细表 第一个页签 供应商明细 + * @Author xiangerlin + * @Date 2024/10/14 13:42 + **/ +public class PrepaymentSuppDaoImpl extends MybatisGenericDao implements IPrepaymentSuppDao { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.java index 35565ce0..0c387be2 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.java @@ -3,9 +3,319 @@ package com.hzya.frame.plugin.dgx.u9c.entity; import com.hzya.frame.web.entity.BaseEntity; /** - * @Description 德广信U9C预付单明细 + * @Description 德广信U9C预付单明细（请款单） 请款明细 第2个页签 * @Author xiangerlin * @Date 2024/9/18 17:11 **/ public class PrepaymentDetailEntity extends BaseEntity { + // 主表id + private String mainId; + // 单据类型明细 + private String docType; + // 应付单 + private String docCode; + // 折扣前可请款金额 + private String canDisposeMoney; + // 请款对应折扣 + private String rfDisCount; + // 折扣前请款金额明细 + private String rfTotalMoney; + // 折扣后请款金额明细 + private String raTotalMoney; + // 累计确认对应金额 + private String cfmMoney; + // 发票号 + private String invoiceNum; + // 发票日期 + private String invoiceDate; + // 立账日期 + private String accrueDate; + // 记账期间 + private String postPeriod; + // 到期日 + private String maturity; + // 付款条件 ID + private String payTermId; + // 付款条件 code + private String payTermCode; + // 付款条件 name + private String payTermName; + // 部门明细 code + private String detpCode; + // 部门明细 + private String detpName; + // 业务员明细 code + private String transactorCode; + // 业务员明细 + private String transactorName; + // 料号 ID + private String itemId; + // 料号 code + private String itemCode; + // 料号 + private String itemName; + // 项目 ID + private String projectId; + // 项目 code + private String projectCode; + // 项目 + private String projectName; + // 立账供应商 id + private String suppId; + // 立账供应商 code + private String suppCode; + // 立账供应商 + private String suppName; + + //用途code + private String reqFundUseCode; + //用途name + private String reqFundUseName; + public String getMainId() { + return mainId; + } + + public void setMainId(String mainId) { + this.mainId = mainId; + } + + public String getDocType() { + return docType; + } + + public void setDocType(String docType) { + this.docType = docType; + } + + public String getDocCode() { + return docCode; + } + + public void setDocCode(String docCode) { + this.docCode = docCode; + } + + public String getCanDisposeMoney() { + return canDisposeMoney; + } + + public void setCanDisposeMoney(String canDisposeMoney) { + this.canDisposeMoney = canDisposeMoney; + } + + public String getRfDisCount() { + return rfDisCount; + } + + public void setRfDisCount(String rfDisCount) { + this.rfDisCount = rfDisCount; + } + + public String getRfTotalMoney() { + return rfTotalMoney; + } + + public void setRfTotalMoney(String rfTotalMoney) { + this.rfTotalMoney = rfTotalMoney; + } + + public String getRaTotalMoney() { + return raTotalMoney; + } + + public void setRaTotalMoney(String raTotalMoney) { + this.raTotalMoney = raTotalMoney; + } + + public String getCfmMoney() { + return cfmMoney; + } + + public void setCfmMoney(String cfmMoney) { + this.cfmMoney = cfmMoney; + } + + public String getInvoiceNum() { + return invoiceNum; + } + + public void setInvoiceNum(String invoiceNum) { + this.invoiceNum = invoiceNum; + } + + public String getInvoiceDate() { + return invoiceDate; + } + + public void setInvoiceDate(String invoiceDate) { + this.invoiceDate = invoiceDate; + } + + public String getAccrueDate() { + return accrueDate; + } + + public void setAccrueDate(String accrueDate) { + this.accrueDate = accrueDate; + } + + public String getPostPeriod() { + return postPeriod; + } + + public void setPostPeriod(String postPeriod) { + this.postPeriod = postPeriod; + } + + public String getMaturity() { + return maturity; + } + + public void setMaturity(String maturity) { + this.maturity = maturity; + } + + public String getPayTermId() { + return payTermId; + } + + public void setPayTermId(String payTermId) { + this.payTermId = payTermId; + } + + public String getPayTermCode() { + return payTermCode; + } + + public void setPayTermCode(String payTermCode) { + this.payTermCode = payTermCode; + } + + public String getPayTermName() { + return payTermName; + } + + public void setPayTermName(String payTermName) { + this.payTermName = payTermName; + } + + public String getDetpCode() { + return detpCode; + } + + public void setDetpCode(String detpCode) { + this.detpCode = detpCode; + } + + public String getDetpName() { + return detpName; + } + + public void setDetpName(String detpName) { + this.detpName = detpName; + } + + public String getTransactorCode() { + return transactorCode; + } + + public void setTransactorCode(String transactorCode) { + this.transactorCode = transactorCode; + } + + public String getTransactorName() { + return transactorName; + } + + public void setTransactorName(String transactorName) { + this.transactorName = transactorName; + } + + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getProjectCode() { + return projectCode; + } + + public void setProjectCode(String projectCode) { + this.projectCode = projectCode; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getSuppId() { + return suppId; + } + + public void setSuppId(String suppId) { + this.suppId = suppId; + } + + public String getSuppCode() { + return suppCode; + } + + public void setSuppCode(String suppCode) { + this.suppCode = suppCode; + } + + public String getSuppName() { + return suppName; + } + + public void setSuppName(String suppName) { + this.suppName = suppName; + } + + public String getReqFundUseCode() { + return reqFundUseCode; + } + + public void setReqFundUseCode(String reqFundUseCode) { + this.reqFundUseCode = reqFundUseCode; + } + + public String getReqFundUseName() { + return reqFundUseName; + } + + public void setReqFundUseName(String reqFundUseName) { + this.reqFundUseName = reqFundUseName; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.xml new file mode 100644 index 00000000..e2e44c24 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentDetailEntity.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mainId, + docType, + docCode, + canDisposeMoney, + rfDisCount, + rfTotalMoney, + raTotalMoney, + cfmMoney, + invoiceNum, + invoiceDate, + accrueDate, + postPeriod, + maturity, + payTermId, + payTermCode, + payTermName, + detpCode, + detpName, + transactorCode, + transactorName, + itemId, + itemCode, + itemName, + projectId, + projectCode, + projectName, + reqFundUseCode, + reqFundUseName, + suppId, + suppCode, + suppName + + + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.java index 20353b48..f66602fc 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.java @@ -5,7 +5,7 @@ import com.hzya.frame.web.entity.BaseEntity; import org.springframework.format.annotation.DateTimeFormat; /** - * @Description 德广信U9C预付单 + * @Description 德广信U9C预付单(请款单) * @Author xiangerlin * @Date 2024/9/18 14:36 **/ @@ -20,6 +20,52 @@ public class PrepaymentEntity extends BaseEntity { //结束时间 查询用 private String endTime; + + // 单据号 + private String docNo; + //单据类型id + private String documentTypeId; + //单据类型code + private String documentTypeCode; + //单据类型name + private String documentTypeName; + // 业务员 id + private String transactorId; + // 业务员 code + private String transactorCode; + // 业务员 name + private String transactorName; + // 申请日期 + private String payRFDate; + // 部门 id + private String deptId; + // 部门 code + private String deptCode; + // 部门 name + private String deptName; + // 预计付款日 _表头 + private String expectPayDate; + // 付款方式 code + private String payModeCode; + // 付款对象 code + private String requestObjTypeCode; + // 状态 code + private String docStatusCode; + //状态name + private String docStatusName; + //出纳确认 + private String cashierConfirmed; + //币种id + private String currencyId; + //币种code + private String currencyCode; + //币种name + private String currencyName; + //创建时间 + private String createdOn; + //修改时间 + private String modifiedOn; + public String getStartTime() { return startTime; } @@ -35,4 +81,179 @@ public class PrepaymentEntity extends BaseEntity { public void setEndTime(String endTime) { this.endTime = endTime; } + public String getDocNo() { + return docNo; + } + + public void setDocNo(String docNo) { + this.docNo = docNo; + } + + public String getTransactorId() { + return transactorId; + } + + public void setTransactorId(String transactorId) { + this.transactorId = transactorId; + } + + public String getTransactorCode() { + return transactorCode; + } + + public void setTransactorCode(String transactorCode) { + this.transactorCode = transactorCode; + } + + public String getTransactorName() { + return transactorName; + } + + public void setTransactorName(String transactorName) { + this.transactorName = transactorName; + } + + public String getPayRFDate() { + return payRFDate; + } + + public void setPayRFDate(String payRFDate) { + this.payRFDate = payRFDate; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptCode() { + return deptCode; + } + + public void setDeptCode(String deptCode) { + this.deptCode = deptCode; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getExpectPayDate() { + return expectPayDate; + } + + public void setExpectPayDate(String expectPayDate) { + this.expectPayDate = expectPayDate; + } + + public String getPayModeCode() { + return payModeCode; + } + + public void setPayModeCode(String payModeCode) { + this.payModeCode = payModeCode; + } + + public String getRequestObjTypeCode() { + return requestObjTypeCode; + } + + public void setRequestObjTypeCode(String requestObjTypeCode) { + this.requestObjTypeCode = requestObjTypeCode; + } + + public String getDocStatusCode() { + return docStatusCode; + } + + public void setDocStatusCode(String docStatusCode) { + this.docStatusCode = docStatusCode; + } + + public String getDocStatusName() { + return docStatusName; + } + + public void setDocStatusName(String docStatusName) { + this.docStatusName = docStatusName; + } + + public String getCashierConfirmed() { + return cashierConfirmed; + } + + public void setCashierConfirmed(String cashierConfirmed) { + this.cashierConfirmed = cashierConfirmed; + } + + public String getCreatedOn() { + return createdOn; + } + + public void setCreatedOn(String createdOn) { + this.createdOn = createdOn; + } + + public String getModifiedOn() { + return modifiedOn; + } + + public void setModifiedOn(String modifiedOn) { + this.modifiedOn = modifiedOn; + } + + public String getDocumentTypeId() { + return documentTypeId; + } + + public void setDocumentTypeId(String documentTypeId) { + this.documentTypeId = documentTypeId; + } + + public String getDocumentTypeCode() { + return documentTypeCode; + } + + public void setDocumentTypeCode(String documentTypeCode) { + this.documentTypeCode = documentTypeCode; + } + + public String getDocumentTypeName() { + return documentTypeName; + } + + public void setDocumentTypeName(String documentTypeName) { + this.documentTypeName = documentTypeName; + } + + public String getCurrencyId() { + return currencyId; + } + + public void setCurrencyId(String currencyId) { + this.currencyId = currencyId; + } + + public String getCurrencyCode() { + return currencyCode; + } + + public void setCurrencyCode(String currencyCode) { + this.currencyCode = currencyCode; + } + + public String getCurrencyName() { + return currencyName; + } + + public void setCurrencyName(String currencyName) { + this.currencyName = currencyName; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.xml new file mode 100644 index 00000000..9ff70061 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, + docNo, + documentTypeId, + documentTypeCode, + documentTypeName, + transactorId, + transactorCode, + transactorName, + payRFDate, + deptId, + deptCode, + deptName, + expectPayDate, + payModeCode, + requestObjTypeCode, + docStatusCode, + docStatusName, + cashierConfirmed, + currencyId, + currencyCode, + currencyName, + createdOn, + modifiedOn + + + + + + + + + update AP_PayReqBillHead set + + businessDate = #{businessDate}, + status = #{status}, + + where id = #{id} + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentSuppEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentSuppEntity.java new file mode 100644 index 00000000..6054b12e --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentSuppEntity.java @@ -0,0 +1,251 @@ +package com.hzya.frame.plugin.dgx.u9c.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Description 德广信U9C预付单明细（请款单） 明细，供应商页签 + * @Author xiangerlin + * @Date 2024/10/14 11:29 + **/ +public class PrepaymentSuppEntity extends BaseEntity { + // 付款申请资金表头作为主 ID + private String mainId; + // 行号 + private String lineNum; + // 供应商名字 + private String suppName; + // 折扣前请款金额 + private String rfTotalMoney; + // 请款对应折扣 + private String rfDisCount; + // 折扣后请款金额 + private String rfaMoney; + // 付款本币金额 + private String acmPayFCMoney; + // 结算方式 + private String payType; + // 收款银行账号 + private String oppAccBkAccount; + // 收款账号名称 + private String recBkAccName; + // 开户行 + private String oppAccBk; + // 收支项目 id + private String incomeExpendItem; + // 收支项目名字 + private String incomeExpendItemName; + // 部门 - 供应商 id + private String deptId; + // 部门 - 供应商 code + private String deptCode; + // 部门 - 供应商 name + private String deptName; + // 业务员 - 供应商 id + private String transactorId; + // 业务员 - 供应商 code + private String transactorCode; + // 业务员 - 供应商 + private String transactorName; + // 立账供应商 id + private String accrueSuppId; + // 立账供应商 code + private String accrueSuppCode; + // 立账供应商 + private String accrueSuppName; + // 料品 code + private String itemCode; + // 料品 + private String itemName; + + public String getMainId() { + return mainId; + } + + public void setMainId(String mainId) { + this.mainId = mainId; + } + + public String getLineNum() { + return lineNum; + } + + public void setLineNum(String lineNum) { + this.lineNum = lineNum; + } + + public String getSuppName() { + return suppName; + } + + public void setSuppName(String suppName) { + this.suppName = suppName; + } + + public String getRfTotalMoney() { + return rfTotalMoney; + } + + public void setRfTotalMoney(String rfTotalMoney) { + this.rfTotalMoney = rfTotalMoney; + } + + public String getRfDisCount() { + return rfDisCount; + } + + public void setRfDisCount(String rfDisCount) { + this.rfDisCount = rfDisCount; + } + + public String getRfaMoney() { + return rfaMoney; + } + + public void setRfaMoney(String rfaMoney) { + this.rfaMoney = rfaMoney; + } + + public String getAcmPayFCMoney() { + return acmPayFCMoney; + } + + public void setAcmPayFCMoney(String acmPayFCMoney) { + this.acmPayFCMoney = acmPayFCMoney; + } + + public String getPayType() { + return payType; + } + + public void setPayType(String payType) { + this.payType = payType; + } + + public String getOppAccBkAccount() { + return oppAccBkAccount; + } + + public void setOppAccBkAccount(String oppAccBkAccount) { + this.oppAccBkAccount = oppAccBkAccount; + } + + public String getRecBkAccName() { + return recBkAccName; + } + + public void setRecBkAccName(String recBkAccName) { + this.recBkAccName = recBkAccName; + } + + public String getOppAccBk() { + return oppAccBk; + } + + public void setOppAccBk(String oppAccBk) { + this.oppAccBk = oppAccBk; + } + + public String getIncomeExpendItem() { + return incomeExpendItem; + } + + public void setIncomeExpendItem(String incomeExpendItem) { + this.incomeExpendItem = incomeExpendItem; + } + + public String getIncomeExpendItemName() { + return incomeExpendItemName; + } + + public void setIncomeExpendItemName(String incomeExpendItemName) { + this.incomeExpendItemName = incomeExpendItemName; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptCode() { + return deptCode; + } + + public void setDeptCode(String deptCode) { + this.deptCode = deptCode; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getTransactorId() { + return transactorId; + } + + public void setTransactorId(String transactorId) { + this.transactorId = transactorId; + } + + public String getTransactorCode() { + return transactorCode; + } + + public void setTransactorCode(String transactorCode) { + this.transactorCode = transactorCode; + } + + public String getTransactorName() { + return transactorName; + } + + public void setTransactorName(String transactorName) { + this.transactorName = transactorName; + } + + public String getAccrueSuppId() { + return accrueSuppId; + } + + public void setAccrueSuppId(String accrueSuppId) { + this.accrueSuppId = accrueSuppId; + } + + public String getAccrueSuppCode() { + return accrueSuppCode; + } + + public void setAccrueSuppCode(String accrueSuppCode) { + this.accrueSuppCode = accrueSuppCode; + } + + public String getAccrueSuppName() { + return accrueSuppName; + } + + public void setAccrueSuppName(String accrueSuppName) { + this.accrueSuppName = accrueSuppName; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentSuppEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentSuppEntity.xml new file mode 100644 index 00000000..0f1dd2fb --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentSuppEntity.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mainId, + lineNum, + suppName, + rfTotalMoney, + rfDisCount, + rfaMoney, + acmPayFCMoney, + payType, + oppAccBkAccount, + recBkAccName, + oppAccBk, + incomeExpendItem, + incomeExpendItemName, + deptId, + deptCode, + deptName, + transactorId, + transactorCode, + transactorName, + accrueSuppId, + accrueSuppCode, + accrueSuppName, + itemCode, + itemName + + + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IPrepaymentSuppService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IPrepaymentSuppService.java new file mode 100644 index 00000000..1e5df694 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/IPrepaymentSuppService.java @@ -0,0 +1,21 @@ +package com.hzya.frame.plugin.dgx.u9c.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentSuppEntity; + +import java.util.List; + +/** + * @Description 德广信U9C预付单明细表 第一个页签 供应商明细 + * @Author xiangerlin + * @Date 2024/10/14 13:43 + **/ +public interface IPrepaymentSuppService extends IBaseService { + + /** + * 查询预付单明细 供应商页签 + * @param entity + * @return + */ + List queryDetails(PrepaymentSuppEntity entity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentDetailServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentDetailServiceImpl.java index 50cb86af..5992e4b8 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentDetailServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentDetailServiceImpl.java @@ -33,6 +33,7 @@ public class PrepaymentDetailServiceImpl extends BaseService queryDetails(PrepaymentDetailEntity entity) { - return null; + List list = prepaymentDetailDao.queryList(entity, "com.hzya.frame.plugin.dgx.u9c.dao.impl.PrepaymentDetailDaoImpl.entity_list_base"); + return list; } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentServiceImpl.java index c7c7c48d..d518236b 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentServiceImpl.java @@ -35,7 +35,8 @@ public class PrepaymentServiceImpl extends BaseService @DS("#entity.dataSourceCode") @Override public List queryList(PrepaymentEntity entity) { - return null; + List list = prepaymentDao.query(entity); + return list; } /** diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentSuppServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentSuppServiceImpl.java new file mode 100644 index 00000000..43c78c04 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/PrepaymentSuppServiceImpl.java @@ -0,0 +1,39 @@ +package com.hzya.frame.plugin.dgx.u9c.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.plugin.dgx.u9c.dao.IPrepaymentSuppDao; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentDetailEntity; +import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentSuppEntity; +import com.hzya.frame.plugin.dgx.u9c.service.IPrepaymentSuppService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** + * @Description 德广信U9C预付单明细表 第一个页签 供应商明细 + * @Author xiangerlin + * @Date 2024/10/14 13:44 + **/ +public class PrepaymentSuppServiceImpl extends BaseService implements IPrepaymentSuppService { + + private IPrepaymentSuppDao prepaymentSuppDao; + @Autowired + public void setPrepaymentSuppDao(IPrepaymentSuppDao dao) { + this.prepaymentSuppDao = dao; + this.dao = dao; + } + + /** + * 查询预付单明细 供应商页签 + * + * @param entity + * @return + */ + @DS("#entity.dataSourceCode") + @Override + public List queryDetails(PrepaymentSuppEntity entity) { + List list = prepaymentSuppDao.queryList(entity, "com.hzya.frame.plugin.dgx.u9c.dao.impl.PrepaymentSuppDaoImpl.entity_list_base"); + return list; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java index 38a191da..48a7ce25 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java @@ -4,10 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentDetailEntity; -import com.hzya.frame.plugin.dgx.u9c.entity.PrepaymentEntity; -import com.hzya.frame.plugin.dgx.u9c.entity.RequisitionDetailEntity; -import com.hzya.frame.plugin.dgx.u9c.entity.RequisitionEntity; +import com.hzya.frame.plugin.dgx.u9c.entity.*; import com.hzya.frame.plugin.dgx.u9c.service.*; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; @@ -20,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.util.Date; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -34,6 +32,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService { private IPrepaymentService prepaymentService; @Resource private IPrepaymentDetailService prepaymentDetailServiceImpl; + @Resource + private IPrepaymentSuppService prepaymentSuppService; @Resource(name = "requisitionServiceImpl") private IRequisitionService requisitionService; @Resource @@ -43,7 +43,7 @@ public class U9CPluginServiceImpl implements IU9CPluginService { @Value("${zt.url}") private String url; /** - * u9c预付单发起OA请款单流程 + * u9c预付单发起OA请款单流程 (预付) * * @param requestJson * @return @@ -60,6 +60,7 @@ public class U9CPluginServiceImpl implements IU9CPluginService { String taskId = requestJson.getString("integration_task_living_details_id"); //查询U9C预付单 PrepaymentEntity prepaymentEntity = new PrepaymentEntity(); + prepaymentEntity.setDocNo("RE-1563"); prepaymentEntity.setDataSourceCode(datasourceCode); if (StrUtil.isEmpty(taskId)){ prepaymentEntity.setStartTime(startTime); @@ -70,36 +71,43 @@ public class U9CPluginServiceImpl implements IU9CPluginService { List prepaymentList = prepaymentService.queryList(prepaymentEntity); if (CollectionUtils.isNotEmpty(prepaymentList)){ for (PrepaymentEntity prepayment : prepaymentList) { - //查询u9c预付单明细 + //查询u9c预付单供应商明细 第一个页签 + PrepaymentSuppEntity prepaymentSuppEntity = new PrepaymentSuppEntity(); + prepaymentSuppEntity.setMainId(prepayment.getId()); + prepaymentSuppEntity.setDataSourceCode(datasourceCode); + List prepaymentSuppList = prepaymentSuppService.queryDetails(prepaymentSuppEntity); + //查询u9c预付单明细 第二个页签 PrepaymentDetailEntity prepaymentDetailEntity = new PrepaymentDetailEntity(); + prepaymentDetailEntity.setMainId(prepayment.getId()); + prepaymentDetailEntity.setDataSourceCode(datasourceCode); List prepaymentDetailList = prepaymentDetailServiceImpl.queryDetails(prepaymentDetailEntity); - if (CollectionUtils.isNotEmpty(prepaymentDetailList)){ + if (CollectionUtils.isNotEmpty(prepaymentDetailList) && CollectionUtils.isNotEmpty(prepaymentSuppList)){ //主表 JSONObject formmain_0668 = new JSONObject(); //单据类型 - formmain_0668.put("field0001",""); + formmain_0668.put("field0001",prepayment.getDocumentTypeName()); //币种 - formmain_0668.put("field0002",""); + formmain_0668.put("field0002",prepayment.getCurrencyName()); //单号 - formmain_0668.put("field0003",""); + formmain_0668.put("field0003",prepayment.getDocNo()); //业务员 - formmain_0668.put("field0004",""); + formmain_0668.put("field0004",prepayment.getTransactorName()); //申请日期 - formmain_0668.put("field0005",""); + formmain_0668.put("field0005",prepayment.getPayRFDate()); //部门 - formmain_0668.put("field0006",""); + formmain_0668.put("field0006",prepayment.getDeptName()); //预计付款日 - formmain_0668.put("field0007",""); + formmain_0668.put("field0007",prepayment.getExpectPayDate()); //付款方式 - formmain_0668.put("field0008",""); + formmain_0668.put("field0008",prepayment.getPayModeCode()); //请款对象 - formmain_0668.put("field0009",""); + formmain_0668.put("field0009",prepayment.getRequestObjTypeCode()); //状态 - formmain_0668.put("field0010",""); + formmain_0668.put("field0010",prepayment.getDocStatusName()); //请款用途 - formmain_0668.put("field0011",""); + formmain_0668.put("field0011",prepaymentDetailList.get(0).getReqFundUseName()); //出纳确认 - formmain_0668.put("field0012",""); + formmain_0668.put("field0012",prepayment.getCashierConfirmed()); //折扣前请款金额合计 formmain_0668.put("field0044",""); //请款对应折扣合计 @@ -125,36 +133,36 @@ public class U9CPluginServiceImpl implements IU9CPluginService { //子表 List formson69List = new LinkedList<>(); List formson70List = new LinkedList<>(); - for (PrepaymentDetailEntity detail : prepaymentDetailList) { + for (PrepaymentSuppEntity detail : prepaymentSuppList){ JSONObject formson_0669 = new JSONObject(); //行号 - formson_0669.put("field0013",""); + formson_0669.put("field0013",detail.getLineNum()); //供应商 - formson_0669.put("field0014",""); + formson_0669.put("field0014",detail.getSuppName()); //选单 - formson_0669.put("field0015",""); + formson_0669.put("field0015","");//有问题，不知道字段 //折扣前请款金额 - formson_0669.put("field0016",""); + formson_0669.put("field0016",detail.getRfTotalMoney()); //请款对应折扣 - formson_0669.put("field0017",""); + formson_0669.put("field0017",detail.getRfDisCount()); //折扣后请款金额 - formson_0669.put("field0018",""); + formson_0669.put("field0018",detail.getRfaMoney()); //付款本币金额 - formson_0669.put("field0019",""); + formson_0669.put("field0019",detail.getAcmPayFCMoney()); //结算方式 - formson_0669.put("field0020",""); + formson_0669.put("field0020",detail.getPayType()); //收款银行帐号 - formson_0669.put("field0021",""); + formson_0669.put("field0021",detail.getOppAccBkAccount()); //收款账号名称 - formson_0669.put("field0022",""); + formson_0669.put("field0022",detail.getRecBkAccName()); //开户银行 - formson_0669.put("field0023",""); + formson_0669.put("field0023",detail.getOppAccBk()); //收支项目 - formson_0669.put("field0024",""); + formson_0669.put("field0024",detail.getIncomeExpendItemName()); //部门-供应商 - formson_0669.put("field0025",""); + formson_0669.put("field0025",detail.getDeptName()); //业务员-供应商 - formson_0669.put("field0026",""); + formson_0669.put("field0026",detail.getTransactorName()); //项目-供应商 formson_0669.put("field0027",""); //预付款类型 @@ -162,71 +170,72 @@ public class U9CPluginServiceImpl implements IU9CPluginService { //请款金额 formson_0669.put("field0052",""); //料品 - formson_0669.put("field0054",""); + formson_0669.put("field0054",detail.getItemName()); formson69List.add(formson_0669); - + } + for (PrepaymentDetailEntity detail : prepaymentDetailList) { JSONObject formson_0070 = new JSONObject(); //单据类型明细 - formson_0070.put("field0028",""); + formson_0070.put("field0028",detail.getDocType()); //应付单 - formson_0070.put("field0029",""); + formson_0070.put("field0029",detail.getDocCode()); //折扣前可请款金额 - formson_0070.put("field0030",""); + formson_0070.put("field0030",detail.getCanDisposeMoney()); //可享受折扣 - formson_0070.put("field0031",""); + formson_0070.put("field0031",detail.getRfDisCount()); //折扣前请款金额明细 - formson_0070.put("field0032",""); + formson_0070.put("field0032",detail.getRfTotalMoney()); //请款享受折扣 - formson_0070.put("field0033",""); + formson_0070.put("field0033",detail.getRfDisCount()); //折扣后请款金额明细 - formson_0070.put("field0034",""); + formson_0070.put("field0034",detail.getRaTotalMoney()); //累计确认对应金额 - formson_0070.put("field0035",""); + formson_0070.put("field0035",detail.getCfmMoney()); //发票号 - formson_0070.put("field0036",""); + formson_0070.put("field0036",detail.getInvoiceNum()); //发票日期 - formson_0070.put("field0037",""); + formson_0070.put("field0037",detail.getInvoiceDate()); //立账日期 - formson_0070.put("field0038",""); + formson_0070.put("field0038",detail.getAccrueDate()); //记账日期 - formson_0070.put("field0039",""); + formson_0070.put("field0039",detail.getPostPeriod()); //到期日 - formson_0070.put("field0040",""); + formson_0070.put("field0040",detail.getMaturity()); //付款条件 - formson_0070.put("field0041",""); + formson_0070.put("field0041",detail.getPayTermName()); //部门明细 - formson_0070.put("field0042",""); + formson_0070.put("field0042",detail.getDetpName()); //业务员明细 - formson_0070.put("field0043",""); + formson_0070.put("field0043",detail.getTransactorName()); //预付款类型明细 - formson_0070.put("field0055",""); + formson_0070.put("field0055","");//有问题，不知道字段 //单号明细 - formson_0070.put("field0056",""); + formson_0070.put("field0056","");//有问题，不知道字段 //单价 - formson_0070.put("field0057",""); + formson_0070.put("field0057","");//有问题，不知道字段 //数量 - formson_0070.put("field0058",""); + formson_0070.put("field0058","");//有问题，不知道字段 //单位 - formson_0070.put("field0059",""); + formson_0070.put("field0059","");//有问题，不知道字段 //请款数量 - formson_0070.put("field0060",""); + formson_0070.put("field0060","");//有问题，不知道字段 //请款金额明细 - formson_0070.put("field0062",""); + formson_0070.put("field0062","");//有问题，不知道字段 //费用 - formson_0070.put("field0064",""); + formson_0070.put("field0064","");//有问题，不知道字段 //料号 - formson_0070.put("field0065",""); + formson_0070.put("field0065","");//有问题，不知道字段 //料品明细 - formson_0070.put("field0066",""); + formson_0070.put("field0066","");//有问题，不知道字段 //项目 - formson_0070.put("field0067",""); + formson_0070.put("field0067",detail.getProjectName()); //立账供应商 - formson_0070.put("field0068",""); + formson_0070.put("field0068",detail.getSuppName()); //单据状态 - formson_0070.put("field0069",""); + formson_0070.put("field0069",prepayment.getDocumentTypeName()); formson70List.add(formson_0070); } - JSONObject formData = new JSONObject(); + JSONObject formData = new JSONObject(new LinkedHashMap<>()); formData.put("formmain_0668",formmain_0668); formData.put("formson_0669",formson69List); formData.put("formson_0670",formson70List); diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml index d909da1e..58a0c89a 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml @@ -5,4 +5,5 @@ + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-service.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-service.xml index caa65e06..ee311679 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-service.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-service.xml @@ -5,5 +5,6 @@ +