维护人相关。

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 用户名

blade-ops/blade-job/src/main/resources/application-dev.yml

@@ -3,6 +3,7 @@ server:
   port: 7770
 
 #job服务配置
+#PowerJob外部应用启动类 tech.powerjob.server.PowerJobServerApplication
 powerjob:
   worker:
     app-name: ${spring.application.name}

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java

@@ -37,5 +37,5 @@ public class BaseEntityVO {
     @Schema(description = "维护[用户]-真名")
     private String keepUserRealName = "维护[用户]-真名";
     @Schema(description = "业务状态 名称")
-    private String statusName;
+    private String statusName = "statusName";
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/IdUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.quality.util;
+package org.springblade.desk.basic.util;
 
 /**
  * 雪花 long id工具类。
@@ -32,7 +32,7 @@ public class IdUtil {
     public static Boolean isInvalid(Long id) {
         if (id == null || id <= 0L) {
             return Boolean.TRUE;
-            // todo:兼容老MES数据
+            // todo:兼容老MES数据 不进行19位校验
 //        } else if (id < MIN_19_ID) {
 //            return Boolean.TRUE;
         } else if (id == Long.MAX_VALUE) {

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java

@@ -13,4 +13,11 @@ public interface ProReTemplateConst {
      * 废弃
      */
     Integer STATUS_NO = 3;
+
+
+    Integer ONLINE = 1;
+
+    Integer OFFLINE = 0;
+
+    String DIC  = "ProReTemplate-Status";
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java

@@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
+import org.springblade.desk.quality.constant.ProReTemplateConst;
 import org.springblade.desk.quality.excel.ProReTemplateExcel;
 import org.springblade.desk.quality.pojo.entity.ProReTemplate;
 import org.springblade.desk.quality.pojo.vo.ProReTemplateVO;
@@ -122,6 +123,8 @@ public class ProReTemplateController extends BladeController {
     @Operation(summary = "新增一条", description = "传入ProReTemplate Obj")
     public R save(@Valid @RequestBody ProReTemplate addOne) {
         addOne.setId(null);
+        addOne.setStatus(ProReTemplateConst.STATUS_NEW);
+        addOne.setApprovalStatus(1);
         return R.status(service.save(addOne));
     }
 
@@ -148,6 +151,16 @@ public class ProReTemplateController extends BladeController {
         return R.status(service.updateById(updateOne));
     }
 
+    /**
+     * [过程记录模板] 修改一条
+     */
+    @PostMapping("/updateDetail")
+    @ApiOperationSupport(order = 42)
+    @Operation(summary = "修改一条明细", description = "传入ProReTemplate Obj")
+    public R updateDetail(@Valid @RequestBody ProReTemplateVO updateDetail) {
+        return service.updateDetail(updateDetail);
+    }
+
     /**
      * [过程记录模板] 修改批量
      */
@@ -188,6 +201,13 @@ public class ProReTemplateController extends BladeController {
         return R.status(service.deleteLogic(Func.toLongList(ids)));
     }
 
+    @GetMapping("/removeFromDetail")
+    @ApiOperationSupport(order = 61)
+    @Operation(summary = "逻辑删除FromDetail", description = "传入ids")
+    public R removeFromDetail(@Parameter(description = "", required = true) @RequestParam Long tankId) {
+        return service.removeFromDetail(tankId);
+    }
+
     /**
      * [过程记录模板] 导出Excel
      */
@@ -234,4 +254,14 @@ public class ProReTemplateController extends BladeController {
         );
         return R.status(service.saveBatch(importList));
     }
+
+    /**
+     * [过程记录模板] 逻辑删除
+     */
+    @GetMapping("/copy")
+    @ApiOperationSupport(order = 80)
+    @Operation(summary = "copy", description = "传入id")
+    public R copy(@Parameter(description = "主键", required = true) @RequestParam Long id) {
+        return service.copy(id);
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java

@@ -79,7 +79,7 @@ public class ProReTemplate extends BaseEntity {
 	 * 审批状态
 	 */
 	@Schema(description = "审批状态")
-	private Short approvalStatus;
+	private Integer approvalStatus;
 	/**
 	 * 线上/下-[0]:线上;[1]:线下;
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java

@@ -78,17 +78,17 @@ public class ProReTemplateDetail extends BaseEntity {
 	 * 是否合格
 	 */
 	@Schema(description = "是否合格")
-	private Short qualified;
+	private Integer qualified;
 	/**
 	 * [过程记录模板-槽-明细]id
 	 */
 	@Schema(description = "[过程记录模板-槽-明细]id")
-	private BigDecimal templateTankId;
+	private Long templateTankId;
 	/**
 	 * 明细序号
 	 */
 	@Schema(description = "明细序号")
-	private Short detailIndex;
+	private Integer detailIndex;
 	/**
 	 * 时间
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java

@@ -51,7 +51,7 @@ public class ProReTemplateTank extends BaseEntity {
 	 * [过程记录模板]id
 	 */
 	@Schema(description = "[过程记录模板]id")
-	private BigDecimal templateId;
+	private Long templateId;
 	/**
 	 * 槽号名称
 	 */
@@ -61,15 +61,15 @@ public class ProReTemplateTank extends BaseEntity {
 	 * 插入序号
 	 */
 	@Schema(description = "插入序号")
-	private Short insertIndex;
+	private Integer insertIndex;
 	/**
 	 * 模板类型
 	 */
 	@Schema(description = "模板类型")
-	private Short rfpsType;
+	private Integer rfpsType;
 	/**
 	 * 槽号序号
 	 */
 	@Schema(description = "槽号序号")
-	private BigDecimal slotIndex;
+	private Integer slotIndex;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java

@@ -6,6 +6,8 @@ package org.springblade.desk.quality.pojo.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.desk.basic.pojo.vo.BaseEntityVO;
 import org.springblade.desk.quality.pojo.entity.AuditFile;
 
 import java.io.Serial;
@@ -22,9 +24,6 @@ public class AuditFileVO extends AuditFile {
     @Serial
     private static final long serialVersionUID = 1L;
 
-	/**
+    @Schema(description = "base")
-	 * todo:
+    private BaseEntityVO base;
-	 */
-	@Schema(description = "状态名称")
-	private String statusName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java

@@ -25,5 +25,4 @@ public class ProReTemplateTankVO extends ProReTemplateTank {
 
     @Schema(description = "detail 具体明细")
     List<ProReTemplateDetailVO> childrenList;
-
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java

@@ -26,13 +26,15 @@ public class ProReTemplateVO extends ProReTemplate {
     /**
      * todo:
      */
-    @Schema(description = "基本信息字段")
+    @Schema(description = "base信息字段")
-    private BaseEntityVO base = new BaseEntityVO();
+    private BaseEntityVO base;
 
     @Schema(description = "[作业中心]name")
     private String wcName;
     @Schema(description = "[工序]name")
     private String ppsName;
+    @Schema(description = "[审批状态]name")
+    private String approvalStatusName;
     @Schema(description = "tank 槽明细")
     private List<ProReTemplateTankVO> preserveSlotList;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java

@@ -14,7 +14,7 @@ import org.springblade.desk.quality.pojo.entity.CycleTestItem;
 import org.springblade.desk.quality.pojo.entity.CycleTestStandard;
 import org.springblade.desk.quality.pojo.request.CycleTestItemSubmit;
 import org.springblade.desk.quality.pojo.vo.CycleTestItemVO;
-import org.springblade.desk.quality.util.IdUtil;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.desk.quality.wrapper.CycleTestItemWrapper;
 import org.springblade.resource.feign.IAttachClient;
 import org.springblade.resource.pojo.entity.Attach;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java

@@ -10,7 +10,7 @@ import org.springblade.desk.basic.constant.BaseCol;
 import org.springblade.desk.quality.mapper.CycleTestStandardMapper;
 import org.springblade.desk.quality.pojo.entity.CycleTestStandard;
 import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO;
-import org.springblade.desk.quality.util.IdUtil;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.resource.feign.IAttachClient;
 import org.springblade.resource.pojo.entity.Attach;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java

@@ -6,6 +6,7 @@ package org.springblade.desk.quality.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
 import org.springblade.desk.quality.excel.AuditFileExcel;
 import org.springblade.desk.quality.pojo.entity.AuditFile;
 import org.springblade.desk.quality.pojo.vo.AuditFileVO;
@@ -41,4 +42,6 @@ public interface IAuditFileService extends BaseService<AuditFile> {
      * @param vo
      */
 	void setVOValue(AuditFileVO vo);
+
+	R upgradeVer(Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java

@@ -5,12 +5,14 @@ package org.springblade.desk.quality.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Parameter;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.quality.excel.ProReTemplateExcel;
 import org.springblade.desk.quality.pojo.entity.ProReTemplate;
 import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO;
 import org.springblade.desk.quality.pojo.vo.ProReTemplateVO;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -45,7 +47,11 @@ public interface IProReTemplateService extends BaseService<ProReTemplate> {
      */
     void setVOValue(ProReTemplateVO vo);
 
+    R updateDetail(ProReTemplateVO vo);
+
     R copy(Long id);
 
     R upgradeVer(Long id);
+
+    R removeFromDetail(Long tankId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java

@@ -13,7 +13,7 @@ import org.springblade.desk.quality.mapper.LiquidTankTaskMapper;
 import org.springblade.desk.quality.pojo.entity.LiquidTank;
 import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
 import org.springblade.desk.quality.pojo.request.*;
-import org.springblade.desk.quality.util.IdUtil;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java

@@ -18,7 +18,7 @@ import org.springblade.desk.quality.constant.LiquidTankTaskConst;
 import org.springblade.desk.quality.pojo.entity.LiquidTank;
 import org.springblade.desk.quality.pojo.vo.LiquidTankReportConfigVO;
 import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO;
-import org.springblade.desk.quality.util.IdUtil;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.UserInfo;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java

@@ -11,6 +11,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
 import org.springblade.desk.quality.excel.AuditFileExcel;
 import org.springblade.desk.quality.mapper.AuditFileMapper;
 import org.springblade.desk.quality.pojo.entity.AuditFile;
@@ -55,4 +56,9 @@ public class AuditFileServiceImpl extends BaseServiceImpl<AuditFileMapper, Audit
     public void setVOValue(AuditFileVO vo) {
 
     }
+
+	@Override
+	public R upgradeVer(Long id) {
+		return null;
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankServiceImpl.java

@@ -26,7 +26,7 @@ import org.springblade.desk.quality.mapper.LiquidTankMapper;
 import org.springblade.desk.quality.pojo.entity.LiquidTank;
 import org.springblade.desk.quality.pojo.vo.LiquidTankVO;
 import org.springblade.desk.quality.service.ILiquidTankService;
-import org.springblade.desk.quality.util.IdUtil;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@@ -30,7 +30,7 @@ import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
 import org.springblade.desk.quality.pojo.entity.LiquidTankTaskHi;
 import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO;
 import org.springblade.desk.quality.service.*;
-import org.springblade.desk.quality.util.IdUtil;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java

@@ -11,20 +11,28 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.pojo.vo.BaseEntityVO;
 import org.springblade.desk.quality.constant.ProReTemplateConst;
 import org.springblade.desk.quality.excel.ProReTemplateExcel;
 import org.springblade.desk.quality.mapper.ProReTemplateMapper;
 import org.springblade.desk.quality.pojo.entity.ProReTemplate;
-import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO;
 import org.springblade.desk.quality.pojo.vo.ProReTemplateDetailVO;
 import org.springblade.desk.quality.pojo.vo.ProReTemplateTankVO;
 import org.springblade.desk.quality.pojo.vo.ProReTemplateVO;
 import org.springblade.desk.quality.service.IProReTemplateDetailService;
 import org.springblade.desk.quality.service.IProReTemplateService;
 import org.springblade.desk.quality.service.IProReTemplateTankService;
+import org.springblade.desk.basic.util.IdUtil;
+import org.springblade.system.feign.IDictClient;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.Dept;
+import org.springblade.system.pojo.entity.User;
+import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.stereotype.Service;
 
 import java.util.Comparator;
@@ -48,6 +56,10 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl<ProReTemplateMappe
     @Resource
     private IUserClient userClient;
     @Resource
+    private ISysClient sysClient;
+    @Resource
+    private IDictClient dictClient;
+    @Resource
     private IProReTemplateTankService tankService;
     @Resource
     private IProReTemplateDetailService detailService;
@@ -68,7 +80,10 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl<ProReTemplateMappe
 
     @Override
     public void setVOValue(ProReTemplateVO vo) {
+        vo.setBase(setBaseVOValue(vo, ProReTemplateConst.DIC));
+        //
         List<ProReTemplateTankVO> tankVOList = tankService.getListByTemplateId(vo.getId());
+        if (tankVOList != null && !tankVOList.isEmpty()) {
             // 根据插入序号 getInsertIndex 排序 生成新的list
             tankVOList = tankVOList.stream()
                     .sorted(Comparator.comparingInt(ProReTemplateTankVO::getInsertIndex))
@@ -79,6 +94,84 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl<ProReTemplateMappe
                 tankVO.setChildrenList(detailVOList);
             }
         }
+    }
+
+    /**
+     * 构建BaseEntityVO
+     *
+     * @param be         不赋值可以传入null
+     * @param statusCode 不需要可以传null
+     * @return BaseEntityVO
+     */
+    public BaseEntityVO setBaseVOValue(BaseEntity be, String statusCode) {
+        if (be == null) {
+            return null;
+        }
+        BaseEntityVO bv = new BaseEntityVO();
+        R<UserInfo> rUICR = null;
+        R<UserInfo> rUIUP = null;
+        R<Dept> rDept = null;
+        if (IdUtil.isValid(be.getCreateUser())) {
+            rUICR = userClient.userInfo(be.getCreateUser());
+            if (rUICR != null && rUICR.isSuccess() &&
+                    rUICR.getData() != null && rUICR.getData().getUser() != null) {
+                bv.setCreateUserRealName(rUICR.getData().getUser().getRealName());
+            }
+
+        }
+        if (IdUtil.isValid(be.getUpdateUser())) {
+            rUIUP = userClient.userInfo(be.getUpdateUser());
+            if (rUIUP != null && rUIUP.isSuccess() &&
+                    rUIUP.getData() != null && rUIUP.getData().getUser() != null) {
+                bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName());
+            }
+        }
+        if (IdUtil.isValid(be.getCreateDept())) {
+            rDept = sysClient.getDept(be.getCreateDept());
+            if (rDept != null && rDept.isSuccess() && rDept.getData() != null) {
+                bv.setCreateDeptName(rDept.getData().getDeptName());
+            }
+        }
+        if (be.getCreateTime() != null && be.getUpdateTime() != null) {
+            if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚
+                bv.setKeepUser(be.getUpdateUser());
+                bv.setKeepUserRealName(bv.getUpdateUserRealName());
+            } else { // 等于或更早
+                bv.setKeepUser(be.getCreateUser());
+                bv.setKeepUserRealName(bv.getCreateUserRealName());
+            }
+        }
+        if (StringUtils.isNotBlank(statusCode)) {
+            R<String> rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus());
+            if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) {
+                bv.setStatusName(rStatusDic.getData());
+            }
+        }
+        return bv;
+    }
+
+    @Override
+    public R updateDetail(ProReTemplateVO vo) {
+        for (ProReTemplateTankVO tankOne : vo.getPreserveSlotList()) {
+            tankOne.setTemplateId(vo.getId());
+            if (IdUtil.isValid(tankOne.getId())) {
+                tankService.updateById(tankOne);
+            } else {
+                tankService.save(tankOne);
+            }
+            for (ProReTemplateDetailVO detailOne : tankOne.getChildrenList()) {
+                detailOne.setTemplateTankId(tankOne.getId());
+                if (IdUtil.isValid(detailOne.getId())) {
+                    detailService.updateById(detailOne);
+                } else {
+                    detailService.save(detailOne);
+                }
+            }
+        }
+        ProReTemplate e = new ProReTemplate();
+        BeanUtil.copyProperties(vo, e, true);
+        return R.status(updateById(e));
+    }
 
     @Override
     public R copy(Long id) {
@@ -94,4 +187,9 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl<ProReTemplateMappe
     public R upgradeVer(Long id) {
         return null;
     }
+
+    @Override
+    public R removeFromDetail(Long tankId) {
+        return R.status(tankService.removeById(tankId));
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/StandardServiceImpl.java

@@ -16,7 +16,7 @@ import org.springblade.desk.quality.mapper.StandardMapper;
 import org.springblade.desk.quality.pojo.entity.Standard;
 import org.springblade.desk.quality.pojo.vo.StandardVO;
 import org.springblade.desk.quality.service.IStandardService;
-import org.springblade.desk.quality.util.IdUtil;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.resource.feign.IAttachClient;
 import org.springblade.resource.pojo.entity.Attach;
 import org.springblade.system.feign.IUserClient;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/BaseEntityUtil.java

@@ -3,13 +3,14 @@ package org.springblade.desk.quality.util;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springframework.beans.BeanWrapper;
+import org.springblade.desk.basic.util.IdUtil;
-import org.springframework.beans.BeanWrapperImpl;
 
-import java.beans.PropertyDescriptor;
 import java.util.Date;
 import java.util.Objects;
 
+/**
+ * todo:
+ */
 public class BaseEntityUtil {
 
     /**