采购销售修改

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

@@ -99,7 +99,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	@Transactional
 	public R saveOrderMessage(Order order) {
-		//校验单号重复
+		//校验单号重复-新增
 		if(order.getId()==null)
 		{
 			LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
@@ -112,6 +112,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				throw new SecurityException("合同号:"+order.getOrderNo()+"已存在,禁止重复添加");
 			}
 		}
+		//校验单号重复-编辑
+		else
+		{
+			LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
+			orderLambdaQueryWrapper
+				.ne(Order::getId,order.getId())
+				.eq(Order::getOrderNo,order.getOrderNo())
+				.eq(Order::getTenantId, AuthUtil.getTenantId());
+			Integer count = baseMapper.selectCount(orderLambdaQueryWrapper);
+			if(count!=null&&count>0)
+			{
+				throw new SecurityException("合同号:"+order.getOrderNo()+"已存在,禁止重复添加");
+			}
+		}
 
 		Date date = new Date();//订单时间
 		//保存订单主表信息

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

@@ -79,7 +79,7 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 	 * @param order
 	 */
 	private Order saveOrder(OrderSubmitDto order) {
-        //校验单号重复
+        //校验单号重复-新增
 		if(order.getId()==null)
 		{
 			LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
@@ -92,6 +92,20 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 				throw new SecurityException("合同号:"+order.getOrderNo()+"已存在,禁止重复添加");
 			}
 		}
+		//校验单号重复-编辑
+		else
+		{
+			LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
+			orderLambdaQueryWrapper
+				.ne(Order::getId,order.getId())
+				.eq(Order::getOrderNo,order.getOrderNo())
+				.eq(Order::getTenantId,AuthUtil.getTenantId());
+			Integer count = orderService.selectCount(orderLambdaQueryWrapper);
+			if(count!=null&&count>0)
+			{
+				throw new SecurityException("合同号:"+order.getOrderNo()+"已存在,禁止重复添加");
+			}
+		}
 		order.setBillType(order.getBillType());
 		order.setTradeType(order.getTradeType());
 		if (Func.isBlank(order.getSysNo())) {