From 11424c6e56545768873c9e3be8281a51e20604db Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 十二月 2022 09:17:08 +0800
Subject: [PATCH] SOP操作文件查询接口，仓库看板接口开发
---
VueWebApi/DLL/DAL/SystemSettingDAL.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VueWebApi/DLL/DAL/SystemSettingDAL.cs b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
index 8bd2dca..8bdcfbb 100644
--- a/VueWebApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
@@ -365,7 +365,7 @@
{
if (search != "" && search != null)
{
- sech += "and concat(isnull(AA.partcode,''),isnull(AA.partname,''),isnull(AA.partspec,''),isnull(AA.eqptype_name,''),isnull(AA.filetype_name,''),isnull(AA.file_name,''),isnull(AA.file_version,''),isnull(AA.username,'')) like '%@search%' ";
+ sech += "and concat(isnull(AA.partcode,''),isnull(AA.partname,''),isnull(AA.partspec,''),isnull(AA.eqptype_name,''),isnull(AA.filetype_name,''),isnull(AA.define_name,''),isnull(AA.file_version,''),isnull(AA.username,'')) like '%'+@search+'%' ";
dynamicParams.Add("@search", search);
}
if (check == "Y")
@@ -381,11 +381,11 @@
sech = sech.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.id,AA.partcode,AA.partname,AA.partspec,AA.eqptype_code,AA.eqptype_name,AA.filetype_code,AA.filetype_name,AA.file_name,AA.file_version,AA.file_path,
+ var sql = @"select AA.id,AA.partcode,AA.partname,AA.partspec,AA.eqptype_code,AA.eqptype_name,AA.filetype_code,AA.filetype_name,AA.file_name,AA.define_name,AA.file_version,AA.file_path,
AA.username,AA.lm_date,AA.rn from(
select top 100 A.id,M.partcode,M.partname,M.partspec,A.eqptype_code,T.name as eqptype_name,A.filetype_code,
(case when A.filetype_code='P001' then '浣滀笟鎸囧涔�' when A.filetype_code='P002' then '妫�楠屾寚瀵间功' when A.filetype_code='P003' then '鍥剧焊' end) as filetype_name,
- A.file_name,A.file_version,A.file_path,U.username,A.lm_date,
+ A.file_name,A.define_name,A.file_version,A.file_path,U.username,A.lm_date,
row_number() over(partition by A.materiel_code,A.filetype_code order by replace(A.file_version,'V','') desc) rn
from TK_Sop_Matfile A
left join TMateriel_Info M on A.materiel_code=M.partcode
--
Gitblit v1.9.3