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/sales/service/impl/ShippingInfoServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index c062391..851684f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -92,11 +92,19 @@
salesLedgerProductMapper.updateById(salesLedgerProduct);
}
}
- byId.setExpressNumber(req.getExpressNumber());
- byId.setExpressCompany(req.getExpressCompany());
+ if (req.getExpressNumber() != null) {
+ byId.setExpressNumber(req.getExpressNumber());
+ }
+ if (req.getExpressCompany() != null) {
+ byId.setExpressCompany(req.getExpressCompany());
+ }
+ if (req.getShippingCarNumber() != null) {
+ byId.setShippingCarNumber(req.getShippingCarNumber());
+ }
+ if (req.getShippingDate() != null) {
+ byId.setShippingDate(req.getShippingDate());
+ }
byId.setStatus("宸插彂璐�");
- byId.setShippingCarNumber(req.getShippingCarNumber());
- byId.setShippingDate(req.getShippingDate());
boolean update = this.updateById(byId);
// 鏇存柊璁㈠崟鐘舵�佷负 5-宸插彂璐� (濡傛灉鎵�鏈夊彂璐ц褰曢兘宸插彂璐�)
@@ -117,7 +125,6 @@
}
return update;
}
-
@Override
public boolean delete(List<Long> ids) {
--
Gitblit v1.9.3