修改组织管理员角色逻辑

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

@@ -12,7 +12,7 @@ import java.util.List;
 public class BlockPlaceMessage {
 
     @Schema(description = "自增板信息")
-    private String zzInfo;
+    private String incrInfo;
     @Schema(description = "大板ID")
     private Integer bi;
     @Schema(description = "小板号")

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

@@ -59,8 +59,8 @@ public class Material {
     private List<BlockPlaceMessage> blockPlaceMessageList;
     @Schema(description = "状态")
     private Integer state;
-    @Schema(description = "有波纹")
-    private Boolean hasWave;
+    @Schema(description = "有纹路")
+    private Boolean hasTexture;
     @Schema(description = "板材原宽")
     private Integer orgWidth;
     @Schema(description = "板材原长")
@@ -72,7 +72,7 @@ public class Material {
     @Schema(description = "预洗值")
     private Integer preCutValue;
     @Schema(description = "废料板列表")
-    private List<ScrapBoard> scrapBoardList;
+    private List<ScrapBoard> remainBoardList;
     @Schema(description = "是否辅助开料")
     private Boolean helpCut;
     @Schema(description = "同刀辅助 厚度")

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

@@ -18,8 +18,8 @@ public class UsedBoardMessage {
     private Integer l;
     @Schema(description = "余料板ID")
     private Integer si;
-    @Schema(description = "仓库号")
-    private String so;
+    /*@Schema(description = "仓库号")
+    private String so;*/
     @Schema(description = "余料板号,大板为空")
     private String no;
     @Schema(description = "RM")
@@ -27,9 +27,9 @@ public class UsedBoardMessage {
     @Schema(description = "是否锁定")
     private Boolean lK;
     @Schema(description = "余料母板")
-    private List<ScrapPt> scrapPtList;
+    private List<ScrapPt> remainPtList;
     @Schema(description = "余料空间")
-    private List<ScrapBlock> scrapBlocks;
+    private List<ScrapBlock> remainBlocks;
     @Schema(description = "左边不能加工区域，有造型")
     private Boolean le;
     @Schema(description = "右边不能加工区域，有造型")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java

@@ -257,6 +257,16 @@ public class OrderInputProcessor {
 
     }
 
+    /**
+     * 批量保存生产单小板五金数据
+     * @param rawGoodsDOS
+     * @param orderBodyDOS
+     * @param orderGroupDOS
+     * @param orderPartsDOS
+     * @param plateDOS
+     * @param orderModuleExtraDOS
+     * @param itemDOS
+     */
     @Transactional
     public void batchInsert(Collection<RawGoodsDO> rawGoodsDOS, Collection<OrderBodyDO> orderBodyDOS,
                             Collection<OrderGroupDO> orderGroupDOS, Collection<OrderPartsDO> orderPartsDOS,
@@ -270,5 +280,15 @@ public class OrderInputProcessor {
         orderItemMapper.insertBatch(itemDOS);
     }
 
+    /**
+     * 保存生产单造型数据
+     * @param sourceList
+     * @param orderId
+     */
+    public void saveModel(List<Detail> sourceList, Long orderId) {
+
+
+    }
+
 
 }