This commit is contained in:
chi
2023-03-08 13:26:54 +09:00
parent 8b6b25830e
commit 8d230307b4
4 changed files with 933 additions and 888 deletions

View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("23.03.07.2300")]
[assembly: AssemblyFileVersion("23.03.07.2300")]
[assembly: AssemblyVersion("23.03.08.1300")]
[assembly: AssemblyFileVersion("23.03.08.1300")]

View File

@@ -51,6 +51,7 @@
System.Windows.Forms.Label label8;
System.Windows.Forms.Label label9;
System.Windows.Forms.Label label10;
System.Windows.Forms.Label label11;
this.tbSC = new System.Windows.Forms.TextBox();
this.tbSID = new System.Windows.Forms.TextBox();
this.tbPumName = new System.Windows.Forms.TextBox();
@@ -79,6 +80,7 @@
this.chkExp = new System.Windows.Forms.CheckBox();
this.btSaveAdd = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.tbStorage = new System.Windows.Forms.TextBox();
this.tbPumPriceD = new System.Windows.Forms.TextBox();
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
@@ -97,7 +99,7 @@
this.dsPurchase = new FEQ0000.dsPurchase();
this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
this.tbStorage = new System.Windows.Forms.TextBox();
this.tbInQty = new System.Windows.Forms.TextBox();
processLabel = new System.Windows.Forms.Label();
receiveLabel = new System.Windows.Forms.Label();
scLabel = new System.Windows.Forms.Label();
@@ -119,6 +121,7 @@
label8 = new System.Windows.Forms.Label();
label9 = new System.Windows.Forms.Label();
label10 = new System.Windows.Forms.Label();
label11 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -129,7 +132,7 @@
// processLabel
//
processLabel.AutoSize = true;
processLabel.Location = new System.Drawing.Point(57, 130);
processLabel.Location = new System.Drawing.Point(57, 165);
processLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
processLabel.Name = "processLabel";
processLabel.Size = new System.Drawing.Size(39, 20);
@@ -149,7 +152,7 @@
// scLabel
//
scLabel.AutoSize = true;
scLabel.Location = new System.Drawing.Point(69, 160);
scLabel.Location = new System.Drawing.Point(69, 195);
scLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
scLabel.Name = "scLabel";
scLabel.Size = new System.Drawing.Size(27, 20);
@@ -209,7 +212,7 @@
// assetLabel
//
assetLabel.AutoSize = true;
assetLabel.Location = new System.Drawing.Point(24, 326);
assetLabel.Location = new System.Drawing.Point(24, 361);
assetLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
assetLabel.Name = "assetLabel";
assetLabel.Size = new System.Drawing.Size(69, 20);
@@ -219,7 +222,7 @@
// poLabel
//
poLabel.AutoSize = true;
poLabel.Location = new System.Drawing.Point(66, 190);
poLabel.Location = new System.Drawing.Point(66, 225);
poLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
poLabel.Name = "poLabel";
poLabel.Size = new System.Drawing.Size(30, 20);
@@ -250,7 +253,7 @@
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(12, 290);
label2.Location = new System.Drawing.Point(12, 325);
label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(84, 20);
@@ -260,7 +263,7 @@
// label4
//
label4.AutoSize = true;
label4.Location = new System.Drawing.Point(24, 254);
label4.Location = new System.Drawing.Point(24, 289);
label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label4.Name = "label4";
label4.Size = new System.Drawing.Size(69, 20);
@@ -270,7 +273,7 @@
// label5
//
label5.AutoSize = true;
label5.Location = new System.Drawing.Point(36, 221);
label5.Location = new System.Drawing.Point(36, 256);
label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label5.Name = "label5";
label5.Size = new System.Drawing.Size(59, 20);
@@ -332,9 +335,19 @@
label9.TabIndex = 37;
label9.Text = "해외물품은 좌측 단가를 입력";
//
// label10
//
label10.AutoSize = true;
label10.Location = new System.Drawing.Point(287, 286);
label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label10.Name = "label10";
label10.Size = new System.Drawing.Size(75, 20);
label10.TabIndex = 38;
label10.Text = "STORAGE";
//
// tbSC
//
this.tbSC.Location = new System.Drawing.Point(104, 156);
this.tbSC.Location = new System.Drawing.Point(104, 191);
this.tbSC.Margin = new System.Windows.Forms.Padding(4);
this.tbSC.Name = "tbSC";
this.tbSC.Size = new System.Drawing.Size(286, 27);
@@ -461,7 +474,7 @@
//
// tbPO
//
this.tbPO.Location = new System.Drawing.Point(104, 187);
this.tbPO.Location = new System.Drawing.Point(104, 222);
this.tbPO.Margin = new System.Windows.Forms.Padding(4);
this.tbPO.Name = "tbPO";
this.tbPO.Size = new System.Drawing.Size(286, 27);
@@ -517,7 +530,7 @@
this.cbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.cbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbProcess.FormattingEnabled = true;
this.cbProcess.Location = new System.Drawing.Point(104, 125);
this.cbProcess.Location = new System.Drawing.Point(104, 160);
this.cbProcess.Margin = new System.Windows.Forms.Padding(4);
this.cbProcess.Name = "cbProcess";
this.cbProcess.Size = new System.Drawing.Size(286, 28);
@@ -673,6 +686,15 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "필수입력";
//
// tbStorage
//
this.tbStorage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.tbStorage.Location = new System.Drawing.Point(370, 283);
this.tbStorage.Margin = new System.Windows.Forms.Padding(4);
this.tbStorage.Name = "tbStorage";
this.tbStorage.Size = new System.Drawing.Size(104, 27);
this.tbStorage.TabIndex = 39;
//
// tbPumPriceD
//
this.tbPumPriceD.ForeColor = System.Drawing.Color.Blue;
@@ -718,6 +740,8 @@
// groupBox2
//
this.groupBox2.BackColor = System.Drawing.Color.Gainsboro;
this.groupBox2.Controls.Add(this.tbInQty);
this.groupBox2.Controls.Add(label11);
this.groupBox2.Controls.Add(this.button7);
this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button5);
@@ -754,7 +778,7 @@
//
// button7
//
this.button7.Location = new System.Drawing.Point(6, 454);
this.button7.Location = new System.Drawing.Point(6, 489);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(93, 27);
this.button7.TabIndex = 36;
@@ -764,7 +788,7 @@
//
// button6
//
this.button6.Location = new System.Drawing.Point(6, 422);
this.button6.Location = new System.Drawing.Point(6, 457);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(93, 27);
this.button6.TabIndex = 35;
@@ -774,7 +798,7 @@
//
// button5
//
this.button5.Location = new System.Drawing.Point(6, 390);
this.button5.Location = new System.Drawing.Point(6, 425);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(93, 27);
this.button5.TabIndex = 34;
@@ -784,7 +808,7 @@
//
// button4
//
this.button4.Location = new System.Drawing.Point(6, 358);
this.button4.Location = new System.Drawing.Point(6, 393);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(93, 27);
this.button4.TabIndex = 33;
@@ -795,7 +819,7 @@
// tbOrderNo
//
this.tbOrderNo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.tbOrderNo.Location = new System.Drawing.Point(104, 218);
this.tbOrderNo.Location = new System.Drawing.Point(104, 253);
this.tbOrderNo.Margin = new System.Windows.Forms.Padding(4);
this.tbOrderNo.Name = "tbOrderNo";
this.tbOrderNo.Size = new System.Drawing.Size(286, 27);
@@ -808,7 +832,7 @@
this.cbManuProc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbManuProc.FormattingEnabled = true;
this.cbManuProc.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.cbManuProc.Location = new System.Drawing.Point(104, 251);
this.cbManuProc.Location = new System.Drawing.Point(104, 286);
this.cbManuProc.Margin = new System.Windows.Forms.Padding(4);
this.cbManuProc.Name = "cbManuProc";
this.cbManuProc.Size = new System.Drawing.Size(286, 28);
@@ -821,7 +845,7 @@
this.cbEQModel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbEQModel.FormattingEnabled = true;
this.cbEQModel.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.cbEQModel.Location = new System.Drawing.Point(104, 323);
this.cbEQModel.Location = new System.Drawing.Point(104, 358);
this.cbEQModel.Margin = new System.Windows.Forms.Padding(4);
this.cbEQModel.Name = "cbEQModel";
this.cbEQModel.Size = new System.Drawing.Size(286, 28);
@@ -834,7 +858,7 @@
this.cbEQManu.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbEQManu.FormattingEnabled = true;
this.cbEQManu.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.cbEQManu.Location = new System.Drawing.Point(104, 287);
this.cbEQManu.Location = new System.Drawing.Point(104, 322);
this.cbEQManu.Margin = new System.Windows.Forms.Padding(4);
this.cbEQManu.Name = "cbEQManu";
this.cbEQManu.Size = new System.Drawing.Size(286, 28);
@@ -844,9 +868,9 @@
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Gray;
this.pictureBox1.Location = new System.Drawing.Point(104, 358);
this.pictureBox1.Location = new System.Drawing.Point(104, 393);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(286, 148);
this.pictureBox1.Size = new System.Drawing.Size(286, 123);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 17;
this.pictureBox1.TabStop = false;
@@ -866,24 +890,24 @@
//
this.purchaseTableAdapter.ClearBeforeFill = true;
//
// tbStorage
// tbInQty
//
this.tbStorage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.tbStorage.Location = new System.Drawing.Point(370, 283);
this.tbStorage.Margin = new System.Windows.Forms.Padding(4);
this.tbStorage.Name = "tbStorage";
this.tbStorage.Size = new System.Drawing.Size(104, 27);
this.tbStorage.TabIndex = 39;
this.tbInQty.Location = new System.Drawing.Point(104, 125);
this.tbInQty.Margin = new System.Windows.Forms.Padding(4);
this.tbInQty.Name = "tbInQty";
this.tbInQty.Size = new System.Drawing.Size(286, 27);
this.tbInQty.TabIndex = 38;
this.tbInQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// label10
// label11
//
label10.AutoSize = true;
label10.Location = new System.Drawing.Point(287, 286);
label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label10.Name = "label10";
label10.Size = new System.Drawing.Size(75, 20);
label10.TabIndex = 38;
label10.Text = "STORAGE";
label11.AutoSize = true;
label11.Location = new System.Drawing.Point(27, 129);
label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label11.Name = "label11";
label11.Size = new System.Drawing.Size(69, 20);
label11.TabIndex = 37;
label11.Text = "입고수량";
//
// fPurchase_Add
//
@@ -963,5 +987,6 @@
private System.Windows.Forms.Button button7;
private System.Windows.Forms.TextBox tbPumPriceD;
private System.Windows.Forms.TextBox tbStorage;
private System.Windows.Forms.TextBox tbInQty;
}
}

