파트리스트 금액칸 9백에서 9조로 수정 함 (붙여넣기 값 오류 있었음)

2020-05-11 13:00:44 +09:00
parent f68c0a0ea4
commit 91c2ddc961
17 changed files with 720 additions and 470 deletions
--- a/SubProject/FEQ0000/Purchase/fPurchase_AddS.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_AddS.Designer.cs
@@ -39,6 +39,7 @@
            System.Windows.Forms.Label label3;
            System.Windows.Forms.Label label6;
            System.Windows.Forms.Label label2;
+            System.Windows.Forms.Label receiveLabel;
            this.tbSID = new System.Windows.Forms.TextBox();
            this.tbPumName = new System.Windows.Forms.TextBox();
            this.tbPumModel = new System.Windows.Forms.TextBox();
@@ -63,6 +64,7 @@
            this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
            this.cmbPlace = new System.Windows.Forms.ComboBox();
            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.cmbReceive = new System.Windows.Forms.ComboBox();
            sidLabel = new System.Windows.Forms.Label();
            pumscaleLabel = new System.Windows.Forms.Label();
            pumqtyLabel = new System.Windows.Forms.Label();
@@ -73,6 +75,7 @@
            label3 = new System.Windows.Forms.Label();
            label6 = new System.Windows.Forms.Label();
            label2 = new System.Windows.Forms.Label();
+            receiveLabel = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.purchaseBindingSource)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -406,18 +409,43 @@
            // 
            this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
            this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pictureBox1.Location = new System.Drawing.Point(490, 11);
+            this.pictureBox1.Location = new System.Drawing.Point(490, 44);
            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(393, 538);
+            this.pictureBox1.Size = new System.Drawing.Size(393, 505);
            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
            this.pictureBox1.TabIndex = 33;
            this.pictureBox1.TabStop = false;
            // 
+            // receiveLabel
+            // 
+            receiveLabel.AutoSize = true;
+            receiveLabel.Location = new System.Drawing.Point(494, 11);
+            receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            receiveLabel.Name = "receiveLabel";
+            receiveLabel.Size = new System.Drawing.Size(54, 20);
+            receiveLabel.TabIndex = 34;
+            receiveLabel.Text = "수령인";
+            // 
+            // cmbReceive
+            // 
+            this.cmbReceive.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            this.cmbReceive.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+            this.cmbReceive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbReceive.FormattingEnabled = true;
+            this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.cmbReceive.Location = new System.Drawing.Point(556, 9);
+            this.cmbReceive.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbReceive.Name = "cmbReceive";
+            this.cmbReceive.Size = new System.Drawing.Size(327, 28);
+            this.cmbReceive.TabIndex = 35;
+            // 
            // fPurchase_AddS
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(895, 561);
+            this.Controls.Add(receiveLabel);
+            this.Controls.Add(this.cmbReceive);
            this.Controls.Add(this.pictureBox1);
            this.Controls.Add(this.cmbPlace);
            this.Controls.Add(label2);
@@ -490,5 +518,6 @@
        private System.Windows.Forms.LinkLabel linkLabel6;
        private System.Windows.Forms.ComboBox cmbPlace;
        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.ComboBox cmbReceive;
    }
 }
--- a/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs
@@ -62,6 +62,7 @@ namespace FEQ0000
            var userList = FCOMMON.DBM.getUserList(); //.getGroupList("name", "Users", "[level] > 0 and [level] < 10");
            foreach (var user in userList)
            {
+                this.cmbReceive.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value));
                this.cmbRequest.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value));
            }

@@ -81,6 +82,18 @@ namespace FEQ0000
                }
            } else cmbRequest.Text = dr.request;

+            if (cmbReceive.Items.Count > 0)
+            {
+                for (int i = 0; i < cmbReceive.Items.Count; i++)
+                {
+                    if (cmbReceive.Items[i].ToString().StartsWith("[" + dr.receive + "]"))
+                    {
+                        cmbReceive.SelectedIndex = i;
+                        break;
+                    }
+                }
+            }
+            else cmbReceive.Text = dr.receive;


            cmbPlace.Text = dr.place;
@@ -112,7 +125,9 @@ namespace FEQ0000
            int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase));
            if (curLevel < 5)
            {
-               
+
+                if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
+                    cmbReceive.Enabled = false;

                cmbState.Enabled = false;
                if (cmbRequest.Text != "") cmbRequest.Enabled = false;
@@ -382,6 +397,13 @@ namespace FEQ0000
            else dr.supplyidx = int.Parse(tbSupplyIndex.Text);

            dr.state = cmbState.Text.Trim();
+
+            if (cmbReceive.Text.IndexOf("]") != -1)
+                dr.receive = cmbReceive.Text.Substring(1, cmbReceive.Text.IndexOf("]") - 1);
+            else
+                dr.receive = cmbReceive.Text.Trim();
+
+
            dr.bigo = tbBigo.Text;

            //품정보가 업데이트 되어있으면 해당 데이터의 이미지를 업데이트 한다.(크기비교)
--- a/SubProject/FEQ0000/Purchase/fPurchase_AddS.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase_AddS.resx
@@ -150,6 +150,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>
@@ -159,6 +162,9 @@
  <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="receiveLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>58</value>
  </metadata>