This commit is contained in:
chi
2020-10-12 13:28:18 +09:00
parent 9fd97e8877
commit 60cc309353
39 changed files with 21926 additions and 14776 deletions

View File

@@ -38,7 +38,6 @@
System.Windows.Forms.Label statusLabel;
System.Windows.Forms.Label label1;
System.Windows.Forms.Label label2;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPartList));
FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer();
FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer();
FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer();
@@ -64,6 +63,7 @@
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPartList));
this.panel1 = new System.Windows.Forms.Panel();
this.button3 = new System.Windows.Forms.Button();
this.panel6 = new System.Windows.Forms.Panel();
@@ -86,7 +86,7 @@
this.sdateTextBox = new System.Windows.Forms.TextBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.reqstaffTextBox = new System.Windows.Forms.TextBox();
this.idxTextBox = new System.Windows.Forms.TextBox();
this.tbIdx = new System.Windows.Forms.TextBox();
this.nameTextBox = new System.Windows.Forms.TextBox();
this.pdateTextBox = new System.Windows.Forms.TextBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -137,6 +137,8 @@
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.panel7 = new System.Windows.Forms.Panel();
this.button4 = new System.Windows.Forms.Button();
pdateLabel = new System.Windows.Forms.Label();
requestLabel = new System.Windows.Forms.Label();
reqstaffLabel = new System.Windows.Forms.Label();
@@ -243,6 +245,8 @@
//
// panel1
//
this.panel1.Controls.Add(this.button4);
this.panel1.Controls.Add(this.panel7);
this.panel1.Controls.Add(this.button3);
this.panel1.Controls.Add(this.panel6);
this.panel1.Controls.Add(this.button2);
@@ -368,7 +372,7 @@
this.panel2.Controls.Add(sdateLabel);
this.panel2.Controls.Add(this.textBox1);
this.panel2.Controls.Add(this.reqstaffTextBox);
this.panel2.Controls.Add(this.idxTextBox);
this.panel2.Controls.Add(this.tbIdx);
this.panel2.Controls.Add(reqstaffLabel);
this.panel2.Controls.Add(this.nameTextBox);
this.panel2.Controls.Add(requestLabel);
@@ -490,14 +494,14 @@
this.reqstaffTextBox.Size = new System.Drawing.Size(186, 21);
this.reqstaffTextBox.TabIndex = 9;
//
// idxTextBox
// tbIdx
//
this.idxTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true));
this.idxTextBox.Location = new System.Drawing.Point(11, 9);
this.idxTextBox.Name = "idxTextBox";
this.idxTextBox.ReadOnly = true;
this.idxTextBox.Size = new System.Drawing.Size(40, 21);
this.idxTextBox.TabIndex = 1;
this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true));
this.tbIdx.Location = new System.Drawing.Point(11, 9);
this.tbIdx.Name = "tbIdx";
this.tbIdx.ReadOnly = true;
this.tbIdx.Size = new System.Drawing.Size(40, 21);
this.tbIdx.TabIndex = 1;
//
// nameTextBox
//
@@ -1374,6 +1378,29 @@
this.fpSpread1_Sheet1.TitleInfo.Value = "Partlist";
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// panel7
//
this.panel7.Dock = System.Windows.Forms.DockStyle.Left;
this.panel7.Location = new System.Drawing.Point(955, 0);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(7, 119);
this.panel7.TabIndex = 41;
//
// button4
//
this.button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.button4.Dock = System.Windows.Forms.DockStyle.Left;
this.button4.Image = ((System.Drawing.Image)(resources.GetObject("button4.Image")));
this.button4.Location = new System.Drawing.Point(962, 0);
this.button4.Name = "button4";
this.button4.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10);
this.button4.Size = new System.Drawing.Size(87, 119);
this.button4.TabIndex = 42;
this.button4.Text = "공용폴더";
this.button4.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.button4.UseVisualStyleBackColor = true;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
// fPartList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1410,7 +1437,7 @@
private System.Windows.Forms.BindingSource bs;
private dsPRJTableAdapters.ProjectsTableAdapter ta;
private dsPRJTableAdapters.TableAdapterManager tam;
private System.Windows.Forms.TextBox idxTextBox;
private System.Windows.Forms.TextBox tbIdx;
private System.Windows.Forms.TextBox nameTextBox;
private System.Windows.Forms.TextBox pdateTextBox;
private System.Windows.Forms.TextBox requestTextBox;
@@ -1478,5 +1505,7 @@
private System.Windows.Forms.Panel panel6;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.RadioButton radSortIpNum;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Panel panel7;
}
}

View File

