修改装箱提示

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.Designer.cs

@@ -109,7 +109,7 @@
             this.AutoPrint.Checked = true;
             this.AutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoPrint.Location = new System.Drawing.Point(985, 204);
+            this.AutoPrint.Location = new System.Drawing.Point(1004, 216);
             this.AutoPrint.Margin = new System.Windows.Forms.Padding(4);
             this.AutoPrint.Name = "AutoPrint";
             this.AutoPrint.Size = new System.Drawing.Size(154, 31);
@@ -143,7 +143,7 @@
             // 
             this.palletcode_label.AutoSize = true;
             this.palletcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.palletcode_label.Location = new System.Drawing.Point(980, 339);
+            this.palletcode_label.Location = new System.Drawing.Point(957, 339);
             this.palletcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.palletcode_label.Name = "palletcode_label";
             this.palletcode_label.Size = new System.Drawing.Size(72, 27);
@@ -154,7 +154,7 @@
             // 
             this.outboxcode_label.AutoSize = true;
             this.outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outboxcode_label.Location = new System.Drawing.Point(980, 394);
+            this.outboxcode_label.Location = new System.Drawing.Point(957, 394);
             this.outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.outboxcode_label.Name = "outboxcode_label";
             this.outboxcode_label.Size = new System.Drawing.Size(92, 27);
@@ -275,11 +275,11 @@
             this.outboxcode.AllPower = "ifall";
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(1105, 394);
+            this.outboxcode.Location = new System.Drawing.Point(1054, 394);
             this.outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifwrite";
-            this.outboxcode.Size = new System.Drawing.Size(195, 25);
+            this.outboxcode.Size = new System.Drawing.Size(140, 25);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -292,11 +292,11 @@
             this.bigoutboxcode.AllPower = "ifall";
             this.bigoutboxcode.BackColor = System.Drawing.Color.White;
             this.bigoutboxcode.ID = null;
-            this.bigoutboxcode.Location = new System.Drawing.Point(1105, 339);
+            this.bigoutboxcode.Location = new System.Drawing.Point(1054, 341);
             this.bigoutboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.bigoutboxcode.Name = "bigoutboxcode";
             this.bigoutboxcode.Power = "ifwrite";
-            this.bigoutboxcode.Size = new System.Drawing.Size(195, 25);
+            this.bigoutboxcode.Size = new System.Drawing.Size(140, 25);
             this.bigoutboxcode.Str = null;
             this.bigoutboxcode.Str1 = null;
             this.bigoutboxcode.Str2 = null;
@@ -517,12 +517,12 @@
             this.AutoOutBoxCode.Checked = true;
             this.AutoOutBoxCode.CheckState = System.Windows.Forms.CheckState.Checked;
             this.AutoOutBoxCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoOutBoxCode.Location = new System.Drawing.Point(1146, 204);
+            this.AutoOutBoxCode.Location = new System.Drawing.Point(1202, 338);
             this.AutoOutBoxCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoOutBoxCode.Name = "AutoOutBoxCode";
-            this.AutoOutBoxCode.Size = new System.Drawing.Size(154, 31);
+            this.AutoOutBoxCode.Size = new System.Drawing.Size(114, 31);
             this.AutoOutBoxCode.TabIndex = 179;
-            this.AutoOutBoxCode.Text = "自动生成箱号";
+            this.AutoOutBoxCode.Text = "自动生成";
             this.AutoOutBoxCode.UseVisualStyleBackColor = true;
             // 
             // pa_status

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -85,11 +85,6 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (bigoutboxcode.Text == "")
-                {
-                    OperateResult.AppendText(">>大箱号不能为空\n", Color.Red);
-                    return;
-                }
                 sql.Clear();
                 sql.Append("select pa_makecode,pa_standardqty,pa_packageqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_currentqty,pa_custcode,pa_salecode ");
                 sql.Append("from package where pa_outboxcode='" + bigoutboxcode.Text + "'  and pa_type =2");
