업무일지 입력창을 rtf 로 변경

This commit is contained in:
chi
2020-05-19 10:43:16 +09:00
parent 0daf284264
commit 117d7a3ba2
24 changed files with 9614 additions and 9364 deletions

View File

@@ -48,7 +48,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<OutputPath>..\..\..\..\Amkor\GroupWare\</OutputPath>
<OutputPath>..\..\..\..\..\Amkor\GroupWare\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

View File

@@ -1,4 +1,5 @@
200512 chi 구매내역 엑셀 반입 기능 추가
200519 chi 업무일지 그림 넣기 가능하게
200512 chi 구매내역 엑셀 반입 기능 추가
200106 chi 구매내역목록에서 정렬 기능 추가 (등록일,완료일,S/C)
업무일지 및 프로젝트에 담당자 공정추가하고 해당 공정별 데이터 분리 작업
업무일지 기록 시간 출력물 2번을 제외한 1,3번 숨김

BIN
Project/sample_purchase.xls Normal file

Binary file not shown.

View File

@@ -30,17 +30,17 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItems));
FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.CurrencyCellType currencyCellType1 = new FarPoint.Win.Spread.CellType.CurrencyCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.ComboBoxCellType comboBoxCellType1 = new FarPoint.Win.Spread.CellType.ComboBoxCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.CurrencyCellType currencyCellType3 = new FarPoint.Win.Spread.CellType.CurrencyCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.ComboBoxCellType comboBoxCellType3 = new FarPoint.Win.Spread.CellType.ComboBoxCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bs = new System.Windows.Forms.BindingSource(this.components);
@@ -115,6 +115,8 @@
this.taPurchase = new FCM0000.dsMSSQLTableAdapters.PurchaseTableAdapter();
this.bsStaff = new System.Windows.Forms.BindingSource(this.components);
this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter();
this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
this.tbSearch = new System.Windows.Forms.ToolStripTextBox();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -385,6 +387,8 @@
this.toolStripLabel4,
this.cmbSort,
this.toolStripSeparator3,
this.toolStripLabel6,
this.tbSearch,
this.toolStripButton2,
this.toolStripButton1});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
@@ -443,8 +447,7 @@
"sid",
"sid,name",
"name",
"cate"
});
"cate"});
this.cmbSort.Name = "cmbSort";
this.cmbSort.Size = new System.Drawing.Size(100, 37);
this.cmbSort.SelectedIndexChanged += new System.EventHandler(this.cmbSort_SelectedIndexChanged);
@@ -509,89 +512,89 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "공급처";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 42F;
this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType1.DecimalPlaces = 0;
numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType1.MaximumValue = 2147483647D;
numberCellType1.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
numberCellType5.DecimalPlaces = 0;
numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType5.MaximumValue = 2147483647D;
numberCellType5.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX";
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Width = 88F;
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType15;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "분류";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType16;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "품명";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType17;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID#";
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType18;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "model";
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F;
currencyCellType1.DecimalPlaces = 0;
currencyCellType1.MaximumValue = new decimal(new int[] {
currencyCellType3.DecimalPlaces = 0;
currencyCellType3.MaximumValue = new decimal(new int[] {
10000000,
0,
0,
0});
currencyCellType1.MinimumValue = new decimal(new int[] {
currencyCellType3.MinimumValue = new decimal(new int[] {
10000000,
0,
0,
-2147483648});
currencyCellType1.NegativeRed = true;
currencyCellType1.NullDisplay = "--";
currencyCellType1.Separator = ",";
currencyCellType1.ShowSeparator = true;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType1;
currencyCellType3.NegativeRed = true;
currencyCellType3.NullDisplay = "--";
currencyCellType3.Separator = ",";
currencyCellType3.ShowSeparator = true;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType3;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "price";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "매입가";
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Width = 123F;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType19;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "manu";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "제조사";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F;
numberCellType2.MaximumValue = 999999999999999D;
numberCellType2.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2;
numberCellType6.MaximumValue = 999999999999999D;
numberCellType6.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType6;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "scale";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "규격";
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Width = 84F;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType20;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "unit";
this.fpSpread1_Sheet1.Columns.Get(8).Label = "단위";
this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType21;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "supply";
this.fpSpread1_Sheet1.Columns.Get(9).Tag = "supplyname";
this.fpSpread1_Sheet1.Columns.Get(9).Visible = false;
comboBoxCellType1.AllowEditorVerticalAlign = true;
comboBoxCellType1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
comboBoxCellType1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
comboBoxCellType1.ButtonAlign = FarPoint.Win.ButtonAlign.Right;
comboBoxCellType1.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = comboBoxCellType1;
comboBoxCellType3.AllowEditorVerticalAlign = true;
comboBoxCellType3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
comboBoxCellType3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
comboBoxCellType3.ButtonAlign = FarPoint.Win.ButtonAlign.Right;
comboBoxCellType3.EditorValue = FarPoint.Win.Spread.CellType.EditorValue.ItemData;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = comboBoxCellType3;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supplyidx";
this.fpSpread1_Sheet1.Columns.Get(10).Label = "공급처";
this.fpSpread1_Sheet1.Columns.Get(10).Tag = "supply";
@@ -883,6 +886,20 @@
//
this.taStaff.ClearBeforeFill = true;
//
// toolStripLabel6
//
this.toolStripLabel6.Name = "toolStripLabel6";
this.toolStripLabel6.Size = new System.Drawing.Size(31, 34);
this.toolStripLabel6.Text = "검색";
//
// tbSearch
//
this.tbSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbSearch.Name = "tbSearch";
this.tbSearch.Size = new System.Drawing.Size(100, 37);
this.tbSearch.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSearch_KeyDown);
//
// fItems
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -995,5 +1012,7 @@
private System.Windows.Forms.ToolStripButton toolStripButton6;
private System.Windows.Forms.ToolStripButton toolStripButton9;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripLabel toolStripLabel6;
private System.Windows.Forms.ToolStripTextBox tbSearch;
}
}

View File

@@ -44,7 +44,7 @@ namespace FCM0000
var cy = colSupply.CellType as FarPoint.Win.Spread.CellType.ComboBoxCellType;
List<string> items = new List<string>();
List<string> itemData = new List<string>();
foreach(var item in customData)
foreach (var item in customData)
{
items.Add(item.name);
itemData.Add(item.idx.ToString());
@@ -55,7 +55,7 @@ namespace FCM0000
this.cmbSort.SelectedIndex = 0;
refreshData();
tbSearch.Focus();
}
void cy_EditorValueChanged(object sender, EventArgs e)
@@ -73,9 +73,19 @@ namespace FCM0000
string cateSearch = "%";
if (cmbCate.SelectedIndex > 0) cateSearch = cmbCate.Text;
if (cmbMode.SelectedIndex == 0)
this.ta.FillNoImage(this.dsMSSQL.Items, FCOMMON.info.Login.gcode,cateSearch);
{
var skey = tbSearch.Text.Trim();
if (skey == "") skey = "%";
else
this.ta.FillDupCheck(this.dsMSSQL.Items, FCOMMON.info.Login.gcode,cateSearch);
{
if (skey.StartsWith("%") == false) skey = "%" + skey;
if (skey.EndsWith("%") == false) skey += "%";
}
this.ta.FillNoImage(this.dsMSSQL.Items, FCOMMON.info.Login.gcode, cateSearch,skey);
}
else
this.ta.FillDupCheck(this.dsMSSQL.Items, FCOMMON.info.Login.gcode, cateSearch);
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
}
@@ -85,7 +95,7 @@ namespace FCM0000
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["gcode"] = FCOMMON.info.Login.gcode;
if(this.cmbCate.SelectedIndex > 0) e.Row["cate"] = this.cmbCate.Text.Trim();
if (this.cmbCate.SelectedIndex > 0) e.Row["cate"] = this.cmbCate.Text.Trim();
}
private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
@@ -111,6 +121,12 @@ namespace FCM0000
private void toolStripButton2_Click(object sender, EventArgs e)
{
if (tbSearch.Text.Trim() == "")
{
util.MsgE("검색어를 입력하세요\n\n자료가 많은 관계로 검색어를 입력하세요.\n\n전체 검색을 하려면 %를 입력하세요");
tbSearch.Focus();
return;
}
refreshData();
}
@@ -207,7 +223,7 @@ namespace FCM0000
{
var drv = this.bs.Current as DataRowView;
var img = this.pictureBox1.Image;
if(drv == null)
if (drv == null)
{
this.pictureBox1.Image = null;
}
@@ -216,23 +232,25 @@ namespace FCM0000
var dr = drv.Row as dsMSSQL.ItemsRow;
//이미지 확인
try {
try
{
var img1 = FCOMMON.DBM.GetImageData("Items", "image", dr.idx);
if (img1 != null) this.pictureBox1.Image = img1;
else this.pictureBox1.Image = null;
} catch
}
catch
{
this.pictureBox1.Image = null;
}
//공급처 담당자 정보
if (dr.supply != "") label4.Text = "[" + dr.supply +"] 담당자";
if (dr.supply != "") label4.Text = "[" + dr.supply + "] 담당자";
else label4.Text = "공급처 담당자";
lvSupplyDamdang.Items.Clear();
if (dr.supplyidx != -1)
{
taStaff.FillByCID(this.dsMSSQL.Staff, FCOMMON.info.Login.gcode, dr.supplyidx);
foreach( dsMSSQL.StaffRow item in this.dsMSSQL.Staff)
foreach (dsMSSQL.StaffRow item in this.dsMSSQL.Staff)
{
var name = item.name;
if (item.grade != "") name += "(" + item.grade + ")";
@@ -245,9 +263,9 @@ namespace FCM0000
//최근 입고 데이터 확인 (일자,담당,수량,금액,상태)
var inData = taPurchase.GetInDate(dr.idx);
lvInDate.Items.Clear();
if(inData != null && inData.Rows.Count > 0)
if (inData != null && inData.Rows.Count > 0)
{
foreach( dsMSSQL.PurchaseRow drP in inData.Rows)
foreach (dsMSSQL.PurchaseRow drP in inData.Rows)
{
string date = drP.indate;
if (date.Length > 9) date = date.Substring(2);
@@ -396,5 +414,10 @@ namespace FCM0000
}
}
}
private void tbSearch_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter) toolStripButton2.PerformClick();
}
}
}

View File

