Browse Source

反馈调整

章政 7 years ago
parent
commit
5eba822bff

+ 17 - 15
UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs

@@ -83,6 +83,7 @@
             this.label4 = new System.Windows.Forms.Label();
             this.bi_inman = new System.Windows.Forms.Label();
             this.pib_inman = new System.Windows.Forms.Label();
+            this.PackMidBox = new System.Windows.Forms.Button();
             this.DCCheck = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.GridPrcode = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
             this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -148,7 +149,6 @@
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.PackMidBox = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridPrcode)).BeginInit();
@@ -482,7 +482,7 @@
             // AttachInfo
             // 
             this.AttachInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AttachInfo.Location = new System.Drawing.Point(388, 80);
+            this.AttachInfo.Location = new System.Drawing.Point(388, 48);
             this.AttachInfo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AttachInfo.Name = "AttachInfo";
             this.AttachInfo.Size = new System.Drawing.Size(64, 26);
@@ -628,6 +628,19 @@
             this.pib_inman.Size = new System.Drawing.Size(0, 20);
             this.pib_inman.TabIndex = 101;
             // 
+            // PackMidBox
+            // 
+            this.PackMidBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PackMidBox.Location = new System.Drawing.Point(388, 80);
+            this.PackMidBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.PackMidBox.Name = "PackMidBox";
+            this.PackMidBox.Size = new System.Drawing.Size(64, 26);
+            this.PackMidBox.TabIndex = 102;
+            this.PackMidBox.Text = "封中盒";
+            this.PackMidBox.UseVisualStyleBackColor = true;
+            this.PackMidBox.Visible = false;
+            this.PackMidBox.Click += new System.EventHandler(this.PackMidBox_Click);
+            // 
             // DCCheck
             // 
             this.DCCheck.ID = null;
@@ -1271,15 +1284,16 @@
             // 
             // OutBoxNum
             // 
+            this.OutBoxNum.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.OutBoxNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OutBoxNum.Items.AddRange(new object[] {
             "新增"});
             this.OutBoxNum.Location = new System.Drawing.Point(52, 144);
             this.OutBoxNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutBoxNum.Name = "OutBoxNum";
+            this.OutBoxNum.Text = "新增";
             this.OutBoxNum.Size = new System.Drawing.Size(72, 25);
             this.OutBoxNum.TabIndex = 91;
-            this.OutBoxNum.Text = "新增";
             this.OutBoxNum.SelectedIndexChanged += new System.EventHandler(this.OutBoxNum_SelectedIndexChanged);
             this.OutBoxNum.Click += new System.EventHandler(this.OutBoxNum_Click);
             // 
@@ -1346,18 +1360,6 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // PackMidBox
-            // 
-            this.PackMidBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PackMidBox.Location = new System.Drawing.Point(388, 48);
-            this.PackMidBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.PackMidBox.Name = "PackMidBox";
-            this.PackMidBox.Size = new System.Drawing.Size(64, 26);
-            this.PackMidBox.TabIndex = 102;
-            this.PackMidBox.Text = "封中盒";
-            this.PackMidBox.UseVisualStyleBackColor = true;
-            this.PackMidBox.Click += new System.EventHandler(this.PackMidBox_Click);
-            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

+ 5 - 2
UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -530,6 +530,7 @@ namespace UAS_LabelMachine
         {
             if (e.KeyCode == Keys.Enter)
             {
+                Input.Clear();
                 sql.Clear();
                 sql.Append("select pi_id,pi_cardcode,to_char(pi_date,'yyyymmdd')pi_date from prodinout where pi_inoutno='" + pi_inoutno.Text + "'");
                 dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
@@ -538,6 +539,7 @@ namespace UAS_LabelMachine
                     pi_cardcode.Text = dt.Rows[0]["pi_cardcode"].ToString();
                     pi_date.Text = dt.Rows[0]["pi_date"].ToString();
                     PI_ID = dt.Rows[0]["pi_id"].ToString();
+                    OutBoxNum_Click(new object(), new EventArgs());
                     LoadPrcodeData();
                     LoadGridData(sender, e);
                     //获取条码规则
@@ -809,6 +811,7 @@ namespace UAS_LabelMachine
         {
             if (MidLabelCombox.Text != "")
             {
+                PackMidBox_Click(sender, e);
                 thread = new Thread(MidBoxLabelPrint);
                 stw = new SetLoadingWindow(thread, "正在打印中盒");
                 BaseUtil.SetFormCenter(stw);
@@ -990,6 +993,7 @@ namespace UAS_LabelMachine
                     dh.BatchInsert("delete from prodiobarcode where pib_id=:pib_id", new string[] { "pib_id" }, DeleteID.ToArray());
                     LogManager.DoCommandLog(pi_inoutno.Text, User.UserCode, "删除明细", "删除明细成功");
                     MessageBox.Show("删除成功", "提示");
+                    LoadPrcodeData();
                     LoadGridData(sender, e);
                 }
             }
@@ -1274,7 +1278,7 @@ namespace UAS_LabelMachine
                 io = new ItemObject(pib_outboxcode2, pib_outboxcode2);
                 OutBoxNum.Items.Add(io);
             }
-            if (OutBoxNum.Text == "新增")
+            if (OutBoxNum.Text == "新增" || OutBoxNum.Text == "")
                 OutBoxNum.SelectedIndex = OutBoxNum.Items.Count - 1;
         }
 
@@ -1545,7 +1549,6 @@ namespace UAS_LabelMachine
                     dh.UpdateByCondition("RULEMAXNUM", "rmn_maxnumber='" + MaxNum + "'", "rmn_nrcode='" + pi_cardcode.Text + "' and rmn_prefix='" + Prefix + "'");
                 }
                 LoadGridData(sender, e);
-                MidLabelPrint.PerformClick();
             }
         }