From d2c878cc261fda22075c27d75d59cba7e385ed6d Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Tue, 23 Jun 2026 17:12:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PlanAssignSteerController.java | 25 +++- .../basic/excel/PlanAssignSteerExcel.java | 129 +++++++++--------- .../excel/PlanAssignSteerImportExcel.java | 98 +++++++++++++ .../basic/mapper/PlanAssignSteerMapper.xml | 16 ++- .../controller/QualityGradeController.java | 29 ++-- .../scheduling/excel/QualityGradeExcel.java | 62 ++++----- .../scheduling/mapper/QualityGradeMapper.java | 2 + .../scheduling/mapper/QualityGradeMapper.xml | 11 +- .../service/IQualityGradeService.java | 2 + .../service/impl/QualityGradeServiceImpl.java | 4 + 10 files changed, 261 insertions(+), 117 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerImportExcel.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java index fd5346b09..fa0a3e11f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java @@ -5,6 +5,7 @@ package org.springblade.desk.basic.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -29,6 +30,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.MaterialQuotaExcel; import org.springblade.desk.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.excel.PlanAssignSteerImportExcel; import org.springblade.desk.basic.pojo.entity.*; import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; import org.springblade.desk.basic.service.ICraftAbilityService; @@ -221,13 +223,22 @@ public class PlanAssignSteerController extends BladeController { public void exportExcel(@Parameter(hidden = true) @RequestParam Map planAssignSteer, BladeUser bladeUser, HttpServletResponse response) { QueryWrapper qw = Condition.getQueryWrapper(planAssignSteer, PlanAssignSteer.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(PlanAssignSteer::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(PlanAssignSteerEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + qw.eq(planAssignSteer.containsKey("platingId"), PlanAssignSteer.COL_PLATING_ID, Func.toInt(planAssignSteer.get("platingId"))); + qw.eq("is_deleted", 0); List list = service.exportPlanAssignSteer(qw); - ExcelUtil.export(response, "[外协分派]数据" + DateUtil.time(), - "[外协分派]数据表", list, PlanAssignSteerExcel.class); + for(PlanAssignSteerExcel excel : list){ + if(StringUtils.isEmpty(excel.getOemName()) && excel.getOemId() != null){ + excel.setOemName(excel.getOemId().toString()); + } + if(StringUtils.isEmpty(excel.getDsPartName()) && excel.getDsPart() != null){ + excel.setDsPartName(excel.getDsPart().toString()); + } + if(StringUtils.isEmpty(excel.getPlatingName()) && excel.getPlatingId() != null){ + excel.setPlatingName(excel.getPlatingId().toString()); + } + } + ExcelUtil.export(response, "外协分派" + DateUtil.time(), + "外协分派", list, PlanAssignSteerExcel.class); } /** @@ -260,7 +271,7 @@ public class PlanAssignSteerController extends BladeController { List noticeList = new ArrayList<>(); - List list = ExcelUtil.read(file, PlanAssignSteerExcel.class); + List list = ExcelUtil.read(file, PlanAssignSteerImportExcel.class); list.forEach(noticeExcel -> { PlanAssignSteer notice = BeanUtil.copy(noticeExcel, PlanAssignSteer.class); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java index e8cbeaace..ead6d8d4a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java @@ -4,6 +4,7 @@ package org.springblade.desk.basic.excel; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; @@ -13,7 +14,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDateTime; /** @@ -28,71 +28,66 @@ import java.time.LocalDateTime; @ContentRowHeight(18) public class PlanAssignSteerExcel implements Serializable { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; + + /** + * 供应商 + */ + @ColumnWidth(20) + @ExcelProperty("供应商") + private String oemName; + /** + * 工艺能力 + */ + @ColumnWidth(20) + @ExcelProperty("工艺能力") + private String platingName; + + /** + * 零件 + */ + @ColumnWidth(20) + @ExcelProperty("零件") + private String dsPartName; + /** + * 分派比例(%) + */ + @ColumnWidth(20) + @ExcelProperty("分派比例(%)") + private BigDecimal assignScale; + /** + * 日分派量 + */ + @ColumnWidth(20) + @ExcelProperty("日分派量") + private String assign; + /** + * 厂家周累计分派量 + */ + @ColumnWidth(20) + @ExcelProperty("厂家周累计分派量") + private BigDecimal weekAssign; + /** + * 分类周累计分派量 + */ + @ColumnWidth(20) + @ExcelProperty("分类周累计分派量") + private BigDecimal classifyAssign; + /** + * 比例偏差因子 + */ + @ColumnWidth(20) + @ExcelProperty("比例偏差因子") + private BigDecimal factor; + + @ExcelIgnore + private Long oemId; + + @ExcelIgnore + private Long dsPart; + + @ExcelIgnore + private Long platingId; - /** - * [供应商]id - */ - @ColumnWidth(20) - @ExcelProperty("供应商") -// private Long oemId; - private String oemName; - /** - * [工艺能力]id - */ - @ColumnWidth(20) - @ExcelProperty("工艺能力") -// private Long platingId; - private String platingName; - /** - * 零件;外键(dsPart) - */ - @ColumnWidth(20) - @ExcelProperty("零件") -// private Long dsPart; - private String dsPartName; - /** - * 分派比例 - */ - @ColumnWidth(20) - @ExcelProperty("分派比例") - private BigDecimal assignScale; - /** - * 厂家周累计分派量 - */ - @ColumnWidth(20) - @ExcelProperty("厂家周累计分派量") - private BigDecimal weekAssign; - /** - * 分类周累计分派量 - */ - @ColumnWidth(20) - @ExcelProperty("分类周累计分派量") - private BigDecimal classifyAssign; - /** - * 比例偏差因子 - */ - @ColumnWidth(20) - @ExcelProperty("比例偏差因子") - private BigDecimal factor; - /** - * 维护人 - */ - @ColumnWidth(20) - @ExcelProperty("维护人") -// private Long maintainMan; - private String maintainManName; - /** - * 维护时间 - */ - @ColumnWidth(20) - @ExcelProperty("维护时间-示例[1998-08-09 16:33:11]") - private LocalDateTime maintainTime; - /** - * 日分派量 - */ - @ColumnWidth(20) - @ExcelProperty("日分派量") - private String assign; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerImportExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerImportExcel.java new file mode 100644 index 000000000..081b0dc25 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerImportExcel.java @@ -0,0 +1,98 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.time.LocalDateTime; + + +/** + * [外协分派] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlanAssignSteerImportExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [供应商]id + */ + @ColumnWidth(20) + @ExcelProperty("供应商") +// private Long oemId; + private String oemName; + /** + * [工艺能力]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺能力") +// private Long platingId; + private String platingName; + /** + * 零件;外键(dsPart) + */ + @ColumnWidth(20) + @ExcelProperty("零件") +// private Long dsPart; + private String dsPartName; + /** + * 分派比例 + */ + @ColumnWidth(20) + @ExcelProperty("分派比例") + private BigDecimal assignScale; + /** + * 厂家周累计分派量 + */ + @ColumnWidth(20) + @ExcelProperty("厂家周累计分派量") + private BigDecimal weekAssign; + /** + * 分类周累计分派量 + */ + @ColumnWidth(20) + @ExcelProperty("分类周累计分派量") + private BigDecimal classifyAssign; + /** + * 比例偏差因子 + */ + @ColumnWidth(20) + @ExcelProperty("比例偏差因子") + private BigDecimal factor; + /** + * 维护人 + */ + @ColumnWidth(20) + @ExcelProperty("维护人") +// private Long maintainMan; + private String maintainManName; + /** + * 维护时间 + */ + @ColumnWidth(20) + @ExcelProperty("维护时间-示例[1998-08-09 16:33:11]") + private LocalDateTime maintainTime; + /** + * 日分派量 + */ + @ColumnWidth(20) + @ExcelProperty("日分派量") + private String assign; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml index e78008023..ba166d0fd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml @@ -17,11 +17,23 @@ + select * from MES_QUALITY_GRADE is_deleted = 0 @@ -28,6 +27,14 @@ and QUALITY_GRADE LIKE '%' || #{param2.qualityGrade} || '%'; + + + + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IQualityGradeService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IQualityGradeService.java index 72948df7a..cba652cab 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IQualityGradeService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IQualityGradeService.java @@ -50,6 +50,8 @@ public interface IQualityGradeService extends BaseService { */ IPage selectQualityGradePage(IPage page, QualityGradeVO QualityGrade); + List selectQualityGrade(QualityGradeVO QualityGrade); + /** * 导出数据 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/QualityGradeServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/QualityGradeServiceImpl.java index e84b381b2..93396848f 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/QualityGradeServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/QualityGradeServiceImpl.java @@ -51,6 +51,10 @@ public class QualityGradeServiceImpl extends BaseServiceImpl selectQualityGrade(QualityGradeVO QualityGrade) { + return baseMapper.selectQualityGrade(QualityGrade); + } @Override public List export(Wrapper queryWrapper) {