@@ -222,22 +222,25 @@
<data name="btFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgvCv4H
o/4Bn9RoDBETzcQgRmjLtrbQVuwFygKloZZud5dLJYZCdxceoAIthDuYlBcDPpVEyNrTTBNjBroD2y/5
MtnZM9+XOWfm7JbogRcm/8nXRuf1d01dVTDCM36lP+53dx9lfMJzryCLgdHUWjSR3h5Z/q3CCM+u7DzT
HnmGEDqClxweDa3BCm+fIilLWzuJX6q6F5WlzR03L8U/tIYr8NKDg/GJj8Lji2sko70YlGZXzazwEEvQ
w+AO3w4pcysk8UIMji38bGAPsHOoKaSXJKqVkHbqmsNBKlTTQpQXN3fgwGFJbfDwUh9JjJZeXhaxZGG8
NLSdDsaS6yQhWsJV03zPq+u/XPv2Y2ObJERLIZHOVNe7r2Lp/YGaO+6NLG8RhWgZW9pSkbWzEkvvjxrj
51IxsZEhCdFSmEhnakwtV7D0/kDIeQpqQxKiZU88tUrVy6H3koRo6RFlHktqA9w/6L0kMa2Ulzf/mNv4
J1hSG6DjuMTDdS6PII1Sd67sgmNGT+9grzxHFC3E0NjCOnWvfmqxnGhsC3FcfEr1R8fV8Ng8UXwvwteJ
6eQfYDltgBNt8H4VOWlKFZSkysWn1QZPKObi4hL0XpJRnlBTSK/BFSrHctqAGM/57E5jEWk6Zwqj0R3q
hwxAreDAuUVZgCsiTKYz8AcCY1BKrUBPhoNEX1NTywUryw9H5JmcKS/NqI0+boB0B2EOmgyyd1bCeOB/
LmTtuGjt4BUhb6rMqGY2MoxstjM4RH/UWryXbX5+ks8agimYm9vD45ABHKI/6uy+G3Z//3TOMLfTpGpj
+UnIAA7RH+8dXbccgWgybwq0B8QJZG69hEP0R62j/Y6jZ3D+P9Nk9vNVikP0x6uPznPNgejcv6YtwWjq
jdV/E4cUB28ZV3lgSNrNm7qyO0ef2DL8unh47HQeZ3zc9+6h+K6zZ2C2rom9i18VH2COTN4yZPGdxVNF
RknJX+KoWsB5oN9wAAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVEhLtVZbTxNBFCZeYrxEjY8++KKiMfHFRAgviv4H
o/4Bn9RoDBETzcQgRmjLtrbQVuyNskBpqKXb2eVSiaHQ3YWHYoAWQpGbCbzU4BMkQtaeZpoYM7S7sP2S
L5OdPfN9mXNmzm6FHnhuChx/ZXRefdvacwdGeCav9Me93t7DjJ9/5uUlITieXo0l17fHln4rMMKzKzfP
dEafIoQOkSUHR7MvVOMdkEU582vne1ZR9qKcye64sZh474vUkKX7B+MXHkYmF1dpRnsxJM6tmFn+AZHQ
DoM7cjMszy/TxEsxNJH52czuY+dQU0gvTVQtIe2aaw4HqVRNS1FayO7AgSOS6uDB4gBNTCu9WBKIZGm8
MHScDMVTazQhrYSrpvqe1zV9vvJ1amObJqSV0eT6Vl2T+zKRLg7U1nV3bGmTKqSV8R+bCrJ21xLp4qg3
fqrEyY0tmpBWwo7rTe2XiHRxIOQ8AbWhCWllXyK9oqmXQ++lCWmlR5AwkVQHuH/Qe2liaiktZf+YO/Bj
IqkO0HFcwsE6l4cXxzV3rtyCI0ZP/3C/NE8VLcXwRGZNc69+YrEca+kIc1xiWgnEJpXIxAJVfC/C14np
xveJnDrAiTZ4vwicOK3wckrhEjNKsyccd3EJEXovzahAqCmk1+AKVxM5dUCM52xup/GoOJM3hdHoDg9C
BqBWcODcgsTDFYH7CX8gMIbE9DL0ZDhI2mtqaj9nZfFoVJrNm2JxVmnxc0O0Owhz0GSQvbsWxn3/cyFr
13lrF5b5gqk8q5jZ6Ciy2U6REP3RYPFetAXwFM4ZgimYmzsjk5ABEqI/Gu3+a/bA4EzeML/TlGJj8RRk
gIToj3eOnhuOYCxVMAXag0ISmX0XSIj+aHB03nL0DS/8Z5rKfb4qSYj+ePnBeaYtGJv/17Q9FEu/tgau
k5Dy4A3jqg6OjO8WTF25naOPbBV5XT48cjqPMn7uW+/I2K6zb2iusZW9TV6VH2COTN4qZPGfJlNlRkXF
XxFnWoqmzzQrAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>389, 10</value>
</metadata>
@@ -282,25 +285,25 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQgSURBVEhLtVdbT1NZGD3RmehPcJyYaLz7PqOJD74anYgo
pqJQLK1SryhWKiA52BmR9gCtThFRURBsvaETVCrFBpC2tFQFNBHvPUXFS5QCo75p7TrsTY9QlcpxJTs9
ybf2t7ov32UzsWLVqrPjl+36b/LK3Pr5K3LrF8blXJ2yiG38hZilhYxtmKUocnObSjsdO8q7AhnH7/ey
Vv7T3pqeUOaxux8SdY4lhCoNZGzjVOUBn3X3yYdvDXXBEGfrGzH+ufgqtEbX8BeZMnbIDS6NpvLBM84W
XZCO4cJyfYsj/XAnP3wkFTi7V+ba4ghtJHCGqQZ3WZ6l571YACvOtAb6t5bdcW80t1tVprajKpO3fL3J
U5vAXvuTTGc2l3bWi+dhaCr4l8mcK5lQogOi+bXPP9JJhrq+kLby0fPUIm+ZLL9hFqF9FSOFgyF5YWst
MUcHtle8Uv2V3lDaQV9zEtc8jVC+i2grzrL436cUuLYRypfARRo804io0th2YfHWugmEMipQYa2VDxZc
7h0S11R0dUddgMrkOU0vErY37d8bTbGKAhDGmSYVtCjV5nY3FYZPVbGvitAGsVbnmI2QoSScaSzbK8ba
/c6mJM61Gt/LdU1z4Yv61VQ8eZmos88UiICCc3M0TvGrKPYeJqaYEae1TSWfAlRG7/FISIZ9hxMRMTEM
MhL9VzkW/8AK8b8aIxAJmRZ/P/W/saTDLhgQt0iD1LCttMMlGCTElkO3PdQ/tITcvjT70u9ZlU/6qEFt
vnWa8CWD+uCtM9R/VqW/D0WGiWftC/bWBIYSRqrRV0b4kgE+qX8Ul/hs+wIG5S2vhv+pwutNbUeo/7zz
/Mf43Lo/hK0WH36a2Sf9Vpe0n6P+UVKXaC5PYjZsuPGr+HLhIhC+ZBBfroyj9/y40IJBfaj9GjVkWvh+
KcMpkW2ck2MJDFD/m0o7GogpfPiFnkJxkCPoiUnA8KQQC5TF3mPi5CTnXHpiYpiEPY7ZO6sev6b/Cmku
Yd/1ebAh/SENCsQYgZZJW3X/BfWbUf34TUL+1RnEPAil0WtFIqekcJFwJe5vku+qftiDxE9oo0Y4SUyE
j4jPIKpdNTFHIDM4pu84cfcpFUZJ01r4IL5jFYaowuipRWml/nae6OqWhTtSQvkSKXqnOq8m8D8l0xGL
MLZXbb7pFIuy5/l38sKWdEKJjpSi1kuRizZ6YZnOPldZ5C3HmYqPDG1UCuf8drVL1jfLcKZiUQyxMBo7
NHho9NDwqUs6ziBO91j4AXp76cBKIToUt9GA1hMtaLTWFC0roTFoZdHSigVGjmBIEz7TZEPLdjJt7PiW
MFaMkFEY20599SL9KPBcwbMFzxdUGuTe9PIuHtlvHdeql/3tmE6o0gJFHA81PNhQ2eKzbb+xLDuOmEcJ
hvkMi1v0OLU4S10AAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQkSURBVEhLtVdbT1NZGD3RMeNP8BITjbfRdy/JPPhq1Ayi
mA4KxdIq1VHwUqmC5GAdkfYA7WgRGayCQKujqEGHSrEBpC0tVYHRiI7SFlS8RCng5c2pXYe96RGqQ+W4
kp2e5Fv7W92X77KZWLFhw1+Tf9l3Zcb6nPpl63Lqf47Lvj5rBdv4AzGLCwnbsEBW6OK2l3Tad5u6enaZ
Hvaz1b7/DtX0hTLL7n1I1NhXEao4kLCNs+V/eC37zz56o6sLhjjrwJjx++WXoY2ahjVkysQh1TlVqop/
n3LW6IJ0jBaWalvsGSc7A6NHUr6jd32ONY7QxgJnmKpzleZW970XCmDFmZaewZ2ld13bjO0WhaGtTGHw
mLYY3LUJ7I2lZDrzW0lnvXAehqo88CKZcyYTSnRANK/2yUc6SVc3EFJXPH6WWugpleQ1LCC0L2KscDAk
LWitJebowPYKV6r9uz+UdszbnMQ1zyGU/0W0Fauru9+n5DvTCeVz4CINn2lEVK5vu7RyZ92PhDIuUGG1
JRDMv9Y/Iq4q7+qNugCFwX2OXiRsb9rxW02xigIQxpkm5bfIlcZ2FxWGT0WRt5LQhrFJY1+IkKEknGks
2yvEpqOOpiTO+Su+12qaFsEX9asq971I1Njm80RAxrk4Gqf4lRV5ThJTzIhTW2eTTx4Kved0JCTDvsOJ
iJgYBhmJ/qtss39onfBfTRCIhEyzf5D631bcYeMNiFukQWpIL+lw8gYRsePEP27qH1p8bl+ddXXmgQrf
ADUojXfOEb5oUB67c576P1DhH0CRYeJZ2/JDNf6RhJGq95YSvmiAT+ofxSU+y7acQXnLrfF9V+EthrY/
qf/ci76P8Tl1S/itFh5+mtEr/lYXt1+g/lFSV6muTWO2br01RXi5cBEIXzQIL9eesgd+XGjeoDzRfoMa
Ms2BQTHDKZFt/Cnb3DNE/W8v6WggpvDhF7gLhEGOoCcmHqOTQiyQF3lOCZOTlHNqiYlhEg7aF+6t7H5F
/xXSXMKRm4thQ/pDGuSJMQItk7ry4XPqd09V9+uEvOvziHkYcr3HgkROSeEi4Uw82iTdV/WoD4mf0MaN
cJKYCh8Rn0FUuypijkCis8/dfeb+EyqMkqY2B4L4jlUYojK9uxallfrbe6arVxLuSAnlc6RoHcrcGv9b
SqYjFmFsr9J42yEUZS/63kkLWjIIJTpSCluvRi7a+IUlGtsieaHHhDMVHhnaqBTO8fVql6xtluBMhaIY
QmE0dmjw0Oih4VMWd5xHnB40B4bo7aUDK4XoSNxGA1pPtKDRWlO0rITGoJVFSysUGDuCIVX4TJN1LbvI
tInja8JYMUJGpm+r/uJF+lbguYJnC54vqDTIvRmmrgCy32auVSs5bJ9LqOICRRwPNTzYUNnis6zTWZad
RMzjBMN8Aik29AY1BJE5AAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -319,6 +322,9 @@
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>193, 56</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>193, 56</value>
</metadata>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -345,7 +351,7 @@
<data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKQSURBVDhPzZLbSptBFIX/Nyj0MTxcSAwiihoRBS9EQVQ0
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKPSURBVDhPzZLbSptBFIX/Nyj0MTxcSAwiihoRBS9EQVQ0
5GRiDqhBUREJRqlR8RgSczZJaRpBQREqTRUpXlijIBKlMbFVaPsGpVDohX6d/6f0FdqBxczArLXX2nuk
/2OFQiHP+vp6dmlpKbewsHDtdrtvJycn70dGRr4ODQ19m5iYuF9cXPT+eS719vaqOjs7nyuXSCTyLBwO
c3Fxwfn5OWdnZ5yenhLzu/n15TU/3mvwuOz4/T4GBwd1Wq32uwACT319fWpJVPi8t7fHzc0N+/v7pFIp
@@ -355,8 +361,8 @@
v8ORvMOeuMMSK6IP35JOp+nq6lLiLC8v093dzfj4ONXV1Ugmk4m1tTWy2awiYBGVZbLj5R3WeBFTtKA4
bG9vVxrq8Xhoa2tjeHiYqqoqJIPBgJg9h4eHmIM5jNEi1k0BQR4Quy16xcrKCq2trUSjUWZmZmhpaVGm
oVarkeRs09PTirVA+p0QucIQFdlFH2yRK174U4h5o9FoCAQCSvbGxkbMZjMqlQpJzuN0OpW5Tk1NKXbl
Tvv9fubn5+np6VHGJRO8Xi9jY2MYjUbEb6SiogJJ2HEKpZ/CzmNzc/NTU1OTUq2+vp7a2loqKyufysvL
H8vKyh5LS0v/oqSkRMZb5Tv/wyVJvwHWadHUEgctIgAAAABJRU5ErkJggg==
Tvv9fubn5+np6VHGJRO8Xi9jY2MYjUbEb6SiogJJ2HGKw09h57G5ufmpqalJqVZfX09tbS2VlZVP5eXl
j2VlZY+lpaV/UVJSIuOt8p3/4ZKk39H70c7Xi4MHAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="taPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -9859,12 +9859,17 @@ ORDER BY sid, name, idx";
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, n" +
"ame, price, scale, sid, supply, supplyidx, unit, wdate, wuid\r\nFROM Items\r\nWH" +
"ERE (gcode = @code) AND (ISNULL(cate, \'\') LIKE @cate)\r\nORDER BY name, idx";
this._commandCollection[4].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid
FROM Items
WHERE (gcode = @code) AND (ISNULL(cate, N'') LIKE @cate) AND (ISNULL(name, N'') LIKE @search OR
ISNULL(model, N'') LIKE @search OR
ISNULL(sid, N'') LIKE @search OR
ISNULL(manu, N'') LIKE @search)
ORDER BY name, idx";
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].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[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(sid, N'') LIKE @search OR ISNULL(manu, N'') LIKE @search OR ISNULL(supply, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) ORDER BY name, idx";
@@ -9976,7 +9981,7 @@ ORDER BY sid, name, idx";
[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, false)]
public virtual int FillNoImage(dsMSSQL.ItemsDataTable dataTable, string code, string cate) {
public virtual int FillNoImage(dsMSSQL.ItemsDataTable dataTable, string code, string cate, string search) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((code == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -9990,6 +9995,12 @@ ORDER BY sid, name, idx";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cate));
}
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(search));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -10001,7 +10012,7 @@ ORDER BY sid, name, idx";
[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, false)]
public virtual dsMSSQL.ItemsDataTable GetNoImage(string code, string cate) {
public virtual dsMSSQL.ItemsDataTable GetNoImage(string code, string cate, string search) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((code == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -10015,6 +10026,12 @@ ORDER BY sid, name, idx";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(cate));
}
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(search));
}
dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable();
this.Adapter.Fill(dataTable);
return dataTable;

