Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -57,7 +57,7 @@ namespace UAS_MES.Make
             }
             catch
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件",Color.Red);
+                OperateResult.AppendText("未正确安装CodeSoft软件\n",Color.Red);
             }
         }
 

UAS-MES/FunctionCode/Make/Make_BigBoxWeight.cs

@@ -89,7 +89,7 @@ namespace UAS_MES.Make
                 BaseUtil.WriteLbl(lbl);
             }
             catch {
-                MessageBox.Show("未正确安装CodeSoft软件");
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
 

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -79,8 +79,15 @@ namespace UAS_MES.Make
 
         private void InPrint()
         {
-            lbl = new ApplicationClass();
-            BaseUtil.WriteLbl(lbl);
+            try
+            {
+                lbl = new ApplicationClass();
+                BaseUtil.WriteLbl(lbl);
+            }
+            catch (Exception)
+            {
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+            }
         }
 
         private void 卡通箱称重_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -100,7 +100,7 @@ namespace UAS_MES.Make
             }
             catch (Exception ex)
             {
-                MessageBox.Show("未正确安装codesoft");
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
 

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -66,7 +66,7 @@ namespace UAS_MES.Make
             }
             catch (Exception ex)
             {
-                MessageBox.Show("未正确安装codesoft");
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
 

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -67,7 +67,7 @@ namespace UAS_MES.Make
             }
             catch (Exception ex)
             {
-                MessageBox.Show("未正确安装codesoft");
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
 

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -60,7 +60,7 @@ namespace UAS_MES.Make
             }
             catch (Exception ex)
             {
-                MessageBox.Show("未安装codesoft");
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
 

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -42,7 +42,7 @@ namespace UAS_MES.Make
             }
             catch (Exception ex)
             {
-                MessageBox.Show("未正确安装codesoft");
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
 

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

@@ -58,9 +58,9 @@
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_currentqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_outboxcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_packageqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_standardqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_packageqty_label = new System.Windows.Forms.Label();
             this.Packing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
@@ -71,10 +71,10 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode_label.Location = new System.Drawing.Point(30, 41);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(27, 34);
             this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
-            this.pa_outboxcode_label.Size = new System.Drawing.Size(86, 31);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(72, 27);
             this.pa_outboxcode_label.TabIndex = 102;
             this.pa_outboxcode_label.Text = "栈板号";
             // 
@@ -82,10 +82,10 @@
             // 
             this.pa_totalqty_label.AutoSize = true;
             this.pa_totalqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty_label.Location = new System.Drawing.Point(352, 115);
+            this.pa_totalqty_label.Location = new System.Drawing.Point(313, 96);
             this.pa_totalqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_totalqty_label.Name = "pa_totalqty_label";
-            this.pa_totalqty_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_totalqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_totalqty_label.TabIndex = 104;
             this.pa_totalqty_label.Text = "已装数量";
             // 
@@ -93,10 +93,10 @@
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(352, 41);
+            this.pa_makecode_label.Location = new System.Drawing.Point(313, 34);
             this.pa_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_makecode_label.Name = "pa_makecode_label";
-            this.pa_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.pa_makecode_label.TabIndex = 108;
             this.pa_makecode_label.Text = "制造单号";
             // 
@@ -104,10 +104,10 @@
             // 
             this.pa_restqty_label.AutoSize = true;
             this.pa_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_restqty_label.Location = new System.Drawing.Point(1102, 192);
+            this.pa_restqty_label.Location = new System.Drawing.Point(980, 160);
             this.pa_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_restqty_label.Name = "pa_restqty_label";
-            this.pa_restqty_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_restqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_restqty_label.TabIndex = 154;
             this.pa_restqty_label.Text = "打印张数";
             // 
@@ -115,10 +115,10 @@
             // 
             this.pa_custcode_label.AutoSize = true;
             this.pa_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode_label.Location = new System.Drawing.Point(1102, 41);
+            this.pa_custcode_label.Location = new System.Drawing.Point(980, 34);
             this.pa_custcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_custcode_label.Name = "pa_custcode_label";
-            this.pa_custcode_label.Size = new System.Drawing.Size(62, 31);
+            this.pa_custcode_label.Size = new System.Drawing.Size(52, 27);
             this.pa_custcode_label.TabIndex = 157;
             this.pa_custcode_label.Text = "客户";
             // 
@@ -126,10 +126,10 @@
             // 
             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(1102, 370);
+            this.palletcode_label.Location = new System.Drawing.Point(980, 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(86, 31);
+            this.palletcode_label.Size = new System.Drawing.Size(72, 27);
             this.palletcode_label.TabIndex = 165;
             this.palletcode_label.Text = "栈板号";
             // 
@@ -137,10 +137,10 @@
             // 
             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(1102, 436);
+            this.outboxcode_label.Location = new System.Drawing.Point(980, 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(62, 31);
+            this.outboxcode_label.Size = new System.Drawing.Size(52, 27);
             this.outboxcode_label.TabIndex = 166;
             this.outboxcode_label.Text = "箱号";
             // 
@@ -148,10 +148,10 @@
             // 
             this.pa_prodcode_label.AutoSize = true;
             this.pa_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode_label.Location = new System.Drawing.Point(680, 41);
+            this.pa_prodcode_label.Location = new System.Drawing.Point(604, 34);
             this.pa_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_prodcode_label.Name = "pa_prodcode_label";
-            this.pa_prodcode_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.pa_prodcode_label.TabIndex = 169;
             this.pa_prodcode_label.Text = "产品编号";
             // 
@@ -159,20 +159,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1243, 121);
+            this.PrintLabel.Location = new System.Drawing.Point(1105, 101);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(219, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(195, 23);
             this.PrintLabel.TabIndex = 172;
             // 
             // PrintLabel_label
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(1102, 119);
+            this.PrintLabel_label.Location = new System.Drawing.Point(980, 99);
             this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(110, 31);
+            this.PrintLabel_label.Size = new System.Drawing.Size(92, 27);
             this.PrintLabel_label.TabIndex = 174;
             this.PrintLabel_label.Text = "标签文件";
             // 
@@ -180,19 +180,19 @@
             // 
             this.PrinterList_label.AutoSize = true;
             this.PrinterList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_label.Location = new System.Drawing.Point(680, 119);
+            this.PrinterList_label.Location = new System.Drawing.Point(604, 99);
             this.PrinterList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrinterList_label.Name = "PrinterList_label";
-            this.PrinterList_label.Size = new System.Drawing.Size(134, 31);
+            this.PrinterList_label.Size = new System.Drawing.Size(112, 27);
             this.PrinterList_label.TabIndex = 173;
             this.PrinterList_label.Text = "打印机列表";
             // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(1243, 193);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PrintNum.Location = new System.Drawing.Point(1105, 161);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(220, 28);
+            this.PrintNum.Size = new System.Drawing.Size(196, 25);
             this.PrintNum.TabIndex = 175;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -202,10 +202,10 @@
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(845, 119);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.PrinterList.Location = new System.Drawing.Point(751, 99);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(219, 30);
+            this.PrinterList.Size = new System.Drawing.Size(195, 25);
             this.PrinterList.TabIndex = 171;
             // 
             // pa_prodcode
@@ -213,11 +213,11 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(838, 41);
+            this.pa_prodcode.Location = new System.Drawing.Point(745, 34);
             this.pa_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_prodcode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
             this.pa_prodcode.TabIndex = 170;
             this.pa_prodcode.Tag = "1";
             // 
@@ -228,13 +228,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1243, 764);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Clean.Location = new System.Drawing.Point(1105, 637);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(90, 36);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 168;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -243,10 +243,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1072, 491);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Location = new System.Drawing.Point(953, 409);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(414, 263);
+            this.OperateResult.Size = new System.Drawing.Size(368, 220);
             this.OperateResult.TabIndex = 167;
             this.OperateResult.Text = "";
             // 
@@ -255,11 +255,11 @@
             this.outboxcode.AllPower = "ifall";
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(1244, 436);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.outboxcode.Location = new System.Drawing.Point(1106, 363);
+            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifwrite";
-            this.outboxcode.Size = new System.Drawing.Size(219, 28);
+            this.outboxcode.Size = new System.Drawing.Size(195, 25);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -272,11 +272,11 @@
             this.palletcode.AllPower = "ifall";
             this.palletcode.BackColor = System.Drawing.Color.White;
             this.palletcode.ID = null;
-            this.palletcode.Location = new System.Drawing.Point(1244, 370);
-            this.palletcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.palletcode.Location = new System.Drawing.Point(1106, 308);
+            this.palletcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = "ifwrite";
-            this.palletcode.Size = new System.Drawing.Size(219, 28);
+            this.palletcode.Size = new System.Drawing.Size(195, 25);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -291,13 +291,13 @@
             this.Printlab.DownImage = ((System.Drawing.Image)(resources.GetObject("Printlab.DownImage")));
             this.Printlab.Image = ((System.Drawing.Image)(resources.GetObject("Printlab.Image")));
             this.Printlab.IsShowBorder = true;
-            this.Printlab.Location = new System.Drawing.Point(1314, 251);
-            this.Printlab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Printlab.Location = new System.Drawing.Point(1168, 209);
+            this.Printlab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Printlab.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printlab.MoveImage")));
             this.Printlab.Name = "Printlab";
             this.Printlab.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printlab.NormalImage")));
             this.Printlab.Power = null;
-            this.Printlab.Size = new System.Drawing.Size(90, 36);
+            this.Printlab.Size = new System.Drawing.Size(80, 30);
             this.Printlab.TabIndex = 161;
             this.Printlab.Text = "打印";
             this.Printlab.UseVisualStyleBackColor = true;
@@ -310,13 +310,13 @@
             this.ReleasePallet.DownImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.DownImage")));
             this.ReleasePallet.Image = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.Image")));
             this.ReleasePallet.IsShowBorder = true;
-            this.ReleasePallet.Location = new System.Drawing.Point(1171, 318);
-            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ReleasePallet.Location = new System.Drawing.Point(1041, 265);
+            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ReleasePallet.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.MoveImage")));
             this.ReleasePallet.Name = "ReleasePallet";
             this.ReleasePallet.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.NormalImage")));
             this.ReleasePallet.Power = null;
-            this.ReleasePallet.Size = new System.Drawing.Size(90, 36);
+            this.ReleasePallet.Size = new System.Drawing.Size(80, 30);
             this.ReleasePallet.TabIndex = 160;
             this.ReleasePallet.Text = "解除栈板";
             this.ReleasePallet.UseVisualStyleBackColor = true;
@@ -329,13 +329,13 @@
             this.NewPalletCode.DownImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.DownImage")));
             this.NewPalletCode.Image = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.Image")));
             this.NewPalletCode.IsShowBorder = true;
-            this.NewPalletCode.Location = new System.Drawing.Point(1171, 251);
-            this.NewPalletCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.NewPalletCode.Location = new System.Drawing.Point(1041, 209);
+            this.NewPalletCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NewPalletCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.MoveImage")));
             this.NewPalletCode.Name = "NewPalletCode";
             this.NewPalletCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.NormalImage")));
             this.NewPalletCode.Power = "ifwrite";
-            this.NewPalletCode.Size = new System.Drawing.Size(90, 36);
+            this.NewPalletCode.Size = new System.Drawing.Size(80, 30);
             this.NewPalletCode.TabIndex = 159;
             this.NewPalletCode.Text = "新增栈板";
             this.NewPalletCode.UseVisualStyleBackColor = true;
@@ -346,11 +346,11 @@
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
             this.pa_custcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode.Location = new System.Drawing.Point(1243, 41);
+            this.pa_custcode.Location = new System.Drawing.Point(1105, 34);
             this.pa_custcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_custcode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_custcode.Name = "pa_custcode";
-            this.pa_custcode.Size = new System.Drawing.Size(0, 31);
+            this.pa_custcode.Size = new System.Drawing.Size(0, 27);
             this.pa_custcode.TabIndex = 158;
             this.pa_custcode.Tag = "1";
             // 
@@ -364,11 +364,11 @@
             this.Column3,
             this.Column4,
             this.Column5});
