SalesReport 分组

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

@@ -875,9 +875,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		// String debug = System.getProperty("java.debug");
 		boolean isDebug = true; // (debug != null && debug.toLowerCase().startsWith("true"));
 
-		List<Long> psFeeIds = new ArrayList<>();
-		psFeeIds.add(220L);
-		psFeeIds.add(623L);
+		List<String> psFeeCodes = new ArrayList<>();
+		psFeeCodes.add("P/S");
+		psFeeCodes.add("HP/S");
 
 		R<Dept> res = sysClient.getDept(deptUtils.getDeptPid());
 		Dept dept;
@@ -2000,7 +2000,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getDc, MagicValues.D)
 					.eq(FeeCenter::getIsDeleted, 0)
-					.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds);
+					.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes);
 				lambdaQueryWrapper.in(FeeCenter::getPid, ids);
 				if (MagicValues.RECEIVABLE_BILL.equals(groupCode)) {
 					lambdaQueryWrapper.eq(FeeCenter::getAccStatus, 1);
@@ -2215,7 +2215,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getDc, MagicValues.C)
 					.eq(FeeCenter::getIsDeleted, 0)
-					.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds);
+					.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes);
 				lambdaQueryWrapper.in(FeeCenter::getPid, ids);
 				if (ObjectUtils.isNotNull(corpIds)) {
 					lambdaQueryWrapper.eq(FeeCenter::getCorpId, corpIds);

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/impl/AeaBillsServiceImpl.java

@@ -945,6 +945,10 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
 			if (ObjectUtils.isNotNull(map)) {
 				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+				String errMsg = map.get("errorMessage").toString().trim();
+				if(!errMsg.isEmpty()){
+					throw new SecurityException(errMsg);
+				}
 			}
 			if ("AE".equals(declare.getBusinessType())) {
 				auditProecessDTO.setCustomizeThree(declare.getEtd());

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -375,6 +375,10 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
 			if (ObjectUtils.isNotNull(map)) {
 				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+				String errMsg = map.get("errorMessage").toString().trim();
+				if(!errMsg.isEmpty()){
+					throw new SecurityException(errMsg);
+				}
 			}
 			if ("AEA".equals(declare.getBusinessType()) || "SEA".equals(declare.getBusinessType())) {
 				auditProecessDTO.setCustomizeThree(declare.getEtd());

blade-service/blade-los/src/main/java/org/springblade/los/business/customsDeclaration/service/impl/CustomsDeclarationServiceImpl.java

@@ -443,6 +443,10 @@ public class CustomsDeclarationServiceImpl extends ServiceImpl<CustomsDeclaratio
 			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
 			if (ObjectUtils.isNotNull(map)) {
 				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+				String errMsg = map.get("errorMessage").toString().trim();
+				if(!errMsg.isEmpty()){
+					throw new SecurityException(errMsg);
+				}
 			}
 			if ("BGSE".equals(declare.getBusinessType())) {
 				if (ObjectUtils.isNotNull(declare.getDeclareDate())) {

blade-service/blade-los/src/main/java/org/springblade/los/business/generalBill/service/impl/GeneralBillServiceImpl.java

@@ -409,6 +409,10 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 			Map<String,Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(),feeCenterList);
 			if (ObjectUtils.isNotNull(map)){
 				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+				String errMsg = map.get("errorMessage").toString().trim();
+				if(!errMsg.isEmpty()){
+					throw new SecurityException(errMsg);
+				}
 			}
 			R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {

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

@@ -1606,6 +1606,10 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
 			if (ObjectUtils.isNotNull(map)) {
 				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+				String errMsg = map.get("errorMessage").toString().trim();
+				if(!errMsg.isEmpty()){
+					throw new SecurityException(errMsg);
+				}
 			}
 			if ("SE".equals(declare.getBusinessType())) {
 				auditProecessDTO.setCustomizeThree(declare.getEtd());
@@ -4308,6 +4312,10 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
 				if (ObjectUtils.isNotNull(map)) {
 					auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
+					String errMsg = map.get("errorMessage").toString().trim();
+					if(!errMsg.isEmpty()){
+						throw new SecurityException(errMsg);
+					}
 				}
 				if ("SE".equals(declare.getBusinessType())) {
 					auditProecessDTO.setCustomizeThree(declare.getEtd());

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

@@ -130,6 +130,18 @@ public class DataProcessingImplService implements IDataProcessingService {
 			throw new RuntimeException("请核的业务 id 不存在");
 		}
 
+		List<Bills> billsList = new ArrayList<>();
+		billsList.add(bill);
+		if("MM".equals(bill.getBillType())){
+			List<Bills> billsList1 = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
+				.select(Bills::getId, Bills::getQuotationMethod, Bills::getCorpId, Bills::getCarrierId,
+					Bills::getHpaymode, Bills::getMpaymode, Bills::getBillType, Bills::getHblno)
+				.eq(Bills::getTenantId, AuthUtil.getTenantId())
+				.eq(Bills::getIsDeleted, 0)
+				.eq(Bills::getMasterId, bill.getId()));
+			billsList.addAll(billsList1);
+		}
+
 		// 费用名称
 		// 1722822288795000833	O/F		海运费	145
 		// 1722823384343011329	P/S		P/S		220
@@ -165,12 +177,19 @@ public class DataProcessingImplService implements IDataProcessingService {
 		BigDecimal psProfit = new BigDecimal(BigInteger.ZERO);
 		BigDecimal psInAmtProfit = new BigDecimal(BigInteger.ZERO);
 
+		StringBuilder errMsg = new StringBuilder();
+
 		// 特殊ps客户 Id
 		Long specPSCorpId = 0L;
 		// 高收退费客户 Id
 		Long hpsCorpId = 0L;
 
-		for (FeeCenter fee : feeCenterList) {
+		List<Long> idList = billsList.stream().map(Bills::getId).collect(Collectors.toList());
+		List<Long> corpIdList = billsList.stream().map(Bills::getCorpId).collect(Collectors.toList());
+		List<Long> carrierIdList = billsList.stream().map(Bills::getCarrierId).collect(Collectors.toList());
+
+		List<FeeCenter> fcList = feeCenterList.stream().filter(e->idList.contains(e.getId())).collect(Collectors.toList());
+		for (FeeCenter fee : fcList) {
 			if (specPSCorpId == 0 && ObjectUtils.isNotNull(fee.getCorpId())) {
 				if (specPScorpIds.indexOf("," + fee.getCorpId().toString() + ",") >= 0) {
 					specPSCorpId = fee.getCorpId();
@@ -215,6 +234,15 @@ public class DataProcessingImplService implements IDataProcessingService {
 					specInAmtProfit = specInAmtProfit.subtract(amt);
 				}
 			}
+
+			// W0
+			Long feeCorpId = fee.getCorpId();
+			Long billId = fee.getPid();
+			Long corpId = corpIdList.get(idList.indexOf(billId));
+			Long carrierId = carrierIdList.get(idList.indexOf(billId));
+			if(!feeCorpId.equals(corpId) && !feeCorpId.equals(carrierId)){
+				// int bc = bCorpsService.count();
+			}
 		}
 
 		// 提取客户 PsRate
@@ -364,6 +392,9 @@ public class DataProcessingImplService implements IDataProcessingService {
 				}
 				sumLocCr = sumLocCr.add(fee.getAmountLoc()).setScale(2, BigDecimal.ROUND_HALF_UP);
 			}
+
+			// W 号检测
+
 		}
 
 
@@ -435,6 +466,8 @@ public class DataProcessingImplService implements IDataProcessingService {
 				R.put("profitStatusEnText", "");
 		}
 
+		R.put("errorMessage", errMsg.toString().trim());
+
 		return R;
 	}
 

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

@@ -1088,9 +1088,9 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 
 	@Override
 	public List<FinAccBills> getFeeCenterCorpIds(Long billId, String dc, String type, String accBillNo) {
-		List<Long> psFeeIds = new ArrayList<>();
-		psFeeIds.add(220L);
-		psFeeIds.add(623L);
+		List<String> psFeeCodes = new ArrayList<>();
+		psFeeCodes.add("P/S");
+		psFeeCodes.add("HP/S");
 
 		List<FinAccBills> accBills = null;
 
@@ -1102,7 +1102,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				.eq(FeeCenter::getAccStatus, 1)
 				.eq(FeeCenter::getPid, billId)
 				.eq(FeeCenter::getDc, dc)
-				.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds)
+				.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes)
 			);
 			/*
 			List<BCorps> bCorpsList = new ArrayList<>();
@@ -1197,7 +1197,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 								.eq(FeeCenter::getIsDeleted, 0)
 								.eq(FeeCenter::getDc, dc)
 								.in(FeeCenter::getPid, billIds)
-								.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds)
+								.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes)
 							);
 							if (!feeCenterList.isEmpty()) {
 								corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
@@ -1209,7 +1209,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						.eq(FeeCenter::getIsDeleted, 0)
 						.eq(FeeCenter::getDc, dc)
 						.eq(FeeCenter::getPid, billId)
-						.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds)
+						.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes)
 					);
 					if (!feeCenterList.isEmpty()) {
 						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
@@ -1238,7 +1238,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 								.eq(FeeCenter::getIsDeleted, 0)
 								.eq(FeeCenter::getDc, dc)
 								.in(FeeCenter::getPid, billIds)
-								.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds)
+								.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes)
 							);
 							if (!feeCenterList.isEmpty()) {
 								corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
@@ -1250,7 +1250,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						.eq(FeeCenter::getIsDeleted, 0)
 						.eq(FeeCenter::getDc, dc)
 						.eq(FeeCenter::getPid, billId)
-						.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds)
+						.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes)
 					);
 					if (!feeCenterList.isEmpty()) {
 						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
@@ -1264,7 +1264,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						.eq(FeeCenter::getIsDeleted, 0)
 						.eq(FeeCenter::getDc, dc)
 						.eq(FeeCenter::getPid, billId)
-						.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds)
+						.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes)
 					);
 					if (!feeCenterList.isEmpty()) {
 						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
@@ -1278,7 +1278,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						.eq(FeeCenter::getIsDeleted, 0)
 						.eq(FeeCenter::getDc, dc)
 						.eq(FeeCenter::getPid, billId)
-						.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds)
+						.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes)
 					);
 					if (!feeCenterList.isEmpty()) {
 						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
@@ -1292,7 +1292,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						.eq(FeeCenter::getIsDeleted, 0)
 						.eq(FeeCenter::getDc, dc)
 						.eq(FeeCenter::getPid, billId)
-						.notIn(!psFeeIds.isEmpty(), FeeCenter::getFeeId, psFeeIds)
+						.notIn(!psFeeCodes.isEmpty(), FeeCenter::getFeeCode, psFeeCodes)
 					);
 					if (!feeCenterList.isEmpty()) {
 						corpIds = feeCenterList.stream().map(FeeCenter::getCorpId).filter(Objects::nonNull).distinct().collect(Collectors.toList());