|
|
@@ -72,6 +72,7 @@ public class StockDescServiceImpl extends ServiceImpl<StockDescMapper, PjStockDe
|
|
|
PjStockDesc updateDesc = new PjStockDesc();
|
|
|
updateDesc.setId(stockDesc.getId());
|
|
|
updateDesc.setUpAndDownShelves(stockDesc.getUpAndDownShelves());
|
|
|
+ updateDesc.setVersion(stockDesc.getVersion());
|
|
|
updateDesc.setUserAndDept(bladeUser);
|
|
|
return R.status(this.updateById(updateDesc));
|
|
|
}
|
|
|
@@ -88,7 +89,7 @@ public class StockDescServiceImpl extends ServiceImpl<StockDescMapper, PjStockDe
|
|
|
|
|
|
private R<String> verifyVersion (PjStockDesc stockDesc) {
|
|
|
if (Objects.isNull(stockDesc.getId())) {
|
|
|
- return null;
|
|
|
+ return R.fail("请求缺少重要参数，请刷新后重试");
|
|
|
}
|
|
|
PjStockDesc srcStock = this.getById(stockDesc.getId());
|
|
|
if (!stockDesc.getVersion().equals(srcStock.getVersion())) {
|
liyuan