Merge branch 'test'

bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java

@@ -0,0 +1,64 @@
+package com.bms.ar.domain.vo;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.bms.common.annotation.Excel;
+import com.bms.price.domain.PrcOrderBill;
+import lombok.Data;
+
+/** 应收账单生成预览结果 Excel 导出行。 */
+@Data
+public class ArBillGeneratePreviewExportRow implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "订单号", sort = 0, width = 24)
+    private String orderNo;
+
+    @Excel(name = "运单号", sort = 1, width = 22)
+    private String trackingNo;
+
+    @Excel(name = "转单号", sort = 2, width = 24)
+    private String transferNo;
+
+    @Excel(name = "客户", sort = 3, width = 24)
+    private String customerName;
+
+    @Excel(name = "业务日期", sort = 4, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 22)
+    private Date bizDate;
+
+    @Excel(name = "产品", sort = 5, width = 22)
+    private String productName;
+
+    @Excel(name = "国家/地区", sort = 6, width = 18)
+    private String countryName;
+
+    @Excel(name = "实际重(kg)", sort = 7, scale = 2, width = 16)
+    private BigDecimal actualWeight;
+
+    @Excel(name = "计费重(kg)", sort = 8, scale = 2, width = 16)
+    private BigDecimal chargeWeight;
+
+    @Excel(name = "应收金额", sort = 9, scale = 2, width = 16)
+    private BigDecimal incomeTotal;
+
+    @Excel(name = "币种", sort = 10, width = 12)
+    private String currency;
+
+    public static ArBillGeneratePreviewExportRow from(PrcOrderBill bill) {
+        ArBillGeneratePreviewExportRow row = new ArBillGeneratePreviewExportRow();
+        row.setOrderNo(bill.getOrderNo());
+        row.setTrackingNo(bill.getTrackingNo());
+        row.setTransferNo(bill.getTransferNo());
+        row.setCustomerName(bill.getCustomerName());
+        row.setBizDate(bill.getBizDate());
+        row.setProductName(bill.getProductName());
+        row.setCountryName(bill.getCountryName());
+        row.setActualWeight(bill.getActualWeight());
+        row.setChargeWeight(bill.getChargeWeight());
+        row.setIncomeTotal(bill.getIncomeTotal());
+        row.setCurrency(bill.getCurrency());
+        return row;
+    }
+}

bms-back/bms-system/src/main/java/com/bms/price/service/IPrcProfitReportService.java

@@ -1,6 +1,7 @@
 package com.bms.price.service;
 
 import java.util.List;
+import com.bms.customer.customerinfo.domain.BmsCustomerOption;
 // 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate;
 import com.bms.price.domain.PrcProfitReportExport;
 import com.bms.price.domain.vo.PrcProfitReportOrderRow;
@@ -11,6 +12,8 @@ import com.bms.price.domain.vo.PrcProfitReportSummary;
 /** 毛利报表服务。 */
 public interface IPrcProfitReportService
 {
+    List<BmsCustomerOption> selectCustomerOptions(String keywords);
+
     List<PrcProfitReportOrderRow> selectOrderRows(PrcProfitReportQuery query);
 
     List<PrcProfitReportProductRow> selectProductRows(PrcProfitReportQuery query);

bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java

@@ -9,6 +9,9 @@ import org.springframework.stereotype.Service;
 // 提成功能暂停使用：import org.springframework.transaction.annotation.Transactional;
 import com.bms.common.exception.ServiceException;
 import com.bms.common.utils.SecurityUtils;
+import com.bms.customer.customerinfo.domain.BmsCustomer;
+import com.bms.customer.customerinfo.domain.BmsCustomerOption;
+import com.bms.customer.customerinfo.mapper.BmsCustomerMapper;
 // 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate;
 // 提成功能暂停使用：import com.bms.price.mapper.PrcProfitCommissionRateMapper;
 import com.bms.price.domain.PrcProfitReportExport;
@@ -28,11 +31,23 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
     @Autowired
     private PrcProfitReportMapper profitReportMapper;
 
+    @Autowired
+    private BmsCustomerMapper customerMapper;
+
     /* 提成配置依赖暂停使用。
     @Autowired
     private PrcProfitCommissionRateMapper commissionRateMapper;
     */
 
+    @Override
+    public List<BmsCustomerOption> selectCustomerOptions(String keywords)
+    {
+        // 报表不应用客户模块的 DataScope，只接收关键字并构造内部查询条件。
+        BmsCustomer query = new BmsCustomer();
+        query.setKeywords(keywords);
+        return customerMapper.selectCustomerOptions(query);
+    }
+
     @Override
     public List<PrcProfitReportOrderRow> selectOrderRows(PrcProfitReportQuery query)
     {