feat:1.包装费用表添加提成,提成状态,已发提成。

2.系统配置中的提成成本配置添加包装费用提成。

feat:1.包装费用表添加提成,提成状态,已发提成。
2.系统配置中的提成成本配置添加包装费用提成。
chenhang4442024
1 parent 50ce9682
Showing 11 changed files with 398 additions and 169 deletions
src/main/java/com/order/erp/controller/OrderCostController.java
src/main/java/com/order/erp/domain/ApplyTypeEnum.java
src/main/java/com/order/erp/domain/CommissionStatusEnum.java
src/main/java/com/order/erp/domain/dto/order/OrderCostInfoDO.java
src/main/java/com/order/erp/domain/vo/order/BusinessProfitDetailVO.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/domain/vo/order/OrderCostInfoVO.java
src/main/java/com/order/erp/domain/vo/order/OrderCostInfolockFieldVO.java
src/main/java/com/order/erp/service/order/IOrderCostInfoService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
@@ -84,4 +84,10 @@ public class OrderCostController {
         return orderCostInfoService.setInnerProduceStatus(vo);
     }
+
+    @PostMapping("/setCommissionStatus")
+    @ApiOperation("设置包装费用明细表的提成发放状态")
+    public ServerResult setCommissionStatus(@RequestBody OrderCostInfoVO vo) {
+        return orderCostInfoService.setCommissionStatus(vo);
+    }
 }
