轮胎商城版本号控制bug修改 2024年7月16日17:23:04

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -891,10 +891,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R shortcutWarehousing(PjOrder order) {
 		PjOrder pjOrder = baseMapper.selectById(order.getId());
-		if (!pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		PjShip pjShip = new PjShip();
 		// 获取系统编号
 		R billNo = serialClient.getBillNo(OrderTypeEnum.SHRW.getType(), OrderTypeEnum.SHRW.getType(), OrderTypeEnum.SHRW.getType());
@@ -1723,10 +1720,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		pjShip.setSourceCompanyName(pjOrder.getSalesCompanyName());
 		shipMapper.insert(pjShip);
 
-		if ( !pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		//修改销售状态为待发货
 		pjOrder.setStatus(OrderTypeEnum.TOBESHIPPEDOUT.getType());
 		pjOrder.setXcxStatus(OrderTypeEnum.TOBESHIPPEDOUT.getType());
@@ -1818,10 +1812,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		} else {
 			throw new RuntimeException("出库已完成，禁止撤销！");
 		}
-		if ( !pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		//修改销售状态为待发货
 		pjOrder.setStatus(OrderTypeEnum.XSDQR.getType());
 		pjOrder.setGenerateTask(OrderTypeEnum.NSCRW.getType());
@@ -1925,11 +1916,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		pjShip.setCreateUser(AuthUtil.getUserId());
 		pjShip.setCreateTime(new Date());
 		shipMapper.insert(pjShip);
-
-		if ( !pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		//修改采购状态
 		pjOrder.setStatus(OrderTypeEnum.TREATWAREHOUSING.getType());
 		pjOrder.setGenerateTask(OrderTypeEnum.SCRW.getType());
@@ -2029,10 +2016,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		} else {
 			throw new RuntimeException("入库已完成，禁止撤销！");
 		}
-		if ( !pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		//修改销售状态为待发货
 		pjOrder.setStatus(OrderTypeEnum.XSDQR.getType());
 		pjOrder.setGenerateTask(OrderTypeEnum.NSCRW.getType());
@@ -3149,12 +3133,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		pjShip.setSourceCompanyId(pjOrder.getSalesCompanyId());
 		pjShip.setSourceCompanyName(pjOrder.getSalesCompanyName());
 		shipMapper.insert(pjShip);
-
-		if (!pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
-
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		//修改销售状态为待发货
 		pjOrder.setStatus(OrderTypeEnum.XSDFH.getType());
 		pjOrder.setXcxStatus(OrderTypeEnum.XSDFH.getType());
@@ -3385,11 +3364,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		} else {
 			throw new RuntimeException("出库已完成，禁止撤销！");
 		}
-
-		if (!pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		//修改销售状态为待发货
 		pjOrder.setStatus(OrderTypeEnum.XSDQR.getType());
 		pjOrder.setGenerateTask(OrderTypeEnum.NSCRW.getType());
@@ -3496,11 +3471,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		pjShip.setCreateUser(AuthUtil.getUserId());
 		pjShip.setCreateTime(new Date());
 		shipMapper.insert(pjShip);
-
-		if (!pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		//修改采购状态
 		pjOrder.setStatus(OrderTypeEnum.GOODSRECEIVED.getType());
 		pjOrder.setGenerateTask(OrderTypeEnum.SCRW.getType());
@@ -4238,10 +4209,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		} else {
 			throw new RuntimeException("入库已完成，禁止撤销！");
 		}
-		if (!pjOrder.getVersion().equals(order.getVersion())) {
-			throw new RuntimeException("订单数据已被修改，请返回列表重新操作！");
-		}
-		pjOrder.setVersion(order.getVersion() + 1);
+		pjOrder.setVersion(pjOrder.getVersion() + 1);
 		//修改销售状态为待发货
 		if ("1".equals(pjOrder.getShortcutWarehousingStatus())) {
 			pjOrder.setStatus(OrderTypeEnum.XSLR.getType());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -271,7 +271,7 @@ public class StockDescController extends BladeController {
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandId()), PjStockDesc::getBrandId, stockDesc.getBrandId())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getGoodsTypeId()), PjStockDesc::getGoodsTypeId, stockDesc.getGoodsTypeId())
 			.like(ObjectUtil.isNotEmpty(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot())
-			.orderByAsc(PjStockDesc::getCreateTime);
+			.orderByDesc(PjStockDesc::getBalanceQuantity);
 		if ("0".equals(stockDesc.getWhether())) {
 			lambdaQueryWrapper.ne(PjStockDesc::getStoreInventory, 0);
 		}