This commit is contained in:
chi
2023-06-22 10:07:11 +09:00
parent 772cf9faeb
commit b04b79b5f5
27 changed files with 4487 additions and 4575 deletions

View File

@@ -262,9 +262,13 @@ namespace FPJ0000
//사용자 목록다중선택으로 인해 처리
var sql = "SELECT *, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue";
var sql = "SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description," +
"remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot," +
"dbo.getWorkWeek(pdate) AS ww, process, tag," +
"dbo.getCodeSValue(gcode, '15', type) AS svalue," +
"otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otwuid, ottime";
sql += " FROM JobReport";
sql += " WHERE(pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)";
sql += " WHERE (gcode = @gcode) and (pdate BETWEEN @sd AND @ed)";
if (request != "%")
{
//사용자가 지정되어있다
@@ -294,6 +298,7 @@ namespace FPJ0000
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
dsMSSQL.JobReport.Clear();
dsMSSQL.JobReport.AcceptChanges();
da.Fill(this.dsMSSQL.JobReport);
dsMSSQL.JobReport.AcceptChanges();