구매등록시 SID 선택한 경우 품명, 모델을 편집할 수 없게함

구매등록시 탭 순서 변경

Project/History.txt

@@ -1,4 +1,6 @@
-181226	chi	NR구매 목록에서 저장시 메세지 표시
+190104	chi	NR구매시 SID 설정하면 모델 및 이름 변경 불가하게 함 (박성민s)
+			탭순서 변경
+181226	chi	NR구매 목록에서 저장시 메세지 표시
 181222	chi	NR구매 등록화면 데이터 불러오기시 금액에 천단위 기호 추가
 			Redis 오류 발생시 try catch 제거
 			NR구매등록시 적용장비/적용위치 항목 추가(공통코드 06,07)
@@ -9,7 +11,6 @@
 181213	chi	구매등록시 필수항목 변경
 			수령자는 비활성화 함
 181212	chi	구매내역의 부서를 비고로 변경하고 크기를 50- >500으로 증가
-181212	chi	구매내역의 부서를 비고로 변경하고 크기를 50- >500으로 증가
 181210	chi	NR구매등록시 이미지 표시 및 추가 기능
 			NR구매목록에서 권한 없는 사람이 더블클릭으로 편집할 수 있는 버그 수정
 			이미지 크기를 640*480 내에서 자동 조정 됨

Project/Properties/AssemblyInfo.cs

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

SubProject/FEQ0000/Properties/licenses.licx

@@ -1 +0,0 @@
-FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457

SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs

@@ -86,6 +86,7 @@
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             processLabel = new System.Windows.Forms.Label();
             receiveLabel = new System.Windows.Forms.Label();
             scLabel = new System.Windows.Forms.Label();
@@ -157,7 +158,7 @@
             pumnameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             pumnameLabel.Name = "pumnameLabel";
             pumnameLabel.Size = new System.Drawing.Size(39, 20);
-            pumnameLabel.TabIndex = 7;
+            pumnameLabel.TabIndex = 5;
             pumnameLabel.Text = "품명";
             // 
             // pumscaleLabel
@@ -167,7 +168,7 @@
             pumscaleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             pumscaleLabel.Name = "pumscaleLabel";
             pumscaleLabel.Size = new System.Drawing.Size(39, 20);
-            pumscaleLabel.TabIndex = 10;
+            pumscaleLabel.TabIndex = 8;
             pumscaleLabel.Text = "모델";
             // 
             // pumqtyLabel
@@ -177,7 +178,7 @@
             pumqtyLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             pumqtyLabel.Name = "pumqtyLabel";
             pumqtyLabel.Size = new System.Drawing.Size(39, 20);
-            pumqtyLabel.TabIndex = 13;
+            pumqtyLabel.TabIndex = 11;
             pumqtyLabel.Text = "수량";
             // 
             // pumpriceLabel
@@ -187,7 +188,7 @@
             pumpriceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             pumpriceLabel.Name = "pumpriceLabel";
             pumpriceLabel.Size = new System.Drawing.Size(39, 20);
-            pumpriceLabel.TabIndex = 16;
+            pumpriceLabel.TabIndex = 13;
             pumpriceLabel.Text = "단가";
             // 
             // pumamtLabel
@@ -197,7 +198,7 @@
             pumamtLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             pumamtLabel.Name = "pumamtLabel";
             pumamtLabel.Size = new System.Drawing.Size(39, 20);
-            pumamtLabel.TabIndex = 16;
+            pumamtLabel.TabIndex = 15;
             pumamtLabel.Text = "합계";
             // 
             // supplyLabel
@@ -207,7 +208,7 @@
             supplyLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             supplyLabel.Name = "supplyLabel";
             supplyLabel.Size = new System.Drawing.Size(54, 20);
-            supplyLabel.TabIndex = 20;
+            supplyLabel.TabIndex = 17;
             supplyLabel.Text = "공급처";
             // 
             // projectLabel