-            this.PackageInf.Location = new System.Drawing.Point(4, 193);
-            this.PackageInf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PackageInf.Location = new System.Drawing.Point(4, 161);
+            this.PackageInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PackageInf.Name = "PackageInf";
             this.PackageInf.RowTemplate.Height = 23;
-            this.PackageInf.Size = new System.Drawing.Size(1059, 623);
+            this.PackageInf.Size = new System.Drawing.Size(941, 519);
             this.PackageInf.TabIndex = 156;
             // 
             // pd_outboxcode
@@ -412,61 +412,61 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(494, 41);
+            this.pa_makecode.Location = new System.Drawing.Point(439, 34);
             this.pa_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 31);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 27);
             this.pa_makecode.TabIndex = 109;
             this.pa_makecode.Tag = "1";
             // 
-            // pa_totalqty
+            // pa_currentqty
             // 
-            this.pa_totalqty.AutoSize = true;
-            this.pa_totalqty.CutLength = null;
-            this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty.Location = new System.Drawing.Point(494, 115);
-            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(225, 0);
-            this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 31);
-            this.pa_totalqty.TabIndex = 105;
-            this.pa_totalqty.Tag = "1";
+            this.pa_currentqty.AutoSize = true;
+            this.pa_currentqty.CutLength = null;
+            this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_currentqty.Location = new System.Drawing.Point(439, 96);
+            this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_currentqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_currentqty.Name = "pa_currentqty";
+            this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_currentqty.TabIndex = 105;
+            this.pa_currentqty.Tag = "1";
             // 
             // pa_outboxcode
             // 
             this.pa_outboxcode.AutoSize = true;
             this.pa_outboxcode.CutLength = null;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode.Location = new System.Drawing.Point(177, 41);
+            this.pa_outboxcode.Location = new System.Drawing.Point(157, 34);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_outboxcode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_outboxcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Size = new System.Drawing.Size(0, 31);
+            this.pa_outboxcode.Size = new System.Drawing.Size(0, 27);
             this.pa_outboxcode.TabIndex = 103;
             this.pa_outboxcode.Tag = "1";
             // 
-            // pa_packageqty
+            // pa_standardqty
             // 
-            this.pa_packageqty.AutoSize = true;
-            this.pa_packageqty.CutLength = null;
-            this.pa_packageqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty.Location = new System.Drawing.Point(177, 115);
-            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_packageqty.MaximumSize = new System.Drawing.Size(225, 0);
-            this.pa_packageqty.Name = "pa_packageqty";
-            this.pa_packageqty.Size = new System.Drawing.Size(0, 31);
-            this.pa_packageqty.TabIndex = 177;
-            this.pa_packageqty.Tag = "1";
+            this.pa_standardqty.AutoSize = true;
+            this.pa_standardqty.CutLength = null;
+            this.pa_standardqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_standardqty.Location = new System.Drawing.Point(157, 96);
+            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_standardqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_standardqty.Name = "pa_standardqty";
+            this.pa_standardqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_standardqty.TabIndex = 177;
+            this.pa_standardqty.Tag = "1";
             // 
             // pa_packageqty_label
             // 
             this.pa_packageqty_label.AutoSize = true;
             this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty_label.Location = new System.Drawing.Point(30, 115);
