diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java index 2a7366a..c9f5cae 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java @@ -3,7 +3,6 @@ package com.bonus.purchase.controller; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; -import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.purchase.domain.PurchaseStorageDto; import com.bonus.purchase.service.BpmPurchaseStorageService; import com.bonus.purchase.vo.PurchaseVo; @@ -47,7 +46,6 @@ public class BpmPurchaseStorageController extends BaseController { * @return */ @GetMapping("/details") - @RequiresPermissions("purchase:purchaseDto:query") public TableDataInfo getDetails(PurchaseStorageDto purchaseStorageDto) { startPage(); List list = purchaseStorageService.getDetails(purchaseStorageDto); diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java new file mode 100644 index 0000000..817b959 --- /dev/null +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java @@ -0,0 +1,84 @@ +package com.bonus.purchase.vo; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 新购验收列表返回vo + * @Author ma_sh + * @create 2024/8/19 17:36 + */ +@Data +public class PurchaseVo { + + @ApiModelProperty(value="任务id") + private Integer id; + + @ApiModelProperty("物资名称") + private String materialName; + + @ApiModelProperty("规格型号") + private String specificationCode; + + @ApiModelProperty(value="单位") + private String unitName; + + @ApiModelProperty(value="供应商名称") + private String supplierName; + + @ApiModelProperty(value="出厂日期") + @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") + private Date productDate; + + @ApiModelProperty(value="到货时间") + @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") + @Excel(name = "到货时间") + private Date arrivalTime; + + @ApiModelProperty(value="采购单号") + @Excel(name = "采购单号") + private String purchaseCode; + + @ApiModelProperty(value="采购物资") + @Excel(name = "采购物资") + private String purchaseMaterial; + + @ApiModelProperty(value="采购数量") + @Excel(name = "采购数量") + private Integer purchaseNum; + + @ApiModelProperty(value="采购价格(元含税)") + @Excel(name = "采购价格(元含税)") + private Integer purchasePrice; + + @ApiModelProperty(value="采购价格(元不含税)") + @Excel(name = "采购价格(元不含税)") + private Integer notaxPrice; + + @ApiModelProperty(value="税率") + @Excel(name = "税率") + private Integer taxRate; + + @ApiModelProperty(value="操作人") + @Excel(name = "操作人") + private String createBy; + + @ApiModelProperty(value="操作时间") + @Excel(name = "操作时间") + private String createTime; + + @ApiModelProperty(value="状态") + private Integer status; + + @ApiModelProperty(value="状态名称") + @Excel(name = "状态") + private String statusName; + + @ApiModelProperty(value="备注") + @Excel(name = "备注") + private String remark; +}