@@ -38,10 +38,25 @@ namespace FPJ0000
this.ProjectIndex = idx_;
this.FormClosed += fPartList_FormClosed;
this.FormClosing += FPartList_FormClosing;
this.KeyDown += fPartList_KeyDown;
this.dsPRJ.ProjectsPart.TableNewRow += ProjectsPart_TableNewRow;
}
private void FPartList_FormClosing(object sender, FormClosingEventArgs e)
{
var dt = this.dsPRJ.ProjectsPart.GetChanges();
if (dt != null && dt.Rows.Count > 0)
{
var dlg = FCOMMON.Util.MsgQ("변경된 자료가 있습니다.\n화면을 닫으면 손실됩니다.\n화면을 닫을까요?");
if (dlg != DialogResult.Yes)
{
e.Cancel = true;
return;
}
}
}
void ProjectsPart_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
e.Row["wuid"] = FCOMMON.info.Login.no;
@@ -202,7 +217,7 @@ namespace FPJ0000
// if (value_bconf != null) bconf = (Boolean)value_bconf;
if (bbuy) PO발행전체 += 1;
// if (bbuy && string.IsNullOrEmpty(value_supply))
// if (bbuy && string.IsNullOrEmpty(value_supply))
+= 1;
@@ -325,11 +340,11 @@ namespace FPJ0000
this.bsPart.EndEdit();
//모든데이터의 공백을 제거(sid)
foreach(var item in this.dsPRJ.ProjectsPart)
foreach (var item in this.dsPRJ.ProjectsPart)
{
//sid에 공백제거
if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Detached) continue;
if(item.ItemSid != item.ItemSid.Replace(" ","").Trim())
if (item.ItemSid != item.ItemSid.Replace(" ", "").Trim())
{
item.ItemSid = item.ItemSid.Replace(" ", "").Trim();
item.EndEdit();
@@ -462,7 +477,7 @@ namespace FPJ0000
fpSpread1.ActiveSheet.Cells[Rowidx, colidx_item].Value = f.item;
fpSpread1.ActiveSheet.Cells[Rowidx, colidx_itemname].Value = f.itemName;
fpSpread1.ActiveSheet.Cells[Rowidx, colidx_sid].Value = f.SID.Replace(" ","").Trim();
fpSpread1.ActiveSheet.Cells[Rowidx, colidx_sid].Value = f.SID.Replace(" ", "").Trim();
//공급사는 기록하지 않는다 200623
//fpSpread1.ActiveSheet.Cells[Rowidx, colidx_supplyidx].Value = f.itemSupplyidx;
@@ -569,7 +584,7 @@ namespace FPJ0000
FormattingData();
this.tbFind.SelectAll();
this.tbFind.Focus();
}
}
@@ -773,5 +788,37 @@ namespace FPJ0000
var f = new rPartList(this.ProjectIndex);
f.Show();
}
private void button4_Click(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.ProjectsRow;
var tbPath = dr.path;
if (tbPath == "") tbPath = "/" + tbIdx.Text;
if (tbPath.StartsWith("\\") == false)
{
if (tbPath.StartsWith("/")) tbPath = tbPath.Replace("/", "\\");
else tbPath = "\\" + tbPath;
}
var serverpath = @"\\10.131.32.29\Data\Project";
if (System.IO.Directory.Exists(serverpath) == false)
{
FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" +
serverpath);
return;
}
var path = serverpath + tbPath;
if (System.IO.Directory.Exists(path) == false)
{
FCOMMON.Util.MsgE("프로젝트 저장소 없음");
}
FCOMMON.Util.RunExplorer(path);
}
}
}

View File

