订单明细报表：处理运费和回程运费问题

@@ -9,6 +9,7 @@ import com.lframework.xingyun.sc.entity.OrderDetailReport;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>
@@ -295,6 +296,16 @@ public class GetOrderDetailReportBo extends BaseBo<OrderDetailReport> {
 
     @Override
     protected void afterInit(OrderDetailReport dto) {
-
+        if ("PROCESS_STD_AGMT".equals(dto.getContractType())) {
+            if (StringUtils.isBlank(this.returnShippingCost) && StringUtils.isNotBlank(this.shippingCost)) {
+                this.returnShippingCost = this.shippingCost;
+            }
+            this.shippingCost = null;
+        } else {
+            if (StringUtils.isBlank(this.shippingCost) && StringUtils.isNotBlank(this.returnShippingCost)) {
+                this.shippingCost = this.returnShippingCost;
+            }
+            this.returnShippingCost = null;
+        }
     }
 }

@@ -354,6 +354,17 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
         this.specialRequirements = getDicItemNameOrOriginal(DIC_SPECIAL_REQUIREMENTS, this.specialRequirements);
         this.deptCode = convertDeptNameToDeptCode(this.deptName);
         this.contractTypeName = handleContractType(this.contractTypeCode);
+        if ("PROCESS_STD_AGMT".equals(this.contractTypeCode)) {
+            if (StringUtils.isBlank(this.returnShippingCost) && StringUtils.isNotBlank(this.shippingCost)) {
+                this.returnShippingCost = this.shippingCost;
+            }
+            this.shippingCost = null;
+        } else {
+            if (StringUtils.isBlank(this.shippingCost) && StringUtils.isNotBlank(this.returnShippingCost)) {
+                this.shippingCost = this.returnShippingCost;
+            }
+            this.returnShippingCost = null;
+        }
     }
 
     private static String getDicItemNameOrOriginal(String dicCode, String itemCode) {

@@ -952,8 +952,17 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         vo.setPerformance(orderDetailReport.getPerformance());
         vo.setPackaging(orderDetailReport.getPackaging());
         vo.setRemarks(orderDetailReport.getRemarks());
-        vo.setReturnShippingCost(orderDetailReport.getReturnShippingCost());
-        vo.setShippingCost(orderDetailReport.getShippingCost());
+        if (orderDetailReport.getContractType() != null && orderDetailReport.getContractType().contains("加工")) {
+            vo.setReturnShippingCost(StringUtils.isNotBlank(orderDetailReport.getReturnShippingCost())
+                    ? orderDetailReport.getReturnShippingCost()
+                    : orderDetailReport.getShippingCost());
+            vo.setShippingCost(null);
+        } else {
+            vo.setShippingCost(StringUtils.isNotBlank(orderDetailReport.getShippingCost())
+                    ? orderDetailReport.getShippingCost()
+                    : orderDetailReport.getReturnShippingCost());
+            vo.setReturnShippingCost(null);
+        }
         vo.setCustomerType(orderDetailReport.getCustomerType());
         vo.setQuality(orderDetailReport.getQuality());
         vo.setContractType(orderDetailReport.getContractType());

@@ -577,8 +577,10 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         String type = standard.getType();
         if ("PROCESS_STD_AGMT".equals(type)) {
             vo.setReturnShippingCost(orderInfo.getShippingCost());
+            vo.setShippingCost(null);
         } else {
             vo.setShippingCost(orderInfo.getShippingCost());
+            vo.setReturnShippingCost(null);
         }
         vo.setCustomerType(orderDetailReport.getCustomerType());
         vo.setQuality(line.getQuality());

@@ -380,8 +380,10 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 String type = standard.getType();
                 if ("PROCESS_STD_AGMT".equals(type)) {
                     vo.setReturnShippingCost(purchaseOrderInfo.getShippingCost());
+                    vo.setShippingCost(null);
                 } else {
                     vo.setShippingCost(purchaseOrderInfo.getShippingCost());
+                    vo.setReturnShippingCost(null);
                 }
                 if (customerCredit != null) {
                     SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("ENTERPRISE_TYPE", customerCredit.getEnterpriseType());

@@ -250,6 +250,23 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
                 log.error("超协价格式错误，使用原始销售价。value=" + assessmentExceedsAgreement);
             }
         }
+
+        String shippingCost = StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost();
+        String returnShippingCost = null;
+        boolean isProcessContract = false;
+        PurchaseOrderLine purchaseOrderLine = purchaseOrderLineService.findById(vo.getPurchaseOrderLineId());
+        if (purchaseOrderLine != null && StringUtils.isNotBlank(purchaseOrderLine.getPurchaseOrderId())) {
+            PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(purchaseOrderLine.getPurchaseOrderId());
+            if (purchaseOrderInfo != null && StringUtils.isNotBlank(purchaseOrderInfo.getContractId())) {
+                ContractDistributorStandard standard = contractDistributorStandardService.findById(purchaseOrderInfo.getContractId());
+                isProcessContract = standard != null && "PROCESS_STD_AGMT".equals(standard.getType());
+            }
+        }
+        if (isProcessContract) {
+            returnShippingCost = shippingCost;
+            shippingCost = null;
+        }
+
         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())
@@ -262,7 +279,8 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
                 .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())
+                .set(OrderDetailReport::getShippingCost, shippingCost)
+                .set(OrderDetailReport::getReturnShippingCost, returnShippingCost)
                 .set(OrderDetailReport::getSuggestedPrice, StringUtil.isBlank(vo.getSuggestedPrice()) ? null : vo.getSuggestedPrice())
                 .set(OrderDetailReport::getProductionProcess, StringUtil.isBlank(vo.getProductionProcess()) ? null : vo.getProductionProcess())
                 .eq(OrderDetailReport::getShowOrder, 0)