From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
index 267e154..3d33d5c 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
@@ -56,6 +56,9 @@
WarehouseGoodsShelves one = warehouseGoodsShelvesMapper.selectOne(new LambdaQueryWrapper<WarehouseGoodsShelves>().eq(WarehouseGoodsShelves::getId, warehouseGoodsShelves.getId()));
// 1. 妫�鏌ヨ揣鏋跺悕绉版槸鍚﹀凡瀛樺湪
if (one == null) {
+ if(warehouseGoodsShelves.getRow() == null || warehouseGoodsShelves.getRow() == 0 && warehouseGoodsShelves.getCol() == null || warehouseGoodsShelves.getCol() == 0){
+ throw new IllegalArgumentException("灞傛暟鍜屽垪鏁颁笉鑳戒负绌�");
+ }
int insert = warehouseGoodsShelvesMapper.insert(warehouseGoodsShelves);
if (insert <= 0) return false;
}
@@ -64,11 +67,11 @@
Long warehouseId = warehouseGoodsShelves.getWarehouseId();
// 3. 鎵归噺鍒涘缓琛屽垪璁板綍
List<WarehouseGoodsShelvesRowcol> rowcolList = new ArrayList<>();
- for (long i = 1; i <= warehouseGoodsShelves.getStorey(); i++) {
- for (long j = 1; j <= warehouseGoodsShelves.getArrange(); j++) {
+ for (long i = 1; i <= warehouseGoodsShelves.getRow(); i++) {
+ for (long j = 1; j <= warehouseGoodsShelves.getCol(); j++) {
WarehouseGoodsShelvesRowcol rowcol = new WarehouseGoodsShelvesRowcol();
- rowcol.setStorey(i);
- rowcol.setArrange(j);
+ rowcol.setRow(i);
+ rowcol.setCol(j);
rowcol.setWarehouseGoodsShelvesId(shelvesId);
rowcolList.add(rowcol);
}
--
Gitblit v1.9.3