1.业务利润统计增加字段，teu，箱型，箱量等

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FinanceProfitDtoList.java

@@ -60,6 +60,47 @@ public class FinanceProfitDtoList {
 	private String statisticsDate;
 
 	/**
+	 * 20GP
+	 */
+	@ExcelProperty(value = "20GP")
+	private BigDecimal quantityGp20;
+	/**
+	 * 40GP
+	 */
+	@ExcelProperty(value = "40GP")
+	private BigDecimal quantityGp40;
+	/**
+	 * 20HC
+	 */
+	@ExcelProperty(value = "20HC")
+	private BigDecimal quantityHc20;
+	/**
+	 * 40FR
+	 */
+	@ExcelProperty(value = "40FR")
+	private BigDecimal quantityFr40;
+	/**
+	 * 40HC
+	 */
+	@ExcelProperty(value = "40HC")
+	private BigDecimal quantityHc40;
+	/**
+	 * TEU
+	 */
+	@ExcelProperty(value = "TEU")
+	private BigDecimal teu;
+	/**
+	 * 分单合计TEU
+	 */
+	@ExcelProperty(value = "分单合计TEU")
+	private BigDecimal teuTotal;
+	/**
+	 * 集装箱
+	 */
+	@ExcelProperty(value = "集装箱")
+	private String quantityCntrDescr;
+
+	/**
 	 * 往来单位Id
 	 */
 	@ExcelIgnore

blade-service-api/blade-los-api/src/main/java/org/springblade/los/view/entity/FinanceProfit.java

@@ -99,6 +99,13 @@ public class FinanceProfit implements Serializable {
 	private BigDecimal realAmountProfitLoc;
 	private String boxBelongsTo;
 
-
+	private BigDecimal quantityGp20;
+	private BigDecimal quantityGp40;
+	private BigDecimal quantityHc20;
+	private BigDecimal quantityFr40;
+	private BigDecimal quantityHc40;
+	private BigDecimal teu;
+	private BigDecimal teuTotal;
+	private String quantityCntrDescr;
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/TemplateImportServiceImpl.java

@@ -1439,7 +1439,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			if (lastDigitIndex > 0) {
 				String number = quantity.substring(0, lastDigitIndex + 1);
 				bills.setQuantity(new BigDecimal(number));
-				String packingUnit = quantity.substring(lastDigitIndex);
+				String packingUnit = quantity.substring(lastDigitIndex+ 1);
 				if (ObjectUtils.isNotNull(packingUnit)) {
 					BPackages packages = bPackagesService.getOne(new LambdaQueryWrapper<BPackages>()
 						.eq(BPackages::getTenantId, AuthUtil.getTenantId())
@@ -1749,7 +1749,7 @@ public class TemplateImportServiceImpl implements ITemplateImportService {
 			if (lastDigitIndex > 0) {
 				String number = quantity.substring(0, lastDigitIndex + 1);
 				bills.setQuantity(new BigDecimal(number));
-				String packingUnit = quantity.substring(lastDigitIndex);
+				String packingUnit = quantity.substring(lastDigitIndex+ 1);
 				if (ObjectUtils.isNotNull(packingUnit)) {
 					BPackages packages = bPackagesService.getOne(new LambdaQueryWrapper<BPackages>()
 						.eq(BPackages::getTenantId, AuthUtil.getTenantId())

blade-service/blade-los/src/main/java/org/springblade/los/view/mapper/FinanceProfitMapper.xml

@@ -55,6 +55,15 @@
         <result column="realAmount_cr_sgd" property="realAmountCrSgd"/>
         <result column="realAmount_cr_loc" property="realAmountCrLoc"/>
         <result column="amount_profit_loc" property="amountProfitLoc"/>
+
+        <result column="quantity_gp20" property="quantityGp20"/>
+        <result column="quantity_gp40" property="quantityGp40"/>
+        <result column="quantity_hc20" property="quantityHc20"/>
+        <result column="quantity_fr40" property="quantityFr40"/>
+        <result column="quantity_hc40" property="quantityHc40"/>
+        <result column="teu" property="teu"/>
+        <result column="teu_total" property="teuTotal"/>
+        <result column="quantity_cntr_descr" property="quantityCntrDescr"/>
     </resultMap>
 
 
@@ -113,6 +122,15 @@
         seb.real_amount_cr_loc AS realAmountCrLoc,
 
         seb.amount_profit_loc AS amountProfitLoc,
+
+        seb.quantity_gp20 AS quantityGp20,
+        seb.quantity_gp40 AS quantityGp40,
+        seb.quantity_hc20 AS quantityHc20,
+        seb.quantity_fr40 AS quantityFr40,
+        seb.quantity_hc40 AS quantityHc40,
+        seb.teu AS teu,
+        seb.teu_total AS teuTotal,
+        seb.quantity_cntr_descr AS quantityCntrDescr,
         seb.branch_name as branchId,
         seb.corp_source AS corpSource,
         seb.ocean_freight_dr AS oceanFreightDr,
@@ -257,6 +275,15 @@
         seb.real_amount_cr_loc AS realAmountCrLoc,
 
         seb.amount_profit_loc AS amountProfitLoc,
+
+        seb.quantity_gp20 AS quantityGp20,
+        seb.quantity_gp40 AS quantityGp40,
+        seb.quantity_hc20 AS quantityHc20,
+        seb.quantity_fr40 AS quantityFr40,
+        seb.quantity_hc40 AS quantityHc40,
+        seb.teu AS teu,
+        seb.teu_total AS teuTotal,
+        seb.quantity_cntr_descr AS quantityCntrDescr,
         seb.branch_name as branchId,
         seb.corp_source AS corpSource,
         seb.ocean_freight_dr AS oceanFreightDr,