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

@@ -38,6 +38,7 @@ import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.*;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.UpdateOrderDetailReportVo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -440,6 +441,24 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (CollectionUtils.isNotEmpty(updatePurchaseOrderLineVoList)) {
             for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : updatePurchaseOrderLineVoList) {
                 purchaseOrderLineService.update(updatePurchaseOrderLineVo);
+
+                //修改订单详情
+                UpdateOrderDetailReportVo vo1 = new UpdateOrderDetailReportVo();
+                vo1.setPurchaseOrderLineId(updatePurchaseOrderLineVo.getId());
+                vo1.setDeliveryDate(updatePurchaseOrderLineVo.getDeliveryDate());
+                vo1.setPriceListNo(vo.getPriceListNo());
+                if (updatePurchaseOrderLineVo.getPackagingFee() != null) {
+                    vo1.setPackagingFee(updatePurchaseOrderLineVo.getPackagingFee().toPlainString());
+                }
+                vo1.setInvoicingStatus(vo.getInvoicingStatus());
+                vo1.setPieceWeightHeader(vo.getPieceWeightHeader());
+                vo1.setSurface(vo.getSurface());
+                vo1.setTolerance(vo.getTolerance());
+                vo1.setPerformance(vo.getPerformance());
+                vo1.setPackaging(vo.getPackaging());
+                vo1.setRemarks(vo.getRemarks());
+                vo1.setShippingCost(vo.getShippingCost());
+                orderDetailReportService.update(vo1);
             }
         }
 
