파트리스트 금액칸 9백에서 9조로 수정 함 (붙여넣기 값 오류 있었음)

This commit is contained in:
chi
2020-05-11 13:00:44 +09:00
parent f68c0a0ea4
commit 91c2ddc961
17 changed files with 720 additions and 470 deletions

View File

@@ -40,7 +40,7 @@ namespace FPJ0000
var processStr = "%";
if (cmbProcess.SelectedIndex > 0) processStr = cmbProcess.Text;
var dtUserList = taUserList.GetData(processStr);
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList)
{
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);

View File

@@ -739,6 +739,8 @@
//
this.fpSpread1.AccessibleDescription = "";
this.fpSpread1.AllowDragFill = true;
this.fpSpread1.AutoAdvance = true;
this.fpSpread1.ClipboardPasteToFill = true;
this.fpSpread1.ContextMenuStrip = this.cm1;
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fpSpread1.EditModeReplace = true;
@@ -881,19 +883,25 @@
this.fpSpread1_Sheet1.Columns.Get(9).Label = "N대 수량";
this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qtyn";
this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType5.DecimalPlaces = 0;
numberCellType5.MaximumValue = 9999999999999.99D;
numberCellType5.MinimumValue = -9999999999999.99D;
numberCellType5.NegativeRed = true;
numberCellType5.NullDisplay = "--";
numberCellType5.Separator = ",";
numberCellType5.ShowSeparator = true;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "amt";
this.fpSpread1_Sheet1.Columns.Get(10).Formula = "RC[-3]*RC[-2]";
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(10).Label = "1대 금액";
this.fpSpread1_Sheet1.Columns.Get(10).Tag = "amt";
this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amtn";
this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[-4]*RC[-2]";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "N대 금액";
this.fpSpread1_Sheet1.Columns.Get(11).Tag = "amtn";

View File

@@ -160,6 +160,8 @@ namespace FPJ0000
var delindex = this.fpSpread1.ActiveSheet.Columns["sid"].Index;
var col_pmp = this.fpSpread1.ActiveSheet.Columns["pmp"].Index;
var col_buy = this.fpSpread1.ActiveSheet.Columns["buy"].Index;
var col_amt = this.fpSpread1.ActiveSheet.Columns["amt"].Index;
var col_amtn = this.fpSpread1.ActiveSheet.Columns["amtn"].Index;
for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
{
var value = this.fpSpread1.ActiveSheet.GetValue(i, delindex);
@@ -178,6 +180,8 @@ namespace FPJ0000
this.fpSpread1.ActiveSheet.Cells[i, delindex].BackColor = Color.FromArgb(240,240, 250);
this.fpSpread1.ActiveSheet.Cells[i, col_pmp].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1.ActiveSheet.Cells[i, col_buy].BackColor = Color.FromArgb(200,200,255);
this.fpSpread1.ActiveSheet.Cells[i, col_amt].BackColor = Color.WhiteSmoke;
this.fpSpread1.ActiveSheet.Cells[i, col_amtn].BackColor = Color.WhiteSmoke;
}
@@ -186,13 +190,11 @@ namespace FPJ0000
void RefreshSum()
{
decimal sum = 0;
foreach (dsPRJ.ProjectsPartRow dr in this.dsPRJ.ProjectsPart.Rows)
{
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
sum += dr.amt;
}
lbSum.Text = sum.ToString("N0");
decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
}

View File

