2022年10月118 18:51

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsDesc.java

@@ -384,4 +384,10 @@ public class CorpsDesc implements Serializable {
 	@ApiModelProperty(value = "纳税人识别号")
 	private String taxpayerDifferenceCode;
 
+	/**
+	 * 优势航线
+	 */
+	@ApiModelProperty(value = "优势航线")
+	private String line;
+
 }

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

@@ -106,13 +106,13 @@ public class BidingItems implements Serializable {
 	 * 起运港箱使费
 	 */
 	@ApiModelProperty(value = "起运港箱使费")
-	private BigDecimal departureHarborFee;
+	private String departureHarborFee;
 
 	/**
 	 * 目的港箱使费
 	 */
 	@ApiModelProperty(value = "目的港箱使费")
-	private BigDecimal objectiveHarborFee;
+	private String objectiveHarborFee;
 
 	/**
 	 * 状态
@@ -202,4 +202,10 @@ public class BidingItems implements Serializable {
 	@ApiModelProperty(value = "有效期")
 	private Date termValidity;
 
+	/**
+	 * 客户联系人主表id
+	 */
+	@ApiModelProperty(value = "客户联系人主表id")
+	private Long corpsAttnId;
+
 }

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

@@ -505,7 +505,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			//明细总采购价
 			String purchaseTotalAmount = CollectionUtils.isEmpty(deliveryItems) ? "0" : pricetotal1.toString();
 			//明细总销售价
-			String deliveryAmount = CollectionUtils.isEmpty(deliveryItems) ? "0" : pricetotal2.toString();
+			/*String deliveryAmount = CollectionUtils.isEmpty(deliveryItems) ? "0" : pricetotal2.toString();*/
+			String deliveryAmount = delivery.getDeliveryAmount().toString();
 
 			//=============生成凭证所需信息==============
 			String accountName = select.getBelongCompany();

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingMapper.xml

@@ -47,6 +47,7 @@
             BB.cargo_information AS cargoInformation,
             BB.box_type_quantity AS boxTypeQuantity,
             BB.status AS status,
+            BBA.status AS agentStatus,
             BCD.id as corpId
         FROM business_biding BB
         LEFT JOIN business_biding_agent BBA ON BBA.pid = BB.id

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

@@ -72,7 +72,7 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 					throw new SecurityException("投标信息只允许修改一次");
 				}
 			}
-
+			bidingAgent.setStatus(5);
 			if (ObjectUtil.isNotEmpty(bidingAgent)){
 				//更新代理明细信息
 				bidingAgentMapper.updateById(bidingAgent);
@@ -87,6 +87,9 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 				item.setDistinguish(distinguish);
 				if (distinguish == 1){
 					item.setStatus(5);
+					if (ObjectUtil.isNotEmpty(corpsAttn)){
+						item.setCorpsAttnId(corpsAttn.getPid());
+					}
 				}
 				item.setPid(pid);
 				baseMapper.insert(item);
@@ -176,5 +179,19 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 		}
 		items.setStatus(6);
 		baseMapper.updateById(items);
+
+		//获得代理信息
+		LambdaQueryWrapper<BidingAgent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BidingAgent::getTenantId, AuthUtil.getTenantId());
+		lambdaQueryWrapper.eq(BidingAgent::getIsDeleted,0);
+		lambdaQueryWrapper.eq(BidingAgent::getPid, items);
+		lambdaQueryWrapper.in(BidingAgent::getAgentId, items.getCorpsAttnId());
+		BidingAgent bidingAgent = bidingAgentMapper.selectOne(lambdaQueryWrapper);
+
+		if (ObjectUtil.isNotEmpty(bidingAgent)){
+			//更新代理明细信息
+			bidingAgent.setStatus(6);
+			bidingAgentMapper.updateById(bidingAgent);
+		}
 	}
 }

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

@@ -251,68 +251,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			createUser = userR.getData().getName();
 		}
 
