diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java index 3ceb6f2..f24245f 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java @@ -1,8 +1,66 @@ 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.PurchaseDto; +import com.bonus.purchase.service.PurchaseAcceptService; +import com.bonus.purchase.vo.PurchaseVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** + * 新购到货验收控制层 * @Author ma_sh * @create 2024/8/19 16:13 */ -public class PurchaseAcceptController { +@RestController +@RequestMapping("/purchase/arrival") +public class PurchaseAcceptController extends BaseController { + + @Resource + private PurchaseAcceptService purchaseAcceptService; + + /** + * 分页查询数据 + */ + @GetMapping(value = "/list") + @RequiresPermissions("purchase:purchaseDto:query") + public TableDataInfo getList(PurchaseDto purchaseDto) { + startPage(); + List list = purchaseAcceptService.selectAll(purchaseDto); + return getDataTable(list); + } + + /** + * 查看验收单详情 + * + * @param purchaseDto + * @return + */ + @GetMapping("/details") + @RequiresPermissions("purchase:purchaseDto:query") + public TableDataInfo getDetails(PurchaseDto purchaseDto) { + startPage(); + List list = purchaseAcceptService.getDetails(purchaseDto); + return getDataTable(list); + } + + /** + * 导出新购验证列表 + */ + @ApiOperation(value = "导出新购验证列表") + @RequiresPermissions("purchase:purchaseDto:export") + @PostMapping("/export") + public void export(HttpServletResponse response, PurchaseDto purchaseDto) + { + List list = purchaseAcceptService.selectAll(purchaseDto); + ExcelUtil util = new ExcelUtil<>(PurchaseVo.class); + util.exportExcel(response, list, "新购验证列表"); + } } diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/PurchaseDto.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/PurchaseDto.java new file mode 100644 index 0000000..a915cc7 --- /dev/null +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/PurchaseDto.java @@ -0,0 +1,36 @@ +package com.bonus.purchase.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author ma_sh + * @create 2024/8/19 17:50 + */ +@Data +public class PurchaseDto { + + @ApiModelProperty(value = "id") + private Integer id; + + @ApiModelProperty(value = "类型id") + private Integer typeId; + + @ApiModelProperty(value="供应商id") + private Integer supplierId; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + + @ApiModelProperty(value = "关键字") + private String keyWord; + + @ApiModelProperty(value = "状态") + private String status; + + @ApiModelProperty(value = "出厂日期") + private String productDate; +} diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java index 357045e..0a1b713 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java @@ -1,8 +1,27 @@ package com.bonus.purchase.mapper; +import com.bonus.purchase.domain.PurchaseDto; +import com.bonus.purchase.vo.PurchaseVo; + +import java.util.List; + /** * @Author ma_sh * @create 2024/8/19 16:13 */ public interface PurchaseAcceptMapper { + + /** + * 查询 + * @param purchaseDto + * @return + */ + List selectAll(PurchaseDto purchaseDto); + + /** + * 查询详情 + * @param purchaseDto + * @return + */ + List getDetails(PurchaseDto purchaseDto); } diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java index b5d5545..e1f3eeb 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java @@ -1,8 +1,27 @@ package com.bonus.purchase.service; +import com.bonus.purchase.domain.PurchaseDto; +import com.bonus.purchase.vo.PurchaseVo; + +import java.util.List; + /** * @Author ma_sh * @create 2024/8/19 16:13 */ public interface PurchaseAcceptService { + + /** + * 查询所有 + * @param purchaseDto + * @return + */ + List selectAll(PurchaseDto purchaseDto); + + /** + * 查询详情 + * @param purchaseDto + * @return + */ + List getDetails(PurchaseDto purchaseDto); } diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java index 65bd4c8..bb4adfe 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java @@ -1,12 +1,41 @@ package com.bonus.purchase.service.impl; +import com.bonus.purchase.domain.PurchaseDto; +import com.bonus.purchase.mapper.PurchaseAcceptMapper; import com.bonus.purchase.service.PurchaseAcceptService; +import com.bonus.purchase.vo.PurchaseVo; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** * @Author ma_sh * @create 2024/8/19 16:48 */ @Service public class PurchaseAcceptServiceImpl implements PurchaseAcceptService { + + @Resource + private PurchaseAcceptMapper mapper; + + /** + * 查询采购单 + * @param purchaseDto + * @return + */ + @Override + public List selectAll(PurchaseDto purchaseDto) { + return mapper.selectAll(purchaseDto); + } + + /** + * 查询采购单详情 + * @param purchaseDto + * @return + */ + @Override + public List getDetails(PurchaseDto purchaseDto) { + return mapper.getDetails(purchaseDto); + } } diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/vo/PurchaseVo.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/vo/PurchaseVo.java new file mode 100644 index 0000000..d4d0266 --- /dev/null +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/vo/PurchaseVo.java @@ -0,0 +1,79 @@ +package com.bonus.purchase.vo; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 新购验收一级列表返回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="出厂日期") + private String productDate; + + @ApiModelProperty(value="到货时间") + @Excel(name = "到货时间") + private String 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; +} diff --git a/bonus-modules/bonus-purchase/src/main/resources/logback.xml b/bonus-modules/bonus-purchase/src/main/resources/logback.xml index b368f5a..11ea4b3 100644 --- a/bonus-modules/bonus-purchase/src/main/resources/logback.xml +++ b/bonus-modules/bonus-purchase/src/main/resources/logback.xml @@ -1,86 +1,74 @@ - - - - - - + + + + + + - + + - %d [%thread] %-5level %logger{50} -[%file:%line]- %msg%n - - UTF-8 + ${log.pattern} - - ${logFile} - - %d [%thread] %-5level -[%file:%line]- %msg%n - - UTF-8 - - - ${logFile}.%d{yyyy-MM-dd}.%i - 30MB - - 15 + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 - - - - ${logFile}.error - %d [%thread] %-5level %logger{36} -[%file:%line]- %msg%n - - UTF-8 + ${log.pattern} - - ${logFile}.error.%d{yyyy-MM-dd}.%i - 30MB - - 15 - - error + + INFO + ACCEPT + DENY - - ${logFile}.sql - - %d [%thread] %msg%n - - UTF-8 - - - ${logFile}.sql.%d{yyyy-MM-dd}.%i - 30MB - - 15 + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + - - - + + + + - - - - - - - - - - - + + - + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-purchase/src/main/resources/mapper.purchase/PurchaseAcceptMapper.xml b/bonus-modules/bonus-purchase/src/main/resources/mapper.purchase/PurchaseAcceptMapper.xml deleted file mode 100644 index b741ec9..0000000 --- a/bonus-modules/bonus-purchase/src/main/resources/mapper.purchase/PurchaseAcceptMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/bonus-modules/bonus-purchase/src/main/resources/mapper/PurchaseAcceptMapper.xml b/bonus-modules/bonus-purchase/src/main/resources/mapper/PurchaseAcceptMapper.xml new file mode 100644 index 0000000..55c171b --- /dev/null +++ b/bonus-modules/bonus-purchase/src/main/resources/mapper/PurchaseAcceptMapper.xml @@ -0,0 +1,85 @@ + + + + + + + \ No newline at end of file