福达 修改利润分析 本票利润

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

@@ -433,8 +433,10 @@ public class ExportOrderController extends BladeController {
 				} else {
 					item.setFc(BigDecimal.ZERO);
 				}
-				//产品利润 销售金额-采购成本金额-配件成本金额
+				//产品利润 销售出厂金额-采购成本金额-配件成本金额
 				item.setGrossProfit(item.getOutFactoryPrice().subtract(item.getProcurementCost()).subtract(item.getPartsCost()));
+				//销售利润  销售金额-采购成本金额-配件成本金额
+				item.setSalesProfit(item.getAmount().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));
@@ -442,7 +444,7 @@ public class ExportOrderController extends BladeController {
 					item.setGrossProfitRate(BigDecimal.ZERO);
 				}
 				//计算单票利润=单票利润+费用应收-费用应付
-				item.setSingleTicketMargin(item.getGrossProfit().add(item.getFd()).subtract(item.getFc()));
+				item.setSingleTicketMargin(item.getSalesProfit().add(item.getFd()).subtract(item.getFc()));
 			});
 		}
 		return R.data(page);

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/LeadsServiceImpl.java

@@ -39,7 +39,6 @@ import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;