Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

비용절감 화면 사용자 기본 이름 제거 및 1년치 보이게 함

Browse Source
This commit is contained in:
chi
2021-04-05 11:22:03 +09:00
parent e92bd86d2b
commit fb8a1d23bb
9 changed files with 517 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
SubProject/FPJ0000/dsPRJ.Designer.cs generated
View File

@@ -911,6 +911,14 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnProgressPrj;
private global::System.Data.DataColumn columnwws;
private global::System.Data.DataColumn columnwwo;
private global::System.Data.DataColumn columnwwe;
private global::System.Data.DataColumn columnwwd;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public ProjectsDataTable() :
@@ -1329,6 +1337,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn wwsColumn {
get {
return this.columnwws;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn wwoColumn {
get {
return this.columnwwo;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn wweColumn {
get {
return this.columnwwe;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn wwdColumn {
get {
return this.columnwwd;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1412,7 +1452,11 @@ namespace FPJ0000 {
bool bFanOut,
string div,
string crdue,
double ProgressPrj) {
int ProgressPrj,
string wws,
string wwo,
string wwe,
string wwd) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1461,7 +1505,11 @@ namespace FPJ0000 {
bFanOut,
div,
crdue,
ProgressPrj};
ProgressPrj,
wws,
wwo,
wwe,
wwd};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1514,7 +1562,11 @@ namespace FPJ0000 {
bool bFanOut,
string div,
string crdue,
double ProgressPrj) {
int ProgressPrj,
string wws,
string wwo,
string wwe,
string wwd) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1563,7 +1615,11 @@ namespace FPJ0000 {
bFanOut,
div,
crdue,
ProgressPrj};
ProgressPrj,
wws,
wwo,
wwe,
wwd};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1640,6 +1696,10 @@ namespace FPJ0000 {
this.columndiv = base.Columns["div"];
this.columncrdue = base.Columns["crdue"];
this.columnProgressPrj = base.Columns["ProgressPrj"];
this.columnwws = base.Columns["wws"];
this.columnwwo = base.Columns["wwo"];
this.columnwwe = base.Columns["wwe"];
this.columnwwd = base.Columns["wwd"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1737,8 +1797,16 @@ namespace FPJ0000 {
base.Columns.Add(this.columndiv);
this.columncrdue = new global::System.Data.DataColumn("crdue", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columncrdue);
this.columnProgressPrj = new global::System.Data.DataColumn("ProgressPrj", typeof(double), null, global::System.Data.MappingType.Element);
this.columnProgressPrj = new global::System.Data.DataColumn("ProgressPrj", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnProgressPrj);
this.columnwws = new global::System.Data.DataColumn("wws", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnwws);
this.columnwwo = new global::System.Data.DataColumn("wwo", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnwwo);
this.columnwwe = new global::System.Data.DataColumn("wwe", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnwwe);
this.columnwwd = new global::System.Data.DataColumn("wwd", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnwwd);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1784,6 +1852,14 @@ namespace FPJ0000 {
this.columndiv.MaxLength = 2;
this.columncrdue.MaxLength = 10;
this.columnProgressPrj.ReadOnly = true;
this.columnwws.ReadOnly = true;
this.columnwws.MaxLength = 6;
this.columnwwo.ReadOnly = true;
this.columnwwo.MaxLength = 6;
this.columnwwe.ReadOnly = true;
this.columnwwe.MaxLength = 6;
this.columnwwd.ReadOnly = true;
this.columnwwd.MaxLength = 6;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10840,10 +10916,10 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double ProgressPrj {
public int ProgressPrj {
get {
try {
return ((double)(this[this.tableProjects.ProgressPrjColumn]));
return ((int)(this[this.tableProjects.ProgressPrjColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'ProgressPrj\' 열의 값이 DBNull입니다.", e);
@@ -10854,6 +10930,70 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string wws {
get {
if (this.IswwsNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.wwsColumn]));
}
}
set {
this[this.tableProjects.wwsColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string wwo {
get {
if (this.IswwoNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.wwoColumn]));
}
}
set {
this[this.tableProjects.wwoColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string wwe {
get {
if (this.IswweNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.wweColumn]));
}
}
set {
this[this.tableProjects.wweColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string wwd {
get {
if (this.IswwdNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProjects.wwdColumn]));
}
}
set {
this[this.tableProjects.wwdColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsnameNull() {
@@ -11369,6 +11509,54 @@ namespace FPJ0000 {
public void SetProgressPrjNull() {
this[this.tableProjects.ProgressPrjColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IswwsNull() {
return this.IsNull(this.tableProjects.wwsColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetwwsNull() {
this[this.tableProjects.wwsColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IswwoNull() {
return this.IsNull(this.tableProjects.wwoColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetwwoNull() {
this[this.tableProjects.wwoColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IswweNull() {
return this.IsNull(this.tableProjects.wweColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetwweNull() {
this[this.tableProjects.wweColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IswwdNull() {
return this.IsNull(this.tableProjects.wwdColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetwwdNull() {
this[this.tableProjects.wwdColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -19412,6 +19600,10 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("div", "div");
tableMapping.ColumnMappings.Add("crdue", "crdue");
tableMapping.ColumnMappings.Add("ProgressPrj", "ProgressPrj");
tableMapping.ColumnMappings.Add("wws", "wws");
tableMapping.ColumnMappings.Add("wwo", "wwo");
tableMapping.ColumnMappings.Add("wwe", "wwe");
tableMapping.ColumnMappings.Add("wwd", "wwd");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -19566,7 +19758,8 @@ namespace FPJ0000.dsPRJTableAdapters {
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut, div, crdue, dbo.getScheduleProgress(idx) AS ProgressPrj
bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe,
dbo.getWorkWeek(ddate) AS wwd
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -19586,7 +19779,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status,
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj
bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe,
dbo.getWorkWeek(ddate) AS wwd
FROM Projects
WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
@@ -19595,7 +19789,8 @@ WHERE (idx = @idx)";
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj
bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe,
dbo.getWorkWeek(ddate) AS wwd
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