@@ -31,6 +31,7 @@ public enum ApplyTypeEnum {
     ORDER_PACKET_COST_FIELD_EDIT_APPLY(80,"订单包装费用明细字段申请"),
     ORDER_PACKET_COST_PASS(81,"订单包装费用明细表申请通过"),
+    ORDER_PACKET_COST_COMMISSION_PASS(82,"提成发放通过"),
     ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY(90,"订单生产费用明细字段申请"),
     ORDER_PRODUCTION_COST_APPLY(91,"订单生产费用明细申请通过"),
     ;
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+//提成发放状态。
+@Getter
+@AllArgsConstructor
+public enum CommissionStatusEnum {
+    UN_ISSUED(-1,"未发放"),
+    ISSUED(0,"已发放"),
+        ;
+    private Integer status;
+    private String desc;
+}
@@ -49,6 +49,14 @@ public class OrderCostInfoDO extends BaseDO implements Serializable {
     private BigDecimal productionDepartmentPredictUnitPrice;
     //包装费用明细表状态。
     private Integer packStatus;
+    //包装费用明细表中的提成发放状态。
+    private Integer orderCommissionStatus;
+    //包装费用表的已发提成。
+    private BigDecimal issuedCommission;
+    //包装费用明细表中的备注信息。
+    private String packNotes;
+    //包装费用表的已通过的包装费用提成总金额。 需要把已通过的包装提成总金额存储起来,下次再查询时使用已通过的包装提成总金额进行计算,而不再采用系统配置中的包装提成总金额进行计算,这样做的目的主要是为了避免更改系统配置中包装提成总金额后,即使已通过也会被改变,所以存储通过时的包装提成金额。
+    private BigDecimal passedCopyCommission ;
     //内部生产明细表状态。
     private Integer innerProduceStatus;
@@ -128,6 +128,24 @@ public class BusinessProfitDetailVO implements Serializable {
     private Integer packStatus;
     /**
+     * 包装费用明细表的提成发放状态
+     */
+    @ApiModelProperty(value = "包装费用明细表的提成发放状态")
+    private Integer orderCommissionStatus;
+
+    /**
+     * 包装费用明细表的已发提成
+     */
+    @ApiModelProperty(value = "包装费用明细表的已发提成")
+    private BigDecimal issuedCommission;
+    /**
+     * 包装费用明细表的备注
+     */
+    @ApiModelProperty(value = "包装费用明细表的备注")
+    private String packNotes;
+
+
+    /**
      * 锁定字段信息
      */
     @ApiModelProperty(value = "锁定字段信息")
@@ -26,11 +26,6 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     private List<Long> ids;
     private Set<Long> orderIds;
-   /**
-    * 查询不通过的订单。
-    * */
-    private Set<Long> notInOrderIds;
-
     private Long id;
@@ -225,6 +220,10 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
      * */
     private Integer packStatus;
     /**
+     * 包装费用明细表的提成发放状态
+     * */
+    private  Integer OrderCommissionStatus;
+    /**
      *  内部生产净利润分析表状态
      * */
     private Integer innerProductionStatus;
@@ -241,5 +240,14 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
      * 控制mapper.xml文件中查询分支的判断依据。
      * */
     private Boolean isFinish;
+
+   /**
+    * 查询订单明细表中状态为未完成的订单。
+    * */
+   private Set<Long> notInOrderIds;
+   /**
+    * 查询订单明细表中提成状态为未发放的订单。
+    * */
+   private Set<Long> unissuedOrderIds;
 }
@@ -12,6 +12,7 @@ import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 /**
  * <p>
@@ -26,13 +27,10 @@ import java.math.BigDecimal;
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName("order_cost_info")
-@ApiModel(value="OrderCostDetail对象", description="")
 public class OrderCostInfoVO implements Serializable {
     private static final long serialVersionUID = 1L;
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private Long orderId;
@@ -47,9 +45,17 @@ public class OrderCostInfoVO implements Serializable {
     private BigDecimal productionDepartmentPredictUnitPrice;
     //包装费用明细表中的跟单评分。 (1-100分)
     private Integer orderScore;
+    //包装费用明细表中的已发提成。
+    private BigDecimal issuedCommission;
+    //包装费用表的已通过的包装费用提成总金额。 需要把已通过的包装提成总金额存储起来,下次再查询时使用已通过的包装提成总金额进行计算,而不再采用系统配置中的包装提成总金额进行计算,这样做的目的主要是为了避免更改系统配置中包装提成总金额后,即使已通过也会被改变,所以存储通过时的包装提成金额。
+    private BigDecimal passedCopyCommission ;
+    //包装费用明细表中的备注。
+    private String packNotes;
     //内部生产费用明细表状态。
     private Integer innerProduceStatus;
     //包装费用费用明细表状态。
     private Integer packStatus;
+    //包装费用明细表中的提成发放状态
+    private Integer orderCommissionStatus;
 }
@@ -45,6 +45,10 @@ public class OrderCostInfolockFieldVO implements Serializable {
      * */
     private String orderScore;
     /**
+     * 已发提成
+     * */
+    private String issuedCommission;
+    /**
      * 生产科预算单价。
      * */
     private String productionDepartmentPredictUnitPrice;
@@ -32,4 +32,5 @@ public interface IOrderCostInfoService extends IService&lt;OrderCostInfoDO&gt; {
     void exportInnerProfitDetailExcel(HttpServletResponse response,ProjectBaseInfoQueryVO queryVO) throws Exception;
     ServerResult setPackStatus(OrderCostInfoVO vo);
     ServerResult setInnerProduceStatus(OrderCostInfoVO vo);
+    ServerResult setCommissionStatus(OrderCostInfoVO vo);
 }
@@ -1608,6 +1608,7 @@ end
                 .le(StringUtils.isNotBlank(queryVO.getOrderHodEndTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodEndTime())
                 .in(CollectionUtils.isNotEmpty(queryVO.getOrderIds()), OrderBaseInfoDO::getId, queryVO.getOrderIds())
                 .notIn(CollectionUtils.isNotEmpty(queryVO.getNotInOrderIds()), OrderBaseInfoDO::getId, queryVO.getNotInOrderIds())
+                .notIn(CollectionUtils.isNotEmpty(queryVO.getUnissuedOrderIds()), OrderBaseInfoDO::getId, queryVO.getUnissuedOrderIds())
                 .in(CollectionUtils.isNotEmpty(queryVO.getInvoiceNo()),OrderBaseInfoDO::getInvoiceNo,queryVO.getInvoiceNo())
                 .in(CollectionUtils.isNotEmpty(queryVO.getCheckNo()),OrderBaseInfoDO::getCheckNo,queryVO.getCheckNo())
                 .eq(Objects.nonNull(queryVO.getInvoiceStatus()), OrderBaseInfoDO::getInvoiceStatus, queryVO.getInvoiceStatus())
@@ -82,8 +82,8 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ServerResult edit(OrderCostInfoVO vo) {
-        Integer type=null;
-        String  operationDesc=null;
+        Integer type = null;
+        String operationDesc = null;
         Long id = vo.getOrderId();
         Optional<OrderCostInfoDO> orderCostInfoDOOpt = this.lambdaQuery()
                 .eq(OrderCostInfoDO::getOrderId, id)
@@ -97,7 +97,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             orderCostInfoDO = BeanUtil.copyProperties(vo, OrderCostInfoDO.class);
         } else {
             orderCostInfoDO = orderCostInfoDOOpt.get();
-            oldOrderCostInfoDO = BeanUtil.copyProperties(orderCostInfoDO, OrderCostInfoDO.class,"id","orderId","createTime","createBy","modifyTime","modifyBy","enableFlag");
+            oldOrderCostInfoDO = BeanUtil.copyProperties(orderCostInfoDO, OrderCostInfoDO.class, "id", "orderId", "createTime", "createBy", "modifyTime", "modifyBy", "enableFlag");
             BeanUtil.copyProperties(vo, orderCostInfoDO, CopyOptions.create().ignoreNullValue());
         }
         // 如果对于新旧数据一致时,则不会进行状态设置。  但是对于第一次创建数据应该怎么办呢？ 通过isUpdate来进行判断。  对象不存在时,就不需要判断数据是否一致,对象存在时,就需要进行判断数据是否一致。如果一致,则不要进行状态设置,反之则需要进行状态设置。
@@ -114,37 +114,43 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                         .build()
         );
         OrderCostInfolockFieldVO originOrderCostInfolockFieldVO = JSONObject.parseObject(Optional.ofNullable(orderCostFieldLockRecord.getFields()).orElse("{}"), OrderCostInfolockFieldVO.class);
-        if(Objects.nonNull(vo.getPacketActualRmbTotalPrice())){
+        if (Objects.nonNull(vo.getPacketActualRmbTotalPrice()) || Objects.nonNull(vo.getOrderScore()) || Objects.nonNull(vo.getIssuedCommission())) {
             originOrderCostInfolockFieldVO.setPacketActualRmbTotalPrice(OrderLockFieldEnum.LOCKED.name());
             originOrderCostInfolockFieldVO.setOrderScore(OrderLockFieldEnum.LOCKED.name());
-            type=ProjectOptTypeEnum.PACKAGING_COST_TYPE.getType();
+            originOrderCostInfolockFieldVO.setIssuedCommission(OrderLockFieldEnum.LOCKED.name());
+            type = ProjectOptTypeEnum.PACKAGING_COST_TYPE.getType();
             operationDesc = isUpdate
                     ? OrderOptTypeEnum.PROJECT_COST_EDIT.getDesc()
                     : OrderOptTypeEnum.PROJECT_COST_ADD.getDesc();
             //编辑包装费用实际金额之后状态为待审核
             /*需要考虑一个问题,假如状态为已通过,但是没有进行任何的修改而点击了确认,那么它的状态会由已审核变为待审核,所以需要进行判断一下,此次传递来的数据是否与上一次的数据一致,如果不一致则需要进行状态设置*/
-            if(isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getPackStatus())
+            if (isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getPackStatus())
                     && vo.getPacketActualRmbTotalPrice().compareTo(oldOrderCostInfoDO.getPacketActualRmbTotalPrice()) == 0
-                    && ( vo.getOrderScore().equals(oldOrderCostInfoDO.getOrderScore()))
-            ){
-            }else{
+                    && (vo.getOrderScore().equals(oldOrderCostInfoDO.getOrderScore()))
+            ) {
+            } else {
                 orderCostInfoDO.setPackStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
             }
-        }else if(Objects.nonNull(vo.getProductionActualPrice())||Objects.nonNull(vo.getProductionDepartmentPredictPrice()) || Objects.nonNull(vo.getProductionDepartmentPredictUnitPrice())) {
+            if(isUpdate && CommissionStatusEnum.ISSUED.getStatus().equals(oldOrderCostInfoDO.getOrderCommissionStatus())
+               && vo.getIssuedCommission().compareTo(oldOrderCostInfoDO.getIssuedCommission()) == 0){
+            }else{
+                orderCostInfoDO.setOrderCommissionStatus(CommissionStatusEnum.UN_ISSUED.getStatus());
+            }
+        } else if (Objects.nonNull(vo.getProductionActualPrice()) || Objects.nonNull(vo.getProductionDepartmentPredictPrice()) || Objects.nonNull(vo.getProductionDepartmentPredictUnitPrice())) {
             originOrderCostInfolockFieldVO.setProductionActualPrice(OrderLockFieldEnum.LOCKED.name());
             originOrderCostInfolockFieldVO.setProductionDepartmentPredictPrice(OrderLockFieldEnum.LOCKED.name());
             originOrderCostInfolockFieldVO.setProductionDepartmentPredictUnitPrice(OrderLockFieldEnum.LOCKED.name());
-            type=ProjectOptTypeEnum.INTERNAL_PRODUCE_DETAILS_TYPE.getType();
+            type = ProjectOptTypeEnum.INTERNAL_PRODUCE_DETAILS_TYPE.getType();
             operationDesc = isUpdate
                     ? OrderOptTypeEnum.PROJECT_INNER_PRODUCE_PROFIT_EDIT.getDesc()
                     : OrderOptTypeEnum.PROJECT_INNER_PRODUCE_PROFIT_ADD.getDesc();
             //编辑生产科预算金额和实际发生费用之后状态为待审核
             /*也需要考虑问题,假如状态为已通过,但是没有进行任何修改二点击了确认,那么它的状态会由已审核变为待审核*/
-            if(isUpdate &&  ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getInnerProduceStatus()) &&
-                    vo.getProductionActualPrice().compareTo(oldOrderCostInfoDO.getProductionActualPrice()) ==0 &&
-                    vo.getProductionDepartmentPredictPrice().compareTo(oldOrderCostInfoDO.getProductionDepartmentPredictPrice()) ==0 &&
-            vo.getProductionDepartmentPredictUnitPrice().compareTo(oldOrderCostInfoDO.getProductionDepartmentPredictUnitPrice()) == 0){
-            }else{
+            if (isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getInnerProduceStatus()) &&
+                    vo.getProductionActualPrice().compareTo(oldOrderCostInfoDO.getProductionActualPrice()) == 0 &&
+                    vo.getProductionDepartmentPredictPrice().compareTo(oldOrderCostInfoDO.getProductionDepartmentPredictPrice()) == 0 &&
+                    vo.getProductionDepartmentPredictUnitPrice().compareTo(oldOrderCostInfoDO.getProductionDepartmentPredictUnitPrice()) == 0) {
+            } else {
                 orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
             }
         }
@@ -153,13 +159,13 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         this.saveOrUpdate(orderCostInfoDO);
         //进行日志记录。
         OrderCostInfoVO orderCostInfoVO = buildOrderConstInfoVO(vo, id);
-        OrderCostDetailedOptLogDO orderConstOptLogDo = buildOrderConstOptLogDo(id, dataScope.getLoginUserId(),type ,operationDesc,JSONObject.toJSONString(orderCostInfoVO));
+        OrderCostDetailedOptLogDO orderConstOptLogDo = buildOrderConstOptLogDo(id, dataScope.getLoginUserId(), type, operationDesc, JSONObject.toJSONString(orderCostInfoVO));
         return ServerResult.success(orderCostDetailedOptLogService.save(orderConstOptLogDo));
     }
     @Override
     public ServerResult applyEditFileds(OrderCostInfolockFieldVO vo) {
-        Integer applyType=null;
+        Integer applyType = null;
         List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderFieldLockApplyDO::getOrderId, vo.getOrderId())