@@ -217,7 +218,7 @@
             projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             projectLabel.Name = "projectLabel";
             projectLabel.Size = new System.Drawing.Size(69, 20);
-            projectLabel.TabIndex = 23;
+            projectLabel.TabIndex = 20;
             projectLabel.Text = "프로젝트";
             // 
             // assetLabel
@@ -247,7 +248,7 @@
             deptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             deptLabel.Name = "deptLabel";
             deptLabel.Size = new System.Drawing.Size(39, 20);
-            deptLabel.TabIndex = 10;
+            deptLabel.TabIndex = 26;
             deptLabel.Text = "비고";
             // 
             // label1
@@ -294,8 +295,8 @@
             this.tbSID.Location = new System.Drawing.Point(93, 66);
             this.tbSID.Margin = new System.Windows.Forms.Padding(4);
             this.tbSID.Name = "tbSID";
-            this.tbSID.Size = new System.Drawing.Size(176, 27);
+            this.tbSID.Size = new System.Drawing.Size(238, 27);
-            this.tbSID.TabIndex = 4;
+            this.tbSID.TabIndex = 0;
             // 
             // tbPumName
             // 
@@ -305,7 +306,7 @@
             this.tbPumName.Margin = new System.Windows.Forms.Padding(4);
             this.tbPumName.Name = "tbPumName";
             this.tbPumName.Size = new System.Drawing.Size(311, 27);
-            this.tbPumName.TabIndex = 8;
+            this.tbPumName.TabIndex = 1;
             // 
             // tbPumModel
             // 
@@ -315,7 +316,7 @@
             this.tbPumModel.Margin = new System.Windows.Forms.Padding(4);
             this.tbPumModel.Name = "tbPumModel";
             this.tbPumModel.Size = new System.Drawing.Size(311, 27);
-            this.tbPumModel.TabIndex = 11;
+            this.tbPumModel.TabIndex = 2;
             // 
             // tbPumUnit
             // 
@@ -324,9 +325,10 @@
             this.tbPumUnit.Margin = new System.Windows.Forms.Padding(4);
             this.tbPumUnit.Name = "tbPumUnit";
             this.tbPumUnit.Size = new System.Drawing.Size(64, 27);
-            this.tbPumUnit.TabIndex = 12;
+            this.tbPumUnit.TabIndex = 10;
             this.tbPumUnit.TabStop = false;
             this.tbPumUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.toolTip1.SetToolTip(this.tbPumUnit, "단위");
             // 
             // tbPumQty
             // 
@@ -335,7 +337,7 @@
             this.tbPumQty.Margin = new System.Windows.Forms.Padding(4);
             this.tbPumQty.Name = "tbPumQty";
             this.tbPumQty.Size = new System.Drawing.Size(111, 27);
-            this.tbPumQty.TabIndex = 13;
+            this.tbPumQty.TabIndex = 3;
             this.tbPumQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.tbPumQty.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged);
             // 
@@ -345,7 +347,7 @@
             this.tbPumPrice.Margin = new System.Windows.Forms.Padding(4);
             this.tbPumPrice.Name = "tbPumPrice";
             this.tbPumPrice.Size = new System.Drawing.Size(148, 27);
-            this.tbPumPrice.TabIndex = 15;
+            this.tbPumPrice.TabIndex = 4;
             this.tbPumPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.tbPumPrice.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged);
             // 
@@ -356,7 +358,7 @@
             this.tbPumAmt.Name = "tbPumAmt";
             this.tbPumAmt.ReadOnly = true;
             this.tbPumAmt.Size = new System.Drawing.Size(382, 27);
-            this.tbPumAmt.TabIndex = 17;
+            this.tbPumAmt.TabIndex = 5;
             this.tbPumAmt.TabStop = false;
             this.tbPumAmt.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             // 
@@ -367,7 +369,7 @@
             this.tbSupply.Margin = new System.Windows.Forms.Padding(4);
             this.tbSupply.Name = "tbSupply";
             this.tbSupply.Size = new System.Drawing.Size(311, 27);
