小板信息增加字段：侧面造型，二维/侧面二维 刀路

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/Assert/AssertUtils.java

@@ -38,6 +38,11 @@ public class AssertUtils {
         }
     }
 
+    public static void empty(Object object, ErrorCode errorCode) {
+        if (object != null) {
+            throw exception(errorCode);
+        }
+    }
 
     public static void notEmpty(Object object, ErrorCode errorCode) {
         if (object == null) {

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java

@@ -83,8 +83,8 @@ public class PlateDetailsRespVO {
     @ExcelProperty("异形")
     private Boolean specialShaped;
 
-    @Schema(description = "造型", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "正反面造型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("造型")
+    @ExcelProperty("正反面造型")
     private Boolean profiling;
 
     @Schema(description = "排孔", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -115,6 +115,20 @@ public class PlateDetailsRespVO {
     private String openDoorType;
 
 
+    @Schema(description = "是否侧面造型")
+    @ExcelProperty("是否侧面造型")
+    private Boolean isSideSculpt;
+
+
+    @Schema(description = "是否二维刀路")
+    @ExcelProperty("是否二维刀路")
+    private Boolean is2v;
+
+
+    @Schema(description = "是否侧面二维刀路")
+    @ExcelProperty("是否侧面二维刀路")
+    private Boolean isSide2v;
+
 
     @Schema(description = "加工组名称集合")
     private List<GroupNameList> processGroupNameList;

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

@@ -189,7 +189,6 @@ public class PlanController {
     @PostMapping("getPlanGoodsList")
     @Operation(summary = "未排单混单获取分类的排单信息")
     @OperateLog(enable = false)
-//    @PreAuthorize("@ss.hasPermission('manage:un-order-olan:create')")
     public CommonResult<List<PlanActualGoodsResp>> getPlanGoodsList(@Valid @RequestBody SavePlanPlateList savePlanPlateList) {
 
         return success(planService.getPlanGoodsList(savePlanPlateList));

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

@@ -160,10 +160,6 @@ public class PlateDetailRespVO {
     private Long moduleTypeId;
 
 
-    @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Boolean isSculpt;
-
-
     @Schema(description = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private String filterType;
 
@@ -192,7 +188,6 @@ public class PlateDetailRespVO {
     private String processGroupName;
 
 
-
     @Schema(description = "开门类型，0 无 1 左 2 右 3 上 4 下", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private Integer openDoorType;
 
@@ -201,6 +196,22 @@ public class PlateDetailRespVO {
     private Boolean  hasHole;
 
 
+    @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean isSculpt;
+
+
+    @Schema(description = "是否侧面造型")
+    private Boolean isSideSculpt;
+
+
+    @Schema(description = "是否二维刀路")
+    private Boolean is2v;
+
+
+    @Schema(description = "是否侧面二维刀路")
+    private Boolean isSide2v;
+
+
     // 加工组ID和名称
     @Schema(description = "加工组名称", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<ProcessGroupList> processGroupLists;

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

@@ -66,6 +66,14 @@ public class PlateResList {
     private String remark;
 
 
+    @Schema(description = "是否侧面造型")
+    private Boolean isSideSculpt;
+    @Schema(description = "是否二维刀路")
+    private Boolean is2v;
+    @Schema(description = "是否侧面二维刀路")
+    private Boolean isSide2v;
+
+
     @Schema(description = "大板号")
     private Integer boardId;
     @Schema(description = "开料序")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java

@@ -22,8 +22,7 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 public class OrderModelDO extends ESDocument {
-    /*@Schema(description = "组织id")
+
-    private Long organId;*/
     @Schema(description = "生产单id")
     private Long orderId;
     @Schema(description = "小板id")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/elasticsearch/EsUtils.java

@@ -448,6 +448,62 @@ public class EsUtils {
 
 
 
+    
+    // scroll 游标查询，目前仅用于查询造型数据
+    public <T> List<T> getEsDocumentByScroll(String filedName, List<Long> values,Integer size, String index, Class<T> targetClass){
+
+        // scroll 保持游标有效时间
+        final String scrollTime = "1m";
+
+        List<T> result = new ArrayList<>();
+
+        List<FieldValue> fieldValues = values.stream().map(FieldValue::of).toList();
+
+        String scrollId = null;
+
+        try {
+
+            // 执行第一次搜索，开启 scroll
+            SearchResponse<T> searchResponse = elasticsearchClient.search(s -> s
+                            .index(index)
+                            .scroll(Time.of(t -> t.time(scrollTime)))
+                            .size(size)
+                            .query(q->q.bool(b->b.filter(f->f.terms(te->te.field(filedName).terms(v->v.value(fieldValues)))))),
+                    targetClass
+            );
+
+
+            scrollId = searchResponse.scrollId();
+            List<Hit<T>> hits = searchResponse.hits().hits();
+            hits.forEach(hit -> result.add(hit.source()));
+
+            // 循环 scroll 拉取剩余数据
+            while (!hits.isEmpty()) {
+                String finalScrollId = scrollId;
+                ScrollResponse<T> scrollResponse = elasticsearchClient.scroll(s -> s
+                        .scrollId(finalScrollId)
+                        .scroll(Time.of(t -> t.time(scrollTime))), targetClass);
+
+                scrollId = scrollResponse.scrollId();
+                hits = scrollResponse.hits().hits();
+
+                if (!hits.isEmpty()) {
+                    hits.forEach(hit -> result.add(hit.source()));
+                }
+            }
+
+            return result;
+
+        }catch (IOException | ElasticsearchException e){
+            log.error(e.getMessage());
+            throw new ServiceException(DATA_DATA_ERROR);
+        }finally {
+            // 清理 scroll
+            clearScroll(scrollId);
+        }
+
+    }
+
 
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml

@@ -119,7 +119,10 @@
                         oi.room_id,
                         oi.body_id,
                         ob.name as bodyName,
-                        ob.room_name as roomName
+                        ob.room_name as roomName,
+                        op.is_side_sculpt as isSideSculpt,
+                        op.is_2v as is2v,
+                        op.is_side_2v as isSide2v
 
         from order_plan_item opi
                  join order_goods og on opi.order_id = og.order_id and opi.goods_id = og.id
@@ -366,6 +369,10 @@
         <result property="roomName" column="roomName"/>
         <result property="hasHole" column="hasHole"/>
 
+        <result property="isSideSculpt" column="isSideSculpt"/>
+        <result property="is2v" column="is2v"/>
+        <result property="isSide2v" column="isSide2v"/>
+
         <collection property="processGroupLists" javaType="java.util.List"   ofType="com.cf.imes.module.executor.controller.admin.plan.bo.ProcessGroupList"  >
 
             <result property="groupId" column="groupId"/>
@@ -432,7 +439,10 @@
             op.remark as remark,
             op.filter_type as filterType,
             op.is_cancel as isCancel,
-            op.is_row_hole as  hasHole
+            op.is_row_hole as  hasHole,
+            op.is_side_sculpt as isSideSculpt,
+            op.is_2v as is2v,
+            op.is_side_2v as isSide2v
 
         from order_plan_item opi
                   join order_plate op on opi.organ_id = op.organ_id and opi.order_id = op.order_id and opi.plate_id = op.id

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -72,6 +72,10 @@
         <result property="roomName" column="roomName"/>
         <result property="hasHole" column="hasHole"/>
 
+        <result property="isSideSculpt" column="isSideSculpt"/>
+        <result property="is2v" column="is2v"/>
+        <result property="isSide2v" column="isSide2v"/>
+
         <collection property="processGroupLists" javaType="java.util.List"   ofType="com.cf.imes.module.executor.controller.admin.plan.bo.ProcessGroupList"  >
 
             <result property="groupId" column="groupId"/>
@@ -429,7 +433,10 @@
         op.remark as remark,
         op.filter_type as filterType,
         op.is_cancel as isCancel,
-        op.is_row_hole as  hasHole
+        op.is_row_hole as  hasHole,
+        op.is_side_sculpt as isSideSculpt,
+        op.is_2v as is2v,
+        op.is_side_2v as isSide2v
 
         from order_plate op
             left join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
@@ -506,7 +513,10 @@
             op.remark as remark,
             op.filter_type as filterType,
             op.is_cancel as isCancel,
-            op.is_row_hole as  hasHole
+            op.is_row_hole as  hasHole,
+            op.is_side_sculpt as isSideSculpt,
+            op.is_2v as is2v,
+            op.is_side_2v as isSide2v
 
         from order_plate op
                  left join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
@@ -838,6 +848,10 @@
         <result property="holeArrange" column="holeArrange"/>
         <result property="openDoorType" column="openDoorType"/>
 
+        <result property="isSideSculpt" column="isSideSculpt"/>
+        <result property="is2v" column="is2v"/>
+        <result property="isSide2v" column="isSide2v"/>
+
         <collection property="processGroupNameList" javaType="java.util.List"  ofType="com.cf.imes.module.executor.controller.admin.manage.pack.vo.GroupNameList">
             <result property="name" column="name"/>
         </collection>
@@ -871,7 +885,10 @@
             op.is_row_hole as rowHole,
             op.hole_face as holeFace,
             op.hole_arrange as holeArrange,
-            op.open_door_type as openDoorType
+            op.open_door_type as openDoorType,
+            op.is_side_sculpt as isSideSculpt,
+            op.is_2v as is2v,
+            op.is_side_2v as isSide2v
 
         from order_plate op
                  left join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
@@ -913,7 +930,10 @@
         op.is_row_hole as rowHole,
         op.hole_face as holeFace,
         op.hole_arrange as holeArrange,
-        op.open_door_type as openDoorType
+        op.open_door_type as openDoorType,
+        op.is_side_sculpt as isSideSculpt,
+        op.is_2v as is2v,
+        op.is_side_2v as isSide2v
 
         from order_plate op
         left join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/menu/MenuRespVO.java

@@ -63,6 +63,9 @@ public class MenuRespVO {
     @Schema(description = "是否总是显示", example = "false")
     private Boolean alwaysShow;
 
+    @Schema(description = "权限功能描述")
+    private String description;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java

@@ -71,4 +71,7 @@ public class MenuSaveVO {
     @Schema(description = "是否总是显示", example = "false")
     private Boolean alwaysShow;
 
+    @Schema(description = "权限功能描述")
+    private String description;
+
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/permission/MenuDO.java

@@ -106,5 +106,11 @@ public class MenuDO extends BaseDO {
      * 如果为 false 时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单
      */
     private Boolean alwaysShow;
+    /**
+     * 权限功能描述
+     *
+     */
+    private String description;
+
 
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/job/demo/DemoJob.java

@@ -1,7 +1,5 @@
 package com.cf.imes.module.system.job.demo;
 
-import com.cf.imes.framework.organ.core.job.OrganJob;
-/*import com.xxl.job.core.handler.annotation.XxlJob;*/
 import org.springframework.stereotype.Component;
 
 @Component

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/tokenconfig/TokenConfigServiceImpl.java

@@ -349,11 +349,4 @@ public class TokenConfigServiceImpl implements TokenConfigService{
 
 
 
-//    // 安全密钥生成
-//    public static String generateSecureSecretKey() {
-//        SecretKey key = Keys.secretKeyFor(SignatureAlgorithm.HS256);
-//        return Base64.getEncoder().encodeToString(key.getEncoded());
-//    }
-
-
 }