diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java
index 1244d01..797f093 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java
@@ -5,14 +5,17 @@ import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO;
 import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity;
 import com.thing.common.orm.service.IBaseService;
 
+import java.util.LinkedHashMap;
+
 
 public interface CbamIndustryService extends IBaseService<CbamIndustryEntity> {
 
 
     CbamIndustryDTO findById(Long id);
 
-
     void saveEntity(CbamIndustryDTO dto);
 
+    LinkedHashMap<String, Object> validateMsg(Long hyId,Long startTime,Long endTime);
+
 
 }
diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java
index dbea3ab..82c3dac 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java
@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -84,4 +85,18 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl<CbamIndustryMapper,
             cbamMaterialService.saveBatch(ConvertUtils.sourceToTarget(cbamMaterialList, CbamMaterialEntity.class));
         }
     }
+
+    @Override
+    public LinkedHashMap<String, Object> validateMsg(Long hyId,Long startTime,Long endTime) {
+
+        LinkedHashMap<String, Object> resMap = new LinkedHashMap<>();
+        //1.所属行业不能为空，并且是行业字典的值
+
+
+
+
+
+
+        return null;
+    }
 }
diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java
index 47a6acd..4378349 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java
@@ -1,6 +1,7 @@
 package com.thing.cbam.dict.controller;
 
 import com.thing.cbam.dict.dto.CbamHsDictDTO;
+import com.thing.cbam.dict.dto.CbamProdProcessDictDTO;
 import com.thing.cbam.dict.service.CbamHsDictService;
 import com.thing.common.core.annotation.LogOperation;
 import com.thing.common.core.constants.Constant;
@@ -20,6 +21,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -86,6 +88,16 @@ public class CbamHsDictController {
         return new Result<>();
     }
 
+
+
+    @GetMapping("hs/{code}")
+    @Operation(summary="信息")
+    public Result<List<CbamHsDictDTO>> getByHsCode(@PathVariable("code") String code){
+        List<CbamHsDictDTO> cbamHsDictDTOS = cbamHsDictService.getByHsCode(code);
+        return new Result<List<CbamHsDictDTO>>().ok(cbamHsDictDTOS);
+    }
+
+
     /**
       *@GetMapping("export")
       *@Operation(summary="导出")
diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java
index 56635f1..2620c41 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java
@@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,6 +50,20 @@ public class CbamIndustryDictController {
         return new Result<PageData<CbamIndustryDictDTO>>().ok(page);
     }
 
+
+    @GetMapping("list")
+    @Operation(summary="列表")
+    @Parameters({
+            @Parameter(name = Constant.PAGE, description = "当前页码，从1开始",  required = true) ,
+            @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+            @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+            @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
+    })
+    public Result<List<CbamIndustryDictDTO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        List<CbamIndustryDictDTO> list = cbamIndustryDictService.listAs(params, CbamIndustryDictDTO.class);
+        return new Result<List<CbamIndustryDictDTO>>().ok(list);
+    }
+
     @GetMapping("{id}")
     @Operation(summary="信息")
     public Result<CbamIndustryDictDTO> get(@PathVariable("id") Long id){
diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java
index 9c02f8c..3e26251 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java
@@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -56,6 +57,33 @@ public class CbamProdProcessDictController {
         return new Result<CbamProdProcessDictDTO>().ok(data);
     }
 
+
+    @GetMapping("prod/{industryId}")
+    @Operation(summary="信息")
+    public Result<List<CbamProdProcessDictDTO>> getByIndustryId(@PathVariable("industryId") Long industryId){
+        List<CbamProdProcessDictDTO> cbamProdProcessDictDTOS = cbamProdProcessDictService.getByIndustryId(industryId);
+        return new Result<List<CbamProdProcessDictDTO>>().ok(cbamProdProcessDictDTOS);
+    }
+
+
+
+    @GetMapping("process/{prodId}")
+    @Operation(summary="信息")
+    public Result<List<CbamProdProcessDictDTO>> getByProdId(@PathVariable("prodId") Long prodId){
+        List<CbamProdProcessDictDTO> cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdId(prodId);
+        return new Result<List<CbamProdProcessDictDTO>>().ok(cbamProdProcessDictDTOS);
+    }
+
+
+
+    @PostMapping("process/list")
+    @Operation(summary="信息")
+    public Result<List<CbamProdProcessDictDTO>> getByProdIds(@RequestBody List<Long> prodIds){
+        List<CbamProdProcessDictDTO> cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdIds(prodIds);
+        return new Result<List<CbamProdProcessDictDTO>>().ok(cbamProdProcessDictDTOS);
+    }
+
+
     @PostMapping
     @Operation(summary="保存")
     @LogOperation("保存")
diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java
index 8e57db4..d1f16d5 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java
@@ -1,8 +1,11 @@
 package com.thing.cbam.dict.service;
 
+import com.thing.cbam.dict.dto.CbamHsDictDTO;
 import com.thing.cbam.dict.entity.CbamHsDictEntity;
 import com.thing.common.orm.service.IBaseService;
 
+import java.util.List;
+
 
 /**
  * hs字典表
@@ -12,4 +15,6 @@ import com.thing.common.orm.service.IBaseService;
  */
 public interface CbamHsDictService extends IBaseService<CbamHsDictEntity> {
 
+    List<CbamHsDictDTO> getByHsCode(String code);
+
 }