@@ -497,6 +516,25 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (CollectionUtils.isNotEmpty(updatePurchaseOrderLineVoList)) {
             for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : updatePurchaseOrderLineVoList) {
                 purchaseOrderLineService.update(updatePurchaseOrderLineVo);
+
+                //修改订单详情
+                UpdateOrderDetailReportVo vo1 = new UpdateOrderDetailReportVo();
+                vo1.setPurchaseOrderLineId(updatePurchaseOrderLineVo.getId());
+                vo1.setDeliveryDate(updatePurchaseOrderLineVo.getDeliveryDate());
+                vo1.setAssessmentExceedsAgreement(updatePurchaseOrderLineVo.getAssessmentExceedsAgreement());
+                vo1.setPriceListNo(vo.getPriceListNo());
+                if (updatePurchaseOrderLineVo.getPackagingFee() != null) {
+                    vo1.setPackagingFee(updatePurchaseOrderLineVo.getPackagingFee().toPlainString());
+                }
+                vo1.setInvoicingStatus(vo.getInvoicingStatus());
+                vo1.setPieceWeightHeader(vo.getPieceWeightHeader());
+                vo1.setSurface(vo.getSurface());
+                vo1.setTolerance(vo.getTolerance());
+                vo1.setPerformance(vo.getPerformance());
+                vo1.setPackaging(vo.getPackaging());
+                vo1.setRemarks(vo.getRemarks());
+                vo1.setShippingCost(vo.getShippingCost());
+                orderDetailReportService.update(vo1);
             }
         }
 

 package com.lframework.xingyun.sc.impl.statistics;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -26,6 +28,7 @@ import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.UpdateOrderDetailReportVo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -216,6 +219,30 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
         return data.getId();
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "修改订单明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateOrderDetailReportVo vo) {
+
+        LambdaUpdateWrapper<OrderDetailReport> updateWrapper = Wrappers.lambdaUpdate(OrderDetailReport.class)
+                .set(OrderDetailReport::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
+                .set(OrderDetailReport::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
+                .set(OrderDetailReport::getPriceListNo, StringUtil.isBlank(vo.getPriceListNo()) ? null : vo.getPriceListNo())
+                .set(OrderDetailReport::getPackagingFee, StringUtil.isBlank(vo.getPackagingFee()) ? null : vo.getPackagingFee())
+                .set(OrderDetailReport::getInvoicingStatus, StringUtil.isBlank(vo.getInvoicingStatus()) ? null : vo.getInvoicingStatus())
+                .set(OrderDetailReport::getPieceWeightHeader, StringUtil.isBlank(vo.getPieceWeightHeader()) ? null : vo.getPieceWeightHeader())
+                .set(OrderDetailReport::getSurface, StringUtil.isBlank(vo.getSurface()) ? null : vo.getSurface())
+                .set(OrderDetailReport::getTolerance, StringUtil.isBlank(vo.getTolerance()) ? null : vo.getTolerance())
+                .set(OrderDetailReport::getPerformance, StringUtil.isBlank(vo.getPerformance()) ? null : vo.getPerformance())
+                .set(OrderDetailReport::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
+                .set(OrderDetailReport::getRemarks, StringUtil.isBlank(vo.getRemarks()) ? null : vo.getRemarks())
+                .set(OrderDetailReport::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
+                .eq(OrderDetailReport::getPurchaseOrderLineId, vo.getPurchaseOrderLineId());
+
+        getBaseMapper().update(updateWrapper);
+
+    }
+
     @Override
     public void processHistoricalData() {
         QueryPurchaseOrderInfoVo vo2 = new QueryPurchaseOrderInfoVo();
@@ -223,7 +250,10 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
         if (CollectionUtils.isNotEmpty(query)) {
             for (PurchaseOrderInfo purchaseOrderInfo : query) {
                 ContractDistributorStandard standard = contractDistributorStandardService.findById(purchaseOrderInfo.getContractId());
-                CustomerCredit customerCredit = customerCreditService.findById(purchaseOrderInfo.getCustomerCreditId());
+                CustomerCredit customerCredit = null;
+                if (StringUtils.isNotEmpty(purchaseOrderInfo.getCustomerCreditId())) {
+                    customerCredit = customerCreditService.findById(purchaseOrderInfo.getCustomerCreditId());
+                }
                 QueryPurchaseOrderLineVo vo1 = new QueryPurchaseOrderLineVo();
                 vo1.setPurchaseOrderId(purchaseOrderInfo.getId());
                 List<PurchaseOrderLine> lineVoList = purchaseOrderLineService.query(vo1);
@@ -262,14 +292,18 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
                                 vo.setSuggestedPrice(subtract.toPlainString());
                             } catch (NumberFormatException e) {
                                 // 日志记录或按业务处理：超协价格式无效，忽略计算
-                                log.error("assessmentExceedsAgreement====>" + assessmentExceedsAgreement);
+                                log.error("超协价格式错误，使用原始销售价。value=" + assessmentExceedsAgreement);
                             }
                         }
                         vo.setDeliveryDate(line.getDeliveryDate());
                         vo.setAssessmentExceedsAgreement(line.getAssessmentExceedsAgreement());
-                        vo.setSalesPrice(line.getSalesPrice().toPlainString());
+                        if (line.getSalesPrice() != null) {
+                            vo.setSalesPrice(line.getSalesPrice().toPlainString());
+                        }
                         vo.setPriceListNo(purchaseOrderInfo.getPriceListNo());
-                        vo.setPackagingFee(line.getPackagingFee().toPlainString());
+                        if (line.getPackagingFee() != null) {
+                            vo.setPackagingFee(line.getPackagingFee().toPlainString());
+                        }
                         vo.setInvoicingStatus(purchaseOrderInfo.getInvoicingStatus());
                         vo.setPieceWeightHeader(purchaseOrderInfo.getPieceWeightHeader());
                         vo.setSurface(purchaseOrderInfo.getSurface());
@@ -295,14 +329,14 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
                         vo.setContractType(contractType);
                         if ("加工".equals(contractType)) {
                             String contractDistributorLineId = line.getContractDistributorLineId();
-                            ContractStdProcessingLine processingLine = contractStdProcessingLineService.findById(contractDistributorLineId);
-
-                            if (processingLine != null) {
-                                String materialProductRatio = processingLine.getMaterialProductRatio();
-                                SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("RAW_TO_PROD_RATIO", materialProductRatio);
-
-                                if (dataDicItem != null) {
-                                    vo.setContractType(dataDicItem.getName() + contractType);
+                            if (StringUtils.isNotEmpty(contractDistributorLineId)) {
+                                ContractStdProcessingLine processingLine = contractStdProcessingLineService.findById(contractDistributorLineId);
+                                if (processingLine != null) {
+                                    String materialProductRatio = processingLine.getMaterialProductRatio();
+                                    SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("RAW_TO_PROD_RATIO", materialProductRatio);
+                                    if (dataDicItem != null) {
+                                        vo.setContractType(dataDicItem.getName() + contractType);
+                                    }
                                 }
                             }
                         }

@@ -5,6 +5,8 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.xingyun.sc.entity.OrderDetailReport;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.UpdateOrderDetailReportVo;
+
 import java.util.List;
 
 /**
@@ -40,6 +42,12 @@ public interface OrderDetailReportService extends BaseMpService<OrderDetailRepor
     String create(CreateOrderDetailReportVo vo);
 
     /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateOrderDetailReportVo vo);
+
+    /**
      * 处理历史数据
      */
     void processHistoricalData();

+package com.lframework.xingyun.sc.vo.statistics.orderDetail;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdateOrderDetailReportVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料行ID不能为空
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "物料行ID不能为空！")
+    private String purchaseOrderLineId;
+
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 超协价
+     */
+    @ApiModelProperty("超协价")
+    @Length(message = "超协价最多允许50个字符！")
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 价格表编号
+     */
+    @ApiModelProperty("价格表编号")
+    @Length(message = "价格表编号最多允许50个字符！")
+    private String priceListNo;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    @Length(message = "包装费最多允许50个字符！")
+    private String packagingFee;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty("开票情况")
+    @Length(message = "开票情况最多允许50个字符！")
+    private String invoicingStatus;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty("件重条头")
+    @Length(message = "件重条头最多允许65,535个字符！")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty("表面")
+    @Length(message = "表面最多允许65,535个字符！")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty("公差")
+    @Length(message = "公差最多允许65,535个字符！")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty("性能")
+    @Length(message = "性能最多允许65,535个字符！")
+    private String performance;
+
+    /**
+     * 包装
+     */
+    @ApiModelProperty("包装")
+    @Length(message = "包装最多允许65,535个字符！")
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(message = "备注最多允许65,535个字符！")
+    private String remarks;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    @Length(message = "运费最多允许50个字符！")
+    private String shippingCost;
+
+}