From 9e927d9d892cd141992ef250e612012aab4f081b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 14:34:33 +0800
Subject: [PATCH] 合并分支
---
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 5 +++--
src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java | 3 ++-
src/main/java/com/ruoyi/sales/service/ShippingInfoService.java | 3 ++-
src/main/java/com/ruoyi/sales/vo/SalesLedgerProductVo.java | 15 +++++++++++++++
src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java | 16 ++++++++++++++++
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 13 ++++++++++---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 3 ++-
7 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 56b3e15..cff5be3 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -11,6 +11,7 @@
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShippingInfoService;
+import com.ruoyi.sales.vo.ShippingInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,7 @@
@GetMapping("/listPage")
@ApiOperation("鍙戣揣淇℃伅鍒楄〃")
public AjaxResult listPage(Page page, ShippingInfo req) {
- IPage<ShippingInfo> listPage = shippingInfoService.listPage(page,req);
+ IPage<ShippingInfoVo> listPage = shippingInfoService.listPage(page,req);
return AjaxResult.success(listPage);
}
diff --git a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
index 88dec8a..3054796 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.vo.ShippingInfoVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -13,7 +14,7 @@
* @date : 2025/10/22 9:32
*/
public interface ShippingInfoMapper extends BaseMapper<ShippingInfo> {
- IPage<ShippingInfo> listPage(Page page,@Param("req") ShippingInfo req);
+ IPage<ShippingInfoVo> listPage(Page page, @Param("req") ShippingInfo req);
List<ShippingInfo> listAll();
}
diff --git a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
index 81c7181..1a3a316 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.vo.ShippingInfoVo;
/**
* @author :yys
* @date : 2025/10/22 9:33
*/
public interface ShippingInfoService extends IService<ShippingInfo>{
- IPage<ShippingInfo> listPage(Page page, ShippingInfo req);
+ IPage<ShippingInfoVo> listPage(Page page, ShippingInfo req);
}
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 8469b9e..db3cae8 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShippingInfoService;
+import com.ruoyi.sales.vo.ShippingInfoVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,8 +23,8 @@
private ShippingInfoMapper shippingInfoMapper;
@Override
- public IPage<ShippingInfo> listPage(Page page, ShippingInfo req) {
- IPage<ShippingInfo> listPage = shippingInfoMapper.listPage(page, req);
+ public IPage<ShippingInfoVo> listPage(Page page, ShippingInfo req) {
+ IPage<ShippingInfoVo> listPage = shippingInfoMapper.listPage(page, req);
return listPage;
}
diff --git a/src/main/java/com/ruoyi/sales/vo/SalesLedgerProductVo.java b/src/main/java/com/ruoyi/sales/vo/SalesLedgerProductVo.java
new file mode 100644
index 0000000..752ec27
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/vo/SalesLedgerProductVo.java
@@ -0,0 +1,15 @@
+package com.ruoyi.sales.vo;
+
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+@Data
+public class SalesLedgerProductVo extends SalesLedgerProduct {
+
+ //浜у搧搴撳瓨
+ private BigDecimal productStock;
+
+}
diff --git a/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java b/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java
new file mode 100644
index 0000000..d03fb20
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java
@@ -0,0 +1,16 @@
+package com.ruoyi.sales.vo;
+
+import com.ruoyi.sales.pojo.ShippingInfo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+@Data
+public class ShippingInfoVo extends ShippingInfo {
+
+ /**
+ * 鏁伴噺
+ */
+ private BigDecimal quantity;
+}
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index efe93cf..a23a02c 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.ShippingInfoMapper">
- <select id="listPage" resultType="com.ruoyi.sales.pojo.ShippingInfo">
+ <select id="listPage" resultType="com.ruoyi.sales.vo.ShippingInfoVo">
SELECT
s.id,
s.sales_ledger_id,
@@ -14,12 +14,19 @@
s.update_user,
s.tenant_id,
sl.sales_contract_no,
- sl.customer_name
+ sl.customer_name,
+ slp.product_category,
+ slp.specification_model,
+ slp.quantity
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ left join sales_ledger_product slp on slp.id = s.sales_ledger_product_id and slp.type = 1
WHERE 1=1
<if test="req.salesContractNo != null and req.salesContractNo != ''">
AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
+ </if>
+ <if test="req.productCategory != null and req.productCategory != ''">
+ AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
</if>
<if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
@@ -41,4 +48,4 @@
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3