-            this.tbSupply.TabIndex = 21;
+            this.tbSupply.TabIndex = 6;
             // 
             // tbSupplyIndex
             // 
@@ -376,9 +378,10 @@
             this.tbSupplyIndex.Name = "tbSupplyIndex";
             this.tbSupplyIndex.ReadOnly = true;
             this.tbSupplyIndex.Size = new System.Drawing.Size(64, 27);
-            this.tbSupplyIndex.TabIndex = 22;
+            this.tbSupplyIndex.TabIndex = 19;
             this.tbSupplyIndex.TabStop = false;
             this.tbSupplyIndex.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.toolTip1.SetToolTip(this.tbSupplyIndex, "Database ID");
             // 
             // tbProject
             // 
@@ -388,7 +391,7 @@
             this.tbProject.Margin = new System.Windows.Forms.Padding(4);
             this.tbProject.Name = "tbProject";
             this.tbProject.Size = new System.Drawing.Size(311, 27);
-            this.tbProject.TabIndex = 24;
+            this.tbProject.TabIndex = 7;
             // 
             // tbProjectIndex
             // 
@@ -397,9 +400,10 @@
             this.tbProjectIndex.Name = "tbProjectIndex";
             this.tbProjectIndex.ReadOnly = true;
             this.tbProjectIndex.Size = new System.Drawing.Size(64, 27);
-            this.tbProjectIndex.TabIndex = 25;
+            this.tbProjectIndex.TabIndex = 22;
             this.tbProjectIndex.TabStop = false;
             this.tbProjectIndex.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.toolTip1.SetToolTip(this.tbProjectIndex, "Database ID");
             // 
             // tbPO
             // 
@@ -418,7 +422,7 @@
             this.tbBigo.Multiline = true;
             this.tbBigo.Name = "tbBigo";
             this.tbBigo.Size = new System.Drawing.Size(381, 91);
-            this.tbBigo.TabIndex = 11;
+            this.tbBigo.TabIndex = 8;
             this.tbBigo.TabStop = false;
             // 
             // dtPdate
@@ -435,7 +439,7 @@
             this.btSave.Margin = new System.Windows.Forms.Padding(4);
             this.btSave.Name = "btSave";
             this.btSave.Size = new System.Drawing.Size(492, 51);
-            this.btSave.TabIndex = 3;
+            this.btSave.TabIndex = 0;
             this.btSave.Text = "저장(&S)";
             this.btSave.UseVisualStyleBackColor = true;
             this.btSave.Click += new System.EventHandler(this.button1_Click);
@@ -494,9 +498,10 @@
             this.tbPumIDX.Name = "tbPumIDX";
             this.tbPumIDX.ReadOnly = true;
             this.tbPumIDX.Size = new System.Drawing.Size(64, 27);
-            this.tbPumIDX.TabIndex = 9;
+            this.tbPumIDX.TabIndex = 7;
             this.tbPumIDX.TabStop = false;
             this.tbPumIDX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.toolTip1.SetToolTip(this.tbPumIDX, "Database ID");
             // 
             // tbPumStock
             // 
@@ -508,6 +513,7 @@
             this.tbPumStock.TabIndex = 14;
             this.tbPumStock.TabStop = false;
             this.tbPumStock.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.toolTip1.SetToolTip(this.tbPumStock, "재고량");
             // 
             // dtInDate
             // 
@@ -516,6 +522,7 @@
             this.dtInDate.Name = "dtInDate";
             this.dtInDate.Size = new System.Drawing.Size(193, 27);
             this.dtInDate.TabIndex = 15;
+            this.dtInDate.TabStop = false;
             // 
             // chkInDate
             // 
@@ -524,7 +531,8 @@
             this.chkInDate.Margin = new System.Windows.Forms.Padding(4);
             this.chkInDate.Name = "chkInDate";
             this.chkInDate.Size = new System.Drawing.Size(73, 24);
