1.海运进出口导出字段修改

2.转单客户中英文转换去掉
3.发票添加明细取值日期修改
4.文件上传bug修改

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java

@@ -183,16 +183,18 @@ public class OssEndpoint {
 		System.err.println("link:" + link);
 		//String replace = link.replace("http://113.44.105.66:9000/", "https://trade.tubaosoft.com/file/");
 		String replace = "";
-		if (ObjectUtils.isNotNull(status) && "获取数据失败".equals(status)) {
-			if (ObjectUtils.isNotNull(replaceUrl)&& "获取数据失败".equals(replaceUrl)){
-				replace = link.replace(status, replaceUrl + "/file");
+		if (ObjectUtils.isNotNull(status) && !"获取数据失败".equals(status)) {
+			if (ObjectUtils.isNotNull(replaceUrl)&& !"获取数据失败".equals(replaceUrl)){
+				replace = link.replace(status, replaceUrl + "/file/");
+				System.err.println("replace1:" + replace);
 			}else{
 				replace = link.replace(status + ":9000/", status + "/file/");
+				System.err.println("replace2:" + replace);
 			}
 		} else {
 			replace = link.replace("http://113.44.105.66:9000/", "http://e.win-fl.com/file/");
 		}
-		System.err.println("replace:" + replace);
+		System.err.println("replace3:" + replace);
 		bladeFile.setLink(replace);
 		return R.data(bladeFile);
 	}

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

@@ -2891,7 +2891,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		billsJk.setSrcBusId(detail.getId());
 		billsJk.setBusinessType("SI");
 		billsJk.setSeaType("I");
-		billsJk.setCorpCnName(billsJk.getCorpEnName());
 		String deptId = billsJk.getPodCompanyId() + "";
 		String deptName = billsJk.getPodCompanyName();
 		String branchId = billsJk.getPodCompanyId() + "";

blade-service/blade-los/src/main/java/org/springblade/los/excel/BillsExcel.java

@@ -215,25 +215,30 @@ public class BillsExcel implements Serializable {
 	@ExcelProperty(value = "箱属")
 	private String boxBelongsTo;
 	/**
-	 * 20"集装箱箱数
+	 * 20GP"集装箱箱数
 	 */
-	@ExcelProperty(value = "V20")
+	@ExcelProperty(value = "20GP")
 	private Integer quantityV20;
 	/**
-	 * 40"集装箱箱数
+	 * 40GP"集装箱箱数
 	 */
-	@ExcelProperty(value = "V40")
+	@ExcelProperty(value = "40GP")
 	private Integer quantityV40;
 	/**
-	 * 45"集装箱箱数
+	 * 20HC"集装箱箱数
 	 */
-	@ExcelProperty(value = "V45")
+	@ExcelProperty(value = "20HC")
 	private Integer quantityV45;
 	/**
-	 * 48"集装箱箱数
+	 * 40FR"集装箱箱数
 	 */
-	@ExcelProperty(value = "V48")
+	@ExcelProperty(value = "40FR")
 	private Integer quantityV48;
+	/**
+	 * 40HC 集装箱箱数
+	 */
+	@ExcelProperty(value = "40HC")
+	private Integer quantityV40hc;
 
 	/**
 	 * 需陆运（0 否 1是）

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -788,7 +788,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setBillDate(bills.getBillDate());
 				} else if ("SEA".equals(list.get(0).getBusinessType()) || "SIA".equals(list.get(0).getBusinessType())) {
 					feeCenter.setBillDate(amends.getCreateTime());
-				}else{
+				} else {
 					feeCenter.setBillDate(new Date());
 				}
 				feeCenter.setBookingAgentId(bills.getBookingAgentId());
@@ -872,7 +872,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setAmountLoc(feeCenter.getAmount().multiply(feeCenter.getExrate()));
 				}
 				feeCenter.setUnsettledAmount(feeCenter.getAmount().subtract(feeCenter.getStlTtlAmount()));
-				if (ObjectUtils.isNull(feeCenter.getBillDate())){
+				if (ObjectUtils.isNull(feeCenter.getBillDate())) {
 					feeCenter.setBillDate(new Date());
 				}
 				feeCenterList.add(feeCenter);
@@ -1262,7 +1262,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenter.setBillCorpEnName(bCorps1.getShortName());
 					}
 				}
-				if (ObjectUtils.isNull(feeCenter.getBillDate())){
+				if (ObjectUtils.isNull(feeCenter.getBillDate())) {
 					feeCenter.setBillDate(new Date());
 				}
 				if (feeCenter.getId() == null) {
@@ -1289,10 +1289,10 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				feeCenterList.add(feeCenter);
 			}
 			List<FeeCenter> feeCenters = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
-				.eq(FeeCenter::getIsDeleted,0)
-				.eq(FeeCenter::getTenantId,AuthUtil.getTenantId())
-				.eq(FeeCenter::getPid,tradingBox.getId())
-				.notIn(!idList.isEmpty(),FeeCenter::getId,idList));
+				.eq(FeeCenter::getIsDeleted, 0)
+				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+				.eq(FeeCenter::getPid, tradingBox.getId())
+				.notIn(!idList.isEmpty(), FeeCenter::getId, idList));
 			for (FeeCenter feeCenter : feeCenters) {
 				if (exrateType.equals(feeCenter.getCurCode())) {
 					if ("D".equals(feeCenter.getDc())) {
@@ -1772,6 +1772,9 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 		if (billsList.isEmpty()) {
 			throw new RuntimeException("未查到单据信息");
 		}
+		if (billsList.stream().anyMatch(e -> "MH".equals(e.getBillType()))) {
+			throw new RuntimeException("请选择主单提取成本");
+		}
 		List<Long> idList = billsList.stream().map(Bills::getId).collect(Collectors.toList());
 		List<Bills> billsListFD = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -3064,7 +3064,7 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 		invoicesItems.setBillType(item.getBillType());
 		invoicesItems.setBillNo(item.getBusinessBillNo());
 		invoicesItems.setBillDate(reconciliation.getBillDate());
-		invoicesItems.setAccountDate(item.getBillDate());
+		invoicesItems.setAccountDate(item.getBusinessDate());
 		invoicesItems.setSourceId(Long.parseLong(item.getSourceId()));
 		invoicesItems.setCorpId(item.getCorpId());
 		invoicesItems.setCorpCnName(item.getCorpCnName());