From 9725ae55d0a8724f2a35810cf5f1df4d50156709 Mon Sep 17 00:00:00 2001 From: ChiKyun Kim Date: Fri, 8 Aug 2025 09:30:03 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=97=90=EC=84=9C=20aseemblyid=20=EA=B0=80=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=EB=90=98=EB=8A=94=20=ED=98=84=EC=83=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=ED=95=B4=EB=8B=B9=20=EC=BB=AC=EB=9F=BC?= =?UTF-8?q?=EC=9D=80=20=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EC=BB=AC=EB=9F=BC(=EC=9D=B4=EC=A7=80=EC=9B=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SubProject/FPJ0000/Project/fProjectList.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index ae3a1f5..c2f7757 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -217,10 +217,9 @@ namespace FPJ0000 " [memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[bHighlight],[div]," + " dbo.getScheduleProgress(idx) as ProgressPrj,'' AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd,model,serial," + " [championid], dbo.getProjectFinishRate(gcode, idx) AS finishrate,sfic,sfi_shiftcount, sfi_type, sfi_savetime, sfi_savecount," + - " championid,designid,assemblyid,epanelid,softwareid,userAssembly,effect_tangible,effect_intangible," + + " championid,designid,epanelid,softwareid,effect_tangible,effect_intangible," + "dbo.getUserName2(championid,usermanager) as name_champion," + "dbo.getUserName2(designid,usermain) as name_design," + - "dbo.getUserName2(assemblyid,userAssembly) as name_assembly," + "dbo.getUserName2(epanelid,userhw2) as name_epanel," + "dbo.getUserName2(softwareid,usersub) as name_software,category," + "ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate,jasmin,sfi,'' AS lasthistoryD," + @@ -250,11 +249,9 @@ namespace FPJ0000 // "ISNULL(usersub, '') LIKE @username) "; State_where += " (ISNULL(userManager, '') LIKE @username OR " + "ISNULL(usermain, '') LIKE @username OR " + - "ISNULL(reqstaff, '') LIKE @username OR " + - "ISNULL(userAssembly, '') LIKE @username OR " + + "ISNULL(reqstaff, '') LIKE @username OR " + "dbo.getUserName(championid) LIKE @username OR " + - "dbo.getUserName(designid) LIKE @username OR " + - "dbo.getUserName(assemblyid) LIKE @username OR " + + "dbo.getUserName(designid) LIKE @username OR " + "dbo.getUserName(epanelid) LIKE @username OR " + "dbo.getUserName(softwareid) LIKE @username OR " + "ISNULL(usersub, '') LIKE @username) ";