2024年10月31日17:17:30

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java

@@ -521,6 +521,36 @@ public class BCorps implements Serializable {
 	private String inttraCode;
 
 	/**
+	 * 天数
+	 */
+	@ApiModelProperty(value = "天数")
+	private Integer days;
+
+	/**
+	 * 结清月份
+	 */
+	@ApiModelProperty(value = "结清月份")
+	private String settlementMonth;
+
+	/**
+	 * 结清天数
+	 */
+	@ApiModelProperty(value = "结清天数")
+	private String settlementDays;
+
+	/**
+	 * 日利息万分
+	 */
+	@ApiModelProperty(value = "日利息万分")
+	private String dailyInterest;
+
+	/**
+	 * 最大欠款
+	 */
+	@ApiModelProperty(value = "最大欠款")
+	private BigDecimal maximumOutstandingDebt;
+
+	/**
 	 * 客户更改授信等级记录
 	 */
 	@TableField(exist = false)

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FeeCenter.java

@@ -980,12 +980,12 @@ public class FeeCenter implements Serializable {
 	 * 税票日期
 	 */
 	@ApiModelProperty(value = "税票日期")
-	private String taxInvoiceDate;
+	private Date taxInvoiceDate;
 	/**
 	 * 扣款时间
 	 */
 	@ApiModelProperty(value = "扣款时间")
-	private String deductionTime;
+	private Date deductionTime;
 
 }
 

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/stl/entity/FinStlBillsItems.java

@@ -666,12 +666,12 @@ public class FinStlBillsItems implements Serializable {
 	 * 税票日期
 	 */
 	@ApiModelProperty(value = "税票日期")
-	private String taxInvoiceDate;
+	private Date taxInvoiceDate;
 	/**
 	 * 扣款时间
 	 */
 	@ApiModelProperty(value = "扣款时间")
-	private String deductionTime;
+	private Date deductionTime;
 
 
 	/**

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/stock/service/impl/StockGoodsServiceImpl.java

@@ -47,17 +47,19 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, Deliver
 //		stockGoods.setLockingQuantity(detail.getLockingQuantity().add(stockGoods.getThisLockingQuantity()));
 //		stockGoods.setBalanceQuantity(detail.getBalanceQuantity());
 //		stockGoods.setSurplusRouteQuantity(detail.getBalanceQuantity().subtract(stockGoods.getLockingQuantity()));
+		Integer version = stockGoods.getVersion();
+		stockGoods.setVersion(ObjectUtils.isNull(stockGoods.getVersion()) ? 0 : stockGoods.getVersion() + 1);
 		int count = baseMapper.update(stockGoods, new LambdaQueryWrapper<DeliverStockGoods>()
 			.eq(DeliverStockGoods::getId, stockGoods.getId())
-			.eq(DeliverStockGoods::getVersion, stockGoods.getVersion())
+			.eq(DeliverStockGoods::getVersion, version)
 			.setEntity(new DeliverStockGoods()));
 		if (count == 0) {
 			return R.fail(stockGoods.getCode() + "系统正忙，请稍后再试");
 		} else {
-			DeliverStockGoods stockGoods1 = new DeliverStockGoods();
+			/*DeliverStockGoods stockGoods1 = new DeliverStockGoods();
 			stockGoods1.setId(stockGoods.getId());
 			stockGoods1.setVersion(ObjectUtils.isNull(stockGoods.getVersion()) ? 0 : stockGoods.getVersion() + 1);
-			baseMapper.updateById(stockGoods1);
+			baseMapper.updateById(stockGoods1);*/
 			return R.success("操作成功");
 		}
 	}

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

@@ -415,7 +415,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		Integer other = 0;
 		BigDecimal teu = new BigDecimal("0.00");
 		StringBuilder boxTypeSum = new StringBuilder();
-		if (ObjectUtils.isNull(bills.getCfsQuantity()) || bills.getCfsQuantity().compareTo(new BigDecimal("0.00")) == 0) {
+//		if (ObjectUtils.isNull(bills.getCfsQuantity()) || bills.getCfsQuantity().compareTo(new BigDecimal("0.00")) == 0) {
 			if (ObjectUtils.isNotNull(bills.getPreContainersList())) {
 				for (PreContainers item : bills.getPreContainersList()) {
 					item.setPid(bills.getId());
@@ -446,7 +446,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					bills.setQuantityCntrDescr(boxTypeSum.toString());
 				}
 			}
-		}
+//		}
 		bills.setQuantityV20(V20);
 		bills.setQuantityV40(V40);
 		bills.setQuantityV40hc(V40HC);
