From da08d1515149e2ae355fcd636cae61118cfd9afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 12 Mar 2026 17:30:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=9B=B8=E5=85=B3=E6=94=B9?= =?UTF-8?q?=E9=80=A0;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/billManage/entity/BillDetail.java | 11 +++- .../domain/billManage/entity/BillManage.java | 9 +++ .../repository/po/BillDetailPO.java | 11 +++- .../repository/po/BillManagePO.java | 9 +++ .../repository/todo/BillDetailDO.java | 11 +++- .../repository/todo/BillManageDO.java | 9 +++ .../BmsInvoiceListServiceImpl.java | 39 ++++++++++- .../repository/todo/BmsInvoiceListAddDTO.java | 4 ++ .../entity/BmsMakeOutInvoice.java | 6 ++ .../entity/BmsMakeOutInvoiceItem.java | 64 +++++++++++++++++++ .../mapper/BmsMakeOutInvoiceItemMapper.java | 16 +++++ .../dto/billManage/BillDetailDTO.java | 11 +++- .../dto/billManage/BillManageDTO.java | 9 +++ 13 files changed, 201 insertions(+), 8 deletions(-) create mode 100644 mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoiceItem/entity/BmsMakeOutInvoiceItem.java create mode 100644 mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoiceItem/repository/mapper/BmsMakeOutInvoiceItemMapper.java diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java index f26c5fb13..32eb7303b 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java @@ -74,5 +74,12 @@ public class BillDetail extends BaseVOEntity{ @Excel(name = "期望金额") private BigDecimal billingExpectedAmount; - -} + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty("结算币种") + private String settlementCurrency; +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java index 456267ccd..7b5ba8e36 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillManage.java @@ -225,4 +225,13 @@ public class BillManage extends BaseVOEntity{ @ApiModelProperty(value = "nc唯一标识") private String skNcId; + + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty("结算币种") + private String settlementCurrency; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java index d66f4b579..dfb1a2b8d 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java @@ -120,5 +120,14 @@ public class BillDetailPO extends BaseVOEntity{ @Excel(name = "二级费用科目", readConverterExp = "结=算项") private String secondSubjectName; + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty("结算币种") + private String settlementCurrency; -} + +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java index aedc20879..69c40f11c 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java @@ -236,4 +236,13 @@ public class BillManagePO extends BaseVOEntity{ @ApiModelProperty(value = "nc唯一标识") private String skNcId; + + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty("结算币种") + private String settlementCurrency; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java index b09beda98..4349cfaa7 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java @@ -78,4 +78,13 @@ public class BillDetailDO extends BaseVOEntity{ @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} + + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty("结算币种") + private String settlementCurrency; +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java index 89d749056..2edb48101 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillManageDO.java @@ -247,4 +247,13 @@ public class BillManageDO extends BaseVOEntity{ @ApiModelProperty(value = "nc唯一标识") private String skNcId; + + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty("结算币种") + private String settlementCurrency; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java index f3a56498e..5d81325a1 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java @@ -16,10 +16,14 @@ import com.mhd.bms.domain.bmsInvoiceList.repository.vo.BmsInvoiceListDetailsVO; import com.mhd.bms.domain.bmsInvoiceList.repository.vo.BmsInvoiceListVO; import com.mhd.bms.domain.bmsMakeOutInvoice.entity.BmsMakeOutInvoice; import com.mhd.bms.domain.bmsMakeOutInvoice.repository.mapper.BmsMakeOutInvoiceMapper; +import com.mhd.bms.domain.bmsMakeOutInvoiceItem.entity.BmsMakeOutInvoiceItem; +import com.mhd.bms.domain.bmsMakeOutInvoiceItem.repository.mapper.BmsMakeOutInvoiceItemMapper; import com.mhd.common.core.utils.OrderSequence; import com.mhd.common.core.utils.StringUtils; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.domain.SysDictData; +import com.mhd.system.api.domain.TmsMakeOutInvoice; +import com.mhd.system.api.domain.TmsMakeOutInvoiceItem; import com.mhd.system.api.domain.WlhyLoginUser; import com.mhd.system.api.model.LoginUser; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -48,6 +52,8 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl bmsMakeOutInvoices = bmsInvoiceListAddDTO.getBmsMakeOutInvoices(); + if (ObjectUtil.isNotNull(bmsMakeOutInvoices) && bmsMakeOutInvoices.size() > 0) { + for (BmsMakeOutInvoice bmsMakeOutInvoice : bmsMakeOutInvoices) { + bmsMakeOutInvoice.setInvoiceId(listId); + //bmsMakeOutInvoice.setCreateBy(sysUser.getId()); + bmsMakeOutInvoice.setCreateTime(new Date()); + bmsMakeOutInvoiceMapper.insert(bmsMakeOutInvoice); + for (BmsMakeOutInvoiceItem bmsMakeOutInvoiceItem : bmsMakeOutInvoice.getBmsMakeOutInvoiceItems()) { + bmsMakeOutInvoiceItem.setMakeId(bmsMakeOutInvoice.getId()); + //bmsMakeOutInvoiceItem.setCreateBy(sysUser.getId()); + bmsMakeOutInvoiceItem.setCreateTime(new Date()); + bmsMakeOutInvoiceItemMapper.insert(bmsMakeOutInvoiceItem); + } + } + } + } + BillManage billManage = billManageMapper.selectById(bmsInvoiceListAddDTO.getBillManageId()); if (billManage != null) { billManage.setIsInvoice(1); @@ -781,7 +807,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl bmsMakeOutInvoices; + } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java index 6d34522c5..8cbd155ca 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoice/entity/BmsMakeOutInvoice.java @@ -1,8 +1,10 @@ package com.mhd.bms.domain.bmsMakeOutInvoice.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.mhd.bms.domain.bmsMakeOutInvoiceItem.entity.BmsMakeOutInvoiceItem; import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModelProperty; @@ -11,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * @Description: 销项发票表 @@ -105,4 +108,7 @@ public class BmsMakeOutInvoice extends BaseVOEntity { private String actualInvoiceCustomerId; @ApiModelProperty(value = "实际开票客户名称") private String actualInvoiceCustomerName; + + @TableField(exist = false) + private List bmsMakeOutInvoiceItems; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoiceItem/entity/BmsMakeOutInvoiceItem.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoiceItem/entity/BmsMakeOutInvoiceItem.java new file mode 100644 index 000000000..53d8fb3ef --- /dev/null +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoiceItem/entity/BmsMakeOutInvoiceItem.java @@ -0,0 +1,64 @@ +package com.mhd.bms.domain.bmsMakeOutInvoiceItem.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.mhd.common.core.annotation.Excel; +import com.mhd.common.core.web.domain.BaseVOEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 销项发票表-费用明细 + * @Author: lfs + * @Date: 2020-02-19 08:50:47 + * @Version: V1.0 + */ +@Data +public class BmsMakeOutInvoiceItem extends BaseVOEntity { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ID_WORKER_STR) + private String id; + /**makeId*/ + @ApiModelProperty(value = "makeId") + @Excel(name = "makeId", width = 15) + private Long makeId; + /**发票金额*/ + @ApiModelProperty(value = "发票金额") + @Excel(name = "发票金额", width = 15) + private BigDecimal invoiceValue; + /**发票备注*/ + @ApiModelProperty(value = "发票备注") + @Excel(name = "发票备注", width = 15) + private String remark; + + /**是否删除（0-否，1-是）*/ + @ApiModelProperty(value = "是否删除（0-否，1-是）") + @Excel(name = "是否删除（0-否，1-是）", width = 15) + private Integer isDelete; + + @ApiModelProperty(value = "开票项目") + private String invoiceItem; + @ApiModelProperty(value = "开票项目名称") + private String invoiceItemName; + @ApiModelProperty(value = "实际开票客户id") + private String actualInvoiceCustomerId; + @ApiModelProperty(value = "实际开票客户名称") + private String actualInvoiceCustomerName; + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty(value = "费用类别") + private String feeType; +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoiceItem/repository/mapper/BmsMakeOutInvoiceItemMapper.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoiceItem/repository/mapper/BmsMakeOutInvoiceItemMapper.java new file mode 100644 index 000000000..2694b0622 --- /dev/null +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsMakeOutInvoiceItem/repository/mapper/BmsMakeOutInvoiceItemMapper.java @@ -0,0 +1,16 @@ +package com.mhd.bms.domain.bmsMakeOutInvoiceItem.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.bms.domain.bmsMakeOutInvoiceItem.entity.BmsMakeOutInvoiceItem; +import org.apache.ibatis.annotations.Select; + +/** + * @Description: 开票表 + * @Author: lfs + * @Date: 2020-03-30 + * @Version: V1.0 + */ +public interface BmsMakeOutInvoiceItemMapper extends BaseMapper { + @Select("SELECT * FROM tms_make_out_invoice_item WHERE invoice_id=#{invoiceId} and is_delete = 0") + BmsMakeOutInvoiceItem queryByInvoiceId(String invoiceId); +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java index dacf3210c..97e4b3a9a 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java @@ -124,4 +124,13 @@ public class BillDetailDTO extends BaseVOEntity{ @ApiModelProperty("二级费用科目（结算项）") @Excel(name = "二级费用科目", readConverterExp = "结=算项") private String secondSubjectName; -} + + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty("结算币种") + private String settlementCurrency; +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java index ac4b7be25..25261eb0f 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillManageDTO.java @@ -253,4 +253,13 @@ public class BillManageDTO extends BaseVOEntity{ @ApiModelProperty(value = "nc唯一标识") private String skNcId; + + @ApiModelProperty(value = "无税费用") + private BigDecimal taxFreeFee; + @ApiModelProperty(value = "税额") + private BigDecimal taxAmount; + @ApiModelProperty(value = "税率") + private Double taxRate; + @ApiModelProperty("结算币种") + private String settlementCurrency; } \ No newline at end of file