aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateProcessShopStatController.java
@@ -9,6 +9,8 @@ import com.aps.common.security.annotation.RequiresPermissions; import com.aps.core.domain.ApsPlateProcessShopStat; import com.aps.core.service.IApsPlateProcessShopStatService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +24,9 @@ * @date 2025-04-23 */ @Tag(name = "钣金计划大表", description = "钣金计划大表接口") @RestController @RequestMapping("/ApsPlateProcessShopStat") @RequestMapping("/plateProcessShopStat") public class ApsPlateProcessShopStatController extends BaseController { @Autowired @@ -34,8 +36,8 @@ /** * 导出钣金车间统计列表 */ @RequiresPermissions("ApsPlateProcessShopStat:ApsPlateProcessShopStat:export") @Operation(summary = "钣金计划大表", description = "导出功能") @RequiresPermissions("plateProcessShopStat:export") @Log(title = "钣金车间统计", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ApsPlateProcessShopStat apsPlateProcessShopStat) @@ -50,10 +52,11 @@ * 修改钣金车间统计 */ @Operation(summary = "钣金计划大表", description = "更新统计数据") @Log(title = "钣金车间统计", businessType = BusinessType.UPDATE) @RequiresPermissions("plateProcessShopStat:update") @PostMapping("/update") public AjaxResult update(@RequestBody ApsPlateProcessShopStat apsPlateProcessShopStat) public AjaxResult update() { apsPlateProcessShopStatService.saveShopStat(); return toAjax(true); @@ -62,10 +65,10 @@ /** * 查询钣金车间统计列表 */ @RequiresPermissions("plateProcessShopStat:list") @Operation(summary = "钣金计划大表", description = "获取统计数据") @GetMapping("/list") public AjaxResult list(ApsPlateProcessShopStat apsPlateProcessShopStat) public AjaxResult list() { return apsPlateProcessShopStatService.getShopPlanStat();
@@ -2,6 +2,7 @@ import com.aps.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; @@ -12,56 +13,70 @@ import java.util.List; @Data @Schema(description = "钣金统计大表") public class ApsPlateProcessShopPlanStat implements Serializable { @Serial private static final long serialVersionUID = 1L; /** 主键id */ @Schema(description = "主键id", type = "String") private String id; /** 主件料号 */ @Schema(description = "主件料号", type = "String") @Excel(name = "主件料号") private String mainPartNumber; /** 业务类型 */ @Schema(description = "业务类型", type = "String") @Excel(name = "业务类型") private String businessType; /** 单据号 */ @Schema(description = "单据号", type = "String") @Excel(name = "单据号") private String documentNumber; /** 需求分类 */ @Schema(description = "需求分类", type = "String") @Excel(name = "需求分类") private String requirementType; /** 单据状态 */ @Schema(description = "单据状态", type = "String") @Excel(name = "单据状态") private String documentStatus; /** 当前工序 */ @Schema(description = "当前工序", type = "String") @Excel(name = "当前工序") private String workCenter; /** 料号 */ @Excel(name = "料号") @Schema(description = "料号", type = "String") private String itemNumber; /** 图号 */ @Schema(description = "图号", type = "String") @Excel(name = "图号") private String drawingNo; /** 版本号 */ @Schema(description = "版本号", type = "String") @Excel(name = "版本号") private String versionNumber; /** 生产数量 */ @Schema(description = "生产数量", type = "String") @Excel(name = "生产数量") private BigDecimal productionQuantity; /** 计划完工日 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "计划完工日", width = 30, dateFormat = "yyyy-MM-dd") @Schema(description = "计划完工日", type = "String") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "计划完工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date planEndDay; private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>(); aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopStat.java
@@ -1,5 +1,6 @@ package com.aps.core.domain; import io.swagger.v3.oas.annotations.media.Schema; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.aps.common.core.annotation.Excel; @@ -13,42 +14,42 @@ * @author zhl * @date 2025-04-23 */ //@ApiModel("钣金车间统计实体类") @Schema(description = "钣金车间统计对象") public class ApsPlateProcessShopStat extends BaseEntity { private static final long serialVersionUID = 1L; /** $column.columnComment */ //@ApiModelProperty("$column.columnComment") @Schema(description = "主键id", type = "Long") private Long id; /** 单据号 */ @Excel(name = "单据号") ///@ApiModelProperty("单据号") @Schema(description = "单据号", type = "String") private String docNo; /** 车间编码 */ @Excel(name = "车间编码") //@ApiModelProperty("车间编码") @Schema(description = "车间编码", type = "String") private String shopCode; /** 车间名称 */ @Excel(name = "车间名称") //@ApiModelProperty("车间名称") @Schema(description = "车间名称", type = "String") private String shopName; /** 计划开始时间 */ @Excel(name = "计划开始时间") //@ApiModelProperty("计划开始时间") @Schema(description = "计划开始时间", type = "String") private String planStartDate; /** 计划结束日期 */ @Excel(name = "计划结束日期") //@ApiModelProperty("计划结束日期") @Schema(description = "计划结束日期", type = "String") private String planEndDate; /** 删除标志（0代表存在 2代表删除） */ //@ApiModelProperty("删除标志（0代表存在 2代表删除）") @Schema(description = "删除标志", type = "String") private String delFlag; public void setId(Long id) aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
@@ -273,7 +273,6 @@ return shopPlanStat; }) .toList(); // 构建返回结果 AjaxResult success = AjaxResult.success(shopPlanStats); success.put("shopNames", shopList);
