楚江ERP-订货单变更调整

 package com.lframework.xingyun.sc.bo.order.change;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.xingyun.sc.entity.OrderInfoChangeRecord;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
@@ -55,6 +56,12 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
     private String orderingUnit;
 
     /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
      * 订货日期
      */
     @ApiModelProperty("订货日期")
@@ -200,12 +207,24 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
     private Double totalQuantity;
 
     /**
+     * 变更后总数量
+     */
+    @ApiModelProperty("变更后总数量")
+    private Double afterTotalQuantity;
+
+    /**
      * 包装费
      */
     @ApiModelProperty("包装费")
     private BigDecimal packagingFee;
 
     /**
+     * 制单日期
+     */
+    @ApiModelProperty("制单日期")
+    private LocalDate createDate;
+
+    /**
      * 变更前规格数据
      */
     @ApiModelProperty("变更前规格数据")
@@ -217,6 +236,18 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
     @ApiModelProperty("变更后规格数据")
     private List<PurchaseOrderLine> afterChangeSpecList;
 
+    /**
+     * 是否展示审核按钮
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private Boolean showExamine;
+
+    /**
+     * 是否是变更发起人
+     */
+    @ApiModelProperty("是否是变更发起人")
+    private Boolean changeCreateBy;
+
 
     public OrderChangeRecordBo() {
 
@@ -233,6 +264,11 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
 
     @Override
     protected void afterInit(OrderInfoChangeRecord dto) {
-
+        LocalDateTime time = dto.getCreateTime();
+        if (time != null) {
+            this.createDate = time.toLocalDate();
+        }
+        String createBy = dto.getCreateBy();
+        this.changeCreateBy = SecurityUtil.getCurrentUser().getId().equals(createBy);
     }
 }

@@ -176,6 +176,12 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
     private Double totalQuantity;
 
     /**
+     * 变更后总数量
+     */
+    @TableField(exist = false)
+    private Double afterTotalQuantity;
+
+    /**
      * 包装费
      */
     private BigDecimal packagingFee;
@@ -205,6 +211,12 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
     private List<PurchaseOrderLine> afterChangeSpecList;
 
     /**
+     * 是否展示审核按钮
+     */
+    @TableField(exist = false)
+    private Boolean showExamine;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -3,9 +3,13 @@ package com.lframework.xingyun.sc.impl.order;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.components.redis.RedisHandler;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
@@ -29,6 +33,7 @@ import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.change.*;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +42,7 @@ import com.lframework.xingyun.sc.service.order.OrderChangeRecordService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -63,6 +69,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
     private RedisHandler redisHandler;
     @Resource
     private MessageHandler messageHandler;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
     @Override
@@ -78,7 +86,21 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
 
     @Override
     public List<OrderInfoChangeRecord> query(QueryPurchaseOrderInfoVo vo) {
-        return getBaseMapper().query(vo);
+        List<OrderInfoChangeRecord> recordList = getBaseMapper().query(vo);
+        if (CollectionUtils.isEmpty(recordList)) {
+            return Collections.emptyList();
+        }
+        // 判断当前人员是否有审核权限
+        // 获取当前人员的待办任务数据
+        List<String> businessIds = new ArrayList<>();
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (CollectionUtils.isNotEmpty(flowTaskList)) {
+            businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+        }
+        for (OrderInfoChangeRecord record : recordList) {
+            record.setShowExamine(businessIds.contains(record.getId()));
+        }
+        return recordList;
     }
 
     @Override
@@ -94,6 +116,16 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         changeRecord.setBeforeChangeSpecList(beforeChangeList);
         // 变更后
         List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(id), true);
+        if (CollectionUtils.isNotEmpty(afterChangeList)) {
+            BigDecimal total = BigDecimal.ZERO;
+            for (PurchaseOrderLine afterChangeLine : afterChangeList) {
+                BigDecimal quantity = afterChangeLine.getQuantity();
+                if (quantity != null) {
+                    total = total.add(quantity);
+                }
+            }
+            changeRecord.setAfterTotalQuantity(total.doubleValue());
+        }
         changeRecord.setAfterChangeSpecList(afterChangeList);
 
         return changeRecord;