This commit is contained in:
chi
2024-01-01 22:46:17 +09:00
parent 6e091f6218
commit 6a60c44489
20 changed files with 5815 additions and 547 deletions

View File

@@ -119,14 +119,14 @@ namespace FPJ0000
"ReqSite,ReqPlant,ReqLine,ReqPackage,[name],'' as remark_ans,[reqstaff], [costo],[costn],[cnt], " +
"[remark_req],[sdate],[ddate],[edate],[odate], [orderno], " +
"[path], dbo.getScheduleProgress(idx) as ProgressPrj,[bHighlight],[bCost],[bFanOut], " +
"dbo.getLastHistory(idx) AS lasthistory,effect_intangible,effect_tangible, " +
"effect_intangible,effect_tangible, " +
"dbo.getProjectFinishRate(gcode, idx) AS finishrate, sfi_type, sfi_savetime, sfi_savecount, " +
"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,jasmin,[memo],wuid,wdate,gcode,CMP_Description,CMP_Before,CMP_After" +
"dbo.getUserName2(softwareid, usersub) as name_software,jasmin,[memo],wuid,wdate,gcode" +
" 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 ";