diff --git a/Project/History.txt b/Project/History.txt
index d8a58a1..93ef6c8 100644
--- a/Project/History.txt
+++ b/Project/History.txt
@@ -1,6 +1,11 @@
-181213 chi 구매등록시 필수항목 변경
+181214 chi NR구매 메뉴 한글화
+ 출력메뉴를 하단에서 상단으로 이동
+ 웹캠기능 추가
+ unit 가 저장되지 않는현상제거(김효천c)
+181213 chi 구매등록시 필수항목 변경
수령자는 비활성화 함
181212 chi 구매내역의 부서를 비고로 변경하고 크기를 50- >500으로 증가
+181212 chi 구매내역의 부서를 비고로 변경하고 크기를 50- >500으로 증가
181210 chi NR구매등록시 이미지 표시 및 추가 기능
NR구매목록에서 권한 없는 사람이 더블클릭으로 편집할 수 있는 버그 수정
이미지 크기를 640*480 내에서 자동 조정 됨
diff --git a/Project/Setting.cs b/Project/Setting.cs
index 5312882..52ccf42 100644
--- a/Project/Setting.cs
+++ b/Project/Setting.cs
@@ -45,6 +45,7 @@ namespace Project
public string Barcode { get; set; }
public string lastid { get; set; }
+ public int CamIndex { get; set; }
public Setting() : this(Util.CurrentPath + "setting.xml") {}
diff --git a/Project/fMain.cs b/Project/fMain.cs
index cfefba5..16ae9a8 100644
--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -78,6 +78,7 @@ namespace Project
if (!Pub.setting.Barcode.isEmpty()) Pub.barcode.PortName = Pub.setting.Barcode;
Pub.barcode.ReceiveData += barcode_ReceiveData;
+ FCOMMON.info.camIndex = Pub.setting.CamIndex;
UpdateControls();
tmDisplay.Start(); //display timer
@@ -145,6 +146,7 @@ namespace Project
fSetting f = new fSetting();
if (f.ShowDialog() == DialogResult.OK)
{
+ FCOMMON.info.camIndex = Pub.setting.CamIndex;
Pub.setting.Save();
Pub.log.AddI("Setting Save");
Pub.log.Add(Pub.setting.ToString());
diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj
index a27242c..f238998 100644
--- a/SubProject/FCM0000/FCM0000.csproj
+++ b/SubProject/FCM0000/FCM0000.csproj
@@ -70,6 +70,7 @@
+
diff --git a/SubProject/FCM0000/fItems.Designer.cs b/SubProject/FCM0000/fItems.Designer.cs
index 670abd3..86271b9 100644
--- a/SubProject/FCM0000/fItems.Designer.cs
+++ b/SubProject/FCM0000/fItems.Designer.cs
@@ -30,15 +30,15 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItems));
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.CurrencyCellType currencyCellType8 = new FarPoint.Win.Spread.CellType.CurrencyCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType();
+ 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();
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);
@@ -85,12 +85,14 @@
this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.columnHeader10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.label3 = new System.Windows.Forms.Label();
this.lvInDate = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.label2 = new System.Windows.Forms.Label();
this.memoTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
@@ -99,8 +101,7 @@
this.파일섡택ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.이미지붙여넣기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.taPurchase = new FCM0000.dsMSSQLTableAdapters.PurchaseTableAdapter();
- this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.columnHeader10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.촬영ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -173,7 +174,7 @@
// bindingNavigatorCountItem
//
this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
- this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22);
+ this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 28);
this.bindingNavigatorCountItem.Text = "/{0}";
this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
//
@@ -182,7 +183,7 @@
this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 22);
+ this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(86, 28);
this.bindingNavigatorDeleteItem.Text = "Delete(&D)";
//
// bindingNavigatorMoveFirstItem
@@ -191,7 +192,7 @@
this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(28, 28);
this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동";
//
// bindingNavigatorMovePreviousItem
@@ -200,13 +201,13 @@
this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(28, 28);
this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동";
//
// bindingNavigatorSeparator
//
this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
- this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
+ this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 31);
//
// bindingNavigatorPositionItem
//
@@ -220,7 +221,7 @@
// bindingNavigatorSeparator1
//
this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
- this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
+ this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 31);
//
// bindingNavigatorMoveNextItem
//
@@ -228,7 +229,7 @@
this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(28, 28);
this.bindingNavigatorMoveNextItem.Text = "다음으로 이동";
//
// bindingNavigatorMoveLastItem
@@ -237,38 +238,38 @@
this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(28, 28);
this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동";
//
// bindingNavigatorSeparator2
//
this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
- this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
+ this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 31);
//
// itemsBindingNavigatorSaveItem
//
this.itemsBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("itemsBindingNavigatorSaveItem.Image")));
this.itemsBindingNavigatorSaveItem.Name = "itemsBindingNavigatorSaveItem";
- this.itemsBindingNavigatorSaveItem.Size = new System.Drawing.Size(67, 22);
+ this.itemsBindingNavigatorSaveItem.Size = new System.Drawing.Size(75, 28);
this.itemsBindingNavigatorSaveItem.Text = "Save(&S)";
this.itemsBindingNavigatorSaveItem.Click += new System.EventHandler(this.itemsBindingNavigatorSaveItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
- this.toolStripLabel3.Size = new System.Drawing.Size(41, 22);
+ this.toolStripLabel3.Size = new System.Drawing.Size(41, 28);
this.toolStripLabel3.Text = "search";
//
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFind.Name = "tbFind";
- this.tbFind.Size = new System.Drawing.Size(100, 25);
+ this.tbFind.Size = new System.Drawing.Size(100, 31);
this.tbFind.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.btFind_KeyDown);
//
@@ -278,7 +279,7 @@
this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image")));
this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btFind.Name = "btFind";
- this.btFind.Size = new System.Drawing.Size(23, 22);
+ this.btFind.Size = new System.Drawing.Size(28, 28);
this.btFind.Text = "toolStripButton1";
this.btFind.Click += new System.EventHandler(this.toolStripButton1_Click_1);
//
@@ -387,7 +388,7 @@
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
- this.toolStripLabel2.Size = new System.Drawing.Size(55, 22);
+ this.toolStripLabel2.Size = new System.Drawing.Size(55, 28);
this.toolStripLabel2.Text = "Category";
//
// cmbCate
@@ -397,17 +398,17 @@
"Normal",
"Duplication"});
this.cmbCate.Name = "cmbCate";
- this.cmbCate.Size = new System.Drawing.Size(100, 25);
+ this.cmbCate.Size = new System.Drawing.Size(100, 31);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31);
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
- this.toolStripLabel1.Size = new System.Drawing.Size(68, 22);
+ this.toolStripLabel1.Size = new System.Drawing.Size(68, 28);
this.toolStripLabel1.Text = "Query Type";
//
// cmbMode
@@ -417,21 +418,21 @@
"Normal",
"Duplication"});
this.cmbMode.Name = "cmbMode";
- this.cmbMode.Size = new System.Drawing.Size(150, 25);
+ this.cmbMode.Size = new System.Drawing.Size(150, 31);
//
// toolStripButton2
//
this.toolStripButton2.Image = global::FCM0000.Properties.Resources.action_refresh;
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
- this.toolStripButton2.Size = new System.Drawing.Size(66, 22);
+ this.toolStripButton2.Size = new System.Drawing.Size(74, 28);
this.toolStripButton2.Text = "Refresh";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 31);
//
// fpSpread1
//
@@ -467,77 +468,77 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).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)))));
- numberCellType15.DecimalPlaces = 0;
- numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType15.MaximumValue = 2147483647D;
- numberCellType15.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType15;
+ 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;
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 = textCellType43;
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
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 = textCellType44;
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
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 = textCellType45;
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
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 = textCellType46;
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
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;
- currencyCellType8.DecimalPlaces = 0;
- currencyCellType8.MaximumValue = new decimal(new int[] {
+ currencyCellType1.DecimalPlaces = 0;
+ currencyCellType1.MaximumValue = new decimal(new int[] {
10000000,
0,
0,
0});
- currencyCellType8.MinimumValue = new decimal(new int[] {
+ currencyCellType1.MinimumValue = new decimal(new int[] {
10000000,
0,
0,
-2147483648});
- currencyCellType8.NegativeRed = true;
- currencyCellType8.NullDisplay = "--";
- currencyCellType8.Separator = ",";
- currencyCellType8.ShowSeparator = true;
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType8;
+ currencyCellType1.NegativeRed = true;
+ currencyCellType1.NullDisplay = "--";
+ currencyCellType1.Separator = ",";
+ currencyCellType1.ShowSeparator = true;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType1;
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 = textCellType47;
+ this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
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;
- numberCellType16.MaximumValue = 999999999999999D;
- numberCellType16.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType16;
+ numberCellType2.MaximumValue = 999999999999999D;
+ numberCellType2.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2;
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 = textCellType48;
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "unit";
this.fpSpread1_Sheet1.Columns.Get(8).Label = "단위";
this.fpSpread1_Sheet1.DataAutoCellTypes = false;
@@ -606,6 +607,11 @@
this.columnHeader8.Text = "금액";
this.columnHeader8.Width = 80;
//
+ // columnHeader10
+ //
+ this.columnHeader10.Text = "상태";
+ this.columnHeader10.Width = 70;
+ //
// label3
//
this.label3.Dock = System.Windows.Forms.DockStyle.Top;
@@ -651,6 +657,11 @@
this.columnHeader4.Text = "금액";
this.columnHeader4.Width = 80;
//
+ // columnHeader9
+ //
+ this.columnHeader9.Text = "상태";
+ this.columnHeader9.Width = 70;
+ //
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Top;
@@ -699,9 +710,10 @@
this.cmImage.Font = new System.Drawing.Font("맑은 고딕", 20F);
this.cmImage.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.파일섡택ToolStripMenuItem,
- this.이미지붙여넣기ToolStripMenuItem});
+ this.이미지붙여넣기ToolStripMenuItem,
+ this.촬영ToolStripMenuItem});
this.cmImage.Name = "cm1";
- this.cmImage.Size = new System.Drawing.Size(293, 88);
+ this.cmImage.Size = new System.Drawing.Size(293, 152);
//
// 파일섡택ToolStripMenuItem
//
@@ -721,15 +733,12 @@
//
this.taPurchase.ClearBeforeFill = true;
//
- // columnHeader9
+ // 촬영ToolStripMenuItem
//
- this.columnHeader9.Text = "상태";
- this.columnHeader9.Width = 70;
- //
- // columnHeader10
- //
- this.columnHeader10.Text = "상태";
- this.columnHeader10.Width = 70;
+ this.촬영ToolStripMenuItem.Name = "촬영ToolStripMenuItem";
+ this.촬영ToolStripMenuItem.Size = new System.Drawing.Size(292, 42);
+ this.촬영ToolStripMenuItem.Text = "촬영";
+ this.촬영ToolStripMenuItem.Click += new System.EventHandler(this.촬영ToolStripMenuItem_Click);
//
// fItems
//
@@ -827,5 +836,6 @@
private dsMSSQLTableAdapters.PurchaseTableAdapter taPurchase;
private System.Windows.Forms.ColumnHeader columnHeader10;
private System.Windows.Forms.ColumnHeader columnHeader9;
+ private System.Windows.Forms.ToolStripMenuItem 촬영ToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/SubProject/FCM0000/fItems.cs b/SubProject/FCM0000/fItems.cs
index fcba363..5ac17f5 100644
--- a/SubProject/FCM0000/fItems.cs
+++ b/SubProject/FCM0000/fItems.cs
@@ -285,5 +285,38 @@ namespace FCM0000
}
else this.pictureBox1.Image = image; //181208
}
+
+ private void 촬영ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var drv = this.bs.Current as DataRowView;
+ if (drv == null) return;
+ var dr = drv.Row as dsMSSQL.ItemsRow;
+ if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached ||
+ dr.RowState == DataRowState.Added)
+ {
+ FCOMMON.Util.MsgE("이미지는 등록 완료된 아이템만 가능합니다. 먼저 저장한 후 다시 시도하세요.");
+ return;
+ }
+
+ FCOMMON.fWebCamera f = new FCOMMON.fWebCamera(FCOMMON.info.camIndex);
+ if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ System.Drawing.Bitmap bmp = f.bmp.Clone() as System.Drawing.Bitmap;
+ Application.DoEvents();
+
+ if (!FCOMMON.DBM.setImageData(bmp, "Items", "image", dr.idx))
+ {
+ FCOMMON.Util.MsgE("등록 실패");
+ }
+ else
+ {
+ var oimag = this.pictureBox1.Image;
+ this.pictureBox1.Image = (Image)bmp;
+ if (oimag != null) oimag.Dispose();
+ }
+
+
+ }
+ }
}
}
diff --git a/SubProject/FCM0000/fItems.resx b/SubProject/FCM0000/fItems.resx
index a77e84c..0645bd3 100644
--- a/SubProject/FCM0000/fItems.resx
+++ b/SubProject/FCM0000/fItems.resx
@@ -209,9 +209,6 @@
GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
-
- 17, 17
-
389, 10
@@ -264,12 +261,12 @@
462, 17
- 823, 17
+ 17, 56
- 720, 17
+ 568, 17
- 975, 17
+ 169, 56
\ No newline at end of file
diff --git a/SubProject/FCM0000/fLovItem.Designer.cs b/SubProject/FCM0000/fLovItem.Designer.cs
index fb87ab1..44679e4 100644
--- a/SubProject/FCM0000/fLovItem.Designer.cs
+++ b/SubProject/FCM0000/fLovItem.Designer.cs
@@ -36,9 +36,9 @@
System.Windows.Forms.Label label1;
System.Windows.Forms.Label label2;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovItem));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FCM0000.dsMSSQL();
@@ -58,6 +58,8 @@
this.model = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1 = new System.Windows.Forms.Panel();
+ this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.textBox3 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.textBox1 = new System.Windows.Forms.TextBox();
@@ -67,8 +69,6 @@
this.priceTextBox = new System.Windows.Forms.TextBox();
this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter();
this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.linkLabel1 = new System.Windows.Forms.LinkLabel();
manuLabel = new System.Windows.Forms.Label();
supplyLabel = new System.Windows.Forms.Label();
memoLabel = new System.Windows.Forms.Label();
@@ -271,15 +271,15 @@
this.model,
this.dataGridViewTextBoxColumn3});
this.dv.DataSource = this.bs;
- dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle12.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle12.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3);
- dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dv.DefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3);
+ dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dv.DefaultCellStyle = dataGridViewCellStyle6;
this.dv.Dock = System.Windows.Forms.DockStyle.Fill;
this.dv.Location = new System.Drawing.Point(0, 0);
this.dv.Name = "dv";
@@ -295,9 +295,9 @@
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
- dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle4;
this.dataGridViewTextBoxColumn1.HeaderText = "IDX";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
@@ -314,8 +314,8 @@
// model
//
this.model.DataPropertyName = "model";
- dataGridViewCellStyle11.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.model.DefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.model.DefaultCellStyle = dataGridViewCellStyle5;
this.model.HeaderText = "model";
this.model.Name = "model";
this.model.ReadOnly = true;
@@ -352,6 +352,30 @@
this.panel1.Size = new System.Drawing.Size(290, 502);
this.panel1.TabIndex = 2;
//
+ // linkLabel1
+ //
+ this.linkLabel1.AutoSize = true;
+ this.linkLabel1.Location = new System.Drawing.Point(13, 249);
+ this.linkLabel1.Name = "linkLabel1";
+ this.linkLabel1.Size = new System.Drawing.Size(51, 18);
+ this.linkLabel1.TabIndex = 27;
+ this.linkLabel1.TabStop = true;
+ this.linkLabel1.Text = "Image";
+ this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.pictureBox1.BackColor = System.Drawing.Color.Black;
+ this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pictureBox1.Location = new System.Drawing.Point(74, 248);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(202, 146);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox1.TabIndex = 26;
+ this.pictureBox1.TabStop = false;
+ //
// textBox3
//
this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -438,34 +462,11 @@
this.tam.MailDataTableAdapter = null;
this.tam.MailFormTableAdapter = null;
this.tam.ProjectsTableAdapter = null;
+ this.tam.PurchaseTableAdapter = null;
this.tam.RequestItemTableAdapter = null;
this.tam.StaffTableAdapter = null;
this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
- // pictureBox1
- //
- this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.pictureBox1.BackColor = System.Drawing.Color.Black;
- this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pictureBox1.Location = new System.Drawing.Point(74, 248);
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(202, 146);
- this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox1.TabIndex = 26;
- this.pictureBox1.TabStop = false;
- //
- // linkLabel1
- //
- this.linkLabel1.AutoSize = true;
- this.linkLabel1.Location = new System.Drawing.Point(13, 249);
- this.linkLabel1.Name = "linkLabel1";
- this.linkLabel1.Size = new System.Drawing.Size(51, 18);
- this.linkLabel1.TabIndex = 27;
- this.linkLabel1.TabStop = true;
- this.linkLabel1.Text = "Image";
- this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
- //
// fLovItem
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
diff --git a/SubProject/FCM0000/fLovItem.cs b/SubProject/FCM0000/fLovItem.cs
index f6dd843..32bf5bd 100644
--- a/SubProject/FCM0000/fLovItem.cs
+++ b/SubProject/FCM0000/fLovItem.cs
@@ -16,7 +16,7 @@ namespace FCM0000
public string itemmodel = string.Empty;
public decimal itemprice = 0;
public string SID = string.Empty;
-
+ public string itemUnit = "EA";
public string itemSupply = string.Empty;
public int itemSupplyidx = -1;
@@ -49,6 +49,7 @@ namespace FCM0000
itemprice = 0;
itemSupply = string.Empty;
itemSupplyidx = -1;
+ itemUnit = "EA";
SID = string.Empty;
return;
}
@@ -66,6 +67,8 @@ namespace FCM0000
else itemSupply = dr.supply;
if (dr.IssupplyidxNull()) itemSupplyidx = -1;
else itemSupplyidx = dr.supplyidx;
+ if (dr.IsunitNull()) itemUnit = "EA";
+ else itemUnit = dr.unit;
SID = dr.sid;
}
diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs
index 422e017..927e6fb 100644
--- a/SubProject/FCOMMON/DataBaseManager.cs
+++ b/SubProject/FCOMMON/DataBaseManager.cs
@@ -66,7 +66,10 @@ namespace FCOMMON
sm.Dispose();
return buffer;
}
-
+ public static Boolean setImageData(System.Drawing.Bitmap img, string table, string field, int idx)
+ {
+ return setImageData((System.Drawing.Image)img, table, field, idx);
+ }
public static Boolean setImageData(System.Drawing.Image img, string table, string field, int idx)
{
if (img == null || img.Width < 1||img.Height < 1) return false;
diff --git a/SubProject/FCOMMON/FCOMMON.csproj b/SubProject/FCOMMON/FCOMMON.csproj
index f5fede2..24207fa 100644
--- a/SubProject/FCOMMON/FCOMMON.csproj
+++ b/SubProject/FCOMMON/FCOMMON.csproj
@@ -11,6 +11,7 @@
FCOMMON
v4.0
512
+ b79f5d14
true
@@ -34,6 +35,14 @@
..\..\DLL\ArSetting.Net4.dll
+
+ ..\..\packages\EMGU.CV.3.4.3.3016\lib\net35\Emgu.CV.UI.dll
+ True
+
+
+ ..\..\packages\EMGU.CV.3.4.3.3016\lib\net35\Emgu.CV.World.dll
+ True
+
@@ -50,6 +59,7 @@
+
@@ -57,6 +67,10 @@
+
+ ..\..\packages\ZedGraph.5.1.7\lib\net35-Client\ZedGraph.dll
+ True
+
@@ -73,6 +87,12 @@
fLovDateList.cs
+
+ Form
+
+
+ fWebCamera.cs
+
@@ -87,9 +107,25 @@
fLovDateList.cs
+
+ fWebCamera.cs
+
+
+
+
+
+
+
+
+
+
+ 이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하세요. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하세요. 누락된 파일은 {0}입니다.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/SubProject/FCOMMON/packages.config b/SubProject/FCOMMON/packages.config
new file mode 100644
index 0000000..9379d44
--- /dev/null
+++ b/SubProject/FCOMMON/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
index 7a45897..b7cf458 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
@@ -30,29 +30,29 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase));
- FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
- 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.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType154 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType155 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType156 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType157 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType158 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType159 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType160 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType161 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType46 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType162 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType47 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType163 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType48 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType164 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType49 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType165 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType50 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType166 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType167 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType168 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType169 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType170 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType10 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
this.dsPurchase = new FEQ0000.dsPurchase();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -69,11 +69,9 @@
this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.btEdit = new System.Windows.Forms.ToolStripButton();
this.btSave = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.lbSum = new System.Windows.Forms.ToolStripLabel();
this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
@@ -113,6 +111,9 @@
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
+ this.toolStripButton3 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.집계ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -163,11 +164,9 @@
this.bindingNavigatorSeparator2,
this.bindingNavigatorAddNewItem,
this.bindingNavigatorDeleteItem,
- this.toolStripButton1,
this.btEdit,
this.btSave,
this.toolStripSeparator1,
- this.toolStripSeparator4,
this.lbSum,
this.toolStripLabel5,
this.toolStripLabel2,
@@ -256,8 +255,8 @@
this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(73, 28);
- this.bindingNavigatorAddNewItem.Text = "Add(&A)";
+ this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(75, 28);
+ this.bindingNavigatorAddNewItem.Text = "추가(&A)";
this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
//
// bindingNavigatorDeleteItem
@@ -265,27 +264,17 @@
this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(86, 28);
- this.bindingNavigatorDeleteItem.Text = "Delete(&D)";
+ this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(76, 28);
+ this.bindingNavigatorDeleteItem.Text = "삭제(&D)";
this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click);
//
- // toolStripButton1
- //
- this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
- this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(130, 28);
- this.toolStripButton1.Text = "Report(Summary)";
- this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
- //
// btEdit
//
this.btEdit.Image = ((System.Drawing.Image)(resources.GetObject("btEdit.Image")));
this.btEdit.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btEdit.Name = "btEdit";
- this.btEdit.Size = new System.Drawing.Size(69, 28);
- this.btEdit.Text = "Edit(&E)";
+ this.btEdit.Size = new System.Drawing.Size(73, 28);
+ this.btEdit.Text = "편집(&E)";
this.btEdit.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// btSave
@@ -293,8 +282,8 @@
this.btSave.Image = global::FEQ0000.Properties.Resources.action_save;
this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btSave.Name = "btSave";
- this.btSave.Size = new System.Drawing.Size(75, 28);
- this.btSave.Text = "Save(&S)";
+ this.btSave.Size = new System.Drawing.Size(74, 28);
+ this.btSave.Text = "저장(&S)";
this.btSave.Click += new System.EventHandler(this.btSave_Click);
//
// toolStripSeparator1
@@ -302,12 +291,6 @@
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31);
//
- // toolStripSeparator4
- //
- this.toolStripSeparator4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 31);
- //
// lbSum
//
this.lbSum.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -320,14 +303,14 @@
//
this.toolStripLabel5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripLabel5.Name = "toolStripLabel5";
- this.toolStripLabel5.Size = new System.Drawing.Size(58, 28);
- this.toolStripLabel5.Text = "Sub Total";
+ this.toolStripLabel5.Size = new System.Drawing.Size(31, 28);
+ this.toolStripLabel5.Text = "합계";
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
- this.toolStripLabel2.Size = new System.Drawing.Size(43, 28);
- this.toolStripLabel2.Text = "Search";
+ this.toolStripLabel2.Size = new System.Drawing.Size(31, 28);
+ this.toolStripLabel2.Text = "검색";
//
// tbFind
//
@@ -463,10 +446,12 @@
this.toolStripSeparator3,
this.toolStripLabel3,
this.tbRequest,
+ this.toolStripSeparator4,
this.btSearch,
this.toolStripSeparator5,
this.toolStripDropDownButton1,
this.btViewDel,
+ this.toolStripButton3,
this.toolStripButton2});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
@@ -478,9 +463,9 @@
//
this.cmDate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmDate.Items.AddRange(new object[] {
- "Date",
- "InDate",
- "ExpDate"});
+ "등록일",
+ "입고일",
+ "입고예정일"});
this.cmDate.Name = "cmDate";
this.cmDate.Size = new System.Drawing.Size(75, 31);
//
@@ -515,14 +500,14 @@
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
- this.toolStripLabel1.Size = new System.Drawing.Size(34, 28);
- this.toolStripLabel1.Text = "State";
+ this.toolStripLabel1.Size = new System.Drawing.Size(31, 28);
+ this.toolStripLabel1.Text = "상태";
//
// cmbState
//
this.cmbState.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbState.Name = "cmbState";
- this.cmbState.Size = new System.Drawing.Size(100, 31);
+ this.cmbState.Size = new System.Drawing.Size(90, 31);
//
// toolStripSeparator3
//
@@ -532,8 +517,8 @@
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
- this.toolStripLabel3.Size = new System.Drawing.Size(66, 28);
- this.toolStripLabel3.Text = "User Name";
+ this.toolStripLabel3.Size = new System.Drawing.Size(43, 28);
+ this.toolStripLabel3.Text = "사용자";
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
//
// tbRequest
@@ -549,8 +534,8 @@
this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btSearch.Name = "btSearch";
- this.btSearch.Size = new System.Drawing.Size(89, 28);
- this.btSearch.Text = "Refresh(&R)";
+ this.btSearch.Size = new System.Drawing.Size(98, 28);
+ this.btSearch.Text = "새로고침(&R)";
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
//
// toolStripSeparator5
@@ -663,7 +648,7 @@
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType18;
+ this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType154;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일";
@@ -671,7 +656,7 @@
this.fpSpread1_Sheet1.Columns.Get(0).Width = 82F;
this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType19;
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType155;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태";
@@ -679,144 +664,144 @@
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 66F;
this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType20;
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType156;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
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 = 67F;
- this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType21;
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType157;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "request";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청";
this.fpSpread1_Sheet1.Columns.Get(3).Width = 48F;
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType22;
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType158;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc";
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "SC#";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Width = 27F;
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType23;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType159;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "receive";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "수령";
this.fpSpread1_Sheet1.Columns.Get(5).Width = 46F;
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoSort = true;
- this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType24;
+ this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType160;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sid";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "SID#";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Width = 55F;
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType25;
+ this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType161;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumname";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "품명";
this.fpSpread1_Sheet1.Columns.Get(7).Width = 33F;
this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType6.DecimalPlaces = 0;
- numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType6.MaximumValue = 2147483647D;
- numberCellType6.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType6;
+ numberCellType46.DecimalPlaces = 0;
+ numberCellType46.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType46.MaximumValue = 2147483647D;
+ numberCellType46.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType46;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumidx";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(8).Width = 14F;
- this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType26;
+ this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType162;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumscale";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(9).Label = "모델";
this.fpSpread1_Sheet1.Columns.Get(9).Width = 43F;
- numberCellType7.DecimalPlaces = 0;
- numberCellType7.NegativeRed = true;
- numberCellType7.NullDisplay = "--";
- numberCellType7.Separator = ",";
- numberCellType7.ShowSeparator = true;
- numberCellType7.ShrinkToFit = true;
- this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType7;
+ numberCellType47.DecimalPlaces = 0;
+ numberCellType47.NegativeRed = true;
+ numberCellType47.NullDisplay = "--";
+ numberCellType47.Separator = ",";
+ numberCellType47.ShowSeparator = true;
+ numberCellType47.ShrinkToFit = true;
+ this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType47;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumqty";
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Label = "수량";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 44F;
- this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType27;
+ this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType163;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumunit";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위";
this.fpSpread1_Sheet1.Columns.Get(11).Width = 46F;
- numberCellType8.DecimalPlaces = 0;
- numberCellType8.NegativeRed = true;
- numberCellType8.NullDisplay = "--";
- numberCellType8.Separator = ",";
- numberCellType8.ShowSeparator = true;
- numberCellType8.ShrinkToFit = true;
- this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType8;
+ numberCellType48.DecimalPlaces = 0;
+ numberCellType48.NegativeRed = true;
+ numberCellType48.NullDisplay = "--";
+ numberCellType48.Separator = ",";
+ numberCellType48.ShowSeparator = true;
+ numberCellType48.ShrinkToFit = true;
+ this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType48;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumprice";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "단가";
this.fpSpread1_Sheet1.Columns.Get(12).Width = 35F;
- this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType8;
+ this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType48;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumamt";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(13).Label = "합계금액";
this.fpSpread1_Sheet1.Columns.Get(13).Width = 32F;
this.fpSpread1_Sheet1.Columns.Get(14).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType28;
+ this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType164;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "supply";
this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(14).Label = "공급업체";
this.fpSpread1_Sheet1.Columns.Get(14).Width = 46F;
this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType9.DecimalPlaces = 0;
- numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType9.MaximumValue = 2147483647D;
- numberCellType9.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType9;
+ numberCellType49.DecimalPlaces = 0;
+ numberCellType49.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType49.MaximumValue = 2147483647D;
+ numberCellType49.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType49;
this.fpSpread1_Sheet1.Columns.Get(15).DataField = "supplyidx";
this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(15).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(15).Width = 14F;
- this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType29;
+ this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType165;
this.fpSpread1_Sheet1.Columns.Get(16).DataField = "project";
this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(16).Label = "관련프로젝트";
this.fpSpread1_Sheet1.Columns.Get(16).Width = 46F;
this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType10.DecimalPlaces = 0;
- numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType10.MaximumValue = 2147483647D;
- numberCellType10.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType10;
+ numberCellType50.DecimalPlaces = 0;
+ numberCellType50.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType50.MaximumValue = 2147483647D;
+ numberCellType50.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType50;
this.fpSpread1_Sheet1.Columns.Get(17).DataField = "projectidx";
this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(17).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(17).Width = 14F;
- this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType30;
+ this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType166;
this.fpSpread1_Sheet1.Columns.Get(18).DataField = "asset";
this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(18).Label = "자산번호";
this.fpSpread1_Sheet1.Columns.Get(18).Width = 35F;
- this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType31;
+ this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType167;
this.fpSpread1_Sheet1.Columns.Get(19).DataField = "edate";
this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(19).Label = "입고예정";
this.fpSpread1_Sheet1.Columns.Get(19).Width = 38F;
- this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType32;
+ this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType168;
this.fpSpread1_Sheet1.Columns.Get(20).DataField = "indate";
this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(20).Label = "입고일";
this.fpSpread1_Sheet1.Columns.Get(20).Width = 42F;
- this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType33;
+ this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType169;
this.fpSpread1_Sheet1.Columns.Get(21).DataField = "po";
this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(21).Label = "PO#";
this.fpSpread1_Sheet1.Columns.Get(21).Width = 23F;
- this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType34;
+ this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType170;
this.fpSpread1_Sheet1.Columns.Get(22).DataField = "dept";
this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(22).Label = "비고";
this.fpSpread1_Sheet1.Columns.Get(22).Width = 33F;
- this.fpSpread1_Sheet1.Columns.Get(23).CellType = checkBoxCellType2;
+ this.fpSpread1_Sheet1.Columns.Get(23).CellType = checkBoxCellType10;
this.fpSpread1_Sheet1.Columns.Get(23).DataField = "isdel";
this.fpSpread1_Sheet1.Columns.Get(23).Label = "삭제됨";
this.fpSpread1_Sheet1.Columns.Get(23).Tag = "isdel";
@@ -826,6 +811,28 @@
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
+ // toolStripButton3
+ //
+ this.toolStripButton3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.집계ToolStripMenuItem});
+ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
+ this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton3.Name = "toolStripButton3";
+ this.toolStripButton3.Size = new System.Drawing.Size(68, 28);
+ this.toolStripButton3.Text = "출력";
+ //
+ // 집계ToolStripMenuItem
+ //
+ this.집계ToolStripMenuItem.Name = "집계ToolStripMenuItem";
+ this.집계ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.집계ToolStripMenuItem.Text = "집계";
+ this.집계ToolStripMenuItem.Click += new System.EventHandler(this.집계ToolStripMenuItem_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 31);
+ //
// fPurchase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -879,7 +886,6 @@
private System.Windows.Forms.ContextMenuStrip cm1;
private System.Windows.Forms.ToolStripLabel toolStripLabel3;
private System.Windows.Forms.ToolStripTextBox tbRequest;
- private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripLabel toolStripLabel5;
private System.Windows.Forms.ToolStripLabel lbSum;
@@ -891,7 +897,6 @@
private System.Windows.Forms.ToolStripMenuItem viewThisUserDataToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem copyDataToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripTextBox tbFind;
private System.Windows.Forms.ToolStripButton btFind;
@@ -915,5 +920,8 @@
private System.Windows.Forms.ToolStripButton btViewDel;
private System.Windows.Forms.ToolStripButton toolStripButton2;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+ private System.Windows.Forms.ToolStripDropDownButton toolStripButton3;
+ private System.Windows.Forms.ToolStripMenuItem 집계ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
}
}
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs
index 0e3153b..6aeae8b 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.cs
@@ -241,9 +241,7 @@ namespace FEQ0000
private void toolStripButton1_Click_1(object sender, EventArgs e)
{
- Purchase.rPurchase f = new Purchase.rPurchase();
- f.MdiParent = this.MdiParent;
- f.Show();
+
}
private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e)
@@ -689,5 +687,12 @@ namespace FEQ0000
refreshData();
}
+ private void 집계ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ Purchase.rPurchase f = new Purchase.rPurchase();
+ f.MdiParent = this.MdiParent;
+ f.Show();
+ }
+
}
}
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx
index 38f0767..dd72191 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase.resx
@@ -195,21 +195,6 @@
86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
- YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
- 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
- bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
- VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
- c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
- Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
- mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
- kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
- TgDQASA1MVpwzwAAAABJRU5ErkJggg==
@@ -329,4 +314,20 @@
577, 17
+
+
+ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJlSURBVGhD7Za9SlxRFIXnBYKMhWRmxCoPkLyDYOUPo6bI
+ IwxWQiRdCiFYSBDSWQjCEObnBexNk1TJNJbRImIhxCKiEfRk9mXdcDiz7njvzrkbArPgY37uYe21mH25
+ U5loopK19+W3K4fbtxhRrvjwf2P/6x3eG5QIh8fg5Oe9XYlweAzOrh/sSoTDYyAFzEqEw2OQFjApEQ6P
+ gV+g9BLh8BiEBUotEQ6PASsglFIiHB4DFj4leolweAxYcB+/BGLoFQ63BjH0YqaWIIZezNQSxNCLmVqC
+ GHoxU0sQQy9magli6MVMY9Fqf3eNtV5Cq31KzyCGXsw0FrPrPfdk4TBh9mWfnkEMvZhpLGaa3f+3wPbx
+ jZt7M3BTSx1XW+u7jY9n9Bxi6MVMs5Cdrq32XH3MTqfMH1y6uZ0fySu7noIYejHTLPydbqzzlRA2j34l
+ 4Z/tnie/BDuTghh6MdMs/J2eXum6d59Gw73/fOuef7hICrzqX41cD0EMvZgpw9/p6nLX1bcG7sUwaFhC
+ Qkt4KSFl/GsMxNCLmTL8nZbQEl4++yWkpKyNfC9rFHowEEMvZhrCdpqVyHvj+iCGXszUZ9xOpyVqr7+5
+ 6nC1phY7yZo9duP6IIZezNTnsZ2WEtXlzt+be6bZGzkzDsTQi5mm5N3pRo6/DFkghl7MNCXvTstDTUrU
+ xzxxs0AMvZipPHGfDldBs9NFQQy9mKn/xC2600VBDL2YaZ6/wbFADL2Yqey0lJDwRXe6KIihFzO1BDH0
+ YqaWIIZezNQSxNCLmVqCGHoxU0sQQy9magli6MVMLUGMiSYqR5XKHzP/iFmrzyd6AAAAAElFTkSuQmCC
+
+
\ No newline at end of file
diff --git a/packages/repositories.config b/packages/repositories.config
index 0e3f828..3454723 100644
--- a/packages/repositories.config
+++ b/packages/repositories.config
@@ -3,4 +3,5 @@
+
\ No newline at end of file