财务修改

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

@@ -240,41 +240,49 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 		//测试账套-保存凭证
 		if ("681169".equals(settlement.getTenantId())) {
-			//查询原始订单的类型,销售 还是 采购
-			if (StringUtils.isNotBlank(settlement.getSrcOrderno())) {
-				Order mode = new Order();
-				mode.setOrderNo(settlement.getSrcOrderno());
-				Order order = orderDescClient.getByOrder(mode);
-				if (order == null) {
-					throw new SecurityException("原始单据不存在 或者 已被删除");
-				} else {
-					//销售
-					if ("XS".equals(order.getBillType())) {
-						//销售收款-保存凭证
-						if (settlement.getSettlementType() == 1 && "收费".equals(settlement.getBillType())) {
-							try {
-								String accountName = settlement.getBelongCompany();
-								//测试账套-销售保存凭证
-								this.testSaleCollectionSaveVoucher(settlement, accountName, corpsName, settlement.getAmount().toString());
-								//更新绑定
-								baseMapper.updateById(settlement);
-							} catch (Exception exception) {
-								throw new SecurityException(exception.getMessage());
+			//获取来源订单号
+			LambdaQueryWrapper<Items> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			itemsLambdaQueryWrapper.eq(Items::getPid, settlement.getId()).eq(Items::getIsDeleted, 0);
+			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 {
+						//销售
+						if ("XS".equals(order.getBillType())) {
+							//销售收款-保存凭证
+							if (settlement.getSettlementType() == 1 && "收费".equals(settlement.getBillType())) {
+								try {
+									String accountName = settlement.getBelongCompany();
+									//测试账套-销售保存凭证
+									this.testSaleCollectionSaveVoucher(settlement, accountName, corpsName, 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 {
-								String accountName = settlement.getBelongCompany();
-								//测试账套-销售保存凭证
-								this.testPurchaseSaveVoucher(settlement, accountName, createUser, corpsName, 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 {
+									String accountName = settlement.getBelongCompany();
+									//测试账套-销售保存凭证
+									this.testPurchaseSaveVoucher(settlement, accountName, createUser, corpsName, settlement.getAmount().toString());
+									//更新绑定
+									baseMapper.updateById(settlement);
+								} catch (Exception exception) {
+									throw new SecurityException(exception.getMessage());
+								}
 							}
 						}
 					}