From 62ec2c105ab57b72e36d11acb58f2b38f3152bed Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 29 May 2024 14:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E6=8E=A5=E5=8F=A3=20-=20bug?= =?UTF-8?q?=E5=92=8C=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/vo/PlateResList.java | 6 ++++-- .../executor/dal/mysql/plan/PlanMapper.java | 16 ++++++++-------- .../optimizeplan/OptimizePlanServiceImpl.java | 8 ++++++-- .../executor/service/plan/PlanServiceImpl.java | 11 +---------- .../main/resources/mapper/plate/PlateMapper.xml | 9 +++++---- .../admin/machine/MachineController.java | 8 ++++---- .../admin/machine/vo/MachineSimpleRespVO.java | 4 ++++ .../system/service/machine/MachineService.java | 4 ++-- .../service/machine/MachineServiceImpl.java | 10 ++++++---- 9 files changed, 40 insertions(+), 36 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java index 31d30c34c..967668035 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java @@ -29,7 +29,9 @@ public class PlateResList { @Schema(description = "商品厚") private String thickness; @Schema(description = "是否异形") - private Boolean specialShaped; + private Boolean isSpecialShaped; @Schema(description = "是否造型") - private Boolean sculpt; + private Boolean isSculpt; + @Schema(description = "材质") + private String material; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java index ee250e902..c8a83a1e1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java @@ -59,8 +59,8 @@ public interface PlanMapper extends BaseMapperX { .betweenIfPresent(PlanDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(PlanDO::getOperator, reqVO.getOperator()) .betweenIfPresent(PlanDO::getProduceTime, reqVO.getProduceTime()) - .orderByAsc(PlanDO::getSort) - .orderByDesc(PlanDO::getId)); + .orderByDesc(PlanDO::getSort)); +// .orderByDesc(PlanDO::getId)); } List selectPlateListByPlanId(Long planId); @@ -68,10 +68,10 @@ public interface PlanMapper extends BaseMapperX { OptimizeParamRespVO getOptimizePlanParam(Long planId); - - default PlanDO selectByOrderId(Long orderId) { - return selectOne(new MPJLambdaWrapperX() - .like(PlanDO::getOrderNos, orderId)); - - } +// +// default PlanDO selectByOrderId(Long orderId) { +// return selectOne(new MPJLambdaWrapperX() +// .like(PlanDO::getOrderNos, orderId)); +// +// } } \ No newline at end of file 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 0a71db923..115446e50 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 @@ -41,6 +41,7 @@ import com.cf.imes.module.infra.api.file.FileApi; import com.cf.imes.module.infra.api.file.dto.FileCreateReqDTO; import com.cf.imes.module.system.api.dataSource.DataSourceApi; import com.cf.imes.module.system.api.machine.MachineApi; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -106,6 +107,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Resource private MachineApi machineApi; + @Resource + private ESDocumentService esDocumentService; + @Override public List getPlateListByPlanId(Long planId) { return planMapper.selectPlateListByPlanId(planId); @@ -318,7 +322,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { .eq(GoodsDO::getOrderId, orderId) ); - PlanDO planDO = planMapper.selectByOrderId(orderId); +// PlanDO planDO = planMapper.selectByOrderId(orderId); List plateDOS = plateMapper.selectPlateDetialList(orderId); @@ -327,7 +331,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL,size); orderSource.setOptimizePlateDetialRespVO(optimizePlateDetialRespVO); - orderSource.setPlan(planDO); +// orderSource.setPlan(planDO); orderSource.setOrderList(Collections.singletonList(orderDO)); orderSource.setPlateList(plateDOS); orderSource.setGoodsList(goodsDOS); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index d22a6b1d3..56cf8b5c5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -407,22 +407,13 @@ public class PlanServiceImpl implements PlanService { PageDTO page = new PageDTO<>(vo.getPageNo(), vo.getPageSize()); IPage pageResult = plateMapper.selectPlateByPlanId(page, queryWrapperX); Set bodyIds = pageResult.getRecords().stream().map(PlateResList::getBodyId).collect(Collectors.toSet()); - Set roomIds = pageResult.getRecords().stream().map(PlateResList::getRoomId).collect(Collectors.toSet()); if (CollectionUtil.isNotEmpty(bodyIds)) { List orderBodyDOS = orderBodyMapper.selectBatchIds(bodyIds); for (PlateResList resList : pageResult.getRecords()) { resList.setBodyName(orderBodyDOS.stream().filter(e -> Objects.equals(e.getId(), resList.getBodyId())).map(OrderBodyDO::getName).findAny().orElse(null)); - resList.setRoomName(orderBodyDOS.stream().filter(e -> Objects.equals(e.getId(), resList.getRoomId())).map(OrderBodyDO::getRoomName).findAny().orElse(null)); + resList.setRoomName(orderBodyDOS.stream().filter(e -> Objects.equals(e.getRoomId(), resList.getRoomId())).map(OrderBodyDO::getRoomName).findAny().orElse(null)); } } - //todo 获取柜体名称，房间名称 - /* List moduleDOS = moduleMapper.selectList(new LambdaQueryWrapperX().in(ModuleDO::getId, bodyIds).eq(ModuleDO::getType, 2) - .or().in(ModuleDO::getId, roomIds).eq(ModuleDO::getType, 1) - ); - for (PlateResList resList : list) { - resList.setBodyName(moduleDOS.stream().filter(e -> Objects.equals(e.getId(), resList.getBodyId())).map(ModuleDO::getName).findAny().orElse(null)); - resList.setRoomName(moduleDOS.stream().filter(e -> Objects.equals(e.getId(), resList.getRoomId())).map(ModuleDO::getName).findAny().orElse(null)); - }*/ return new PageResult<>(pageResult.getRecords(), pageResult.getTotal()); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index 65e6f2e70..22fc103cb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -29,25 +29,26 @@ from order_plate a LEFT JOIN order_item oi on a.id = oi.plate_id LEFT JOIN `order` b on a.order_id = b.id - LEFT JOIN order_goods c on a.goods_id = c.goods_id + LEFT JOIN order_goods c on a.goods_id = c.id a.is_cancel = 0 and a.order_id = #{orderId} - and c.goods_id = #{goodsId} + and c.id = #{goodsId} +