单据校验

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1925,6 +1925,12 @@ public class Bills implements Serializable {
 	private Integer isVgm;
 
 	/**
+	 * 是否美国货（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否美国货")
+	private Integer whetherAmericaMoney;
+
+	/**
 	 * 放单（0 否 1是）
 	 */
 	@ApiModelProperty(value = "放单")

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -857,11 +857,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else {
 			throw new RuntimeException("获取报表表头数据失败");
 		}
-		BCurrency bCurrency = ibCurrencyService.getOne(new LambdaQueryWrapper<BCurrency>()
-			.eq(BCurrency::getStatus, 0)
-			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
-			.eq(BCurrency::getIsDeleted, 0)
-			.eq(BCurrency::getCode, MagicValues.USD));
 		// 销售报告 SALES REPORT
 		if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			List<Bills> list = new ArrayList<>();
@@ -874,13 +869,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(HmmEdi::getTenantId, AuthUtil.getTenantId())
 					.eq(HmmEdi::getPid, bills.getId()));
 				bills.setHmmEdi(hmmEdi != null ? hmmEdi : new HmmEdi());
-				// 提取 USD 汇率
-				if (bCurrency != null) {
-					bills.setRate(bCurrency.getExrate());
-				} else {
-					bills.setRate(new BigDecimal(MagicValues.ZERO));
-				}
-				//
+				bills.setRate(ibCurrencyService.getCnyExrate(bills.getBillDate(), "USD", "D", "1"));
 				if (ObjectUtils.isNotNull(bills.getAmountProfitLoc()) && ObjectUtils.isNotNull(bills.getAmountDrLoc())) {
 					if (bills.getAmountProfitLoc().compareTo(new BigDecimal(MagicValues.ZERO)) == 0 ||
 						bills.getAmountDrLoc().compareTo(new BigDecimal(MagicValues.ZERO)) == 0) {
@@ -2106,13 +2095,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(HmmEdi::getTenantId, AuthUtil.getTenantId())
 					.eq(HmmEdi::getPid, bills.getId()));
 				bills.setHmmEdi(hmmEdi != null ? hmmEdi : new HmmEdi());
-				// 提取 USD 汇率
-				if (bCurrency != null) {
-					bills.setRate(bCurrency.getExrate());
-				} else {
-					bills.setRate(new BigDecimal(MagicValues.ZERO));
-				}
-				//
+				bills.setRate(ibCurrencyService.getCnyExrate(bills.getBillDate(), "USD", "D", "1"));
 				if (ObjectUtils.isNotNull(bills.getAmountProfitLoc()) && ObjectUtils.isNotNull(bills.getAmountDrLoc())) {
 					if (bills.getAmountProfitLoc().compareTo(new BigDecimal(MagicValues.ZERO)) == 0 ||
 						bills.getAmountDrLoc().compareTo(new BigDecimal(MagicValues.ZERO)) == 0) {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -890,5 +890,15 @@ public class BillsController extends BladeController {
 		}
 
 	}
+
+
+	/**
+	 * 单据校验
+	 */
+	/*@PostMapping("/documentVerification")
+	@RepeatSubmit
+	public R documentVerification(@RequestBody Bills bills) {
+		return billsService.documentVerification(bills);
+	}*/
 }