任务审批

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java

@@ -19,5 +19,5 @@ public interface BizTypeConstant {
 
 	String SET_SUITE_FLOW = "齐套流转";
 
-	String INVENTORY_WRITE_OFF = "库存报废";
+	String INVENTORY_WRITE_OFF = "磨具变更-库存报废";
 }

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

@@ -16,10 +16,11 @@ public enum MesApprovalRecordBizTypeEnum {
     TOOL_PLAN_APPLY_AUDIT("工装计划申报审批"),
     TEAM_GROUP_PROCESS_AUDIT("班组提请工艺审批"),
     WMS_SCRAP_AUDIT("仓库报废审批"),
-    BATCH_PLANNING_CATEGORY("槽液计划类/审核"),
     LIQUID_TANK_TASK("槽液加药量审核"),
     RAISE_HAND("举手免责审核"),
     PRO_RE_TEMPLATE("过程记录模板审核"),
+    BATCH_PLANNING_CATEGORY("槽液计划类/审核"),
+    BATCH_PLANNING_TASK("槽液任务/审核"),
     ;
 
     private final String desc;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java

@@ -103,10 +103,7 @@ public class DsBatchPreserveTaskEntity extends BaseEntity {
 	private String auditDescribe;
 	/**
 	 * 审核状态
-	 * 维护状态 和 审核状态 用taskStatus
-	 * auditStatus 作废
 	 */
-	@Deprecated
 	@Schema(description = "审核状态")
 	private Long auditStatus;
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreservePlanServiceImpl.java

@@ -3,27 +3,49 @@ package org.springblade.desk.common.service.impl;
 import jakarta.annotation.Resource;
 import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
 import org.springblade.desk.common.service.ApprovalRecordDetailStrategy;
+import org.springblade.desk.dashboard.pojo.entity.BsWorkCenterEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsBatchPreservePlanEntity;
+import org.springblade.desk.dashboard.pojo.vo.DsBatchPreservePlanVO;
+import org.springblade.desk.dashboard.service.IBsWorkCenterService;
 import org.springblade.desk.dashboard.service.IDsBatchPreservePlanService;
+import org.springblade.system.feign.IUserClient;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * 槽液计划类审核待办策略实现类
  */
 @Service
-public class BatchPreservePlanServiceImpl implements ApprovalRecordDetailStrategy<DsBatchPreservePlanEntity> {
+public class BatchPreservePlanServiceImpl implements ApprovalRecordDetailStrategy<DsBatchPreservePlanVO> {
 
     @Resource
     private IDsBatchPreservePlanService batchPreservePlanService;
 
+    @Autowired
+    IBsWorkCenterService workCenterService;
+
+    @Autowired
+    IUserClient userClient;
+
     @Override
     public String getBizType() {
         return MesApprovalRecordBizTypeEnum.BATCH_PLANNING_CATEGORY.getDesc();
     }
 
     @Override
-    public DsBatchPreservePlanEntity getDetail(Long bizId) {
+    public DsBatchPreservePlanVO getDetail(Long bizId) {
         DsBatchPreservePlanEntity detail = batchPreservePlanService.getById(bizId);
-        return detail;
+        DsBatchPreservePlanVO vo = new DsBatchPreservePlanVO();
+        BeanUtils.copyProperties(detail, vo);
+        if(null != vo.getWcId()){
+            BsWorkCenterEntity workCenterEntity = workCenterService.getById(vo.getWcId());
+            vo.setWcName(workCenterEntity.getWcName());
+        }
+        if(null != vo.getKeepMan()){
+            String name = userClient.userInfo(vo.getKeepMan()).getData().getUser().getName();
+            vo.setKeepManStr(name);
+        }
+        return vo;
     }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/BatchPreserveTaskServiceImpl.java

@@ -0,0 +1,29 @@
+package org.springblade.desk.common.service.impl;
+
+import jakarta.annotation.Resource;
+import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
+import org.springblade.desk.common.service.ApprovalRecordDetailStrategy;
+import org.springblade.desk.dashboard.pojo.entity.DsBatchPreserveTaskEntity;
+import org.springblade.desk.dashboard.service.IDsBatchPreserveTaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 槽液任务审核待办策略实现类
+ */
+@Service
+public class BatchPreserveTaskServiceImpl implements ApprovalRecordDetailStrategy<DsBatchPreserveTaskEntity> {
+
+    @Resource
+    private  IDsBatchPreserveTaskService dsBatchPreserveTaskService;
+
+    @Override
+    public String getBizType() {
+        return MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc();
+    }
+
+    @Override
+    public DsBatchPreserveTaskEntity getDetail(Long bizId) {
+        DsBatchPreserveTaskEntity batchPreserveTaskEntity = dsBatchPreserveTaskService.getById(bizId);
+        return batchPreserveTaskEntity;
+    }
+}

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

@@ -195,6 +195,10 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 				dsBatchPreserveTaskEntity.setTaskCreateTime(new Date());
 				dsBatchPreserveTaskEntity.setTaskStatus(BatchConstant.TO_BE_MAINTAINED.longValue());
 				batchPreserveTaskService.save(dsBatchPreserveTaskEntity);
+
+				//创建代办
+				mesApprovalRecordService.createApproval
+						(dsBatchPreserveTaskEntity.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),AuthUtil.getUser().getUserId(),new Date());
 			}
 		}
 	}
@@ -214,6 +218,10 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 				dsBatchPreserveTaskEntity.setTaskCreateTime(new Date());
 				dsBatchPreserveTaskEntity.setTaskStatus(BatchConstant.TO_BE_MAINTAINED.longValue());
 				batchPreserveTaskService.save(dsBatchPreserveTaskEntity);
+
+				//创建代办
+				mesApprovalRecordService.createApproval
+						(dsBatchPreserveTaskEntity.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),AuthUtil.getUser().getUserId(),new Date());
 			}
 		}
 
