This commit is contained in:
chi
2023-04-27 15:05:14 +09:00
parent 5a899c2d1b
commit 79ea4ddfff
16 changed files with 2630 additions and 817 deletions

View File

@@ -1208,7 +1208,7 @@ namespace FEQ0000
return;
}
}
var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx);
var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx,string.Empty);
if (f.ShowDialog() == DialogResult.OK)
{
refreshData();

View File

@@ -62,6 +62,9 @@ namespace FEQ0000.Purchase
this.tbPrjName = new System.Windows.Forms.TextBox();
this.tbIdx = new System.Windows.Forms.TextBox();
this.panel2 = new System.Windows.Forms.Panel();
this.tbSCRCF = new System.Windows.Forms.TextBox();
this.tbSC = new System.Windows.Forms.TextBox();
this.tbPO = new System.Windows.Forms.TextBox();
this.tbRemarkO = new System.Windows.Forms.TextBox();
this.tbAmt = new System.Windows.Forms.TextBox();
this.tbPriceO = new System.Windows.Forms.TextBox();
@@ -72,6 +75,7 @@ namespace FEQ0000.Purchase
this.tbPumname = new System.Windows.Forms.TextBox();
this.textBox16 = new System.Windows.Forms.TextBox();
this.panel3 = new System.Windows.Forms.Panel();
this.tbInPrice = new System.Windows.Forms.TextBox();
this.tbInRemark = new System.Windows.Forms.TextBox();
this.tbInQty = new System.Windows.Forms.TextBox();
this.chkInDate = new System.Windows.Forms.CheckBox();
@@ -79,10 +83,6 @@ namespace FEQ0000.Purchase
this.cmbReceive = new System.Windows.Forms.ComboBox();
this.btOK = new System.Windows.Forms.Button();
this.arLabel3 = new System.Windows.Forms.Label();
this.tbInPrice = new System.Windows.Forms.TextBox();
this.tbPO = new System.Windows.Forms.TextBox();
this.tbSC = new System.Windows.Forms.TextBox();
this.tbSCRCF = new System.Windows.Forms.TextBox();
label17 = new System.Windows.Forms.Label();
label12 = new System.Windows.Forms.Label();
label11 = new System.Windows.Forms.Label();
@@ -272,6 +272,35 @@ namespace FEQ0000.Purchase
receiveLabel.TabIndex = 105;
receiveLabel.Text = "수령인";
//
// label13
//
label13.AutoSize = true;
label13.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
label13.Location = new System.Drawing.Point(56, 195);
label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label13.Name = "label13";
label13.Size = new System.Drawing.Size(52, 28);
label13.TabIndex = 111;
label13.Text = "단가";
//
// label14
//
label14.AutoSize = true;
label14.Location = new System.Drawing.Point(85, 314);
label14.Name = "label14";
label14.Size = new System.Drawing.Size(22, 12);
label14.TabIndex = 92;
label14.Text = "PO";
//
// label10
//
label10.AutoSize = true;
label10.Location = new System.Drawing.Point(9, 158);
label10.Name = "label10";
label10.Size = new System.Drawing.Size(89, 12);
label10.TabIndex = 94;
label10.Text = "SC / SCR/CF#";
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.Gainsboro;
@@ -413,8 +442,6 @@ namespace FEQ0000.Purchase
this.panel2.Controls.Add(this.tbSCRCF);
this.panel2.Controls.Add(this.tbSC);
this.panel2.Controls.Add(label10);
this.panel2.Controls.Add(this.tbPO);
this.panel2.Controls.Add(label14);
this.panel2.Controls.Add(this.tbRemarkO);
this.panel2.Controls.Add(this.tbAmt);
this.panel2.Controls.Add(this.tbPriceO);
@@ -431,9 +458,38 @@ namespace FEQ0000.Purchase
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 193);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(584, 234);
this.panel2.Size = new System.Drawing.Size(584, 194);
this.panel2.TabIndex = 88;
//
// tbSCRCF
//
this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.tbSCRCF.Location = new System.Drawing.Point(340, 145);
this.tbSCRCF.Name = "tbSCRCF";
this.tbSCRCF.ReadOnly = true;
this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
this.tbSCRCF.TabIndex = 96;
//
// tbSC
//
this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.tbSC.Location = new System.Drawing.Point(104, 144);
this.tbSC.Name = "tbSC";
this.tbSC.ReadOnly = true;
this.tbSC.Size = new System.Drawing.Size(232, 38);
this.tbSC.TabIndex = 95;
//
// tbPO
//
this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.tbPO.Location = new System.Drawing.Point(113, 311);
this.tbPO.Name = "tbPO";
this.tbPO.Size = new System.Drawing.Size(321, 38);
this.tbPO.TabIndex = 93;
//
// tbRemarkO
//
this.tbRemarkO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
@@ -530,6 +586,8 @@ namespace FEQ0000.Purchase
this.panel3.Controls.Add(this.tbInPrice);
this.panel3.Controls.Add(label13);
this.panel3.Controls.Add(this.tbInRemark);
this.panel3.Controls.Add(this.tbPO);
this.panel3.Controls.Add(label14);
this.panel3.Controls.Add(label7);
this.panel3.Controls.Add(this.tbInQty);
this.panel3.Controls.Add(label8);
@@ -540,11 +598,22 @@ namespace FEQ0000.Purchase
this.panel3.Controls.Add(this.btOK);
this.panel3.Controls.Add(this.arLabel3);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 427);
this.panel3.Location = new System.Drawing.Point(0, 387);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(584, 313);
this.panel3.Size = new System.Drawing.Size(584, 353);
this.panel3.TabIndex = 89;
//
// tbInPrice
//
this.tbInPrice.Enabled = false;
this.tbInPrice.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbInPrice.Location = new System.Drawing.Point(113, 191);
this.tbInPrice.Margin = new System.Windows.Forms.Padding(4);
this.tbInPrice.Name = "tbInPrice";
this.tbInPrice.Size = new System.Drawing.Size(321, 34);
this.tbInPrice.TabIndex = 112;
this.tbInPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
//
// tbInRemark
//
this.tbInRemark.Enabled = false;
@@ -552,7 +621,7 @@ namespace FEQ0000.Purchase
this.tbInRemark.Margin = new System.Windows.Forms.Padding(4);
this.tbInRemark.Multiline = true;
this.tbInRemark.Name = "tbInRemark";
this.tbInRemark.Size = new System.Drawing.Size(286, 70);
this.tbInRemark.Size = new System.Drawing.Size(321, 70);
this.tbInRemark.TabIndex = 110;
//
// tbInQty
@@ -562,7 +631,7 @@ namespace FEQ0000.Purchase
this.tbInQty.Location = new System.Drawing.Point(113, 149);
this.tbInQty.Margin = new System.Windows.Forms.Padding(4);
this.tbInQty.Name = "tbInQty";
this.tbInQty.Size = new System.Drawing.Size(286, 34);
this.tbInQty.Size = new System.Drawing.Size(321, 34);
this.tbInQty.TabIndex = 108;
//
// chkInDate
@@ -586,7 +655,7 @@ namespace FEQ0000.Purchase
this.dtInDate.Location = new System.Drawing.Point(113, 108);
this.dtInDate.Margin = new System.Windows.Forms.Padding(4);
this.dtInDate.Name = "dtInDate";
this.dtInDate.Size = new System.Drawing.Size(286, 34);
this.dtInDate.Size = new System.Drawing.Size(321, 34);
this.dtInDate.TabIndex = 104;
this.dtInDate.TabStop = false;
//
@@ -602,7 +671,7 @@ namespace FEQ0000.Purchase
this.cmbReceive.Location = new System.Drawing.Point(17, 56);
this.cmbReceive.Margin = new System.Windows.Forms.Padding(4);
this.cmbReceive.Name = "cmbReceive";
this.cmbReceive.Size = new System.Drawing.Size(382, 45);
this.cmbReceive.Size = new System.Drawing.Size(417, 45);
this.cmbReceive.TabIndex = 106;
//
// btOK
@@ -611,7 +680,7 @@ namespace FEQ0000.Purchase
this.btOK.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btOK.Location = new System.Drawing.Point(445, 23);
this.btOK.Name = "btOK";
this.btOK.Size = new System.Drawing.Size(139, 290);
this.btOK.Size = new System.Drawing.Size(139, 330);
this.btOK.TabIndex = 102;
this.btOK.Text = "등록";
this.btOK.UseVisualStyleBackColor = true;
@@ -631,76 +700,6 @@ namespace FEQ0000.Purchase
this.arLabel3.Text = "입고정보";
this.arLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// tbInPrice
//
this.tbInPrice.Enabled = false;
this.tbInPrice.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbInPrice.Location = new System.Drawing.Point(113, 191);
this.tbInPrice.Margin = new System.Windows.Forms.Padding(4);
this.tbInPrice.Name = "tbInPrice";
this.tbInPrice.Size = new System.Drawing.Size(286, 34);
this.tbInPrice.TabIndex = 112;
this.tbInPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
//
// label13
//
label13.AutoSize = true;
label13.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
label13.Location = new System.Drawing.Point(56, 195);
label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label13.Name = "label13";
label13.Size = new System.Drawing.Size(52, 28);
label13.TabIndex = 111;
label13.Text = "단가";
//
// tbPO
//
this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.tbPO.Location = new System.Drawing.Point(104, 145);
this.tbPO.Name = "tbPO";
this.tbPO.ReadOnly = true;
this.tbPO.Size = new System.Drawing.Size(437, 38);
this.tbPO.TabIndex = 93;
//
// label14
//
label14.AutoSize = true;
label14.Location = new System.Drawing.Point(76, 148);
label14.Name = "label14";
label14.Size = new System.Drawing.Size(22, 12);
label14.TabIndex = 92;
label14.Text = "PO";
//
// tbSC
//
this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.tbSC.Location = new System.Drawing.Point(104, 189);
this.tbSC.Name = "tbSC";
this.tbSC.ReadOnly = true;
this.tbSC.Size = new System.Drawing.Size(232, 38);
this.tbSC.TabIndex = 95;
//
// label10
//
label10.AutoSize = true;
label10.Location = new System.Drawing.Point(9, 203);
label10.Name = "label10";
label10.Size = new System.Drawing.Size(89, 12);
label10.TabIndex = 94;
label10.Text = "SC / SCR/CF#";
//
// tbSCRCF
//
this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.tbSCRCF.Location = new System.Drawing.Point(340, 190);
this.tbSCRCF.Name = "tbSCRCF";
this.tbSCRCF.ReadOnly = true;
this.tbSCRCF.Size = new System.Drawing.Size(232, 38);
this.tbSCRCF.TabIndex = 96;
//
// fPurchaseCR_Ipgo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

View File

@@ -13,9 +13,11 @@ namespace FEQ0000.Purchase
public partial class fPurchaseCR_Ipgo : Form
{
int idx = -1;
public fPurchaseCR_Ipgo(int purchaseIdx)
string po = string.Empty;
public fPurchaseCR_Ipgo(int purchaseIdx,string po_)
{
InitializeComponent();
this.po = po_;
this.idx = purchaseIdx;
this.KeyPreview = true;
this.KeyDown += (s1, e1) =>
@@ -49,6 +51,7 @@ namespace FEQ0000.Purchase
tbAmt.Text = (dr.pumqty * dr.pumprice).ToString();
tbRemarkO.Text = dr.bigo;
tbPO.Text = dr.po;
if (string.IsNullOrEmpty(tbPO.Text)) tbPO.Text = this.po;
tbSC.Text = dr.sc;
tbSCRCF.Text = dr.orderno;
@@ -176,7 +179,9 @@ namespace FEQ0000.Purchase
dr.state = "Received";
dr.inremark = tbInRemark.Text.Trim();
}
dr.windate = DateTime.Now;
dr.winuid = FCOMMON.info.Login.no;
dr.po = this.tbPO.Text.Trim();
dr.EndEdit();
var cnt = ta.Update(dr);
DialogResult = DialogResult.OK;

View File

@@ -168,13 +168,13 @@
<metadata name="receiveLabel.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">
<metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>