@@ -104,7 +99,7 @@ namespace UAS_MES.Make
                     FillPrintLabel();
                     outboxcode.Focus();
                 }
-                else OperateResult.AppendText(">>大箱号不存在\n", Color.Red);
+                else outboxcode.Focus();
             }
         }
 
@@ -164,7 +159,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
-                        OperateResult.AppendText(">>箱号" + outboxcode.Text + "未采集内容，不允许装大箱\n", Color.Red, outboxcode);
+                        OperateResult.AppendText(">>箱号" + outboxcode.Text + "未采集内容或不存在，不允许装大箱\n", Color.Red, outboxcode);
                         return;
                     }
                     pa_status.Text = dh.getFieldDataByCondition("package", "nvl(pa_status,0)pa_status", "pa_outboxcode='" + bigoutboxcode.Text + "'").ToString();

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -55,6 +55,7 @@ namespace UAS_MES.Make
             pa_outboxcode.ShowClickIcon = false;
             //设置DbFind的必须的数据
             PrintNum.Value = 1;
+            pr_outboxinnerqty.Controls[0].Visible = false;
             asc.controllInitializeSize(this);
             thread = new Thread(NewPrint);
             SetLoadingWindow stw = new SetLoadingWindow(thread, "初始化打印程序");
@@ -93,7 +94,7 @@ namespace UAS_MES.Make
                     pr_outboxinnerqty.Text = pa_standardqty.Text;
                 }
             }
-            else OperateResult.AppendText(">>" + Err + "不存在\n", Color.Red);
+            else sn_code.Focus();
         }
 
         private void LoadGridData()

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -72,6 +72,7 @@ namespace UAS_MES.Make
             pa_outboxcode.ShowClickIcon = false;
             ComList.Text = BaseUtil.GetCacheData("PortName").ToString();
             Baurate.Text = BaseUtil.GetCacheData("BaudRate").ToString();
+            pr_outboxinnerqty.Controls[0].Visible = false;
             //设置DbFind的必须的数据
             PrintNum.Value = 1;
             asc.controllInitializeSize(this);
@@ -170,7 +171,7 @@ namespace UAS_MES.Make
                 else
                     pr_cartonboxgw.Text = MinWeight + "-" + MaxWeight;
             }
-            else OperateResult.AppendText(">>" + Err + "不存在\n", Color.Red);
+            else sn_code.Focus();
         }
 
         private void LoadGridData()

UAS-MES/FunctionCode/Make/Make_PalletCollection.Designer.cs

@@ -128,7 +128,7 @@
             // 
             this.palletcode_label.AutoSize = true;
             this.palletcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.palletcode_label.Location = new System.Drawing.Point(980, 308);
+            this.palletcode_label.Location = new System.Drawing.Point(960, 308);
             this.palletcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.palletcode_label.Name = "palletcode_label";
             this.palletcode_label.Size = new System.Drawing.Size(72, 27);
@@ -139,7 +139,7 @@
             // 
             this.outboxcode_label.AutoSize = true;
             this.outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outboxcode_label.Location = new System.Drawing.Point(980, 363);
+            this.outboxcode_label.Location = new System.Drawing.Point(960, 363);
             this.outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.outboxcode_label.Name = "outboxcode_label";
             this.outboxcode_label.Size = new System.Drawing.Size(52, 27);
@@ -303,11 +303,11 @@
             this.outboxcode.AllPower = "ifall";
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(1106, 363);
+            this.outboxcode.Location = new System.Drawing.Point(1047, 363);
             this.outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifwrite";
-            this.outboxcode.Size = new System.Drawing.Size(195, 25);
+            this.outboxcode.Size = new System.Drawing.Size(154, 25);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -320,11 +320,11 @@
             this.palletcode.AllPower = "ifall";
             this.palletcode.BackColor = System.Drawing.Color.White;
             this.palletcode.ID = null;
