楚江ERP：撤销单-增加撤销总数量及按钮展示权限

@@ -269,7 +269,7 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     /**
     /**
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)
      */
      */
-    @TableField(exist = false)
+    @ApiModelProperty("是否展示审核按钮")
     private Boolean showExamine;
     private Boolean showExamine;
 
 
 
 

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.bo.order;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
+
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
@@ -96,12 +98,36 @@ public class GetPurchaseOrderRevokeBo extends BaseBo<PurchaseOrderRevoke> {
     private String confirmationVoucherFileName;
     private String confirmationVoucherFileName;
 
 
     /**
     /**
+     * 原总数量
+     */
+    @ApiModelProperty("原总数量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 撤销总数量
+     */
+    @ApiModelProperty("撤销总数量")
+    private BigDecimal totalRevokeQuantity;
+
+    /**
      * 创建人(制单人)
      * 创建人(制单人)
      */
      */
     @ApiModelProperty("创建人")
     @ApiModelProperty("创建人")
     private String createBy;
     private String createBy;
 
 
     /**
     /**
+     * 是否为撤销单创建人
+     */
+    @ApiModelProperty("创建人")
+    private boolean revokeCreateBy;
+
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private Boolean showExamine;
+
+    /**
      * 订货单撤销表物料行
      * 订货单撤销表物料行
      */
      */
     @ApiModelProperty("订货单撤销表物料行")
     @ApiModelProperty("订货单撤销表物料行")

@@ -2,12 +2,15 @@ package com.lframework.xingyun.sc.controller.order;
 
 
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+
+import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderRevokeBo;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderRevokeBo;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
@@ -64,7 +67,18 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
         List<GetPurchaseOrderRevokeBo> results = null;
         List<GetPurchaseOrderRevokeBo> results = null;
 
 
         if (!CollectionUtil.isEmpty(datas)) {
         if (!CollectionUtil.isEmpty(datas)) {
-            results = datas.stream().map(GetPurchaseOrderRevokeBo::new).collect(Collectors.toList());
+            String currentUserId = SecurityUtil.getCurrentUser().getId();
+
+            results = datas.stream().map(purchaseOrderRevoke -> {
+                GetPurchaseOrderRevokeBo bo = new GetPurchaseOrderRevokeBo(purchaseOrderRevoke);
+                // 判断 createById 是否等于当前用户 ID
+                boolean isCreateBy = false;
+                if (currentUserId.equals(purchaseOrderRevoke.getCreateById())) {
+                    isCreateBy = true;
+                }
+                bo.setRevokeCreateBy(isCreateBy);
+                return bo;
+            }).collect(Collectors.toList());
         }
         }
 
 
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));

@@ -87,6 +87,16 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private String confirmationVoucherFileName;
     private String confirmationVoucherFileName;
 
 
     /**
     /**
+     * 原总数量
+     */
+    private BigDecimal totalQuantity;
+
+    /**
+     * 撤销总数量
+     */
+    private BigDecimal totalRevokeQuantity;
+
+    /**
      * 撤销撤销数量总和（吨）（非持久化字段）
      * 撤销撤销数量总和（吨）（非持久化字段）
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
@@ -99,6 +109,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private String userId;
     private String userId;
 
 
     /**
     /**
+     * 是否展示审核字段（非持久化字段）
+     */
+    @TableField(exist = false)
+    private boolean showExamine;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -234,6 +234,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 if (query.size() < query1.size()) {
                 if (query.size() < query1.size()) {
                     b = false;
                     b = false;
                 }
                 }
+                BigDecimal totalQuantity = BigDecimal.ZERO;
                 for (PurchaseOrderRevokeLine purchaseOrderRevokeLine : query) {
                 for (PurchaseOrderRevokeLine purchaseOrderRevokeLine : query) {
                     //原数量
                     //原数量
                     BigDecimal quantity = purchaseOrderRevokeLine.getQuantity();
                     BigDecimal quantity = purchaseOrderRevokeLine.getQuantity();
@@ -247,9 +248,12 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                     }
                     }
                     if (quantity != null) {
                     if (quantity != null) {
                         BigDecimal result = quantity.subtract(revokeQuantity);
                         BigDecimal result = quantity.subtract(revokeQuantity);
+                        totalQuantity = totalQuantity.add(result);
                         purchaseOrderLineService.updateQuantity(purchaseOrderRevokeLine.getPurchaseOrderLineId(), result);
                         purchaseOrderLineService.updateQuantity(purchaseOrderRevokeLine.getPurchaseOrderLineId(), result);
                     }
                     }
                 }
                 }
