金蝶凭证修改

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

@@ -60,7 +60,7 @@ public class JdTenant implements Serializable {
 		private String username;
 		private String password;
 
-
+		private String isDeleted;
 
 
 

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

@@ -30,10 +30,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.springblade.client.entity.BasicCorpsProfitChange;
 import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.*;
-import org.springblade.client.goods.service.impl.GoodsDescServiceImpl;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -57,7 +55,6 @@ import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.purchase.sales.feign.IOrderItemsClient;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
-import org.springblade.stock.vo.StockGoodsVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -369,14 +366,21 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			String deliveryAmount = CollectionUtils.isEmpty(deliveryItems) ? "0" : pricetotal2.toString();
 
 			//=============生成凭证所需信息==============
-
-			try {
-				String accountName = select.getBelongCompany();
-				//测试账套-收货生成凭证
-				this.testDeliverGoodsSaveVoucher(brand, select, accountName, corpName, corpNumber, wareHouse, purchaseTotalAmount, deliveryAmount, saleOrderNo, purchaseOrderNo);
-				baseMapper.updateById(select);
-			} catch (Exception exception) {
-				throw new SecurityException(exception.getMessage());
+			String accountName = select.getBelongCompany();
+			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) {
+				try {
+					//测试账套-收货生成凭证
+					this.testDeliverGoodsSaveVoucher(brand, select, accountName, corpName, corpNumber, wareHouse, purchaseTotalAmount, deliveryAmount, saleOrderNo, purchaseOrderNo);
+					baseMapper.updateById(select);
+				} catch (Exception exception) {
+					throw new SecurityException(exception.getMessage());
+				}
 			}
 		}
 
@@ -592,15 +596,23 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		Long storageId = select.getStorageId();
 		//收货凭证
 		if ("681169".equals(select.getTenantId())) {
-			//todo
-			try {
-				String accountName = select.getBelongCompany();
-				//测试账套-收货生成凭证
-				this.testTakeGoodsSaveVoucher(brand, select, accountName, corpName, corpNumber, wareHouse, acoount, orderNo);
-				baseMapper.updateById(select);
-
-			} catch (Exception exception) {
-				throw new SecurityException(exception.getMessage());
+			String accountName = select.getBelongCompany();
+			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) {
+				//todo
+				try {
+					//测试账套-收货生成凭证
+					this.testTakeGoodsSaveVoucher(brand, select, accountName, corpName, corpNumber, wareHouse, acoount, orderNo);
+					baseMapper.updateById(select);
+
+				} catch (Exception exception) {
+					throw new SecurityException(exception.getMessage());
+				}
 			}
 		}
 
@@ -1018,7 +1030,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		}
 		JdyTool.AccountGroup group = groupList.get(0);
 
-
 		//1.获取套账信息
 		LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		jdTenantLambdaQueryWrapper
@@ -1223,7 +1234,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 		//warehouse="测试仓库";//具体到时候用哪个,需要关联查询传参,今天先用测试的
 		LambdaQueryWrapper<JdCorps> corpsQueryWrapper2 = new LambdaQueryWrapper<>();
-		System.out.println(AuthUtil.getTenantId());
 		corpsQueryWrapper2
 			.eq(JdCorps::getCorpsType, 4)
 			.eq(JdCorps::getAccountId, accountId)

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

@@ -227,7 +227,6 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		String corpsName = null;
 		String createUser = null;
 		String corpNumber = null;
-		Boolean use_voucher = false;//是否开启金蝶凭证
 		//供应商
 		R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(settlement.getCorpId());
 		if (corpMessage.isSuccess() && corpMessage.getData() != null) {
@@ -257,33 +256,40 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 					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, corpNumber, settlement.getAmount().toString());
-									//更新绑定
-									baseMapper.updateById(settlement);
-								} catch (Exception exception) {
-									throw new SecurityException(exception.getMessage());
+						String accountName = settlement.getBelongCompany();
+						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 {
-									String accountName = settlement.getBelongCompany();
-									//测试账套-销售保存凭证
-									this.testPurchaseSaveVoucher(settlement, accountName, createUser, 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());
+									}
 								}
 							}
 						}