임현대수석님 건의사항 적용.

This commit is contained in:
chi
2021-05-31 13:37:27 +09:00
parent ba02049737
commit 6590694e8b
15 changed files with 463 additions and 71 deletions

View File

@@ -154,7 +154,7 @@
priceLabel.AutoSize = true;
priceLabel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
priceLabel.ForeColor = System.Drawing.Color.White;
priceLabel.Location = new System.Drawing.Point(24, 371);
priceLabel.Location = new System.Drawing.Point(24, 388);
priceLabel.Name = "priceLabel";
priceLabel.Size = new System.Drawing.Size(42, 21);
priceLabel.TabIndex = 18;
@@ -166,7 +166,7 @@
label1.AutoSize = true;
label1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
label1.ForeColor = System.Drawing.Color.White;
label1.Location = new System.Drawing.Point(24, 402);
label1.Location = new System.Drawing.Point(24, 419);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(42, 21);
label1.TabIndex = 20;
@@ -178,7 +178,7 @@
label2.AutoSize = true;
label2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
label2.ForeColor = System.Drawing.Color.White;
label2.Location = new System.Drawing.Point(24, 340);
label2.Location = new System.Drawing.Point(24, 357);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(42, 21);
label2.TabIndex = 22;
@@ -190,7 +190,6 @@
this.bn.BindingSource = this.bs;
this.bn.CountItem = this.bindingNavigatorCountItem;
this.bn.DeleteItem = null;
this.bn.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bn.ImageScalingSize = new System.Drawing.Size(30, 30);
this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.bindingNavigatorMoveFirstItem,
@@ -207,7 +206,7 @@
this.tbFind,
this.btFind,
this.btAdd});
this.bn.Location = new System.Drawing.Point(0, 624);
this.bn.Location = new System.Drawing.Point(0, 0);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
@@ -263,7 +262,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -315,7 +313,6 @@
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbFind.Name = "tbFind";
this.tbFind.Size = new System.Drawing.Size(150, 37);
this.tbFind.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -358,9 +355,9 @@
this.panel1.Controls.Add(priceLabel);
this.panel1.Controls.Add(this.priceTextBox);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
this.panel1.Location = new System.Drawing.Point(794, 0);
this.panel1.Location = new System.Drawing.Point(794, 37);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(290, 438);
this.panel1.Size = new System.Drawing.Size(290, 455);
this.panel1.TabIndex = 2;
//
// linkLabel1
@@ -369,7 +366,7 @@
this.linkLabel1.AutoSize = true;
this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.linkLabel1.ForeColor = System.Drawing.Color.White;
this.linkLabel1.Location = new System.Drawing.Point(11, 184);
this.linkLabel1.Location = new System.Drawing.Point(11, 201);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(58, 21);
this.linkLabel1.TabIndex = 27;
@@ -383,7 +380,7 @@
| 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, 184);
this.pictureBox1.Location = new System.Drawing.Point(74, 201);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(202, 146);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -394,7 +391,7 @@
//
this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "unit", true));
this.textBox3.Location = new System.Drawing.Point(237, 337);
this.textBox3.Location = new System.Drawing.Point(237, 354);
this.textBox3.Name = "textBox3";
this.textBox3.ReadOnly = true;
this.textBox3.Size = new System.Drawing.Size(38, 25);
@@ -404,7 +401,7 @@
//
this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "scale", true));
this.textBox2.Location = new System.Drawing.Point(75, 337);
this.textBox2.Location = new System.Drawing.Point(75, 354);
this.textBox2.Name = "textBox2";
this.textBox2.ReadOnly = true;
this.textBox2.Size = new System.Drawing.Size(156, 25);
@@ -414,7 +411,7 @@
//
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
this.textBox1.Location = new System.Drawing.Point(75, 400);
this.textBox1.Location = new System.Drawing.Point(75, 417);
this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true;
this.textBox1.Size = new System.Drawing.Size(200, 25);
@@ -448,14 +445,14 @@
this.memoTextBox.Multiline = true;
this.memoTextBox.Name = "memoTextBox";
this.memoTextBox.ReadOnly = true;
this.memoTextBox.Size = new System.Drawing.Size(200, 94);
this.memoTextBox.Size = new System.Drawing.Size(200, 111);
this.memoTextBox.TabIndex = 13;
//
// priceTextBox
//
this.priceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true));
this.priceTextBox.Location = new System.Drawing.Point(75, 369);
this.priceTextBox.Location = new System.Drawing.Point(75, 386);
this.priceTextBox.Name = "priceTextBox";
this.priceTextBox.ReadOnly = true;
this.priceTextBox.Size = new System.Drawing.Size(200, 25);
@@ -485,11 +482,11 @@
this.fpSpread1.AccessibleDescription = "";
this.fpSpread1.ContextMenuStrip = this.cm1;
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fpSpread1.Location = new System.Drawing.Point(0, 0);
this.fpSpread1.Location = new System.Drawing.Point(0, 37);
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
this.fpSpread1.Size = new System.Drawing.Size(794, 438);
this.fpSpread1.Size = new System.Drawing.Size(794, 455);
this.fpSpread1.TabIndex = 4;
//
// cm1
@@ -722,7 +719,7 @@
this.panel2.Controls.Add(this.arDatagridView1);
this.panel2.Controls.Add(this.label3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(0, 438);
this.panel2.Location = new System.Drawing.Point(0, 492);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1084, 186);
this.panel2.TabIndex = 7;
@@ -730,7 +727,7 @@
// fLovItem
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1084, 661);
this.ClientSize = new System.Drawing.Size(1084, 678);
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);