+            this.pa_packageqty_label.Location = new System.Drawing.Point(27, 96);
             this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_packageqty_label.Name = "pa_packageqty_label";
-            this.pa_packageqty_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_packageqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_packageqty_label.TabIndex = 176;
             this.pa_packageqty_label.Text = "箱内容量";
             // 
@@ -477,13 +477,13 @@
             this.Packing.DownImage = ((System.Drawing.Image)(resources.GetObject("Packing.DownImage")));
             this.Packing.Image = ((System.Drawing.Image)(resources.GetObject("Packing.Image")));
             this.Packing.IsShowBorder = true;
-            this.Packing.Location = new System.Drawing.Point(1314, 318);
-            this.Packing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Packing.Location = new System.Drawing.Point(1168, 265);
+            this.Packing.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Packing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Packing.MoveImage")));
             this.Packing.Name = "Packing";
             this.Packing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Packing.NormalImage")));
             this.Packing.Power = null;
-            this.Packing.Size = new System.Drawing.Size(90, 36);
+            this.Packing.Size = new System.Drawing.Size(80, 30);
             this.Packing.TabIndex = 178;
             this.Packing.Text = "装箱";
             this.Packing.UseVisualStyleBackColor = true;
@@ -491,11 +491,11 @@
             // 
             // Make_PalletCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1495, 828);
+            this.ClientSize = new System.Drawing.Size(1329, 690);
             this.Controls.Add(this.Packing);
-            this.Controls.Add(this.pa_packageqty);
+            this.Controls.Add(this.pa_standardqty);
             this.Controls.Add(this.pa_packageqty_label);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.PrintLabel_label);
@@ -519,12 +519,12 @@
             this.Controls.Add(this.pa_restqty_label);
             this.Controls.Add(this.pa_makecode);
             this.Controls.Add(this.pa_makecode_label);
