This commit is contained in:
chikyun.kim
2019-07-25 08:29:57 +09:00
parent 5c77244a45
commit ae209e00af
85 changed files with 21568 additions and 4313 deletions

View File

@@ -65,6 +65,7 @@ namespace FEQ0000
void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["gcode"] = FCOMMON.info.Login.gcode;
e.Row["pdate"] = DateTime.Now.ToShortDateString();
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
@@ -328,7 +329,7 @@ namespace FEQ0000
newdr.pumidx = newidx;
newdr.EndEdit();
}
this.dsPurchase.Purchase.AddPurchaseRow(newdr);
int cnt = this.ta.Update(newdr);

View File

@@ -44,7 +44,6 @@
System.Windows.Forms.Label poLabel;
System.Windows.Forms.Label deptLabel;
System.Windows.Forms.Label label1;
System.Windows.Forms.Label stateLabel;
System.Windows.Forms.Label label2;
System.Windows.Forms.Label label4;
System.Windows.Forms.Label label5;
@@ -106,7 +105,6 @@
poLabel = new System.Windows.Forms.Label();
deptLabel = new System.Windows.Forms.Label();
label1 = new System.Windows.Forms.Label();
stateLabel = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
label4 = new System.Windows.Forms.Label();
label5 = new System.Windows.Forms.Label();
@@ -120,7 +118,7 @@
// processLabel
//
processLabel.AutoSize = true;
processLabel.Location = new System.Drawing.Point(57, 99);
processLabel.Location = new System.Drawing.Point(57, 130);
processLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
processLabel.Name = "processLabel";
processLabel.Size = new System.Drawing.Size(39, 20);
@@ -130,7 +128,7 @@
// receiveLabel
//
receiveLabel.AutoSize = true;
receiveLabel.Location = new System.Drawing.Point(42, 64);
receiveLabel.Location = new System.Drawing.Point(42, 95);
receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
receiveLabel.Name = "receiveLabel";
receiveLabel.Size = new System.Drawing.Size(54, 20);
@@ -140,7 +138,7 @@
// scLabel
//
scLabel.AutoSize = true;
scLabel.Location = new System.Drawing.Point(69, 129);
scLabel.Location = new System.Drawing.Point(69, 160);
scLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
scLabel.Name = "scLabel";
scLabel.Size = new System.Drawing.Size(27, 20);
@@ -230,7 +228,7 @@
// assetLabel
//
assetLabel.AutoSize = true;
assetLabel.Location = new System.Drawing.Point(24, 295);
assetLabel.Location = new System.Drawing.Point(24, 326);
assetLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
assetLabel.Name = "assetLabel";
assetLabel.Size = new System.Drawing.Size(69, 20);
@@ -240,7 +238,7 @@
// poLabel
//
poLabel.AutoSize = true;
poLabel.Location = new System.Drawing.Point(66, 159);
poLabel.Location = new System.Drawing.Point(66, 190);
poLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
poLabel.Name = "poLabel";
poLabel.Size = new System.Drawing.Size(30, 20);
@@ -267,20 +265,10 @@
label1.TabIndex = 0;
label1.Text = "입력일";
//
// stateLabel
//
stateLabel.AutoSize = true;
stateLabel.Location = new System.Drawing.Point(27, 33);
stateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
stateLabel.Name = "stateLabel";
stateLabel.Size = new System.Drawing.Size(69, 20);
stateLabel.TabIndex = 0;
stateLabel.Text = "구매상태";
//
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(12, 259);
label2.Location = new System.Drawing.Point(12, 290);
label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(84, 20);
@@ -290,7 +278,7 @@
// label4
//
label4.AutoSize = true;
label4.Location = new System.Drawing.Point(24, 223);
label4.Location = new System.Drawing.Point(24, 254);
label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label4.Name = "label4";
label4.Size = new System.Drawing.Size(69, 20);
@@ -300,7 +288,7 @@
// label5
//
label5.AutoSize = true;
label5.Location = new System.Drawing.Point(36, 190);
label5.Location = new System.Drawing.Point(36, 221);
label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label5.Name = "label5";
label5.Size = new System.Drawing.Size(60, 20);
@@ -309,7 +297,7 @@
//
// tbSC
//
this.tbSC.Location = new System.Drawing.Point(104, 125);
this.tbSC.Location = new System.Drawing.Point(104, 156);
this.tbSC.Margin = new System.Windows.Forms.Padding(4);
this.tbSC.Name = "tbSC";
this.tbSC.Size = new System.Drawing.Size(286, 27);
@@ -433,7 +421,7 @@
//
// tbPO
//
this.tbPO.Location = new System.Drawing.Point(104, 156);
this.tbPO.Location = new System.Drawing.Point(104, 187);
this.tbPO.Margin = new System.Windows.Forms.Padding(4);
this.tbPO.Name = "tbPO";
this.tbPO.Size = new System.Drawing.Size(286, 27);
@@ -442,12 +430,12 @@
// tbBigo
//
this.tbBigo.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.tbBigo.Location = new System.Drawing.Point(93, 390);
this.tbBigo.Location = new System.Drawing.Point(93, 320);
this.tbBigo.Margin = new System.Windows.Forms.Padding(4);
this.tbBigo.MaxLength = 500;
this.tbBigo.Multiline = true;
this.tbBigo.Name = "tbBigo";
this.tbBigo.Size = new System.Drawing.Size(381, 91);
this.tbBigo.Size = new System.Drawing.Size(381, 165);
this.tbBigo.TabIndex = 8;
this.tbBigo.TabStop = false;
//
@@ -461,7 +449,7 @@
//
// btSave
//
this.btSave.Location = new System.Drawing.Point(11, 540);
this.btSave.Location = new System.Drawing.Point(11, 562);
this.btSave.Margin = new System.Windows.Forms.Padding(4);
this.btSave.Name = "btSave";
this.btSave.Size = new System.Drawing.Size(492, 51);
@@ -474,10 +462,10 @@
//
this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.cmbState.FormattingEnabled = true;
this.cmbState.Location = new System.Drawing.Point(104, 28);
this.cmbState.Location = new System.Drawing.Point(336, 65);
this.cmbState.Margin = new System.Windows.Forms.Padding(4);
this.cmbState.Name = "cmbState";
this.cmbState.Size = new System.Drawing.Size(286, 28);
this.cmbState.Size = new System.Drawing.Size(139, 28);
this.cmbState.TabIndex = 1;
this.cmbState.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
@@ -488,7 +476,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, 94);
this.cbProcess.Location = new System.Drawing.Point(104, 125);
this.cbProcess.Margin = new System.Windows.Forms.Padding(4);
this.cbProcess.Name = "cbProcess";
this.cbProcess.Size = new System.Drawing.Size(286, 28);
@@ -512,7 +500,7 @@
this.cmbReceive.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbReceive.FormattingEnabled = true;
this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.cmbReceive.Location = new System.Drawing.Point(104, 62);
this.cmbReceive.Location = new System.Drawing.Point(104, 93);
this.cmbReceive.Margin = new System.Windows.Forms.Padding(4);
this.cmbReceive.Name = "cmbReceive";
this.cmbReceive.Size = new System.Drawing.Size(286, 28);
@@ -544,17 +532,17 @@
//
// dtInDate
//
this.dtInDate.Location = new System.Drawing.Point(93, 355);
this.dtInDate.Location = new System.Drawing.Point(104, 58);
this.dtInDate.Margin = new System.Windows.Forms.Padding(4);
this.dtInDate.Name = "dtInDate";
this.dtInDate.Size = new System.Drawing.Size(193, 27);
this.dtInDate.Size = new System.Drawing.Size(286, 27);
this.dtInDate.TabIndex = 15;
this.dtInDate.TabStop = false;
//
// chkInDate
//
this.chkInDate.AutoSize = true;
this.chkInDate.Location = new System.Drawing.Point(13, 357);
this.chkInDate.Location = new System.Drawing.Point(24, 60);
this.chkInDate.Margin = new System.Windows.Forms.Padding(4);
this.chkInDate.Name = "chkInDate";
this.chkInDate.Size = new System.Drawing.Size(73, 24);
@@ -566,17 +554,17 @@
//
// dtExpDate
//
this.dtExpDate.Location = new System.Drawing.Point(93, 320);
this.dtExpDate.Location = new System.Drawing.Point(104, 26);
this.dtExpDate.Margin = new System.Windows.Forms.Padding(4);
this.dtExpDate.Name = "dtExpDate";
this.dtExpDate.Size = new System.Drawing.Size(193, 27);
this.dtExpDate.Size = new System.Drawing.Size(286, 27);
this.dtExpDate.TabIndex = 24;
this.dtExpDate.TabStop = false;
//
// chkExp
//
this.chkExp.AutoSize = true;
this.chkExp.Location = new System.Drawing.Point(13, 324);
this.chkExp.Location = new System.Drawing.Point(24, 30);
this.chkExp.Margin = new System.Windows.Forms.Padding(4);
this.chkExp.Name = "chkExp";
this.chkExp.Size = new System.Drawing.Size(73, 24);
@@ -600,7 +588,7 @@
//
// btSaveAdd
//
this.btSaveAdd.Location = new System.Drawing.Point(511, 540);
this.btSaveAdd.Location = new System.Drawing.Point(511, 562);
this.btSaveAdd.Margin = new System.Windows.Forms.Padding(4);
this.btSaveAdd.Name = "btSaveAdd";
this.btSaveAdd.Size = new System.Drawing.Size(410, 51);
@@ -613,19 +601,15 @@
//
this.groupBox1.Controls.Add(this.dtPdate);
this.groupBox1.Controls.Add(this.tbPumStock);
this.groupBox1.Controls.Add(this.linkLabel1);
this.groupBox1.Controls.Add(this.tbPumAmt);
this.groupBox1.Controls.Add(this.chkExp);
this.groupBox1.Controls.Add(this.tbBigo);
this.groupBox1.Controls.Add(deptLabel);
this.groupBox1.Controls.Add(this.tbSupplyIndex);
this.groupBox1.Controls.Add(this.dtExpDate);
this.groupBox1.Controls.Add(pumamtLabel);
this.groupBox1.Controls.Add(this.tbPumIDX);
this.groupBox1.Controls.Add(this.chkInDate);
this.groupBox1.Controls.Add(this.cmbState);
this.groupBox1.Controls.Add(projectLabel);
this.groupBox1.Controls.Add(this.tbSID);
this.groupBox1.Controls.Add(this.dtInDate);
this.groupBox1.Controls.Add(this.tbPumQty);
this.groupBox1.Controls.Add(supplyLabel);
this.groupBox1.Controls.Add(pumqtyLabel);
@@ -654,13 +638,13 @@
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(350, 325);
this.linkLabel1.Location = new System.Drawing.Point(7, 441);
this.linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(124, 20);
this.linkLabel1.Size = new System.Drawing.Size(89, 20);
this.linkLabel1.TabIndex = 16;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "견적서 폴더 열기";
this.linkLabel1.Text = "견적서 폴더";
this.toolTip1.SetToolTip(this.linkLabel1, "클릭시 견적서(공유폴더) 가 열립니다.");
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
@@ -669,16 +653,20 @@
this.groupBox2.BackColor = System.Drawing.Color.Gainsboro;
this.groupBox2.Controls.Add(this.tbOrderNo);
this.groupBox2.Controls.Add(label5);
this.groupBox2.Controls.Add(this.linkLabel1);
this.groupBox2.Controls.Add(this.cbManuProc);
this.groupBox2.Controls.Add(label4);
this.groupBox2.Controls.Add(this.chkExp);
this.groupBox2.Controls.Add(this.cbEQModel);
this.groupBox2.Controls.Add(this.cbEQManu);
this.groupBox2.Controls.Add(label2);
this.groupBox2.Controls.Add(this.chkInDate);
this.groupBox2.Controls.Add(this.linkLabel4);
this.groupBox2.Controls.Add(this.dtExpDate);
this.groupBox2.Controls.Add(this.linkLabel3);
this.groupBox2.Controls.Add(this.dtInDate);
this.groupBox2.Controls.Add(this.linkLabel2);
this.groupBox2.Controls.Add(this.pictureBox1);
this.groupBox2.Controls.Add(this.cmbState);
this.groupBox2.Controls.Add(this.tbPO);
this.groupBox2.Controls.Add(poLabel);
this.groupBox2.Controls.Add(this.tbSC);
@@ -688,12 +676,11 @@
this.groupBox2.Controls.Add(this.cmbReceive);
this.groupBox2.Controls.Add(processLabel);
this.groupBox2.Controls.Add(this.cbProcess);
this.groupBox2.Controls.Add(stateLabel);
this.groupBox2.Location = new System.Drawing.Point(512, 38);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
this.groupBox2.Size = new System.Drawing.Size(409, 494);
this.groupBox2.Size = new System.Drawing.Size(409, 516);
this.groupBox2.TabIndex = 4;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "추가정보";
@@ -701,7 +688,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, 187);
this.tbOrderNo.Location = new System.Drawing.Point(104, 218);
this.tbOrderNo.Margin = new System.Windows.Forms.Padding(4);
this.tbOrderNo.Name = "tbOrderNo";
this.tbOrderNo.Size = new System.Drawing.Size(286, 27);
@@ -714,7 +701,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, 220);
this.cbManuProc.Location = new System.Drawing.Point(104, 251);
this.cbManuProc.Margin = new System.Windows.Forms.Padding(4);
this.cbManuProc.Name = "cbManuProc";
this.cbManuProc.Size = new System.Drawing.Size(286, 28);
@@ -727,7 +714,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, 292);
this.cbEQModel.Location = new System.Drawing.Point(104, 323);
this.cbEQModel.Margin = new System.Windows.Forms.Padding(4);
this.cbEQModel.Name = "cbEQModel";
this.cbEQModel.Size = new System.Drawing.Size(286, 28);
@@ -740,7 +727,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, 256);
this.cbEQManu.Location = new System.Drawing.Point(104, 287);
this.cbEQManu.Margin = new System.Windows.Forms.Padding(4);
this.cbEQManu.Name = "cbEQManu";
this.cbEQManu.Size = new System.Drawing.Size(286, 28);
@@ -750,7 +737,7 @@
// linkLabel4
//
this.linkLabel4.AutoSize = true;
this.linkLabel4.Location = new System.Drawing.Point(57, 355);
this.linkLabel4.Location = new System.Drawing.Point(57, 386);
this.linkLabel4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.linkLabel4.Name = "linkLabel4";
this.linkLabel4.Size = new System.Drawing.Size(39, 20);
@@ -762,7 +749,7 @@
// linkLabel3
//
this.linkLabel3.AutoSize = true;
this.linkLabel3.Location = new System.Drawing.Point(28, 327);
this.linkLabel3.Location = new System.Drawing.Point(28, 358);
this.linkLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.linkLabel3.Name = "linkLabel3";
this.linkLabel3.Size = new System.Drawing.Size(69, 20);
@@ -774,7 +761,7 @@
// linkLabel2
//
this.linkLabel2.AutoSize = true;
this.linkLabel2.Location = new System.Drawing.Point(22, 382);
this.linkLabel2.Location = new System.Drawing.Point(22, 413);
this.linkLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.linkLabel2.Name = "linkLabel2";
this.linkLabel2.Size = new System.Drawing.Size(74, 20);
@@ -786,7 +773,7 @@
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Gray;
this.pictureBox1.Location = new System.Drawing.Point(104, 327);
this.pictureBox1.Location = new System.Drawing.Point(104, 358);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(286, 148);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -812,7 +799,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(934, 602);
this.ClientSize = new System.Drawing.Size(934, 618);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btSaveAdd);