@@ -172,6 +178,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         OrderCostInfolockFieldVO lockField = OrderCostInfolockFieldVO.builder()
                 .packetActualRmbTotalPrice(vo.getPacketActualRmbTotalPrice())
                 .orderScore(vo.getOrderScore())
+                .issuedCommission(vo.getIssuedCommission())
                 .productionActualPrice(vo.getProductionActualPrice())
                 .productionDepartmentPredictPrice(vo.getProductionDepartmentPredictPrice())
                 .productionDepartmentPredictUnitPrice(vo.getProductionDepartmentPredictUnitPrice())
@@ -180,7 +187,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 .orderId(vo.getOrderId())
                 .applyUserId(dataScope.getLoginUserId())
                 //无论是订单生产费用明细字段申请还是订单生产费用明细字段申请,都是管理员审批,但是这里加上财务人员的目的是为财务人员能够在待审核列表中查看到申请,而不是给财务人员审批的。
-                .auditRoleCodes(RoleEnum.ADMIN.getCode()+Constant.COMMA_CHARACTER+RoleEnum.FINANCE_USER.getCode())
+                .auditRoleCodes(RoleEnum.ADMIN.getCode() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
                 .applyRemark(vo.getApplyRemark())
                 .fields(JSONObject.toJSONString(lockField))
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
@@ -189,12 +196,12 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 .build();
         orderFieldLockApplyService.save(build);
         //进行审批记录的保存。需要前端在申请字段申请时传递这条数据的id。
-        if(ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType().equals(vo.getType())){
-         applyType=ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType();
-        }else{
-         applyType=ApplyTypeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY.getType();
+        if (ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType().equals(vo.getType())) {
+            applyType = ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType();
+        } else {
+            applyType = ApplyTypeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY.getType();
         }
-        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo(vo.getOrderId(), dataScope.getLoginUserId(),applyType,ApplyTypeEnum.getNameByType(applyType),JSONObject.toJSONString(lockField)));
+        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo(vo.getOrderId(), dataScope.getLoginUserId(), applyType, ApplyTypeEnum.getNameByType(applyType), JSONObject.toJSONString(lockField)));
         return ServerResult.success();
     }
@@ -202,14 +209,14 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     public ServerResult<Page<InnerProfitDetailVO>> listInnerProfitDetailByPage(OrderBaseInfoQueryVO queryVO) {
         Set<Long> orderIds = null;
         Long loginUserId = dataScope.getLoginUserId();
-        if(Objects.nonNull(queryVO.getInnerProduceStatus())){
+        if (Objects.nonNull(queryVO.getInnerProduceStatus())) {
             List<OrderCostInfoDO> list;
-            if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getInnerProduceStatus())){
-                 list = list(new LambdaQueryWrapper<OrderCostInfoDO>()
+            if (ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getInnerProduceStatus())) {
+                list = list(new LambdaQueryWrapper<OrderCostInfoDO>()
                         .select(OrderCostInfoDO::getOrderId).eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                         .in(OrderCostInfoDO::getInnerProduceStatus, ProfitStatusEnum.PENDING_APPROVAL.getStatus(), ProfitStatusEnum.APPROVED.getStatus()));
-            }else{
-                 list = list(new LambdaQueryWrapper<OrderCostInfoDO>()
+            } else {
+                list = list(new LambdaQueryWrapper<OrderCostInfoDO>()
                         .select(OrderCostInfoDO::getOrderId).eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                         .eq(OrderCostInfoDO::getInnerProduceStatus, queryVO.getInnerProduceStatus()));
             }
@@ -220,12 +227,12 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
         }
-        if(CollectionUtils.isNotEmpty(orderIds)){
-             if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getInnerProduceStatus())){
-                 queryVO.setNotInOrderIds(orderIds);
-             }else{
-                 queryVO.setOrderIds(orderIds);
-             }
+        if (CollectionUtils.isNotEmpty(orderIds)) {
+            if (ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getInnerProduceStatus())) {
+                queryVO.setNotInOrderIds(orderIds);
+            } else {
+                queryVO.setOrderIds(orderIds);
+            }
         }
         ServerResult serverResult = orderBaseInfoService.listByPage(queryVO);
         Page<OrderInfoResultVO> page = (Page<OrderInfoResultVO>) serverResult.getData();
@@ -249,26 +256,26 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             } catch (JsonProcessingException e) {
                 throw new RuntimeException(e);
             }
-        },(v1, v2) -> v2));
+        }, (v1, v2) -> v2));
         List<InnerProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
             OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
             OrderCostInfolockFieldVO lockFields = Optional.ofNullable(orderId2fieldMapMap.get(record.getId()))
                     .orElse(new OrderCostInfolockFieldVO()
                     );
