修改enum

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java

@@ -11,10 +11,13 @@ import lombok.Getter;
 public enum MesApprovalRecordBizTypeEnum {
 
     OEM_STATEMENT("外协结算校对/审核"),
+
     WMS_EXTRA_PLAN("仓库额外计划审批"),
     TOOL_PLAN_APPLY_AUDIT("工装计划申报审批"),
     TEAM_GROUP_PROCESS_AUDIT("班组提请工艺审批"),
     WMS_SCRAP_AUDIT("仓库报废审批"),
+    BATCH_PLANNING_CATEGORY("槽液计划类/审核"),
+
     ;
 
     private final String desc;

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreservePlanServiceImpl.java

@@ -28,6 +28,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.IMesApprovalRecordService;
 import org.springblade.desk.dashboard.constant.BatchConstant;
 import org.springblade.desk.dashboard.pojo.dto.DsBatchPreservePlanDTO;
 import org.springblade.desk.dashboard.pojo.entity.*;
@@ -90,6 +92,9 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 	@Autowired
 	IDsMainSaltAddQuantityService mainSaltAddQuantityService;
 
+	@Autowired
+	IMesApprovalRecordService mesApprovalRecordService;
+
 	@Override
 	public IPage<DsBatchPreservePlanVO> selectDsBatchPreservePlanPage(IPage<DsBatchPreservePlanVO> page, DsBatchPreservePlanVO dsBatchPreservePlan) {
 
@@ -134,7 +139,10 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 				batchPreservePlan.setPreservePlanStatus("1");
 				save(batchPreservePlan);
 
+
 				//创建代办
+				mesApprovalRecordService.createApproval
+						(batchPreservePlan.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_CATEGORY.getDesc(),AuthUtil.getUser().getUserId(),new Date());
 			}
 		}
 		return true;
@@ -145,13 +153,16 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 		DsBatchPreservePlanEntity batchPreservePlanEntity = batchPreservePlanMapper.selectById(dsBatchPreservePlan.getId());
 		if(dsBatchPreservePlan.getIsPass()){
 			batchPreservePlanEntity.setApprovalStatus(BatchConstant.DIRECTOR_STATUS_RECEIPT);
-
+			//审批通过
+			mesApprovalRecordService.passApproval(dsBatchPreservePlan.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_CATEGORY.getDesc(),  AuthUtil.getUserId(), new Date());
 		}else {
 			batchPreservePlanEntity.setApprovalStatus(BatchConstant.DIRECTOR_STATUS_ASSIGN);
+			//审批驳回
+			mesApprovalRecordService.rejectApproval(dsBatchPreservePlan.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_CATEGORY.getDesc(),  AuthUtil.getUserId(), new Date());
 		}
 		batchPreservePlanEntity.setApprovalOpinion(dsBatchPreservePlan.getApprovalOpinion());
-		updateById(batchPreservePlanEntity);
+
-		return true;
+		return updateById(batchPreservePlanEntity);
 	}
 
 	@Override
@@ -159,13 +170,16 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 		DsBatchPreservePlanEntity batchPreservePlanEntity = batchPreservePlanMapper.selectById(dsBatchPreservePlan.getId());
 		if(dsBatchPreservePlan.getIsPass()){
 			batchPreservePlanEntity.setApprovalStatus(BatchConstant.FACTORY_STATUS_RECEIPT);
-
+			//审批通过
+			mesApprovalRecordService.passApproval(dsBatchPreservePlan.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_CATEGORY.getDesc(),  AuthUtil.getUserId(), new Date());
 		}else {
 			batchPreservePlanEntity.setApprovalStatus(BatchConstant.FACTORY_STATUS_ASSIGN);
+			//审批驳回
+			mesApprovalRecordService.rejectApproval(dsBatchPreservePlan.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_CATEGORY.getDesc(),  AuthUtil.getUserId(), new Date());
 		}
 		batchPreservePlanEntity.setApprovalOpinion(dsBatchPreservePlan.getApprovalOpinion());
-		updateById(batchPreservePlanEntity);
+
-		return true;
+		return updateById(batchPreservePlanEntity);
 	}
 
 	@Override