2024年1月15日18:27:34

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -308,7 +308,6 @@ public class BCorpsController extends BladeController {
 		LambdaQueryWrapper<BCorps> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(BCorps::getTenantId, AuthUtil.getTenantId())
 			.eq(BCorps::getIsDeleted, 0)
-			.like(ObjectUtils.isNotNull(bCorps.getCode()), BCorps::getCode, bCorps.getCode())
 			.eq(ObjectUtils.isNotNull(bCorps.getStatus()), BCorps::getStatus, bCorps.getStatus())
 			.and(ObjectUtils.isNotNull(bCorps.getCnName()), i -> i.like(BCorps::getCnName, bCorps.getCnName()).or()
 				.like(BCorps::getEnName, bCorps.getCnName()).or().like(BCorps::getCode, bCorps.getCnName()))

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -953,24 +953,24 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 								if (e.getStlTtlAmount().compareTo(currentStlAmount) > 0) {
 									e.setStlTtlAmount(e.getStlTtlAmount().subtract(currentStlAmount));
 									e.setUnsettledAmount(e.getAmount().subtract(e.getStlTtlAmount()));
-									e.setAppliedInvoiceAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedInvoiceAmountStl()));
+									e.setAppliedInvoiceAmountStl(e.getAppliedInvoiceAmountStl().subtract(currentStlAmount));
 									currentStlAmount = new BigDecimal("0.00");
 								} else if (e.getStlTtlAmount().compareTo(currentStlAmount) == 0) {
 									e.setStlTtlAmount(new BigDecimal("0.00"));
 									e.setUnsettledAmount(e.getAmount().subtract(e.getStlTtlAmount()));
-									e.setAppliedInvoiceAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedInvoiceAmountStl()));
+									e.setAppliedInvoiceAmountStl(e.getAppliedInvoiceAmountStl().subtract(currentStlAmount));
 									currentStlAmount = new BigDecimal("0.00");
 								} else {
 									e.setStlTtlAmount(new BigDecimal("0.00"));
 									e.setUnsettledAmount(e.getAmount().subtract(e.getStlTtlAmount()));
-									e.setAppliedInvoiceAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedInvoiceAmountStl()));
+									e.setAppliedInvoiceAmountStl(new BigDecimal("0.00"));
 									currentStlAmount = currentStlAmount.subtract(e.getAmount());
 								}
 							}else{
 								if (e.getStlTtlAmount().compareTo(currentStlAmount) > 0) {
 									e.setStlTtlAmount(e.getStlTtlAmount().subtract(currentStlAmount));
 									e.setUnsettledAmount(e.getAmount().subtract(e.getStlTtlAmount()));
-									e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
+									e.setAppliedAmountStl(e.getAppliedAmountStl().subtract(currentStlAmount));
 									currentStlAmount = new BigDecimal("0.00");
 								} else if (e.getStlTtlAmount().compareTo(currentStlAmount) == 0) {
 									e.setStlTtlAmount(new BigDecimal("0.00"));
@@ -980,7 +980,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 								} else {
 									e.setStlTtlAmount(new BigDecimal("0.00"));
 									e.setUnsettledAmount(e.getAmount().subtract(e.getStlTtlAmount()));
-									e.setAppliedAmountStl(e.getAmount().subtract(e.getUnsettledAmount()).subtract(e.getAppliedAmountStl()));
+									e.setAppliedAmountStl(new BigDecimal("0.00"));
 									currentStlAmount = currentStlAmount.subtract(e.getAmount());
 								}
 							}