From bace339cef323dcecc2ce309fdda6a0e0a530b28 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 07 四月 2026 15:17:14 +0800
Subject: [PATCH] fix:1.发货查询字段 2.质量批号
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 3 +++
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 2 ++
src/main/resources/mapper/quality/QualityInspectMapper.xml | 6 ++++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index d29c034..2be238c 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -180,4 +180,6 @@
private String workOrderNo;
@TableField(exist = false)
private String purchaseContractNo;
+ @TableField(exist = false)
+ private String batchNo;
}
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 33f8e1e..6f038d3 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -11,7 +11,8 @@
pl.purchase_contract_number as purchase_contract_no
</when>
<otherwise>
- pwo.work_order_no
+ pwo.work_order_no,
+ po.batch_no
</otherwise>
</choose>
FROM
@@ -24,10 +25,11 @@
<otherwise>
LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+ LEFT JOIN product_order po ON pwo.product_order_id = po.id
</otherwise>
</choose>
WHERE
- inspect_type=#{qualityInspect.inspectType}
+ inspect_type = #{qualityInspect.inspectType}
<if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
AND qi.supplier like concat('%',#{qualityInspect.supplier},'%')
</if>
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 6026980..cf620e1 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -35,6 +35,9 @@
<if test="req.expressNumber != null and req.expressNumber != ''">
AND s.express_number LIKE CONCAT('%',#{req.expressNumber},'%')
</if>
+ <if test="req.customerName != null and req.customerName != ''">
+ AND sl.customer_name LIKE CONCAT('%',#{req.customerName},'%')
+ </if>
order by create_time DESC
</select>
<select id="listAll" resultType="com.ruoyi.sales.pojo.ShippingInfo">
--
Gitblit v1.9.3