View File

@@ -50,14 +50,17 @@ namespace FCM0000
this.fpSpread1.KeyDown += (s1, e1) => { btOK.PerformClick(); };
this.fpSpread1.CellDoubleClick += (s1, e1) => { btOK.PerformClick(); };
this.tbFind.Text = search_;
this.StartPosition = FormStartPosition.CenterScreen;
}
private void fLovItem_Load(object sender, EventArgs e)
{
refreshData(this.tbFind.Text);
this.Show();
Application.DoEvents();
if (this.bs.Count >0) fpSpread1.Focus();
refreshData(this.tbFind.Text);
if (this.bs.Count > 0) fpSpread1.Focus();
else
{
tbFind.Focus();
@@ -68,9 +71,10 @@ namespace FCM0000
Boolean searchOk = false;
void refreshData(string search)
{
if(search == "")
if (search == "")
{
// MessageBox.Show("검색어가 없습니다.");
FCOMMON.Util.MsgI("(품명,모델,SID)을 검색 한 후 없는 경우 '품목추가' 버튼을 이용해서 추가 하시기 바랍니다");
tbFind.Focus();
}
else
@@ -84,8 +88,8 @@ namespace FCM0000
this.arDatagridView1.AutoResizeColumns();
searchOk = true;
}
}
private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e)
@@ -146,7 +150,7 @@ namespace FCM0000
if (img1 != null) this.pictureBox1.Image = img1;
else this.pictureBox1.Image = null;
}
catch
catch
{
this.pictureBox1.Image = null;
}
@@ -219,14 +223,19 @@ namespace FCM0000
void Find()
{
var search = tbFind.Text.Trim();
refreshData(search);
if (search.isEmpty())
{
FCOMMON.Util.MsgE("검색어를 입력하세요");
return;
}
else refreshData(search);
tbFind.SelectAll();
tbFind.Focus();
}
private void btAdd_Click(object sender, EventArgs e)
{
if(searchOk==false)
if (searchOk == false)
{
FCOMMON.Util.MsgE("먼저 검색을 통해서 아이템을 찾은 후 없다면 신규추가를 눌러 주세요");
tbFind.Focus();
@@ -234,15 +243,15 @@ namespace FCM0000
return;
}
var f = new Item.fItemAdd();
if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
itemName = f.tbName.Text.Trim();
item = f.newIDX;
itemmodel = f.tbModel.Text.Trim();
itemManu = f.tbManu.Text.Trim();
decimal price;
decimal.TryParse(f.tbPrice.Text.Replace(",",""),out price);
itemprice =price;// decimal.Parse(f.tbPrice.Text.Trim().Replace(",",""));
decimal.TryParse(f.tbPrice.Text.Replace(",", ""), out price);
itemprice = price;// decimal.Parse(f.tbPrice.Text.Trim().Replace(",",""));
SID = f.tbSid.Text.Trim();
itemUnit = f.tbUnit.Text.Trim();
itemSupply = f.tbSupply.Text.Trim();

View File

@@ -230,19 +230,19 @@
<data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -295,6 +295,15 @@
<metadata name="bsPMP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>705, 17</value>
</metadata>
<metadata name="Storage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="bsPMP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>705, 17</value>
</metadata>
<metadata name="dSPMP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>614, 17</value>
</metadata>
<metadata name="dSPMP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>614, 17</value>
</metadata>