From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人,维护时间默认当前 2.销售报价审核非必填,产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间,修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了,增加生产订单当前工序 3.库存导入模板规格改成图纸编号,产品名称可以为空,加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量(只统计二级)

---
 src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
index dabc4f0..06202f8 100644
--- a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
@@ -35,8 +35,8 @@
         from documentation_return_management dbm
         LEFT JOIN documentation doc on doc.id = dbm.documentation_id
         where dbm.returner IS NOT NULL
-        <if test="documentationReturnManagement.returnStatus != null">
-            and return_status = #{documentationReturnManagement.returnStatus}
+        <if test="documentationReturnManagement.borrowStatus != null">
+            and borrow_status = #{documentationReturnManagement.borrowStatus}
         </if>
         <if test="documentationReturnManagement.documentationId != null">
             and documentation_id = #{documentationReturnManagement.documentationId}

--
Gitblit v1.9.3