From 926371b9919b5197886aa44af43cbdbe9e6dee99 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 10:57:04 +0800
Subject: [PATCH] yys 修改发货模块bug
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 14 ++++++++++++++
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 6 +-----
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 2 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 3966071..8927d74 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -202,7 +202,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "鍙戣揣鐘舵��")
- private String shippingStatus;
+ private String shippingStatus = "寰呭彂璐�";
/**
* 浜у搧鐘舵��
*/
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 8fdf4f9..52035d8 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -22,9 +22,11 @@
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +76,7 @@
private ProductionProductOutputMapper productionProductOutputMapper;
private ProductionProductInputMapper productionProductInputMapper;
private QualityInspectMapper qualityInspectMapper;
+ private ShippingInfoMapper shippingInfoMapper;
private StockUtils stockUtils;
@@ -117,6 +120,17 @@
ledgerProduct.setInvoiceAmount(invoiceAmount);
ledgerProduct.setNoInvoiceNum(noInvoiceNum);
ledgerProduct.setNoInvoiceAmount(noInvoiceAmount);
+ // 鍙戣揣淇℃伅
+ ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerProductId, ledgerProduct.getId())
+ .orderByDesc(ShippingInfo::getCreateTime)
+ .last("limit 1"));
+ if(shippingInfo != null){
+ ledgerProduct.setShippingDate(shippingInfo.getShippingDate());
+ ledgerProduct.setShippingCarNumber(shippingInfo.getShippingCarNumber());
+ ledgerProduct.setShippingStatus(shippingInfo.getStatus());
+ }
+
}
}
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 71b776c..2732085 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -7,10 +7,6 @@
<select id="selectSalesLedgerProductList" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
SELECT
T1.*,
- t3.shipping_car_number,
- t3.shipping_date,
- t3.status as shippingStatus,
- t3.shipping_date,
CASE
WHEN t2.qualitity > T1.quantity THEN 1
ELSE 0
@@ -18,7 +14,6 @@
FROM
sales_ledger_product T1
LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id
- LEFT JOIN shipping_info t3 ON T1.id = t3.sales_ledger_product_id
<where>
1=1
<if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">
@@ -28,6 +23,7 @@
AND T1.type = #{salesLedgerProduct.type}
</if>
</where>
+ ORDER BY T1.register_date DESC
</select>
<select id="selectSalesLedgerProductByMainId" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
select slp.*
--
Gitblit v1.9.3