+                //更新总数量
+                purchaseOrderInfoService.updateTotalQuantity(revoke.getPurchaseOrderId(), totalQuantity);
                 //更新订货单撤销状态（部分撤销、全部撤销）
                 //更新订货单撤销状态（部分撤销、全部撤销）
                 if (b) {
                 if (b) {
                     //全部撤销
                     //全部撤销

@@ -37,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -373,6 +374,19 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
     }
     }
 
 
+    @OpLog(type = OtherOpLogType.class, name = "更新总数量，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateTotalQuantity(String id, BigDecimal totalQuantity) {
+        if (StringUtils.isBlank(id) || totalQuantity == null) {
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                .set(PurchaseOrderInfo::getTotalQuantity, totalQuantity)
+                .eq(PurchaseOrderInfo::getId, id);
+        getBaseMapper().update(updateWrapper);
+    }
+
     /**
     /**
      * 更新规格变更状态
      * 更新规格变更状态
      *
      *

@@ -3,7 +3,10 @@ package com.lframework.xingyun.sc.impl.order;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -19,6 +22,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderRevokeMapper;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderRevokeMapper;
@@ -26,6 +30,7 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeService;
 import com.lframework.xingyun.sc.vo.order.*;
 import com.lframework.xingyun.sc.vo.order.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -35,6 +40,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOrderRevokeMapper, PurchaseOrderRevoke> implements PurchaseOrderRevokeService {
 public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOrderRevokeMapper, PurchaseOrderRevoke> implements PurchaseOrderRevokeService {
@@ -46,7 +52,8 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
     private PurchaseOrderInfoService purchaseOrderInfoService;
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     @Resource
     private FlowInstanceWrapperService flowInstanceWrapperService;
     private FlowInstanceWrapperService flowInstanceWrapperService;
-
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
     @Override
     @Override
     public PageResult<PurchaseOrderRevoke> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderRevokeVo vo) {
     public PageResult<PurchaseOrderRevoke> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderRevokeVo vo) {
@@ -56,6 +63,21 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
 
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<PurchaseOrderRevoke> datas = this.query(vo);
         List<PurchaseOrderRevoke> datas = this.query(vo);
+        if (CollectionUtils.isNotEmpty(datas)) {
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (CollectionUtils.isEmpty(flowTaskList)) {
+                return new PageResult<>();
+            }
+            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            for (PurchaseOrderRevoke purchaseOrderRevoke : datas) {
+                if (ids.contains(purchaseOrderRevoke.getId())) {
+                    purchaseOrderRevoke.setShowExamine(true);
+                } else {
+                    purchaseOrderRevoke.setShowExamine(false);
+                }
+            }
+        }
 
 
         return PageResultUtil.convert(new PageInfo<>(datas));
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
     }
@@ -108,6 +130,12 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         if (!StringUtil.isBlank(vo.getConfirmationVoucherFileName())) {
         if (!StringUtil.isBlank(vo.getConfirmationVoucherFileName())) {
             data.setConfirmationVoucherFileName(vo.getConfirmationVoucherFileName());
             data.setConfirmationVoucherFileName(vo.getConfirmationVoucherFileName());
         }
         }
+        if (vo.getTotalQuantity() != null) {
+            data.setTotalQuantity(vo.getTotalQuantity());
+        }
+        if (vo.getTotalRevokeQuantity() != null) {
+            data.setTotalRevokeQuantity(vo.getTotalRevokeQuantity());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -176,6 +204,8 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
                 .set(PurchaseOrderRevoke::getRevokeReason, StringUtil.isBlank(vo.getRevokeReason()) ? null : vo.getRevokeReason())
                 .set(PurchaseOrderRevoke::getRevokeReason, StringUtil.isBlank(vo.getRevokeReason()) ? null : vo.getRevokeReason())
                 .set(PurchaseOrderRevoke::getConfirmationVoucherFileId, StringUtil.isBlank(vo.getConfirmationVoucherFileId()) ? null : vo.getConfirmationVoucherFileId())
                 .set(PurchaseOrderRevoke::getConfirmationVoucherFileId, StringUtil.isBlank(vo.getConfirmationVoucherFileId()) ? null : vo.getConfirmationVoucherFileId())
                 .set(PurchaseOrderRevoke::getConfirmationVoucherFileName, StringUtil.isBlank(vo.getConfirmationVoucherFileName()) ? null : vo.getConfirmationVoucherFileName())
                 .set(PurchaseOrderRevoke::getConfirmationVoucherFileName, StringUtil.isBlank(vo.getConfirmationVoucherFileName()) ? null : vo.getConfirmationVoucherFileName())
+                .set(PurchaseOrderRevoke::getTotalQuantity, vo.getTotalQuantity() == null ? null : vo.getTotalQuantity())
+                .set(PurchaseOrderRevoke::getTotalRevokeQuantity, vo.getTotalRevokeQuantity() == null ? null : vo.getTotalRevokeQuantity())
                 .eq(PurchaseOrderRevoke::getId, vo.getId());
                 .eq(PurchaseOrderRevoke::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -6,6 +6,8 @@ import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -90,6 +92,14 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
     void updateRevokeStatus(String id, String status);
     void updateRevokeStatus(String id, String status);
 
 
     /**
     /**
+     * 更新总数量
+     *
+     * @param id            主键ID
+     * @param totalQuantity 总数量
+     */
+    void updateTotalQuantity(String id, BigDecimal totalQuantity);
+
+    /**
      * 更新规格变更状态
      * 更新规格变更状态
      *
      *
      * @param id        主键ID
      * @param id        主键ID

 package com.lframework.xingyun.sc.vo.order;
 package com.lframework.xingyun.sc.vo.order;
 
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
@@ -94,4 +95,16 @@ public class CreatePurchaseOrderRevokeVo implements BaseVo, Serializable {
     @ApiModelProperty("订货单撤销表物料行")
     @ApiModelProperty("订货单撤销表物料行")
     private List<PurchaseOrderRevokeLine> purchaseOrderRevokeLineList;
     private List<PurchaseOrderRevokeLine> purchaseOrderRevokeLineList;
 
 
+    /**
+     * 原总数量
+     */
+    @ApiModelProperty("原总数量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 撤销总数量
+     */
+    @ApiModelProperty("撤销总数量")
+    private BigDecimal totalRevokeQuantity;
+
 }
 }

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.vo.order;
 
 
 import lombok.Data;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
