20230406 17:58

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -677,4 +677,22 @@ public class Delivery implements Serializable {
 	@ApiModelProperty(value = "订舱日期")
 	private Date bookingSpaceDate;
 
+	/**
+	 * 需产地证 0否1是（福达）
+	 */
+	@ApiModelProperty(value = "需产地证 0否1是（福达）")
+	private String certificateOriginRequired;
+
+	/**
+	 * 签单方式（福达）
+	 */
+	@ApiModelProperty(value = "签单方式（福达）")
+	private String signingMethod;
+
+	/**
+	 * 三方检验（福达）
+	 */
+	@ApiModelProperty(value = "三方检验（福达）")
+	private String tripartiteInspection;
+
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -1356,6 +1356,23 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "通联支付金额")
 	private BigDecimal paymentAmountTl;
 
+	/**
+	 * 需产地证 0否1是（福达）
+	 */
+	@ApiModelProperty(value = "需产地证 0否1是（福达）")
+	private String certificateOriginRequired;
+
+	/**
+	 * 签单方式（福达）
+	 */
+	@ApiModelProperty(value = "签单方式（福达）")
+	private String signingMethod;
+
+	/**
+	 * 三方检验（福达）
+	 */
+	@ApiModelProperty(value = "三方检验（福达）")
+	private String tripartiteInspection;
 
 	/**
 	 * 采购状态类型

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/feign/DeliveryClient.java

@@ -141,6 +141,9 @@ public class DeliveryClient implements IDeliveryClient {
 			delivery1.setBelongToCorpId(order.getBelongToCorpId());
 			delivery1.setCorpAttn(order.getCorpAttn());
 			delivery1.setCorpTel(order.getCorpTel());
+			delivery1.setCertificateOriginRequired(order.getCertificateOriginRequired());
+			delivery1.setSigningMethod(order.getSigningMethod());
+			delivery1.setTripartiteInspection(order.getTripartiteInspection());
 			deliveryService.updateById(delivery1);
 			deliveryNew = delivery1;
 		} else {
@@ -185,6 +188,9 @@ public class DeliveryClient implements IDeliveryClient {
 			delivery.setBelongToCorpId(order.getBelongToCorpId());
 			delivery.setCorpAttn(order.getCorpAttn());
 			delivery.setCorpTel(order.getCorpTel());
+			delivery.setCertificateOriginRequired(order.getCertificateOriginRequired());
+			delivery.setSigningMethod(order.getSigningMethod());
+			delivery.setTripartiteInspection(order.getTripartiteInspection());
 			deliveryService.save(delivery);
 			deliveryNew = delivery;
 		}

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

@@ -610,7 +610,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 			//=============生成凭证所需信息==============
 			String accountName = select.getBelongCompany();
-			if (!"青岛通用沃德轮胎有限公司".equals(accountName)) {
+			if ("A青岛达沃特轮胎有限公司".equals(accountName)) {
 				accountName = "青岛达沃特轮胎有限公司";
 			}
 			JdTenant jdTenant = getJdTenant(accountName);
@@ -911,7 +911,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		//工厂发货凭证
 		if ("681169".equals(select.getTenantId())) {
 			String accountName = select.getBelongCompany();
-			if (!"青岛通用沃德轮胎有限公司".equals(accountName)) {
+			if ("A青岛达沃特轮胎有限公司".equals(accountName)) {
 				accountName = "青岛达沃特轮胎有限公司";
 			}
 			JdTenant jdTenant = getJdTenant(accountName);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -1356,7 +1356,7 @@ public class ExportOrderController extends BladeController {
 			LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
 				.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
-				.eq(OrderParts::getType, "4")
+//				.eq(OrderParts::getType, "4")
 				.eq(OrderParts::getPid, orderItems_.getId());
 			List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
 			for (OrderParts orderParts : orderPartsList) {
@@ -1437,7 +1437,7 @@ public class ExportOrderController extends BladeController {
 			LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
 				.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
-				.eq(OrderParts::getType, "4")
+				//.eq(OrderParts::getType, "4")
 				.eq(OrderParts::getPid, orderItems_.getId());
 			List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
 			for (OrderParts orderParts : orderPartsList) {

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -91,6 +91,7 @@ import javax.net.ssl.*;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -440,7 +441,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 						throw new SecurityException("原始单据不存在 或者 已被删除");
 					} else {
 						String accountName = settlement.getBelongCompany();
-						if (!"青岛通用沃德轮胎有限公司".equals(accountName)) {
+						if ("A青岛达沃特轮胎有限公司".equals(accountName)) {
 							accountName = "青岛达沃特轮胎有限公司";
 						}
 						LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -923,6 +924,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			accMapper.updateById(acc);
 			//原业务表,计算应收未收款,应收未收款 = 销售金额 - 本次溢付款 - 已收款
 			client.setBalanceAmount((client.getDebitAmount().subtract(client.getSettlmentAmount())).subtract(client.getCaseOverPayment()));
+			if (ObjectUtils.isEmpty(items.getSettlementAmount())){
+				items.setSettlementAmount(BigDecimal.ZERO);
+			}
 			if (!items.getAmount().equals(items.getThisAmount().add(items.getSettlementAmount()))) {
 				client.setDepositReceived("定金到账");
 			} else {

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/ClaimServiceImpl.java

@@ -381,8 +381,8 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 			}
 
 			//=============生成凭证所需信息==============
-			if (!"青岛通用沃德轮胎有限公司".equals(accountName)) {
-				accountName="青岛达沃特轮胎有限公司";
+			if ("A青岛达沃特轮胎有限公司".equals(accountName)) {
+				accountName = "青岛达沃特轮胎有限公司";
 			}
 			LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			jdTenantLambdaQueryWrapper