From ea1f6643208c409ff474af694a1f2ca818e957f8 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Sat, 22 Feb 2025 14:14:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9D=BF=E4=BB=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=86=99=E5=85=A5=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/web/core/handler/GlobalExceptionHandler.java | 2 +- .../imes/module/manage/service/plate/PlateExcelListener.java | 3 ++- .../factory/service/impl/CustomPlateNoServiceHandler.java | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java index d3227c8c6..e925bc201 100644 --- a/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java +++ b/cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/handler/GlobalExceptionHandler.java @@ -227,7 +227,7 @@ public class GlobalExceptionHandler { // 文件格式错误处理 if (rootCause instanceof IOException) { // 使用正则提取数值 - Pattern pattern = Pattern.compile("Numeric value \\((\\d+)\\) out of range"); + Pattern pattern = Pattern.compile("Numeric value \\(([-+]?\\d*\\.?\\d+(?:[eE][-+]?\\d+)?)\\) out of range"); Matcher matcher = pattern.matcher(rootCause.getMessage()); if (matcher.find()) { String invalidValue = matcher.group(1); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java index 1e0c28ee6..87a473419 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java @@ -1,6 +1,7 @@ package com.cf.imes.module.manage.service.plate; import com.alibaba.excel.context.AnalysisContext; +import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO; import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO; import com.cf.imes.module.manage.util.file.ExcelListener; import lombok.extern.slf4j.Slf4j; @@ -98,7 +99,7 @@ public final class PlateExcelListener extends ExcelListener getDatas() { + public List getDates() { return datas; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java index c8ed54db4..a8fe8af3d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/CustomPlateNoServiceHandler.java @@ -368,6 +368,8 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand @Override public void modifySystemConfig(ConfigSaveReqVO reqVO) { + // 记录当前版本配置状态 + int status = getSystemConfig(reqVO.getId()).getStatus(); // 校验规则 checkValid(reqVO.getSetting()); // 系统配置保存前操作 @@ -382,7 +384,7 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand // 更新 systemConfigMapper.updateById(systemConfigDO); } else { - systemConfigDO = BeanUtils.toBean(reqVO, SystemConfigDO.class); + systemConfigDO = BeanUtils.toBean(reqVO, SystemConfigDO.class).setStatus(status); // 新增 systemConfigMapper.insert(systemConfigDO); } From a61b3498d25f6a62f5d55df3fcdc8d7da5beefdf Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Sat, 22 Feb 2025 14:20:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8E=92=E5=8D=95?= =?UTF-8?q?=E6=B7=B7=E5=8D=95=E9=80=89=E6=8B=A9=E5=A4=A7=E6=9D=BF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/controller/admin/plan/PlanController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java index ac356de89..eef3601c0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java @@ -185,4 +185,14 @@ public class PlanController { } + + @PostMapping("getPlanGoodsList") + @Operation(summary = "未排单混单获取分类的排单信息") + @PreAuthorize("@ss.hasPermission('manage:un-order-olan:create')") + public CommonResult> getPlanGoodsList(@Valid @RequestBody SavePlanPlateList savePlanPlateList) { + + return success(planService.getPlanGoodsList(savePlanPlateList)); + + } + } \ No newline at end of file From fee11367a87abfa7eef92bf9d6e7e575cb2446e5 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Sat, 22 Feb 2025 16:17:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9D=BF=E6=9D=90=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/parts/PartsController.java | 8 ++ .../admin/parts/vo/PartsCadPageReqVO.java | 88 ++++++++++++++++++ .../admin/plate/PlateController.java | 20 ++-- .../plate/vo/plate/PlateImportExcelVO.java | 9 +- .../admin/plate/vo/plate/PlateSaveReqVO.java | 6 +- .../manage/dal/mysql/parts/PartsMapper.java | 69 ++++++++++++++ .../manage/service/parts/PartsService.java | 3 + .../service/parts/PartsServiceImpl.java | 9 ++ .../main/resources/type/excel_plate_add.xlsx | Bin 11859 -> 11945 bytes 9 files changed, 195 insertions(+), 17 deletions(-) create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsCadPageReqVO.java diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java index fef645cb2..728ed5acc 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java @@ -144,4 +144,12 @@ public class PartsController { } } + @GetMapping("/cad/page") + @Operation(summary = "cad获得配件分页") + @PreAuthorize("@ss.hasAnyPermissions('system:accessory:query','base:accessory:query')") + public CommonResult> getCadPage(@Valid PartsCadPageReqVO pageReqVO) { + PageResult pageResult = partsService.getCadPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); + } + } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsCadPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsCadPageReqVO.java new file mode 100644 index 000000000..0daa19fc2 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/vo/PartsCadPageReqVO.java @@ -0,0 +1,88 @@ +package com.cf.imes.module.manage.controller.admin.parts.vo; + +import com.cf.imes.framework.common.pojo.PageParam; +import com.cf.imes.module.manage.validation.parts.PartsNumberValid; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.validation.constraints.Size; + +/** + * cad 传参 + */ +@Schema(description = "管理后台 - 配件分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PartsCadPageReqVO extends PageParam { + + @Schema(description = "商品名称", example = "张三") + @Size(max = 64, message = "配件名称长度不能超过64个字符") + private String name; + + @Schema(description = "颜色") + @Size(max = 32, message = "颜色长度不能超过32个字符") + private String color; + + @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板") + @Size(max = 64, message = "材质长度不能超过64个字符") + private String material; + + @Schema(description = "配件类型", example = "2") + @Size(max = 32, message = "配件类型长度不能超过323个字符") + private String category; + + @Schema(description = "配件子类", example = "2") + @Size(max = 64, message = "配件子类长度不能超过64个字符") + private String type; + + @Schema(description = "型号") + @Size(max = 64, message = "配件型号长度不能超过64个字符") + private String model; + + @Schema(description = "规格") + @Size(max = 64, message = "配件规格不能超过64个字符") + private String spec; + + @Schema(description = "宽度") + @PartsNumberValid(name = "宽度") + private Double width; + + @Schema(description = "长度") + @PartsNumberValid(name = "长度") + private Double length; + + @Schema(description = "厚度") + @PartsNumberValid(name = "厚度") + private Double thickness; + + @Schema(description = "品牌") + @Size(max = 64, message = "配件品牌不能超过64个字符") + private String brand; + + @Schema(description = "厂家") + @Size(max = 128, message = "厂家长度不能超过64个字符") + private String factory; + + @Schema(description = "单位") + @Size(max = 32, message = "单位长度不能超过64个字符") + private String unit; + + @Schema(description = "是否复合部件：0 否 1 是") + private Boolean isComposite; + + @Schema(description = "备注", example = "你说的对") + @Size(max = 255, message = "备注长度不能超过255个字符") + private String remark; + + private Long organId; + + @Schema(description = "排序", example = "ascend") + private String order; + + @Schema(description = "排序字段", example = "id") + private String field; + +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java index 5b941b482..e30cd8aac 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java @@ -118,15 +118,17 @@ public class PlateController { // @PreAuthorize("@ss.hasPermission('manage:plate:export')") @PreAuthorize("@ss.hasAnyPermissions('manage:plate:export','base:plate:export')") public void importTemplate(HttpServletResponse response) throws IOException { - // 手动创建导出 demo - List list = Arrays.asList( - PlateImportExcelVO.builder().goodsId("BD10010001").goodsName("18mm-多层板-暖白").material("多层板").width(String.valueOf(1220)).height(String.valueOf(2440)) - .thickness(String.valueOf(18)).brand("AAA").spec("2440*1220*18").color("暖白").price("120").texture("无").build(), - PlateImportExcelVO.builder().goodsId("BD10010002").goodsName("18mm-颗粒板-高级灰").material("多层板").width(String.valueOf(1220)).height(String.valueOf(2750)) - .thickness(String.valueOf(18)).brand("鸿达树").spec("2750*1220*18").color("高级灰").price("120").texture("无").build() - ); - // 输出 - ExcelUtils.write(response, IMPORT_TEMPLATE, "板材列表", PlateImportExcelVO.class, list); +// // 手动创建导出 demo +// List list = Arrays.asList( +// PlateImportExcelVO.builder().goodsId("BD10010001").goodsName("18mm-多层板-暖白").material("多层板").width(String.valueOf(1220)).height(String.valueOf(2440)) +// .thickness(String.valueOf(18)).brand("AAA").spec("2440*1220*18").color("暖白").price("120").texture("无").build(), +// PlateImportExcelVO.builder().goodsId("BD10010002").goodsName("18mm-颗粒板-高级灰").material("多层板").width(String.valueOf(1220)).height(String.valueOf(2750)) +// .thickness(String.valueOf(18)).brand("鸿达树").spec("2750*1220*18").color("高级灰").price("120").texture("无").build() +// ); +// // 输出 +// ExcelUtils.write(response, IMPORT_TEMPLATE, "板材列表", PlateImportExcelVO.class, list); + + plateService.exportTemplate(response, "excel_plate_add.xlsx"); } // @GetMapping("/get-import-template") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java index 5ef6af037..04813b5da 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java @@ -40,16 +40,16 @@ public class PlateImportExcelVO { @NotEmpty(message = "颜色不能为空") private String color; - @ExcelProperty(value = "*纹理") + @ExcelProperty(value = "纹理") @ColumnWidth(10) private String texture; - @ExcelProperty("*宽度") + @ExcelProperty("宽度") @ColumnWidth(10) @NotEmpty(message = "宽度不能为空") private String width; - @ExcelProperty("*高度")// float(8,3) + @ExcelProperty("高度")// float(8,3) @ColumnWidth(10) @NotEmpty(message = "高度不能为空") private String height; @@ -79,8 +79,7 @@ public class PlateImportExcelVO { public boolean isValidGoods() { return !(goodsId == null || goodsId.isEmpty() || goodsName == null || goodsName.isEmpty() || material == null || - material.isEmpty() || color == null || color.isEmpty() || width == null ||width.isEmpty() || height == null || - height.isEmpty() || height == null ||thickness.isEmpty() ); + material.isEmpty() || color == null || color.isEmpty() ||thickness.isEmpty() ); } // 数据长度判断 diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java index 7803bf987..cb40dd654 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java @@ -36,16 +36,16 @@ public class PlateSaveReqVO { private String color; @Schema(description = "纹理", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "纹理不能为空") +// @NotNull(message = "纹理不能为空") private Boolean texture; @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "宽度不能为空") +// @NotNull(message = "宽度不能为空") @NumberValid(name = "宽度") private Double width; @Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "高度不能为空") +// @NotNull(message = "高度不能为空") @NumberValid(name = "高度") private Double height; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java index cffe35f89..932de050b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java @@ -3,6 +3,7 @@ package com.cf.imes.module.manage.dal.mysql.parts; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.module.manage.controller.admin.parts.vo.PartsCadPageReqVO; import com.cf.imes.module.manage.controller.admin.parts.vo.PartsPageReqVO; import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO; @@ -103,4 +104,72 @@ public interface PartsMapper extends BaseMapperX { .eq(PartsDO::getOrganId, organId)); } + default PageResult selectCadPage(PartsCadPageReqVO reqVO) { + LambdaQueryWrapperX queryWrapper = new LambdaQueryWrapperX() + .eqIfPresent(PartsDO::getOrganId, reqVO.getOrganId()) + .eqIfPresent(PartsDO::getCategory, reqVO.getCategory()) + .likeIfPresent(PartsDO::getColor, reqVO.getColor()) + .likeIfPresent(PartsDO::getType, reqVO.getType()) + .likeIfPresent(PartsDO::getName, reqVO.getName()) + .likeIfPresent(PartsDO::getMaterial, reqVO.getMaterial()) + .likeIfPresent(PartsDO::getModel, reqVO.getModel()) + .likeIfPresent(PartsDO::getSpec, reqVO.getSpec()) + .likeIfPresent(PartsDO::getBrand, reqVO.getBrand()) + .likeIfPresent(PartsDO::getFactory, reqVO.getFactory()) + .likeIfPresent(PartsDO::getUnit, reqVO.getUnit()) + .eqIfPresent(PartsDO::getIsComposite, reqVO.getIsComposite()) + .eqIfPresent(PartsDO::getWidth, reqVO.getWidth()) + .eqIfPresent(PartsDO::getLength, reqVO.getLength()) + .eqIfPresent(PartsDO::getThickness, reqVO.getThickness()) + .likeIfPresent(PartsDO::getRemark, reqVO.getRemark()); + + if (reqVO.getOrder() == null) { + queryWrapper.orderByDesc(PartsDO::getId); + }else { + if (reqVO.getOrder().equals("ascend")) { + switch (reqVO.getField()) { + case "isComposite" -> queryWrapper.orderByAsc(PartsDO::getIsComposite); + case "category" -> queryWrapper.orderByAsc(PartsDO::getCategory); + case "type" -> queryWrapper.orderByAsc(PartsDO::getType); + case "name" -> queryWrapper.orderByAsc(PartsDO::getName); + case "model" -> queryWrapper.orderByAsc(PartsDO::getModel); + case "material" -> queryWrapper.orderByAsc(PartsDO::getMaterial); + case "color" -> queryWrapper.orderByAsc(PartsDO::getColor); + case "unit" -> queryWrapper.orderByAsc(PartsDO::getUnit); + case "spec" -> queryWrapper.orderByAsc(PartsDO::getSpec); + case "brand" -> queryWrapper.orderByAsc(PartsDO::getBrand); + case "factory" -> queryWrapper.orderByAsc(PartsDO::getFactory); + case "width" -> queryWrapper.orderByAsc(PartsDO::getWidth); + case "length" -> queryWrapper.orderByAsc(PartsDO::getLength); + case "thickness" -> queryWrapper.orderByAsc(PartsDO::getThickness); + default -> { + // default不排序 + } + } + }else if (reqVO.getOrder().equals("descend")) { + switch (reqVO.getField()) { + case "isComposite" -> queryWrapper.orderByDesc(PartsDO::getIsComposite); + case "category" -> queryWrapper.orderByDesc(PartsDO::getCategory); + case "type" -> queryWrapper.orderByDesc(PartsDO::getType); + case "name" -> queryWrapper.orderByDesc(PartsDO::getName); + case "model" -> queryWrapper.orderByDesc(PartsDO::getModel); + case "material" -> queryWrapper.orderByDesc(PartsDO::getMaterial); + case "color" -> queryWrapper.orderByDesc(PartsDO::getColor); + case "unit" -> queryWrapper.orderByDesc(PartsDO::getUnit); + case "spec" -> queryWrapper.orderByDesc(PartsDO::getSpec); + case "brand" -> queryWrapper.orderByDesc(PartsDO::getBrand); + case "factory" -> queryWrapper.orderByDesc(PartsDO::getFactory); + case "width" -> queryWrapper.orderByDesc(PartsDO::getWidth); + case "length" -> queryWrapper.orderByDesc(PartsDO::getLength); + case "thickness" -> queryWrapper.orderByDesc(PartsDO::getThickness); + default -> { + // default不排序 + } + } + } + } + + return selectPage(reqVO, queryWrapper); + } + } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java index c64014565..299a19ae8 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java @@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.*; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.module.manage.controller.admin.parts.vo.PartsCadPageReqVO; import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO; import com.cf.imes.module.manage.controller.admin.parts.vo.PartsPageReqVO; import com.cf.imes.module.manage.controller.admin.parts.vo.PartsSaveReqVO; @@ -60,6 +61,8 @@ public interface PartsService { */ PageResult getPage(PartsPageReqVO pageReqVO); + PageResult getCadPage(PartsCadPageReqVO pageReqVO); + /** * 生产导入文件模板下载 */ diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java index da509abbf..2fcc3a9c4 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java @@ -3,6 +3,7 @@ package com.cf.imes.module.manage.service.parts; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.framework.organ.core.context.OrganContextHolder; +import com.cf.imes.module.manage.controller.admin.parts.vo.PartsCadPageReqVO; import com.cf.imes.module.manage.controller.admin.parts.vo.PartsImportExcelVO; import com.cf.imes.module.manage.controller.admin.parts.vo.PartsPageReqVO; import com.cf.imes.module.manage.controller.admin.parts.vo.PartsSaveReqVO; @@ -156,6 +157,14 @@ public class PartsServiceImpl implements PartsService { return partsMapper.selectPage(pageReqVO); } + @Override + @OrganIgnore + public PageResult getCadPage(PartsCadPageReqVO pageReqVO) { + pageReqVO.setOrganId(getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId())); + + return partsMapper.selectCadPage(pageReqVO); + } + @Override @OrganIgnore public void exportTemplate(HttpServletResponse response, String value) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/type/excel_plate_add.xlsx index d4917f35ee59c497c9b8bfa229c7767d54f715b2..ce5f2918e5e55606f4104aa2ff012b8abe7d67ae 100644 GIT binary patch delta 3117 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 H00000$tKQC delta 3009 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 DweOu( From 90fd0f1f3e73fc4e04a27ea897258b29023088eb Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Mon, 24 Feb 2025 15:42:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?MyCat=E7=8E=AF=E5=A2=83=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=9F=E5=BA=A6=E7=BC=93=E6=85=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/goods/GoodsMapper.xml | 6 ++--- .../mapper/planitem/PlanItemMapper.xml | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml index 0730ee41e..45b98e454 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml @@ -309,9 +309,9 @@ from order_body ob - left join order_item oi on ob.organ_id = oi.organ_id and ob.order_id = oi.order_id and ob.id = oi.body_id and oi.organ_id = #{organId} - left join order_plate op on oi.organ_id = op.organ_id and oi.order_id = op.order_id and oi.plate_id = op.id and op.organ_id = #{organId} - left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId} + left join order_item oi on ob.order_id = oi.order_id and ob.id = oi.body_id and oi.organ_id = #{organId} + left join order_plate op on oi.order_id = op.order_id and oi.plate_id = op.id and op.organ_id = #{organId} + left join order_plan_item opi on op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId} where ob.organ_id = #{organId} and ob.order_id in diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml index a40beb77a..dd45a8a6b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml @@ -168,10 +168,10 @@ og.brand as brand from orders o - left join order_goods og on o.organ_id = og.organ_id and o.id = og.order_id and og.organ_id = #{organId} - left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id and op.organ_id = #{organId} - left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id and oi.organ_id = #{organId} - left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId} + left join order_goods og on o.id = og.order_id and og.organ_id = #{organId} + left join order_plate op on og.order_id = op.order_id and og.id = op.goods_id and op.organ_id = #{organId} + left join order_item oi on op.order_id = oi.order_id and op.id = oi.plate_id and oi.organ_id = #{organId} + left join order_plan_item opi on op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId} ${ew.customSqlSegment} @@ -193,9 +193,9 @@ og.brand as brand from orders o - left join order_goods og on o.organ_id = og.organ_id and o.id = og.order_id and og.organ_id = #{organId} - left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id and op.organ_id = #{organId} - left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId} + left join order_goods og on o.id = og.order_id and og.organ_id = #{organId} + left join order_plate op on og.order_id = op.order_id and og.id = op.goods_id and op.organ_id = #{organId} + left join order_plan_item opi on op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId} ${ew.customSqlSegment} @@ -221,10 +221,10 @@ og.order_id as orderId from orders o - left join order_goods og on o.organ_id = og.organ_id and o.id = og.order_id and og.organ_id = #{organId} - left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id and op.organ_id = #{organId} - left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id and oi.organ_id = #{organId} - left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId} + left join order_goods og on o.id = og.order_id and og.organ_id = #{organId} + left join order_plate op on og.order_id = op.order_id and og.id = op.goods_id and op.organ_id = #{organId} + left join order_item oi on op.order_id = oi.order_id and op.id = oi.plate_id and oi.organ_id = #{organId} + left join order_plan_item opi on op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId} ${ew.customSqlSegment}