View File

@@ -167,11 +167,15 @@ ORDER BY sid, name, idx</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid
FROM Items
WHERE (gcode = @code) AND (ISNULL(cate, '') LIKE @cate)
WHERE (gcode = @code) AND (ISNULL(cate, N'') LIKE @cate) AND (ISNULL(name, N'') LIKE @search OR
ISNULL(model, N'') LIKE @search OR
ISNULL(sid, N'') LIKE @search OR
ISNULL(manu, N'') LIKE @search)
ORDER BY name, idx</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="code" ColumnName="gcode" DataSourceName="GroupWare.dbo.Items" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@code" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="code" ColumnName="gcode" DataSourceName="EE.dbo.Items" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@code" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="cate" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="search" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="String" Direction="Input" ParameterName="@search" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -1419,7 +1423,7 @@ ORDER BY pdate</CommandText>
<xs:element name="dsMSSQL" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsMSSQL" msprop:Generator_UserDSName="dsMSSQL">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_RowClassName="ItemsRow" msprop:Generator_UserTableName="Items" msprop:Generator_RowEvArgName="ItemsRowChangeEvent">
<xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_UserTableName="Items" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_RowEvArgName="ItemsRowChangeEvent" msprop:Generator_RowClassName="ItemsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1510,7 +1514,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Common" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_TableVarName="tableCommon" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_TablePropName="Common" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_RowClassName="CommonRow" msprop:Generator_UserTableName="Common" msprop:Generator_RowEvArgName="CommonRowChangeEvent">
<xs:element name="Common" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_TableVarName="tableCommon" msprop:Generator_TablePropName="Common" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_UserTableName="Common" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_RowEvArgName="CommonRowChangeEvent" msprop:Generator_RowClassName="CommonRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1562,7 +1566,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_RowClassName="BoardRow" msprop:Generator_UserTableName="Board" msprop:Generator_RowEvArgName="BoardRowChangeEvent">
<xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_UserTableName="Board" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_RowEvArgName="BoardRowChangeEvent" msprop:Generator_RowClassName="BoardRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1630,7 +1634,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="RequestItem" msprop:Generator_TableClassName="RequestItemDataTable" msprop:Generator_TableVarName="tableRequestItem" msprop:Generator_RowChangedName="RequestItemRowChanged" msprop:Generator_TablePropName="RequestItem" msprop:Generator_RowDeletingName="RequestItemRowDeleting" msprop:Generator_RowChangingName="RequestItemRowChanging" msprop:Generator_RowEvHandlerName="RequestItemRowChangeEventHandler" msprop:Generator_RowDeletedName="RequestItemRowDeleted" msprop:Generator_RowClassName="RequestItemRow" msprop:Generator_UserTableName="RequestItem" msprop:Generator_RowEvArgName="RequestItemRowChangeEvent">
<xs:element name="RequestItem" msprop:Generator_TableClassName="RequestItemDataTable" msprop:Generator_TableVarName="tableRequestItem" msprop:Generator_TablePropName="RequestItem" msprop:Generator_RowDeletingName="RequestItemRowDeleting" msprop:Generator_RowChangingName="RequestItemRowChanging" msprop:Generator_RowEvHandlerName="RequestItemRowChangeEventHandler" msprop:Generator_RowDeletedName="RequestItemRowDeleted" msprop:Generator_UserTableName="RequestItem" msprop:Generator_RowChangedName="RequestItemRowChanged" msprop:Generator_RowEvArgName="RequestItemRowChangeEvent" msprop:Generator_RowClassName="RequestItemRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1719,7 +1723,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Customs" msprop:Generator_TableClassName="CustomsDataTable" msprop:Generator_TableVarName="tableCustoms" msprop:Generator_RowChangedName="CustomsRowChanged" msprop:Generator_TablePropName="Customs" msprop:Generator_RowDeletingName="CustomsRowDeleting" msprop:Generator_RowChangingName="CustomsRowChanging" msprop:Generator_RowEvHandlerName="CustomsRowChangeEventHandler" msprop:Generator_RowDeletedName="CustomsRowDeleted" msprop:Generator_RowClassName="CustomsRow" msprop:Generator_UserTableName="Customs" msprop:Generator_RowEvArgName="CustomsRowChangeEvent">
<xs:element name="Customs" msprop:Generator_TableClassName="CustomsDataTable" msprop:Generator_TableVarName="tableCustoms" msprop:Generator_TablePropName="Customs" msprop:Generator_RowDeletingName="CustomsRowDeleting" msprop:Generator_RowChangingName="CustomsRowChanging" msprop:Generator_RowEvHandlerName="CustomsRowChangeEventHandler" msprop:Generator_RowDeletedName="CustomsRowDeleted" msprop:Generator_UserTableName="Customs" msprop:Generator_RowChangedName="CustomsRowChanged" msprop:Generator_RowEvArgName="CustomsRowChangeEvent" msprop:Generator_RowClassName="CustomsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1832,7 +1836,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Staff" msprop:Generator_TableClassName="StaffDataTable" msprop:Generator_TableVarName="tableStaff" msprop:Generator_RowChangedName="StaffRowChanged" msprop:Generator_TablePropName="Staff" msprop:Generator_RowDeletingName="StaffRowDeleting" msprop:Generator_RowChangingName="StaffRowChanging" msprop:Generator_RowEvHandlerName="StaffRowChangeEventHandler" msprop:Generator_RowDeletedName="StaffRowDeleted" msprop:Generator_RowClassName="StaffRow" msprop:Generator_UserTableName="Staff" msprop:Generator_RowEvArgName="StaffRowChangeEvent">
<xs:element name="Staff" msprop:Generator_TableClassName="StaffDataTable" msprop:Generator_TableVarName="tableStaff" msprop:Generator_TablePropName="Staff" msprop:Generator_RowDeletingName="StaffRowDeleting" msprop:Generator_RowChangingName="StaffRowChanging" msprop:Generator_RowEvHandlerName="StaffRowChangeEventHandler" msprop:Generator_RowDeletedName="StaffRowDeleted" msprop:Generator_UserTableName="Staff" msprop:Generator_RowChangedName="StaffRowChanged" msprop:Generator_RowEvArgName="StaffRowChangeEvent" msprop:Generator_RowClassName="StaffRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1897,7 +1901,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_RowClassName="PurchaseRow" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent">
<xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent" msprop:Generator_RowClassName="PurchaseRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -2038,7 +2042,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="ddate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ddate" msprop:Generator_ColumnVarNameInTable="columnddate" msprop:Generator_ColumnPropNameInTable="ddateColumn" msprop:Generator_UserColumnName="ddate" minOccurs="0">
@@ -2137,7 +2141,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -2167,7 +2171,7 @@ ORDER BY pdate</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="InventoryUser" msprop:Generator_TableClassName="InventoryUserDataTable" msprop:Generator_TableVarName="tableInventoryUser" msprop:Generator_TablePropName="InventoryUser" msprop:Generator_RowDeletingName="InventoryUserRowDeleting" msprop:Generator_RowChangingName="InventoryUserRowChanging" msprop:Generator_RowEvHandlerName="InventoryUserRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryUserRowDeleted" msprop:Generator_UserTableName="InventoryUser" msprop:Generator_RowChangedName="InventoryUserRowChanged" msprop:Generator_RowEvArgName="InventoryUserRowChangeEvent" msprop:Generator_RowClassName="InventoryUserRow">
<xs:element name="InventoryUser" msprop:Generator_TableClassName="InventoryUserDataTable" msprop:Generator_TableVarName="tableInventoryUser" msprop:Generator_RowChangedName="InventoryUserRowChanged" msprop:Generator_TablePropName="InventoryUser" msprop:Generator_RowDeletingName="InventoryUserRowDeleting" msprop:Generator_RowChangingName="InventoryUserRowChanging" msprop:Generator_RowEvHandlerName="InventoryUserRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryUserRowDeleted" msprop:Generator_RowClassName="InventoryUserRow" msprop:Generator_UserTableName="InventoryUser" msprop:Generator_RowEvArgName="InventoryUserRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />

View File

@@ -267,20 +267,21 @@ namespace FCOMMON
/// <param name="ProjectIdx"></param>
/// <param name="Message"></param>
/// <returns></returns>
public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message)
public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message,string rtf)
{
var cn = getCn();
cn.Open();
string sql =
"insert into ProjectsHistory(pidx,pdate,remark,wuid,wdate)" +
" values(@pidx,@pdate,@remark,@wuid,@wdate)";
"insert into ProjectsHistory(pidx,pdate,remark,remark2,wuid,wdate)" +
" values(@pidx,@pdate,@remark,@remark2,@wuid,@wdate)";
var cmd = new SqlCommand(sql, cn);
cmd.Parameters.Add(new SqlParameter("pidx", ProjectIdx));
cmd.Parameters.Add(new SqlParameter("pdate", pdate));
cmd.Parameters.Add(new SqlParameter("remark", Message));
cmd.Parameters.Add(new SqlParameter("remark2", rtf));
cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no));
cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now));
var cnt = cmd.ExecuteNonQuery();

View File

@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FPJ0000</RootNamespace>
<AssemblyName>FPJ0000</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
@@ -21,6 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="ArSetting.Net4">
@@ -57,6 +60,9 @@
<EmbedInteropTypes>False</EmbedInteropTypes>
<Private>True</Private>
</Reference>
<Reference Include="NetSpell.SpellChecker, Version=2.1.7.41329, Culture=neutral, PublicKeyToken=318b389f0db66e46">
<HintPath>..\..\packages\NetSpell.2.1.7\lib\NetSpell.SpellChecker.dll</HintPath>
</Reference>
<Reference Include="OfficeApi, Version=1.7.3.0, Culture=neutral, PublicKeyToken=a39beb0835c43c8e, processorArchitecture=MSIL">
<HintPath>..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\OfficeApi.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
@@ -67,6 +73,12 @@
<EmbedInteropTypes>False</EmbedInteropTypes>
<Private>True</Private>
</Reference>
<Reference Include="PrintRichTextBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\RichTextBoxEx.1.0.0\lib\PrintRichTextBox.dll</HintPath>
</Reference>
<Reference Include="RichTextBoxEx, Version=1.0.6541.36291, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\RichTextBoxEx.1.0.0\lib\RichTextBoxEx.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
@@ -439,6 +451,14 @@
<ItemGroup>
<None Include="Resources\action_refresh.gif" />
</ItemGroup>
<ItemGroup>
<Content Include="editform.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="hcwgenericclasses.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