View File

@@ -162,9 +162,6 @@
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="stateLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
@@ -180,6 +177,9 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>490, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>490, 17</value>
</metadata>
<metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>

View File

@@ -290,7 +290,11 @@ namespace FEQ0000
}
var taE = new dsPurchaseTableAdapters.PurchaseTableAdapter();
if (checkBox1.Checked) taE.DeleteImport(sd.Value.ToShortDateString(), ed.Value.ToShortDateString(), FCOMMON.info.Login.no);
if (checkBox1.Checked) taE.DeleteImport(
sd.Value.ToShortDateString(),
ed.Value.ToShortDateString(),
FCOMMON.info.Login.no,
FCOMMON.info.Login.gcode);
taE.Update((dsPurchase.PurchaseDataTable)dt);
dt.AcceptChanges();

View File

@@ -306,7 +306,7 @@ namespace FEQ0000
if (checkBox1.Checked) taE.DeleteImport(
dtPdate.Value.ToShortDateString(),
dtPdate.Value.ToShortDateString(),
FCOMMON.info.Login.no);
FCOMMON.info.Login.no, FCOMMON.info.Login.gcode);
taE.Update((dsPurchase.PurchaseDataTable)dt);

View File

@@ -35,7 +35,7 @@ namespace FEQ0000.Purchase
}
void refreshData()
{
this.ta.FillDate(this.dsPurchase.Purchase, dtSD.Text, dtED.Text);
this.ta.FillDate(this.dsPurchase.Purchase, dtSD.Text, dtED.Text,FCOMMON.info.Login.gcode);
//Set DataSource
Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource();