镀层物料二级审批

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

@@ -22,6 +22,7 @@ public enum MesApprovalRecordBizTypeEnum {
     BATCH_PLANNING_CATEGORY("槽液计划类/审核"),
     BATCH_PLANNING_TASK("槽液任务/审核"),
     PLATE_GOODS_RECORD("镀层物料需求申报/审核"),
+    PLATE_GOODS_APPLY("镀层物料添加量申报/审核"),
     ;
 
     private final String desc;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java

@@ -10,6 +10,8 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
 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.order.mapper.PlateGoodsApplyMapper;
 import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 import org.springblade.desk.order.pojo.entity.PlateGoodsApply;
@@ -18,6 +20,7 @@ import org.springblade.desk.order.pojo.entity.PlateGoodsRecord;
 import org.springblade.desk.order.pojo.enums.AssayContentEnum;
 import org.springblade.desk.order.pojo.enums.PlateGoodsEnum;
 import org.springblade.desk.order.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,6 +43,9 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 	private final IPlateGoodsRecordService goodsRecordService;
 	private final IPlateGoodsApplyDetailService goodsApplyDetailService;
 
+	@Autowired
+	IMesApprovalRecordService mesApprovalRecordService;
+
 	@Override
 	public IPage<PlateGoodsApply> selectPage(IPage<PlateGoodsApply> page, PlateGoodsApply entity) {
 		List<PlateGoodsApply> dataList = baseMapper.selectPage(page, entity);
@@ -60,6 +66,14 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 			item.setStatus(approvalStatus);
 			item.setApprovalMemo(approvalMemo);
 			dataList.add(item);
+			if(approvalStatus.equals(PlateGoodsEnum.STATUS_PASS.getCode())){
+				//审批通过
+				mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(),  AuthUtil.getUserId(), new Date());
+			}
+			if(approvalStatus.equals(PlateGoodsEnum.STATUS_NOT_PASS.getCode())){
+				//审批驳回
+				mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(),  AuthUtil.getUserId(), new Date());
+			}
 		});
 
 		return this.updateBatchById(dataList);
@@ -176,6 +190,10 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 		goodsRecordService.updateBatchById(addRecordList);
 		this.save(apply);
 
+		//创建代办
+		mesApprovalRecordService.createApproval
+				(apply.getId(), MesApprovalRecordBizTypeEnum.PLATE_GOODS_APPLY.getDesc(),AuthUtil.getUser().getUserId(),new Date());
+
 		//关联订单
 		List<PlateGoodsApplyDetail> goodsApplyDetailList = new ArrayList<>();
 		for (PlateGoodsRecord goodsRecord : addRecordList) {

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java

@@ -614,6 +614,14 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 
 			// 4. 更新数据库
 			this.updateById(plateGoodsRecord);
+			if(approvalStatus.equals(PlateGoodsEnum.SECOND_STATUS_PASS.getCode())){
+				//审批通过
+				mesApprovalRecordService.passApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(),  AuthUtil.getUserId(), new Date());
+			}
+			if(approvalStatus.equals(PlateGoodsEnum.SECOND_STATUS_NOT_PASS.getCode())){
+				//审批驳回
+				mesApprovalRecordService.rejectApproval(id, MesApprovalRecordBizTypeEnum.PLATE_GOODS_RECORD.getDesc(),  AuthUtil.getUserId(), new Date());
+			}
 		}
 
 		return true;