View File

@@ -32,11 +32,13 @@
System.Windows.Forms.Label hrsLabel;
System.Windows.Forms.Label typeLabel;
System.Windows.Forms.Label label1;
System.Windows.Forms.Label label2;
System.Windows.Forms.Label projectLabel;
System.Windows.Forms.Label label4;
System.Windows.Forms.Label stateLabel;
System.Windows.Forms.Label label5;
System.Windows.Forms.Label label3;
System.Windows.Forms.Label label6;
System.Windows.Forms.Label label2;
this.lbSummary = new System.Windows.Forms.Label();
this.tbHrs = new System.Windows.Forms.TextBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
@@ -46,7 +48,6 @@
this.lbIndex = new System.Windows.Forms.ToolStripStatusLabel();
this.cmbType = new System.Windows.Forms.ComboBox();
this.btSave = new System.Windows.Forms.Button();
this.tbDescription = new System.Windows.Forms.TextBox();
this.dtPdate = new System.Windows.Forms.DateTimePicker();
this.cmbUser = new System.Windows.Forms.ComboBox();
this.tbProjectIndex = new System.Windows.Forms.TextBox();
@@ -60,69 +61,65 @@
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.chkAutoAdd = new System.Windows.Forms.CheckBox();
this.tbProject = new System.Windows.Forms.ComboBox();
this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
this.panel1 = new System.Windows.Forms.Panel();
hrsLabel = new System.Windows.Forms.Label();
typeLabel = new System.Windows.Forms.Label();
label1 = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
projectLabel = new System.Windows.Forms.Label();
label4 = new System.Windows.Forms.Label();
stateLabel = new System.Windows.Forms.Label();
label5 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
this.statusStrip1.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// hrsLabel
//
hrsLabel.AutoSize = true;
hrsLabel.Location = new System.Drawing.Point(18, 162);
hrsLabel.Location = new System.Drawing.Point(15, 98);
hrsLabel.Name = "hrsLabel";
hrsLabel.Size = new System.Drawing.Size(115, 12);
hrsLabel.Size = new System.Drawing.Size(53, 12);
hrsLabel.TabIndex = 16;
hrsLabel.Text = "근무시간 / 초과시간";
hrsLabel.Text = "근무시간";
//
// typeLabel
//
typeLabel.AutoSize = true;
typeLabel.Location = new System.Drawing.Point(18, 129);
typeLabel.Location = new System.Drawing.Point(374, 65);
typeLabel.Name = "typeLabel";
typeLabel.Size = new System.Drawing.Size(115, 12);
typeLabel.Size = new System.Drawing.Size(53, 12);
typeLabel.TabIndex = 13;
typeLabel.Text = "업무형태 / 업무분류";
typeLabel.Text = "업무형태";
//
// label1
//
label1.AutoSize = true;
label1.Location = new System.Drawing.Point(30, 100);
label1.Location = new System.Drawing.Point(15, 65);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(103, 12);
label1.Size = new System.Drawing.Size(53, 12);
label1.TabIndex = 10;
label1.Text = "요청부서 / 패키지";
//
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(76, 190);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(57, 12);
label2.TabIndex = 18;
label2.Text = "진행 내용";
label1.Text = "요청부서";
//
// projectLabel
//
projectLabel.AutoSize = true;
projectLabel.Location = new System.Drawing.Point(30, 73);
projectLabel.Location = new System.Drawing.Point(15, 39);
projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
projectLabel.Name = "projectLabel";
projectLabel.Size = new System.Drawing.Size(103, 12);
projectLabel.Size = new System.Drawing.Size(53, 12);
projectLabel.TabIndex = 7;
projectLabel.Text = "프로젝트 (아이템)";
projectLabel.Text = "프로젝트";
//
// label4
//
label4.AutoSize = true;
label4.Location = new System.Drawing.Point(92, 46);
label4.Location = new System.Drawing.Point(531, 12);
label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label4.Name = "label4";
label4.Size = new System.Drawing.Size(41, 12);
@@ -132,7 +129,7 @@
// stateLabel
//
stateLabel.AutoSize = true;
stateLabel.Location = new System.Drawing.Point(388, 18);
stateLabel.Location = new System.Drawing.Point(320, 12);
stateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
stateLabel.Name = "stateLabel";
stateLabel.Size = new System.Drawing.Size(29, 12);
@@ -142,18 +139,36 @@
// label5
//
label5.AutoSize = true;
label5.Location = new System.Drawing.Point(92, 18);
label5.Location = new System.Drawing.Point(27, 12);
label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label5.Name = "label5";
label5.Size = new System.Drawing.Size(41, 12);
label5.TabIndex = 0;
label5.Text = "등록일";
//
// label3
//
label3.AutoSize = true;
label3.Location = new System.Drawing.Point(188, 65);
label3.Name = "label3";
label3.Size = new System.Drawing.Size(41, 12);
label3.TabIndex = 10;
label3.Text = "패키지";
//
// label6
//
label6.AutoSize = true;
label6.Location = new System.Drawing.Point(582, 65);
label6.Name = "label6";
label6.Size = new System.Drawing.Size(53, 12);
label6.TabIndex = 13;
label6.Text = "업무분류";
//
// lbSummary
//
this.lbSummary.AutoSize = true;
this.lbSummary.ForeColor = System.Drawing.Color.SlateGray;
this.lbSummary.Location = new System.Drawing.Point(309, 156);
this.lbSummary.Location = new System.Drawing.Point(298, 92);
this.lbSummary.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSummary.Name = "lbSummary";
this.lbSummary.Size = new System.Drawing.Size(195, 24);
@@ -164,7 +179,7 @@
//
this.tbHrs.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hrs", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
this.tbHrs.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbHrs.Location = new System.Drawing.Point(141, 151);
this.tbHrs.Location = new System.Drawing.Point(72, 88);
this.tbHrs.Name = "tbHrs";
this.tbHrs.Size = new System.Drawing.Size(77, 33);
this.tbHrs.TabIndex = 17;
@@ -185,9 +200,9 @@
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1,
this.lbIndex});
this.statusStrip1.Location = new System.Drawing.Point(0, 443);
this.statusStrip1.Location = new System.Drawing.Point(0, 659);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(538, 22);
this.statusStrip1.Size = new System.Drawing.Size(969, 22);
this.statusStrip1.TabIndex = 28;
this.statusStrip1.Text = "statusStrip1";
//
@@ -207,36 +222,26 @@
//
this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbType.FormattingEnabled = true;
this.cmbType.Location = new System.Drawing.Point(141, 123);
this.cmbType.Location = new System.Drawing.Point(431, 61);
this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(183, 20);
this.cmbType.Size = new System.Drawing.Size(142, 20);
this.cmbType.TabIndex = 14;
this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
//
// btSave
//
this.btSave.Location = new System.Drawing.Point(141, 376);
this.btSave.BackColor = System.Drawing.Color.SkyBlue;
this.btSave.Location = new System.Drawing.Point(829, 6);
this.btSave.Name = "btSave";
this.btSave.Size = new System.Drawing.Size(381, 43);
this.btSave.Size = new System.Drawing.Size(133, 115);
this.btSave.TabIndex = 20;
this.btSave.Text = "확인";
this.btSave.UseVisualStyleBackColor = true;
this.btSave.UseVisualStyleBackColor = false;
this.btSave.Click += new System.EventHandler(this.button1_Click);
//
// tbDescription
//
this.tbDescription.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true));
this.tbDescription.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.tbDescription.Location = new System.Drawing.Point(141, 190);
this.tbDescription.Multiline = true;
this.tbDescription.Name = "tbDescription";
this.tbDescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.tbDescription.Size = new System.Drawing.Size(381, 181);
this.tbDescription.TabIndex = 19;
//
// dtPdate
//
this.dtPdate.Location = new System.Drawing.Point(141, 14);
this.dtPdate.Location = new System.Drawing.Point(73, 8);
this.dtPdate.Margin = new System.Windows.Forms.Padding(4);
this.dtPdate.Name = "dtPdate";
this.dtPdate.Size = new System.Drawing.Size(178, 21);
@@ -250,16 +255,16 @@
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbUser.FormattingEnabled = true;
this.cmbUser.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.cmbUser.Location = new System.Drawing.Point(141, 42);
this.cmbUser.Location = new System.Drawing.Point(588, 8);
this.cmbUser.Margin = new System.Windows.Forms.Padding(4);
this.cmbUser.Name = "cmbUser";
this.cmbUser.Size = new System.Drawing.Size(381, 20);
this.cmbUser.Size = new System.Drawing.Size(234, 20);
this.cmbUser.TabIndex = 6;
this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
//
// tbProjectIndex
//
this.tbProjectIndex.Location = new System.Drawing.Point(458, 69);
this.tbProjectIndex.Location = new System.Drawing.Point(758, 35);
this.tbProjectIndex.Margin = new System.Windows.Forms.Padding(4);
this.tbProjectIndex.Name = "tbProjectIndex";
this.tbProjectIndex.ReadOnly = true;
@@ -273,7 +278,7 @@
this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true));
this.tbOt.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbOt.ForeColor = System.Drawing.Color.Red;
this.tbOt.Location = new System.Drawing.Point(224, 151);
this.tbOt.Location = new System.Drawing.Point(213, 88);
this.tbOt.Name = "tbOt";
this.tbOt.Size = new System.Drawing.Size(77, 33);
this.tbOt.TabIndex = 17;
@@ -281,7 +286,7 @@
//
// tbWW
//
this.tbWW.Location = new System.Drawing.Point(321, 14);
this.tbWW.Location = new System.Drawing.Point(253, 8);
this.tbWW.Margin = new System.Windows.Forms.Padding(4);
this.tbWW.Name = "tbWW";
this.tbWW.ReadOnly = true;
@@ -294,37 +299,37 @@
//
this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbProcess.FormattingEnabled = true;
this.cmbProcess.Location = new System.Drawing.Point(339, 123);
this.cmbProcess.Location = new System.Drawing.Point(641, 61);
this.cmbProcess.Name = "cmbProcess";
this.cmbProcess.Size = new System.Drawing.Size(183, 20);
this.cmbProcess.Size = new System.Drawing.Size(181, 20);
this.cmbProcess.TabIndex = 15;
//
// cmbState
//
this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.cmbState.FormattingEnabled = true;
this.cmbState.Location = new System.Drawing.Point(421, 14);
this.cmbState.Location = new System.Drawing.Point(353, 8);
this.cmbState.Margin = new System.Windows.Forms.Padding(4);
this.cmbState.Name = "cmbState";
this.cmbState.Size = new System.Drawing.Size(101, 20);
this.cmbState.Size = new System.Drawing.Size(160, 20);
this.cmbState.TabIndex = 4;
//
// cmbPackage
//
this.cmbPackage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPackage.FormattingEnabled = true;
this.cmbPackage.Location = new System.Drawing.Point(339, 97);
this.cmbPackage.Location = new System.Drawing.Point(235, 61);
this.cmbPackage.Name = "cmbPackage";
this.cmbPackage.Size = new System.Drawing.Size(183, 20);
this.cmbPackage.Size = new System.Drawing.Size(131, 20);
this.cmbPackage.TabIndex = 12;
//
// cmbRequest
//
this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbRequest.FormattingEnabled = true;
this.cmbRequest.Location = new System.Drawing.Point(141, 97);
this.cmbRequest.Location = new System.Drawing.Point(73, 61);
this.cmbRequest.Name = "cmbRequest";
this.cmbRequest.Size = new System.Drawing.Size(183, 20);
this.cmbRequest.Size = new System.Drawing.Size(108, 20);
this.cmbRequest.TabIndex = 11;
//
// ta
@@ -341,12 +346,13 @@
this.tam.ProjectsPartTableAdapter = null;
this.tam.ProjectsScheduleTableAdapter = null;
this.tam.ProjectsTableAdapter = null;
this.tam.SPMasterTableAdapter = null;
this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// chkAutoAdd
//
this.chkAutoAdd.AutoSize = true;
this.chkAutoAdd.Location = new System.Drawing.Point(141, 424);
this.chkAutoAdd.Location = new System.Drawing.Point(646, 94);
this.chkAutoAdd.Name = "chkAutoAdd";
this.chkAutoAdd.Size = new System.Drawing.Size(176, 16);
this.chkAutoAdd.TabIndex = 54;
@@ -359,42 +365,82 @@
this.tbProject.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.tbProject.FormattingEnabled = true;
this.tbProject.Location = new System.Drawing.Point(140, 69);
this.tbProject.Location = new System.Drawing.Point(72, 35);
this.tbProject.Name = "tbProject";
this.tbProject.Size = new System.Drawing.Size(311, 20);
this.tbProject.Size = new System.Drawing.Size(679, 20);
this.tbProject.TabIndex = 55;
//
// richTextBoxEx1
//
this.richTextBoxEx1.AllowBullets = true;
this.richTextBoxEx1.AllowDefaultInsertText = true;
this.richTextBoxEx1.AllowDefaultSmartText = true;
this.richTextBoxEx1.AllowHyphenation = true;
this.richTextBoxEx1.AllowPictures = true;
this.richTextBoxEx1.AllowSpellCheck = true;
this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBoxEx1.FilePath = "";
this.richTextBoxEx1.Location = new System.Drawing.Point(0, 129);
this.richTextBoxEx1.Name = "richTextBoxEx1";
this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n\\viewkind4\\uc" +
"1\\pard\\lang1042\\fs20 richTextBoxEx1\\par\r\n}\r\n";
this.richTextBoxEx1.SetColorWithFont = true;
this.richTextBoxEx1.ShowToolStrip = true;
this.richTextBoxEx1.Size = new System.Drawing.Size(969, 530);
this.richTextBoxEx1.TabIndex = 58;
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
this.panel1.Controls.Add(this.dtPdate);
this.panel1.Controls.Add(this.tbHrs);
this.panel1.Controls.Add(this.tbProject);
this.panel1.Controls.Add(label2);
this.panel1.Controls.Add(hrsLabel);
this.panel1.Controls.Add(this.chkAutoAdd);
this.panel1.Controls.Add(this.cmbType);
this.panel1.Controls.Add(label5);
this.panel1.Controls.Add(typeLabel);
this.panel1.Controls.Add(this.lbSummary);
this.panel1.Controls.Add(label6);
this.panel1.Controls.Add(this.cmbPackage);
this.panel1.Controls.Add(this.btSave);
this.panel1.Controls.Add(this.cmbRequest);
this.panel1.Controls.Add(label1);
this.panel1.Controls.Add(this.cmbState);
this.panel1.Controls.Add(label3);
this.panel1.Controls.Add(stateLabel);
this.panel1.Controls.Add(this.cmbUser);
this.panel1.Controls.Add(this.cmbProcess);
this.panel1.Controls.Add(this.tbProjectIndex);
this.panel1.Controls.Add(this.tbWW);
this.panel1.Controls.Add(projectLabel);
this.panel1.Controls.Add(label4);
this.panel1.Controls.Add(this.tbOt);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(969, 129);
this.panel1.TabIndex = 59;
//
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(155, 98);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(53, 12);
label2.TabIndex = 16;
label2.Text = "초과시간";
//
// fJobReport_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(538, 465);
this.Controls.Add(this.tbProject);
this.Controls.Add(this.chkAutoAdd);
this.Controls.Add(label5);
this.Controls.Add(this.lbSummary);
this.Controls.Add(this.cmbPackage);
this.Controls.Add(this.cmbRequest);
this.Controls.Add(this.cmbState);
this.Controls.Add(stateLabel);
this.Controls.Add(this.cmbProcess);
this.Controls.Add(this.tbWW);
this.Controls.Add(label4);
this.Controls.Add(this.tbOt);
this.Controls.Add(projectLabel);
this.Controls.Add(this.tbProjectIndex);
this.Controls.Add(this.cmbUser);
this.Controls.Add(this.dtPdate);
this.Controls.Add(label2);
this.Controls.Add(this.tbDescription);
this.Controls.Add(label1);
this.Controls.Add(this.btSave);
this.Controls.Add(typeLabel);
this.Controls.Add(this.cmbType);
this.ClientSize = new System.Drawing.Size(969, 681);
this.Controls.Add(this.richTextBoxEx1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(hrsLabel);
this.Controls.Add(this.tbHrs);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "fJobReport_Add";
@@ -404,6 +450,8 @@
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -421,7 +469,6 @@
private System.Windows.Forms.ToolStripStatusLabel lbIndex;
private System.Windows.Forms.ComboBox cmbType;
private System.Windows.Forms.Button btSave;
private System.Windows.Forms.TextBox tbDescription;
private System.Windows.Forms.DateTimePicker dtPdate;
private System.Windows.Forms.ComboBox cmbUser;
private System.Windows.Forms.TextBox tbProjectIndex;
@@ -434,5 +481,7 @@
private System.Windows.Forms.Label lbSummary;
private System.Windows.Forms.CheckBox chkAutoAdd;
private System.Windows.Forms.ComboBox tbProject;
private RichTextBoxEx.RichTextBoxEx richTextBoxEx1;
private System.Windows.Forms.Panel panel1;
}
}