@@ -280,57 +280,57 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZLdS1NhHMd3lX9CWBddClFaKRV1US61WYG9
WVmZTucUTW3owiBTp5FphiYqVIhSdFFRVnNqU2vO5UYzelmm5st8jU2Xez1Hd8769pyz1QyEfvDhuXjO
98P5fc8RcBN7VZN6pFqvTril/xlXpqfISfPUcKeBTqgeoA/d1Jn2yrV1mxMfr+NDqyf+er/W6qQXZyw2
1uZehs0VZNHJQePbvBPFL6dx9tawR5SrCglE/XO4Umf9sbDEDpi9MEwxMEwz0JsZ6CZXoPm+jM4hN5YZ
QDlMobhtCul3TNQ/krgSNeXwrGBwhsWHGYacDN7zkhX0jS3j9ZCHCHwYnGdhmPOiQjUN4ZXeR3z4TE30
xKmyxF/SxhNIbziJhq5WlD+rgbAkHNEEUcUexCp2olZZy6/iohlYljyILehjeMHpauHT3i/taB+9jwZ9
IS9JqT+EwofJyGtNgqTpKNKa0qD8ZEG7yYVXnx2wk57iFP00LxDViUJEpfmsfuQtHnxRoEqTy0tSGw+T
8DFk3c2EdszNr9IzSkFNelhyexFX/s4v4Ca+so+WNYthHNOhyXAZN7oLcKbmAFLrE2E0e2AkxXIFa8f9
ndiIIFaxSrDvWol3V9EmJNeJMDg+gIq32VCoZEi6HYNWzQt8nGVgJMUOTHrxjmB1eiEsDQh2yEOlkfKN
yGs5h/ON8ThXe5CXyFTJkD/LJG8SA+5+cJrFe+4TE5ykyCiZzi+IlK+fjZRvIA+FIrIwFMerYpBzTwzt
kBoV6iJkPxFD0ngaRiIwkH9DTwS014dt+ZrgCvtl/fS8ncanWZanb2QOl5qzkEGC0qYkFLRc/HvH4Vlh
EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC
WIAFl5eHa95Fs7DYHD6KouxhFzq+BuICQVRWV06EpLN7u1Rti5A+p/+S4Sf8D5LndJikY2lLWkdPuFiV
LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZJZTxNRGIZ7pT/BoBdekhgFtUaNXijIUsAE
NwSiKEspBGQTajARIQUjshiQAIkaAtF4oQZUoCwFpJRCG4oRQQRkLUugtCxdZqAz5fXMtFpNSPySJ+fi
zPtkvndGwI3/A2X0xWKNIrREsxaQp6HISfOUcqeWDi3up4OfqEfOSlXlh8Le7uFDf0/Qo16VwUwb9ctG
1mTdgsnixmjmoPFjyYycT3pElozZRCnyva6oc0IK1YYlwxrbP2uHdo6BVs9AM8tAPbMN5c8ttI5ascUA
TWMUcj7MIe7ZCPWPJCC3ndq0bWNwnsWXeYacDAZ4yTZ6JrfQPmojAgcGl1hoF+0okOvhe7/rDR+OKPWZ
vp4XtiOpuoq4ymuobKtDfn0pfHO94EMQFZyBv+wkyprK+FUsNIOVdRv87/YwvCC82Pd913AzmideolKT
xUtuVwQj63UUUusiIa6+hNjqWDQNraB5xILGb5vYID0FyHppXiAqF+0NzE1jNePdeDUsQ5EyhZdEV4WQ
8GUkPk+AatLKr9I5QUFBeli32hGQ3+cUcBNU2ENn1MRAN6lGtfYeHndkIqL0AqIrwqCbtUFHiuUKVk05
OzERgb/sL8G5h7n2U9kHEVUuwuBUPwq6kyCTZyDyqR/qlB/xdYGBjhTbP2NHH8FgtsM3zyU4LvWQCKUH
kFp7AzergnCjLJCXZMijIK1PIG/iB+5+UM9igPvEBDMpUpiudgqE0n0LQul+8pAHhFkeuFLkh+QXMVCN
KlCgyEbSuxiIq8KhIwIt+Tc0REDbHfBOU7pXOJ/eSy9t0BhaYHl6xheRXpOIeBKUVEcis/bOnzsO2zZL
BI1uwVFimze5Bf/DSlbwTmhwC05nfLYNz6zs7PbwbhjXNx1HbjdZXHFSZGLH9NymzTw8u+qYXqUwbaAw
6WLVYufhmrfQLJaNGw6KojY8b7V8d8UFghOJbcne4taOYxKFyVvSQP8h3onXb8QNtKe4Zf1wbEunV4w8
TiAQCH4BkPChBKRJ4EwAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -352,19 +352,18 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKjSURBVDhPvVLfT1JRHL/ruf6GHpplPrRlGw/10IOvvdbc
zIfemk9tmloazBoWoYYow0TYAI0JNzAkvfxacvlhuEpHbBgoyKBf/koDrxDWp3sud0u31mOf7bOzfXc+
53M+n3Oo/w6z2QyDwYDR0VFoNJrrVDgcBmEwGMTc3Bz8fj88Hg9mZ2cxPT0Nh8MBm80Gi8UCk8kk7K1U
Ksjn81CpVHEqFArh4OAA5XL5nywUCtDr9R93d3exvLwMpVKZUSgULRTLssIgl8thfn4e2WwWZJbJZOD1
epFKpeByuYQ9NE0jHo8LN+LFDWIqivL5fIhEIuTKkkAgALvdLiHiiYkJCYmh0+kkRKxWqyX8TMgvl8tr
RTlFMQyDWCwmdJBOp4UOiDMRJxIJ+J1qrLDtmHxmwNLSEnGHTCY7LsqrmJqaQrFYhNvtFpydTqfgbKct
SDJNma2UDW8dzeNjY2OQSqUQZX9gtVq7FxYWkEwmQcTEmZ8hEdZgIzGOSnEF7+3X8C7iRGdn5y9RdhRG
o5E0jZGREQwNDUGnkSNGX0Vpw4XSpwFsr75EdPIm2m+3/v2Aw+BDHotbr5g3P9Ao5e6DfXQBP7ZoLBoa
8ETa+F3cVgWf68xTHlqtljSN/v5+6FXtyPi7UF43gVu5AfbheexnO7CTnoF34PLPkOLiCVFOUfyzdJN1
cHDwVl9f35pSIW9d1De8+cYXt7/Whr1kY5WpZj6KCtmAGiFFvVQQEwwPD3fz31L4KNFoFDPGLmTZAZS/
aAX3vVQTH6FeWLl0C7jPL/DqQe1XVlZXJx5RRW9vL3p6ehBUXdrhNldR3vajtM53sG47xOeoFOLIvx6H
/26NTZQeBfv43KZXVsd5eLp5MgLPcsy9Wo7pOs0xd2o4puMU52s7GfwN2W8wmGlnW+YAAAAASUVORK5C
YII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKhSURBVDhPvVLfT1JRHL/ruf6GHpplPrRVGw/10IOvvdbc
zIfemk9tmloazBoWoYYow0TYAI0JNzAkvfxacvlhuEpHbBgoyKBf/koDrxDWp3sud6Vb67HP9tnZvjuf
8zmfzznUf4fZbIbBYMDIyAg0Gs01KhwOgzAYDGJ2dhZ+vx8ejwczMzOYmpqCw+GAzWaDxWKByWQS9lYq
FeTzeahUqjgVCoWwv7+Pcrn8TxYKBej1+g87OztYWlqCUqnMKBSKZoplWWGQy+UwNzeHbDYLMstkMvB6
vUilUnC5XMIemqYRj8eFG/HiejEVRfl8PkQiEXJlSSAQgN1ulxDx+Pi4hMTQ6XQSIlar1RJ+JuSXy+W1
opyiGIZBLBYTOkin00IHxJmIE4kE/E41ltk2TDw1YHFxkbhDJpMdFeVVTE5Oolgswu12C85Op1NwttMW
JJnGzGbKhjeOprHR0VFIpVKIsj+wWq1d8/PzSCaTIGLizM+QCGuwnhhDpbiMd/areBtxoqOj46coOwyj
0UiaxvDwMAYHB6HTyBGjr6C07kLpYz+2Vl4gOnEDbbda/n7AQfAhj8Stl80b72mUcvfAPjyP75s0Fgz1
eCxt+CZuq4LPdeoJD61WS5pGX18f9Ko2ZPydKK+ZwC1fB/vgLPay7dhOT8Pbf+lHSHHhmCinKP5Zusg6
MDBws7e3d1WpkLcs6Otff+WL21ttxW6yocpUEx9FhWxAjZDinFQQEwwNDXXx31L4KNFoFNPGTmTZfpQ/
awX33VQjH+GcsHLpZnCfnuPl/dovrKyuTjyiip6eHnR3dyOourjNbaygvOVHaY3vYM12gM9QKcSRfzUG
/50amyg9DPbRmQ2PrI5z82R+8zTH3K3lmM6THHO7hmPaT3C+1uPBX9kDMJVEIfxrAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -1355,6 +1355,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnname;
private global::System.Data.DataColumn columngcode;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public ProcessUserListDataTable() {
@@ -1404,6 +1406,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn gcodeColumn {
get {
return this.columngcode;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1441,11 +1451,12 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public ProcessUserListRow AddProcessUserListRow(string id, string name) {
public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode) {
ProcessUserListRow rowProcessUserListRow = ((ProcessUserListRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
id,
name};
name,
gcode};
rowProcessUserListRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProcessUserListRow);
return rowProcessUserListRow;
@@ -1470,6 +1481,7 @@ namespace FPJ0000 {
internal void InitVars() {
this.columnid = base.Columns["id"];
this.columnname = base.Columns["name"];
this.columngcode = base.Columns["gcode"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1479,11 +1491,14 @@ namespace FPJ0000 {
base.Columns.Add(this.columnid);
this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnname);
this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columngcode);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnid}, false));
this.columnid.Unique = true;
this.columnid.MaxLength = 20;
this.columnname.MaxLength = 100;
this.columngcode.MaxLength = 10;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2269,6 +2284,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string gcode {
get {
if (this.IsgcodeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProcessUserList.gcodeColumn]));
}
}
set {
this[this.tableProcessUserList.gcodeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsidNull() {
@@ -2292,6 +2323,18 @@ namespace FPJ0000 {
public void SetnameNull() {
this[this.tableProcessUserList.nameColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsgcodeNull() {
return this.IsNull(this.tableProcessUserList.gcodeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetgcodeNull() {
this[this.tableProcessUserList.gcodeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -3301,28 +3344,34 @@ ORDER BY processs, JobReport.pdate, uname";
tableMapping.DataSetTable = "ProcessUserList";
tableMapping.ColumnMappings.Add("id", "id");
tableMapping.ColumnMappings.Add("name", "name");
tableMapping.ColumnMappings.Add("gcode", "gcode");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
this._adapter.DeleteCommand.CommandText = "DELETE FROM [Users] WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Origina" +
"l_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)))" +
"";
"l_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) " +
"AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)))";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_id", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [Users] SET [id] = @id, [name] = @name WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)));
SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name ORDER BY Users.name";
this._adapter.UpdateCommand.CommandText = @"UPDATE [Users] SET [id] = @id, [name] = @name, [gcode] = @gcode WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)));
SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name, Users.gcode ORDER BY Users.name";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_id", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_id", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.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, "", "", ""));
}
@@ -3339,19 +3388,22 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT Users.id, Users.name\r\nFROM Users RIGHT OUTER JOIN\r\n Job" +
"Report ON Users.id = JobReport.uid\r\nWHERE (Users.processs LIKE @process) AND (U" +
"sers.id <> \'dev\') AND (Users.id <> \'test\')\r\nGROUP BY Users.id, Users.name\r\nORDER" +
" BY Users.name";
this._commandCollection[0].CommandText = @"SELECT Users.id, Users.name, Users.gcode
FROM Users RIGHT OUTER JOIN
JobReport ON Users.id = JobReport.uid
WHERE (Users.processs LIKE @process) AND (Users.id <> 'dev') AND (Users.id <> 'test') AND (Users.gcode = @gcode)
GROUP BY Users.id, Users.name, Users.gcode
ORDER BY Users.name";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "processs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
public virtual int Fill(dsReport.ProcessUserListDataTable dataTable, string process) {
public virtual int Fill(dsReport.ProcessUserListDataTable dataTable, string process, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((process == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -3359,6 +3411,12 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(process));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -3370,7 +3428,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
public virtual dsReport.ProcessUserListDataTable GetData(string process) {
public virtual dsReport.ProcessUserListDataTable GetData(string process, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((process == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -3378,6 +3436,12 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(process));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
dsReport.ProcessUserListDataTable dataTable = new dsReport.ProcessUserListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -3416,7 +3480,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
public virtual int Delete(string Original_id, string Original_name) {
public virtual int Delete(string Original_id, string Original_name, string Original_gcode) {
if ((Original_id == null)) {
throw new global::System.ArgumentNullException("Original_id");
}
@@ -3432,6 +3496,14 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_name));
}
if ((Original_gcode == null)) {
this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_gcode));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -3452,7 +3524,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
public virtual int Update(string id, string name, string Original_id, string Original_name, int idx) {
public virtual int Update(string id, string name, string gcode, string Original_id, string Original_name, string Original_gcode, int idx) {
if ((id == null)) {
throw new global::System.ArgumentNullException("id");
}
@@ -3465,22 +3537,36 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
else {
this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(name));
}
if ((gcode == null)) {
this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(gcode));
}
if ((Original_id == null)) {
throw new global::System.ArgumentNullException("Original_id");
}
else {
this.Adapter.UpdateCommand.Parameters[2].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(Original_id));
this.Adapter.UpdateCommand.Parameters[3].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Original_id));
}
if ((Original_name == null)) {
this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_name));
this.Adapter.UpdateCommand.Parameters[5].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Original_name));
}
this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(idx));
if ((Original_gcode == null)) {
this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_gcode));
}
this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {

View File

@@ -90,39 +90,45 @@ ORDER BY processs</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Users" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [Users] WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)))</CommandText>
<CommandText>DELETE FROM [Users] WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_id" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT Users.id, Users.name
<CommandText>SELECT Users.id, Users.name, Users.gcode
FROM Users RIGHT OUTER JOIN
JobReport ON Users.id = JobReport.uid
WHERE (Users.processs LIKE @process) AND (Users.id &lt;&gt; 'dev') AND (Users.id &lt;&gt; 'test')
GROUP BY Users.id, Users.name
WHERE (Users.processs LIKE @process) AND (Users.id &lt;&gt; 'dev') AND (Users.id &lt;&gt; 'test') AND (Users.gcode = @gcode)
GROUP BY Users.id, Users.name, Users.gcode
ORDER BY Users.name</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="processs" DataSourceName="EE.dbo.Users" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@process" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="processs" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Users" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [Users] SET [id] = @id, [name] = @name WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)));
SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name ORDER BY Users.name</CommandText>
<CommandText>UPDATE [Users] SET [id] = @id, [name] = @name, [gcode] = @gcode WHERE (((@IsNull_id = 1 AND [id] IS NULL) OR ([id] = @Original_id)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)));
SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport ON Users.id = JobReport.uid WHERE (JobReport.idx = @idx) AND (Users.id = @id) GROUP BY Users.id, Users.name, Users.gcode ORDER BY Users.name</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_id" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_id" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="id" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
@@ -132,6 +138,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
<Mappings>
<Mapping SourceColumn="id" DataSetColumn="id" />
<Mapping SourceColumn="name" DataSetColumn="name" />
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
</Mappings>
<Sources />
</TableAdapter>
@@ -143,7 +150,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
<xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent">
<xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_RowClassName="jobReportRow">
<xs:complexType>
<xs:sequence>
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
@@ -173,7 +180,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_RowClassName="JobReportDayRow">
<xs:complexType>
<xs:sequence>
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
@@ -209,7 +216,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent">
<xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_RowClassName="ProcessListRow">
<xs:complexType>
<xs:sequence>
<xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
@@ -222,7 +229,7 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent">
<xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_RowClassName="ProcessUserListRow">
<xs:complexType>
<xs:sequence>
<xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
@@ -239,10 +246,17 @@ SELECT Users.id, Users.name FROM Users RIGHT OUTER JOIN JobReport ON Users.id =
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_RowClassName="PartSummaryRow" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent">
<xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent" msprop:Generator_RowClassName="PartSummaryRow">
<xs:complexType>
<xs:sequence>
<xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" />

View File

@@ -9,7 +9,7 @@
<Shape ID="DesignTable:jobReport" ZOrder="5" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="4" X="335" Y="164" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="3" X="587" Y="65" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="2" X="619" Y="303" Height="115" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="2" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:PartSummary" ZOrder="1" X="852" Y="79" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
</Shapes>
<Connectors />