-            this.Controls.Add(this.pa_totalqty);
+            this.Controls.Add(this.pa_currentqty);
             this.Controls.Add(this.pa_totalqty_label);
             this.Controls.Add(this.pa_outboxcode);
             this.Controls.Add(this.pa_outboxcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_PalletCollection";
             this.Tag = "Make!BigBoxCollection";
             this.Text = "栈板采集";
@@ -542,7 +542,7 @@
 
         private CustomControl.ValueLabel.ValueLabel pa_outboxcode;
         private System.Windows.Forms.Label pa_outboxcode_label;
-        private CustomControl.ValueLabel.ValueLabel pa_totalqty;
+        private CustomControl.ValueLabel.ValueLabel pa_currentqty;
         private System.Windows.Forms.Label pa_totalqty_label;
         private CustomControl.ValueLabel.ValueLabel pa_makecode;
         private System.Windows.Forms.Label pa_makecode_label;
@@ -571,7 +571,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private CustomControl.ValueLabel.ValueLabel pa_packageqty;
+        private CustomControl.ValueLabel.ValueLabel pa_standardqty;
         private System.Windows.Forms.Label pa_packageqty_label;
         private CustomControl.ButtonUtil.NormalButton Packing;
     }

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -57,7 +57,7 @@ namespace UAS_MES.Make
             }
             catch
             {
-                MessageBox.Show("未正确安装CodeSoft软件");
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }
 
@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                     return;
                 }
                 sql.Clear();
-                sql.Append("select pa_makecode,pa_packageqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
+                sql.Append("select pa_makecode,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");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.SetFormValue(Controls, dt);
@@ -134,7 +134,7 @@ namespace UAS_MES.Make
                         sql.Append(",(select nvl(sum(pd_innerqty),0) from packagedetail left join package on pa_id=pd_paid where pa_outboxcode=");
                         sql.Append("'" + outboxcode.Text + "') from package where pa_outboxcode='" + outboxcode.Text + "'");
                         dh.ExecuteSql(sql.GetString(), "insert");
-                        dh.UpdateByCondition("package", "pa_totalqty=pa_totalqty+1", "pa_outboxcode='" + palletcode.Text + "' and pa_type=3");
+                        dh.UpdateByCondition("package", "PA_CURRENTQTY=PA_CURRENTQTY+1,PA_PACKAGEQTY=PA_PACKAGEQTY+1,PA_TOTALQTY=(select sum(pd_innerqty) from packagedetail left join package on pa_id=pd_paid where pa_outboxcode='" + palletcode.Text + "')", "pa_outboxcode='" + palletcode.Text + "' and pa_type=3");
                         if (dh.getFieldDataByCondition("package", "pa_makecode", "pa_outboxcode='" + palletcode.Text + "'").ToString() == "")
                         {
                             string carton_macode = dh.getFieldDataByCondition("package", "pa_makecode", "pa_outboxcode='" + outboxcode.Text + "'").ToString();
@@ -178,7 +178,7 @@ namespace UAS_MES.Make
 
         private void LoadCollectNum()
         {
-            pa_totalqty.Text = dh.getFieldDataByCondition("package", "pa_totalqty", "pa_outboxcode='" + palletcode.Text + "' and pa_type=3").ToString();
+            pa_currentqty.Text = dh.getFieldDataByCondition("package", "pa_currentqty", "pa_outboxcode='" + palletcode.Text + "' and pa_type=3").ToString();
         }
 
         private void 栈板称重_SizeChanged(object sender, EventArgs e)
@@ -232,8 +232,8 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>" + palletcode.Text + "装箱成功\n", Color.Red);
                 palletcode.Text = LogicHandler.GetOutBoxCode("PALLET", "", pa_prodcode.Text, User.UserCode);
                 sql.Clear();
-                sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_totalqty)values");
-                sql.Append("(package_seq.nextval,'" + palletcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',3,'" + pa_prodcode.Text + "',0,'','" + pa_totalqty.Text + "')");
+                sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty)values");
+                sql.Append("(package_seq.nextval,'" + palletcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',3,'" + pa_prodcode.Text + "',0,'','" + pa_standardqty.Text + "')");
                 dh.ExecuteSql(sql.GetString(), "insert");
                 palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
             }

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -83,7 +83,7 @@ namespace UAS_MES.Make
             }
             catch (Exception ex)
             {
-                MessageBox.Show("未安装codesoft");
+                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
             }
         }