diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
index 83e6bdc6..2397f861 100644
--- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
+++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
@@ -14,9 +14,9 @@ public interface LauncherConstant {
      */
 //	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 	// 生产环境
-	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 	// 测试环境
-//	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
+	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 
     /**
      * nacos 用户名
@@ -134,6 +134,12 @@ public interface LauncherConstant {
      */
     String APPLICATION_MONITOR_NAME = "blade-monitor";
 
+
+    /**
+     * 生产监控
+     */
+    String APPLICATION_ERP_DATA_NAME = "blade-erpData";
+
     /**
      * seata 服务组格式
      *
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java
index 10f502f2..cf1592b1 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java
@@ -42,4 +42,9 @@ public class DsTaskingDTO extends DsTaskingEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * taskId
+	 */
+	private String taskId;
+
 }
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java
index 81f00c7e..e3b6dd19 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java
@@ -59,6 +59,7 @@ public class DsBatchPreservePlanEntity extends BaseEntity {
 	 * 安排日期
 	 */
 	@Schema(description = "安排日期")
+
 	private Date arrangeTime;
 	/**
 	 * 维护内容
@@ -104,7 +105,7 @@ public class DsBatchPreservePlanEntity extends BaseEntity {
 	 * 规则类型
 	 */
 	@Schema(description = "规则类型")
-	private Long ruleType;
+	private Integer ruleType;
 	/**
 	 * 参数1
 	 */
@@ -140,16 +141,16 @@ public class DsBatchPreservePlanEntity extends BaseEntity {
 	private Integer cumulativeTriggerValue;
 
 	/**
-	 * 当前值（累计）
+	 * 当前值
 	 */
-	@Schema(description = "当前值（累计）")
+	@Schema(description = "当前值")
 	private Integer currentValue;
 
 	/**
 	 * 累计初始值
 	 */
 	@Schema(description = "累计初始值")
-	private Integer cumulativeInitialValue;
+	private String cumulativeInitialValue;
 
 	/**
 	 * 审核意见
@@ -157,4 +158,22 @@ public class DsBatchPreservePlanEntity extends BaseEntity {
 	@Schema(description = "审核意见")
 	private String approvalOpinion;
 
+	/**
+	 * 累计类状态 1.进行中 2.已完成
+	 */
+	@Schema(description = "累计类状态")
+	private Integer accumulatedStatus;
+
+	/**
+	 * 累计类有效期 1.长期 2.一次性
+	 */
+	@Schema(description = "累计类有效期")
+	private Integer periodOfValidity;
+
+	/**
+	 * 设备（外键）
+	 */
+	@Schema(description = "设备（外键）")
+	private Long device;
+
 }
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java
index 342cd334..f797f7d6 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java
@@ -246,7 +246,6 @@ public class DsPartEntity extends BaseEntity {
 	 * 零件类型
 	 */
 	@Schema(description = "零件类型")
-
 	private Integer sinTerType;
 
 	/**
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java
index 88571817..313885b1 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java
@@ -172,6 +172,11 @@ public class DsTaskingEntity extends BaseEntity {
 	@Schema(description = "返工单号")
 	private String reworkOrder;
 
+	/**
+	 * 接收时间
+	 */
+	@Schema(description = "接收时间")
+	private Date receptionTime;
 
 
 }
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 6ab9351d..0f3a8fd7 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -72,21 +72,21 @@
             <scope>compile</scope>
         </dependency>
         <!--老系统jar包-->
-        <dependency>
-            <groupId>com.videasoft</groupId>
-            <artifactId>vwebfrk-base</artifactId>
-            <version>1.4.6-RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.videasoft</groupId>-->
+<!--            <artifactId>vwebfrk-base</artifactId>-->
+<!--            <version>1.4.6-RELEASE</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
             <version>3.0.9</version> <!-- 使用最新的稳定版本 -->
         </dependency>
-        <dependency>
-            <groupId>com.videasoft.m3</groupId>
-            <artifactId>barbecue</artifactId>
-            <version>0.0.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.videasoft.m3</groupId>-->
+<!--            <artifactId>barbecue</artifactId>-->
+<!--            <version>0.0.1</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itext7-core</artifactId>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java
index 2d9a9f67..b1829413 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java
@@ -24,6 +24,38 @@ public  interface BatchConstant {
     Integer REGULAR_DEVICE = 4;
 
 
+    /** 槽液累计类规则类型*/
+    /**
+     * 电量差类
+     */
+    public static final Integer ELECTRICITY_DIFFERENCE = 1;
+
+    /**
+     * 累计电量类
+     */
+    public static final Integer CUMULATIVE_ELECTRICITY = 2;
+
+    /**
+     * 累计生产日期
+     */
+    public static final Integer CUMULATIVE_PRODUCTION_DAYS = 3;
+
+    /**
+     * 主盐添加量类
+     */
+    public static final Integer MAIN_SALT_ADDITION = 4;
+
+    /**
+     * 累计生产面积
+     */
+    public static final Integer CUMULATIVE_PRODUCTION_AREA = 5;
+
+    /**
+     * 累计主盐添加量
+     */
+    public static final Integer CUMULATIVE_MAIN_SALT_ADDITION = 6;
+
+
 
     /** 槽液检查任务状态*/
     /**
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java
index 00124b67..8b0ab673 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java
@@ -177,13 +177,12 @@ public class DsBatchPreservePlanController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@Operation(summary = "审批", description  = "")
 	public R factoryApproval() {
-		//todo 新增时没有向任务表中增加任务状态 是否更改
-		//todo 创建槽液精细化-计划类-任务发起任务定时器运行...
+		// 创建槽液精细化-计划类-任务发起任务定时器运行...
 		dsBatchPreservePlanService.createPlanClassTask();
-		//todo 创建槽液精细化-定期类-任务发起任务定时器运行
-		//todo 存在问题 查询3和4 没有时间限制 每天查询 每天新增
+		// 查询3和4 没有时间限制 每天查询 每天新增
+		//创建槽液精细化-定期类-任务发起任务定时器运行...
 		dsBatchPreservePlanService.createPeriodicalClassTask();
-		//todo 创建槽液精细化-累计类-任务发起任务定时器运行
+		// 创建槽液精细化-累计类-任务发起任务定时器运行...
 		dsBatchPreservePlanService.createAccumulateClassTask();
 		return R.status(true);
 	}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java
index c27bd77f..404c0ce2 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java
@@ -116,7 +116,8 @@ public class DsSimilarPartsController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入dsSimilarParts")
 	public R save(@Valid @RequestBody DsSimilarPartsEntity dsSimilarParts) {
-		return R.status(dsSimilarPartsService.save(dsSimilarParts));
+
+		return R.status(dsSimilarPartsService.saveSimilarParts(dsSimilarParts));
 	}
 
 	/**
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java
index 1545210e..f3d2912f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java
@@ -205,12 +205,12 @@ public class DsTaskingController extends BladeController {
 	/**
 	 * 任务接收
 	 */
-	@GetMapping("/taskReception")
+	@PostMapping("/taskReception")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "任务接收")
-	public R taskReception(  @RequestParam String taskIds) {
-		Long Id = Long.valueOf(taskIds);
-		return R.status(dsTaskingService.taskReception(Id));
+	public R taskReception(  @RequestBody DsTaskingDTO tasking) {
+		Long taskId = Long.valueOf(tasking.getTaskId());
+		return R.status(dsTaskingService.taskReception(taskId));
 	}
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml
index ad4bf526..db6e7b1a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml
@@ -30,6 +30,10 @@
         <result column="CUMULATIVE_TRIGGER_VALUE" property="cumulativeTriggerValue"/>
         <result column="CURRENT_VALUE" property="currentValue"/>
         <result column="CUMULATIVE_INITIAL_VALUE" property="cumulativeInitialValue"/>
+        <result column="APPROVAL_OPINION" property="approvalOpinion"/>
+        <result column="ACCUMULATED_STATUS" property="accumulatedStatus"/>
+        <result column="PERIOD_OF_VALIDITY" property="periodOfValidity"/>
+        <result column="DEVICE" property="device"/>
     </resultMap>
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml
index 374fceb3..a5c100da 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml
@@ -26,6 +26,7 @@
         <if test="dsBatchWorkCenterSet.wcId != null ">
             and WC_ID = #{dsBatchWorkCenterSet.wcId}
         </if>
+        order by update_time desc
     </select>
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java
index db2c6623..04f84faf 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java
@@ -60,4 +60,5 @@ public interface DsSimilarPartsMapper extends BaseMapper<DsSimilarPartsEntity> {
 	 */
 	List<DsSimilarPartsExcel> exportDsSimilarParts(@Param("ew") Wrapper<DsSimilarPartsEntity> queryWrapper);
 
+	DsSimilarPartsEntity selectByPartOneAndPartTwo(@Param("dsSimilarParts") DsSimilarPartsEntity dsSimilarParts);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java
index 162614ec..de10b0ef 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java
@@ -75,7 +75,7 @@ public interface DsTaskingMapper extends BaseMapper<DsTaskingEntity> {
 	 * @param dsTasking
 	 * @return
 	 */
-	List<DsTaskingVO> selectDisposeList(IPage<DsTaskingVO> page,  @Param("dsTasking")DsTaskingVO dsTasking);
+	List<DsTaskingVO> selectDisposeList(IPage<DsTaskingVO> page, @Param("dsTasking") DsTaskingVO dsTasking);
 
 	/**
 	 * 根据零件号 版本号 任务状态查询
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
index c2e1bf63..61735137 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
@@ -51,6 +51,7 @@
         <result column="STATUS" property="status"/>
         <result column="IS_DELETED" property="isDeleted"/>
         <result column="SIN_TER_TYPE" property="sinTerType"/>
+        <result column="QUOTA" property="quota"/>
         <result column="PLATE_TWO" property="plateTwo"/>
         <result column="PLATE_CODE_TWO" property="plateCodeTwo"/>
         <result column="AREA_TWO" property="areaTwo"/>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml
index 682fc630..2a994adf 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml
@@ -40,6 +40,7 @@
         <if test="dsProModel.name != null and dsProModel.name != ''">
             and name like concat(concat('%', #{dsProModel.name}), '%')
         </if>
+        order by update_time desc
 
     </select>
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml
index eafa12f3..ea70695c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml
@@ -32,5 +32,10 @@
     <select id="exportDsSimilarParts" resultType="org.springblade.desk.dashboard.excel.DsSimilarPartsExcel">
         SELECT * FROM DS_SIMILAR_PARTS ${ew.customSqlSegment}
     </select>
+    <select id="selectByPartOneAndPartTwo"
+            resultType="org.springblade.desk.dashboard.pojo.entity.DsSimilarPartsEntity">
+        select * from DS_SIMILAR_PARTS where is_deleted = 0
+        and PART_ONE = #{dsSimilarParts.partOne} and PART_TWO = #{dsSimilarParts.partTwo}
+    </select>
 
 </mapper>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml
index a27a26cd..c517893e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml
@@ -72,13 +72,16 @@
         <if test="dsTasking.partCode != null ">
             and PART_CODE = #{dsTasking.partCode}
         </if>
+        <if test="dsTasking.craftMan != null and dsTasking.craftMan != ''">
+            and CRAFT_MAN = #{dsTasking.craftMan}
+        </if>
         <if test="dsTasking.taskStatus == null and dsTasking.TaskStatusList != null">
             and TASK_STATUS in
             <foreach collection="dsTasking.TaskStatusList" item="taskStatus" open="(" close=")" separator=",">
                 #{taskStatus}
             </foreach>
         </if>
-        ORDER BY CREATE_TIME DESC
+        ORDER BY ASSIGN_TIME DESC
     </select>
 
     <select id="selectDsTaskingByPartCodeAndVersion"
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsSimilarPartsService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsSimilarPartsService.java
index 8c71be2e..d5039a5e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsSimilarPartsService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsSimilarPartsService.java
@@ -64,4 +64,11 @@ public interface IDsSimilarPartsService extends BaseService<DsSimilarPartsEntity
 	 * @return
 	 */
 	boolean importExcelSimple(List<DsSimilarPartsVO> list);
+
+	/**
+	 * 新增
+	 * @param dsSimilarParts
+	 * @return
+	 */
+    boolean saveSimilarParts(DsSimilarPartsEntity dsSimilarParts);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java
index 8b0a3987..153870cf 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java
@@ -191,13 +191,7 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 		DsBatchPreserveTaskEntity dsBatchPreserveTask = null;
 		if(!CollectionUtils.isEmpty(batchPreservePlanList)){
 			for (DsBatchPreservePlanEntity batchPreservePlan : batchPreservePlanList) {
-				// 先判断是否有上次触发时间 在判断是否符合触发条件，
-				if (batchPreservePlan.getLastTaskTime() != null) {
-					int days = (int) ((System.currentTimeMillis() - batchPreservePlan.getLastTaskTime().getTime()) / (1000 * 3600 * 24));
-					if (days >= batchPreservePlan.getFrequency()) {
-						this.createTask(batchPreservePlan, dsBatchPreserveTask);
-					}
-				}
+				this.createTask(batchPreservePlan, dsBatchPreserveTask);
 			}
 		}
 	}
@@ -209,6 +203,26 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 	 */
 	private void createTask(DsBatchPreservePlanEntity batchPreservePlan, DsBatchPreserveTaskEntity dsBatchPreserveTask) {
 
+		//电量差 （1）电量差：当前值为1天的电量（自动取数）≥累计触发值，触发任务需添加量
+		if(BatchConstant.ELECTRICITY_DIFFERENCE.equals(batchPreservePlan.getRuleType())){
+
+			//累计电量类 （2）累计电量：（当前日期的用电量-累计初始日期对应的用电量）≥累计触发值，触发任务需添加量
+		}else if(BatchConstant.CUMULATIVE_ELECTRICITY.equals(batchPreservePlan.getRuleType())){
+
+			//累计生产日期 （3）累计生产日期：当前日期-累计初始日期=累计触发值，触发任务需添加量
+		}else if(BatchConstant.CUMULATIVE_PRODUCTION_DAYS.equals(batchPreservePlan.getRuleType())){
+
+			//主盐添加量类 （4）累计生产面积：当前值为"累计初始值日期~当前日期"对应作业槽【浸保护剂】工序生产总面积≥累计触发值，触发任务需添加量
+		}else if(BatchConstant.MAIN_SALT_ADDITION.equals(batchPreservePlan.getRuleType())){
+
+			//累计生产面积 （5）主盐添加量：当前值为1天内【添加量填报】页面填报的作业槽添加量≥累计触发值，触发任务需添加量
+		}else if(BatchConstant.CUMULATIVE_PRODUCTION_AREA.equals(batchPreservePlan.getRuleType())){
+
+			//累计主盐添加量 （6）累计主盐添加量：当前值≥累计触发值（添加量），当前值为累计初始值日期开始在【添加量录入】页面填报的作业槽添加量总和
+		}else if(BatchConstant.CUMULATIVE_MAIN_SALT_ADDITION.equals(batchPreservePlan.getRuleType())){
+
+		}
+
 
 	}
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProModelServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProModelServiceImpl.java
index e77552e2..71a646fc 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProModelServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProModelServiceImpl.java
@@ -101,16 +101,25 @@ public class DsProModelServiceImpl extends BaseServiceImpl<DsProModelMapper, DsP
 		// 只复制相同字段名的属性
 		BeanUtils.copyProperties(dsProModelDetailListVO, entity);
 
+		entity.setProcessNum((long) dsProModelDetailListVO.getTableData().size());
+
 		//新增模版
-		save(entity);
+		boolean save = save(entity);
+		if(!save){
+			throw new ServiceException("工艺模版新增失败");
+		}
 		Long modelId = entity.getId();
 
 		List<DsProDetailEntity> tableData = dsProModelDetailListVO.getTableData();
 		for (DsProDetailEntity tableDatum : tableData) {
 			tableDatum.setModelId(modelId);
 		}
+		boolean saveBatch = proDetailService.saveBatch(tableData);
+		if(!saveBatch){
+			throw new ServiceException("工艺模版明细新增失败");
+		}
 
-		return proDetailService.saveBatch(tableData);
+		return true;
 	}
 
 	@Override
@@ -143,8 +152,13 @@ public class DsProModelServiceImpl extends BaseServiceImpl<DsProModelMapper, DsP
 		DsProModelDetailListVO dsProModelDetailListVO = JSONObject.toJavaObject(data, DsProModelDetailListVO.class);
 		DsProModelEntity entity = new DsProModelEntity();
 		BeanUtils.copyProperties(dsProModelDetailListVO, entity);
+		entity.setProcessNum((long) dsProModelDetailListVO.getTableData().size());
 		//修改模版
-		updateById(entity);
+		boolean update = updateById(entity);
+		if(!update){
+			throw new ServiceException("工艺模版修改失败");
+		}
+
 		Long modelId = entity.getId();
 
 		List<DsProDetailEntity> tableData = dsProModelDetailListVO.getTableData();
@@ -152,8 +166,15 @@ public class DsProModelServiceImpl extends BaseServiceImpl<DsProModelMapper, DsP
 			tableDatum.setModelId(modelId);
 		}
 		//删除原模版数据
-		proDetailService.deleteDetailByModelId(modelId);
-		return proDetailService.saveBatch(tableData);
+		boolean delete = proDetailService.deleteDetailByModelId(modelId);
+		if(!delete){
+			throw new ServiceException("工艺模版明细修改失败");
+		}
+		boolean saveBatch = proDetailService.saveBatch(tableData);
+		if(!saveBatch){
+			throw new ServiceException("工艺模版明细修改失败");
+		}
+		return true;
 	}
 
 	@Override
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java
index 1803c1d9..a907a0db 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java
@@ -109,7 +109,18 @@ public class DsSimilarPartsServiceImpl extends BaseServiceImpl<DsSimilarPartsMap
 		return true;
 	}
 
