From 48b67ec89db21534f5a7269ec90fb6c4c414cba7 Mon Sep 17 00:00:00 2001 From: chi Date: Fri, 25 Jun 2021 15:55:26 +0900 Subject: [PATCH] .. --- Project/Dialog/fLogin.cs | 2 + Project/Setting.cs | 4 + SubProject/FCOMMON/Info.cs | 1 + .../Project/fPartBuyStatus.Designer.cs | 146 ++++++++++-------- SubProject/FPJ0000/Project/fPartBuyStatus.cs | 43 ++++-- .../FPJ0000/Project/fPartBuyStatus.resx | 31 ++-- SubProject/FPJ0000/Project/fProjectList.cs | 6 +- 7 files changed, 140 insertions(+), 93 deletions(-) diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 3012cec..05cc44f 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -170,6 +170,8 @@ namespace Project.Dialog FCOMMON.info.Login.permission = 0; FCOMMON.info.Login.gpermission = int.Parse(gperm); FCOMMON.info.datapath = Pub.setting.SharedDataPath; + FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625 + if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524 FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$"; diff --git a/Project/Setting.cs b/Project/Setting.cs index 7d162be..50be9bd 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -33,6 +33,7 @@ namespace Project #endregion + [Description("시작 화면")] public eFormList startForm { get; set; } @@ -55,6 +56,9 @@ namespace Project public string SharedDataPath { get; set; } + [Category("구매"),DisplayName("오류항목표시")] + public Boolean Showbuyerror { get; set; } + [Category("Barcode"), DisplayName("Port Name")] public string Barcode { get; set; } diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs index d071c30..7003080 100644 --- a/SubProject/FCOMMON/Info.cs +++ b/SubProject/FCOMMON/Info.cs @@ -50,6 +50,7 @@ namespace FCOMMON public int permission; } + public static Boolean ShowBuyerror = true; public static sUserInfo Login; public static string Path; public static string CS; diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs index bad7c10..408e424 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs @@ -34,29 +34,30 @@ System.Windows.Forms.Label label4; System.Windows.Forms.Label label5; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPartBuyStatus)); - 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(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer2 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); + FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer3 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer4 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType4 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo2 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); + this.chkshowerr = new System.Windows.Forms.CheckBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.prb1 = new arCtl.arLabel(); this.prb3 = new arCtl.arLabel(); @@ -183,6 +184,7 @@ // // panel1 // + this.panel1.Controls.Add(this.chkshowerr); this.panel1.Controls.Add(this.tableLayoutPanel1); this.panel1.Controls.Add(this.panel2); this.panel1.Controls.Add(this.button1); @@ -196,6 +198,18 @@ this.panel1.Size = new System.Drawing.Size(1345, 92); this.panel1.TabIndex = 0; // + // chkshowerr + // + this.chkshowerr.AutoSize = true; + this.chkshowerr.Location = new System.Drawing.Point(902, 70); + this.chkshowerr.Name = "chkshowerr"; + this.chkshowerr.Size = new System.Drawing.Size(76, 16); + this.chkshowerr.TabIndex = 44; + this.chkshowerr.Text = "오류 표시"; + this.chkshowerr.UseVisualStyleBackColor = true; + this.chkshowerr.CheckedChanged += new System.EventHandler(this.chkshowerr_CheckedChanged); + this.chkshowerr.Click += new System.EventHandler(this.chkshowerr_Click); + // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 4; @@ -356,8 +370,8 @@ // // prb4 // - this.prb4.BackColor = System.Drawing.Color.Tomato; - this.prb4.BackColor2 = System.Drawing.Color.Red; + this.prb4.BackColor = System.Drawing.Color.Gray; + this.prb4.BackColor2 = System.Drawing.Color.DimGray; this.prb4.BackgroundImagePadding = new System.Windows.Forms.Padding(0); this.prb4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); this.prb4.BorderColorOver = System.Drawing.Color.Red; @@ -859,12 +873,12 @@ this.fpSpread1.ContextMenuStrip = this.cm1; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; - this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer1; + this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer2; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1.HorizontalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.HorizontalScrollBar.Name = ""; - flatScrollBarRenderer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer1; + flatScrollBarRenderer3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer3; this.fpSpread1.Location = new System.Drawing.Point(0, 147); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { @@ -877,8 +891,8 @@ this.fpSpread1.TitleInfo.Value = "PartList"; this.fpSpread1.VerticalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.VerticalScrollBar.Name = ""; - flatScrollBarRenderer2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; + flatScrollBarRenderer4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); // // fpSpread1_Sheet1 @@ -922,30 +936,30 @@ this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Tag = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "담당자"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "CR/CF"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "Project"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "PRJ"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - textCellType4.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + textCellType17.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ItemSid"; this.fpSpread1_Sheet1.Columns.Get(4).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -953,38 +967,38 @@ this.fpSpread1_Sheet1.Columns.Get(4).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - textCellType5.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + textCellType18.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ItemName"; this.fpSpread1_Sheet1.Columns.Get(5).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F; - textCellType6.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + textCellType19.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemModel"; this.fpSpread1_Sheet1.Columns.Get(6).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 99F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ItemManu"; this.fpSpread1_Sheet1.Columns.Get(7).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "제조사"; this.fpSpread1_Sheet1.Columns.Get(7).Tag = "manu"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "ItemUnit"; this.fpSpread1_Sheet1.Columns.Get(8).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(8).Tag = "unit"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - textCellType7.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7; + textCellType20.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType20; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "price"; this.fpSpread1_Sheet1.Columns.Get(9).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; @@ -992,15 +1006,15 @@ this.fpSpread1_Sheet1.Columns.Get(9).Tag = "price"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - textCellType8.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType8; + textCellType21.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType21; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "qty"; this.fpSpread1_Sheet1.Columns.Get(10).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "1대 수량"; this.fpSpread1_Sheet1.Columns.Get(10).Tag = "qty"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(11).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -1008,8 +1022,8 @@ this.fpSpread1_Sheet1.Columns.Get(11).Tag = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - textCellType9.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; + textCellType22.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amt"; this.fpSpread1_Sheet1.Columns.Get(12).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; @@ -1017,33 +1031,33 @@ this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amt"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "amtn"; this.fpSpread1_Sheet1.Columns.Get(13).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(13).Label = "N대 금액"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "amtn"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "qtyjago"; this.fpSpread1_Sheet1.Columns.Get(14).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "PMP"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "qtybuy"; this.fpSpread1_Sheet1.Columns.Get(15).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "구매수량"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "buy"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = checkBoxCellType3; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "PR"; this.fpSpread1_Sheet1.Columns.Get(16).Tag = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = checkBoxCellType4; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "bconfirm"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Label = "PO"; @@ -1051,7 +1065,7 @@ this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "ItemSupply"; this.fpSpread1_Sheet1.Columns.Get(18).Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; @@ -1060,30 +1074,30 @@ this.fpSpread1_Sheet1.Columns.Get(18).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 113F; - textCellType11.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType11; + textCellType24.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "option2"; this.fpSpread1_Sheet1.Columns.Get(19).Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(19).Label = "납기일"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType25; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType26; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(21).Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(21).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "Item"; this.fpSpread1_Sheet1.Columns.Get(22).Tag = "item"; this.fpSpread1_Sheet1.Columns.Get(22).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "ItemSupplyidx"; this.fpSpread1_Sheet1.Columns.Get(23).Visible = false; this.fpSpread1_Sheet1.DataAutoCellTypes = false; @@ -1098,11 +1112,11 @@ this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.MultiSelect; this.fpSpread1_Sheet1.PrintInfo.Footer = "EET Groupware - Alpha -"; this.fpSpread1_Sheet1.PrintInfo.Header = "PartList"; - noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo1.HardMarginX = 0F; - noPrinterPrintInfo1.HardMarginY = 0F; - noPrinterPrintInfo1.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; + noPrinterPrintInfo2.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo2.HardMarginX = 0F; + noPrinterPrintInfo2.HardMarginY = 0F; + noPrinterPrintInfo2.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo2; this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; this.fpSpread1_Sheet1.Protect = false; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -1254,6 +1268,7 @@ this.Text = "CR구매현황"; this.Load += new System.EventHandler(this.fPartList_Load); this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); this.cm1.ResumeLayout(false); @@ -1342,5 +1357,6 @@ private System.Windows.Forms.ToolStripMenuItem oNToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem oFFToolStripMenuItem1; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.CheckBox chkshowerr; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs index ef9a709..65012e3 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs @@ -51,7 +51,7 @@ namespace FPJ0000 private void ProjectPartStatus_ColumnChanged(object sender, DataColumnChangeEventArgs e) { - + } private void FPartList_FormClosing(object sender, FormClosingEventArgs e) @@ -100,6 +100,7 @@ namespace FPJ0000 else if (colname == "itemmanu") colidx_manu = col.Index; else if (colname == "itemunit") colidx_unit = col.Index; } + this.chkshowerr.Checked = FCOMMON.info.ShowBuyerror; this.Show(); //this.bsPart.Sort = "bbuy,ItemSupply,qtyin"; Application.DoEvents(); @@ -117,6 +118,16 @@ namespace FPJ0000 } //if (button3.BackColor != Color.Gold) bsPart.Filter = "status not like '완료%'"; //else bsPart.Filter = ""; + if (chkshowerr.Checked) + { + prb4.BackColor = Color.Tomato; + prb4.BackColor2 = Color.Red; + } + else + { + prb4.BackColor = Color.Gray; + prb4.BackColor2 = Color.DimGray; + } try { @@ -223,7 +234,7 @@ namespace FPJ0000 if (bPR == false) { //PR이 입력되지 않았따. - if (qty_in > 0 ) + if (chkshowerr.Checked && qty_in > 0) { 입력오류 += 1; row.ForeColor = Color.White; @@ -238,7 +249,7 @@ namespace FPJ0000 } else if (bPO == false) //PO 입력대기 (발주완율) { - if (qty_in > 0 ) + if (chkshowerr.Checked && qty_in > 0) { 입력오류 += 1; row.ForeColor = Color.White; @@ -250,7 +261,7 @@ namespace FPJ0000 row.ForeColor = Color.Black; row.BackColor = Color.Gold; } - + } else { @@ -319,7 +330,7 @@ namespace FPJ0000 this.Validate(); this.bsPart.EndEdit(); this.Validate(); - + ////모든데이터의 공백을 제거(sid) //foreach (var item in this.dsPRJ.ProjectsPart) @@ -785,7 +796,7 @@ namespace FPJ0000 var dr = drv.Row as dsPRJ.ProjectPartStatusRow; var serverpath = System.IO.Path.Combine(FCOMMON.info.datapath, "Data", "Project"); - // var serverpath = Properties.Settings.Default.SharePath + @"\Project"; // + // var serverpath = Properties.Settings.Default.SharePath + @"\Project"; // if (dr.path.isEmpty() == false) { @@ -793,7 +804,7 @@ namespace FPJ0000 else serverpath += "\\" + dr.path; } else serverpath += "\\" + dr.Project.ToString(); - + //+ dr.Project.ToString(); //if (tbPath == "") tbPath = "/" + dr.idx.ToString(); @@ -804,7 +815,7 @@ namespace FPJ0000 // else tbPath = "\\" + tbPath; //} //\\10.131.32.29\Data - + if (System.IO.Directory.Exists(serverpath) == false) { FCOMMON.Util.MsgE("프로젝트 경로가 존재하지 않아 진행할 수 없습니다\n\n" + @@ -912,7 +923,7 @@ namespace FPJ0000 private void 선택반전ToolStripMenuItem_Click(object sender, EventArgs e) { - + } private void 선택해제ToolStripMenuItem_Click(object sender, EventArgs e) @@ -933,7 +944,7 @@ namespace FPJ0000 var col_bcof = this.fpSpread1_Sheet1.Columns["bconfirm"].Index; var allselection = fpSpread1_Sheet1.GetSelections(); - if(allselection.Length < 1 ) + if (allselection.Length < 1) { FCOMMON.Util.MsgE("선택된 대상이 없습니다"); return; @@ -953,7 +964,7 @@ namespace FPJ0000 dr.EndEdit(); } //fpSpread1_Sheet1.Cells[sel.Row, col_bbuy].Value = true; - + } fpSpread1.EditMode = false; @@ -1058,5 +1069,15 @@ namespace FPJ0000 } fpSpread1.EditMode = false; } + + private void chkshowerr_CheckedChanged(object sender, EventArgs e) + { + + } + + private void chkshowerr_Click(object sender, EventArgs e) + { + RefreshData(); + } } } diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index 52cf15c..f3f91d1 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pTmxrY - zVTMdDqnaGpDFwbZYhqal9BEB11EKXpRoV10alPnnNMNZ2QuU5vzLnhZ6i7n6M7023POlhoI/eDD8+I5 - 3w/n9z2Hx07IfU3ipVK9KrJM/ztUpqfISXOUs6eBjizto8Mf60xnpdpKv6i3+7jQ7gl71KNdtNHLJpPJ - bXWsw2rfYdnGQuPnvA35n6YRWzbiFGQq93ujnoko1i2y4b5JFwxTDAzTDPSTDHQTG9D8WkfrsAPrDNA0 - QiH/wxSSn5qofyShslZqzbmBgRk3vs4w5GTQz0k20G1ex5dhJxFsYmDeDcOcC4XKaQTd63zDhWPKAy03 - ZFFb4pprSK6+juq2ehQ0lCNI5o9AgqDwDELkJ1HRVMGtYqcZLKw4EZLQzXCC6NKg951DzWgee4FqfS4n - SagKR+7reGTVx0KkuIwkRRKaBhfQbLLj8/c1rJKeQuU9NCcQVAr2+8my3frRLrwakqNEk8lJEmsiSPgK - 0p6lQmt2cKt0jFFQkR5WHC6EFvR6BOyEFXfTklohjGYdFIa7KGrPQUz5BSRWRcE46YSRFMsWrB33dGIl - ghD5LsG5BzLXqbzDiK8UYGC8D4Vd6ZArJYh9Eox6zUd8m2VgJMX2TbjQS1i0uRD00Cs4LvUR86WHkFUX - h5s1YYiruMhJJMp4SBtSyZsEg70fmHajn/3EBBspMiBb5xHwpQdm+dKD5CEf8HN9cLUkGBnPhdAOq1Co - ykP6OyFENdEwEoGB/Bt6IqBdm0Sg2VnhfHYPPb9KY3DWzdE9Ooc7tWlIIUGxIhY5dbe371icG24iaNwR - sLYZ647gfzjYFVJ3CU5L1M6iqpdbez28F2q1evNoQpPdGydFprVbptacNvbCskTBskjB7GXJ7uJgm7fT - njBFUau+t1p+eOM83om0towAUWv7MbHKGiBupLdJ8eD/F1Ej7StqWTmS1NLhL1Qm83g83h/rHJ3uwC6N - XgAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL8qlNjWw + m6mY6XRO0dREFwbZYiqZutBEhQxRil5UaBed2tQ553TDGZnL1Ob9Al6Wuss5c2f67TlnSw2EfvDhefGc + 74fz+57DYyf4oSbhSqleFVGm/x0i01PkpDkU7GmgI0r76bCnOtN5qbbCL/LtAS60d0KLerXLVnrVZDK5 + LXYnLLZdVq0sNH4uWpH/aRYxZaMOYYbyoDfqmfBi3TIb7p92wTDDwDDLQD/NQDe1Cc0vJ9pG7HAyQPMo + hfwPM0h6bqL+kYTI2qgNxyYG59z4OseQk8EAJ9lEj9mJLyMOItjC4KIbhgUXCpWzEDzoesOFoxWBk7dk + kduS6htIqrqJqvYGFDQqIJD5I5AgLDyHYPlplDeXc6vYaAZLaw4Ex/cwnCCqVPC+a7gFLeMvUaXP5STx + lWHIfR2HzIYYiGuuIrEmEc1DS2gx2fD5+wbWSU8h8l6aEwgrhAf9ZFlu/Vg3Xg3LUaLJ4CQJ1eEkfA2p + L1KgNdu5VTrHKahID2t2F0IK+jwCdkKLe+jsOhGMZh1qDPfxpCMH0YpLSKiMhHHaASMpli1YO+HpxEIE + wfI9gguPZK4zeUcRVyHE4EQ/CrvTIFdmI+ZZEBo0H/FtnoGRFNs/5UIfYdnqguCxV3BS6iPhS48gsz4W + t6tDEVt+mZNkK+MgbUwhbxIE9n5w1o0B9hMTrKTIgCydR8CXHprnSw+Th3zAz/XB9ZIgpNeKoB1RoVCV + h7R3Ioiro2AkAgP5N/REQLu2iECzu8LFrF56cZ3G0Lybo2dsAffqUpFMgpKaGOTU3925Y3FsuomgaVfA + 2uYsu4L/YWdXSNkjOJutdhRV1G7v9/B+qNXqrePxzTZvnBSZ2jE5s+GwsheTKxQmlymYvazYXBxs8zba + E6Yoat33TusPb5zHO5Xanh4gbus4IVFZAiRN9A7JHvz/Im6ifcWta8cSWzv9RcokHo/H+wPmxp3ob1Up + UwAAAABJRU5ErkJggg== @@ -383,6 +383,9 @@ 542, 17 + + 445, 17 + 17, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index a7d5969..3d32ce0 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -506,7 +506,7 @@ namespace FPJ0000 var dr = drv.Row as dsPRJ.ProjectsRow; this.label1.Text = string.Format("[{0}] {1}", dr.name, dr.memo); - var sql = "select (sum((case bbuy when 1 then( case qtybuy when qtyin then 1 else 0 end) else 0 end)) *100 / count(*)) from ProjectsPart where project = " + dr.idx.ToString(); + var sql = "select ((sum((case when isnull(qtybuy,0) = isnull(qtyin,0) then 1 else 0 end))*1.0) / count(*))*100 from ProjectsPart where project = " + dr.idx.ToString(); var stR_result = FCOMMON.DBM.ExecuteScalar(sql); if (string.IsNullOrEmpty(stR_result)) { @@ -515,8 +515,8 @@ namespace FPJ0000 else { tableLayoutPanel3.Visible = true; - var perc = int.Parse(stR_result); - this.label17.Text = string.Format("구매 완료율 ({0}%)", perc); + var perc = float.Parse(stR_result); + this.label17.Text = string.Format("구매 완료({0:N0}%)", perc); this.prb1.ProgressMin = 0; this.prb1.ProgressMax = 100; this.prb1.ProgressValue = perc;