-		//测试账套-保存凭证
-		if ("681169".equals(settlement.getTenantId())) {
-			//获取来源订单号
-			LambdaQueryWrapper<Items> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			itemsLambdaQueryWrapper.eq(Items::getPid, settlement.getId()).eq(Items::getIsDeleted, 0);
-			itemsLambdaQueryWrapper.last("limit 1");
-			List<Items> list = itemsMapper.selectList(itemsLambdaQueryWrapper);
-			if (CollectionUtils.isNotEmpty(list)) {
-				//获取来源订单号
-				List<String> stringList = list.stream().filter(e -> StringUtils.isNotBlank(e.getSrcOrderno())).map(Items::getSrcOrderno).collect(Collectors.toList());
-				for (String s : stringList) {
-					Order mode = new Order();
-					mode.setOrderNo(s);
-					//查询原始订单的类型,销售 还是 采购
-					Order order = orderDescClient.getByOrder(mode);
-					if (order == null) {
-						throw new SecurityException("原始单据不存在 或者 已被删除");
-					} else {
-						String accountName = settlement.getBelongCompany();
-						if (!"青岛通用沃德轮胎有限公司".equals(accountName)) {
-							accountName = "青岛达沃特轮胎有限公司";
-						}
-						LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
-						jdTenantLambdaQueryWrapper
-							.eq(JdTenant::getIsEnable, 1)
-							.eq(JdTenant::getTenantId, AuthUtil.getTenantId())
-							.eq(JdTenant::getAccountName, accountName);
-						JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);
-						if (jdTenant != null) {
-							//销售
-							if ("XS".equals(order.getBillType())) {
-								//销售收款-保存凭证
-								if (settlement.getSettlementType() == 1 && "收费".equals(settlement.getBillType())) {
-									try {
-										//测试账套-销售保存凭证
-										this.testSaleCollectionSaveVoucher(settlement, accountName, corpsName, corpNumber, settlement.getAmount().toString());
-										//更新绑定
-										baseMapper.updateById(settlement);
-									} catch (Exception exception) {
-										throw new SecurityException(exception.getMessage());
-									}
-								}
-							}
-							//采购
-							else if ("CG".equals(order.getBillType())) {
-								//采购付款-保存凭证
-								if (settlement.getSettlementType() == 1 && "付费".equals(settlement.getBillType())) {
-									try {
-										//测试账套-销售保存凭证
-										this.testPurchaseSaveVoucher(settlement, accountName, createUser, corpsName, corpNumber, settlement.getAmount().toString());
-										//更新绑定
-										baseMapper.updateById(settlement);
-									} catch (Exception exception) {
-										throw new SecurityException(exception.getMessage());
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
+		//更新绑定
+		baseMapper.updateById(settlement);
 
 		if ("结算完成".equals(settlement.getFinanceStatus())) {
 			throw new SecurityException("此结算单已结算过,禁止重复操作");
@@ -450,6 +390,66 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				}
 			});
 		}
+
+		//测试账套-保存凭证
+		if ("681169".equals(settlement.getTenantId())) {
+			//获取来源订单号
+			LambdaQueryWrapper<Items> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			itemsLambdaQueryWrapper.eq(Items::getPid, settlement.getId()).eq(Items::getIsDeleted, 0);
+			itemsLambdaQueryWrapper.last("limit 1");
+			List<Items> list = itemsMapper.selectList(itemsLambdaQueryWrapper);
+			if (CollectionUtils.isNotEmpty(list)) {
+				//获取来源订单号
+				List<String> stringList = list.stream().filter(e -> StringUtils.isNotBlank(e.getSrcOrderno())).map(Items::getSrcOrderno).collect(Collectors.toList());
+				for (String s : stringList) {
+					Order mode = new Order();
+					mode.setOrderNo(s);
+					//查询原始订单的类型,销售 还是 采购
+					Order order = orderDescClient.getByOrder(mode);
+					if (order == null) {
+						throw new SecurityException("原始单据不存在 或者 已被删除");
+					} else {
+						String accountName = settlement.getBelongCompany();
+						if (!"青岛通用沃德轮胎有限公司".equals(accountName)) {
+							accountName = "青岛达沃特轮胎有限公司";
+						}
+						LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
+						jdTenantLambdaQueryWrapper
+							.eq(JdTenant::getIsEnable, 1)
+							.eq(JdTenant::getTenantId, AuthUtil.getTenantId())
+							.eq(JdTenant::getAccountName, accountName);
+						JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);
+						if (jdTenant != null) {
+							//销售
+							if ("XS".equals(order.getBillType())) {
+								//销售收款-保存凭证
+								if (settlement.getSettlementType() == 1 && "收费".equals(settlement.getBillType())) {
+									try {
+										//测试账套-销售保存凭证
+										this.testSaleCollectionSaveVoucher(settlement, accountName, corpsName, corpNumber, settlement.getAmount().toString());
+									} catch (Exception exception) {
+										throw new SecurityException(exception.getMessage());
+									}
+								}
+							}
+							//采购
+							else if ("CG".equals(order.getBillType())) {
+								//采购付款-保存凭证
+								if (settlement.getSettlementType() == 1 && "付费".equals(settlement.getBillType())) {
+									try {
+										//测试账套-销售保存凭证
+										this.testPurchaseSaveVoucher(settlement, accountName, createUser, corpsName, corpNumber, settlement.getAmount().toString());
+									} catch (Exception exception) {
+										throw new SecurityException(exception.getMessage());
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
 		return model;
 		//验证结算总金额是否超限
 		/*if(settlementDTO.getBillType().equals("收费")||settlementDTO.getBillType().equals("付费"))