From 38a41b12489d220df27434c0be545ecf8a3f4d12 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 11 Mar 2025 16:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=B7=E5=8D=95=E5=A4=A7=E6=9D=BF=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=9F=A5=E8=AF=A2-=E5=95=86=E5=93=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E5=93=81=E7=89=8C=E6=97=A0=E6=B3=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plate/vo/GoodsPlateFilterPageReqVO.java | 5 +++- .../dal/mysql/plate/PlateGoodMapper.java | 5 ++-- .../service/plate/PlateServiceImpl.java | 29 +------------------ 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/GoodsPlateFilterPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/GoodsPlateFilterPageReqVO.java index 8c8d87ca5..36be3c9ce 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/GoodsPlateFilterPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/GoodsPlateFilterPageReqVO.java @@ -40,12 +40,15 @@ public class GoodsPlateFilterPageReqVO extends PageParam { private String color; + @Schema(description = "品牌") + private String brand; + @Schema(description = "大板的实际ID") private String goodsIds; @Schema(description = "商品名称") - private String goodsName; + private String name; @Schema(description = "选择实际板材的颜色字段") private String filterColor; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java index 5054cf0eb..3045628ed 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateGoodMapper.java @@ -72,10 +72,11 @@ public interface PlateGoodMapper extends BaseMapperX { .eq(PlateGoodDO::getOrganId,organId) .eq(PlateGoodDO::getDeleted,false) .likeIfPresent(PlateGoodDO::getGoodsId,pageReqVO.getGoodsIds()) - .likeIfPresent(PlateGoodDO::getGoodsName,pageReqVO.getGoodsName()) + .likeIfPresent(PlateGoodDO::getGoodsName,pageReqVO.getName()) .eqIfPresent(PlateGoodDO::getThickness, pageReqVO.getThickness()) .eqIfPresent(PlateGoodDO::getMaterial, pageReqVO.getMaterial()) - .eqIfPresent(PlateGoodDO::getColor, pageReqVO.getColor()) + .likeIfPresent(PlateGoodDO::getColor, pageReqVO.getColor()) + .likeIfPresent(PlateGoodDO::getBrand,pageReqVO.getBrand()) .eqIfPresent(PlateGoodDO::getTexture,pageReqVO.getTexture()) .likeIfPresent(PlateGoodDO::getSpec,pageReqVO.getSpec()) .likeIfPresent(PlateGoodDO::getColor,pageReqVO.getFilterColor()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 1bb77c68e..8b11b6898 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -247,18 +247,12 @@ public class PlateServiceImpl implements PlateService { // 查询生产单下的大板,余料板，排单状态的信息 PlateDetailRespVO plateDetailRespVO = orderItemMapper.selectPlateNumList(reqVO.getOrderId(),getUserOrganId()); -// PlateDetailRespVO plateDetailRespVO = plateMapper.selectPlateNumList(reqVO); - plateDetailRespVO.setCompanyId(loginUser.getId()); -// PlateRespVO plateRespVO = BeanUtil.toBean(plateDetailRespVO, PlateRespVO.class); + plateDetailRespVO.setCompanyId(loginUser.getId()); // 查询生产单下的板材详细信息 List plateRespVOS = orderItemMapper.selectPlateList(reqVO,getUserOrganId()); -// List plateRespVOS2 = plateRespVOS -// .stream() -// .map(item -> BeanUtil.toBean(plateDetailRespVO, PlateRespVO.class)) -// .collect(Collectors.toList()); // 将大板等信息循环插入 for (PlateRespVO respVO : plateRespVOS) { @@ -282,27 +276,6 @@ public class PlateServiceImpl implements PlateService { @Override public PageResult getGoodsPlate(GoodsPlateFilterPageReqVO pageReqVO) { -// PlanDO planDO = planMapper.selectById(pageReqVO.getPlanId()); -// -// AssertUtils.notEmpty(planDO,PLAN_NOT_EXISTS); -// -// if(planDO.getStatus().equals(PlanStatusEnum.OPENED.getStatus())){ -// throw exception(THIS_PLAN_PLATE_OPTIMIZE_IS_ALL); -// } -// -// -// if (planDO.getType().equals(PlanTypeEnum.MIXEDORDERPLAN.getType())) { -// -// pageReqVO.setColor(null); -// -// } -// -// -// if(planDO.getType().equals(PlanTypeEnum.ORDERPLAN.getType()) && pageReqVO.getFilterColor() != null){ -// throw exception(PLAN_GOODS_IS_FILTER_DATA_ERROR); -// -// } - return plateGoodMapper.selectGoodsPage(pageReqVO, getUserOrganId()); }