-            if(Objects.nonNull(orderCostInfo)&& ProfitStatusEnum.APPROVED.getStatus().equals(orderCostInfo.getInnerProduceStatus())){
-                if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
+            if (Objects.nonNull(orderCostInfo) && ProfitStatusEnum.APPROVED.getStatus().equals(orderCostInfo.getInnerProduceStatus())) {
+                if (Objects.isNull(lockFields.getPacketActualRmbTotalPrice())) {
                     lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
-                if(Objects.isNull(lockFields.getProductionActualPrice())){
+                if (Objects.isNull(lockFields.getProductionActualPrice())) {
                     lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
-                if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
+                if (Objects.isNull(lockFields.getProductionDepartmentPredictPrice())) {
                     lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
-                if(Objects.isNull(lockFields.getProductionDepartmentPredictUnitPrice())){
+                if (Objects.isNull(lockFields.getProductionDepartmentPredictUnitPrice())) {
                     lockFields.setProductionDepartmentPredictUnitPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictUnitPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
-            }else{
+            } else {
                 lockFields.setPacketActualRmbTotalPrice(OrderLockFieldEnum.UN_LOCKED.name());
                 lockFields.setProductionActualPrice(OrderLockFieldEnum.UN_LOCKED.name());
                 lockFields.setProductionDepartmentPredictPrice(OrderLockFieldEnum.UN_LOCKED.name());
@@ -281,14 +288,14 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .projectNo(record.getProjectNo())
                     .productionDepartment(record.getProductionDepartment())
                     .innerNo(record.getInnerNo())
-                    .picUrl(record.getPicUrl())
+                    .picUrl(record.getSmallPicUrl())
                     .orderCount(record.getOrderCount())
                     .productionDepartmentPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getProductionDepartmentPrice())
                     .productionDepartmentTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getProductionDepartmentTotalPrice())
                     .productionDepartmentPredictPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionDepartmentPredictPrice())
                     .productionDepartmentPredictUnitPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionDepartmentPredictUnitPrice())
                     .productionActualPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionActualPrice())
-                    .innerProduceStatus((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getInnerProduceStatus()))  ? ProfitStatusEnum.Not_COMPLETED.getStatus() : record.getOrderCostInfo().getInnerProduceStatus())
+                    .innerProduceStatus((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getInnerProduceStatus())) ? ProfitStatusEnum.Not_COMPLETED.getStatus() : record.getOrderCostInfo().getInnerProduceStatus())
                     .lockFields(lockFields)
                     .build();
@@ -334,8 +341,9 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Override
     public ServerResult<Page<BusinessProfitDetailVO>> listBusinessProfitDetailByPage(OrderBaseInfoQueryVO queryVO) {
-        Long loginUserId = dataScope.getLoginUserId();
+        /*Long loginUserId = dataScope.getLoginUserId();
         Set<Long> orderIds=null;
+        Set<Long> issueOrderIds=null;
         if(Objects.nonNull(queryVO.getPackStatus())){
             List<OrderCostInfoDO> list;
             if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getPackStatus())){
@@ -361,6 +369,87 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 queryVO.setOrderIds(orderIds);
             }
         }
+        if(Objects.nonNull(queryVO.getOrderCommissionStatus())){
+            List<OrderCostInfoDO> issuedOrderCostInfoDOS;
+                issuedOrderCostInfoDOS = list(new LambdaQueryWrapper<OrderCostInfoDO>().select(OrderCostInfoDO::getOrderId)
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(OrderCostInfoDO::getOrderCommissionStatus, CommissionStatusEnum.ISSUED.getStatus()));
+                issueOrderIds = CollectionUtils.isEmpty(issuedOrderCostInfoDOS)
+                    ? new HashSet<>()
+                    : issuedOrderCostInfoDOS.stream()
+                    .map(OrderCostInfoDO::getOrderId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            }
+        if(CollectionUtils.isNotEmpty(issueOrderIds)){
+            //筛选提成发放状态为未发放的订单。
+            if(CommissionStatusEnum.UN_ISSUED.getStatus().equals(queryVO.getOrderCommissionStatus())){
+                queryVO.setUnissuedOrderIds(issueOrderIds);
+            }else{
+            //筛选提成发放状态为发放的订单。
+                orderIds.addAll(issueOrderIds);
+                queryVO.setOrderIds(orderIds);
+            }
+        }*/
+
+        Long loginUserId = dataScope.getLoginUserId();
+
+        Set<Long> orderIds = new HashSet<>();
+        Set<Long> issueOrderIds = new HashSet<>();
+
+// 处理打包状态
+        Integer packStatus = queryVO.getPackStatus();
+        if (Objects.nonNull(packStatus)) {
+            LambdaQueryWrapper<OrderCostInfoDO> wrapper = new LambdaQueryWrapper<OrderCostInfoDO>()
+                    .select(OrderCostInfoDO::getOrderId)
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN);
+
+            if (ProfitStatusEnum.Not_COMPLETED.getStatus().equals(packStatus)) {
+                wrapper.in(OrderCostInfoDO::getPackStatus,
+                        ProfitStatusEnum.PENDING_APPROVAL.getStatus(),
+                        ProfitStatusEnum.APPROVED.getStatus());
+            } else {
+                wrapper.eq(OrderCostInfoDO::getPackStatus, packStatus);
+            }
+
+            List<Long> ids = list(wrapper).stream()
+                    .map(OrderCostInfoDO::getOrderId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+            orderIds.addAll(ids);
+
+            if (!orderIds.isEmpty()) {
+                if (ProfitStatusEnum.Not_COMPLETED.getStatus().equals(packStatus)) {
+                    queryVO.setNotInOrderIds(orderIds);
+                } else {
+                    queryVO.setOrderIds(orderIds);
+                }
+            }
+        }
+
+// 处理提成发放状态
+        Integer commissionStatus = queryVO.getOrderCommissionStatus();
+        if (Objects.nonNull(commissionStatus)) {
+            List<Long> issuedIds = list(new LambdaQueryWrapper<OrderCostInfoDO>()
+                    .select(OrderCostInfoDO::getOrderId)
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderCostInfoDO::getOrderCommissionStatus, CommissionStatusEnum.ISSUED.getStatus()))
+                    .stream()
+                    .map(OrderCostInfoDO::getOrderId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+            issueOrderIds.addAll(issuedIds);
+
+            if (!issueOrderIds.isEmpty()) {
+                if (CommissionStatusEnum.UN_ISSUED.getStatus().equals(commissionStatus)) {
+                    queryVO.setUnissuedOrderIds(issueOrderIds);
+                } else {
+                    orderIds.addAll(issueOrderIds); // 已存在 packStatus 时收集的 orderIds
+                    queryVO.setOrderIds(issueOrderIds);
+                }
+            }
+        }
+
         ServerResult serverResult = orderBaseInfoService.listByPage(queryVO);
         Page<OrderInfoResultVO> page = (Page<OrderInfoResultVO>) serverResult.getData();
         List<OrderInfoResultVO> records = page.getRecords();
@@ -384,7 +473,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             } catch (JsonProcessingException e) {
                 throw new RuntimeException(e);
             }
-        },(v1, v2) -> v2));
+        }, (v1, v2) -> v2));
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
         //获取所有的客户提成提成配置。
         List<SystemSettingDO> systemSettingDOS = systemSettingService.list(new LambdaQueryWrapper<SystemSettingDO>()
@@ -396,39 +485,50 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             OrderCostInfolockFieldVO lockFields = Optional.ofNullable(orderId2fieldMapMap.get(record.getId())).orElse(
                     new OrderCostInfolockFieldVO()
             );
-            if(Objects.nonNull(orderCostInfo) && ProfitStatusEnum.APPROVED.getStatus().equals(orderCostInfo.getPackStatus())){
-                if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
+            if (Objects.nonNull(orderCostInfo) && ProfitStatusEnum.APPROVED.getStatus().equals(orderCostInfo.getPackStatus())) {
+                if (Objects.isNull(lockFields.getPacketActualRmbTotalPrice())) {
                     lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
                 //跟单评分。
-                if(Objects.isNull(lockFields.getOrderScore())){
+                if (Objects.isNull(lockFields.getOrderScore())) {
                     lockFields.setOrderScore(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getOrderScore()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
-                if(Objects.isNull(lockFields.getProductionActualPrice())){
+                if (Objects.isNull(lockFields.getProductionActualPrice())) {
                     lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
-                if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
+                if (Objects.isNull(lockFields.getProductionDepartmentPredictPrice())) {
                     lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
-            }else{
+            } else {
                 lockFields.setPacketActualRmbTotalPrice(OrderLockFieldEnum.UN_LOCKED.name());
                 lockFields.setProductionActualPrice(OrderLockFieldEnum.UN_LOCKED.name());
                 lockFields.setProductionDepartmentPredictPrice(OrderLockFieldEnum.UN_LOCKED.name());
                 lockFields.setOrderScore(OrderLockFieldEnum.UN_LOCKED.name());
             }
+            if(Objects.nonNull(orderCostInfo) && CommissionStatusEnum.ISSUED.getStatus().equals(orderCostInfo.getOrderCommissionStatus())){
+                // 已发提成
+                if(Objects.isNull(lockFields.getIssuedCommission())){
+                   lockFields.setIssuedCommission(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getIssuedCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                 }
+            }else{
+                lockFields.setIssuedCommission(OrderLockFieldEnum.UN_LOCKED.name());
+            }
             BusinessProfitDetailVO vo = BusinessProfitDetailVO.builder()
                     .orderId(record.getId())
                     .customerCode(record.getCustomerCode())
                     .projectNo(record.getProjectNo())
                     .productionDepartment(record.getProductionDepartment())
                     .innerNo(record.getInnerNo())
-                    .picUrl(record.getPicUrl())
+                    .picUrl(record.getSmallPicUrl())
                     .orderCount(record.getOrderCount())
                     .packetPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getPacketPrice())
                     .packetTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getPacketTotalPrice())
                     .packetActualRmbTotalPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getPacketActualRmbTotalPrice())
                     .packStatus((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getPackStatus())) ? ProfitStatusEnum.Not_COMPLETED.getStatus() : record.getOrderCostInfo().getPackStatus())
+                    .orderCommissionStatus((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getOrderCommissionStatus())) ? CommissionStatusEnum.UN_ISSUED.getStatus() : record.getOrderCostInfo().getOrderCommissionStatus())
+                    .issuedCommission((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getIssuedCommission())) ? null : record.getOrderCostInfo().getIssuedCommission())
+                    .packNotes((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getPackNotes())) ? null : record.getOrderCostInfo().getPackNotes())
                     .lockFields(lockFields)
                     .build();
             if (Objects.nonNull(vo.getPacketTotalPrice())) {
@@ -449,34 +549,39 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 //包装费用净利润率 = 包装费用收益/包装费用合计
                 vo.setPacketProfitRate(vo.getPacketProfitRmbPrice().divide(BigDecimal.valueOf(vo.getPacketRmbTotalPrice()), 4, RoundingMode.HALF_UP));
             }
-            if(Objects.nonNull(orderCostInfo) && Objects.nonNull(orderCostInfo.getOrderScore())){
+            if (Objects.nonNull(orderCostInfo) && Objects.nonNull(orderCostInfo.getOrderScore())) {
                 vo.setOrderScore(orderCostInfo.getOrderScore());
-                String projectFix = ProjectNoUtils.extractProjectNoPrefix(record.getProjectNo());
-                String substring = projectFix.substring(projectFix.lastIndexOf("-") + 1).substring(0, 2);
-                Optional<SystemSettingDO> optionalSetting = systemSettingDOSMap.values().stream()
-                        .flatMap(List::stream)
-                        .filter(setting -> setting.getSettingValue().equals(record.getCustomerCode()))
-                        .filter(setting -> setting.getRelationName().substring(2, 4).equals(substring))
-                        .findFirst();
-                if(optionalSetting.isPresent()){
-                    SystemSettingDO systemSettingDO = optionalSetting.get();
-                    List<Map<String,String>> relations=null;
-                    try {
-                     relations= objectMapper.readValue(systemSettingDO.getRelationValue(),objectMapper.getTypeFactory().constructType(List.class, Map.class));
-                    } catch (JsonProcessingException e) {
-                        throw new RuntimeException(e);
-                    }
-                    String  copyCommission= null;
-                    for(Map<String,String> relation:relations){
-                        if("copyCommission".equals(relation.get("relationCode"))){
-                            copyCommission = relation.get("relationValue");
+                if(CommissionStatusEnum.ISSUED.getStatus().equals(vo.getOrderCommissionStatus()) && Objects.nonNull(orderCostInfo.getPassedCopyCommission())){
+                    //提成金额 = 跟单评分 * 跟单提成计算。
+                    vo.setCopyCommission(orderCostInfo.getPassedCopyCommission().multiply(BigDecimal.valueOf(orderCostInfo.getOrderScore()).divide(BigDecimal.valueOf(100))).setScale( 2, RoundingMode.HALF_UP));
+                }else{
+                    String projectFix = ProjectNoUtils.extractProjectNoPrefix(record.getProjectNo());
+                    String substring = projectFix.substring(projectFix.lastIndexOf("-") + 1).substring(0, 2);
+                    Optional<SystemSettingDO> optionalSetting = systemSettingDOSMap.values().stream()
+                            .flatMap(List::stream)
+                            .filter(setting -> setting.getSettingValue().equals(record.getCustomerCode()))
+                            .filter(setting -> setting.getRelationName().substring(2, 4).equals(substring))
+                            .findFirst();
+                    if (optionalSetting.isPresent()) {
+                        SystemSettingDO systemSettingDO = optionalSetting.get();
+                        List<Map<String, String>> relations = null;
+                        try {
+                            relations = objectMapper.readValue(systemSettingDO.getRelationValue(), objectMapper.getTypeFactory().constructType(List.class, Map.class));
+                        } catch (JsonProcessingException e) {
+                            throw new RuntimeException(e);
+                        }
+                        String copyCommission = null;
+                        for (Map<String, String> relation : relations) {
+                            if ("copyCommission".equals(relation.get("relationCode"))) {
+                                copyCommission = relation.get("relationValue");
+                            }
+                        }
+                        if (StringUtils.isNotBlank(copyCommission)) {
+                            //提成金额 = 跟单评分 * 跟单提成计算。
+                            vo.setCopyCommission(new BigDecimal(copyCommission).multiply(BigDecimal.valueOf(orderCostInfo.getOrderScore()).divide(BigDecimal.valueOf(100))).setScale(2, RoundingMode.HALF_UP));
                         }
                     }
-                    if(StringUtils.isNotBlank(copyCommission)){
-                        //提成金额 = 跟单评分 * 跟单提成计算。
-                        vo.setCopyCommission(new BigDecimal(copyCommission) .multiply(BigDecimal.valueOf(orderCostInfo.getOrderScore()).divide(BigDecimal.valueOf(100))).setScale(2, RoundingMode.HALF_UP));
-                    }
-                    }
+                }
             }
             return vo;
         }).collect(Collectors.toList());
@@ -487,19 +592,19 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     }
     @Override
-    public void exportBusinessProfitDetailExcel(HttpServletResponse response,ProjectBaseInfoQueryVO queryVO) throws Exception {
-        if(CollectionUtils.isEmpty(queryVO.getOrderIds()) &&
-           CollectionUtils.isEmpty(queryVO.getProjectNo()) &&
-           CollectionUtils.isEmpty(queryVO.getCustomerCode()) &&
-           CollectionUtils.isEmpty(queryVO.getInnerNo()) &&
-           CollectionUtils.isEmpty(queryVO.getProductionDepartment())){
+    public void exportBusinessProfitDetailExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
+        if (CollectionUtils.isEmpty(queryVO.getOrderIds()) &&
+                CollectionUtils.isEmpty(queryVO.getProjectNo()) &&
+                CollectionUtils.isEmpty(queryVO.getCustomerCode()) &&
+                CollectionUtils.isEmpty(queryVO.getInnerNo()) &&
+                CollectionUtils.isEmpty(queryVO.getProductionDepartment())) {
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
         OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
                 .page(1)
                 .pageSize(200); // 设置大一点，确保导出数据不遗漏
-      // 根据传入条件设置筛选字段
+        // 根据传入条件设置筛选字段
         if (CollectionUtils.isNotEmpty(queryVO.getOrderIds())) {
             builder.orderIds(queryVO.getOrderIds());
         } else {
@@ -520,10 +625,9 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         ServerResult serverResult = listBusinessProfitDetailByPage(builder.build());
         Page<BusinessProfitDetailVO> page = (Page<BusinessProfitDetailVO>) serverResult.getData();
         List<BusinessProfitDetailVO> businessProfitDetailVOS = page.getRecords();
-        System.out.println("订单数量:"+businessProfitDetailVOS.size());
-        if(CollectionUtils.isNotEmpty(businessProfitDetailVOS)){
+        if (CollectionUtils.isNotEmpty(businessProfitDetailVOS)) {
             List<Map<String, Object>> list = buildBusinessProfitExportExcel(businessProfitDetailVOS, queryVO);
-            if(CollectionUtils.isNotEmpty(list)){
+            if (CollectionUtils.isNotEmpty(list)) {
                 List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
                 ExcelHelper.opsExport(PoiWorkbookType.XLSX)
                         .opsSheet(list)
@@ -532,50 +636,47 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                         .height(CellPosition.CELL, 750)
                         .done()
                         .export(response.getOutputStream());
-                System.out.println("导出成功");
             }
         }
-        System.out.println(businessProfitDetailVOS);
     }
     @Override
     public void exportInnerProfitDetailExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
-        if(CollectionUtils.isEmpty(queryVO.getOrderIds()) &&
+        if (CollectionUtils.isEmpty(queryVO.getOrderIds()) &&
                 CollectionUtils.isEmpty(queryVO.getProjectNo()) &&
                 CollectionUtils.isEmpty(queryVO.getCustomerCode()) &&
                 CollectionUtils.isEmpty(queryVO.getInnerNo()) &&
-                CollectionUtils.isEmpty(queryVO.getProductionDepartment())){
+                CollectionUtils.isEmpty(queryVO.getProductionDepartment())) {
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
         OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
                 .productionDepartment(Collections.singletonList("内部"))
                 .page(1)
                 .pageSize(200); //设置大一点，确保导出数据不遗漏
-        if(CollectionUtils.isNotEmpty(queryVO.getOrderIds())){
+        if (CollectionUtils.isNotEmpty(queryVO.getOrderIds())) {
             builder.orderIds(queryVO.getOrderIds());
-        }else{
+        } else {
             //如果orderIds为空就代表传递的是筛选条件。
-            if(CollectionUtils.isNotEmpty(queryVO.getProjectNo())){
+            if (CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
                 builder.projectNo(queryVO.getProjectNo());
             }
-            if(CollectionUtils.isNotEmpty(queryVO.getCustomerCode())){
+            if (CollectionUtils.isNotEmpty(queryVO.getCustomerCode())) {
                 builder.customerCode(queryVO.getCustomerCode());
             }
-            if(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment())){
+            if (CollectionUtils.isNotEmpty(queryVO.getProductionDepartment())) {
                 builder.productionDepartment(queryVO.getProductionDepartment());
             }
-            if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+            if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
                 builder.innerNo(queryVO.getInnerNo());
             }
         }
         //这里设置为100是故意设置大一点,防止导出多条数据。
-        ServerResult<Page<InnerProfitDetailVO>> serverResult= listInnerProfitDetailByPage(builder.build());
-        Page<InnerProfitDetailVO> page=(Page<InnerProfitDetailVO>) serverResult.getData();
+        ServerResult<Page<InnerProfitDetailVO>> serverResult = listInnerProfitDetailByPage(builder.build());
+        Page<InnerProfitDetailVO> page = (Page<InnerProfitDetailVO>) serverResult.getData();
         List<InnerProfitDetailVO> innerProfitDetailVOS = page.getRecords();
-        System.out.println("订单数量"+innerProfitDetailVOS.size());
-        if(CollectionUtils.isNotEmpty(innerProfitDetailVOS)){
+        if (CollectionUtils.isNotEmpty(innerProfitDetailVOS)) {
             List<Map<String, Object>> list = buildInnerProfitDetailExcel(innerProfitDetailVOS, queryVO);
-            if(CollectionUtils.isNotEmpty(list)){
+            if (CollectionUtils.isNotEmpty(list)) {
                 List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
                 ExcelHelper.opsExport(PoiWorkbookType.XLSX)
                         .opsSheet(list)
@@ -584,7 +685,6 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                         .height(CellPosition.CELL, 750)
                         .done()
                         .export(response.getOutputStream());
-                System.out.println("导出成功");
             }
         }
     }
@@ -592,25 +692,25 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Override
     public ServerResult setPackStatus(OrderCostInfoVO vo) {
         //首先判断orderId是否为空。
-        if(Objects.isNull(vo.getOrderId())){
+        if (Objects.isNull(vo.getOrderId())) {
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
         OrderCostInfoDO orderCostInfoDO = getOne(new LambdaQueryWrapper<OrderCostInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderCostInfoDO::getOrderId, vo.getOrderId())
                 .last("limit 1"));
-        if(Objects.isNull(orderCostInfoDO)){
+        if (Objects.isNull(orderCostInfoDO)) {
             throw new BusinessException(ServerResultCode.EMPTY_LIST);
         }
         orderCostInfoDO.setPackStatus(ProfitStatusEnum.APPROVED.getStatus());
         //还需要对审核通过也进行记录  81  91
-        OrderCostInfoVO orderCostInfoVO=new OrderCostInfoVO();
-        BeanUtils.copyProperties(orderCostInfoDO,orderCostInfoVO);
+        OrderCostInfoVO orderCostInfoVO = new OrderCostInfoVO();
+        BeanUtils.copyProperties(orderCostInfoDO, orderCostInfoVO);
         transactionHelper.run(() -> {
-            orderCostDetailedOptLogService.save(buildOrderConstOptLogDo((vo.getOrderId()),dataScope.getLoginUserId()
-                    ,ApplyTypeEnum.ORDER_PACKET_COST_PASS.getType()
-                    ,ApplyTypeEnum.ORDER_PACKET_COST_PASS.getDesc()
-                    ,JSONObject.toJSONString(orderCostInfoVO)));
+            orderCostDetailedOptLogService.save(buildOrderConstOptLogDo((vo.getOrderId()), dataScope.getLoginUserId()
+                    , ApplyTypeEnum.ORDER_PACKET_COST_PASS.getType()
+                    , ApplyTypeEnum.ORDER_PACKET_COST_PASS.getDesc()
+                    , JSONObject.toJSONString(orderCostInfoVO)));
             updateById(orderCostInfoDO);
         });
         return ServerResult.success();
@@ -618,30 +718,90 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Override
     public ServerResult setInnerProduceStatus(OrderCostInfoVO vo) {
-        if(Objects.isNull(vo.getOrderId())){
+        if (Objects.isNull(vo.getOrderId())) {
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
         OrderCostInfoDO orderCostInfoDO = getOne(new LambdaQueryWrapper<OrderCostInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderCostInfoDO::getOrderId, vo.getOrderId())
                 .last("limit 1"));
-        if(Objects.isNull(orderCostInfoDO)){
+        if (Objects.isNull(orderCostInfoDO)) {
             throw new BusinessException(ServerResultCode.EMPTY_LIST);
         }
-       orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.APPROVED.getStatus());
+        orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.APPROVED.getStatus());
         OrderCostInfoVO orderCostInfoVO = new OrderCostInfoVO();
         BeanUtils.copyProperties(orderCostInfoDO, orderCostInfoVO);
-        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo((vo.getOrderId()),dataScope.getLoginUserId()
-                ,ApplyTypeEnum.ORDER_PRODUCTION_COST_APPLY.getType()
-                ,ApplyTypeEnum.ORDER_PRODUCTION_COST_APPLY.getDesc()
-                ,JSONObject.toJSONString(orderCostInfoVO)));
-        updateById(orderCostInfoDO);
+        transactionHelper.run(() -> {
+        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo((vo.getOrderId()), dataScope.getLoginUserId()
+                , ApplyTypeEnum.ORDER_PRODUCTION_COST_APPLY.getType()
+                , ApplyTypeEnum.ORDER_PRODUCTION_COST_APPLY.getDesc()
+                , JSONObject.toJSONString(orderCostInfoVO)));
         updateById(orderCostInfoDO);
+        });
         return ServerResult.success();
     }
+    @Override
+    public ServerResult setCommissionStatus(OrderCostInfoVO vo) {
+        //首先判断orderId是否为空。
+        if (Objects.isNull(vo.getOrderId())) {
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderCostInfoDO orderCostInfoDO = getOne(new LambdaQueryWrapper<OrderCostInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderCostInfoDO::getOrderId, vo.getOrderId())
+                .last("limit 1"));
+        if (Objects.isNull(orderCostInfoDO)) {
+            throw new BusinessException(ServerResultCode.EMPTY_LIST);
+        }
+        orderCostInfoDO.setOrderCommissionStatus(CommissionStatusEnum.ISSUED.getStatus());
+        //需要把已通过的包装提成总金额存储起来,下次再查询时使用已通过的包装提成总金额进行计算,而不再采用系统配置中的包装提成总金额进行计算,这样做的目的主要是为了避免更改系统配置中包装提成总金额后,即使已通过也会被改变,所以存储通过时的包装提成金额。
+        ObjectMapper objectMapper = new ObjectMapper();
+        List<SystemSettingDO> systemSettingDOS = systemSettingService.list(new LambdaQueryWrapper<SystemSettingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getRelationCode, "costSettingItem"));
+        Map<String, List<SystemSettingDO>> systemSettingDOSMap = systemSettingDOS.stream().collect(Collectors.groupingBy(SystemSettingDO::getSettingValue));
+        OrderBaseInfoDO orderBaseInfoDO = orderBaseInfoService.getById(orderCostInfoDO.getOrderId());
+        String projectFix = ProjectNoUtils.extractProjectNoPrefix(orderBaseInfoDO.getProjectNo());
+            String substring = projectFix.substring(projectFix.lastIndexOf("-") + 1).substring(0, 2);
+            Optional<SystemSettingDO> optionalSetting = systemSettingDOSMap.values().stream()
+                    .flatMap(List::stream)
+                    .filter(setting -> setting.getSettingValue().equals(orderBaseInfoDO.getCustomerCode()))
+                    .filter(setting -> setting.getRelationName().substring(2, 4).equals(substring))
+                    .findFirst();
+            if (optionalSetting.isPresent()) {
+                SystemSettingDO systemSettingDO = optionalSetting.get();
+                List<Map<String, String>> relations = null;
+                try {
+                    relations = objectMapper.readValue(systemSettingDO.getRelationValue(), objectMapper.getTypeFactory().constructType(List.class, Map.class));
+                } catch (JsonProcessingException e) {
+                    throw new RuntimeException(e);
+                }
+                String copyCommission = null;
+                for (Map<String, String> relation : relations) {
+                    if ("copyCommission".equals(relation.get("relationCode"))) {
+                        copyCommission = relation.get("relationValue");
+                    }
+                }
+                if (StringUtils.isNotBlank(copyCommission)) {
+                   orderCostInfoDO.setPassedCopyCommission(new BigDecimal(copyCommission));
+                }
+            }
+        //还需要对审核通过也进行记录  81  91
+        OrderCostInfoVO orderCostInfoVO = new OrderCostInfoVO();
+        BeanUtils.copyProperties(orderCostInfoDO, orderCostInfoVO);
+        transactionHelper.run(() -> {
+            orderCostDetailedOptLogService.save(buildOrderConstOptLogDo((vo.getOrderId()), dataScope.getLoginUserId()
+                    , ApplyTypeEnum.ORDER_PACKET_COST_COMMISSION_PASS.getType()
+                    , ApplyTypeEnum.ORDER_PACKET_COST_COMMISSION_PASS.getDesc()
+                    , JSONObject.toJSONString(orderCostInfoVO)));
+            updateById(orderCostInfoDO);
+        });
+        return ServerResult.success();
+    }
-    private OrderCostDetailedOptLogDO buildOrderConstOptLogDo(Long orderId, Long userId , Integer type, String optType, String field){
+
+    private OrderCostDetailedOptLogDO buildOrderConstOptLogDo(Long orderId, Long userId, Integer type, String optType, String field) {
         return OrderCostDetailedOptLogDO.builder()
                 .orderId(orderId)
                 .userId(userId)
@@ -650,39 +810,42 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 .fields(field)
                 .build();
     }
-    private OrderCostInfoVO buildOrderConstInfoVO(OrderCostInfoVO vo,Long orderId){
+
+    private OrderCostInfoVO buildOrderConstInfoVO(OrderCostInfoVO vo, Long orderId) {
         OrderCostInfoVO orderCostInfoVO = new OrderCostInfoVO();
         BeanUtils.copyProperties(vo, orderCostInfoVO, "id");
         orderCostInfoVO.setId(orderId);
         return orderCostInfoVO;
     }
-    private List<Map<String,Object>> buildBusinessProfitExportExcel(List<BusinessProfitDetailVO> businessProfitDetailVOS,ProjectBaseInfoQueryVO queryVO) throws IOException {
-        List<Map<String,Object>> list= new ArrayList<>();
-        for(BusinessProfitDetailVO vo:businessProfitDetailVOS){
+    private List<Map<String, Object>> buildBusinessProfitExportExcel(List<BusinessProfitDetailVO> businessProfitDetailVOS, ProjectBaseInfoQueryVO queryVO) throws IOException {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (BusinessProfitDetailVO vo : businessProfitDetailVOS) {
             Map<String, Object> map = new LinkedHashMap<>();
-            map.put("客户编码",Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
-            map.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
-            map.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
-            map.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
-          /* 不要图片,影响导出效率。
+            map.put("客户编码", Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
+            map.put("项目号", Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
+            map.put("生产科", Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
+            map.put("内部编号", Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
+//           不要图片,影响导出效率。
           if(StringUtils.isNotBlank(vo.getPicUrl())){
                 URL url = new URL(vo.getPicUrl());
                 InputStream inputStream = url.openStream();
                 map.put("订单图片", FileUtil.imageParseBytes(inputStream));
             }else{
                 map.put("订单图片", "");
-            }*/
-            map.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
-            map.put("包装费用$",Objects.nonNull(vo.getPacketPrice()) ? String.format("%.2f",vo.getPacketPrice()) : "");
-            map.put("包装费用合计$",Objects.nonNull(vo.getPacketTotalPrice()) ? String.format("%.2f",vo.getPacketTotalPrice()) : "");
-            map.put("包装费用合计￥",Objects.nonNull(vo.getPacketRmbTotalPrice()) ? String.format("%.2f",vo.getPacketRmbTotalPrice()) : "");
-            map.put("包装费用实际金额￥",Objects.nonNull(vo.getPacketActualRmbTotalPrice()) ? vo.getPacketActualRmbTotalPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-            map.put("实际跟单单价￥",Objects.nonNull(vo.getPacketActualRmbPrice()) ? vo.getPacketActualRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-            map.put("实际跟单单价$",Objects.nonNull(vo.getPacketActualPrice()) ? vo.getPacketActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-            map.put("包装费用净利润率",Objects.nonNull(vo.getPacketProfitRate()) ? vo.getPacketProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
-            map.put("跟单评分",Objects.nonNull(vo.getOrderScore()) ? vo.getOrderScore() : "");
-            map.put("跟单提成￥",Objects.nonNull(vo.getCopyCommission()) ? vo.getCopyCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            }
+            map.put("订单数量", Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
+            map.put("包装费用$", Objects.nonNull(vo.getPacketPrice()) ? String.format("%.2f", vo.getPacketPrice()) : "");
+            map.put("包装费用合计$", Objects.nonNull(vo.getPacketTotalPrice()) ? String.format("%.2f", vo.getPacketTotalPrice()) : "");
+            map.put("包装费用合计￥", Objects.nonNull(vo.getPacketRmbTotalPrice()) ? String.format("%.2f", vo.getPacketRmbTotalPrice()) : "");
+            map.put("包装费用实际金额￥", Objects.nonNull(vo.getPacketActualRmbTotalPrice()) ? vo.getPacketActualRmbTotalPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("实际跟单单价￥", Objects.nonNull(vo.getPacketActualRmbPrice()) ? vo.getPacketActualRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("实际跟单单价$", Objects.nonNull(vo.getPacketActualPrice()) ? vo.getPacketActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("包装费用净利润率", Objects.nonNull(vo.getPacketProfitRate()) ? vo.getPacketProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            map.put("跟单评分", Objects.nonNull(vo.getOrderScore()) ? vo.getOrderScore() : "");
+            map.put("跟单提成￥", Objects.nonNull(vo.getCopyCommission()) ? vo.getCopyCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("已发提成￥", Objects.nonNull(vo.getIssuedCommission()) ? vo.getIssuedCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("提成状态", Objects.nonNull(vo.getOrderCommissionStatus()) ? (CommissionStatusEnum.ISSUED.getStatus().equals(vo.getOrderCommissionStatus()) ? "已发放" : "未发放") : "未发放");
 //            if(StringUtils.isNotBlank(queryVO.getBusinessCostExportSelect().getPacketPrice()) &&
 //                OrderLockFieldEnum.SELECTED.name().equals(queryVO.getBusinessCostExportSelect().getPacketPrice())){
 //
@@ -692,33 +855,32 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         return list;
     }
-    private List<Map<String,Object>> buildInnerProfitDetailExcel(List<InnerProfitDetailVO> innerProfitDetailVOS, ProjectBaseInfoQueryVO queryVO) throws IOException {
-        List<Map<String,Object>> list = new ArrayList<>();
-        for (InnerProfitDetailVO vo:innerProfitDetailVOS){
+    private List<Map<String, Object>> buildInnerProfitDetailExcel(List<InnerProfitDetailVO> innerProfitDetailVOS, ProjectBaseInfoQueryVO queryVO) throws IOException {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (InnerProfitDetailVO vo : innerProfitDetailVOS) {
             Map<String, Object> hashMap = new LinkedHashMap<>();
-            hashMap.put("客户编码",Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
-            hashMap.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
-            hashMap.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
-            hashMap.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
-           /* 不要图片,影响到处效率。
+            hashMap.put("客户编码", Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
+            hashMap.put("项目号", Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
+            hashMap.put("生产科", Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
+            hashMap.put("内部编号", Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
             if(StringUtils.isNotBlank(vo.getPicUrl())){
                 URL url = new URL(vo.getPicUrl());
                 InputStream inputStream = url.openStream();
                 hashMap.put("订单图片", FileUtil.imageParseBytes(inputStream));
             }else{
                 hashMap.put("订单图片", "");
-            }*/
-            hashMap.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
-            hashMap.put("生产科单价￥",Objects.nonNull(vo.getProductionDepartmentPrice()) ? String.format("%.2f",vo.getProductionDepartmentPrice()) : "");
-            hashMap.put("生产科总价￥",Objects.nonNull(vo.getProductionDepartmentTotalPrice()) ? String.format("%.2f",vo.getProductionDepartmentTotalPrice()) : "");
-            hashMap.put("生产科预算金额￥",Objects.nonNull(vo.getProductionDepartmentPredictPrice()) ? vo.getProductionDepartmentPredictPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-            hashMap.put("实际发生费用￥",Objects.nonNull(vo.getProductionActualPrice()) ? vo.getProductionActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-            hashMap.put("预算占比",Objects.nonNull(vo.getPredictRatio()) ? vo.getPredictRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
-            hashMap.put("预算占比与实际占比差",Objects.nonNull(vo.getPredictAndActualRatio()) ? vo.getPredictAndActualRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
-            hashMap.put("事前毛利润",Objects.nonNull(vo.getBeforeGrossProfit()) ? vo.getBeforeGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-            hashMap.put("事前毛利率",Objects.nonNull(vo.getBeforeGrossProfitRate()) ? vo.getBeforeGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
-            hashMap.put("事后毛利润",Objects.nonNull(vo.getGrossProfit()) ? vo.getGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
-            hashMap.put("事后毛利率",Objects.nonNull(vo.getGrossProfitRate()) ? vo.getGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            }
+            hashMap.put("订单数量", Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
+            hashMap.put("生产科单价￥", Objects.nonNull(vo.getProductionDepartmentPrice()) ? String.format("%.2f", vo.getProductionDepartmentPrice()) : "");
+            hashMap.put("生产科总价￥", Objects.nonNull(vo.getProductionDepartmentTotalPrice()) ? String.format("%.2f", vo.getProductionDepartmentTotalPrice()) : "");
+            hashMap.put("生产科预算金额￥", Objects.nonNull(vo.getProductionDepartmentPredictPrice()) ? vo.getProductionDepartmentPredictPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("实际发生费用￥", Objects.nonNull(vo.getProductionActualPrice()) ? vo.getProductionActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("预算占比", Objects.nonNull(vo.getPredictRatio()) ? vo.getPredictRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("预算占比与实际占比差", Objects.nonNull(vo.getPredictAndActualRatio()) ? vo.getPredictAndActualRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("事前毛利润", Objects.nonNull(vo.getBeforeGrossProfit()) ? vo.getBeforeGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("事前毛利率", Objects.nonNull(vo.getBeforeGrossProfitRate()) ? vo.getBeforeGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("事后毛利润", Objects.nonNull(vo.getGrossProfit()) ? vo.getGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("事后毛利率", Objects.nonNull(vo.getGrossProfitRate()) ? vo.getGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
             /*if(StringUtils.isNotBlank(queryVO.getInnerProfitDetailExportSelect().getProductionDepartmentPrice()) &&
             OrderLockFieldEnum.SELECTED.name().equals(queryVO.getInnerProfitDetailExportSelect().getProductionDepartmentPrice())){