This commit is contained in:
chi
2023-12-13 09:33:18 +09:00
parent 8e384da8ff
commit 4334725900
8 changed files with 354 additions and 293 deletions

View File

@@ -24901,13 +24901,13 @@ namespace FPJ0000.dsPRJTableAdapters {
"yD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible,\r\n " +
" (SELECT MAX(pdate) AS Expr1\r\n FROM Projects" +
"History\r\n WHERE (pidx = Projects.idx)) AS lasthistory_date, " +
"sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount\r\nFROM Projects\r\nW" +
"HERE (status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @username OR\r\n " +
" ISNULL(usermain, \'\') LIKE @username OR\r\n ISNULL(usersub," +
" \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)\r\nORDER BY (" +
"CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status" +
"] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') \r\n " +
" THEN \'9\' ELSE \'5\' END)";
"sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount\r\nFROM Projects WI" +
"TH (nolock)\r\nWHERE (status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @user" +
"name OR\r\n ISNULL(usermain, \'\') LIKE @username OR\r\n I" +
"SNULL(usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcod" +
"e)\r\nORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\'" +
" WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] " +
"= \'취소\') \r\n THEN \'9\' ELSE \'5\' END)";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -24919,12 +24919,42 @@ namespace FPJ0000.dsPRJTableAdapters {
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WHERE (idx = @idx)";
this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut,
bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx)
AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory,
(SELECT MAX(pdate) AS Expr1
FROM ProjectsHistory
WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion,
dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno,
process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager,
userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws
FROM Projects WITH (nolock)
WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)";
this._commandCollection[3].CommandText = "SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getSchedulePr" +
"ogressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid," +
" asset, bCost, bFanOut, \r\n bHighlight, bdate, category, cdate, cha" +
"mpionid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangibl" +
"e, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) \r\n " +
" AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(" +
"idx) AS lasthistory,\r\n (SELECT MAX(pdate) AS Expr1\r\n " +
" FROM ProjectsHistory\r\n WHERE (pidx = Projects" +
".idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid" +
") AS name_assembly, dbo.getUserName(championid) AS name_champion, \r\n " +
" dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_e" +
"panel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path," +
" pdate, pidx, pno, \r\n process, progress, qdate, remark_ans, remark" +
"_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftc" +
"ount, sfi_type, softwareid, status, userAssembly, userManager, \r\n " +
"userhw2, usermain, userprocess, usersub, wdate, wuid, \'\' AS wwd, \'\' AS wwe, \'\' A" +
"S wwo, \'\' AS wws\r\nFROM Projects WITH (nolock)\r\nWHERE (ISNULL(name, N\'\') LIK" +
"E @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR\r\n (I" +
"SNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search" +
") OR\r\n (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(mem" +
"o, N\'\') LIKE @search)";
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -26376,7 +26406,7 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark\r\nFROM Projec" +
"tsIOMap\r\nWHERE (Project = @Project)\r\nORDER BY Dir, PIn";
"tsIOMap WITH (nolock)\r\nWHERE (Project = @Project)\r\nORDER BY Dir, PIn";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -27676,7 +27706,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit,
import, qtyn, amtn
FROM ProjectsPart
FROM ProjectsPart WITH (nolock)
WHERE (Project = @prj)
ORDER BY Project, no, ItemGroup, option1, ItemName";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
@@ -31379,7 +31409,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess,
category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi
FROM EETGW_SaveCost
FROM EETGW_SaveCost WITH (nolock)
ORDER BY pdate";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
}
@@ -32786,14 +32816,18 @@ WHERE (idx = @idx)";
this._commandCollection[0].CommandText = @"SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2,
option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue, dbo.getPorojectgGroupUserName(Project, option3)
AS userGroupName, recvUser, reqUser, bCancel, recvDate
FROM vProjectPartPurchase
FROM vProjectPartPurchase WITH (nolock)
WHERE (gcode = @gcode)
ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0), idx";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = @"SELECT Item, ItemGroup, ItemManu, ItemModel, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemUnit, Project, amt, amtn, bCancel, bbuy, bconfirm, crdue, gcode, idx, import, jago, memo, name, no, option1, option2, option3, orderno, path, pdate, price, qty, qtybuy, qtyin, qtyjago, qtyn, recvDate, recvUser, remark, reqUser, status, dbo.getPorojectgGroupUserName(Project, option3) AS userGroupName, userManager, wdate, wuid FROM vProjectPartPurchase WHERE (gcode = @gcode) AND (idx = @idx)";
this._commandCollection[1].CommandText = @"SELECT Item, ItemGroup, ItemManu, ItemModel, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemUnit, Project, amt, amtn, bCancel, bbuy, bconfirm, crdue, gcode, idx, import, jago, memo, name,
no, option1, option2, option3, orderno, path, pdate, price, qty, qtybuy, qtyin, qtyjago, qtyn, recvDate, recvUser, remark, reqUser, status, dbo.getPorojectgGroupUserName(Project, option3)
AS userGroupName, userManager, wdate, wuid
FROM vProjectPartPurchase WITH (nolock)
WHERE (gcode = @gcode) AND (idx = @idx)";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -33172,7 +33206,7 @@ SELECT idx, pidx, pdate, div, remark, remark2, mailsend, wuid, wdate FROM EETGW_
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT idx, pidx, pdate, div, remark, remark2, mailsend, wuid, wdate\r\nFROM E" +
"ETGW_ProjecthistoryD\r\nWHERE (pidx = @pidx)\r\nORDER BY pdate DESC";
"ETGW_ProjecthistoryD WITH (nolock)\r\nWHERE (pidx = @pidx)\r\nORDER BY pdate DESC";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -34722,7 +34756,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line,
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import,
wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, , , memo, Process, BoardVender, 2, 2, refdata
FROM EETGW_JobReport_EBoard
FROM EETGW_JobReport_EBoard WITH (nolock)
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid)
ORDER BY pdate DESC";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;