组织机台授权新增最大数量异常信息提示，排单优化生产ES数据结构余料新增品牌等信息

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

@@ -45,7 +45,7 @@ public class RemainBoardList {
 
 
     @Schema(description = "纹路 纹路(0正纹1可翻转2反纹)")
-    private Integer texture;
+    private Boolean texture;
 
 
 
@@ -53,4 +53,17 @@ public class RemainBoardList {
     private Boolean isHandAdd;
 
 
+    @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String brand;
+
+
+    @Schema(description = "仓库", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String store;
+
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String remark;
+
+
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -170,6 +170,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
         OptimizeBoardModelDO optimizeBoardModelDO = optimizeBoardModelDOS.get(0);
 
+        if(!optimizeBoardModelDO.getIsOptimized()){
+
+            throw exception(ORDER_PLAN_NO_OPTIMIZE_ERROR);
+
+        }
+
+
         List<Long> plateNo = new ArrayList<>();
 
         // 创建一个列表存储 BlockPlaceInfo 对象,将优化的小板信息拿出，获取到小板编号，查询生产单，修改生产单的状态
@@ -288,6 +295,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
         OptimizeBoardModelDO optimizeBoardModelDO = optimizeBoardModelDOS.get(0);
 
+        if(!optimizeBoardModelDO.getIsOptimized()){
+
+            throw exception(ORDER_PLAN_NO_OPTIMIZE_UPDATE_ERROR);
+
+        }
+
+
         CutedBoardInfo cutedBoardInfo = optimizeBoardModelDO.getCutedBoardInfo() == null ? new CutedBoardInfo() : optimizeBoardModelDO.getCutedBoardInfo();
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml

@@ -44,8 +44,8 @@
             o.status as status
 
         from orders o
-            STRAIGHT_JOIN order_goods og on o.organ_id = og.organ_id  and o.id = og.order_id and og.plan_id = 0  and o.deleted = og.deleted
-            STRAIGHT_JOIN order_plate op on o.organ_id = op.organ_id  and o.deleted = op.deleted and o.id = op.order_id and op.is_optimized = false and og.id = op.goods_id
+                 join order_goods og on o.organ_id = og.organ_id  and o.id = og.order_id and og.plan_id = 0  and o.deleted = og.deleted
+                 join order_plate op on o.organ_id = op.organ_id  and o.deleted = op.deleted and o.id = op.order_id and op.is_optimized = false and og.id = op.goods_id
 
         ${ew.customSqlSegment}
 
@@ -240,8 +240,6 @@
 
         select distinct
 
---             og.order_id as orderId,
---             og.id as id,
             og.goods_id as goodsId,
 
             og.goods_name,