@@ -2891,6 +2891,10 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		List<FeeCenter> feeCenterListMYDL = new ArrayList<>();
 		for (FeeCenter item : feeCenterList) {
 			FeeCenter feeCenter = new FeeCenter();
+			feeCenter.setAccStatus(1);
+			feeCenter.setStlStatus(1);
+			feeCenter.setWhetherSynchronizationTariff("1");
+			feeCenter.setWhetherSynchronizationZzs("1");
 			feeCenter.setCreateTime(new Date());
 			feeCenter.setCreateUser(AuthUtil.getUserId());
 			feeCenter.setCreateUserName(AuthUtil.getUserName());

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

@@ -1027,6 +1027,9 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 					throw new RuntimeException("本次结算金额不能为零或大于未结算金额");
 				}
 				for (FeeCenter e : feeCenters) {
+					e.setTaxInvoiceNumber(item.getTaxInvoiceNumber());
+					e.setTaxInvoiceDate(item.getTaxInvoiceDate());
+					e.setDeductionTime(item.getDeductionTime());
 					if (currentStlAmount.compareTo(new BigDecimal("0.00")) == 0) {
 						break;
 					} else {

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/AgentServiceImpl.java

@@ -2641,6 +2641,18 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		if (feeCenters.isEmpty()) {
 			throw new RuntimeException("请选择收款数据");
 		}
+		for (FeeCenter feeCenterItem : feeCenters) {
+			if ("ZZS".equals(feeCenterItem.getCurCode())) {
+				if ("ZZS".equals(feeCenterItem.getWhetherSynchronizationZzs())) {
+					throw new RuntimeException("增值税为同步数据，撤销失败");
+				}
+			}
+			if ("GS".equals(feeCenterItem.getCurCode())) {
+				if ("GS".equals(feeCenterItem.getWhetherSynchronizationTariff())) {
+					throw new RuntimeException("关税为同步数据，撤销失败");
+				}
+			}
+		}
 		List<Long> finAccBillsIds = feeCenters.stream().map(FeeCenter::getAccBillId).distinct().collect(Collectors.toList());
 		if (!finAccBillsIds.isEmpty()) {
 			List<FinStlBillsItems> finStlBillsItemsSTLD = finStlBillsItemsService.list(new LambdaQueryWrapper<FinStlBillsItems>()
@@ -3552,6 +3564,16 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					for (FeeCenter item : feeCenterListC) {
 						AgentZzsReport agentZzsReport = new AgentZzsReport();
 						agentZzsReport.setValueAddedTax(item.getAmount());
+						agentZzsReport.setTaxInvoiceNumber(item.getTaxInvoiceNumber());
+						if (ObjectUtils.isNotNull(item.getTaxInvoiceDate())) {
+							agentZzsReport.setTaxInvoiceDate(dateFormat.format(item.getTaxInvoiceDate()));
+						}
+						if (ObjectUtils.isNotNull(item.getDeductionTime())) {
+							agentZzsReport.setTaxInvoiceDate(dateFormat.format(item.getDeductionTime()));
+						}
+						if (ObjectUtils.isNotNull(item.getStlDate())) {
+							agentZzsReport.setTaxInvoiceDate(dateFormat.format(item.getStlDate()));
+						}
 						agentZzsReportList.add(agentZzsReport);
 					}
 					agentReport.setAgentZzsReportList(agentZzsReportList);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/stock/service/impl/SalesStockGoodsServiceImpl.java

@@ -47,17 +47,19 @@ public class SalesStockGoodsServiceImpl extends ServiceImpl<SalesStockGoodsMappe
 //		stockGoods.setLockingQuantity(detail.getLockingQuantity().add(stockGoods.getThisLockingQuantity()));
 //		stockGoods.setBalanceQuantity(detail.getBalanceQuantity());
 //		stockGoods.setSurplusRouteQuantity(detail.getBalanceQuantity().subtract(stockGoods.getLockingQuantity()));
+		Integer version = stockGoods.getVersion();
+		stockGoods.setVersion(ObjectUtils.isNull(stockGoods.getVersion()) ? 0 : stockGoods.getVersion() + 1);
 		int count = baseMapper.update(stockGoods, new LambdaQueryWrapper<SalesStockGoods>()
 			.eq(SalesStockGoods::getId, stockGoods.getId())
-			.eq(SalesStockGoods::getVersion, stockGoods.getVersion())
+			.eq(SalesStockGoods::getVersion, version)
 			.setEntity(new SalesStockGoods()));
 		if (count == 0) {
 			return R.fail(stockGoods.getCode() + "系统正忙，请稍后再试");
 		} else {
-			SalesStockGoods stockGoods1 = new SalesStockGoods();
+			/*SalesStockGoods stockGoods1 = new SalesStockGoods();
 			stockGoods1.setId(stockGoods.getId());
 			stockGoods1.setVersion(ObjectUtils.isNull(stockGoods.getVersion()) ? 0 : stockGoods.getVersion() + 1);
-			baseMapper.updateById(stockGoods1);
+			baseMapper.updateById(stockGoods1);*/
 			return R.success("操作成功");
 		}
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsDescController.java

@@ -417,7 +417,8 @@ public class CorpsDescController extends BladeController {
 			.apply("find_in_set(corp_type,'" + corpsDesc.getCorpType() + "')")
 			.eq(ObjectUtils.isNotNull(corpsDesc.getEnableOrNot()), PjCorpsDesc::getEnableOrNot, corpsDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotNull(corpsDesc.getCname()), PjCorpsDesc::getCname, corpsDesc.getCname());
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
+			&& !AuthUtil.getUserRole().contains("客户总览")) {
 			if (AuthUtil.getUserRole().contains("业务员")) {
 				lambdaQueryWrapper.eq(PjCorpsDesc::getSalesmanId, AuthUtil.getUserId());
 			}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -164,7 +164,8 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		corpsDesc.setTenantId(AuthUtil.getTenantId());
 		corpsDesc.setIsDeleted(0);
 		corpsDesc.setStrTenantId(Arrays.asList(AuthUtil.getDeptId().split(",")));
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
+			&& !AuthUtil.getUserRole().contains("客户总览")) {
 			if (AuthUtil.getUserRole().contains("业务员")) {
 				corpsDesc.setSalesmanId(AuthUtil.getUserId());
 			}
@@ -753,7 +754,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 				return R.data(corpsDesc1);
 			}
 		} else {
-			CorpsDesc corpsDesc1 = new CorpsDesc();
+			PjCorpsDesc corpsDesc1 = new PjCorpsDesc();
 			R<User> res = userClient.userInfoById(AuthUtil.getUserId());
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				corpsDesc1.setTel(res.getData().getPhone());

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -523,17 +523,19 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 //		stockGoods.setLockingQuantity(detail.getLockingQuantity().add(stockGoods.getThisLockingQuantity()));
 //		stockGoods.setBalanceQuantity(detail.getBalanceQuantity());
 //		stockGoods.setSurplusRouteQuantity(detail.getBalanceQuantity().subtract(stockGoods.getLockingQuantity()));
+		Integer version = stockGoods.getVersion();
+		stockGoods.setVersion(ObjectUtils.isNull(stockGoods.getVersion()) ? 0 : stockGoods.getVersion() + 1);
 		int count = baseMapper.update(stockGoods, new LambdaQueryWrapper<StockGoods>()
 			.eq(StockGoods::getId, stockGoods.getId())
-			.eq(StockGoods::getVersion, stockGoods.getVersion())
+			.eq(StockGoods::getVersion, version)
 			.setEntity(new StockGoods()));
 		if (count == 0) {
 			return R.fail(stockGoods.getCode() + "系统正忙，请稍后再试");
 		} else {
-			StockGoods stockGoods1 = new StockGoods();
+			/*StockGoods stockGoods1 = new StockGoods();
 			stockGoods1.setId(stockGoods.getId());
 			stockGoods1.setVersion(ObjectUtils.isNull(stockGoods.getVersion()) ? 0 : stockGoods.getVersion() + 1);
-			baseMapper.updateById(stockGoods1);
+			baseMapper.updateById(stockGoods1);*/
 			return R.success("操作成功");
 		}
 	}