From 4445ae4de0cd4f21709b843c52fef80c0037d782 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 09 五月 2026 20:53:49 +0800
Subject: [PATCH] fix: 销售订单已发货但是产品状态显示错误问题
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 5 ++---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 446b5a8..12b54a5 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -248,10 +248,9 @@
@ApiModelProperty(value = "鍙戣揣鐘舵��")
private String shippingStatus = "寰呭彂璐�";
/**
- * 浜у搧鐘舵��
+ * 0-鏈嚭搴擄紝1-宸插嚭搴擄紝2-寰呭鏍革紝3-瀹℃牳瀹屾垚锛�4-瀹℃牳澶辫触锛堥攢鍞彴璐﹀垪琛ㄥ睍绀鸿鍒欒鍓嶇锛�
*/
-// @TableField(exist = false)
- @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
+ @ApiModelProperty(value = "浜у搧鍑哄簱瀹℃壒鐘舵�侊細0-鏈嚭搴擄紝1-宸插嚭搴擄紝2-寰呭鏍革紝3-瀹℃牳瀹屾垚锛�4-瀹℃牳澶辫触")
private Integer approveStatus;
@ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 53b8506..7f5c9ac 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -724,9 +724,9 @@
product.setRegisterDate(LocalDateTime.now());
// 鍙戣揣淇℃伅
ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>().eq(ShippingInfo::getSalesLedgerProductId, product.getId()).orderByDesc(ShippingInfo::getCreateTime).last("limit 1"));
- product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
- product.setShippingDate(shippingInfo.getShippingDate());
if (shippingInfo != null) {
+ product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
+ product.setShippingDate(shippingInfo.getShippingDate());
product.setShippingStatus(shippingInfo.getStatus());
}
}
--
Gitblit v1.9.3