View File

@@ -14,7 +14,7 @@ namespace FPJ0000.JobReport
dsPRJ.JobReportRow dr;
Boolean copyMOde = false;
Boolean bInit = false;
public fJobReport_Add(dsPRJ.JobReportRow dr_,Boolean copy=false)
public fJobReport_Add(dsPRJ.JobReportRow dr_, Boolean copy = false)
{
InitializeComponent();
dr = dr_;
@@ -38,16 +38,16 @@ namespace FPJ0000.JobReport
void tbProject_SelectedIndexChanged(object sender, EventArgs e)
{
if (bInit==false || this.tbProject.SelectedIndex < 0) return;
if (bInit == false || this.tbProject.SelectedIndex < 0) return;
var data = this.tbProject.SelectedValue;
if (data == null) return;
if(data.GetType() == typeof(DataRowView))
if (data.GetType() == typeof(DataRowView))
{
var drv = data as DataRowView;
var idx = int.Parse(drv["Code"].ToString());
tbProjectIndex.Text = idx.ToString();
tbProject.Tag = tbProject.Text;
Console.WriteLine(string.Format("Project Select #1 {0}:{1}",idx,tbProject.Text));
Console.WriteLine(string.Format("Project Select #1 {0}:{1}", idx, tbProject.Text));
}
else
{
@@ -137,13 +137,29 @@ namespace FPJ0000.JobReport
if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) chkAutoAdd.Enabled = true;
else chkAutoAdd.Enabled = false;
if (string.IsNullOrEmpty(dr.description2))
{
this.richTextBoxEx1.Text = dr.description;
}
else
{
try
{
this.richTextBoxEx1.Rtf = dr.description2;
}
catch (Exception ex)
{
this.richTextBoxEx1.Text = dr.description;
}
}
this.Show();
Application.DoEvents();
if(tbDescription.Text.Trim() != "")
if (this.richTextBoxEx1.Text.Trim() != "")
{
tbDescription.Focus();
tbDescription.SelectAll();
this.richTextBoxEx1.Focus();
}
else
{
@@ -151,9 +167,23 @@ namespace FPJ0000.JobReport
tbProject.SelectAll();
}
tbProject.Tag = tbProject.Text;
// if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description;
//editor
// ed = new editform.editor();
//ed.AllowDiscAccess = true;
//ed.WindowTitle = "Quick Edit";
//ed.StartingFont = new Font("Courier New", 12.0f, FontStyle.Regular);
//ed.DisplayEditForm(this.panel1);
//ed.AllowRtf = true;
bInit = true;
}
// editform.editor ed;
void ctl_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
@@ -249,16 +279,16 @@ namespace FPJ0000.JobReport
private void button1_Click(object sender, EventArgs e)
{
this.Invalidate();
if(tbProject.Text.Trim() == "")
if (tbProject.Text.Trim() == "")
{
FCOMMON.Util.MsgE("프로젝트(아이템) 명칭이 없습니다.");
tbProject.Focus();
return;
}
if (cmbType.Text != "휴가" && tbDescription.Text.Trim() == "")
if (cmbType.Text != "휴가" && string.IsNullOrEmpty( this.richTextBoxEx1.Text )==true)
{
FCOMMON.Util.MsgE("진행 내용이 없습니다.");
tbDescription.Focus();
this.richTextBoxEx1.Focus();
return;
}
float hour = Single.Parse(tbHrs.Text) + Single.Parse(tbOt.Text);
@@ -289,10 +319,10 @@ namespace FPJ0000.JobReport
return;
}
if(tbProject.Tag.ToString() != tbProject.Text && tbProjectIndex.Text != "" && tbProjectIndex.Text != "-1")
if (tbProject.Tag.ToString() != tbProject.Text && tbProjectIndex.Text != "" && tbProjectIndex.Text != "-1")
{
FCOMMON.Util.MsgE("프로젝트가 선택되었으나 이름이 임의 수정되어 프로젝트 연결을 해제 합니다\n\n" +
"잘못된 프로젝트명은 프로젝트 관리화면에서 변경하시기 바랍니다.\n\n"+
"잘못된 프로젝트명은 프로젝트 관리화면에서 변경하시기 바랍니다.\n\n" +
"원본 : " + tbProject.Tag.ToString() + "\n" +
"현재 : " + tbProject.Text);
tbProjectIndex.Text = "-1";
@@ -315,9 +345,9 @@ namespace FPJ0000.JobReport
}
}
if(chkAutoAdd.Checked && (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added))
if (chkAutoAdd.Checked && (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added))
{
if(tbProjectIndex.Text == "" || tbProjectIndex.Text == "-1")
if (tbProjectIndex.Text == "" || tbProjectIndex.Text == "-1")
{
FCOMMON.Util.MsgE("프로젝트 주간내역을 등록하려면 프로젝트가 지정되어야 합니다");
tbProject.Focus();
@@ -327,7 +357,7 @@ namespace FPJ0000.JobReport
else
{
//190906
FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToShortDateString(), tbDescription.Text.Trim());
FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToShortDateString(), this.richTextBoxEx1.Text, this.richTextBoxEx1.Rtf);
}
}
@@ -345,7 +375,11 @@ namespace FPJ0000.JobReport
else this.dr.hrs = 0;
if (tbOt.Text != "") this.dr.ot = double.Parse(tbOt.Text);
else this.dr.ot = 0;
this.dr.description = tbDescription.Text.Trim();
//this.dr.description = richTextBox1.Text.Trim();
//MessageBox.Show(richTextBox1.Text);
this.dr.description = richTextBoxEx1.Text;
this.dr.description2 = richTextBoxEx1.Rtf; // ef.DocumentText;// richTextBox1.Rtf;
this.bs.EndEdit();
DialogResult = System.Windows.Forms.DialogResult.OK;
}

View File

@@ -126,9 +126,6 @@
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="projectLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
@@ -141,9 +138,21 @@
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@@ -156,4 +165,7 @@
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>226, 17</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>

View File

