weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bms2.0出账及发票修改;

Browse Source
This commit is contained in:
王奎兴
2026-03-14 14:29:38 +08:00
parent 23ec38d4a3
commit 2870e6729f
30 changed files with 673 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java
+6
View File
@@ -133,4 +133,10 @@ public class BillDetailDTO extends BaseVOEntity{
private Double taxRate;
@ApiModelProperty("结算币种")
private String settlementCurrency;
@ApiModelProperty(value = "开票项目")
private String invoiceItem;
@ApiModelProperty(value = "开票项目名称")
private String invoiceItemName;
@ApiModelProperty(value = "费用类别")
private String feeType;
}
mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java
+5
View File
@@ -262,4 +262,9 @@ public class BillManageDTO extends BaseVOEntity{
private Double taxRate;
@ApiModelProperty("结算币种")
private String settlementCurrency;
@ApiModelProperty("业务员ID")
private String salesmanId;
@ApiModelProperty("业务员ID")
private String salesmanName;
}
mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingStatement/BillingStatementDTO.java
+18 -1
View File
@@ -1,5 +1,6 @@
package com.mhd.bms.interfaces.dto.billingStatement;
import com.mhd.bms.domain.billingStatement.repository.po.BillingStatementADDVO;
import com.mhd.common.core.annotation.Excel;
import lombok.Data;
import java.util.Date;
@@ -227,4 +228,20 @@ public class BillingStatementDTO extends BaseVOEntity{
@ApiModelProperty("业务单据记录id")
private Long businessDocumentId;
}
@ApiModelProperty(value = "无税费用")
private BigDecimal taxFreeFee;
@ApiModelProperty(value = "税额")
private BigDecimal taxAmount;
@ApiModelProperty(value = "税率")
private Double taxRate;
@ApiModelProperty("结算币种")
private String settlementCurrency;
@ApiModelProperty("业务员ID")
private String salesmanId;
@ApiModelProperty("业务员ID")
private String salesmanName;
private List<BillingStatementADDVO> billingStatementList;
}
mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BillManageApi.java
+4 -4
View File
@@ -298,10 +298,10 @@ public class BillManageApi extends BaseController{
@Log(title = "应收账单应收单同步用户nc65", description = "应收账单应收单同步用户nc65", businessType = BusinessType.OTHER)
@ApiOperation("应收账单应收单同步用户nc65")
@GetMapping(value = "/synchronousNc")
public AjaxResult synchronousNc(@RequestParam(name="reconciliationId") String reconciliationId)
public AjaxResult synchronousNc(@RequestParam(name="billManageId") String billManageId)
{
try{
return AjaxResult.success(billManageApplicationService.synchronousNc(reconciliationId));}
return AjaxResult.success(billManageApplicationService.synchronousNc(billManageId));}
catch (Exception e){
e.printStackTrace();
return AjaxResult.error(e.getMessage());
@@ -314,10 +314,10 @@ public class BillManageApi extends BaseController{
@Log(title = "应收账单收款单同步用户nc65", description = "应收账单收款单同步用户nc65", businessType = BusinessType.OTHER)
@ApiOperation("应收账单收款单同步用户nc65")
@GetMapping(value = "/synchronousNcSK")
public AjaxResult synchronousNcSK(@RequestParam(name="reconciliationId") String reconciliationId)
public AjaxResult synchronousNcSK(@RequestParam(name="billManageId") String billManageId)
{
try{
return AjaxResult.success(billManageApplicationService.synchronousNcSK(reconciliationId));
return AjaxResult.success(billManageApplicationService.synchronousNcSK(billManageId));
} catch (Exception e){
e.printStackTrace();
return AjaxResult.error(e.getMessage());