统计报表：订单明细-修改

@@ -458,6 +458,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 vo1.setPackaging(vo.getPackaging());
                 vo1.setPackaging(vo.getPackaging());
                 vo1.setRemarks(vo.getRemarks());
                 vo1.setRemarks(vo.getRemarks());
                 vo1.setShippingCost(vo.getShippingCost());
                 vo1.setShippingCost(vo.getShippingCost());
+                vo1.setSalesPrice(updatePurchaseOrderLineVo.getSalesPrice());
                 orderDetailReportService.update(vo1);
                 orderDetailReportService.update(vo1);
             }
             }
         }
         }
@@ -534,6 +535,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 vo1.setPackaging(vo.getPackaging());
                 vo1.setPackaging(vo.getPackaging());
                 vo1.setRemarks(vo.getRemarks());
                 vo1.setRemarks(vo.getRemarks());
                 vo1.setShippingCost(vo.getShippingCost());
                 vo1.setShippingCost(vo.getShippingCost());
+                vo1.setSalesPrice(updatePurchaseOrderLineVo.getSalesPrice());
                 orderDetailReportService.update(vo1);
                 orderDetailReportService.update(vo1);
             }
             }
         }
         }

@@ -224,6 +224,21 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
     @Override
     @Override
     public void update(UpdateOrderDetailReportVo vo) {
     public void update(UpdateOrderDetailReportVo vo) {
 
 
+        String assessmentExceedsAgreement;
+        BigDecimal salesPrice = vo.getSalesPrice();
+        if (vo.getSalesPrice() != null && StringUtils.isNotEmpty(vo.getAssessmentExceedsAgreement())) {
+            assessmentExceedsAgreement = vo.getAssessmentExceedsAgreement().trim();
+            try {
+                BigDecimal exceedsAgreement = new BigDecimal(assessmentExceedsAgreement);
+                BigDecimal divisor = new BigDecimal("1000");
+                BigDecimal adjustment = exceedsAgreement.divide(divisor, 4, RoundingMode.HALF_UP); // 保留4位小数
+                BigDecimal subtract = salesPrice.subtract(adjustment);
+                vo.setSuggestedPrice(subtract.toPlainString());
+            } catch (NumberFormatException e) {
+                // 日志记录或按业务处理：超协价格式无效，忽略计算
+                log.error("超协价格式错误，使用原始销售价。value=" + assessmentExceedsAgreement);
+            }
+        }
         LambdaUpdateWrapper<OrderDetailReport> updateWrapper = Wrappers.lambdaUpdate(OrderDetailReport.class)
         LambdaUpdateWrapper<OrderDetailReport> updateWrapper = Wrappers.lambdaUpdate(OrderDetailReport.class)
                 .set(OrderDetailReport::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
                 .set(OrderDetailReport::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
                 .set(OrderDetailReport::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
                 .set(OrderDetailReport::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
@@ -237,6 +252,7 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
                 .set(OrderDetailReport::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
                 .set(OrderDetailReport::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
                 .set(OrderDetailReport::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
                 .set(OrderDetailReport::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
                 .set(OrderDetailReport::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
                 .set(OrderDetailReport::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
+                .set(OrderDetailReport::getSuggestedPrice, StringUtil.isBlank(vo.getSuggestedPrice()) ? null : vo.getSuggestedPrice())
                 .eq(OrderDetailReport::getPurchaseOrderLineId, vo.getPurchaseOrderLineId());
                 .eq(OrderDetailReport::getPurchaseOrderLineId, vo.getPurchaseOrderLineId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.vo.statistics.orderDetail;
 
 
 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;
@@ -106,4 +107,18 @@ public class UpdateOrderDetailReportVo implements BaseVo, Serializable {
     @Length(message = "运费最多允许50个字符！")
     @Length(message = "运费最多允许50个字符！")
     private String shippingCost;
     private String shippingCost;
 
 
+    /**
+     * 指导价
+     */
+    @ApiModelProperty("指导价")
+    @Length(message = "指导价最多允许50个字符！")
+    private String suggestedPrice;
+
+    /**
+     * 销售价格
+     */
+    @ApiModelProperty("销售价格")
+    private BigDecimal salesPrice;
+
+
 }
 }