代码

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

@@ -107,6 +107,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
 			orderLambdaQueryWrapper
 				.eq(Order::getOrderNo,order.getOrderNo())
+				.eq(Order::getTradeType,order.getTradeType())
+				.eq(Order::getBillType,order.getBillType())
 				.eq(Order::getTenantId, AuthUtil.getTenantId());
 			Integer count = baseMapper.selectCount(orderLambdaQueryWrapper);
 			if(count!=null&&count>0)
@@ -121,6 +123,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			orderLambdaQueryWrapper
 				.ne(Order::getId,order.getId())
 				.eq(Order::getOrderNo,order.getOrderNo())
+				.eq(Order::getTradeType,order.getTradeType())
+				.eq(Order::getBillType,order.getBillType())
 				.eq(Order::getTenantId, AuthUtil.getTenantId());
 			Integer count = baseMapper.selectCount(orderLambdaQueryWrapper);
 			if(count!=null&&count>0)

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/component/impl/DefaultOrderSaveImpl.java

@@ -86,6 +86,8 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 			LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
 			orderLambdaQueryWrapper
 				.eq(Order::getOrderNo,order.getOrderNo())
+				.eq(Order::getTradeType,order.getTradeType())
+				.eq(Order::getBillType,order.getBillType())
 				.eq(Order::getTenantId,AuthUtil.getTenantId());
 			Integer count = orderService.selectCount(orderLambdaQueryWrapper);
 			if(count!=null&&count>0)
@@ -100,6 +102,8 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 			orderLambdaQueryWrapper
 				.ne(Order::getId,order.getId())
 				.eq(Order::getOrderNo,order.getOrderNo())
+				.eq(Order::getTradeType,order.getTradeType())
+				.eq(Order::getBillType,order.getBillType())
 				.eq(Order::getTenantId,AuthUtil.getTenantId());
 			Integer count = orderService.selectCount(orderLambdaQueryWrapper);
 			if(count!=null&&count>0)