-            this.palletcode.Location = new System.Drawing.Point(1106, 308);
+            this.palletcode.Location = new System.Drawing.Point(1047, 308);
             this.palletcode.Margin = new System.Windows.Forms.Padding(4);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = "ifwrite";
-            this.palletcode.Size = new System.Drawing.Size(195, 25);
+            this.palletcode.Size = new System.Drawing.Size(154, 25);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -502,12 +502,12 @@
             this.AutoOutBoxCode.Checked = true;
             this.AutoOutBoxCode.CheckState = System.Windows.Forms.CheckState.Checked;
             this.AutoOutBoxCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoOutBoxCode.Location = new System.Drawing.Point(1105, 204);
+            this.AutoOutBoxCode.Location = new System.Drawing.Point(1208, 305);
             this.AutoOutBoxCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoOutBoxCode.Name = "AutoOutBoxCode";
-            this.AutoOutBoxCode.Size = new System.Drawing.Size(174, 31);
+            this.AutoOutBoxCode.Size = new System.Drawing.Size(114, 31);
             this.AutoOutBoxCode.TabIndex = 180;
-            this.AutoOutBoxCode.Text = "自动生成栈板号";
+            this.AutoOutBoxCode.Text = "自动生成";
             this.AutoOutBoxCode.UseVisualStyleBackColor = true;
             // 
             // pa_status

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -83,11 +83,6 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (palletcode.Text == "")
-                {
-                    OperateResult.AppendText(">>栈板号不能为空\n", Color.Red);
-                    return;
-                }
                 sql.Clear();
                 sql.Append("select pa_makecode,pa_status,pa_packageqty,pa_currentqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
                 sql.Append("from package where pa_outboxcode='" + palletcode.Text + "' and pa_type =3");
@@ -102,7 +97,7 @@ namespace UAS_MES.Make
                     FillPrintLabel();
                     outboxcode.Focus();
                 }
-                else OperateResult.AppendText(">>栈板号不存在\n", Color.Red);
+                else outboxcode.Focus();
             }
         }
 
@@ -155,7 +150,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
-                        OperateResult.AppendText(">>箱号" + outboxcode.Text + "未采集内容，不允许装栈板箱\n", Color.Red, outboxcode);
+                        OperateResult.AppendText(">>箱号" + outboxcode.Text + "未采集内容或不存在，不允许装栈板\n", Color.Red, outboxcode);
                         return;
                     }
                     pa_status.Text = dh.getFieldDataByCondition("package", "nvl(pa_status,0)pa_status", "pa_outboxcode='" + palletcode.Text + "'").ToString();
@@ -178,7 +173,7 @@ namespace UAS_MES.Make
                     }
                     else if (palletcode.Text == "" && !AutoOutBoxCode.Checked)
                     {
-                        OperateResult.AppendText(">>栈板号箱号不能为空\n", Color.Red, outboxcode);
+                        OperateResult.AppendText(">>栈板号不能为空\n", Color.Red, outboxcode);
                         return;
                     }
                     pa_outboxcode.Text = palletcode.Text;

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -71,6 +71,7 @@ namespace UAS_MES.Make
             pa_outboxcode.Caller = "PACKAGE";
             ComList.Text = BaseUtil.GetCacheData("PortName").ToString();
             Baurate.Text = BaseUtil.GetCacheData("BaudRate").ToString();
+            pr_outboxinnerqty.Controls[0].Visible = false;
             //设置DbFind的必须的数据
             PrintNum.Value = 1;
             asc.controllInitializeSize(this);
@@ -177,7 +178,7 @@ namespace UAS_MES.Make
                 else
                     pr_cartonboxgw.Text = MinWeight + "-" + MaxWeight;
             }
-            else OperateResult.AppendText(">>" + Err + "不存在\n", Color.Red);
+            else sn_code.Focus();
         }
 
         private void LoadGridData()