diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java index 72f7544b..8fb9e14e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java @@ -129,4 +129,28 @@ public class PlateGoodsRecord extends BaseEntity { */ @TableField(value = "SURPLUS") private BigDecimal surplus; + + /** + * 二级审批人 + */ + @TableField(value = "APPROVAL_MAN2") + private Long approvalMan2; + + /** + * 二级审批时间 + */ + @TableField(value = "APPROVAL_TIME2") + private Date approvalTime2; + + /** + * 二级审批状态 + */ + @TableField(value = "APPROVAL_STATUS2") + private Integer approvalStatus2; + + /** + * 二级审批结果/备注 + */ + @TableField(value = "APPROVAL_MEMO2") + private String approvalMemo2; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/PlateGoodsEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/PlateGoodsEnum.java index 303a0ddb..782db02c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/PlateGoodsEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/PlateGoodsEnum.java @@ -28,6 +28,8 @@ public enum PlateGoodsEnum { STATUS_DONE("已完成", 10004), STATUS_NOT_PASS("审核未通过", 10005), STATUS_CLOSE("已关闭", 10006), + SECOND_STATUS_PASS("二级审核通过", 10007), + SECOND_STATUS_NOT_PASS("二级审核未通过", 10008), ; final String name; final int code; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java index 34fba329..03adfb98 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java @@ -120,7 +120,7 @@ public class PlateGoodsRecordController extends BladeController { } /** - * 批量审核 + * 一级批量审核(核算员) */ @PostMapping("/confirmBatch") @Operation(summary = "批量审核", description = "") @@ -131,6 +131,18 @@ public class PlateGoodsRecordController extends BladeController { return R.status(result); } + /** + * 二级批量审核(厂长,副厂长) + */ + @PostMapping("/secondConfirmBatch") + @Operation(summary = "批量审核", description = "") + public R secondConfirmBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids, + @Parameter(description = "审核结果", required = true) @RequestParam Integer approvalStatus, + @Parameter(description = "审批意见", required = true) @RequestParam String approvalMemo) { + Boolean result = goodsRecordService.secondConfirmBatch(Func.toLongList(ids), approvalStatus, approvalMemo); + return R.status(result); + } + /** * 批量关闭 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java index 706d8054..1fc836b8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsRecordService.java @@ -83,4 +83,13 @@ public interface IPlateGoodsRecordService extends BaseService * @return */ boolean calculateCoatingMaterial(YieldOrder yieldOrder); + + /** + * 二级审核 + * @param toLongList + * @param approvalStatus + * @param approvalMemo + * @return + */ + boolean secondConfirmBatch(List toLongList, Integer approvalStatus, String approvalMemo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java index 9e695bf3..3ac6b26f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java @@ -435,6 +435,24 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl ids, Integer approvalStatus, String approvalMemo) { + List plateGoodsRecordList = new ArrayList<>(); + + BladeUser user = AuthUtil.getUser(); + ids.forEach(id -> { + PlateGoodsRecord plateGoodsRecord = new PlateGoodsRecord(); + plateGoodsRecord.setId(id); + plateGoodsRecord.setApprovalMan2(user.getUserId()); + plateGoodsRecord.setApprovalTime2(DateUtil.now()); + plateGoodsRecord.setApprovalStatus2(approvalStatus); + plateGoodsRecord.setApprovalMemo2(approvalMemo); + plateGoodsRecordList.add(plateGoodsRecord); + }); + + return this.updateBatchById(plateGoodsRecordList); + } + /** * 将订单状态标记为数据异常,记录异常原因 * @param yieldOrder