root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(local-material): 新增地材除税价字段

Browse Source
This commit is contained in:
han0
2024-01-04 16:09:52 +08:00
parent 7cc692e443
commit 5044c07eb9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/mjkf/xinke/main/controller/LocalMaterialController.java
View File

@@ -20,7 +20,6 @@ import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**

8
src/main/java/mjkf/xinke/main/model/db/LocalMaterial.java
View File

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
@@ -29,6 +31,7 @@ import org.apache.poi.ss.usermodel.Row;
@Setter @Setter
@TableName("LOCAL_MATERIAL") @TableName("LOCAL_MATERIAL")
@ApiModel(value = "LocalMaterial对象", description = "地材") @ApiModel(value = "LocalMaterial对象", description = "地材")
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class LocalMaterial extends Model<LocalMaterial> { public class LocalMaterial extends Model<LocalMaterial> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -65,6 +68,10 @@ public class LocalMaterial extends Model<LocalMaterial> {
@TableField("PRICE") @TableField("PRICE")
private BigDecimal price; private BigDecimal price;
@ApiModelProperty("除税价")
@TableField("PRICE_WITHOUT_TAX")
private BigDecimal priceWithoutTax;
@ApiModelProperty("日期") @ApiModelProperty("日期")
@TableField("`DATE`") @TableField("`DATE`")
private LocalDate date; private LocalDate date;
@@ -93,6 +100,7 @@ public class LocalMaterial extends Model<LocalMaterial> {
this.setSpec(row.getCell(4, policy).getStringCellValue()); this.setSpec(row.getCell(4, policy).getStringCellValue());
this.setUnit(row.getCell(5, policy).getStringCellValue()); this.setUnit(row.getCell(5, policy).getStringCellValue());
this.setPrice(BigDecimal.valueOf(row.getCell(6, policy).getNumericCellValue())); this.setPrice(BigDecimal.valueOf(row.getCell(6, policy).getNumericCellValue()));
this.setPriceWithoutTax(BigDecimal.valueOf(row.getCell(7, policy).getNumericCellValue()));
this.setPosition(row.getCell(8, policy).getStringCellValue()); this.setPosition(row.getCell(8, policy).getStringCellValue());
this.setRemark(row.getCell(9, policy).getStringCellValue()); this.setRemark(row.getCell(9, policy).getStringCellValue());