1、完善删除功能--删除时同步删除收藏关联、工单参数关联

admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue

@@ -32,7 +32,7 @@
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
       </a-dropdown>
     </div>
 

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java

@@ -1,21 +1,14 @@
 package org.jeecg.modules.workorderTemplate.controller;
 
 import java.io.*;
-import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.net.URLDecoder;
 import javax.annotation.Resource;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.workorderTemplate.entity.ImportBean;
 import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
 import org.jeecg.modules.workorderTemplate.service.IWorkorderTemplateService;
@@ -25,20 +18,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.workorderTemplate.service.MyTemplateService;
 import org.jeecg.modules.workorderTemplate.service.WorkorderExcelService;
 import org.jeecg.modules.workorderTemplate.util.ExcelUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -56,6 +43,15 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class WorkorderTemplateController extends JeecgController<WorkorderTemplate, IWorkorderTemplateService> {
 	@Autowired
 	private IWorkorderTemplateService workorderTemplateService;
+
+	 //excel信息
+	 @Resource
+	 private WorkorderExcelService workorderExcelService;
+
+	 //excel信息
+	 @Resource
+	 private MyTemplateService myTemplateService;
+	 /*****************************************************************************************************************/
 	
 	/**
 	 * 分页列表查询
@@ -116,9 +112,8 @@ public class WorkorderTemplateController extends JeecgController<WorkorderTempla
 	@AutoLog(value = "工单信息表-通过id删除")
 	@ApiOperation(value="工单信息表-通过id删除", notes="工单信息表-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		workorderTemplateService.removeById(id);
-		return Result.OK("删除成功!");
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		return myTemplateService.deleteTemplate(id);
 	}
 	
 	/**
@@ -183,10 +178,7 @@ public class WorkorderTemplateController extends JeecgController<WorkorderTempla
 	 }
 
     /******************************************************************************************************************/
-	//excel信息
-	@Resource
-	private WorkorderExcelService workorderExcelService;
-	 /****************************************************************************************************/
+
 
 	 @ApiOperation(value="导入导出-工单信息导入", notes="导入导出-工单信息导入")
 	 @RequestMapping(value = "/templateImport")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/MyTemplateService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.workorderTemplate.service;
+
+import org.jeecg.common.api.vo.Result;
+
+public interface MyTemplateService {
+
+    /**
+     * 工单信息-删除工单
+     * @param templateId
+     * @return
+     */
+    public Result<?> deleteTemplate(String templateId);
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/service/impl/MyTemplateServiceImpl.java

@@ -0,0 +1,311 @@
+package org.jeecg.modules.workorderTemplate.service.impl;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.workorderCollection.entity.WorkorderCollection;
+import org.jeecg.modules.workorderCollection.service.IWorkorderCollectionService;
+import org.jeecg.modules.workorderGeneralStepfour.entity.WorkorderGeneralStepfour;
+import org.jeecg.modules.workorderGeneralStepfour.service.IWorkorderGeneralStepfourService;
+import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
+import org.jeecg.modules.workorderGeneralStepone.service.IWorkorderGeneralSteponeService;
+import org.jeecg.modules.workorderGeneralStepthree.entity.WorkorderGeneralStepthree;
+import org.jeecg.modules.workorderGeneralStepthree.service.IWorkorderGeneralStepthreeService;
+import org.jeecg.modules.workorderGeneralSteptwo.entity.WorkorderGeneralSteptwo;
+import org.jeecg.modules.workorderGeneralSteptwo.service.IWorkorderGeneralSteptwoService;
+import org.jeecg.modules.workorderParamStepfour.entity.WorkorderParamStepfour;
+import org.jeecg.modules.workorderParamStepfour.service.IWorkorderParamStepfourService;
+import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
+import org.jeecg.modules.workorderParamStepone.service.IWorkorderParamSteponeService;
+import org.jeecg.modules.workorderParamStepthree.entity.WorkorderParamStepthree;
+import org.jeecg.modules.workorderParamStepthree.service.IWorkorderParamStepthreeService;
+import org.jeecg.modules.workorderParamSteptwo.entity.WorkorderParamSteptwo;
+import org.jeecg.modules.workorderParamSteptwo.service.IWorkorderParamSteptwoService;
+import org.jeecg.modules.workorderTemplate.service.IWorkorderTemplateService;
+import org.jeecg.modules.workorderTemplate.service.MyTemplateService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class MyTemplateServiceImpl implements MyTemplateService {
+    //收藏信息
+    @Resource
+    private IWorkorderCollectionService workorderCollectionService;
+
+    //工单信息
+    @Resource
+    private IWorkorderTemplateService workorderTemplateService;
+
+    //工序卡常规参数
+    @Resource
+    private IWorkorderGeneralSteponeService workorderGeneralSteponeService;
+    @Resource
+    private IWorkorderGeneralSteptwoService workorderGeneralSteptwoService;
+    @Resource
+    private IWorkorderGeneralStepthreeService workorderGeneralStepthreeService;
+    @Resource
+    private IWorkorderGeneralStepfourService workorderGeneralStepfourService;
+
+    //工序卡列表参数
+    @Resource
+    private IWorkorderParamSteponeService workorderParamSteponeService;
+    @Resource
+    private IWorkorderParamSteptwoService workorderParamSteptwoService;
+    @Resource
+    private IWorkorderParamStepthreeService workorderParamStepthreeService;
+    @Resource
+    private IWorkorderParamStepfourService workorderParamStepfourService;
+
+    /*************************************************************************************/
+    //工单信息-删除工单
+    @Override
+    public Result<?> deleteTemplate(String templateId){
+
+        //收藏表信息删除成功与否标识
+        boolean collectionFlage = deleteCollection(templateId);
+
+        //删除工单参数
+        boolean workorderGeneralSteponeFlag = deleteGeneralStepOne(templateId);//常规参数-工序卡1
+        boolean workorderGeneralSteptwoFlag = deleteGeneralStepTwo(templateId);//常规参数-工序卡2
+        boolean workorderGeneralStepthreeFlag = deleteGeneralStepThree(templateId);//常规参数-工序卡3
+        boolean workorderGeneralStepfourFlag = deleteGeneralStepFour(templateId);//常规参数-工序卡4
+
+        //检查项目参数
+        boolean workorderParamSteponeFlag = deleteParamStepOne(templateId);//检查项目参数-工序卡1
+        boolean workorderParamSteptwoFlag = deleteParamStepTwo(templateId);//检查项目参数-工序卡2
+        boolean workorderParamStepthreeFlag = deleteParamStepThree(templateId);//检查项目参数-工序卡3
+        boolean workorderParamStepfourFlag = deleteParamStepFour(templateId);//检查项目参数-工序卡4
+
+        //删除工单信息
+        boolean templateFlag = workorderTemplateService.removeById(templateId);
+
+        if(templateFlag){
+            return Result.OK("工单删除成功！");
+        }else {
+            return Result.error("工单删除失败！");
+        }
+    }
+
+    /******************************************工单删除*****************************************************************/
+    //删除工单收藏信息
+    public boolean deleteCollection(String templateId){
+        //执行结果
+        boolean flag = false;
+        //收藏工单获取
+        List<String> collectionIds = new ArrayList<>();
+        List<WorkorderCollection> collectionList = workorderCollectionService
+                .lambdaQuery()
+                .eq(WorkorderCollection::getTemplateId, templateId)
+                .list();
+        //判断该工单是否被收藏，有则删除，无则默认删除成功
+        if(0 == collectionList.size()){
+            flag = true;
+        }else {
+            //收藏工单id获取
+            for (WorkorderCollection collection : collectionList) {
+                collectionIds.add(collection.getId());
+            }
+
+            //删除工单收藏
+            flag = workorderCollectionService.removeByIds(collectionIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单常规参数-工序卡1
+    public boolean deleteGeneralStepOne(String templateId){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡1
+        List<String> workorderGeneralSteponeIds = new ArrayList<>();
+        List<WorkorderGeneralStepone> workorderGeneralSteponeList = workorderGeneralSteponeService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepone::getTemplateId, templateId)
+                .list();
+        //判断该工单有无常规参数，有则删除，无则默认删除成功
+        if(0 == workorderGeneralSteponeList.size()){
+            flag = true;
+        }else {
+            //参数id获取
+            for (WorkorderGeneralStepone generalStepone : workorderGeneralSteponeList) {
+                workorderGeneralSteponeIds.add(generalStepone.getId());
+            }
+
+            flag = workorderGeneralSteponeService.removeByIds(workorderGeneralSteponeIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单常规参数-工序卡2
+    public boolean deleteGeneralStepTwo(String templateId){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡2
+        List<String> workorderGeneralSteptwoIds = new ArrayList<>();
+        List<WorkorderGeneralSteptwo> workorderGeneralSteptwoList = workorderGeneralSteptwoService
+                .lambdaQuery()
+                .eq(WorkorderGeneralSteptwo::getTemplateId, templateId)
+                .list();
+        //判断该工单有无常规参数，有则删除，无则默认删除成功
+        if(0 == workorderGeneralSteptwoList.size()){
+            flag = true;
+        }else {
+            //参数id获取
+            for (WorkorderGeneralSteptwo generalSteptwo : workorderGeneralSteptwoList) {
+                workorderGeneralSteptwoIds.add(generalSteptwo.getId());
+            }
+
+            flag = workorderGeneralSteptwoService.removeByIds(workorderGeneralSteptwoIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单常规参数-工序卡3
+    public boolean deleteGeneralStepThree(String templateId){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡3
+        List<String> workorderGeneralStepthreeIds = new ArrayList<>();
+        List<WorkorderGeneralStepthree> workorderGeneralStepthreeList = workorderGeneralStepthreeService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepthree::getTemplateId, templateId)
+                .list();
+        //判断该工单有无常规参数，有则删除，无则默认删除成功
+        if(0 == workorderGeneralStepthreeList.size()){
+            flag = true;
+        }else {
+            //参数id获取
+            for (WorkorderGeneralStepthree generalStepthree : workorderGeneralStepthreeList) {
+                workorderGeneralStepthreeIds.add(generalStepthree.getId());
+            }
+
+            flag = workorderGeneralStepthreeService.removeByIds(workorderGeneralStepthreeIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单常规参数-工序卡4
+    public boolean deleteGeneralStepFour(String templateId){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡4
+        List<String> workorderGeneralStepfourIds = new ArrayList<>();
+        List<WorkorderGeneralStepfour> workorderGeneralStepfourList = workorderGeneralStepfourService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepfour::getTemplateId, templateId)
+                .list();
+        //判断该工单有无常规参数，有则删除，无则默认删除成功
+        if(0 == workorderGeneralStepfourList.size()){
+            flag = true;
+        }else {
+            //参数id获取
+            for (WorkorderGeneralStepfour generalStepfour : workorderGeneralStepfourList) {
+                workorderGeneralStepfourIds.add(generalStepfour.getId());
+            }
+
+            flag = workorderGeneralStepfourService.removeByIds(workorderGeneralStepfourIds);
+        }
+
+        return flag;
+    }
+
+
+    //删除关联工单检查项目参数-工序卡1
+    public boolean deleteParamStepOne(String templateId){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡1
+        List<String> workorderParamSteponeIds = new ArrayList<>();
+        List<WorkorderParamStepone> workorderParamSteponeList = workorderParamSteponeService
+                .lambdaQuery()
+                .eq(WorkorderParamStepone::getTemplateId, templateId)
+                .list();
+        //判断该工单有无检查参数，有则删除，无则默认删除成功
+        if(0 == workorderParamSteponeList.size()){
+            flag = true;
+        }else {
+            for (WorkorderParamStepone paramStepone : workorderParamSteponeList) {
+                workorderParamSteponeIds.add(paramStepone.getId());
+            }
+
+            flag = workorderParamSteponeService.removeByIds(workorderParamSteponeIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单检查项目参数-工序卡2
+    public boolean deleteParamStepTwo(String templateId){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡2
+        List<String> workorderParamSteptwoIds = new ArrayList<>();
+        List<WorkorderParamSteptwo> workorderParamSteptwoList = workorderParamSteptwoService
+                .lambdaQuery()
+                .eq(WorkorderParamSteptwo::getTemplateId, templateId)
+                .list();
+        if(0 == workorderParamSteptwoList.size()){
+            flag = true;
+        }else {
+            for (WorkorderParamSteptwo paramSteptwo : workorderParamSteptwoList) {
+                workorderParamSteptwoIds.add(paramSteptwo.getId());
+            }
+
+            flag = workorderParamSteptwoService.removeByIds(workorderParamSteptwoIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单检查项目参数-工序卡3
+    public boolean deleteParamStepThree(String templateId){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡3
+        List<String> workorderParamStepThreeIds = new ArrayList<>();
+        List<WorkorderParamStepthree> workorderParamStepthreeList = workorderParamStepthreeService
+                .lambdaQuery()
+                .eq(WorkorderParamStepthree::getTemplateId, templateId)
+                .list();
+        if(0 == workorderParamStepthreeList.size()){
+            flag = true;
+        }else {
+            for (WorkorderParamStepthree paramStepthree : workorderParamStepthreeList) {
+                workorderParamStepThreeIds.add(paramStepthree.getId());
+            }
+
+            flag = workorderParamStepthreeService.removeByIds(workorderParamStepThreeIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单检查项目参数-工序卡4
+    public boolean deleteParamStepFour(String templateId){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡4
+        List<String> workorderParamStepfourIds = new ArrayList<>();
+        List<WorkorderParamStepfour> workorderParamStepfourList = workorderParamStepfourService
+                .lambdaQuery()
+                .eq(WorkorderParamStepfour::getTemplateId, templateId)
+                .list();
+        if(0 == workorderParamStepfourList.size()){
+            flag = true;
+        }else {
+            for (WorkorderParamStepfour paramStepfour : workorderParamStepfourList) {
+                workorderParamStepfourIds.add(paramStepfour.getId());
+            }
+
+            flag = workorderParamStepfourService.removeByIds(workorderParamStepfourIds);
+
+        }
+
+        return flag;
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java

@@ -78,6 +78,14 @@ public class TemplateController {
         return Result.error(message);
     }
 
+    @ApiOperation(value="工单信息-删除工单", notes="工单信息-删除工单")
+    @RequestMapping(value = "/deleteTemplate", method = {RequestMethod.POST})
+    public Result<?> deleteTemplate(String templateId){
+
+        return templateService.deleteTemplate(templateId);
+
+    }
+
     /**************************************工序**********************************************************/
     @ApiOperation(value="工单信息-工序卡1(选配)详情", notes="工单信息-工序卡1(选配)详情")
     @RequestMapping(value = "/queryStepOne", method = {RequestMethod.GET})

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java

@@ -40,6 +40,13 @@ public interface TemplateService {
      */
     public Result<?> updateTemplate(WorkorderTemplate workorderTemplate);
 
+    /**
+     * 工单信息-删除工单
+     * @param templateId
+     * @return
+     */
+    public Result<?> deleteTemplate(String templateId);
+
     /**
      * 工单信息-工序卡1(选配)详情
      * @param templateId

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java

@@ -31,14 +31,6 @@ import org.jeecg.modules.workorderStatus.entity.WorkorderStatus;
 import org.jeecg.modules.workorderStatus.service.IWorkorderStatusService;
 import org.jeecg.modules.workorderStep.entity.WorkorderStep;
 import org.jeecg.modules.workorderStep.service.IWorkorderStepService;
-import org.jeecg.modules.workorderStepfour.entity.WorkorderStepfour;
-import org.jeecg.modules.workorderStepfour.service.IWorkorderStepfourService;
-import org.jeecg.modules.workorderStepone.entity.WorkorderStepone;
-import org.jeecg.modules.workorderStepone.service.IWorkorderSteponeService;
-import org.jeecg.modules.workorderStepthree.entity.WorkorderStepthree;
-import org.jeecg.modules.workorderStepthree.service.IWorkorderStepthreeService;
-import org.jeecg.modules.workorderSteptwo.entity.WorkorderSteptwo;
-import org.jeecg.modules.workorderSteptwo.service.IWorkorderSteptwoService;
 import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
 import org.jeecg.modules.workorderTemplate.service.IWorkorderTemplateService;
 import org.springframework.stereotype.Service;
@@ -144,31 +136,6 @@ public class TemplateServiceImpl implements TemplateService {
         return Result.OK("工单列表", pageList);
     }
 
-    //工单信息-查询工单详情
-//    @Override
-//    public Result<?> queryTemplateById(String templateId) {
-//        //查询工单信息详情
-//        WorkorderTemplate template = workorderTemplateService
-//                .lambdaQuery()
-//                .eq(WorkorderTemplate::getId, templateId)
-//                .one();
-//
-//        //工序卡1
-//        //常规参数
-//        WorkorderGeneralStepone generalStepone = workorderGeneralSteponeService
-//                .lambdaQuery()
-//                .eq(WorkorderGeneralStepone::getTemplateId, templateId)
-//                .one();
-//
-//        //列表参数
-//        List<WorkorderParamStepone> paramStepone = workorderParamSteponeService
-//                .lambdaQuery()
-//                .eq(WorkorderParamStepone::getTemplateId, templateId)
-//                .list();
-//
-//        return Result.OK("工单详情", template);
-//    }
-
     //工单信息-修改工单
     @Override
     public Result<?> updateTemplate(WorkorderTemplate workorderTemplate) {
@@ -197,6 +164,258 @@ public class TemplateServiceImpl implements TemplateService {
         }
     }
 
+    //工单信息-删除工单
+    @Override
+    public Result<?> deleteTemplate(String templateId){
+
+        //收藏表信息删除成功与否标识
+        boolean collectionFlage = deleteCollection(templateId);
+
+        //删除工单参数
+        boolean workorderGeneralSteponeFlag = deleteGeneralStepOne(templateId);//常规参数-工序卡1
+        boolean workorderGeneralSteptwoFlag = deleteGeneralStepTwo(templateId);//常规参数-工序卡2
+        boolean workorderGeneralStepthreeFlag = deleteGeneralStepThree(templateId);//常规参数-工序卡3
+        boolean workorderGeneralStepfourFlag = deleteGeneralStepFour(templateId);//常规参数-工序卡4
+
+        //检查项目参数
+        boolean workorderParamSteponeFlag = deleteParamStepOne(templateId);//检查项目参数-工序卡1
+        boolean workorderParamSteptwoFlag = deleteParamStepTwo(templateId);//检查项目参数-工序卡2
+        boolean workorderParamStepthreeFlag = deleteParamStepThree(templateId);//检查项目参数-工序卡3
+        boolean workorderParamStepfourFlag = deleteParamStepFour(templateId);//检查项目参数-工序卡4
+
+        //删除工单信息
+        boolean templateFlag = workorderTemplateService.removeById(templateId);
+
+        if(templateFlag){
+            return Result.OK("工单删除成功！");
+        }else {
+            return Result.error("工单删除失败！");
+        }
+    }
+
+    /******************************************工单删除*****************************************************************/
+    //删除工单收藏信息
+    public boolean deleteCollection(String templateId){
+        //执行结果
+        boolean flag = false;
+        //收藏工单获取
+        List<String> collectionIds = new ArrayList<>();
+        List<WorkorderCollection> collectionList = workorderCollectionService
+                .lambdaQuery()
+                .eq(WorkorderCollection::getTemplateId, templateId)
+                .list();
+        //判断该工单是否被收藏，有则删除，无则默认删除成功
+        if(0 == collectionList.size()){
+            flag = true;
+        }else {
+            //收藏工单id获取
+            for (WorkorderCollection collection : collectionList) {
+                collectionIds.add(collection.getId());
+            }
+
+            //删除工单收藏
+            flag = workorderCollectionService.removeByIds(collectionIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单常规参数-工序卡1
+    public boolean deleteGeneralStepOne(String templateId){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡1
+        List<String> workorderGeneralSteponeIds = new ArrayList<>();
+        List<WorkorderGeneralStepone> workorderGeneralSteponeList = workorderGeneralSteponeService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepone::getTemplateId, templateId)
+                .list();
+        //判断该工单有无常规参数，有则删除，无则默认删除成功
+        if(0 == workorderGeneralSteponeList.size()){
+            flag = true;
+        }else {
+            //参数id获取
+            for (WorkorderGeneralStepone generalStepone : workorderGeneralSteponeList) {
+                workorderGeneralSteponeIds.add(generalStepone.getId());
+            }
+
+            flag = workorderGeneralSteponeService.removeByIds(workorderGeneralSteponeIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单常规参数-工序卡2
+    public boolean deleteGeneralStepTwo(String templateId){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡2
+        List<String> workorderGeneralSteptwoIds = new ArrayList<>();
+        List<WorkorderGeneralSteptwo> workorderGeneralSteptwoList = workorderGeneralSteptwoService
+                .lambdaQuery()
+                .eq(WorkorderGeneralSteptwo::getTemplateId, templateId)
+                .list();
+        //判断该工单有无常规参数，有则删除，无则默认删除成功
+        if(0 == workorderGeneralSteptwoList.size()){
+            flag = true;
+        }else {
+            //参数id获取
+            for (WorkorderGeneralSteptwo generalSteptwo : workorderGeneralSteptwoList) {
+                workorderGeneralSteptwoIds.add(generalSteptwo.getId());
+            }
+
+            flag = workorderGeneralSteptwoService.removeByIds(workorderGeneralSteptwoIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单常规参数-工序卡3
+    public boolean deleteGeneralStepThree(String templateId){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡3
+        List<String> workorderGeneralStepthreeIds = new ArrayList<>();
+        List<WorkorderGeneralStepthree> workorderGeneralStepthreeList = workorderGeneralStepthreeService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepthree::getTemplateId, templateId)
+                .list();
+        //判断该工单有无常规参数，有则删除，无则默认删除成功
+        if(0 == workorderGeneralStepthreeList.size()){
+            flag = true;
+        }else {
+            //参数id获取
+            for (WorkorderGeneralStepthree generalStepthree : workorderGeneralStepthreeList) {
+                workorderGeneralStepthreeIds.add(generalStepthree.getId());
+            }
+
+            flag = workorderGeneralStepthreeService.removeByIds(workorderGeneralStepthreeIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单常规参数-工序卡4
+    public boolean deleteGeneralStepFour(String templateId){
+        //执行结果
+        boolean flag = false;
+        //常规参数-工序卡4
+        List<String> workorderGeneralStepfourIds = new ArrayList<>();
+        List<WorkorderGeneralStepfour> workorderGeneralStepfourList = workorderGeneralStepfourService
+                .lambdaQuery()
+                .eq(WorkorderGeneralStepfour::getTemplateId, templateId)
+                .list();
+        //判断该工单有无常规参数，有则删除，无则默认删除成功
+        if(0 == workorderGeneralStepfourList.size()){
+            flag = true;
+        }else {
+            //参数id获取
+            for (WorkorderGeneralStepfour generalStepfour : workorderGeneralStepfourList) {
+                workorderGeneralStepfourIds.add(generalStepfour.getId());
+            }
+
+            flag = workorderGeneralStepfourService.removeByIds(workorderGeneralStepfourIds);
+        }
+
+        return flag;
+    }
+
+
+    //删除关联工单检查项目参数-工序卡1
+    public boolean deleteParamStepOne(String templateId){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡1
+        List<String> workorderParamSteponeIds = new ArrayList<>();
+        List<WorkorderParamStepone> workorderParamSteponeList = workorderParamSteponeService
+                .lambdaQuery()
+                .eq(WorkorderParamStepone::getTemplateId, templateId)
+                .list();
+        //判断该工单有无检查参数，有则删除，无则默认删除成功
+        if(0 == workorderParamSteponeList.size()){
+            flag = true;
+        }else {
+            for (WorkorderParamStepone paramStepone : workorderParamSteponeList) {
+                workorderParamSteponeIds.add(paramStepone.getId());
+            }
+
+            flag = workorderParamSteponeService.removeByIds(workorderParamSteponeIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单检查项目参数-工序卡2
+    public boolean deleteParamStepTwo(String templateId){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡2
+        List<String> workorderParamSteptwoIds = new ArrayList<>();
+        List<WorkorderParamSteptwo> workorderParamSteptwoList = workorderParamSteptwoService
+                .lambdaQuery()
+                .eq(WorkorderParamSteptwo::getTemplateId, templateId)
+                .list();
+        if(0 == workorderParamSteptwoList.size()){
+            flag = true;
+        }else {
+            for (WorkorderParamSteptwo paramSteptwo : workorderParamSteptwoList) {
+                workorderParamSteptwoIds.add(paramSteptwo.getId());
+            }
+
+            flag = workorderParamSteptwoService.removeByIds(workorderParamSteptwoIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单检查项目参数-工序卡3
+    public boolean deleteParamStepThree(String templateId){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡3
+        List<String> workorderParamStepThreeIds = new ArrayList<>();
+        List<WorkorderParamStepthree> workorderParamStepthreeList = workorderParamStepthreeService
+                .lambdaQuery()
+                .eq(WorkorderParamStepthree::getTemplateId, templateId)
+                .list();
+        if(0 == workorderParamStepthreeList.size()){
+            flag = true;
+        }else {
+            for (WorkorderParamStepthree paramStepthree : workorderParamStepthreeList) {
+                workorderParamStepThreeIds.add(paramStepthree.getId());
+            }
+
+            flag = workorderParamStepthreeService.removeByIds(workorderParamStepThreeIds);
+        }
+
+        return flag;
+    }
+
+    //删除关联工单检查项目参数-工序卡4
+    public boolean deleteParamStepFour(String templateId){
+        //执行结果
+        boolean flag = false;
+        //检查项目参数-工序卡4
+        List<String> workorderParamStepfourIds = new ArrayList<>();
+        List<WorkorderParamStepfour> workorderParamStepfourList = workorderParamStepfourService
+                .lambdaQuery()
+                .eq(WorkorderParamStepfour::getTemplateId, templateId)
+                .list();
+        if(0 == workorderParamStepfourList.size()){
+            flag = true;
+        }else {
+            for (WorkorderParamStepfour paramStepfour : workorderParamStepfourList) {
+                workorderParamStepfourIds.add(paramStepfour.getId());
+            }
+
+            flag = workorderParamStepfourService.removeByIds(workorderParamStepfourIds);
+
+        }
+
+        return flag;
+    }
+
+    /******************************************工单详情*****************************************************************/
     //工单信息-工序卡1(选配)详情
     @Override
     public Result<?> queryStepOne(String templateId) {
@@ -289,6 +508,7 @@ public class TemplateServiceImpl implements TemplateService {
         return Result.OK("工序卡4(总成)详情", stepFourBean);
     }
 
+    /******************************************工单修改*****************************************************************/
     //工单信息-修改常规参数-工序卡1(选配)
     @Override
     public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone) {