diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java
index 5221c9a49..29a61fb0e 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanSaveReqVO.java
@@ -52,6 +52,9 @@ public class PlanSaveReqVO {
     @Schema(description = "生产单id与商品id 列表",requiredMode = Schema.RequiredMode.REQUIRED)
     private List<Item> itemList;
 
+    @Schema(description = "商品数量")
+    private Long goodsNum;
+
     @Schema(description = "备注")
     private String remark;
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java
index 7dc39e75b..3e5084c9f 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java
@@ -15,7 +15,7 @@ public class PlatePage {
     @Schema(description = "生产单id")
     private Long orderId;
     @Schema(description = "商品id")
-    private String goodsId;
+    private Long goodsId;
     @Schema(description = "板名称")
     private String name;
     @Schema(description = "商品名称")
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 05955764b..953db9838 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
@@ -336,6 +336,7 @@
 
 
         select distinct b.id as orderId,
+                        c.id as goodsId,
                         c.width,
                         c.height,
                         c.thickness,
@@ -359,7 +360,7 @@
             #{orderIds}
         </foreach>
 
-        group by b.id ,c.goods_name,c.width,c.height,c.thickness, c.material, c.color;
+        group by c.id,b.id ,c.goods_name,c.width,c.height,c.thickness, c.material, c.color;
 
 
 
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
index 3cdc618b0..0faad6d24 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
@@ -20,20 +20,21 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
 
     default PageResult<RemainPlateDO> selectPage(RemainPlatePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<RemainPlateDO>()
-                .eqIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId())
+                .likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId().toString() : null)
+                .eqIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId().toString() : null)
                 .eqIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId())
                 .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId())
                 .eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting())
                 .likeIfPresent(RemainPlateDO::getName, reqVO.getName())
-                .eqIfPresent(RemainPlateDO::getMaterial, reqVO.getMaterial())
-                .eqIfPresent(RemainPlateDO::getColor, reqVO.getColor())
+                .likeIfPresent(RemainPlateDO::getMaterial, reqVO.getMaterial())
+                .likeIfPresent(RemainPlateDO::getColor, reqVO.getColor())
                 .eqIfPresent(RemainPlateDO::getThickness, reqVO.getThickness())
                 .eqIfPresent(RemainPlateDO::getBrand, reqVO.getBrand())
                 .eqIfPresent(RemainPlateDO::getPlaceStyle, reqVO.getPlaceStyle())
-                .eqIfPresent(RemainPlateDO::getStore, reqVO.getStore())
+                .likeIfPresent(RemainPlateDO::getStore, reqVO.getStore())
                 .eqIfPresent(RemainPlateDO::getCount, reqVO.getCount())
-                .eqIfPresent(RemainPlateDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(RemainPlateDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(RemainPlateDO::getUseType, reqVO.getUseType())
                 .eqIfPresent(RemainPlateDO::getOrganId, reqVO.getOrganId())
                 .eqIfPresent(RemainPlateDO::getOutLineJson, reqVO.getOutLineJson())