src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -1,9 +1,11 @@ package com.ruoyi.production.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.web.domain.R; import com.ruoyi.production.dto.ProductProcessRouteItemDto; import com.ruoyi.production.dto.ProductionProductMainDto; import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto; import com.ruoyi.production.service.ProductionProductMainService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -11,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; @@ -49,4 +52,16 @@ public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) { return R.ok(productionProductMainService.removeProductMain(productionProductMainDto)); } /** * 导出 */ @PostMapping("/export") public void export(HttpServletResponse response, ProductionProductMainDto productionProductMainDto) { List<ProductionProductMainDto> list; list = productionProductMainService.listPageProductionProductMainDto(new Page<>(1, -1), productionProductMainDto).getRecords(); ExcelUtil<ProductionProductMainDto> util = new ExcelUtil<ProductionProductMainDto>(ProductionProductMainDto.class); util.exportExcel(response, list, "生产报工数据"); } } src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java
@@ -2,10 +2,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.pojo.AccountExpense; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.production.dto.ProductOrderDto; import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto; import com.ruoyi.production.pojo.SalesLedgerProductionAccounting; import com.ruoyi.production.service.impl.SalesLedgerProductionAccountingServiceImpl; @@ -13,8 +16,12 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.List; /** * @author :yys @@ -36,4 +43,15 @@ return AjaxResult.success(list); } /** * 导出 */ @PostMapping("/export") public void export(HttpServletResponse response, SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto) { List<SalesLedgerProductionAccountingDto> list; list = salesLedgerProductionAccountingService.listPage(new Page<>(1, -1), salesLedgerProductionAccountingDto).getRecords(); ExcelUtil<SalesLedgerProductionAccountingDto> util = new ExcelUtil<SalesLedgerProductionAccountingDto>(SalesLedgerProductionAccountingDto.class); util.exportExcel(response, list, "生产核算数据"); } } src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,5 +1,7 @@ package com.ruoyi.production.dto; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.production.pojo.ProductionProductMain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,28 +10,36 @@ import java.time.LocalDateTime; @Data @ExcelIgnoreUnannotated public class ProductionProductMainDto extends ProductionProductMain { @ApiModelProperty(value = "工单编号") @Excel(name = "工单编号") private String workOrderNo; @ApiModelProperty(value = "工单状态") private String workOrderStatus; @ApiModelProperty(value = "报工人员昵称") @Excel(name = "报工人") private String nickName; @ApiModelProperty(value = "报工数量") @Excel(name = "报工数量") private BigDecimal quantity; //产品名称 @Excel(name = "产品名称") private String productName; //产品规格型号 @Excel(name = "产品规格型号") private String productModelName; //单位 @Excel(name = "单位") private String unit; //销售合同号 @Excel(name = "销售合同号") private String salesContractNo; } src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -1,5 +1,7 @@ package com.ruoyi.production.dto; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +14,7 @@ */ @Data @ApiModel @ExcelIgnoreUnannotated public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto{ /** @@ -24,6 +27,7 @@ * 排产人名称 */ @ApiModelProperty(value = "生产人名称") @Excel(name = "生产人") private String schedulingUserName; @@ -31,29 +35,34 @@ * 工资 */ @ApiModelProperty(value = "工资") @Excel(name = "工资") private BigDecimal wages; /** * 生产数量 */ @ApiModelProperty(value = "生产数量") @Excel(name = "生产数量") private BigDecimal finishedNum; /** * 工时定额 */ @ApiModelProperty(value = "工时定额") @Excel(name = "工时定额") private BigDecimal workHours; /** * 工序 */ @ApiModelProperty(value = "工序") @Excel(name = "工序") private String process; /** * 排产日期 */ @ApiModelProperty(value = "排产日期") @Excel(name = "生产日期") private String schedulingDate; @ApiModelProperty(value = "开始时间") src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -16,6 +17,7 @@ private Long id; @ApiModelProperty(value = "报工单号") @Excel(name = "报工单号") private String productNo; @ApiModelProperty(value = "报工人员id") @@ -37,6 +39,7 @@ @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间") private LocalDateTime createTime; @ApiModelProperty(value = "更新时间")
