From ed9ac1dc54e2be0ee8754a2c176cdbbc6d67eec0 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 9 Feb 2026 11:29:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/pojo/entity/PlanAssignSteer.java | 9 +++--- .../LocallyPlatedPartController.java | 31 +++++++++++++----- .../controller/MaterialQuotaController.java | 29 ++++++++++++----- .../controller/PlanAssignSteerController.java | 32 ++++++++++++++----- .../controller/PlatingSmallController.java | 4 +++ .../desk/basic/excel/MaterialQuotaExcel.java | 2 +- .../basic/excel/PlanAssignSteerExcel.java | 4 +-- 7 files changed, 80 insertions(+), 31 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java index 7d8f9e31..4ce6d5d2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; +import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -87,22 +88,22 @@ public class PlanAssignSteer extends BaseEntity { * 分派比例 */ @Schema(description = "分派比例") - private Long assignScale; + private BigDecimal assignScale; /** * 厂家周累计分派量 */ @Schema(description = "厂家周累计分派量") - private Long weekAssign; + private BigDecimal weekAssign; /** * 分类周累计分派量 */ @Schema(description = "分类周累计分派量") - private Long classifyAssign; + private BigDecimal classifyAssign; /** * 比例偏差因子 */ @Schema(description = "比例偏差因子") - private Long factor; + private BigDecimal factor; /** * 维护人 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java index a19ab08a..97d66db6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java @@ -22,10 +22,13 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.CoatingThicknessExcel; import org.springblade.desk.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; import org.springblade.desk.basic.service.ILocallyPlatedPartService; @@ -35,6 +38,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -226,13 +230,24 @@ public class LocallyPlatedPartController extends BladeController { @ApiOperationSupport(order = 72) @Operation(summary = "导入Excel", description = "MultipartFile") public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, LocallyPlatedPart.class - ); - return R.status(service.saveBatch(importList)); +// R checkR = ExcelExtUtil.importExcelCheck(file); +// if (checkR != null) { +// return checkR; +// } +// List importList = ExcelUtil.read( +// file, 0, 1, LocallyPlatedPart.class +// ); +// return R.status(service.saveBatch(importList)); + + List noticeList = new ArrayList<>(); + List list = ExcelUtil.read(file, LocallyPlatedPartExcel.class); + list.forEach(noticeExcel -> { + + LocallyPlatedPart notice = BeanUtil.copy(noticeExcel, LocallyPlatedPart.class); + noticeList.add(notice); + }); + return R.data(service.saveBatch(noticeList)); + + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java index d6e0e947..8725a1ee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -24,10 +24,13 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.LocallyPlatedPartExcel; import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; import org.springblade.desk.basic.service.IMaterialQuotaService; @@ -37,6 +40,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -233,13 +237,22 @@ public class MaterialQuotaController extends BladeController { @ApiOperationSupport(order = 72) @Operation(summary = "导入Excel", description = "MultipartFile") public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, MaterialQuota.class - ); - return R.status(service.saveBatch(importList)); +// R checkR = ExcelExtUtil.importExcelCheck(file); +// if (checkR != null) { +// return checkR; +// } +// List importList = ExcelUtil.read( +// file, 0, 1, MaterialQuota.class +// ); +// return R.status(service.saveBatch(importList)); + + List noticeList = new ArrayList<>(); + List list = ExcelUtil.read(file, MaterialQuotaExcel.class); + list.forEach(noticeExcel -> { + + MaterialQuota notice = BeanUtil.copy(noticeExcel, MaterialQuota.class); + noticeList.add(notice); + }); + return R.data(service.saveBatch(noticeList)); } } 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 22da8b08..4083c63d 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 @@ -22,10 +22,13 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; 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.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; import org.springblade.desk.basic.service.IPlanAssignSteerService; @@ -35,6 +38,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -80,6 +84,8 @@ public class PlanAssignSteerController extends BladeController { public R> list(@Parameter(hidden = true) @RequestParam Map planAssignSteer, Query query) { QueryWrapper qw = Condition.getQueryWrapper(planAssignSteer, PlanAssignSteer.class); + qw.eq(planAssignSteer.containsKey("platingId"), PlanAssignSteer.COL_PLATING_ID, Func.toInt(planAssignSteer.get("platingId"))); + IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = PlanAssignSteerWrapper.build().pageVO(pages); pagesVO.getRecords() @@ -226,13 +232,23 @@ public class PlanAssignSteerController extends BladeController { @ApiOperationSupport(order = 72) @Operation(summary = "导入Excel", description = "MultipartFile") public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, PlanAssignSteer.class - ); - return R.status(service.saveBatch(importList)); +// R checkR = ExcelExtUtil.importExcelCheck(file); +// if (checkR != null) { +// return checkR; +// } +// List importList = ExcelUtil.read( +// file, 0, 1, PlanAssignSteer.class +// ); +// return R.status(service.saveBatch(importList)); + + + List noticeList = new ArrayList<>(); + List list = ExcelUtil.read(file, PlanAssignSteerExcel.class); + list.forEach(noticeExcel -> { + + PlanAssignSteer notice = BeanUtil.copy(noticeExcel, PlanAssignSteer.class); + noticeList.add(notice); + }); + return R.data(service.saveBatch(noticeList)); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java index 69766945..e17f96fc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; import org.springblade.desk.basic.pojo.entity.PlatingSmall; import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; import org.springblade.desk.basic.service.IPlatingSmallService; @@ -83,6 +84,9 @@ public class PlatingSmallController extends BladeController { QueryWrapper qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class); // 名称 qw.like(platingSmall.containsKey("bpsName"), PlatingSmall.COL_BPS_NAME, Func.toStr(platingSmall.get("bpsName"))); + qw.eq(platingSmall.containsKey("capacity"), PlatingSmall.COL_CAPACITY, Func.toInt(platingSmall.get("capacity"))); + + IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = PlatingSmallWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java index 8087c103..91e08eb3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java @@ -35,7 +35,7 @@ public class MaterialQuotaExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("类型-[1]:金押定额;[2]:银板定额;") - private Long quotaType; + private Integer quotaType; /** * 名称 */ 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 8684b9e0..6a70a214 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 @@ -36,13 +36,13 @@ public class PlanAssignSteerExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("[外协厂家]id") - private BigDecimal oemId; + private Long oemId; /** * [工艺能力]id */ @ColumnWidth(20) @ExcelProperty("[工艺能力]id") - private BigDecimal platingId; + private Long platingId; /** * 零件;外键(dsPart) */