bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购导出

This commit is contained in:
sxu 2024-12-02 13:55:33 +08:00
parent 1fcc1023aa
commit 8008939501
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
View File

@ -29,17 +29,20 @@ public class PurchaseCheckInfo extends BaseEntity {
private Long id; private Long id;
/** 任务ID */ /** 任务ID */
@Excel(name = "任务ID") //@Excel(name = "任务ID")
@ApiModelProperty(value = "任务ID") @ApiModelProperty(value = "任务ID")
private Long taskId; private Long taskId;
@Excel(name = "任务状态", readConverterExp = "21=入库进行中,22=入库已完成", sort = 10)
@ApiModelProperty(value = "任务状态") @ApiModelProperty(value = "任务状态")
private Integer taskStatus; private Integer taskStatus;
@Excel(name = "采购单号", sort = 2)
@ApiModelProperty(value = "采购单号") @ApiModelProperty(value = "采购单号")
private String code; private String code;
/** 采购日期 */ /** 采购日期 */
@Excel(name = "采购日期", sort = 1)
@ApiModelProperty(value = "采购日期") @ApiModelProperty(value = "采购日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date purchaseTime; private Date purchaseTime;
@ -57,50 +60,56 @@ public class PurchaseCheckInfo extends BaseEntity {
private Long purchaser; private Long purchaser;
/** 物资厂家id */ /** 物资厂家id */
@Excel(name = "物资厂家id") //@Excel(name = "物资厂家id")
@ApiModelProperty(value = "物资厂家id") @ApiModelProperty(value = "物资厂家id")
private Long supplierId; private Long supplierId;
/** 物资厂家名称 */ /** 物资厂家名称 */
@Excel(name = "物资厂家名称") @Excel(name = "物资厂家名称", sort = 8)
@ApiModelProperty(value = "物资厂家名称") @ApiModelProperty(value = "物资厂家名称")
private String supplier; private String supplier;
/** 数据所属组织 */ /** 数据所属组织 */
@Excel(name = "数据所属组织") //@Excel(name = "数据所属组织")
private Long companyId; private Long companyId;
/** /**
* 采购物资 * 采购物资
*/ */
@Excel(name = "采购物资", sort = 3)
@ApiModelProperty(value = "采购物资--外层Table字段") @ApiModelProperty(value = "采购物资--外层Table字段")
private String purchaseMaTypeName; private String purchaseMaTypeName;
/** /**
* 采购数量 * 采购数量
*/ */
@Excel(name = "采购数量", sort = 4)
@ApiModelProperty(value = "采购数量--外层Table字段") @ApiModelProperty(value = "采购数量--外层Table字段")
private Long purchaseMaNumber; private Long purchaseMaNumber;
/** /**
* 采购单价(不含税) * 采购单价(不含税)
*/ */
@Excel(name = "采购单价(不含税)", sort = 5)
@ApiModelProperty(value = "采购单价(不含税)--外层Table字段") @ApiModelProperty(value = "采购单价(不含税)--外层Table字段")
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
/** /**
* 采购单价(含税) * 采购单价(含税)
*/ */
@Excel(name = "采购单价(含税)", sort = 6)
@ApiModelProperty(value = "采购单价(含税)--外层Table字段") @ApiModelProperty(value = "采购单价(含税)--外层Table字段")
private BigDecimal purchaseTaxPrice; private BigDecimal purchaseTaxPrice;
/** /**
* 税率 * 税率
*/ */
@Excel(name = "税率", sort = 7)
@ApiModelProperty(value = "税率 0~100") @ApiModelProperty(value = "税率 0~100")
@Size(max = 100, message = "税率长度必须介于 0 和 100 之间") @Size(max = 100, message = "税率长度必须介于 0 和 100 之间")
private BigDecimal taxRate; private BigDecimal taxRate;
@Excel(name = "操作人", sort = 9)
@ApiModelProperty(value = "操作人名称") @ApiModelProperty(value = "操作人名称")
private String createUserName; private String createUserName;

2
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
View File

@ -689,7 +689,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE WHERE
mm.type_id = #{record.typeId} mm.type_id = #{record.typeId}
and mm.ma_code is not null and mm.ma_code is not null
and mm.ma_status in (15) and mm.ma_status in (1)
and mt.`level` = 4 and mt.`level` = 4
and mt.del_flag = '0' and mt.del_flag = '0'
</select> </select>