This commit is contained in:
chi
2023-01-09 16:22:06 +09:00
parent 32b5059af8
commit ff2b5834fa
9 changed files with 589 additions and 472 deletions

View File

@@ -173,12 +173,12 @@ namespace FPJ0000
" [memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div]," +
" dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd,model,serial," +
" [championid], dbo.getProjectFinishRate(gcode, idx) AS finishrate," +
" championid,designid,assemblyid,epanelid,softwareid," +
"dbo.getUserName(championid) as name_champion," +
"dbo.getUserName(designid) as name_design," +
"dbo.getUserName(assemblyid) as name_assembly," +
"dbo.getUserName(epanelid) as name_epanel," +
"dbo.getUserName(softwareid) as name_software" +
" championid,designid,assemblyid,epanelid,softwareid,userAssembly," +
"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" +
" FROM Projects";
//string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects";
string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and ";
@@ -196,6 +196,7 @@ namespace FPJ0000
State_where += " (ISNULL(userManager, '') LIKE @username OR " +
"ISNULL(usermain, '') LIKE @username OR " +
"ISNULL(reqstaff, '') LIKE @username OR " +
"ISNULL(userAssembly, '') LIKE @username OR " +
"dbo.getUserName(championid) LIKE @username OR " +
"dbo.getUserName(designid) LIKE @username OR " +
"dbo.getUserName(assemblyid) LIKE @username OR " +