@@ -60,6 +60,8 @@
FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo();
this.panel1 = new System.Windows.Forms.Panel();
this.radSortGrp = new System.Windows.Forms.RadioButton();
@@ -771,7 +773,7 @@
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
this.fpSpread1_Sheet1.ColumnCount = 18;
this.fpSpread1_Sheet1.ColumnCount = 20;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.AutoGenerateColumns = false;
@@ -953,6 +955,13 @@
this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(17).Label = "비고";
this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8;
this.fpSpread1_Sheet1.Columns.Get(18).DataField = "Item";
this.fpSpread1_Sheet1.Columns.Get(18).Tag = "item";
this.fpSpread1_Sheet1.Columns.Get(18).Visible = false;
this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType9;
this.fpSpread1_Sheet1.Columns.Get(19).DataField = "ItemSupplyidx";
this.fpSpread1_Sheet1.Columns.Get(19).Visible = false;
this.fpSpread1_Sheet1.DataAutoCellTypes = false;
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bsPart;

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>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANHSURBVDhPtZBvTNJ5HMfdenbzQbWjWenaVZub2+9BXjdd
kpz5Z4W65kK0iWFUaE5SwWZm+pMOU2l4ioTQeaaRRJYzLS7SZqs2EyOoX+aUitCKPxFJ/bzKzfXOEbe7
293TXk8/n9fru+8n7J+oJsjwBmtVLXlXPFp5u3ix9Ma+xUJj3mh+X3ZNdm/vMuHgq+9Cq/9FQdWw6i2V
jmtPr2LIeQPGmeu499oKvfUcdunY6tKemYNFnU8de7V2Vkj5G7ntaJbhcReGnUPosp9HmbUGkvsk+qYv
I7Ob7c/p0mwo6nzi77ztg+TsM3DktqyQuvTyBLnyuLmCHpkZQdOECoLxQygwH0L7ZCfUt9qQpk46uL/D
oW6+6obxEQ3NsBfsOjOdVj66MhggxyQyo/0KTk+dBX9chNxRIQ5b6qCz6pCm3Gor0EzG7mmYWBx8+B6K
6z70mgMo65jC1pJhWTBw+FahzfR8CCLLUexekoVjYujsBogMRUhojGPmKSfvNBtduGQJoFz/CrIBLxr7
XyBWMGALBopNBQsDzj9QaqlGE6XEhek+nDQ1YcsvP/2e1zrF3U4+/HBhbA4SvQuFv81CqJnFr1fciOFd
DAQD+f3cwJhnHBen+6G6qQTrxBZ/vHRz7aCY/F5VcSYinTRTbdfcqNS7kd/iBK/ZgcY+F9axz9DBALcn
09Z2swXb2livE+VxYpM4J+oTn1/9MZPrp3fsJJIq7lAnL7+EqOMFOPXPUKiehajdjvUZ7V+/kK5JkSS3
MoW28j1rFw4cUMzzeDRdewzzubtBJyYTCSUmSmqYwX6lExlV05AZ3GCXjWBtasvXI+LIkRWfSoq1foFg
Yb5ehjmDDv6eLrzL2Ak6Np7YLBikqrodyGtygFy6A6/hASJT5XQEs54RDHwWiRjzfD79XnsKb3t74JJW
w3e6HXM/p8AfTRAxOeepMu0TkOdcyKm7h03ZekQwGzlB+S/+zOJwaIEAb8ka+LQqeFsVeBOXAE9kNLEx
q5sSNE8iWWjCmiSFg8E8sT2k/ZtAQmLqu9h4h4+bC7eoBF7iR3hWRRLr0tVUVEqLeXWSXMpgkeGh9f/H
GxMT7vshWupdvd7sYUTBs3wVERp9K8LCvgDnwuEzIxwUcgAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANISURBVDhPtZBdTFN3GIdJvFu4cMYanBDjR0JCci5kLhCp
VORDLRBDVgqGYlnVgoQKtBhEhENdQagpg9KV1jEEK7XiCIJWKxiMmiDF2uoRCVStBbUf1kr1MJWE+JPU
mm3Zbvfcvu/z/PN/w/6OaoIMP2GtqiXviEcrbxUvll7ft1hozBvN78uuye7tXSYcfPlNaPXfKKgaVr2l
0nH1yWUMOa/DOHMNd19ZobeexY86trq0Z+ZgUecTx09aOyuk/IXcdjTL8KgLw84hdNnPocxaA8k9En3T
F5HZzfbndGk2FHU+9nfe8kFy5ik4cltWSF16eYJccdxcQY/MjKBpQgXB+CEUmA+hfbIT6pttSFMnHdzf
4VA3X3bD+JCGZtgLdp2ZTisfXREMkGMSmdF+CaemzoA/LkLuqBCHLXXQWXVIU261FWgmY/c2TCwOPngH
xTUfes0BlHVMYWvJsCwYOHyz0GZ6NgSR5Sj2LMnCMTF0dgNEhiIkNMYx85STt5uNLvxhCaBc/xKyAS8a
+58jVjBgCwaKTQULA84rKLVUo4lS4vx0H06amrDl5x9+z2ud4u4gH7w/PzYHid6Fwt9mIdTM4pdLbsTw
LgSCgfx+bmDMM44L0/1Q3VCC1bDFHy/dXDsoJleqKk5HpJNmqu2qG5V6N/JbnOA1O9DY58Ja9mk6GOD2
ZNrabrRgexvrVaI8TmwS50R95POrP2Ry/fSu3URSxW3q5MUXEHU8B6f+KQrVsxC127E+o/3LF9I1KZLk
VqbQVr53zcKBA4p5Ho+ma49hPncP6MRkIqHEREkNM9ivdCKjahoygxvsshGsSW35ckQcOfLtx5Ji7WuB
YGG+XoY5gw7+ni68zdgNOjae2CwYpKq6HchrcoBcugPvxH1EpsrpCGY9Ixj4JBIx5vl8+p32V7zp7YFL
Wg3fqXbMbUuBP5ogYnLOUWXaxyDPupBTdxebsvWIYDZygvJX/szicGiBAG/IGvi0KnhbFXgdlwBPZDSx
MaubEjRPIllowndJCgeD2bAzpP2TQEJi6tvYeIePmwu3qARe4nt4VkUSa9PVVFRKi3l1klzKYJHhofX/
xhsTE+5bFy31rl5v9jCi4Fm+igiN/i/Cwj4D4PbhMOWelX8AAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKgSURBVDhPvZLfT1JhHMbPuq6/oYtmmRdt2cZFXXThbbc1
N/Oiu+ZVm6aWBrOGRaghwjARNkBjwgkMSQ8CSw4/DFfpiA0DBRn0y19p4BHCejrv4Wzp1rrs2b57t+/e
z/u8z/d9qf8ui8UCo9GIkZERaLXa61Q4HAapYDCIubk5+P1+zM7OYmZmBlNTU3A6nbDb7bBarTCbzcLe
SqWCfD4PlUoVp0KhEA4ODlAul/9ZhUIBBoPh4+7uLpaXl6FUKjMKhaKFYllWaORyOczPzyObzYL0MpkM
vF4vUqkU3G63sIemacTjceFGPNwgpqIon8+HSCRCriwJBAJwOBwSAo+Pj0tIDL1eLyGwWq2W8D0hv1wu
rxVximIYBrFYTJhBOp0WZkCcCZxIJOB3qbHCtmPimRFLS0vEHTKZ7LiIVzU5OYlisQiPxyM4u1wuwdlB
W5FkmjJbKTveOpvHRkdHIZVKIWJ/ZLPZuhcWFpBMJkFg4sz3kAhrsZEYQ6W4gveOa3gXcaGzs/OXiB2V
yWQik8bw8DCGhoag18oRo6+itOFG6dMAtldfIjpxE+23W/9+wGHxIY/FbVcsmx9olHL3wT66gB9bNBaN
DXgibfwubquKz3XmKS+dTkcmjf7+fhhU7cj4u1BeN4NbuQH24XnsZzuwk56Gd+Dyz5Di4gkRpyj+WbrJ
Ojg4eKuvr29NqZC3Lhoa3nzjB7e/1oa9ZGO1Us18FBWyATVCinqpABNpNJpu/lsKHyUajWLa1IUsO4Dy
F53gvpdq4iPUCyuXbgH3+QVePaj9ysrq6sQjqurt7UVPTw+Cqks73OYqytt+lNb5GazbD9VzVApx5F+P
wX+3xi6iR8U+PrfpkdVxzJE6yzH3ajmm6zTH3KnhmI5TnK/tZPA32Lcwk+CgY2QAAAAASUVORK5CYII=
N/Oiu+ZVm6aWBrOGRaghyjARNkBjwgkMSY/CWXL4YbhKR2wYKMigX/5KA48Q1tN5D2dLt9Zlz/bdu333
ft7nfb7vS/13Wa1WmEwmDA8PQ6fTXadCoRBIBQIBzM3NgWVZzM7OYnp6GpOTk3C5XHA4HLDZbLBYLOLe
crmMXC4HjUYTo4LBIA4ODlAqlf5Z+XweRqPx4+7uLpaXl6FWq9MqlaqJ4jhObGSzWczPzyOTyYD00uk0
vF4vkskkPB6PuIemacRiMfFGAlwnpaIon8+HcDhMrizz+/1wOp0yAo+NjclIDIPBICOwVquVCT0xv1Kp
rJZwimIYBtFoVJxBKpUSZ0CcCRyPx8G6tVjhWjH+zISlpSXiDoVCcVzCK5qYmEChUMDMzIzo7Ha7RWcn
bUOCaUhvJR1462ocHRkZgVwuh4T9kd1u71xYWEAikQCBibPQQzykw0Z8FOXCCt47r+Fd2I329vZfEnZU
ZrOZTBpDQ0MYGBiAQadElL6K4oYHxU992F59icj4TbTebv77AYclhDwWs1+xbn6gUczeB/foAn5s0Vg0
1eGJvP67tK0iIdeZp4L0ej2ZNHp7e2HUtCLNdqC0bgG/cgPcw/PYz7RhJzUFb9/ln0HVxRMSTlHCs3SS
tb+//1ZPT8+aWqVsXjTWvfkmDG5/rQV7ifpKJRuFKBpk/FoEVbVyESYaHBzsFL6l+FEikQimzB3IcH0o
fdGL7nvJBiFCrbjyqSbwn1/g1YPqr5yipkY6oqLu7m50dXUhoLm0w2+uorTNorguzGDdcaieo5yPIfd6
FOzdKoeEHhX3+Nwmo6jhj9ZZnrlXzTMdp3nmThXPtJ3ifS0nA78B2I8wkgDv+LoAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
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=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVDhPhZLrS1NhHMf3Kv+EsF70UohS0qioF6XpmhrY
zVLMvM0pmtrQhUG1mEblJTRRoUKUohcVWqZTm5pzTjeckZeszOZdc3NNdzlHd8769pyz5QyEfvDhefGc
74fz+54j4Cbipjr5dKlOFVOm+yWU6yhy0jzl3KmnY0oH6KgH2rFjMk3l3tiXO/jQ1om826cx2eiVmSUz
a3Gsw2L3sWLjoPFl0YZbzbOIL/vqFOUo/bxRz0Tf15oWli3swLQL+hkG+lkGumkG2qkNqL+vo33cgXUG
aPlK4dabGaQ9GqP+kQjlHdSacwNDcyw+zjHkZDDISzbQO7mO9+NOInBjaJGFfsGFYuUswm50v+DDceWh
xovy2N+SmvNIq76A6o4GFDWWI0weiFCCqPgoIhSHUNFSwa9ipxksW52IkPYyvOBSadjr7tFWtE48RbWu
gJckVUWh4HkichviIa49g9TaVLQML6N1zI53I2tYJT0JFX00LxBVivyE8jxW960Hz0YVKFHn8JLkmmgS
PovMxxnQTDr4VbomKKhID1aHC8Kifo+Am8j7vbS0LgWGSS1q9ddxrzMfceUnkVwVC8O0EwZSLFew5oen
EwsRRCi2CI7flrsOF+5BYqUIQz8GUNyTBYVSiviH4WhQv8WneQYGUuzAlAv9BJPNhbA7XkGwzF8SItuN
3PoEXK6JRELFKV4iVSZC1phB3iQc3P3QLItB7hMTbKTI4DytRxAi2zkfIttFHvJHSIE/zpWEI/tJCjTj
KhSrCpH1KgXimkswEIGe/Bs6IqBdbgTlqX0rnMjroxdXaQzPszy93xZwrS4T6SQoqY1Hfv3VzTsO5wZL
BM0+AWebs/gE/8NBVgjKaPIJjkg/OEeMP39v9/B2mH+tuvcntdi9cVJkZqdxZs1pG5kyuY1mCkYThUkv
ZruLh2veTrNYMlvdFEWtBlxp++yNCwQHMzuyg8TtnQckKkuQpIneJN1D4F/ETXSAuM26L7WtKzBFmSYQ
CAR/AF7/oOjSHDLtAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -352,18 +352,18 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
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
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKgSURBVDhPvZLfT1JhHMbPuq6/oYtmmRdt2cZFXXThbbc1
N/Oiu+ZVm6aWBrOGRaghwjARNkBjwgkMSQ8CSw4/DFfpiA0DBRn0y19p4BHCejrv4Wzp1rrs2b57t+/e
z/u8z/d9qf8ui8UCo9GIkZERaLXa61Q4HAapYDCIubk5+P1+zM7OYmZmBlNTU3A6nbDb7bBarTCbzcLe
SqWCfD4PlUoVp0KhEA4ODlAul/9ZhUIBBoPh4+7uLpaXl6FUKjMKhaKFYllWaORyOczPzyObzYL0MpkM
vF4vUqkU3G63sIemacTjceFGPNwgpqIon8+HSCRCriwJBAJwOBwSAo+Pj0tIDL1eLyGwWq2W8D0hv1wu
rxVximIYBrFYTJhBOp0WZkCcCZxIJOB3qbHCtmPimRFLS0vEHTKZ7LiIVzU5OYlisQiPxyM4u1wuwdlB
W5FkmjJbKTveOpvHRkdHIZVKIWJ/ZLPZuhcWFpBMJkFg4sz3kAhrsZEYQ6W4gveOa3gXcaGzs/OXiB2V
yWQik8bw8DCGhoag18oRo6+itOFG6dMAtldfIjpxE+23W/9+wGHxIY/FbVcsmx9olHL3wT66gB9bNBaN
DXgibfwubquKz3XmKS+dTkcmjf7+fhhU7cj4u1BeN4NbuQH24XnsZzuwk56Gd+Dyz5Di4gkRpyj+WbrJ
Ojg4eKuvr29NqZC3Lhoa3nzjB7e/1oa9ZGO1Us18FBWyATVCinqpABNpNJpu/lsKHyUajWLa1IUsO4Dy
F53gvpdq4iPUCyuXbgH3+QVePaj9ysrq6sQjqurt7UVPTw+Cqks73OYqytt+lNb5GazbD9VzVApx5F+P
wX+3xi6iR8U+PrfpkdVxzJE6yzH3ajmm6zTH3KnhmI5TnK/tZPA32Lcwk+CgY2QAAAAASUVORK5CYII=
</value>
</data>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -12,7 +12,7 @@ namespace FPJ0000.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