@@ -549,6 +557,10 @@ public class DsBatchPreservePlanServiceImpl extends BaseServiceImpl<DsBatchPrese
 		dsBatchPreserveTask.setTaskStatus(BatchConstant.TO_BE_MAINTAINED.longValue());
 		batchPreserveTaskService.save(dsBatchPreserveTask);
 
+		//创建代办
+		mesApprovalRecordService.createApproval
+				(dsBatchPreserveTask.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),AuthUtil.getUser().getUserId(),new Date());
+
 	}
 
 

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

@@ -27,6 +27,8 @@ package org.springblade.desk.dashboard.service.impl;
 
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
+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.entity.BsWorkCenterEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsBatchPreservePlanEntity;
@@ -73,6 +75,9 @@ public class DsBatchPreserveTaskServiceImpl extends BaseServiceImpl<DsBatchPrese
 	@Autowired
 	IUserClient userClient;
 
+	@Autowired
+	IMesApprovalRecordService mesApprovalRecordService;
+
 	@Override
 	public IPage<DsBatchPreserveTaskVO> selectDsBatchPreserveTaskPage(IPage<DsBatchPreserveTaskVO> page, DsBatchPreserveTaskVO dsBatchPreserveTask) {
 		List<Integer> taskStatusList = new ArrayList<>(Arrays.asList(
@@ -135,12 +140,21 @@ public class DsBatchPreserveTaskServiceImpl extends BaseServiceImpl<DsBatchPrese
 		if(!CollectionUtils.isEmpty(dsBatchPreserveTaskEntityList)){
 			for (DsBatchPreserveTaskEntity dsBatchPreserveTaskEntity : dsBatchPreserveTaskEntityList) {
 				DsBatchPreserveTaskEntity dsBatchPreserveTask = batchPreserveTaskMapper.selectById(dsBatchPreserveTaskEntity.getId());
-				dsBatchPreserveTask.setTaskStatus(dsBatchPreserveTaskEntity.getTaskStatus());
+				dsBatchPreserveTask.setTaskStatus(dsBatchPreserveTaskEntity.getAuditStatus());
 				Long userId = AuthUtil.getUser().getUserId();
 				dsBatchPreserveTask.setAuditMan(userId);
 				dsBatchPreserveTask.setAuditTime(new Date());
 				dsBatchPreserveTask.setAuditDescribe(dsBatchPreserveTaskEntity.getAuditDescribe());
 				batchPreserveTaskMapper.updateById(dsBatchPreserveTask);
+
+				if(dsBatchPreserveTaskEntity.getAuditStatus().equals(BatchConstant.AUDIT_PASS.longValue())){
+					//审批通过
+					mesApprovalRecordService.passApproval(dsBatchPreserveTaskEntity.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),  AuthUtil.getUserId(), new Date());
+				}
+				if(dsBatchPreserveTaskEntity.getAuditStatus().equals(BatchConstant.AUDIT_NO_PASS.longValue())){
+					//审批驳回
+					mesApprovalRecordService.rejectApproval(dsBatchPreserveTaskEntity.getId(), MesApprovalRecordBizTypeEnum.BATCH_PLANNING_TASK.getDesc(),  AuthUtil.getUserId(), new Date());
+				}
 			}
 		}
 		return true;