2024年10月30日17:17:30

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

@@ -155,8 +155,8 @@ public class OssEndpoint {
 		System.err.println("link:" + link);
 		//String replace = link.replace("http://121.37.83.47:9000/", "https://trade.tubaosoft.com/file/");
 		String replace = "";
-		if (ObjectUtils.isNotNull(status)) {
-			if (ObjectUtils.isNotNull(replaceUrl)){
+		if (ObjectUtils.isNotNull(status) && "获取数据失败".equals(status)) {
+			if (ObjectUtils.isNotNull(replaceUrl)&& "获取数据失败".equals(replaceUrl)){
 				replace = link.replace(status, replaceUrl + "/file");
 			}else{
 				replace = link.replace(status + ":9000/", status + "/file/");

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

@@ -229,6 +229,11 @@ public class Bills implements Serializable {
 	@ApiModelProperty(value = "客户约号")
 	private String corpArgreementNo;
 	/**
+	 * 简称
+	 */
+	@ApiModelProperty(value = "客户简称")
+	private String shortName;
+	/**
 	 * Co-Loader id
 	 */
 	@ApiModelProperty(value = "Co-Loader id")

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

@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springblade.los.utils.LosSpecialHandle;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotEmpty;
@@ -965,6 +964,28 @@ public class FeeCenter implements Serializable {
 	 */
 	@ApiModelProperty(value = "主表客户简称")
 	private String billShortName;
+	/**
+	 * 优惠手续费
+	 */
+	@ApiModelProperty(value = "优惠手续费")
+	private BigDecimal discountedHandlingFees;
+
+	/**
+	 * 税票号
+	 */
+	@ApiModelProperty(value = "税票号")
+	private String taxInvoiceNumber;
+
+	/**
+	 * 税票日期
+	 */
+	@ApiModelProperty(value = "税票日期")
+	private String taxInvoiceDate;
+	/**
+	 * 扣款时间
+	 */
+	@ApiModelProperty(value = "扣款时间")
+	private String deductionTime;
 
 }
 

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

@@ -656,6 +656,22 @@ public class FinStlBillsItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "结算状态")
 	private String srcIdStatus;
+	/**
+	 * 税票号
+	 */
+	@ApiModelProperty(value = "税票号")
+	private String taxInvoiceNumber;
+
+	/**
+	 * 税票日期
+	 */
+	@ApiModelProperty(value = "税票日期")
+	private String taxInvoiceDate;
+	/**
+	 * 扣款时间
+	 */
+	@ApiModelProperty(value = "扣款时间")
+	private String deductionTime;
 
 
 	/**

blade-service-api/blade-los-api/src/main/java/org/springblade/los/trade/entity/Agent.java

@@ -696,5 +696,11 @@ public class Agent implements Serializable {
 	@ApiModelProperty(value = "待收预付")
 	private BigDecimal pendingPrepayment;
 
+	/**
+	 * 是否首付款等于货值
+	 */
+	@ApiModelProperty(value = "是否首付款等于货值")
+	private String whetherPaidAlready;
+
 
 }

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

@@ -6003,7 +6003,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			String profitMargin = sysClient.getParamServiceNew(MagicValues.PROFIT_MARGIN);
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -6531,7 +6531,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.MASTER_BILLS.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -6633,7 +6633,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.DOCUMENT.equals(reportCode) && MagicValues.BILLS_DETAIL.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -6729,7 +6729,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.DOCUMENT.equals(reportCode) && MagicValues.DISPATCH_NOTICE.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -6797,7 +6797,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.DOCUMENT.equals(reportCode) && MagicValues.INCOMING_NOTIFICATION.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -6865,7 +6865,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.COST.equals(reportCode) && MagicValues.RECEIVABLE.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -6991,7 +6991,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.COST.equals(reportCode) && MagicValues.RECEIVABLE_BILL.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -7117,7 +7117,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.COST.equals(reportCode) && MagicValues.MEET.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -7233,7 +7233,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.COST.equals(reportCode) && MagicValues.MEET_BILL.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -7381,7 +7381,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			List<AeaBills> list = new ArrayList<>();
 			AeaBills bills = aeaBillsService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -7797,7 +7797,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -7845,7 +7845,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -7859,7 +7859,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -7873,7 +7873,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -7998,7 +7998,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -8123,7 +8123,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -8238,7 +8238,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}
@@ -8404,7 +8404,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (bills != null) {
 //					bills.setFM(MagicValues.FM);
 					bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 					if (biz.isSuccess()) {
 						bills.setSrcType(biz.getData());
 					}
@@ -8513,7 +8513,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (bills != null) {
 //					bills.setFM(MagicValues.FM);
 					bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 					if (biz.isSuccess()) {
 						bills.setSrcType(biz.getData());
 					}
@@ -8622,7 +8622,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (bills != null) {
 //					bills.setFM(MagicValues.FM);
 					bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 					if (biz.isSuccess()) {
 						bills.setSrcType(biz.getData());
 					}
@@ -8731,7 +8731,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (bills != null) {
 //					bills.setFM(MagicValues.FM);
 					bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 					if (biz.isSuccess()) {
 						bills.setSrcType(biz.getData());
 					}
@@ -8843,7 +8843,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FeeCenter::getIsDeleted, 0));
 				Bills bills = billsService.getById(amends.getOrigId());
 				if (bills != null) {
-					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 					if (biz.isSuccess()) {
 						bills.setSrcType(biz.getData());
 					}
@@ -9765,7 +9765,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FeeCenter::getIsDeleted, 0));
 				AeaBills bills = aeaBillsService.getById(amends.getOrigId());
 				if (bills != null) {
-					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 					if (biz.isSuccess()) {
 						bills.setSrcType(biz.getData());
 					}
@@ -10663,7 +10663,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			List<CustomsDeclaration> list = new ArrayList<>();
 			CustomsDeclaration bills = customsDeclarationService.getById(billId);
 			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
 				if (biz.isSuccess()) {
 					bills.setSrcType(biz.getData());
 				}

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

@@ -178,7 +178,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		} else {
 			bills.setBillDate(bills.getEta());
 		}
-		BCorps corps = ibCorpsService.getById(bills.getCorpId());
 		if (ObjectUtils.isNotNull(bills.getBillDate())) {
 			LocalDate date = bills.getBillDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
 			int year = date.getYear();
@@ -484,9 +483,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setBillCorpId(bills.getCorpId());
 				item.setBillCorpCnName(bills.getCorpCnName());
 				item.setBillCorpEnName(bills.getCorpEnName());
-				if (corps != null) {
-					item.setBillShortName(corps.getShortName());
-				}
+				item.setBillShortName(bills.getShortName());
 				item.setLineId(bills.getLineId());
 				item.setLineCnName(bills.getLineCnName());
 				item.setLineEnName(bills.getLineEnName());
@@ -539,9 +536,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setBillCorpId(bills.getCorpId());
 				item.setBillCorpCnName(bills.getCorpCnName());
 				item.setBillCorpEnName(bills.getCorpEnName());
-				if (corps != null) {
-					item.setBillShortName(corps.getShortName());
-				}
+				item.setBillShortName(bills.getShortName());
 				item.setLineId(bills.getLineId());
 				item.setLineCnName(bills.getLineCnName());
 				item.setLineEnName(bills.getLineEnName());
@@ -2406,6 +2401,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setBillCorpId(bills.getCorpId());
 				item.setBillCorpCnName(bills.getCorpCnName());
 				item.setBillCorpEnName(bills.getCorpEnName());
+				item.setBillShortName(bills.getShortName());
 				item.setLineId(bills.getLineId());
 				item.setLineCnName(bills.getLineCnName());
 				item.setLineEnName(bills.getLineEnName());
@@ -2458,6 +2454,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setBillCorpId(bills.getCorpId());
 				item.setBillCorpCnName(bills.getCorpCnName());
 				item.setBillCorpEnName(bills.getCorpEnName());
+				item.setBillShortName(bills.getShortName());
 				item.setLineId(bills.getLineId());
 				item.setLineCnName(bills.getLineCnName());
 				item.setLineEnName(bills.getLineEnName());

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

@@ -173,10 +173,12 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 			.eq(Containers::getTenantId, AuthUtil.getTenantId())
 			.eq(Containers::getIsDeleted, 0)
 			.eq(Containers::getPid, preContainers.getPid()));
-		containersService.removeByPid(preContainers.getPid(), preContainers.getCntrTypeCode());
-		if (!removeContainersList.isEmpty()) {
+		if (!removeContainersList.isEmpty()){
 			List<Long> ids = removeContainersList.stream().map(Containers::getId).collect(Collectors.toList());
-			containersBillsService.removeByPid(ids);
+			containersService.removeByIds(ids);
+			if (!ids.isEmpty()) {
+				containersBillsService.removeByPid(ids);
+			}
 		}
 		BCntrTypes bCntrTypes = bCntrTypesService.getOne(new LambdaQueryWrapper<BCntrTypes>()
 			.eq(BCntrTypes::getCnName, preContainers.getCntrTypeCode())
@@ -307,11 +309,18 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 		if (preContainersList.isEmpty()) {
 			return R.data(containersList);
 		}
-		List<Long> idsList = preContainersList.stream().map(PreContainers::getId).distinct().collect(Collectors.toList());
+		List<Long> idsList = preContainersList.stream().map(PreContainers::getPid).distinct().collect(Collectors.toList());
 		List<Containers> removeContainersList = containersService.list(new LambdaQueryWrapper<Containers>()
 			.eq(Containers::getTenantId, AuthUtil.getTenantId())
 			.eq(Containers::getIsDeleted, 0)
 			.in(Containers::getPid, idsList));
+		if (!removeContainersList.isEmpty()){
+			List<Long> ids = removeContainersList.stream().map(Containers::getId).collect(Collectors.toList());
+			containersService.removeByIds(ids);
+			if (!ids.isEmpty()) {
+				containersBillsService.removeByPid(ids);
+			}
+		}
 		String cntrTypeCode = preContainersList.stream().map(PreContainers::getCntrTypeCode).distinct().collect(Collectors.joining(","));
 		List<BCntrTypes> bCntrTypesList = bCntrTypesService.list(new LambdaQueryWrapper<BCntrTypes>()
 			.apply("find_in_set(cn_name,'" + cntrTypeCode + "')")
@@ -333,12 +342,6 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 				preContainers.setUpdateUserName(AuthUtil.getUserName());
 			}
 			this.saveOrUpdate(preContainers);
-			containersService.removeByPid(preContainers.getPid(), preContainers.getCntrTypeCode());
-			List<Long> ids = removeContainersList.stream().filter(e -> e.getPid().equals(preContainers.getId()))
-				.map(Containers::getId).collect(Collectors.toList());
-			if (!ids.isEmpty()) {
-				containersBillsService.removeByPid(ids);
-			}
 			String ediCode = "";
 			if (!bCntrTypesList.isEmpty()) {
 				BCntrTypes bCntrTypes = bCntrTypesList.stream().filter(e -> e.getCnName().equals(preContainers.getCntrTypeCode()))

blade-service/blade-los/src/main/java/org/springblade/los/trade/controller/AgentController.java

@@ -199,7 +199,7 @@ public class AgentController extends BladeController {
 	 * 单据复制
 	 */
 	@GetMapping("/copyAgent")
-	public R copyAgent( Agent agent) {
+	public R copyAgent(Agent agent) {
 		Agent declare = agentService.copyAgent(agent);
 		return R.data(declare);
 	}
@@ -404,6 +404,25 @@ public class AgentController extends BladeController {
 								@RequestParam(value = "itemIds", required = false) String itemIds,
 								@RequestParam(value = "type", required = false) String type
 	) {
-		return agentService.getReportDataTrade(billId, reportCode, groupCode,corpIds,  itemIds, type);
+		return agentService.getReportDataTrade(billId, reportCode, groupCode, corpIds, itemIds, type);
 	}
+
+	/**
+	 * 首付款等于货值，修改状态已付尾款
+	 */
+	@PostMapping("/paidAlready")
+	@RepeatSubmit
+	public R paidAlready(@RequestBody Agent agent) {
+		return agentService.paidAlready(agent);
+	}
+
+	/**
+	 * 首付款等于货值，修改状态已付尾款 - 撤销
+	 */
+	@PostMapping("/revokePaidAlready")
+	@RepeatSubmit
+	public R revokePaidAlready(@RequestBody Agent agent) {
+		return agentService.revokePaidAlready(agent);
+	}
+
 }

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

@@ -89,4 +89,8 @@ public interface IAgentService extends IService<Agent> {
 	Agent revokeCollectionOfPayments(Agent agent);
 
 	Agent revokeConfirmThePayment(Agent agent);
+
+	R paidAlready(Agent agent);
+
+	R revokePaidAlready(Agent agent);
 }

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

@@ -4583,6 +4583,9 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		BigDecimal finalPaymentInFull = feeCenterList.stream().filter(e -> "WK".equals(e.getFeeCode())).map(FeeCenter::getAmountLoc)
 			.reduce(BigDecimal.ZERO, BigDecimal::add);
 		for (Agent item : agentList) {
+			if ("1".equals(item.getWhetherPaidAlready())) {
+				throw new RuntimeException("合同号:" + item.getContractNo() + "首款等于货值，请先撤销已付尾款");
+			}
 			if (new BigDecimal("0").compareTo(firstActualPayment) != 0) {
 				BigDecimal amountSfk = feeCenterList.stream().filter(e -> "SFK".equals(e.getFeeCode()) && item.getContractNo().equals(e.getBillNo()))
 					.map(FeeCenter::getAmountLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -4703,6 +4706,44 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		return agent;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R paidAlready(Agent agent) {
+		if (agent.getId() == null) {
+			throw new RuntimeException("缺少必要参数");
+		}
+		if (agent.getPrepaidAmount().compareTo(agent.getGoodsValue()) != 0) {
+			throw new RuntimeException("首付款不等货值，操作失败");
+		}
+		if (new BigDecimal("0.00").compareTo(agent.getFirstActualPayment()) == 0 || ObjectUtils.isNull(agent.getFirstActualPaymentDate())) {
+			throw new RuntimeException("请先货款付费结算后再操作");
+		}
+		agent.setUpdateTime(new Date());
+		agent.setUpdateUser(AuthUtil.getUserId());
+		agent.setUpdateUserName(AuthUtil.getUserName());
+		agent.setWhetherPaidAlready("1");
+		agent.setOrderStatus("已付尾款");
+		agent.setWhetherReceivedBalancePayment("已付尾款");
+		baseMapper.updateById(agent);
+		return R.data(agent);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R revokePaidAlready(Agent agent) {
+		if (agent.getId() == null) {
+			throw new RuntimeException("缺少必要参数");
+		}
+		agent.setUpdateTime(new Date());
+		agent.setUpdateUser(AuthUtil.getUserId());
+		agent.setUpdateUserName(AuthUtil.getUserName());
+		agent.setWhetherPaidAlready("0");
+		agent.setOrderStatus("首款已付未付尾款");
+		agent.setWhetherReceivedBalancePayment("首款已付未付尾款");
+		baseMapper.updateById(agent);
+		return R.data(agent);
+	}
+
 	private FeeCenter assemblyDataSK(String businessType, Agent detail, String type, long lineNo, int sort, long deptId, String deptName, List<BFees> feesList) {
 		FeeCenter feeCenter = new FeeCenter();
 		feeCenter.setFeeType("1");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/controller/SettlementController.java

@@ -96,6 +96,7 @@ public class SettlementController extends BladeController {
 	public R<IPage<PjSettlement>> list(PjSettlement settlement, Query query) {
 		LambdaQueryWrapper<PjSettlement> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getCorpId()), PjSettlement::getCorpId, settlement.getCorpId());
+		lambdaQueryWrapper.like(ObjectUtils.isNotNull(settlement.getCorpName()), PjSettlement::getCorpName, settlement.getCorpName());
 		lambdaQueryWrapper.like(ObjectUtils.isNotNull(settlement.getSysNo()), PjSettlement::getSysNo, settlement.getSysNo());
 		lambdaQueryWrapper.like(ObjectUtils.isNotNull(settlement.getContractNumber()), PjSettlement::getContractNumber, settlement.getContractNumber());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getAccountId()), PjSettlement::getAccountId, settlement.getAccountId());

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -43,7 +43,8 @@ public interface UserMapper extends BaseMapper<User> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+	List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList,
+							   @Param("tenantId") String tenantId,@Param("roleId") String roleId);
 
 	/**
 	 * 获取用户

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -66,6 +66,9 @@
             </foreach>
             )
         </if>
+        <if test="roleId!=null and roleId != ''">
+            and find_in_set(#{roleId},role_id)
+        </if>
         ORDER BY id
     </select>
 

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -165,7 +165,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 			deptId = null;
 		}
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
-		return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
+		R<String> res = sysClient.getRoleIds(AuthUtil.getTenantId(), user.getRoleId());
+		String roleId = "";
+		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+			roleId = res.getData();
+		}
+		return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId, roleId));
 	}
 
 	@Override