View File

@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
</configSections>
<connectionStrings>
<add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
providerName="System.Data.SqlClient" />
<add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
providerName="System.Data.SqlClient" />
<add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient"/>
<add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" providerName="System.Data.SqlClient"/>
</connectionStrings>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

File diff suppressed because it is too large Load Diff

View File

@@ -2940,6 +2940,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columngcode;
private global::System.Data.DataColumn columndescription2;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportDataTable() {
@@ -3141,6 +3143,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 description2Column {
get {
return this.columndescription2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -3198,7 +3208,8 @@ namespace FPJ0000 {
double ot,
string ww,
string process,
string gcode) {
string gcode,
string description2) {
JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -3221,7 +3232,8 @@ namespace FPJ0000 {
ot,
ww,
process,
gcode};
gcode,
description2};
rowJobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobReportRow);
return rowJobReportRow;
@@ -3272,6 +3284,7 @@ namespace FPJ0000 {
this.columnww = base.Columns["ww"];
this.columnprocess = base.Columns["process"];
this.columngcode = base.Columns["gcode"];
this.columndescription2 = base.Columns["description2"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3319,6 +3332,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnprocess);
this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columngcode);
this.columndescription2 = new global::System.Data.DataColumn("description2", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columndescription2);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -3344,7 +3359,9 @@ namespace FPJ0000 {
this.columnww.ReadOnly = true;
this.columnww.MaxLength = 6;
this.columnprocess.MaxLength = 50;
this.columngcode.AllowDBNull = false;
this.columngcode.MaxLength = 10;
this.columndescription2.MaxLength = 2147483647;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7248,18 +7265,29 @@ namespace FPJ0000 {
[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.tableJobReport.gcodeColumn]));
}
}
set {
this[this.tableJobReport.gcodeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string description2 {
get {
if (this.Isdescription2Null()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobReport.description2Column]));
}
}
set {
this[this.tableJobReport.description2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IspdateNull() {
@@ -7466,14 +7494,14 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsgcodeNull() {
return this.IsNull(this.tableJobReport.gcodeColumn);
public bool Isdescription2Null() {
return this.IsNull(this.tableJobReport.description2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetgcodeNull() {
this[this.tableJobReport.gcodeColumn] = global::System.Convert.DBNull;
public void Setdescription2Null() {
this[this.tableJobReport.description2Column] = global::System.Convert.DBNull;
}
}
@@ -11819,6 +11847,7 @@ ORDER BY Project, no, ItemGroup, option1, ItemName";
tableMapping.ColumnMappings.Add("ww", "ww");
tableMapping.ColumnMappings.Add("process", "process");
tableMapping.ColumnMappings.Add("gcode", "gcode");
tableMapping.ColumnMappings.Add("description2", "description2");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -11856,8 +11885,8 @@ ORDER BY Project, no, ItemGroup, option1, ItemName";
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO JobReport
(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode)
VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode);
(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2)
VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2);
SELECT 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 FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.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, "", "", ""));
@@ -11872,16 +11901,17 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.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._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE JobReport
SET pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs,
import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process
import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2
WHERE (idx = @Original_idx);
SELECT 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 FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
@@ -11897,10 +11927,11 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", 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.Original, false, null, "", "", ""));
}
@@ -11919,7 +11950,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT 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, gcode
process, gcode, description2
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode)
ORDER BY pdate DESC";
@@ -11940,7 +11971,7 @@ ORDER BY pdate DESC";
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate)
AS ww, gcode
AS ww, gcode, description2
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode)
ORDER BY pdate DESC";
@@ -11987,7 +12018,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
@@ -12024,7 +12055,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
@@ -12059,7 +12090,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(prjname));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
@@ -12096,7 +12127,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(prjname));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode));
@@ -12119,7 +12150,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
@@ -12144,7 +12175,7 @@ ORDER BY projectName";
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search));
}
if ((gcode == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
@@ -12353,7 +12384,8 @@ ORDER BY projectName";
string projectName,
global::System.Nullable<double> ot,
string process,
string gcode) {
string gcode,
string description2) {
if ((pidx.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx.Value));
}
@@ -12446,11 +12478,17 @@ ORDER BY projectName";
this.Adapter.InsertCommand.Parameters[15].Value = ((string)(process));
}
if ((gcode == null)) {
this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.InsertCommand.Parameters[16].Value = ((string)(gcode));
}
if ((description2 == null)) {
this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[17].Value = ((string)(description2));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -12488,6 +12526,7 @@ ORDER BY projectName";
string projectName,
global::System.Nullable<double> ot,
string process,
string description2,
int Original_idx,
int idx) {
if ((pidx.HasValue == true)) {
@@ -12581,8 +12620,14 @@ ORDER BY projectName";
else {
this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(process));
}
this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(idx));
if ((description2 == null)) {
this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(description2));
}
this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[18].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)) {
@@ -12623,7 +12668,7 @@ ORDER BY projectName";
command.Parameters[2].Value = ((string)(user));
}
if ((gcode == null)) {
command.Parameters[3].Value = global::System.DBNull.Value;
throw new global::System.ArgumentNullException("gcode");
}
else {
command.Parameters[3].Value = ((string)(gcode));

View File

@@ -584,7 +584,7 @@ WHERE (Project = @pidx)</CommandText>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobReportTableAdapter" GeneratorDataComponentClassName="JobReportTableAdapter" Name="JobReport" UserDataComponentName="JobReportTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.JobReport" 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">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.JobReport" 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 [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)))</CommandText>
@@ -624,71 +624,73 @@ WHERE (Project = @pidx)</CommandText>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>INSERT INTO JobReport
(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode)
VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode);
(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2)
VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2);
SELECT 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 FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="requestpart" ColumnName="requestpart" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="package" ColumnName="package" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="description" ColumnName="description" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="remark" ColumnName="remark" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="hrs" ColumnName="hrs" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ot" ColumnName="ot" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="requestpart" ColumnName="requestpart" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="package" ColumnName="package" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="description" ColumnName="description" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="remark" ColumnName="remark" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="hrs" ColumnName="hrs" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ot" ColumnName="ot" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="description2" ColumnName="description2" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT 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, gcode
process, gcode, description2
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode)
ORDER BY pdate DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" 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">
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>UPDATE JobReport
SET pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs,
import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process
import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2
WHERE (idx = @Original_idx);
SELECT 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 FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="requestpart" ColumnName="requestpart" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="package" ColumnName="package" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="description" ColumnName="description" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="remark" ColumnName="remark" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="hrs" ColumnName="hrs" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ot" ColumnName="ot" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="requestpart" ColumnName="requestpart" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="package" ColumnName="package" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="description" ColumnName="description" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="remark" ColumnName="remark" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="hrs" ColumnName="hrs" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ot" ColumnName="ot" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="description2" ColumnName="description2" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" 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="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
@@ -715,6 +717,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
<Mapping SourceColumn="ww" DataSetColumn="ww" />
<Mapping SourceColumn="process" DataSetColumn="process" />
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
<Mapping SourceColumn="description2" DataSetColumn="description2" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport">
@@ -736,7 +739,7 @@ WHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND (ISNULL(import, 0) = 1
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="user" ColumnName="wuid" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@user" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -745,15 +748,15 @@ WHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND (ISNULL(import, 0) = 1
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate)
AS ww, gcode
AS ww, gcode, description2
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode)
ORDER BY pdate DESC</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="prjname" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@prjname" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" 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>
@@ -769,7 +772,7 @@ GROUP BY pidx, projectName
ORDER BY projectName</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="search" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="String" Direction="Input" ParameterName="@search" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.JobReport" 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>
@@ -1191,7 +1194,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process,
<xs:element name="dsPRJ" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPRJ" msprop:Generator_UserDSName="dsPRJ">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1384,7 +1387,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_RowClassName="ProjectsIOMapRow" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent">
<xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent" msprop:Generator_RowClassName="ProjectsIOMapRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1428,7 +1431,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_RowClassName="ProjectsMailListRow" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent">
<xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent" msprop:Generator_RowClassName="ProjectsMailListRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1473,7 +1476,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_RowClassName="ProjectsPartRow" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent">
<xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent" msprop:Generator_RowClassName="ProjectsPartRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1585,7 +1588,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process,
</xs:sequence>
</xs:complexType>
</xs:element>
<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="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1686,17 +1689,24 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process,
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
<xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="description2" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="description2" msprop:Generator_ColumnVarNameInTable="columndescription2" msprop:Generator_ColumnPropNameInTable="description2Column" msprop:Generator_UserColumnName="description2" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2147483647" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProjectsSchedule" msprop:Generator_TableClassName="ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableProjectsSchedule" msprop:Generator_RowChangedName="ProjectsScheduleRowChanged" msprop:Generator_TablePropName="ProjectsSchedule" msprop:Generator_RowDeletingName="ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsScheduleRowDeleted" msprop:Generator_RowClassName="ProjectsScheduleRow" msprop:Generator_UserTableName="ProjectsSchedule" msprop:Generator_RowEvArgName="ProjectsScheduleRowChangeEvent">
<xs:element name="ProjectsSchedule" msprop:Generator_TableClassName="ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableProjectsSchedule" msprop:Generator_TablePropName="ProjectsSchedule" msprop:Generator_RowDeletingName="ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsScheduleRowDeleted" msprop:Generator_UserTableName="ProjectsSchedule" msprop:Generator_RowChangedName="ProjectsScheduleRowChanged" msprop:Generator_RowEvArgName="ProjectsScheduleRowChangeEvent" msprop:Generator_RowClassName="ProjectsScheduleRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1730,7 +1740,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_RowClassName="ProjectsHistoryRow" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent">
<xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent" msprop:Generator_RowClassName="ProjectsHistoryRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1768,7 +1778,7 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_RowClassName="SPMasterRow" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent">
<xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent" msprop:Generator_RowClassName="SPMasterRow">
<xs:complexType>
<xs:sequence>
<xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" />

