diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/excel/ReviewFormFileExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/excel/ReviewFormFileExcel.java new file mode 100644 index 000000000..b8fcd8b90 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/excel/ReviewFormFileExcel.java @@ -0,0 +1,309 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * [工艺文件] Excel实体类 + * + * @author Tom Shuo + * @since 2025-12-22 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ReviewFormFileExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ColumnWidth(20) + @ExcelProperty("审理单号") + private String code; + + @ColumnWidth(20) + @ExcelProperty("审理单id") + private BigDecimal id; + + @ColumnWidth(20) + @ExcelProperty("上级编号") + private String precode; + + @ColumnWidth(20) + @ExcelProperty("产品编号") + private String prtno; + + @ColumnWidth(20) + @ExcelProperty("产品名称") + private String name; + + @ColumnWidth(20) + @ExcelProperty("生产标识") + private String qstandno; + + @ColumnWidth(20) + @ExcelProperty("批次号") + private String lotno; + + @ColumnWidth(20) + @ExcelProperty("总数量") + private BigDecimal cntt; + + @ColumnWidth(20) + @ExcelProperty("产品不合格数") + private BigDecimal cntn; + + @ColumnWidth(20) + @ExcelProperty("发现单位") + private String deptcode; + + @ColumnWidth(20) + @ExcelProperty("发现工序") + private String useproc; + + @ColumnWidth(20) + @ExcelProperty("检验员") + private String checker; + + @ColumnWidth(20) + @ExcelProperty("检验员姓名") + private String checkername; + + @ColumnWidth(20) + @ExcelProperty("审理员") + private String chker; + + @ColumnWidth(20) + @ExcelProperty("审理员姓名") + private String chkername; + + @ColumnWidth(20) + @ExcelProperty("检验日期") + private Date checkdate; + + @ColumnWidth(20) + @ExcelProperty("归档日期") + private Date finishdate; + + @ColumnWidth(20) + @ExcelProperty("审理意见") + private String dispose; + + @ColumnWidth(20) + @ExcelProperty("审理意见详情") + private String disposename; + + @ColumnWidth(20) + @ExcelProperty("责任零件") + private String p5layer1; + + @ColumnWidth(20) + @ExcelProperty("相关零件") + private String p5layer2; + + @ColumnWidth(20) + @ExcelProperty("责任批次") + private String p5layer3; + + @ColumnWidth(20) + @ExcelProperty("相关批次") + private String p5layer4; + + @ColumnWidth(20) + @ExcelProperty("问题大类") + private String p1llayer3; + + @ColumnWidth(20) + @ExcelProperty("问题小类") + private String p1llayer4; + + @ColumnWidth(20) + @ExcelProperty("是否关键尺寸") + private String p1llayer12; + + @ColumnWidth(20) + @ExcelProperty("故障描述") + private String p1remark; + + @ColumnWidth(20) + @ExcelProperty("问题编号") + private String p1projectid; + + @ColumnWidth(20) + @ExcelProperty("外协厂家") + private String p2layer7; + + @ColumnWidth(20) + @ExcelProperty("处理描述") + private String opinion; + + @ColumnWidth(20) + @ExcelProperty("产品型号") + private String type; + + @ColumnWidth(20) + @ExcelProperty("比例") + private String pern; + + @ColumnWidth(20) + @ExcelProperty("单据状态") + private String status; + + @ColumnWidth(20) + @ExcelProperty("落实零件") + private String rprtn; + + @ColumnWidth(20) + @ExcelProperty("落实批次") + private String rsplcode; + + @ColumnWidth(20) + @ExcelProperty("让步数") + private String p6layer2; + + @ColumnWidth(20) + @ExcelProperty("返工数") + private String p6layer3; + + @ColumnWidth(20) + @ExcelProperty("返修数") + private String p6layer4; + + @ColumnWidth(20) + @ExcelProperty("报废数") + private String p6layer5; + + @ColumnWidth(20) + @ExcelProperty("责任部门") + private String p2layer1; + + @ColumnWidth(20) + @ExcelProperty("管理责任部门") + private String p2layer11; + + @ColumnWidth(20) + @ExcelProperty("二级部门") + private String p2layer3; + + @ColumnWidth(20) + @ExcelProperty("班组") + private String p2layer4; + + @ColumnWidth(20) + @ExcelProperty("责任人") + private String p2layer5; + + @ColumnWidth(20) + @ExcelProperty("责任人2") + private String p2layer9; + + @ColumnWidth(20) + @ExcelProperty("责任工序") + private String p2layer6; + + @ColumnWidth(20) + @ExcelProperty("供应商") + private String p2layer8; + + @ColumnWidth(20) + @ExcelProperty("考核金额") + private BigDecimal fine; + + @ColumnWidth(20) + @ExcelProperty("奖励金额") + private BigDecimal reward; + + @ColumnWidth(20) + @ExcelProperty("通报号") + private String noticeno; + + @ColumnWidth(20) + @ExcelProperty("故障比例") + private String percent1; + + @ColumnWidth(20) + @ExcelProperty("责任比例") + private String percent2; + + @ColumnWidth(20) + @ExcelProperty("打回原因") + private String backcause; + + @ColumnWidth(20) + @ExcelProperty("修改日期") + private Date editdate; + + @ColumnWidth(20) + @ExcelProperty("用户代表") + private String splywxcode; + + @ColumnWidth(20) + @ExcelProperty("工序名称") + private String useseq; + + @ColumnWidth(20) + @ExcelProperty("是否典型问题") + private String typicalflag; + + @ColumnWidth(20) + @ExcelProperty("是否批次性问题") + private String lotflag; + + @ColumnWidth(20) + @ExcelProperty("计划标记") + private String psign; + + @ColumnWidth(20) + @ExcelProperty("审理打向") + private String judgeflag; + + @ColumnWidth(20) + @ExcelProperty("开始时间") + private Date judgestart; + + @ColumnWidth(20) + @ExcelProperty("结束时间") + private Date judgeend; + + @ColumnWidth(20) + @ExcelProperty("审理周期") + private String period; + + @ColumnWidth(20) + @ExcelProperty("审理等级") + private String userlevel; + + @ColumnWidth(20) + @ExcelProperty("零件备注说明") + private String remark; + + @ColumnWidth(20) + @ExcelProperty("是否低级问题") + private String lowerrflag; + + @ColumnWidth(20) + @ExcelProperty("使用部门") + private String usedept; + + @ColumnWidth(20) + @ExcelProperty("军代名字") + private String jdname; + + @ColumnWidth(20) + @ExcelProperty("返修路线") + private String redodeptcode; +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java index ddcc24fed..f0ac61898 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java @@ -6,6 +6,7 @@ import org.springblade.common.constant.LauncherConstant; import org.springblade.core.tool.api.R; import org.springblade.desk.quality.pojo.dto.ErpQueryRequest; import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO; +import org.springblade.desk.quality.pojo.excel.ReviewFormFileExcel; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; import org.springframework.cloud.openfeign.FeignClient; @@ -30,6 +31,7 @@ public interface IErpMesRbPkpqryClient { String API_PREFIX = "/feign/client/mesRbPkpqry/"; String SELECT_PAGE = API_PREFIX + "selectPage"; String LIST_ERP = API_PREFIX + "listerp"; + String LIST_ERP_ALL = API_PREFIX + "listerpAll"; /** * 查询配置结果 @@ -52,4 +54,7 @@ public interface IErpMesRbPkpqryClient { @PostMapping(LIST_ERP) List listErpNew(@RequestBody ErpQueryRequest erpQueryRequest); + + @PostMapping(LIST_ERP_ALL) + List listErpAll(); } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java index 397740583..0711c467f 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.tool.api.R; import org.springblade.desk.quality.pojo.dto.ErpQueryRequest; import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO; +import org.springblade.desk.quality.pojo.excel.ReviewFormFileExcel; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; import org.springframework.web.bind.annotation.RequestBody; @@ -28,5 +29,10 @@ public class IErpMesRbPkpqryClientFallback implements IErpMesRbPkpqryClient { return List.of(); } + @Override + public List listErpAll() { + return List.of(); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index 8920b06ba..b35a9d34a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -33,6 +33,7 @@ import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO; import org.springblade.desk.quality.pojo.entity.ReviewDuty; import org.springblade.desk.quality.pojo.entity.ReviewFault; import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.excel.ReviewFormFileExcel; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; @@ -563,4 +564,20 @@ public class ReviewSheetController extends BladeController { list.add(vo3); return R.data(list); } + + + /** + * 审理单 导出Excel + */ + @GetMapping("/reviewFormExportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ReviewSheet") + public void reviewFormExportExcel(@Parameter(hidden = true) @RequestParam Map reviewSheet, + BladeUser bladeUser, HttpServletResponse response) { + + List list = service.reviewFormExportExcel(); + + ExcelUtil.export(response, "[审理单]数据" + DateUtil.time(), + "[审理单]数据表", list, ReviewFormFileExcel.class); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java index 39717cfa0..d122e4886 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java @@ -5,12 +5,14 @@ package org.springblade.desk.quality.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.excel.ReviewFormFileExcel; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; @@ -148,4 +150,6 @@ public interface IReviewSheetService extends EnBaseService { IPage listReviewRedoScrap(IPage page, ReviewSheetRedoScrapSearch search); IPage listErp(IPage page, ReviewSheetErpSearch search); + + List reviewFormExportExcel(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index 7b714b878..6a4791f76 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -41,6 +41,7 @@ import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.mapper.ReviewSheetMapper; import org.springblade.desk.quality.pojo.dto.*; import org.springblade.desk.quality.pojo.entity.*; +import org.springblade.desk.quality.pojo.excel.ReviewFormFileExcel; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; @@ -955,6 +956,14 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl reviewFormExportExcel() { + + List listVO = erpMesRbPkpqryClient.listErpAll(); + + return listVO; + } + @Override public ReviewSheet getByRsCode(String rsCode) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java index 3f7ed11b6..b7afd76bb 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java @@ -11,6 +11,7 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.desk.quality.pojo.dto.ErpQueryRequest; import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO; +import org.springblade.desk.quality.pojo.excel.ReviewFormFileExcel; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; import org.springblade.erpdata.mapper.ErpMesRbPkpqryMapper; import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; @@ -56,5 +57,11 @@ public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient { return result; } + @Override + public List listErpAll() { + List result = erpMesRbPkpqryMapper.listErpAll(); + return result; + } + } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java index abe481277..1ec1a43a5 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.Mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO; +import org.springblade.desk.quality.pojo.excel.ReviewFormFileExcel; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO; @@ -30,4 +31,6 @@ public interface ErpMesRbPkpqryMapper extends Mapper { List listErpNew(IPage page, @Param("q") ReviewSheetErpSearch search); + + List listErpAll(); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml index 538ee8b47..e0de10d47 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkpqryMapper.xml @@ -53,5 +53,11 @@ + +