diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java
index 82de38a7..ab5122d8 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java
@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * [作业中心] 实体类
@@ -146,7 +147,7 @@ public class WorkCenter extends BaseEntity {
 	 * 面积
 	 */
 	@Schema(description = "面积")
-	private Long area;
+	private BigDecimal area;
 	/**
 	 * 数量
 	 */
@@ -161,7 +162,7 @@ public class WorkCenter extends BaseEntity {
 	 * 饱和度
 	 */
 	@Schema(description = "饱和度")
-	private Long saturation;
+	private BigDecimal saturation;
 	/**
 	 * 是否检验-[0]:不需检验;[1]:需检验;
 	 */
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java
index 35b7894b..a904c34a 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.scheduling.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -34,6 +35,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.tenant.mp.TenantEntity;
 import java.io.Serial;
+import java.util.List;
 
 /**
  * 工艺能力 实体类
@@ -71,4 +73,7 @@ public class CraftAbilityEntity extends BaseEntity {
 	@Schema(description = "设备名称")
 	private Long bpsId;
 
+	@TableField(exist = false)
+	private List<Long> ids;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java
index 5770cdf0..1588a736 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java
@@ -25,13 +25,16 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
 import org.springblade.desk.basic.constant.BaseCol;
 import org.springblade.desk.basic.constant.BaseValue;
 import org.springblade.desk.basic.excel.PlatingExcel;
+import org.springblade.desk.basic.excel.PlatingSmallExcel;
 import org.springblade.desk.basic.pojo.entity.Plating;
+import org.springblade.desk.basic.pojo.entity.PlatingSmall;
 import org.springblade.desk.basic.pojo.vo.PlatingVO;
 import org.springblade.desk.basic.service.IPlatingService;
 import org.springblade.desk.basic.util.ExcelExtUtil;
@@ -40,6 +43,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -85,6 +89,10 @@ public class PlatingController extends BladeController {
     public R<IPage<PlatingVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> plating,
                                     Query query) {
         QueryWrapper<Plating> qw = Condition.getQueryWrapper(plating, Plating.class);
+        qw.like(plating.containsKey("configNo"), Plating.COL_CONFIG_NO, Func.toStr(plating.get("configNo")));
+        qw.eq(plating.containsKey("bcId"), Plating.COL_BC_ID, Func.toInt(plating.get("bcId")));
+        qw.like(plating.containsKey("plating"), Plating.COL_PLATING, Func.toStr(plating.get("plating")));
+
         qw.orderByAsc(BaseCol.ID);
         IPage<Plating> pages = service.page(Condition.getPage(query), qw);
         IPage<PlatingVO> pagesVO = PlatingWrapper.build().pageVO(pages);
@@ -247,13 +255,23 @@ public class PlatingController extends BladeController {
     @ApiOperationSupport(order = 72)
     @Operation(summary = "导入Excel", description = "MultipartFile")
     public R importExcel(@RequestParam("file") MultipartFile file) {
-        R checkR = ExcelExtUtil.importExcelCheck(file);
-        if (checkR != null) {
-            return checkR;
-        }
-        List<Plating> importList = ExcelUtil.read(
-                file, 0, 1, Plating.class
-        );
-        return R.status(service.saveBatch(importList));
+//        R checkR = ExcelExtUtil.importExcelCheck(file);
+//        if (checkR != null) {
+//            return checkR;
+//        }
+//        List<Plating> importList = ExcelUtil.read(
+//                file, 0, 1, Plating.class
+//        );
+//        return R.status(service.saveBatch(importList));
+
+        List<Plating> noticeList = new ArrayList<>();
+        List<PlatingExcel> list = ExcelUtil.read(file, PlatingExcel.class);
+        list.forEach(noticeExcel -> {
+
+            Plating notice = BeanUtil.copy(noticeExcel, Plating.class);
+            noticeList.add(notice);
+        });
+        return R.data(service.saveBatch(noticeList));
+
     }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java
index e17f96fc..944a8b66 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java
@@ -22,9 +22,11 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
+import org.springblade.desk.basic.excel.PlanAssignSteerExcel;
 import org.springblade.desk.basic.excel.PlatingSmallExcel;
 import org.springblade.desk.basic.pojo.entity.PlanAssignSteer;
 import org.springblade.desk.basic.pojo.entity.PlatingSmall;
@@ -36,6 +38,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -233,13 +236,22 @@ public class PlatingSmallController extends BladeController {
     @ApiOperationSupport(order = 72)
     @Operation(summary = "导入Excel", description = "MultipartFile")
     public R importExcel(@RequestParam("file") MultipartFile file) {
-        R checkR = ExcelExtUtil.importExcelCheck(file);
-        if (checkR != null) {
-            return checkR;
-        }
-        List<PlatingSmall> importList = ExcelUtil.read(
-                file, 0, 1, PlatingSmall.class
-        );
-        return R.status(service.saveBatch(importList));
+//        R checkR = ExcelExtUtil.importExcelCheck(file);
+//        if (checkR != null) {
+//            return checkR;
+//        }
+//        List<PlatingSmall> importList = ExcelUtil.read(
+//                file, 0, 1, PlatingSmall.class
+//        );
+//        return R.status(service.saveBatch(importList));
+
+        List<PlatingSmall> noticeList = new ArrayList<>();
+        List<PlatingSmallExcel> list = ExcelUtil.read(file, PlatingSmallExcel.class);
+        list.forEach(noticeExcel -> {
+
+            PlatingSmall notice = BeanUtil.copy(noticeExcel, PlatingSmall.class);
+            noticeList.add(notice);
+        });
+        return R.data(service.saveBatch(noticeList));
     }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java
index 60c532bc..55f0f2d9 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java
@@ -22,9 +22,11 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
+import org.springblade.desk.basic.excel.PlatingSmallExcel;
 import org.springblade.desk.basic.excel.ProdMarkExcel;
 import org.springblade.desk.basic.pojo.entity.PlatingSmall;
 import org.springblade.desk.basic.pojo.entity.ProdMark;
@@ -36,6 +38,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -84,6 +87,7 @@ public class ProdMarkController extends BladeController {
         QueryWrapper<ProdMark> qw = Condition.getQueryWrapper(prodMark, ProdMark.class);
         // 编码
         qw.like(prodMark.containsKey("code"), ProdMark.COL_CODE, Func.toStr(prodMark.get("code")));
+        qw.like(prodMark.containsKey("name"), ProdMark.COL_NAME, Func.toStr(prodMark.get("name")));
         IPage<ProdMark> pages = service.page(Condition.getPage(query), qw);
         IPage<ProdMarkVO> pagesVO = ProdMarkWrapper.build().pageVO(pages);
         pagesVO.getRecords()
@@ -230,13 +234,22 @@ public class ProdMarkController extends BladeController {
     @ApiOperationSupport(order = 72)
     @Operation(summary = "导入Excel", description = "MultipartFile")
     public R importExcel(@RequestParam("file") MultipartFile file) {
-        R checkR = ExcelExtUtil.importExcelCheck(file);
-        if (checkR != null) {
-            return checkR;
-        }
-        List<ProdMark> importList = ExcelUtil.read(
-                file, 0, 1, ProdMark.class
-        );
-        return R.status(service.saveBatch(importList));
+//        R checkR = ExcelExtUtil.importExcelCheck(file);
+//        if (checkR != null) {
+//            return checkR;
+//        }
+//        List<ProdMark> importList = ExcelUtil.read(
+//                file, 0, 1, ProdMark.class
+//        );
+//        return R.status(service.saveBatch(importList));
+
+        List<ProdMark> noticeList = new ArrayList<>();
+        List<ProdMarkExcel> list = ExcelUtil.read(file, ProdMarkExcel.class);
+        list.forEach(noticeExcel -> {
+
+            ProdMark notice = BeanUtil.copy(noticeExcel, ProdMark.class);
+            noticeList.add(notice);
+        });
+        return R.data(service.saveBatch(noticeList));
     }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java
index 9a3c8cd0..6a266145 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java
@@ -21,10 +21,13 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
+import org.springblade.desk.basic.excel.PlatingSmallExcel;
 import org.springblade.desk.basic.excel.TeamSetExcel;
+import org.springblade.desk.basic.pojo.entity.PlatingSmall;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.vo.TeamSetVO;
 import org.springblade.desk.basic.service.ITeamSetService;
@@ -34,6 +37,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -252,13 +256,22 @@ public class TeamSetController extends BladeController {
     @ApiOperationSupport(order = 72)
     @Operation(summary = "导入Excel", description = "MultipartFile")
     public R importExcel(@RequestParam("file") MultipartFile file) {
-        R checkR = ExcelExtUtil.importExcelCheck(file);
-        if (checkR != null) {
-            return checkR;
-        }
-        List<TeamSet> importList = ExcelUtil.read(
-                file, 0, 1, TeamSet.class
-        );
-        return R.status(service.saveBatch(importList));
+//        R checkR = ExcelExtUtil.importExcelCheck(file);
+//        if (checkR != null) {
+//            return checkR;
+//        }
+//        List<TeamSet> importList = ExcelUtil.read(
+//                file, 0, 1, TeamSet.class
+//        );
+//        return R.status(service.saveBatch(importList));
+
+        List<TeamSet> noticeList = new ArrayList<>();
+        List<TeamSetExcel> list = ExcelUtil.read(file, TeamSetExcel.class);
+        list.forEach(noticeExcel -> {
+
+            TeamSet notice = BeanUtil.copy(noticeExcel, TeamSet.class);
+            noticeList.add(notice);
+        });
+        return R.data(service.saveBatch(noticeList));
     }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java
index 353a8187..f540212a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java
@@ -25,6 +25,7 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
 import org.springblade.desk.basic.excel.WorkCenterExcel;
+import org.springblade.desk.basic.pojo.entity.PlatingSmall;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.basic.pojo.vo.WorkCenterVO;
 import org.springblade.desk.basic.service.IWorkCenterService;
@@ -77,6 +78,11 @@ public class WorkCenterController extends BladeController {
     public R<IPage<WorkCenterVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> workCenter,
                                        Query query) {
         QueryWrapper<WorkCenter> qw = Condition.getQueryWrapper(workCenter, WorkCenter.class);
+
+        qw.like(workCenter.containsKey("wcCode"), WorkCenter.COL_WC_CODE, Func.toStr(workCenter.get("wcCode")));
+        qw.like(workCenter.containsKey("wcName"), WorkCenter.COL_WC_NAME, Func.toInt(workCenter.get("wcName")));
+        qw.like(workCenter.containsKey("processes"), WorkCenter.COL_PROCESSES, Func.toInt(workCenter.get("processes")));
+
         IPage<WorkCenter> pages = service.page(Condition.getPage(query), qw);
         IPage<WorkCenterVO> pagesVO = WorkCenterWrapper.build().pageVO(pages);
         return R.data(pagesVO);
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java
index e093a085..840e452d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java
@@ -21,10 +21,13 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
+import org.springblade.desk.basic.excel.PlatingSmallExcel;
 import org.springblade.desk.basic.excel.WorkTankExcel;
+import org.springblade.desk.basic.pojo.entity.PlatingSmall;
 import org.springblade.desk.basic.pojo.entity.WorkTank;
 import org.springblade.desk.basic.pojo.vo.WorkTankVO;
 import org.springblade.desk.basic.service.IWorkTankService;
@@ -34,6 +37,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -220,13 +224,22 @@ public class WorkTankController extends BladeController {
     @ApiOperationSupport(order = 72)
     @Operation(summary = "导入Excel", description = "MultipartFile")
     public R importExcel(@RequestParam("file") MultipartFile file) {
-        R checkR = ExcelExtUtil.importExcelCheck(file);
-        if (checkR != null) {
-            return checkR;
-        }
-        List<WorkTank> importList = ExcelUtil.read(
-                file, 0, 1, WorkTank.class
-        );
-        return R.status(service.saveBatch(importList));
+//        R checkR = ExcelExtUtil.importExcelCheck(file);
+//        if (checkR != null) {
+//            return checkR;
+//        }
+//        List<WorkTank> importList = ExcelUtil.read(
+//                file, 0, 1, WorkTank.class
+//        );
+//        return R.status(service.saveBatch(importList));
+
+        List<WorkTank> noticeList = new ArrayList<>();
+        List<WorkTankExcel> list = ExcelUtil.read(file, WorkTankExcel.class);
+        list.forEach(noticeExcel -> {
+
+            WorkTank notice = BeanUtil.copy(noticeExcel, WorkTank.class);
+            noticeList.add(notice);
+        });
+        return R.data(service.saveBatch(noticeList));
     }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java
index 60f76b5e..38df3275 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java
@@ -41,13 +41,13 @@ public class PlatingSmallExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("日常规生产能力")
-	private BigDecimal capacity;
+	private Integer capacity;
 	/**
 	 * [作业中心]id
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("[作业中心]id")
-	private BigDecimal wcId;
+	private Long wcId;
 	/**
 	 * 排序
 	 */
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
index a299c76b..938b58fe 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
@@ -37,12 +37,17 @@ import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.basic.pojo.entity.CoatingThickness;
+import org.springblade.desk.basic.pojo.entity.PlatingSmall;
+import org.springblade.desk.basic.pojo.vo.PlatingSmallVO;
 import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
 import org.springblade.scheduling.scheduling.service.ICraftAbilityService;
 import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
 import org.springblade.scheduling.scheduling.wrapper.CraftAbilityWrapper;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -50,9 +55,13 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 工艺能力 控制器
@@ -85,8 +94,24 @@ public class CraftAbilityController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@Operation(summary = "分页", description  = "传入CraftAbility")
 	public R<IPage<CraftAbilityVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> craftAbility, Query query) {
-		IPage<CraftAbilityEntity> pages = craftAbilityService.page(Condition.getPage(query), Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class));
-		return R.data(CraftAbilityWrapper.build().pageVO(pages));
+
+
+		QueryWrapper<CraftAbilityEntity> qw = Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class);
+		// 名称
+		qw.like(craftAbility.containsKey("caName"), "CA_NAME", Func.toStr(craftAbility.get("caName")));
+		qw.eq(craftAbility.containsKey("caCode"), "CA_CODE", Func.toInt(craftAbility.get("caCode")));
+		qw.eq(craftAbility.containsKey("wtId"), "WT_ID", Func.toInt(craftAbility.get("wtId")));
+
+
+		IPage<CraftAbilityEntity> pages = craftAbilityService.page(Condition.getPage(query), qw);
+		IPage<CraftAbilityVO> pagesVO = CraftAbilityWrapper.build().pageVO(pages);
+		pagesVO.getRecords()
+				.stream()
+				.collect(Collectors.toList());
+		return R.data(pagesVO);
+
+//		IPage<CraftAbilityEntity> pages = craftAbilityService.page(Condition.getPage(query), Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class));
+//		return R.data(CraftAbilityWrapper.build().pageVO(pages));
 	}
 
 	/**
@@ -158,6 +183,51 @@ public class CraftAbilityController extends BladeController {
 		ExcelUtil.export(response, "工艺能力数据" + DateUtil.time(), "工艺能力数据表", list, CraftAbilityExcel.class);
 	}
 
+
+	@PostMapping("/submitBatWt")
+	@ApiOperationSupport(order = 51)
+	@Operation(summary = "批量维护厚度", description = "传入CoatingThickness List")
+	public R submitBatWt(@Valid @RequestBody CraftAbilityEntity mergeOne) {
+
+		List<Long> ids = mergeOne.getIds();
+		if(CollectionUtils.isEmpty(ids)){
+			return R.fail("数据为空");
+		}
+		for(Long id : ids){
+			CraftAbilityEntity one = craftAbilityService.getById(id);
+			one.setWtId(mergeOne.getWtId());
+			craftAbilityService.updateById(one);
+		}
+
+		return R.status(true);
+	}
+
+
+	@PostMapping("/importExcel")
+	@ApiOperationSupport(order = 72)
+	@Operation(summary = "导入Excel", description = "MultipartFile")
+	public R importExcel(@RequestParam("file") MultipartFile file) {
+//        R checkR = ExcelExtUtil.importExcelCheck(file);
+//        if (checkR != null) {
+//            return checkR;
+//        }
+//        List<PlatingSmall> importList = ExcelUtil.read(
+//                file, 0, 1, PlatingSmall.class
+//        );
+//        return R.status(service.saveBatch(importList));
+
+		List<CraftAbilityEntity> noticeList = new ArrayList<>();
+		List<CraftAbilityExcel> list = ExcelUtil.read(file, CraftAbilityExcel.class);
+		list.forEach(noticeExcel -> {
+
+			CraftAbilityEntity notice = BeanUtil.copy(noticeExcel, CraftAbilityEntity.class);
+			noticeList.add(notice);
+		});
+		return R.data(craftAbilityService.saveBatch(noticeList));
+	}
+
+
+
 	/**
 	 * 工艺能力表查询列表
 	 */
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/CraftAbilityExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/CraftAbilityExcel.java
index d579f3ba..bf05196d 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/CraftAbilityExcel.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/CraftAbilityExcel.java
@@ -63,19 +63,19 @@ public class CraftAbilityExcel implements Serializable {
 	 * 作业中心
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("作业中心")
+	@ExcelProperty("编码")
 	private String caCode;
 	/**
 	 * 设备编码
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("设备编码")
+	@ExcelProperty("名称")
 	private String caName;
 	/**
 	 * 设备分类
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("设备分类")
+	@ExcelProperty("能力类型")
 	private Long wtId;
 	/**
 	 * 设备名称