From 29e1bbaae782c7d94761f8bf1fa99ec986ed3567 Mon Sep 17 00:00:00 2001 From: yangsb Date: Fri, 29 Mar 2024 15:01:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/OptimizePlanController.java | 4 ---- .../controller/admin/plan/dto/BlockPlaceMessage.java | 2 +- .../admin/plan/dto/{Metrial.java => Material.java} | 2 +- .../dto/{OrgPointDetail.java => OldPointDetail.java} | 2 +- .../dto/{OrgSizeOutOff.java => OldSizeOutOff.java} | 2 +- .../controller/admin/plan/dto/ScrapBoard.java | 2 +- .../controller/admin/plan/vo/OptimizeParamRespVO.java | 6 ++---- .../controller/admin/plate/vo/PlateDetailVO.java | 5 ++--- .../service/optimizeplan/OptimizePlanServiceImpl.java | 11 +++++------ .../mysql/machinetemplate/MachineTemplateMapper.java | 2 +- .../service/machine/MachineTemplateServiceImpl.java | 6 +++--- 11 files changed, 18 insertions(+), 26 deletions(-) rename cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/{Metrial.java => Material.java} (99%) rename cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/{OrgPointDetail.java => OldPointDetail.java} (94%) rename cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/{OrgSizeOutOff.java => OldSizeOutOff.java} (95%) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java index 54ba2ffc0..ada7f61f3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java @@ -1,12 +1,9 @@ package com.cf.imes.module.executor.controller.admin.plan; -import cn.hutool.core.util.RandomUtil; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial; import com.cf.imes.module.executor.controller.admin.plan.vo.*; import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService; -import com.cf.imes.module.executor.util.RandomUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; @@ -18,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import javax.validation.constraints.NotNull; -import java.util.ArrayList; import java.util.List; /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java index 53d5b287a..2133b01d3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java @@ -46,7 +46,7 @@ public class BlockPlaceMessage { @Schema(description = "点阵") private List points; @Schema(description = "原造型偏移信息") - private OrgSizeOutOff orgSizeOutOff; + private OldSizeOutOff olgSizeOutOff; @Schema(description = "尺寸扩展信息(造型)") private SizeOutOff sizeOutOff; @Schema(description = "跟优化位置 漂移多少?X") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Material.java similarity index 99% rename from cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java rename to cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Material.java index f3293a551..b25cdc051 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Material.java @@ -9,7 +9,7 @@ import java.util.List; * @author Beal */ @Data -public class Metrial { +public class Material { @Schema(description = "生产单id") private String orderId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgPointDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OldPointDetail.java similarity index 94% rename from cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgPointDetail.java rename to cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OldPointDetail.java index 8502cc558..e2269dc58 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgPointDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OldPointDetail.java @@ -9,7 +9,7 @@ import lombok.Data; * @date: 2024/3/22 17:00 */ @Data -public class OrgPointDetail { +public class OldPointDetail { @Schema(description = "点id") private Long pointId; @Schema(description = "x") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OldSizeOutOff.java similarity index 95% rename from cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java rename to cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OldSizeOutOff.java index c708de9a2..d83d54eb6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OldSizeOutOff.java @@ -7,7 +7,7 @@ import lombok.Data; * @author Beal */ @Data -public class OrgSizeOutOff { +public class OldSizeOutOff { private Integer left; private Integer right; private Integer upper; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java index 0bef0954b..1f2c159a9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java @@ -22,7 +22,7 @@ public class ScrapBoard { @Schema(description ="排单ID") private Long planId; @Schema(description ="源排单ID") - private Long orgPlanId; + private Long oldPlanId; @Schema(description ="未使用 = 0, 已使用 = 1") private Integer status; @Schema(description ="正面 = 0, 正面右转 = 1, 正面后转 = 2, 正面左转 = 3, 反面 = 4, 反面右转 = 5, 反面后转 = 6, 反面左转 = 7") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java index c3b9349cc..f087d6740 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java @@ -1,7 +1,6 @@ package com.cf.imes.module.executor.controller.admin.plan.vo; -import com.cf.imes.module.executor.controller.admin.goods.vo.GoodsRespVO; -import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial; +import com.cf.imes.module.executor.controller.admin.plan.dto.Material; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -10,7 +9,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -56,7 +54,7 @@ public class OptimizeParamRespVO { @Schema(description = "生产单列表") private List orderList; @Schema(description = "大板使用信息列表") - private List metrialList; + private List materialList; /*@Schema(description = "商品列表") private List goodsList;*/ @Schema(description = "小板列表") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java index 43c6780cd..f487ca817 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java @@ -1,7 +1,6 @@ package com.cf.imes.module.executor.controller.admin.plate.vo; import com.cf.imes.module.executor.controller.admin.plan.dto.*; -import com.cf.imes.module.executor.controller.admin.plan.vo.PlanOptimizeDataDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -31,8 +30,8 @@ public class PlateDetailVO { @Schema(description = "是否新版本") private Boolean newVersion; - @Schema(description = "org点详情列表") - private List orgPointDetailList; + @Schema(description = "原始点详情列表") + private List olgPointDetailList; @Schema(description = "开料尺寸") private KaiLiaoSize kaiLiaoSize; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index e90c10493..82306d87c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -1,12 +1,11 @@ package com.cf.imes.module.executor.service.optimizeplan; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX; -import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial; +import com.cf.imes.module.executor.controller.admin.plan.dto.Material; import com.cf.imes.module.executor.controller.admin.plan.vo.*; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailVO; import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; @@ -213,9 +212,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { return RandomUtils.randomPojo(OptimizeParamRespVO.class); } //暂时先mock - ArrayList list = new ArrayList<>(); - list.add(RandomUtils.randomPojo(Metrial.class)); - list.add(RandomUtils.randomPojo(Metrial.class)); + ArrayList list = new ArrayList<>(); + list.add(RandomUtils.randomPojo(Material.class)); + list.add(RandomUtils.randomPojo(Material.class)); ArrayList plateDetailVOS = new ArrayList<>(); plateDetailVOS.add(RandomUtils.randomPojo(PlateDetailVO.class)); plateDetailVOS.add(RandomUtils.randomPojo(PlateDetailVO.class)); @@ -223,7 +222,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { if( CollectionUtil.isNotEmpty(optimizePlanParam.getPlateList())) { optimizePlanParam.getPlateList().get(0).setPlateDetailList(plateDetailVOS); } - optimizePlanParam.setMetrialList(list); + optimizePlanParam.setMaterialList(list); return optimizePlanParam; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java index 34b63e578..55b09cbc8 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java @@ -26,7 +26,7 @@ public interface MachineTemplateMapper extends BaseMapperX { default PageResult selectPage(MachinePageReqVO reqVO, Collection ids) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(MachineTemplateDO::getMachineType, reqVO.getMachineType()) - .inIfPresent(MachineTemplateDO::getId, ids) + //.inIfPresent(MachineTemplateDO::getId, ids) .likeIfPresent(MachineTemplateDO::getName, reqVO.getName()) .betweenIfPresent(MachineTemplateDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(MachineTemplateDO::getCreateTime)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index 5c5ff3fcb..8e0d8afd4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -361,15 +361,15 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override public PageResult page(MachinePageReqVO pageParam) { - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + /* LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); List machineIds = userMachineMapper.selectList(new LambdaQueryWrapperX().eq(UserMachineDO::getUserId, loginUser.getId())) .stream() .map(e -> e.getMachineId()) .collect(Collectors.toList()); if(CollectionUtil.isEmpty(machineIds)) { return new PageResult<>(); - } - return machineTemplateMapper.selectPage(pageParam, machineIds); + }*/ + return machineTemplateMapper.selectPage(pageParam, new ArrayList<>()); }