From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 8d23060..8976a3a 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -19,4 +19,21 @@
<result column="update_time" property="updateTime" />
</resultMap>
+ <select id="listPage" resultType="com.ruoyi.purchase.vo.PurchaseReturnOrderVo">
+ SELECT
+ pro.*,
+ sm.supplier_name as supplierName,
+ pl.purchase_contract_number as purchaseContractNumber,
+ su.user_name as returnUserName,
+ su1.user_name as createUserName
+ FROM purchase_return_orders pro
+ LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
+ LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
+ LEFT JOIN sys_user su ON su.user_id = pro.return_user_id
+ LEFT JOIN sys_user su1 ON su1.user_id = pro.prepared_user_id
+ where 1=1
+ <if test="params.no != null and params.no != '' ">
+ AND pro.no LIKE CONCAT('%',#{params.no},'%')
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3