混单大板对应查询-商品名称，品牌无法查询修改

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;

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<PlateGoodDO> {
                 .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())

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<PlateRespVO> plateRespVOS = orderItemMapper.selectPlateList(reqVO,getUserOrganId());
 
-//        List<PlateRespVO> 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<PlateGoodDO> 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());
 
     }