From 0ac445694a8ffc0e26e54d788d889b3797edf7a0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 09:48:33 +0800
Subject: [PATCH] feat: 添加备件领用记录功能，包括数据库表
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index e1ca875..e0ddcff 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.ShippingInfoMapper">
@@ -41,7 +42,13 @@
<if test="req.expressNumber != null and req.expressNumber != ''">
AND s.express_number LIKE CONCAT('%',#{req.expressNumber},'%')
</if>
- order by create_time DESC
+ <if test="req.shippingDateStart != null and req.shippingDateStart != ''">
+ AND s.shipping_date >= #{req.shippingDateStart}
+ </if>
+ <if test="req.shippingDateEnd != null and req.shippingDateEnd != ''">
+ AND s.shipping_date <= #{req.shippingDateEnd}
+ </if>
+ order by shipping_no DESC
</select>
<select id="listAll" resultType="com.ruoyi.sales.pojo.ShippingInfo">
SELECT
@@ -57,7 +64,53 @@
sl.sales_contract_no,
sl.customer_name
FROM shipping_info s
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ ORDER BY s.create_time ASC
+ </select>
+
+ <select id="exportList" resultType="com.ruoyi.sales.dto.ShippingInfoDto">
+ SELECT
+ s.id,
+ s.sales_ledger_id,
+ s.shipping_date,
+ s.shipping_car_number,
+ s.express_number,
+ s.express_company,
+ s.shipping_no,
+ s.type,
+ s.status,
+ s.create_time,
+ s.update_time,
+ s.create_user,
+ s.update_user,
+ s.tenant_id,
+ sl.sales_contract_no,
+ slp.specification_model,
+ p.product_name,
+ pm.thickness,
+ sl.customer_name
+ FROM shipping_info s
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
+ left join product_model pm on slp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ WHERE 1=1
+ <if test="req.salesContractNo != null and req.salesContractNo != ''">
+ AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
+ </if>
+ <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
+ AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
+ </if>
+ <if test="req.expressNumber != null and req.expressNumber != ''">
+ AND s.express_number LIKE CONCAT('%',#{req.expressNumber},'%')
+ </if>
+ <if test="req.shippingDateStart != null and req.shippingDateStart != ''">
+ AND s.shipping_date >= #{req.shippingDateStart}
+ </if>
+ <if test="req.shippingDateEnd != null and req.shippingDateEnd != ''">
+ AND s.shipping_date <= #{req.shippingDateEnd}
+ </if>
+ order by s.create_time DESC
</select>
<select id="getReturnManagementDtoById" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
--
Gitblit v1.9.3