齐套性功能校验处理

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/centralToolMagazine/service/impl/ToolManagementServiceImpl.java

@@ -212,9 +212,10 @@ public class ToolManagementServiceImpl extends SuperCacheServiceImpl<ToolManagem
                 resourceList.addAll(resourcelist);
 
                 List<BBomProcedureTool> toolList = bomProcedureToolService.list(Wraps.<BBomProcedureTool>lbQ().eq(BBomProcedureTool::getProcedureId,vo.getId()));
-                List<String> toolIdList = toolList.stream()
+                /*List<String> toolIdList = toolList.stream()
                         .map(BBomProcedureTool::getCuttingToolCategory)
-                        .collect(Collectors.toList());
+                        .collect(Collectors.toList()); */
+                List<String> toolIdList = Lists.newArrayList();
                 toolId.addAll(toolIdList);
             });
             if(CollectionUtil.isEmpty(toolId)){

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/cuttercategories/dao/CutterCategoriesMapper.java

@@ -1,17 +0,0 @@
-package com.github.zuihou.business.cuttercategories.dao;
-
-import com.github.zuihou.base.mapper.SuperMapper;
-import com.github.zuihou.business.cuttercategories.entity.CutterCategoriesEntity;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Project: imcs-admin-boot
- * @Package: com.github.zuihou.business.cuttercategories.dao
- * @Author: Lenovo
- * @Time: 2025 - 04 - 15 14 : 17
- * @Description:
- */
-
-@Repository
-public interface CutterCategoriesMapper extends SuperMapper<CutterCategoriesEntity> {
-}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/dao/CutterCategoriesMapper.java

@@ -0,0 +1,23 @@
+package com.github.zuihou.business.productionResourceCenter.dao;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.cuttercategories.entity.CutterCategories;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Project: imcs-admin-boot
+ * @Package: com.github.zuihou.business.cuttercategories.dao
+ * @Author: Lenovo
+ * @Time: 2025 - 04 - 15 14 : 17
+ * @Description:
+ */
+
+@Repository
+public interface CutterCategoriesMapper extends SuperMapper<CutterCategories> {
+
+    IPage<CutterCategories> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<CutterCategories> queryWrapper);
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/CutterCategoriesService.java

@@ -0,0 +1,13 @@
+package com.github.zuihou.business.productionResourceCenter.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.cuttercategories.entity.CutterCategories;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+
+
+public interface CutterCategoriesService extends SuperService<CutterCategories> {
+
+    IPage<CutterCategories> pageList(IPage page, LbqWrapper<CutterCategories> wrapper);
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/CutterCategoriesServiceImpl.java

@@ -0,0 +1,22 @@
+package com.github.zuihou.business.productionResourceCenter.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.productionResourceCenter.dao.CutterCategoriesMapper;
+import com.github.zuihou.business.cuttercategories.entity.CutterCategories;
+import com.github.zuihou.business.productionResourceCenter.service.CutterCategoriesService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+@Slf4j
+@Service
+public class CutterCategoriesServiceImpl extends SuperServiceImpl<CutterCategoriesMapper, CutterCategories> implements CutterCategoriesService {
+
+    @Override
+    public IPage<CutterCategories> pageList(IPage page, LbqWrapper<CutterCategories> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
+}

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/cuttercategories/CutterCategoriesMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.github.zuihou.business.cuttercategories.dao.CutterCategoriesMapper">
+<mapper namespace="com.github.zuihou.business.productionResourceCenter.dao.CutterCategoriesMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.github.zuihou.business.cuttercategories.entity.CutterCategoriesEntity">
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.cuttercategories.entity.CutterCategories">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="create_user" jdbcType="BIGINT" property="createUser"/>
@@ -24,5 +24,12 @@
         id,order_no,parts_no,procedure_no,program_name,cutter_t,cutter_name,cutter_specification,cutter_sort
     </sql>
 
+    <select id="pageList" parameterType="String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from (
+        SELECT a.* from imcs_cutter_categories a
+        ) s ${ew.customSqlSegment}
 
+    </select>
 </mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/CutterCategoriesController.java

@@ -0,0 +1,54 @@
+package com.github.zuihou.business.controller.productionReadyCenter;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.zuihou.base.R;
+import com.github.zuihou.base.controller.SuperSimpleController;
+import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.cuttercategories.entity.CutterCategories;
+import com.github.zuihou.business.productionResourceCenter.service.CutterCategoriesService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.log.annotation.SysLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/cutterCategory")
+@Api(value = "cutterCategory", tags = "刀具分组")
+@SysLog(enabled = true)
+public class CutterCategoriesController extends SuperSimpleController<CutterCategoriesService, CutterCategories> {
+
+    @Autowired
+    private CutterCategoriesService cutterCategoriesService;
+
+    @ApiOperation(value = "查询对话调度记录", notes = "查询对话调度记录")
+    @PostMapping("/page")
+    public R<IPage<CutterCategories>> page(@RequestBody @Validated PageParams<CutterCategories> params) {
+        IPage<CutterCategories> page = new Page<CutterCategories>(1L, 999L);
+        LbqWrapper<CutterCategories> lbqWrapper = new LbqWrapper<CutterCategories>();
+        Map<String, Object> map = BeanUtil.beanToMap(params.getModel());
+        if(map.containsKey("partsNo") && ObjectUtil.isNotEmpty(map.get("partsNo"))){
+            lbqWrapper.eq(CutterCategories::getPartsNo, map.get("partsNo").toString());
+        }
+        if(map.containsKey("procedureNo") && ObjectUtil.isNotEmpty(map.get("procedureNo"))){
+            lbqWrapper.eq(CutterCategories::getProcedureNo, map.get("procedureNo").toString());
+        }
+        lbqWrapper.orderByAsc(CutterCategories::getCutterSort);
+        cutterCategoriesService.pageList(page, lbqWrapper);
+        return this.success(page);
+    }
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/cuttercategories/entity/CutterCategoriesEntity.java → imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/cuttercategories/entity/CutterCategories.java

@@ -27,9 +27,9 @@ import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("imcs_cutter_categories")
-@ApiModel(value = "CutterCategoriesEntity", description = "订单刀具齐套检测")
+@ApiModel(value = "CutterCategories", description = "订单刀具齐套检测")
 @AllArgsConstructor
-public class CutterCategoriesEntity  extends Entity<Long> {
+public class CutterCategories  extends Entity<Long> {
 
     private static final long serialVersionUID = 1L;