福达 利润用出厂金额-采购-配件=利润

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.trade.purchase.financing.entity.Financing;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import com.trade.purchase.order.feign.IFinancingClient;
 import io.swagger.annotations.Api;
@@ -435,7 +434,7 @@ public class ExportOrderController extends BladeController {
 					item.setFc(BigDecimal.ZERO);
 				}
 				//产品利润 销售金额-采购成本金额-配件成本金额
-				item.setGrossProfit(item.getAmount().subtract(item.getProcurementCost()).subtract(item.getPartsCost()));
+				item.setGrossProfit(item.getOutFactoryPrice().subtract(item.getProcurementCost()).subtract(item.getPartsCost()));
 				//产品利率
 				if (item.getAmount().compareTo(BigDecimal.ZERO) > 0) {
 					item.setGrossProfitRate(item.getGrossProfit().divide(item.getAmount(), 2, BigDecimal.ROUND_HALF_UP));