2023年1月6日17:58:29

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -75,7 +75,7 @@ public class OrderDescClient implements IOrderDescClient {
 			throw new SecurityException("修改状态失败");
 		}
 
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		if ("681169".equals(AuthUtil.getTenantId()) || "941197".equals(AuthUtil.getTenantId())) {
 			if (ObjectUtil.isNotEmpty(order.getDeliverQuantity())) {
 				if (order.getDeliverQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					iOrderService.update(null, new LambdaUpdateWrapper<Order>()

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

@@ -2503,7 +2503,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						for (OrderItems orderItems : order.getOrderItemsList()) {
 							if ("XS".equals(order.getBillType())) {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
-							}else{
+							} else {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
 							}
 							BigDecimal stockPrice = new BigDecimal("0.00");
@@ -2707,7 +2707,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					for (OrderItems orderItems : order.getOrderItemsList()) {
 						if ("XS".equals(order.getBillType())) {
 							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
-						}else{
+						} else {
 							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
 						}
 						BigDecimal stockPrice = new BigDecimal("0.00");
@@ -2868,10 +2868,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						throw new SecurityException("请核失败:请核标识设置不正确");
 					}
 
-					// 没开启审批流直接走 通过流程
-					if (pathsActs == null || pathsActs.getIsEnable() == 2) {
-						throw new SecurityException("当前租户未查询到审批流配置");
-					} else {
+					// 审批流程
+					if (ObjectUtils.isNotNull(pathsActs) && pathsActs.getIsEnable() == 1) {
 						if (CollectionUtils.isEmpty(auditPathsLevels)) {
 							throw new SecurityException("开启审批失败:未查询到审批信息");
 						}
@@ -2910,6 +2908,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (!financeProcess.isSuccess()) {
 							throw new SecurityException("操作失败,请联系管理员");
 						}
+//						throw new SecurityException("当前租户未查询到审批流配置");
 					}
 				}
 			}
@@ -2987,7 +2986,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						for (OrderItems orderItems : order.getOrderItemsList()) {
 							if ("XS".equals(order.getBillType())) {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
-							}else{
+							} else {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
 							}
 							orderItems.setPurchaseCost(orderItems.getPurchasePrice());
@@ -3145,7 +3144,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						for (OrderItems orderItems : order.getOrderItemsList()) {
 							if ("XS".equals(order.getBillType())) {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
-							}else{
+							} else {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
 							}
 							BigDecimal stockPrice = new BigDecimal("0.00");
@@ -3338,7 +3337,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						for (OrderItems orderItems : order.getOrderItemsList()) {
 							if ("XS".equals(order.getBillType())) {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
-							}else{
+							} else {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
 							}
 							orderItems.setPurchaseCost(orderItems.getPurchasePrice());
@@ -3451,9 +3450,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 
 					// 没开启审批流直接走 通过流程
-					if (pathsActs == null || pathsActs.getIsEnable() == 2) {
-						throw new SecurityException("当前租户未查询到审批流配置");
-					} else {
+					if (ObjectUtils.isNotNull(pathsActs) || pathsActs.getIsEnable() == 1) {
 						if (CollectionUtils.isEmpty(auditPathsLevels)) {
 							throw new SecurityException("开启审批失败:未查询到审批信息");
 						}
@@ -3492,6 +3489,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (!financeProcess.isSuccess()) {
 							throw new SecurityException("操作失败,请联系管理员");
 						}
+//						throw new SecurityException("当前租户未查询到审批流配置");
 					}
 				} else {
 					// 订单时间
@@ -3552,7 +3550,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						for (OrderItems orderItems : order.getOrderItemsList()) {
 							if ("XS".equals(order.getBillType())) {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
-							}else{
+							} else {
 								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
 							}
 							orderItems.setPurchaseCost(orderItems.getPurchasePrice());
@@ -4395,7 +4393,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					return R.data("订单单号：" + selectOrder.getSysNo() + "金额小于运费金额，确定要审核通过吗？");
 				}
 			} else {
-				 throw new  RuntimeException("运费余额不足，审核失败");
+				throw new RuntimeException("运费余额不足，审核失败");
 			}
 		} else {
 			return R.data("未查到订单信息");