\ No newline at end of file
diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java
index 51d3591..de667b4 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java
@@ -1,7 +1,11 @@
 package com.thing.cbam.dict.service;
 
+import com.thing.cbam.dict.dto.CbamProdProcessDictDTO;
 import com.thing.cbam.dict.entity.CbamProdProcessDictEntity;
 import com.thing.common.orm.service.IBaseService;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
 
 
 /**
@@ -12,4 +16,12 @@ import com.thing.common.orm.service.IBaseService;
  */
 public interface CbamProdProcessDictService extends IBaseService<CbamProdProcessDictEntity> {
 
+
+    List<CbamProdProcessDictDTO> getByIndustryId(Long industryId);
+
+    List<CbamProdProcessDictDTO> getByProdId(Long prodId);
+
+    List<CbamProdProcessDictDTO> getByProdIds(List<Long> prodIds);
+
+
 }
\ No newline at end of file
diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java
index 90d64d4..a420963 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java
@@ -1,6 +1,7 @@
 package com.thing.cbam.dict.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.cbam.dict.dto.CbamHsDictDTO;
 import com.thing.cbam.dict.entity.CbamHsDictEntity;
 import com.thing.cbam.dict.mapper.CbamHsDictMapper;
 import com.thing.cbam.dict.service.CbamHsDictService;
@@ -8,6 +9,7 @@ import com.thing.common.orm.service.impl.BaseServiceImpl;
 
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,4 +28,8 @@ public class CbamHsDictServiceImpl extends BaseServiceImpl<CbamHsDictMapper, Cba
     }
 
 
+    @Override
+    public List<CbamHsDictDTO> getByHsCode(String code) {
+        return mapper.selectListByQueryAs(new QueryWrapper().eq(CbamHsDictEntity::getCode, code), CbamHsDictDTO.class);
+    }
 }
\ No newline at end of file
diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java
index ccf8cf0..ba33286 100644
--- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java
+++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java
@@ -1,29 +1,65 @@
 package com.thing.cbam.dict.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.cbam.dict.dto.CbamProdProcessDictDTO;
 import com.thing.cbam.dict.entity.CbamProdProcessDictEntity;
 import com.thing.cbam.dict.mapper.CbamProdProcessDictMapper;
 import com.thing.cbam.dict.service.CbamProdProcessDictService;
+import com.thing.common.core.constants.Constant;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 原料（生产过程）---工艺路线映射表
  *
- * @author xc 
+ * @author xc
  * @since 3.0 2024-11-29
  */
 @Service
 public class CbamProdProcessDictServiceImpl extends BaseServiceImpl<CbamProdProcessDictMapper, CbamProdProcessDictEntity> implements CbamProdProcessDictService {
 
     @Override
-    public QueryWrapper getWrapper(Map<String, Object> params){
+    public QueryWrapper getWrapper(Map<String, Object> params) {
         QueryWrapper wrapper = new QueryWrapper();
         return wrapper;
     }
 
 
+    @Override
+    public List<CbamProdProcessDictDTO> getByIndustryId(Long industryId) {
+        return getByIndustryIdAndType(industryId, null,"yl", Constant.ASC);
+    }
+
+    @Override
+    public List<CbamProdProcessDictDTO> getByProdId(Long prodId) {
+        return getByIndustryIdAndType(prodId, null,"gylx", Constant.ASC);
+    }
+
+    @Override
+    public List<CbamProdProcessDictDTO> getByProdIds(List<Long> prodIds) {
+        return getByIndustryIdAndType(null, prodIds,"gylx", Constant.ASC);
+    }
+
+
+    public List<CbamProdProcessDictDTO> getByIndustryIdAndType(Long pidId,List<Long> pidIds, String type, String order) {
+        boolean asc = true;
+        if (StringUtils.equalsIgnoreCase(Constant.DESC, order)) {
+            asc = false;
+        }
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .eq(CbamProdProcessDictEntity::getPidId, pidId, Objects::nonNull)
+                .eq(CbamProdProcessDictEntity::getPidId, pidIds, CollectionUtils::isNotEmpty)
+                .eq(CbamProdProcessDictEntity::getType, type)
+                .orderBy(CbamProdProcessDictEntity::getSort, asc);
+        return mapper.selectListByQueryAs(queryWrapper, CbamProdProcessDictDTO.class);
+    }
+
+
 }
\ No newline at end of file