-            this.chkInDate.TabIndex = 14;
+            this.chkInDate.TabIndex = 25;
+            this.chkInDate.TabStop = false;
             this.chkInDate.Text = "입고일";
             this.chkInDate.UseVisualStyleBackColor = true;
             this.chkInDate.CheckedChanged += new System.EventHandler(this.chkInDate_CheckedChanged);
@@ -535,7 +543,7 @@
             this.dtExpDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtExpDate.Name = "dtExpDate";
             this.dtExpDate.Size = new System.Drawing.Size(193, 27);
-            this.dtExpDate.TabIndex = 13;
+            this.dtExpDate.TabIndex = 24;
             this.dtExpDate.TabStop = false;
             // 
             // chkExp
@@ -545,7 +553,7 @@
             this.chkExp.Margin = new System.Windows.Forms.Padding(4);
             this.chkExp.Name = "chkExp";
             this.chkExp.Size = new System.Drawing.Size(73, 24);
-            this.chkExp.TabIndex = 12;
+            this.chkExp.TabIndex = 23;
             this.chkExp.TabStop = false;
             this.chkExp.Text = "예상일";
             this.chkExp.UseVisualStyleBackColor = true;
@@ -624,8 +632,8 @@
             this.linkLabel1.Name = "linkLabel1";
             this.linkLabel1.Size = new System.Drawing.Size(124, 20);
             this.linkLabel1.TabIndex = 16;
-            this.linkLabel1.TabStop = true;
             this.linkLabel1.Text = "견적서 폴더 열기";
+            this.toolTip1.SetToolTip(this.linkLabel1, "클릭시 견적서(공유폴더) 가 열립니다.");
             this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
             // 
             // groupBox2
@@ -816,5 +824,6 @@
         private dsPurchaseTableAdapters.PurchaseTableAdapter purchaseTableAdapter;
         private System.Windows.Forms.ComboBox tbDept;
         private System.Windows.Forms.ComboBox tbAsset;
+        private System.Windows.Forms.ToolTip toolTip1;
     }
 }

SubProject/FEQ0000/Purchase/fPurchase_Add.cs

@@ -188,7 +188,6 @@ namespace FEQ0000
         {
             if (e.KeyCode == Keys.Enter)
             {
-                
                 Control ctl = sender as Control;
                 string nm = ctl.Name.ToLower();
                 string search = ctl.Text.Trim();
@@ -248,14 +247,29 @@ namespace FEQ0000
                                     if (oimage != null) oimage.Dispose();
                                 }
 
+                                FCOMMON.Util.MsgI("SID를 선택하면 품명&모델을 편집할 수 없습니다.\n\n해당 정보는 '품목' 정보에서 수정해야 합니다.");
 
                                 //이름을 선택되었으므로 모델을 선택한다.
-                                tbPumModel.Focus();
+                                tbPumName.Enabled = false;
+                                tbPumModel.Enabled = false;
+                                tbPumQty.Focus();
                                 this.Invalidate();
                                 return;
                             }
+                            else
+                            {
+                                tbPumName.Enabled = true;
+                                tbPumModel.Enabled = true;
+                                tbPumName.Focus();
+                            }
                         }
-                        tbPumName.Focus();
+                        else
+                        {
+                            tbPumName.Enabled = true;
+                            tbPumModel.Enabled = true;
+                            tbPumName.Focus();
+                        }
+                        
                         break;
                     case "tbpumname":
                         if (search != "")
@@ -310,7 +324,7 @@ namespace FEQ0000
                                 this.tbProjectIndex.Text = f.Index.ToString();
                             }
                         }
-                        this.btSaveAdd.Focus();
+                        this.btSave.Focus();
                         break;
 
                     case "tbsupply":

SubProject/FEQ0000/Purchase/fPurchase_Add.resx

@@ -168,6 +168,12 @@
   <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</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="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>
@@ -177,4 +183,7 @@
   <metadata name="purchaseTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>313, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>58</value>
+  </metadata>
 </root>