@@ -145,6 +145,19 @@
<value>False</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="button4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAIpoAACKaAb7d+yoAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwa
AAABh0lEQVRYR+2VMUoDYRSE92i2igewslcsBCu7eAErIY0gNtY2FjZiYSt4BG+grdXqZ97wfsIgwYWX
XdiBaSYz//sKTbpZQ3V7vLcYswHsx+zpAL4tz/r+5XoUhmUGHOIZcKgt4Fg9CcDVt/bR7rPCx8XhVqz7
wbL6JZEi+C24v4sK6z4sgZUiVMGNK6z7sARWilAFN66w7sMSWClCFdy4wroPS2ClCFVw43W/3130r1en
G5mue2Pdug9LYKUIVXDj1h8Pl+1jG/nzZ+Peat30hwF+PS37+/OD9sE/TZeNe6t1s5n/Sf5l3YclsFKE
KrhxhXUflsBKEargxhXWfVgCK0WoghtXWPdhCawUoQpuXGHdhyWwUoQquHGFdR+WwEoRquDGFdZ9WAIr
RaiCG1dY92EJrBShCm5cYd2HJbBShCq4cYV1H5bAShGq4MYV1n1YAitFqIIbV1j3YQmsFKEKblxh3Ycl
sFKEKrhxhXUflsBKETaFbXuCgDcn+zt8MAbDElizBqrrvgEhPDwfDcBtdQAAAABJRU5ErkJggg==
</value>
</data>
<data name="button3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -229,7 +242,7 @@
<value>17, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>766, 18</value>
<value>614, 18</value>
</metadata>
<metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>539, 18</value>
@@ -383,20 +396,20 @@
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZJZTxNRGIZ7JT/BoBdekhiFKEaNXigIWMAE
NwSCyFYKAQEJ1GAi1hSMyGJAAiRqCETjhRpwgbKUrS2lbSjKUlbZt4SlAl1moDPl9cy0AiYkfsmTc3Hm
fTLfOyPgxv+xMuZaoU4RUqT7HSDVUeSkeYq5U0+HFGrpoBca40WJuvR46MdDfGj/BD7rUq+Y6TWj0cia
rFswWfZYM3PQGFkyI+fbHCKKRm3CVLmbK+qc4HzNitE4xGpn7NDPMtDPMdDNMNBMb0P5awtNw1ZsMUD9
KIWcL7OIf2Wk/pEESJuoTds2eudZ/JhnyMmgh5dsQzWxhZZhGxE40LvEQr9oR558Dr6P2j/w4fBin6k7
0tAdccUtxJffRnlzDXJri+Er9YQPQZh3Af6ysyipL+FXsdAMltdt8I9WMbwgrND3c/tgAxrG36Jcl8VL
osuCkPU+Cmk1ERBVXkdcZRzq+5fRYLTg+8AmNkhPAbIumhcIS4VuntJ0VjfWiXeDMhQoU3lJTEUwCd9A
0utEqCes/Cpt4xQUpId1qx0Bud1OATeB+So6oyoWhgkNKvUP8bw1E+HFVxBTFgrDjA0GUixXsHrS2YmJ
CPxl+wSXnkjt57KPIapUiN5JLfI6kyGTZyDipR9qlF/Rt8DAQIrVTtvRTVgx2+H71CU4LXEXe0uOIq06
EncrAhFZcpWXZMijIKlNJG/iB+6+d45FD/eJCWZSpFe6xinwlhxe8JYcIQ+5wzvLHTcL/JDyJhbqYQXy
FNlI/hQLUUUYDESgJ/+Gjghou4MIlHsrXE7vopc2aPQvsDyqsUU8qEpCAgmKKyOQWX1/947Dts0SQd2e
gLPNm/YE/8PKrZC4T3A+o8PW0t23c9DDBzE4POo4GV1vccVJkUmtU7ObNnOHdsAxtUphaoXChItVi52H
a95Cs/g5OOKgKGrD417jkCsuEJxJak7xEjW1nhIrTF7iOnqXBCeefxHV0R6ixvUTcY1tnrHyeIFAIPgD
q6OfJyXVylwAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3Kv+EsF70UghTyqioF6WpTQ3s
Zipm3uYUTW3owiBbzEXmJTRRoUKUohcV2kWnNm9zzm24ieY0Ne838LLUXc7Rnc1vzzlbzkDoBx+eF8/5
fji/7zk8dkIeKROvlmgVkaXa36ESLUVOmqOMPXV0ZImGDn+uNl4QqyqOR304xIX2T9jTXtWqmV43Go0O
k3UbJouHdTMLjZ/LZhR8nUds6ZiNnyX3ckddE1GkXmXDmlk7dHMMdPMMtLMM1DM7UP7aRuuoFdsM0DRG
oeDzHFJeGql/JKGSVmrLtgPDggMDCww5GfRzkh30TG7j+6iNCJwwLDugW7JDJp9H0MPO91w4pixw+rYk
aldYfRMpVbdQ1VaPwoYyBEn8EEjgy84jRHoG5U3l3CoWmsHKhg0hCT0MJ4guCfrUOdyM5ok3qNLmcZKE
ynDkvYtHdn0sBDXXkFyTjKahFTQbLfj2YwubpKdQaS/NCfgVfC9fSY5DO96Nt8NSFCuzOElidQQJX0f6
qzSoJq3cKh0TFBSkhw2rHaGFfS4BO2FFPbSoNgn6STVqdA/wrD0XMWWXkVgZBf2sDXpSLFuwasrViYkI
QqT7BBcfS+xn848hvoIPw5QGsu4MSOUixL4IRr3yCwYXGehJsZoZO/oIq2Y7gp64BafE3sIA8VFk18Xh
TnUY4sqvcBKRPB7ihjTyJsFg7w3zDvSzn5hgJkX656hdggDx4cUA8RHykDcC8rxxozgYma+ToBpVQKbI
R8bHJAiqo6EnAh35N7REQNudRKD0rHApp5de3qQxtOjg6Blfwv3adKSSoLAmFrl19/buWGw7DiJo9AhY
24LJI/gfVnaFtH2Cc6IuW2vvwO5BDx+IcdR5IqHJ4o6TItPbp+e2bOYu9aBzeo3C9CqFSTdrFjsH27yF
dsAwNOKkKGrT527LiDvO451Ob8v0F7S2nxQqTP7CRnqPVBd+fxE00j6Clg3f5JYOvyR5Co/H4/0Bl8Sf
DuVD3wEAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -442,6 +455,6 @@
<value>385, 17</value>
</metadata>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>863, 18</value>
<value>711, 18</value>
</metadata>
</root>