-
+	@Override
+	public boolean saveSimilarParts(DsSimilarPartsEntity dsSimilarParts) {
+		DsSimilarPartsEntity similarParts = similarPartsMapper.selectByPartOneAndPartTwo(dsSimilarParts);
+		if(null != similarParts ){
+			throw new ServiceException("零件号: "+similarParts.getPartOne()+"与 "+similarParts.getPartTwo()+"与存在");
+		}
+		int insert = similarPartsMapper.insert(dsSimilarParts);
+		if(insert <= 0){
+			throw new ServiceException("相似零件添加失败");
+		}
+		return true;
+	}
 
 
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
index 5350f38f..9ddbd40c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
@@ -106,6 +106,8 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	@Autowired
 	IBsProcessSetService processSetService;
 
+
+
 	@Override
 	public IPage<DsTaskingVO> selectAssignList(IPage<DsTaskingVO> page, DsTaskingVO dsTasking) {
 		List<DsTaskingVO> dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking);
@@ -350,15 +352,21 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 			list.add(TaskingConstant.TASK_STATUS_UNDERWAY);
 			dsTasking.setTaskStatusList(list);
 		}
-
+		String roleName = AuthUtil.getUser().getRoleName();
+		if("craftMan".equals(roleName)){
+			dsTasking.setCraftMan(AuthUtil.getUser().getNickName());
+		};
 		List<DsTaskingVO> dsTaskingList = baseMapper.selectDisposeList(page, dsTasking);
 		if(!CollectionUtils.isEmpty(dsTaskingList)){
 			for (DsTaskingVO dsTaskingVO : dsTaskingList) {
 				String partCode = dsTaskingVO.getPartCode();
 				DsPartEntity partEntity = partService.selectDsPartByPatCode(partCode);
-				String isSintering = partEntity.getIsSintering();
-				if(TaskingConstant.IS_SINTERING.equals(isSintering)){
-					List<DsPartEntity> dsPartEntityList = partService.selectDsPartByParentID(partEntity.getId());
+				//查询子件信息
+				List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
+				//获取所有子件ID
+				List<Long> idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList());
+				if(!CollectionUtils.isEmpty(idList)){
+					List<DsPartEntity> dsPartEntityList = partService.selectDsPartByIds(idList);
 					dsTaskingVO.setChildren(dsPartEntityList);
 				}
 			}
@@ -418,6 +426,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 		DsTaskingEntity dsTaskingEntity = taskingMapper.selectById(taskId);
 		if(TaskingConstant.TASK_STATUS_ALREADY.equals(dsTaskingEntity.getTaskStatus())){
 			dsTaskingEntity.setTaskStatus(TaskingConstant.TASK_STATUS_UNDERWAY);
+			dsTaskingEntity.setReceptionTime(new Date());
 			taskingMapper.updateById(dsTaskingEntity);
 			return true;
 		}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java
index 35a1e47b..bfc57178 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java
@@ -48,7 +48,6 @@ import org.springblade.desk.energy.excel.BsSafeInspectionPointExcel;
 import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity;
 import org.springblade.desk.energy.pojo.vo.BsSafeInspectionPointVO;
 import org.springblade.desk.energy.service.IBsSafeInspectionPointService;
-import org.springblade.desk.energy.util.ExportUtil;
 import org.springblade.desk.energy.wrapper.BsSafeInspectionPointWrapper;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
@@ -76,7 +75,7 @@ public class BsSafeInspectionPointController {
 
 	private final IBsSafeInspectionPointService bsSafeInspectionPointService;
 
-	private final ExportUtil exportUtil;
+//	private final ExportUtil exportUtil;
 
 	/**
 	 * 巡检点配置表 详情
@@ -222,7 +221,7 @@ public class BsSafeInspectionPointController {
 			reportId = "safety_inspectionPoint";
 		}
 		//ipIdList.forEach(id -> list.add(safeInspectionPointService.getByKey(id)));
-		exportUtil.export(reportId, exportType, "安全巡检点", list, null,request, response);
+//		exportUtil.export(reportId, exportType, "安全巡检点", list, null,request, response);
 	}
 	/**
 	 * 巡检点配置表 导出pdf
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/Configer.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/Configer.java
index fcd5e584..5d4f779c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/Configer.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/Configer.java
@@ -1,85 +1,85 @@
-package org.springblade.desk.energy.util;
-
-import com.alibaba.fastjson.JSONObject;
-import com.videasoft.configs.EnumConfiger;
-import com.videasoft.configs.XmlConfigReader;
-import jakarta.annotation.PostConstruct;
-import org.springframework.stereotype.Component;
-
-import java.text.MessageFormat;
-import java.util.LinkedHashMap;
-import java.util.Map;
-@Component
-public class Configer {
-    private static final Map<String, String> configerMap = new LinkedHashMap();
-    private static final Map<String, EnumConfiger> enumConfigerMap = new LinkedHashMap();
-
-    public Configer() {
-    }
-
-    public static String getValue(String code) {
-        return (String)configerMap.get(code);
-    }
-
-    public static String getValue(String code, String defaultValue) {
-        String v = getValue(code);
-        return v == null ? defaultValue : v;
-    }
-
-    public static String getValue(String id, String[] args) {
-        String value = getValue(id);
-        if (value != null) {
-            value = MessageFormat.format(value, (Object[])args);
-        }
-
-        return value;
-    }
-
-    public static EnumConfiger getEnumConfiger(String id) {
-        return (EnumConfiger)enumConfigerMap.get(id);
-    }
-
-    public static String getEnumValue(String id, String code) {
-        String enumValue = null;
-        EnumConfiger enumConfiger = getEnumConfiger(id);
-        if (enumConfiger != null) {
-            enumValue = enumConfiger.getEnumValue(code);
-        }
-
-        return enumValue;
-    }
-
-    public static String getEnumValue(String id, String code, String[] args) {
-        String enumValue = getEnumValue(id, code);
-        if (enumValue != null) {
-            enumValue = MessageFormat.format(enumValue, (Object[])args);
-        }
-
-        return enumValue;
-    }
-
-    public static JSONObject getJsonEnum(String id) {
-        JSONObject json = new JSONObject();
-        EnumConfiger enumConfiger = getEnumConfiger(id);
-        if (enumConfiger != null) {
-            json.putAll(enumConfiger.getOption());
-        }
-
-        return json;
-    }
-    @PostConstruct
-    public static void init() {
-        XmlConfigReader loader = new XmlConfigReader();
-        configerMap.clear();
-        configerMap.putAll(loader.loadKeyValues());
-        enumConfigerMap.clear();
-        enumConfigerMap.putAll(loader.loadEnumConfigs());
-    }
-
-    public static void appendLoad(XmlConfigReader reader) {
-        if (reader != null) {
-            configerMap.putAll(reader.loadKeyValues());
-            enumConfigerMap.putAll(reader.loadEnumConfigs());
-        }
-    }
-}
\ No newline at end of file
+//package org.springblade.desk.energy.util;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.videasoft.configs.EnumConfiger;
+//import com.videasoft.configs.XmlConfigReader;
+//import jakarta.annotation.PostConstruct;
+//import org.springframework.stereotype.Component;
+//
+//import java.text.MessageFormat;
+//import java.util.LinkedHashMap;
+//import java.util.Map;
+//@Component
+//public class Configer {
+//    private static final Map<String, String> configerMap = new LinkedHashMap();
+//    private static final Map<String, EnumConfiger> enumConfigerMap = new LinkedHashMap();
+//
+//    public Configer() {
+//    }
+//
+//    public static String getValue(String code) {
+//        return (String)configerMap.get(code);
+//    }
+//
+//    public static String getValue(String code, String defaultValue) {
+//        String v = getValue(code);
+//        return v == null ? defaultValue : v;
+//    }
+//
+//    public static String getValue(String id, String[] args) {
+//        String value = getValue(id);
+//        if (value != null) {
+//            value = MessageFormat.format(value, (Object[])args);
+//        }
+//
+//        return value;
+//    }
+//
+//    public static EnumConfiger getEnumConfiger(String id) {
+//        return (EnumConfiger)enumConfigerMap.get(id);
+//    }
+//
+//    public static String getEnumValue(String id, String code) {
+//        String enumValue = null;
+//        EnumConfiger enumConfiger = getEnumConfiger(id);
+//        if (enumConfiger != null) {
+//            enumValue = enumConfiger.getEnumValue(code);
+//        }
+//
+//        return enumValue;
+//    }
+//
+//    public static String getEnumValue(String id, String code, String[] args) {
+//        String enumValue = getEnumValue(id, code);
+//        if (enumValue != null) {
+//            enumValue = MessageFormat.format(enumValue, (Object[])args);
+//        }
+//
+//        return enumValue;
+//    }
+//
+//    public static JSONObject getJsonEnum(String id) {
+//        JSONObject json = new JSONObject();
+//        EnumConfiger enumConfiger = getEnumConfiger(id);
+//        if (enumConfiger != null) {
+//            json.putAll(enumConfiger.getOption());
+//        }
+//
+//        return json;
+//    }
+//    @PostConstruct
+//    public static void init() {
+//        XmlConfigReader loader = new XmlConfigReader();
+//        configerMap.clear();
+//        configerMap.putAll(loader.loadKeyValues());
+//        enumConfigerMap.clear();
+//        enumConfigerMap.putAll(loader.loadEnumConfigs());
+//    }
+//
+//    public static void appendLoad(XmlConfigReader reader) {
+//        if (reader != null) {
+//            configerMap.putAll(reader.loadKeyValues());
+//            enumConfigerMap.putAll(reader.loadEnumConfigs());
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/ExportUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/ExportUtil.java
index 93fce533..237c7000 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/ExportUtil.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/ExportUtil.java
@@ -1,165 +1,165 @@
-package org.springblade.desk.energy.util;
-
-import com.videasoft.utils.other.Function;
-import com.videasoft.webframework.common.web.report.HtmlExporterUtil;
-import com.videasoft.webframework.common.web.report.ReportModel;
-import com.videasoft.webframework.configs.ReportInfoReader;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JasperExportManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
-import net.sf.jasperreports.export.ExporterInput;
-import net.sf.jasperreports.export.OutputStreamExporterOutput;
-import net.sf.jasperreports.export.SimpleExporterInput;
-import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-@Service
-public class ExportUtil {
-    public  void export(String reportId, short exportType, String fileName, Object data, Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) {
-        if (params == null) {
-            params = new HashMap();
-        }
-
-        try {
-            Map<String, ReportModel> reports = ReportInfoReader.getReport();
-            JasperPrint jp = JasperReportUtil.getJasperPrint(reportId, data, (Map)params);
-            ReportModel rm = (ReportModel)reports.get(reportId);
-            if (StringUtils.isBlank(fileName)) {
-                fileName = Function.toUtf8String(rm.getReportName());
-            }
-
-            if (0 == exportType) {
-                fileName = fileName + ".xlsx";
-                fileName= URLEncoder.encode(fileName,"UTF-8");
-                this.exportExcel(jp, fileName, response);
-            } else if (1 == exportType) {
-                fileName = fileName + ".pdf";
-               fileName= URLEncoder.encode(fileName,"UTF-8");
-                this.exportPdf(jp, fileName, response);
-            } else if (3 == exportType) {
-                this.exportHtml(jp, response);
-            }
-        } catch (Exception var12) {
-            var12.printStackTrace();
-        }
-
-    }
-    protected void exportExcel(Object jasperPrint, String fileName, HttpServletResponse response) {
-        OutputStream out = null;
-
-        try {
-            out = this.getExportStream("application/vnd.ms-excel", fileName, response);
-            JRXlsxExporter exporter = new JRXlsxExporter();
-            ExporterInput exporterInput = null;
-            if (jasperPrint instanceof JasperPrint) {
-                exporterInput = new SimpleExporterInput((JasperPrint)jasperPrint);
-            } else if (jasperPrint instanceof List) {
-                exporterInput = SimpleExporterInput.getInstance((List)jasperPrint);
-            }
-
-            exporter.setExporterInput(exporterInput);
-            OutputStreamExporterOutput exporterOutput = new SimpleOutputStreamExporterOutput(response.getOutputStream());
-            exporter.setExporterOutput(exporterOutput);
-            exporter.exportReport();
-        } catch (JRException var20) {
-           var20.getMessage();
-        } catch (UnsupportedEncodingException var21) {
-            var21.printStackTrace();
-            var21.getMessage();
-        } catch (IOException var22) {
-            var22.printStackTrace();
-            var22.getMessage();
-        } finally {
-            if (out != null) {
-                try {
-                    out.flush();
-                    out.close();
-                } catch (IOException var19) {
-                    var19.printStackTrace();
-                }
-            }
-
-        }
-
-    }
-    private void exportPdf(Object jasperPrint, String fileName, HttpServletResponse response) {
-        try {
-            OutputStream ouputStream = this.getExportStream("application/pdf", fileName, response);
-            if (jasperPrint instanceof JasperPrint) {
-                JasperExportManager.exportReportToPdfStream((JasperPrint)jasperPrint, ouputStream);
-            } else if (jasperPrint instanceof List) {
-                List<JasperPrint> list = (List)jasperPrint;
-                if (list != null && list.size() > 0) {
-                    Iterator var6 = list.iterator();
-
-                    while(var6.hasNext()) {
-                        JasperPrint jp = (JasperPrint)var6.next();
-                        JasperExportManager.exportReportToPdfStream(jp, ouputStream);
-                    }
-                }
-            }
-
-            ouputStream.flush();
-            ouputStream.close();
-        } catch (Exception var8) {
-            var8.getMessage();
-        }
-
-    }
-    protected void exportHtml(Object jasperPrint, HttpServletResponse response) {
-        PrintWriter printWriter = null;
-
-        try {
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("text/html");
-            printWriter = response.getWriter();
-            HtmlExporterUtil exporter = new HtmlExporterUtil(jasperPrint, printWriter);
-            exporter.exportReport();
-        } catch (JRException var9) {
-            var9.getMessage();
-        } catch (IOException var10) {
-            var10.getMessage();
-        } finally {
-            printWriter.close();
-        }
-
-    }
-
-    protected OutputStream getExportStream(String contentType, String fileName, HttpServletResponse response) {
-        String ct = "application/octet-stream";
-        if (contentType != null) {
-            ct = contentType;
-        }
-
-        ServletOutputStream out = null;
-
-        try {
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType(ct);
-            if (fileName != null && fileName.trim().length() > 0) {
-                response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
-            }
-
-            response.setBufferSize(2048);
-            out = response.getOutputStream();
-        } catch (IOException var7) {
-            var7.getMessage();
-        }
-
-        return out;
-    }
-}
+//package org.springblade.desk.energy.util;
+//
+//import com.videasoft.utils.other.Function;
+//import com.videasoft.webframework.common.web.report.HtmlExporterUtil;
+//import com.videasoft.webframework.common.web.report.ReportModel;
+//import com.videasoft.webframework.configs.ReportInfoReader;
+//import jakarta.servlet.ServletOutputStream;
+//import jakarta.servlet.http.HttpServletRequest;
+//import jakarta.servlet.http.HttpServletResponse;
+//import net.sf.jasperreports.engine.JRException;
+//import net.sf.jasperreports.engine.JasperExportManager;
+//import net.sf.jasperreports.engine.JasperPrint;
+//import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
+//import net.sf.jasperreports.export.ExporterInput;
+//import net.sf.jasperreports.export.OutputStreamExporterOutput;
+//import net.sf.jasperreports.export.SimpleExporterInput;
+//import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
+//import org.apache.commons.lang3.StringUtils;
+//import org.springframework.stereotype.Service;
+//
+//import java.io.IOException;
+//import java.io.OutputStream;
+//import java.io.PrintWriter;
+//import java.io.UnsupportedEncodingException;
+//import java.net.URLEncoder;
+//import java.util.HashMap;
+//import java.util.Iterator;
+//import java.util.List;
+//import java.util.Map;
+//@Service
+//public class ExportUtil {
+//    public  void export(String reportId, short exportType, String fileName, Object data, Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) {
+//        if (params == null) {
+//            params = new HashMap();
+//        }
+//
+//        try {
+//            Map<String, ReportModel> reports = ReportInfoReader.getReport();
+//            JasperPrint jp = JasperReportUtil.getJasperPrint(reportId, data, (Map)params);
+//            ReportModel rm = (ReportModel)reports.get(reportId);
+//            if (StringUtils.isBlank(fileName)) {
+//                fileName = Function.toUtf8String(rm.getReportName());
+//            }
+//
+//            if (0 == exportType) {
+//                fileName = fileName + ".xlsx";
+//                fileName= URLEncoder.encode(fileName,"UTF-8");
+//                this.exportExcel(jp, fileName, response);
+//            } else if (1 == exportType) {
+//                fileName = fileName + ".pdf";
+//               fileName= URLEncoder.encode(fileName,"UTF-8");
+//                this.exportPdf(jp, fileName, response);
+//            } else if (3 == exportType) {
+//                this.exportHtml(jp, response);
+//            }
+//        } catch (Exception var12) {
+//            var12.printStackTrace();
+//        }
+//
+//    }
+//    protected void exportExcel(Object jasperPrint, String fileName, HttpServletResponse response) {
+//        OutputStream out = null;
+//
+//        try {
+//            out = this.getExportStream("application/vnd.ms-excel", fileName, response);
+//            JRXlsxExporter exporter = new JRXlsxExporter();
+//            ExporterInput exporterInput = null;
+//            if (jasperPrint instanceof JasperPrint) {
+//                exporterInput = new SimpleExporterInput((JasperPrint)jasperPrint);
+//            } else if (jasperPrint instanceof List) {
+//                exporterInput = SimpleExporterInput.getInstance((List)jasperPrint);
+//            }
+//
+//            exporter.setExporterInput(exporterInput);
+//            OutputStreamExporterOutput exporterOutput = new SimpleOutputStreamExporterOutput(response.getOutputStream());
+//            exporter.setExporterOutput(exporterOutput);
+//            exporter.exportReport();
+//        } catch (JRException var20) {
+//           var20.getMessage();
+//        } catch (UnsupportedEncodingException var21) {
+//            var21.printStackTrace();
+//            var21.getMessage();
+//        } catch (IOException var22) {
+//            var22.printStackTrace();
+//            var22.getMessage();
+//        } finally {
+//            if (out != null) {
+//                try {
+//                    out.flush();
+//                    out.close();
+//                } catch (IOException var19) {
+//                    var19.printStackTrace();
+//                }
+//            }
+//
+//        }
+//
+//    }
+//    private void exportPdf(Object jasperPrint, String fileName, HttpServletResponse response) {
+//        try {
+//            OutputStream ouputStream = this.getExportStream("application/pdf", fileName, response);
+//            if (jasperPrint instanceof JasperPrint) {
+//                JasperExportManager.exportReportToPdfStream((JasperPrint)jasperPrint, ouputStream);
+//            } else if (jasperPrint instanceof List) {
+//                List<JasperPrint> list = (List)jasperPrint;
+//                if (list != null && list.size() > 0) {
+//                    Iterator var6 = list.iterator();
+//
+//                    while(var6.hasNext()) {
+//                        JasperPrint jp = (JasperPrint)var6.next();
+//                        JasperExportManager.exportReportToPdfStream(jp, ouputStream);
+//                    }
+//                }
+//            }
+//
+//            ouputStream.flush();
+//            ouputStream.close();
+//        } catch (Exception var8) {
+//            var8.getMessage();
+//        }
+//
+//    }
+//    protected void exportHtml(Object jasperPrint, HttpServletResponse response) {
+//        PrintWriter printWriter = null;
+//
+//        try {
+//            response.setCharacterEncoding("UTF-8");
+//            response.setContentType("text/html");
+//            printWriter = response.getWriter();
+//            HtmlExporterUtil exporter = new HtmlExporterUtil(jasperPrint, printWriter);
+//            exporter.exportReport();
+//        } catch (JRException var9) {
+//            var9.getMessage();
+//        } catch (IOException var10) {
+//            var10.getMessage();
+//        } finally {
+//            printWriter.close();
+//        }
+//
+//    }
+//
+//    protected OutputStream getExportStream(String contentType, String fileName, HttpServletResponse response) {
+//        String ct = "application/octet-stream";
+//        if (contentType != null) {
+//            ct = contentType;
+//        }
+//
+//        ServletOutputStream out = null;
+//
+//        try {
+//            response.setCharacterEncoding("UTF-8");
+//            response.setContentType(ct);
+//            if (fileName != null && fileName.trim().length() > 0) {
+//                response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+//            }
+//
+//            response.setBufferSize(2048);
+//            out = response.getOutputStream();
+//        } catch (IOException var7) {
+//            var7.getMessage();
+//        }
+//
+//        return out;
+//    }
+//}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java
index e6740e70..b381db76 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java
@@ -1,115 +1,115 @@
-package org.springblade.desk.energy.util;
-
-import com.videasoft.utils.other.Function;
-import com.videasoft.utils.reader.PathReader;
-import com.videasoft.webframework.common.web.report.JasperReportUtils;
-import com.videasoft.webframework.common.web.report.PrintData;
-import com.videasoft.webframework.common.web.report.ReportModel;
-import com.videasoft.webframework.common.web.report.SubReportModel;
-import com.videasoft.webframework.configs.ReportInfoReader;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-import net.sf.jasperreports.engine.util.JRLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.io.InputStream;
-import java.util.*;
-@Service
-public class JasperReportUtil {
-
-
-    protected static final Logger logger = LoggerFactory.getLogger(JasperReportUtils.class);
-
-    public JasperReportUtil() {
-    }
-
-    public static final ReportModel getReportModel(String reportId) throws Exception {
-        return ReportInfoReader.getReportModel(reportId);
-    }
-
-    public static final JasperPrint getJasperPrint(String reportId, Object data, Map<String, Object> params) throws Exception {
-        ReportModel rm = ReportInfoReader.getReportModel(reportId);
-        if (rm == null) {
-            throw new Exception("找不到报表模板定义");
-        } else {
-            Collection<?> mainData = null;
-            if (data instanceof Collection) {
-                mainData = (Collection)data;
-            } else {
-                mainData = new ArrayList(1);
-                ((List)mainData).add(data);
-            }
-
-            if (params == null) {
-                params = new HashMap();
-            }
-
-            JasperReport jr = rm.getJasperRoport();
-            InputStream inputStream = PathReader.class.getResourceAsStream(rm.getTemplatePath());
-            if (inputStream == null) {
-                logger.error("读取打印模版：" + rm.getTemplatePath() + "出错，文件可能不存在!");
-                return null;
-            } else {
-                if (rm.isDebug() || jr == null) {
-                    jr = (JasperReport) JRLoader.loadObject(inputStream);
-                    rm.setJasperRoport(jr);
-                }
-
-                if (rm.getExtParam() != null) {
-                    ((Map)params).putAll(rm.getExtParam());
-                }
-
-               ((Map)params).put("companyInfo", Configer.getEnumConfiger("company").getOption());
-                SubReportModel subReport = null;
-                JasperReport subJS = null;
-                ReportModel subRM = null;
-                Collection<?> subData = null;
-                List<SubReportModel> subReports = rm.getSubReports();
-                if (subReports != null && subReports.size() > 0) {
-                    for(int i = 0; i < subReports.size(); ++i) {
-                        subReport = (SubReportModel)subReports.get(i);
-                        subRM = ReportInfoReader.getReportModel(subReport.getSubReportId());
-                        subJS = subRM.getJasperRoport();
-                        if (subRM.isDebug() || subJS == null) {
-                            subJS = (JasperReport)JRLoader.loadObject(PathReader.class.getResourceAsStream(subRM.getTemplatePath()));
-                            subRM.setJasperRoport(subJS);
-                        }
-
-                        subData = (Collection) Function.getPropertyValue(((Map)params).get("jasper_head_data"), subReport.getPropertyName());
-                        ((Map)params).put("subReport_" + subReport.getJsReportParamName(), subJS);
-                        ((Map)params).put("subData_" + subReport.getDataParamName(), subData != null ? new JRBeanCollectionDataSource(subData) : null);
-                    }
-                }
-                JasperPrint jp = JasperFillManager.fillReport(jr, (Map)params, new JRBeanCollectionDataSource((Collection)mainData));
-                mainData = null;
-                subData = null;
-                if (jp == null) {
-                    throw new Exception("无法生成导出或打印资源！");
-                } else {
-                    return jp;
-                }
-            }
-        }
-    }
-
-    public static final ArrayList<JasperPrint> getJasperPrints(String reportId, List<PrintData> data, Map<String, Object> pubParamMap) throws Exception {
-        ArrayList<JasperPrint> jps = new ArrayList(data.size());
-
-        for(int i = 0; i < data.size(); ++i) {
-            PrintData d = (PrintData)data.get(i);
-            if (d.getParams() == null) {
-                d.setParams(new HashMap());
-            }
-
-            d.getParams().putAll(pubParamMap);
-            JasperPrint jp = getJasperPrint(reportId, d.getData(), d.getParams());
-            jps.add(jp);
-        }
-
-        return jps;
-    }
-}
+//package org.springblade.desk.energy.util;
+//
+//import com.videasoft.utils.other.Function;
+//import com.videasoft.utils.reader.PathReader;
+//import com.videasoft.webframework.common.web.report.JasperReportUtils;
+//import com.videasoft.webframework.common.web.report.PrintData;
+//import com.videasoft.webframework.common.web.report.ReportModel;
+//import com.videasoft.webframework.common.web.report.SubReportModel;
+//import com.videasoft.webframework.configs.ReportInfoReader;
+//import net.sf.jasperreports.engine.JasperFillManager;
+//import net.sf.jasperreports.engine.JasperPrint;
+//import net.sf.jasperreports.engine.JasperReport;
+//import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+//import net.sf.jasperreports.engine.util.JRLoader;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Service;
+//
+//import java.io.InputStream;
+//import java.util.*;
+//@Service
+//public class JasperReportUtil {
+//
+//
+//    protected static final Logger logger = LoggerFactory.getLogger(JasperReportUtils.class);
+//
+//    public JasperReportUtil() {
+//    }
+//
+//    public static final ReportModel getReportModel(String reportId) throws Exception {
+//        return ReportInfoReader.getReportModel(reportId);
+//    }
+//
+//    public static final JasperPrint getJasperPrint(String reportId, Object data, Map<String, Object> params) throws Exception {
+//        ReportModel rm = ReportInfoReader.getReportModel(reportId);
+//        if (rm == null) {
+//            throw new Exception("找不到报表模板定义");
+//        } else {
+//            Collection<?> mainData = null;
+//            if (data instanceof Collection) {
+//                mainData = (Collection)data;
+//            } else {
+//                mainData = new ArrayList(1);
+//                ((List)mainData).add(data);
+//            }
+//
+//            if (params == null) {
+//                params = new HashMap();
+//            }
+//
+//            JasperReport jr = rm.getJasperRoport();
+//            InputStream inputStream = PathReader.class.getResourceAsStream(rm.getTemplatePath());
+//            if (inputStream == null) {
+//                logger.error("读取打印模版：" + rm.getTemplatePath() + "出错，文件可能不存在!");
+//                return null;
+//            } else {
+//                if (rm.isDebug() || jr == null) {
+//                    jr = (JasperReport) JRLoader.loadObject(inputStream);
+//                    rm.setJasperRoport(jr);
+//                }
+//
+//                if (rm.getExtParam() != null) {
+//                    ((Map)params).putAll(rm.getExtParam());
+//                }
+//
+//               ((Map)params).put("companyInfo", Configer.getEnumConfiger("company").getOption());
+//                SubReportModel subReport = null;
+//                JasperReport subJS = null;
+//                ReportModel subRM = null;
+//                Collection<?> subData = null;
+//                List<SubReportModel> subReports = rm.getSubReports();
+//                if (subReports != null && subReports.size() > 0) {
+//                    for(int i = 0; i < subReports.size(); ++i) {
+//                        subReport = (SubReportModel)subReports.get(i);
+//                        subRM = ReportInfoReader.getReportModel(subReport.getSubReportId());
+//                        subJS = subRM.getJasperRoport();
+//                        if (subRM.isDebug() || subJS == null) {
+//                            subJS = (JasperReport)JRLoader.loadObject(PathReader.class.getResourceAsStream(subRM.getTemplatePath()));
+//                            subRM.setJasperRoport(subJS);
+//                        }
+//
+//                        subData = (Collection) Function.getPropertyValue(((Map)params).get("jasper_head_data"), subReport.getPropertyName());
+//                        ((Map)params).put("subReport_" + subReport.getJsReportParamName(), subJS);
+//                        ((Map)params).put("subData_" + subReport.getDataParamName(), subData != null ? new JRBeanCollectionDataSource(subData) : null);
+//                    }
+//                }
+//                JasperPrint jp = JasperFillManager.fillReport(jr, (Map)params, new JRBeanCollectionDataSource((Collection)mainData));
+//                mainData = null;
+//                subData = null;
+//                if (jp == null) {
+//                    throw new Exception("无法生成导出或打印资源！");
+//                } else {
+//                    return jp;
+//                }
+//            }
+//        }
+//    }
+//
+//    public static final ArrayList<JasperPrint> getJasperPrints(String reportId, List<PrintData> data, Map<String, Object> pubParamMap) throws Exception {
+//        ArrayList<JasperPrint> jps = new ArrayList(data.size());
+//
+//        for(int i = 0; i < data.size(); ++i) {
+//            PrintData d = (PrintData)data.get(i);
+//            if (d.getParams() == null) {
+//                d.setParams(new HashMap());
+//            }
+//
+//            d.getParams().putAll(pubParamMap);
+//            JasperPrint jp = getJasperPrint(reportId, d.getData(), d.getParams());
+//            jps.add(jp);
+//        }
+//
+//        return jps;
+//    }
+//}
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/ErpDataApplication.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/ErpDataApplication.java
index 174805ce..bd4c1130 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/ErpDataApplication.java
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/ErpDataApplication.java
@@ -1,8 +1,8 @@
 package org.springblade.erpdata;
 
+import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.launch.constant.AppConstant;
 
 /**
  * Desk启动器
@@ -13,7 +13,7 @@ import org.springblade.core.launch.constant.AppConstant;
 public class ErpDataApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(AppConstant.APPLICATION_DESK_NAME, ErpDataApplication.class, args);
+		BladeApplication.run(LauncherConstant.APPLICATION_ERP_DATA_NAME, ErpDataApplication.class, args);
 		System.out.println("===================");
 		System.out.println("===================");
 		System.out.println("=======启动成功！====");