View File

@@ -217,6 +217,9 @@ namespace FEQ0000
tbBigo.Text = dr.bigo;
dtInDate.Text = dr.indate;
dtExpDate.Text = dr.edate;
if (dr.IsinqtyNull() == false)
tbInQty.Text = dr.inqty.ToString();
//else tbInQty.Text = "0";
//chkInDate.Checked = !dr.IsindateNull();
//chkExp.Checked = !dr.IsedateNull();
@@ -495,6 +498,19 @@ namespace FEQ0000
}
if (chkInDate.Checked)
{
if (int.TryParse(tbInQty.Text.Replace(",", ""), out int qty) == false)
{
if (FCOMMON.Util.MsgQ("입고 정보가 설정되어 있지만 입고 수량값이 없습니다") != DialogResult.Yes)
{
tbInQty.Focus();
tbInQty.SelectAll();
return false;
}
}
}
var overtime = DateTime.Now - DateTime.Parse("2019-01-09 00:00:00");
if (overtime.TotalSeconds > 0)
{
@@ -691,6 +707,7 @@ namespace FEQ0000
dr.po = tbPO.Text;
dr.orderno = tbOrderNo.Text;
dr.bigo = tbBigo.Text;
dr.inqty = int.Parse(tbInQty.Text.Replace(",", ""));
//품정보가 업데이트 되어있으면 해당 데이터의 이미지를 업데이트 한다.(크기비교)
//품정보가 없다면 그대로 생성을 해준다.
@@ -951,7 +968,7 @@ namespace FEQ0000
private void button7_Click(object sender, EventArgs e)
{
var datapath = FCOMMON.DBM.getCodeSavlue("55", "02");
if(datapath.isEmpty())
if (datapath.isEmpty())
{
FCOMMON.Util.MsgE("견적서 기본폴더 공용코드 55-02 값을 입력하세요");
return;

View File

@@ -196,6 +196,9 @@
<metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<data name="tbBigo.ToolTip" xml:space="preserve">
<value>* 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등)
* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등)
@@ -203,7 +206,7 @@
* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등)
* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등)</value>
</data>
<metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="label11.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">