View File

@@ -10,7 +10,7 @@
<Shape ID="DesignTable:ProjectsIOMap" ZOrder="8" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:ProjectsMailList" ZOrder="7" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:ProjectsPart" ZOrder="6" X="974" Y="70" Height="343" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobReport" ZOrder="5" X="1259" Y="70" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobReport" ZOrder="5" X="1258" Y="68" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ProjectsSchedule" ZOrder="4" X="1629" Y="70" Height="267" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:ProjectsHistory" ZOrder="3" X="1943" Y="70" Height="267" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:SPMaster" ZOrder="1" X="476" Y="366" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />

File diff suppressed because it is too large Load Diff

View File

@@ -29,7 +29,7 @@ namespace FPJ0000 {
private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public dsQuery() {
this.BeginInit();
this.InitClass();
@@ -40,7 +40,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected dsQuery(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) :
base(info, context, false) {
if ((this.IsBinarySerialized(info, context) == true)) {
@@ -76,7 +76,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
[global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
public JobReportItemListDataTable JobReportItemList {
@@ -86,7 +86,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.BrowsableAttribute(true)]
[global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)]
public override global::System.Data.SchemaSerializationMode SchemaSerializationMode {
@@ -99,7 +99,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public new global::System.Data.DataTableCollection Tables {
get {
@@ -108,7 +108,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public new global::System.Data.DataRelationCollection Relations {
get {
@@ -117,7 +117,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override void InitializeDerivedDataSet() {
this.BeginInit();
this.InitClass();
@@ -125,7 +125,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public override global::System.Data.DataSet Clone() {
dsQuery cln = ((dsQuery)(base.Clone()));
cln.InitVars();
@@ -134,19 +134,19 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override bool ShouldSerializeTables() {
return false;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override bool ShouldSerializeRelations() {
return false;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) {
if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
this.Reset();
@@ -171,7 +171,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() {
global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream();
this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null));
@@ -180,13 +180,13 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
internal void InitVars() {
this.InitVars(true);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
internal void InitVars(bool initTable) {
this.tableJobReportItemList = ((JobReportItemListDataTable)(base.Tables["JobReportItemList"]));
if ((initTable == true)) {
@@ -197,7 +197,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitClass() {
this.DataSetName = "dsQuery";
this.Prefix = "";
@@ -209,13 +209,13 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private bool ShouldSerializeJobReportItemList() {
return false;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {
if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) {
this.InitVars();
@@ -223,7 +223,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
dsQuery ds = new dsQuery();
global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
@@ -269,7 +269,7 @@ namespace FPJ0000 {
return type;
}
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public delegate void JobReportItemListRowChangeEventHandler(object sender, JobReportItemListRowChangeEvent e);
/// <summary>
@@ -286,7 +286,7 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnpdate;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportItemListDataTable() {
this.TableName = "JobReportItemList";
this.BeginInit();
@@ -295,7 +295,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
internal JobReportItemListDataTable(global::System.Data.DataTable table) {
this.TableName = table.TableName;
if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
@@ -312,14 +312,14 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected JobReportItemListDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) :
base(info, context) {
this.InitVars();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn pidxColumn {
get {
return this.columnpidx;
@@ -327,7 +327,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn projectNameColumn {
get {
return this.columnprojectName;
@@ -335,7 +335,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn pdateColumn {
get {
return this.columnpdate;
@@ -343,7 +343,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
public int Count {
get {
@@ -352,33 +352,33 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportItemListRow this[int index] {
get {
return ((JobReportItemListRow)(this.Rows[index]));
}
}
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public event JobReportItemListRowChangeEventHandler JobReportItemListRowChanging;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public event JobReportItemListRowChangeEventHandler JobReportItemListRowChanged;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public event JobReportItemListRowChangeEventHandler JobReportItemListRowDeleting;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public event JobReportItemListRowChangeEventHandler JobReportItemListRowDeleted;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void AddJobReportItemListRow(JobReportItemListRow row) {
this.Rows.Add(row);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportItemListRow AddJobReportItemListRow(int pidx, string projectName, string pdate) {
JobReportItemListRow rowJobReportItemListRow = ((JobReportItemListRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
@@ -391,7 +391,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportItemListRow FindBypidxprojectName(int pidx, string projectName) {
return ((JobReportItemListRow)(this.Rows.Find(new object[] {
pidx,
@@ -399,7 +399,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public override global::System.Data.DataTable Clone() {
JobReportItemListDataTable cln = ((JobReportItemListDataTable)(base.Clone()));
cln.InitVars();
@@ -407,13 +407,13 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override global::System.Data.DataTable CreateInstance() {
return new JobReportItemListDataTable();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
internal void InitVars() {
this.columnpidx = base.Columns["pidx"];
this.columnprojectName = base.Columns["projectName"];
@@ -421,7 +421,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitClass() {
this.columnpidx = new global::System.Data.DataColumn("pidx", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnpidx);
@@ -440,25 +440,25 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportItemListRow NewJobReportItemListRow() {
return ((JobReportItemListRow)(this.NewRow()));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
return new JobReportItemListRow(builder);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override global::System.Type GetRowType() {
return typeof(JobReportItemListRow);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowChanged(e);
if ((this.JobReportItemListRowChanged != null)) {
@@ -467,7 +467,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowChanging(e);
if ((this.JobReportItemListRowChanging != null)) {
@@ -476,7 +476,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowDeleted(e);
if ((this.JobReportItemListRowDeleted != null)) {
@@ -485,7 +485,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowDeleting(e);
if ((this.JobReportItemListRowDeleting != null)) {
@@ -494,13 +494,13 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void RemoveJobReportItemListRow(JobReportItemListRow row) {
this.Rows.Remove(row);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
@@ -571,14 +571,14 @@ namespace FPJ0000 {
private JobReportItemListDataTable tableJobReportItemList;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
internal JobReportItemListRow(global::System.Data.DataRowBuilder rb) :
base(rb) {
this.tableJobReportItemList = ((JobReportItemListDataTable)(this.Table));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public int pidx {
get {
return ((int)(this[this.tableJobReportItemList.pidxColumn]));
@@ -589,7 +589,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string projectName {
get {
return ((string)(this[this.tableJobReportItemList.projectNameColumn]));
@@ -600,7 +600,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public string pdate {
get {
try {
@@ -616,13 +616,13 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IspdateNull() {
return this.IsNull(this.tableJobReportItemList.pdateColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetpdateNull() {
this[this.tableJobReportItemList.pdateColumn] = global::System.Convert.DBNull;
}
@@ -631,7 +631,7 @@ namespace FPJ0000 {
/// <summary>
///Row event argument class
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public class JobReportItemListRowChangeEvent : global::System.EventArgs {
private JobReportItemListRow eventRow;
@@ -639,14 +639,14 @@ namespace FPJ0000 {
private global::System.Data.DataRowAction eventAction;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportItemListRowChangeEvent(JobReportItemListRow row, global::System.Data.DataRowAction action) {
this.eventRow = row;
this.eventAction = action;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportItemListRow Row {
get {
return this.eventRow;
@@ -654,7 +654,7 @@ namespace FPJ0000 {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataRowAction Action {
get {
return this.eventAction;
@@ -688,13 +688,13 @@ namespace FPJ0000.dsQueryTableAdapters {
private bool _clearBeforeFill;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public JobReportItemListTableAdapter() {
this.ClearBeforeFill = true;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter {
get {
if ((this._adapter == null)) {
@@ -705,7 +705,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
@@ -733,7 +733,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
internal global::System.Data.SqlClient.SqlTransaction Transaction {
get {
return this._transaction;
@@ -759,7 +759,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected global::System.Data.SqlClient.SqlCommand[] CommandCollection {
get {
if ((this._commandCollection == null)) {
@@ -770,7 +770,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool ClearBeforeFill {
get {
return this._clearBeforeFill;
@@ -781,7 +781,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitAdapter() {
this._adapter = new global::System.Data.SqlClient.SqlDataAdapter();
global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
@@ -794,14 +794,14 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitConnection() {
this._connection = new global::System.Data.SqlClient.SqlConnection();
this._connection.ConnectionString = global::FPJ0000.Properties.Settings.Default.gwcs;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
@@ -815,7 +815,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[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 FillSearch(dsQuery.JobReportItemListDataTable dataTable, string search) {
@@ -834,7 +834,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[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 dsQuery.JobReportItemListDataTable GetSearch(string search) {
@@ -865,7 +865,7 @@ namespace FPJ0000.dsQueryTableAdapters {
private global::System.Data.IDbCommand[] _commandCollection;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected global::System.Data.IDbCommand[] CommandCollection {
get {
if ((this._commandCollection == null)) {
@@ -876,7 +876,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.IDbCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
@@ -887,7 +887,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual global::System.Nullable<bool> CheckHoliday(string pdate) {
global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[0]));
@@ -938,7 +938,7 @@ namespace FPJ0000.dsQueryTableAdapters {
private global::System.Data.IDbConnection _connection;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public UpdateOrderOption UpdateOrder {
get {
return this._updateOrder;
@@ -949,7 +949,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool BackupDataSetBeforeUpdate {
get {
return this._backupDataSetBeforeUpdate;
@@ -960,7 +960,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
public global::System.Data.IDbConnection Connection {
get {
@@ -975,7 +975,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
public int TableAdapterInstanceCount {
get {
@@ -988,7 +988,7 @@ namespace FPJ0000.dsQueryTableAdapters {
///Update rows in top-down order.
///</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private int UpdateUpdatedRows(dsQuery dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
int result = 0;
return result;
@@ -998,7 +998,7 @@ namespace FPJ0000.dsQueryTableAdapters {
///Insert rows in top-down order.
///</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private int UpdateInsertedRows(dsQuery dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
int result = 0;
return result;
@@ -1008,7 +1008,7 @@ namespace FPJ0000.dsQueryTableAdapters {
///Delete rows in bottom-up order.
///</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private int UpdateDeletedRows(dsQuery dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows) {
int result = 0;
return result;
@@ -1018,7 +1018,7 @@ namespace FPJ0000.dsQueryTableAdapters {
///Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first
///</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
if (((updatedRows == null)
|| (updatedRows.Length < 1))) {
@@ -1042,7 +1042,7 @@ namespace FPJ0000.dsQueryTableAdapters {
///Update all changes to the dataset.
///</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public virtual int UpdateAll(dsQuery dataSet) {
if ((dataSet == null)) {
throw new global::System.ArgumentNullException("dataSet");
@@ -1152,13 +1152,13 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) {
global::System.Array.Sort<global::System.Data.DataRow>(rows, new SelfReferenceComparer(relation, childFirst));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) {
if ((this._connection != null)) {
return true;
@@ -1176,7 +1176,7 @@ namespace FPJ0000.dsQueryTableAdapters {
/// <summary>
///Update Order Option
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public enum UpdateOrderOption {
InsertUpdateDelete = 0,
@@ -1187,7 +1187,7 @@ namespace FPJ0000.dsQueryTableAdapters {
/// <summary>
///Used to sort self-referenced table's rows
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer<global::System.Data.DataRow> {
private global::System.Data.DataRelation _relation;
@@ -1195,7 +1195,7 @@ namespace FPJ0000.dsQueryTableAdapters {
private int _childFirst;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) {
this._relation = relation;
if (childFirst) {
@@ -1207,7 +1207,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private global::System.Data.DataRow GetRoot(global::System.Data.DataRow row, out int distance) {
global::System.Diagnostics.Debug.Assert((row != null));
global::System.Data.DataRow root = row;
@@ -1246,7 +1246,7 @@ namespace FPJ0000.dsQueryTableAdapters {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) {
if (object.ReferenceEquals(row1, row2)) {
return 0;

View File

@@ -2,4 +2,6 @@
<packages>
<package id="NetOffice.Core" version="1.7.4.4" targetFramework="net40" />
<package id="NetOffice.Outlook" version="1.7.4.4" targetFramework="net40" />
<package id="NetSpell" version="2.1.7" targetFramework="net45" />
<package id="RichTextBoxEx" version="1.0.0" targetFramework="net45" />
</packages>