@@ -57,4 +58,16 @@ public class UpdatePurchaseOrderRevokeVo implements BaseVo, Serializable {
     @ApiModelProperty("订货单撤销单物料行")
     @ApiModelProperty("订货单撤销单物料行")
     List<UpdatePurchaseOrderRevokeLineVo> updatePurchaseOrderRevokeLineVoList;
     List<UpdatePurchaseOrderRevokeLineVo> updatePurchaseOrderRevokeLineVoList;
 
 
+    /**
+     * 原总数量
+     */
+    @ApiModelProperty("原总数量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 撤销总数量
+     */
+    @ApiModelProperty("撤销总数量")
+    private BigDecimal totalRevokeQuantity;
+
 }
 }

@@ -13,7 +13,8 @@
         <result column="status" property="status"/>
         <result column="status" property="status"/>
         <result column="revoke_reason" property="revokeReason"/>
         <result column="revoke_reason" property="revokeReason"/>
         <result column="confirmation_voucher_file_id" property="confirmationVoucherFileId"/>
         <result column="confirmation_voucher_file_id" property="confirmationVoucherFileId"/>
-        <result column="confirmation_voucher_file_name" property="confirmationVoucherFileName"/>
+        <result column="total_quantity" property="totalQuantity"/>
+        <result column="total_revoke_quantity" property="totalRevokeQuantity"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -36,6 +37,8 @@
             tb.revoke_reason,
             tb.revoke_reason,
             tb.confirmation_voucher_file_id,
             tb.confirmation_voucher_file_id,
             tb.confirmation_voucher_file_name,
             tb.confirmation_voucher_file_name,
+            tb.total_quantity,
+            tb.total_revoke_quantity,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,