余料库逻辑修改，柜体删除修改1

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/GoodsIds.java

@@ -0,0 +1,25 @@
+package com.cf.imes.module.executor.controller.admin.plan.bo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Data
+
+public class GoodsIds {
+
+
+    @Schema(description = "大板ID")
+    private Long id;
+
+    @Schema(description = "生产单ID")
+    private Long orderId;
+
+    @Schema(description = "板材库的大板ID")
+    private Long goodsId;
+
+    @Schema(description = "余料板ID")
+    private Long remainId;
+
+}

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java

@@ -16,6 +16,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -40,6 +42,11 @@ public class OrderSource {
     @Schema(description = "排单数据")
     private PlanDO plan;
 
+
+    @Schema(description = "大板ID列表")
+    private List<GoodsIds> goodsIdList;
+
+
     @Schema(description = "生产单列表")
     private List<OrderDO> orderList;
 
@@ -61,4 +68,6 @@ public class OrderSource {
     private List<PrintOrderPackReqVO> orderPackReqVOS;
 
 
+
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java

@@ -32,8 +32,8 @@ public class OrderPageReqVOCopy extends PageParam {
     private String consigneeAddress;
     @Schema(description = "状态列表")
     private List<Integer> stateList;
-    /*@Schema(description = "矩形")
-    private Boolean rectangle;*/
+    @Schema(description = "矩形")
+    private Boolean rectangle;
     @Schema(description = "异形")
     private Boolean specialShaped;
     @Schema(description = "造型")

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;
 

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 = "商品名称")

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;