修改包装采集

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

@@ -31,53 +31,53 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_PackageCollection));
             this.pr_code_label = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
-            this.ma_code_label = new System.Windows.Forms.Label();
+            this.ms_makecode = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
-            this.pa_packageqty_label = new System.Windows.Forms.Label();
-            this.pa_totalqty_label = new System.Windows.Forms.Label();
+            this.pa_currentqty_label = new System.Windows.Forms.Label();
+            this.pr_outboxinnerqty_label = new System.Windows.Forms.Label();
             this.label13 = new System.Windows.Forms.Label();
             this.pa_code_label = new System.Windows.Forms.Label();
             this.PrintList_label = new System.Windows.Forms.Label();
             this.PrintNum_label = new System.Windows.Forms.Label();
-            this.pa_restqty_label = new System.Windows.Forms.Label();
             this.Cancel = new System.Windows.Forms.CheckBox();
             this.pa_id = new System.Windows.Forms.Label();
             this.PrintLabel = new System.Windows.Forms.ComboBox();
             this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
             this.PrintNum = new System.Windows.Forms.NumericUpDown();
             this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode();
             this.PrintList = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.Printing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pa_packageqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.pr_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.pr_detail = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.pa_restqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.barcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.PackageDetail = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_innerqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_outboxinnerqty = new System.Windows.Forms.NumericUpDown();
             this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
+            this.pr_code = new System.Windows.Forms.Label();
+            this.pr_detail = new System.Windows.Forms.Label();
+            this.pa_currentqty = new System.Windows.Forms.Label();
+            this.pr_outboxinnerqty = new System.Windows.Forms.Label();
+            this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.AutoGenBoxCode = new System.Windows.Forms.CheckBox();
+            this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.Packing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pr_outboxinnerqty)).BeginInit();
+            this.groupBoxWithBorder1.SuspendLayout();
+            this.groupBoxWithBorder2.SuspendLayout();
             this.SuspendLayout();
             // 
             // pr_code_label
             // 
             this.pr_code_label.AutoSize = true;
-            this.pr_code_label.Enabled = false;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(700, 66);
+            this.pr_code_label.Location = new System.Drawing.Point(13, 93);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(92, 27);
@@ -88,23 +88,23 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(16, 126);
+            this.pr_detail_label.Location = new System.Drawing.Point(279, 93);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 80;
             this.pr_detail_label.Text = "产品名称";
             // 
-            // ma_code_label
+            // ms_makecode
             // 
-            this.ma_code_label.AutoSize = true;
-            this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(361, 66);
-            this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(72, 27);
-            this.ma_code_label.TabIndex = 76;
-            this.ma_code_label.Text = "工单号";
+            this.ms_makecode.AutoSize = true;
+            this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ms_makecode.Location = new System.Drawing.Point(1108, 568);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode.Name = "ms_makecode";
+            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
+            this.ms_makecode.TabIndex = 76;
+            this.ms_makecode.Visible = false;
             // 
             // panel2
             // 
@@ -114,7 +114,7 @@
             this.panel2.Location = new System.Drawing.Point(0, 0);
             this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1359, 36);
+            this.panel2.Size = new System.Drawing.Size(1172, 36);
             this.panel2.TabIndex = 88;
             this.panel2.Tag = "NoAuto";
             // 
@@ -123,41 +123,41 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(16, 5);
+            this.label1.Location = new System.Drawing.Point(6, 5);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "工单信息";
             // 
-            // pa_packageqty_label
+            // pa_currentqty_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(360, 128);
-            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(92, 27);
-            this.pa_packageqty_label.TabIndex = 95;
-            this.pa_packageqty_label.Text = "已装数量";
+            this.pa_currentqty_label.AutoSize = true;
+            this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_currentqty_label.Location = new System.Drawing.Point(279, 152);
+            this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_currentqty_label.Name = "pa_currentqty_label";
+            this.pa_currentqty_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_currentqty_label.TabIndex = 95;
+            this.pa_currentqty_label.Text = "已装数量";
             // 
-            // pa_totalqty_label
+            // pr_outboxinnerqty_label
             // 
-            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(361, 186);
-            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(92, 27);
-            this.pa_totalqty_label.TabIndex = 97;
-            this.pa_totalqty_label.Text = "箱内容量";
+            this.pr_outboxinnerqty_label.AutoSize = true;
+            this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(13, 152);
+            this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
+            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_outboxinnerqty_label.TabIndex = 97;
+            this.pr_outboxinnerqty_label.Text = "箱内容量";
             // 
             // label13
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label13.ForeColor = System.Drawing.Color.Black;
-            this.label13.Location = new System.Drawing.Point(27, 715);
+            this.label13.Location = new System.Drawing.Point(11, 723);
             this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(72, 27);
@@ -168,7 +168,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(16, 68);
+            this.pa_code_label.Location = new System.Drawing.Point(13, 46);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(52, 27);
@@ -179,7 +179,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(16, 185);
+            this.PrintList_label.Location = new System.Drawing.Point(15, 46);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(112, 27);
@@ -190,87 +190,65 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(1043, 186);
+            this.PrintNum_label.Location = new System.Drawing.Point(251, 147);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
             this.PrintNum_label.TabIndex = 124;
             this.PrintNum_label.Text = "份数";
             // 
-            // pa_restqty_label
-            // 
-            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(700, 128);
-            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(92, 27);
-            this.pa_restqty_label.TabIndex = 126;
-            this.pa_restqty_label.Text = "剩余容量";
-            // 
             // Cancel
             // 
             this.Cancel.AutoSize = true;
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Cancel.Location = new System.Drawing.Point(429, 715);
+            this.Cancel.Location = new System.Drawing.Point(413, 723);
             this.Cancel.Margin = new System.Windows.Forms.Padding(4);
             this.Cancel.Name = "Cancel";
             this.Cancel.Size = new System.Drawing.Size(114, 31);
             this.Cancel.TabIndex = 129;
-            this.Cancel.Text = "取消采集";
+            this.Cancel.Text = "取消装箱";
             this.Cancel.UseVisualStyleBackColor = true;
             // 
             // pa_id
             // 
             this.pa_id.AutoSize = true;
             this.pa_id.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_id.Location = new System.Drawing.Point(1285, 66);
+            this.pa_id.Location = new System.Drawing.Point(1065, 568);
             this.pa_id.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_id.Name = "pa_id";
-            this.pa_id.Size = new System.Drawing.Size(63, 27);
+            this.pa_id.Size = new System.Drawing.Size(0, 27);
             this.pa_id.TabIndex = 153;
-            this.pa_id.Text = "pa_id";
             this.pa_id.Visible = false;
             // 
             // PrintLabel
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.PrintLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(815, 186);
+            this.PrintLabel.Location = new System.Drawing.Point(157, 95);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(199, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(199, 28);
             this.PrintLabel.TabIndex = 159;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(700, 186);
+            this.label3.Location = new System.Drawing.Point(15, 95);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 160;
             this.label3.Text = "打印标签";
             // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(16, 238);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(92, 27);
-            this.label2.TabIndex = 162;
-            this.label2.Text = "采集信息";
-            // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(1104, 189);
+            this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.PrintNum.Location = new System.Drawing.Point(311, 147);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(67, 25);
+            this.PrintNum.Size = new System.Drawing.Size(57, 27);
             this.PrintNum.TabIndex = 164;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -281,65 +259,46 @@
             // pa_outboxcode
             // 
             this.pa_outboxcode.Caller = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(145, 68);
+            this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.pa_outboxcode.Location = new System.Drawing.Point(130, 49);
             this.pa_outboxcode.MakeCode = null;
-            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(5);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Pr_id = null;
             this.pa_outboxcode.ProdCode = null;
-            this.pa_outboxcode.Size = new System.Drawing.Size(197, 26);
+            this.pa_outboxcode.ShowClickIcon = false;
+            this.pa_outboxcode.Size = new System.Drawing.Size(176, 28);
             this.pa_outboxcode.TabIndex = 163;
-            this.pa_outboxcode.IconClick += new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode.OnTextChange(this.pa_outboxcode_IconClick);
             this.pa_outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_code_KeyDown);
             // 
             // PrintList
             // 
-            this.PrintList.Location = new System.Drawing.Point(145, 186);
-            this.PrintList.Margin = new System.Windows.Forms.Padding(5);
+            this.PrintList.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.PrintList.Location = new System.Drawing.Point(157, 46);
+            this.PrintList.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.PrintList.Name = "PrintList";
-            this.PrintList.Size = new System.Drawing.Size(197, 31);
+            this.PrintList.Size = new System.Drawing.Size(199, 28);
             this.PrintList.TabIndex = 158;
             // 
             // 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(1036, 268);
+            this.OperateResult.Location = new System.Drawing.Point(5, 556);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(291, 429);
+            this.OperateResult.Size = new System.Drawing.Size(595, 149);
             this.OperateResult.TabIndex = 155;
             this.OperateResult.Text = "";
             // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.AutoSize = true;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = "工单查询";
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(473, 68);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(200, 26);
-            this.ma_code.TabIndex = 152;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            this.ma_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.ma_code_UserControlTextChanged);
-            // 
             // Printing
             // 
             this.Printing.AllPower = "ifall";
             this.Printing.BackColor = System.Drawing.Color.Transparent;
             this.Printing.DownImage = ((System.Drawing.Image)(resources.GetObject("Printing.DownImage")));
-            this.Printing.Image = ((System.Drawing.Image)(resources.GetObject("Printing.Image")));
+            this.Printing.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.Printing.Image = null;
             this.Printing.IsShowBorder = true;
-            this.Printing.Location = new System.Drawing.Point(1183, 186);
+            this.Printing.Location = new System.Drawing.Point(389, 144);
             this.Printing.Margin = new System.Windows.Forms.Padding(4);
             this.Printing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printing.MoveImage")));
             this.Printing.Name = "Printing";
@@ -357,9 +316,9 @@
             this.Clean.AllPower = null;
             this.Clean.BackColor = System.Drawing.Color.Transparent;
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
-            this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
+            this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1141, 714);
+            this.Clean.Location = new System.Drawing.Point(618, 675);
             this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
@@ -371,92 +330,22 @@
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
-            // pa_packageqty
-            // 
-            this.pa_packageqty.AllPower = null;
-            this.pa_packageqty.BackColor = System.Drawing.Color.White;
-            this.pa_packageqty.Enabled = false;
-            this.pa_packageqty.ID = null;
-            this.pa_packageqty.Location = new System.Drawing.Point(472, 128);
-            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4);
-            this.pa_packageqty.Name = "pa_packageqty";
-            this.pa_packageqty.Power = null;
-            this.pa_packageqty.Size = new System.Drawing.Size(199, 25);
-            this.pa_packageqty.Str = null;
-            this.pa_packageqty.Str1 = null;
-            this.pa_packageqty.Str2 = null;
-            this.pa_packageqty.TabIndex = 143;
-            this.pa_packageqty.Tag = "NoAuto";
-            this.pa_packageqty.TextChanged += new System.EventHandler(this.pa_packageqty_TextChanged);
-            // 
-            // pr_code
-            // 
-            this.pr_code.AllPower = null;
-            this.pr_code.BackColor = System.Drawing.Color.White;
-            this.pr_code.Enabled = false;
-            this.pr_code.ID = null;
-            this.pr_code.Location = new System.Drawing.Point(815, 69);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4);
-            this.pr_code.Name = "pr_code";
-            this.pr_code.Power = null;
-            this.pr_code.Size = new System.Drawing.Size(199, 25);
-            this.pr_code.Str = null;
-            this.pr_code.Str1 = null;
-            this.pr_code.Str2 = null;
-            this.pr_code.TabIndex = 142;
-            this.pr_code.Tag = "ma_prodcode";
-            this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
-            // 
-            // pr_detail
-            // 
-            this.pr_detail.AllPower = null;
-            this.pr_detail.BackColor = System.Drawing.Color.White;
-            this.pr_detail.Enabled = false;
-            this.pr_detail.ID = null;
-            this.pr_detail.Location = new System.Drawing.Point(145, 128);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4);
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Power = null;
-            this.pr_detail.Size = new System.Drawing.Size(197, 25);
-            this.pr_detail.Str = null;
-            this.pr_detail.Str1 = null;
-            this.pr_detail.Str2 = null;
-            this.pr_detail.TabIndex = 139;
-            this.pr_detail.Tag = "ma_prodname";
-            // 
-            // pa_restqty
-            // 
-            this.pa_restqty.AllPower = null;
-            this.pa_restqty.BackColor = System.Drawing.Color.White;
-            this.pa_restqty.Enabled = false;
-            this.pa_restqty.ID = null;
-            this.pa_restqty.Location = new System.Drawing.Point(815, 128);
-            this.pa_restqty.Margin = new System.Windows.Forms.Padding(4);
-            this.pa_restqty.Name = "pa_restqty";
-            this.pa_restqty.Power = null;
-            this.pa_restqty.Size = new System.Drawing.Size(199, 25);
-            this.pa_restqty.Str = null;
-            this.pa_restqty.Str1 = null;
-            this.pa_restqty.Str2 = null;
-            this.pa_restqty.TabIndex = 137;
-            this.pa_restqty.Tag = "NoAuto";
-            // 
-            // barcode
-            // 
-            this.barcode.AllPower = "ifall";
-            this.barcode.BackColor = System.Drawing.Color.White;
-            this.barcode.ID = null;
-            this.barcode.Location = new System.Drawing.Point(117, 715);
-            this.barcode.Margin = new System.Windows.Forms.Padding(4);
-            this.barcode.Name = "barcode";
-            this.barcode.Power = "ifwrite";
-            this.barcode.Size = new System.Drawing.Size(260, 25);
-            this.barcode.Str = null;
-            this.barcode.Str1 = null;
-            this.barcode.Str2 = null;
-            this.barcode.TabIndex = 135;
-            this.barcode.Tag = "IfWrite";
-            this.barcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.barcode_KeyDown);
+            // sn_code
+            // 
+            this.sn_code.AllPower = "ifall";
+            this.sn_code.BackColor = System.Drawing.Color.White;
+            this.sn_code.ID = null;
+            this.sn_code.Location = new System.Drawing.Point(101, 723);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(4);
+            this.sn_code.Name = "sn_code";
+            this.sn_code.Power = "ifwrite";
+            this.sn_code.Size = new System.Drawing.Size(260, 25);
+            this.sn_code.Str = null;
+            this.sn_code.Str1 = null;
+            this.sn_code.Str2 = null;
+            this.sn_code.TabIndex = 135;
+            this.sn_code.Tag = "IfWrite";
+            this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.barcode_KeyDown);
             // 
             // PackageDetail
             // 
@@ -470,12 +359,12 @@
             this.pd_innerqty,
             this.pa_indate,
             this.pd_id});
-            this.PackageDetail.Location = new System.Drawing.Point(21, 268);
+            this.PackageDetail.Location = new System.Drawing.Point(5, 246);
             this.PackageDetail.Margin = new System.Windows.Forms.Padding(4);
             this.PackageDetail.Name = "PackageDetail";
             this.PackageDetail.ReadOnly = true;
             this.PackageDetail.RowTemplate.Height = 23;
-            this.PackageDetail.Size = new System.Drawing.Size(995, 430);
+            this.PackageDetail.Size = new System.Drawing.Size(1150, 300);
             this.PackageDetail.TabIndex = 134;
             // 
             // pd_barcode
@@ -523,58 +412,150 @@
             this.pd_id.ReadOnly = true;
             this.pd_id.Visible = false;
             // 
-            // pr_outboxinnerqty
-            // 
-            this.pr_outboxinnerqty.Location = new System.Drawing.Point(472, 188);
-            this.pr_outboxinnerqty.Margin = new System.Windows.Forms.Padding(4);
-            this.pr_outboxinnerqty.Name = "pr_outboxinnerqty";
-            this.pr_outboxinnerqty.Size = new System.Drawing.Size(201, 25);
-            this.pr_outboxinnerqty.TabIndex = 165;
-            // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1048, 128);
+            this.AutoPrint.Location = new System.Drawing.Point(126, 147);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(123, 27);
+            this.AutoPrint.Size = new System.Drawing.Size(112, 27);
             this.AutoPrint.TabIndex = 166;
             // 
+            // pr_code
+            // 
+            this.pr_code.AutoSize = true;
+            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_code.Location = new System.Drawing.Point(130, 93);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Size = new System.Drawing.Size(0, 27);
+            this.pr_code.TabIndex = 167;
+            this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.AutoSize = true;
+            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_detail.Location = new System.Drawing.Point(389, 93);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
+            this.pr_detail.TabIndex = 168;
+            // 
+            // pa_currentqty
+            // 
+            this.pa_currentqty.AutoSize = true;
+            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(389, 152);
+            this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_currentqty.Name = "pa_currentqty";
+            this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_currentqty.TabIndex = 169;
+            this.pa_currentqty.TextChanged += new System.EventHandler(this.pa_packageqty_TextChanged);
+            // 
+            // pr_outboxinnerqty
+            // 
+            this.pr_outboxinnerqty.AutoSize = true;
+            this.pr_outboxinnerqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_outboxinnerqty.Location = new System.Drawing.Point(130, 152);
+            this.pr_outboxinnerqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_outboxinnerqty.Name = "pr_outboxinnerqty";
+            this.pr_outboxinnerqty.Size = new System.Drawing.Size(0, 27);
+            this.pr_outboxinnerqty.TabIndex = 170;
+            // 
+            // groupBoxWithBorder1
+            // 
+            this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder1.Controls.Add(this.AutoGenBoxCode);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_currentqty_label);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_outboxinnerqty);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_detail_label);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_outboxcode);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_currentqty);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_code_label);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_detail);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_outboxinnerqty_label);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_code);
+            this.groupBoxWithBorder1.Controls.Add(this.pa_code_label);
+            this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(5, 43);
+            this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(548, 196);
+            this.groupBoxWithBorder1.TabIndex = 171;
+            this.groupBoxWithBorder1.TabStop = false;
+            this.groupBoxWithBorder1.Text = "装箱信息";
+            this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
+            // 
+            // AutoGenBoxCode
+            // 
+            this.AutoGenBoxCode.AutoSize = true;
+            this.AutoGenBoxCode.Checked = true;
+            this.AutoGenBoxCode.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(331, 45);
+            this.AutoGenBoxCode.Name = "AutoGenBoxCode";
+            this.AutoGenBoxCode.Size = new System.Drawing.Size(154, 31);
+            this.AutoGenBoxCode.TabIndex = 171;
+            this.AutoGenBoxCode.Text = "自动生成箱号";
+            this.AutoGenBoxCode.UseVisualStyleBackColor = true;
+            // 
+            // groupBoxWithBorder2
+            // 
+            this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder2.Controls.Add(this.Packing);
+            this.groupBoxWithBorder2.Controls.Add(this.PrintLabel);
+            this.groupBoxWithBorder2.Controls.Add(this.label3);
+            this.groupBoxWithBorder2.Controls.Add(this.PrintNum);
+            this.groupBoxWithBorder2.Controls.Add(this.AutoPrint);
+            this.groupBoxWithBorder2.Controls.Add(this.PrintList);
+            this.groupBoxWithBorder2.Controls.Add(this.Printing);
+            this.groupBoxWithBorder2.Controls.Add(this.PrintList_label);
+            this.groupBoxWithBorder2.Controls.Add(this.PrintNum_label);
+            this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(560, 43);
+            this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(595, 196);
+            this.groupBoxWithBorder2.TabIndex = 172;
+            this.groupBoxWithBorder2.TabStop = false;
+            this.groupBoxWithBorder2.Text = "打印";
+            this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
+            // 
+            // Packing
+            // 
+            this.Packing.AllPower = null;
+            this.Packing.BackColor = System.Drawing.Color.Transparent;
+            this.Packing.DownImage = ((System.Drawing.Image)(resources.GetObject("Packing.DownImage")));
+            this.Packing.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.Packing.Image = null;
+            this.Packing.IsShowBorder = true;
+            this.Packing.Location = new System.Drawing.Point(20, 144);
+            this.Packing.Margin = new System.Windows.Forms.Padding(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(80, 30);
+            this.Packing.TabIndex = 173;
+            this.Packing.Text = "封箱";
+            this.Packing.UseVisualStyleBackColor = true;
+            this.Packing.Click += new System.EventHandler(this.Packing_Click);
+            // 
             // Make_PackageCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1359, 760);
-            this.Controls.Add(this.AutoPrint);
-            this.Controls.Add(this.pr_outboxinnerqty);
-            this.Controls.Add(this.PrintNum);
-            this.Controls.Add(this.pa_outboxcode);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.PrintLabel);
-            this.Controls.Add(this.PrintList);
+            this.ClientSize = new System.Drawing.Size(1172, 760);
+            this.Controls.Add(this.groupBoxWithBorder2);
+            this.Controls.Add(this.groupBoxWithBorder1);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.pa_id);
-            this.Controls.Add(this.ma_code);
-            this.Controls.Add(this.Printing);
             this.Controls.Add(this.Clean);
-            this.Controls.Add(this.pa_packageqty);
-            this.Controls.Add(this.pr_code);
-            this.Controls.Add(this.pr_detail);
-            this.Controls.Add(this.pa_restqty);
-            this.Controls.Add(this.barcode);
+            this.Controls.Add(this.sn_code);
             this.Controls.Add(this.PackageDetail);
             this.Controls.Add(this.Cancel);
-            this.Controls.Add(this.pa_restqty_label);
-            this.Controls.Add(this.PrintNum_label);
-            this.Controls.Add(this.PrintList_label);
-            this.Controls.Add(this.pa_code_label);
             this.Controls.Add(this.label13);
-            this.Controls.Add(this.pa_totalqty_label);
-            this.Controls.Add(this.pa_packageqty_label);
             this.Controls.Add(this.panel2);
-            this.Controls.Add(this.pr_code_label);
-            this.Controls.Add(this.pr_detail_label);
-            this.Controls.Add(this.ma_code_label);
+            this.Controls.Add(this.ms_makecode);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_PackageCollection";
@@ -584,12 +565,15 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.包装采集_FormClosing);
             this.Load += new System.EventHandler(this.包装采集_Load);
             this.SizeChanged += new System.EventHandler(this.包装采集_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pr_outboxinnerqty)).EndInit();
-            this.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
+            this.groupBoxWithBorder1.PerformLayout();
+            this.groupBoxWithBorder2.ResumeLayout(true);
+            this.groupBoxWithBorder2.PerformLayout();
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -597,33 +581,26 @@
         #endregion
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label pr_detail_label;
-        private System.Windows.Forms.Label ma_code_label;
+        private System.Windows.Forms.Label ms_makecode;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label pa_packageqty_label;
-        private System.Windows.Forms.Label pa_totalqty_label;
+        private System.Windows.Forms.Label pa_currentqty_label;
+        private System.Windows.Forms.Label pr_outboxinnerqty_label;
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.Label pa_code_label;
         private System.Windows.Forms.Label PrintList_label;
         private System.Windows.Forms.Label PrintNum_label; 
-        private System.Windows.Forms.Label pa_restqty_label;
         private System.Windows.Forms.CheckBox Cancel;
   
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum PackageDetail;
-        private CustomControl.TextBoxWithIcon.EnterTextBox barcode;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_restqty;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_detail;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_code;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_packageqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
         private CustomControl.ButtonUtil.NormalButton Clean;
         private CustomControl.ButtonUtil.NormalButton Printing;
-        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
         private System.Windows.Forms.Label pa_id;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ComBoxWithFocus.PrinterCombox PrintList;
         private System.Windows.Forms.ComboBox PrintLabel;
         private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label2;
         private CustomControl.TextBoxWithIcon.TextBoxGeneratePaCode pa_outboxcode;
         private System.Windows.Forms.NumericUpDown PrintNum;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_barcode;
@@ -631,7 +608,14 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_innerqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn pa_indate;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
-        private System.Windows.Forms.NumericUpDown pr_outboxinnerqty;
         private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
+        private System.Windows.Forms.Label pr_code;
+        private System.Windows.Forms.Label pr_detail;
+        private System.Windows.Forms.Label pa_currentqty;
+        private System.Windows.Forms.Label pr_outboxinnerqty;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder1;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder2;
+        private CustomControl.ButtonUtil.NormalButton Packing;
+        private System.Windows.Forms.CheckBox AutoGenBoxCode;
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -29,6 +29,7 @@ namespace UAS_MES.Make
 
         public Make_PackageCollection()
         {
+
             InitializeComponent();
         }
 
@@ -48,14 +49,8 @@ namespace UAS_MES.Make
 
         private void 包装采集_Load(object sender, EventArgs e)
         {
-            AutoPrint.Checked = true;
+            pa_outboxcode.ShowClickIcon = false;
             //设置DbFind的必须的数据
-            ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code", "pr_code", "ma_prodname", "pr_outboxinnerqty" };
-            ma_code.TableName = "Make left join product on  ma_prodcode=pr_code";
-            ma_code.SelectField = "ma_code # 工单号,pr_code # 物料编号,pr_detail # 物料名称,pr_outboxinnerqty # 箱内容量";
-            ma_code.Condition = "ma_statuscode='STARTED'";
-            ma_code.DbChange += Ma_code_DbChange;
             PrintNum.Value = 1;
             asc.controllInitializeSize(this);
             thread = new Thread(NewPrint);
@@ -65,12 +60,6 @@ namespace UAS_MES.Make
             dh = new DataHelper();
         }
 
-        private void Ma_code_DbChange(object sender, EventArgs e)
-        {
-            Dbfind = ma_code.ReturnData;
-            BaseUtil.SetFormValue(this.Controls, Dbfind);
-        }
-
         private void 包装采集_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
@@ -85,17 +74,25 @@ namespace UAS_MES.Make
         private void LoadData()
         {
             //加载表单数据
-            sql.Clear();
-            sql.Append("select pa_outboxcode,pr_id,pa_id,pr_outboxinnerqty,pa_packageqty,pa_totalqty-pa_packageqty pa_restqty,pr_code,pr_detail,");
-            sql.Append("pr_colorboxmaxw,pr_colorboxminw,pr_code,pa_makecode as ma_code,pr_outboxinnerqty from package left join packagedetail on  ");
-            sql.Append("pd_paid=pa_id left join product on pa_prodcode=pr_code where ");
-            sql.Append("(pa_outboxcode='" + pa_outboxcode.Text + "' or pd_barcode='" + barcode.Text + "') and rownum=1 ");
+            if (pa_outboxcode.Text != "")
+            {
+                sql.Clear();
+                sql.Append("select pa_outboxcode,pr_detail,pa_packageqty,pr_outboxinnerqty,pa_standardqty,pa_currentqty from package left join product on pa_prodcode=");
+                sql.Append("pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
+            }
+            else
+            {
+                sql.Clear();
+                sql.Append("select ms_makecode,pr_code,pr_detail,pr_outboxinnerqty,pa_standardqty,pa_packageqty,pa_currentqty,");
+                sql.Append("pa_outboxcode from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
+                sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_sncode='" + sn_code.Text + "'");
+            }
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
                 if (pr_code.Text != "")
                 {
-                    dt.Columns.Remove(dt.Columns["pr_outboxinnerqty"]);
+                    dt.Columns.Remove(dt.Columns["pa_standardqty"]);
                 }
                 BaseUtil.SetFormValue(this.Controls, dt);
             }
@@ -103,32 +100,28 @@ namespace UAS_MES.Make
             //加载Grid数据
             dt = (DataTable)dh.ExecuteSql("select pa_outboxcode,pd_barcode,pd_innerqty,pa_indate from packageDetail left join package on pa_id=pd_paid where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
             BaseUtil.FillDgvWithDataTable(PackageDetail, dt);
-            barcode.Clear();
-            if (pr_outboxinnerqty.Text == pa_packageqty.Text)
-            {
-                pa_restqty.Text = "";
-                pa_packageqty.Text = "";
-                pa_outboxcode.Text = "";
-                BaseUtil.CleanDGVData(PackageDetail);
-                pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
-            }
         }
 
         private void InsertDetail()
         {
-            if (int.Parse(pa_restqty.Text == "" ? "1" : pa_restqty.Text) > 0)
+            if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) < int.Parse(pr_outboxinnerqty.Text))
             {
                 sql.Clear();
                 sql.Append("insert into packagedetail(pd_id,pd_paid,pd_outboxcode,pd_innerqty,pd_barcode) ");
-                sql.Append("select packagedetail_seq.nextval,pa_id,pa_outboxcode,pa_totalqty,'" + barcode.Text + "' from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                sql.Append("select packagedetail_seq.nextval,pa_id,pa_outboxcode,pa_totalqty,'" + sn_code.Text + "' from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
                 dh.ExecuteSql(sql.GetString(), "insert");
-                dh.UpdateByCondition("Package", "pa_packageqty=pa_packageqty+1", "pa_outboxcode='" + pa_outboxcode.Text + "'");
-                dh.UpdateByCondition("makeserial", "ms_outboxcode='" + pa_outboxcode.Text + "'", "ms_sncode='" + barcode.Text + "'");
-                if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, barcode.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
+                dh.UpdateByCondition("Package", "pa_packageqty=pa_packageqty+1,pa_currentqty=pa_currentqty+1", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                dh.UpdateByCondition("makeserial", "ms_outboxcode='" + pa_outboxcode.Text + "'", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ms_makecode.Text + "'");
+                if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
                 {
-                    OperateResult.AppendText(">>序列号" + barcode.Text + "采集成功！\n", Color.Green);
-                    barcode.Clear();
+                    OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
+                    //满箱更新状态为1
+                    if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) + 1 == int.Parse(pr_outboxinnerqty.Text))
+                    {
+                        dh.UpdateByCondition("package", "pa_status=1", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                    }
                     LoadData();
+                    sn_code.Clear();
                 }
             }
             else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已采集满\n", Color.Red);
@@ -138,43 +131,33 @@ namespace UAS_MES.Make
         {
             if (PrintLabel.Items.Count != 0)
             {
-                //未采集满的时候点击打印，进行提示
-                if (pr_outboxinnerqty.Text != pa_packageqty.Text)
+                if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
                 {
-                    DialogResult result = MessageBox.Show("该箱未采集满,确定打印？", "提示", MessageBoxButtons.YesNo);
-                    if (result.ToString() == "Yes")
-                    {
-                        OperateResult.AppendText(">>开始打印\n", Color.Green);
-                        Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
-                    }
-                }
-                else
-                {
-                    if (PrintLabel.SelectedValue != null)
-                    {
-                        OperateResult.AppendText(">>开始打印\n", Color.Green);
-                        Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
-                    }
+                    OperateResult.AppendText(">>开始打印箱号" + pa_outboxcode.Text + "\n", Color.Green);
+                    Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                 }
+                else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "尚未封箱，请封箱后执行打印\n", Color.Red);
             }
             else OperateResult.AppendText(">>产品" + pr_code.Text + "未维护打印标签\n", Color.Red);
         }
 
-        //输入箱号的回车事件
+        //加载工单信息和装箱明细信息
         private void pa_code_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
             {
-                LoadData();
-                //根据箱号查询信息，如果箱号存在焦点跳到输入序列号，不存在则跳到选择工单号
+                sql.Clear();
+                sql.Append("select pr_code,pr_detail,pr_outboxinnerqty,pa_packageqty from package left join product ");
+                sql.Append("on pr_code=pa_prodcode where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)
                 {
-                    barcode.Focus();
-                }
-                else
-                {
-                    ma_code.Focus();
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                    dt = (DataTable)dh.ExecuteSql("select pa_outboxcode,pd_barcode,pd_innerqty,pa_indate from packageDetail left join package on pa_id=pd_paid where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
+                    BaseUtil.FillDgvWithDataTable(PackageDetail, dt);
+                    sn_code.Focus();
                 }
+                else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "不存在\n", Color.Red);
             }
         }
 
@@ -184,70 +167,93 @@ namespace UAS_MES.Make
             //当用户输入回车键的时候
             if (e.KeyCode == Keys.Enter)
             {
-                //先判断箱号不为空
-                if (pa_outboxcode.Text != "" && barcode.Text != "")
+                if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
                 {
+                    if (pa_outboxcode.Text == "")
+                    {
+                        if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
+                        {
+                            LoadData();
+                        }
+                        else
+                        {
+                            LoadData();
+                            pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
+                        }
+                    }
                     //判断箱内总数必须大于0
                     if (pr_outboxinnerqty.Text == "" || pr_outboxinnerqty.Text == "0")
                     {
-                        OperateResult.AppendText(">>箱内数量必须大于0\n", Color.Red);
+                        OperateResult.AppendText(">>箱内容量必须大于0\n", Color.Red);
                         return;
                     }
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, barcode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
+                    //如果未勾选了取消录入
+                    if (!Cancel.Checked)
                     {
-                        //如果未勾选了取消录入
-                        if (!Cancel.Checked)
+                        //满箱之后采集下一个之前自动清除内容，生成新的箱号
+                        if (AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text)
+                        {
+                            pa_currentqty.Text = "";
+                            pa_outboxcode.Text = "";
+                            BaseUtil.CleanDGVData(PackageDetail);
+                            pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
+                        }
+                        //判断序列号是否已经装箱
+                        if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
                         {
-                            //判断序列号是否已经装箱
-                            if (dh.CheckExist("packagedetail", "pd_barcode='" + barcode.Text + "'"))
+                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已经装箱！\n", Color.Red);
+                            sn_code.Clear();
+                        }
+                        else
+                        {
+                            //箱号不存在的情况
+                            if (!dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
                             {
-                                OperateResult.AppendText(">>序列号" + barcode.Text + "已经装箱！\n", Color.Red);
-                                barcode.Clear();
+                                //插入Package主表箱号信息
+                                sql.Clear();
+                                sql.Append("insert into package (pa_id,pa_outboxcode,pa_packageqty,pa_totalqty,pa_status,pa_indate,pa_makecode,pa_prodcode,pa_salecode,pa_custcode,pa_type)");
+                                sql.Append("select package_seq.nextval,'" + pa_outboxcode.Text + "',0," + pr_outboxinnerqty.Text + ",0,");
+                                sql.Append("sysdate,'" + ms_makecode.Text + "', ma_prodcode,ma_salecode,ma_custcode,1 from make where ma_code = '" + ms_makecode.Text + "'");
+                                dh.ExecuteSql(sql.GetString(), "insert");
+                                OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "采集成功！\n", Color.Green);
+                                InsertDetail();
                             }
                             else
                             {
-                                //箱号不存在的情况
-                                if (!dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
-                                {
-                                    //插入Package主表箱号信息
-                                    sql.Clear();
-                                    sql.Append("insert into package (pa_id,pa_outboxcode,pa_packageqty,pa_totalqty,pa_status,pa_indate,pa_makecode,pa_prodcode,pa_salecode,pa_custcode,pa_type)");
-                                    sql.Append("select package_seq.nextval,'" + pa_outboxcode.Text + "',0," + pr_outboxinnerqty.Text + ",0,");
-                                    sql.Append("sysdate,'" + ma_code.Text + "', ma_prodcode,ma_salecode,ma_custcode,1 from make where ma_code = '" + ma_code.Text + "'");
-                                    dh.ExecuteSql(sql.GetString(), "insert");
-                                    OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "采集成功！\n", Color.Green);
-                                    //验证序列号插入明细表的数据
+                                if (dh.getRowCount("makeserial", "ms_sncode='" + sn_code.Text + "'") > 0)
                                     InsertDetail();
-                                }
                                 else
-                                {
-                                    //判断序列号是否存在于制造工序表中
-                                    if (dh.getRowCount("makeserial", "ms_sncode='" + barcode.Text + "'") > 0)
-                                        InsertDetail();
-                                    else
-                                        OperateResult.AppendText(">>序列号" + barcode.Text + "不存在\n", Color.Red, barcode);
-                                }
+                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在\n", Color.Red, sn_code);
                             }
                         }
-                        //勾选了取消箱号先验证箱号存不存在，存在的话移除掉，重新加载一次数据
-                        else
+                    }
+                    //勾选了取消箱号先验证箱号存不存在，存在的话移除掉，重新加载一次数据
+                    else
+                    {
+                        if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() != "1")
                         {
-                            dt = (DataTable)dh.ExecuteSql("select pd_outboxcode from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "' and pd_barcode='" + barcode.Text + "'", "select");
-                            if (dt.Rows.Count > 0)
+                            string outboxcode = dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString();
+                            if (outboxcode != "")
                             {
-                                //删除明细行的数据
-                                dh.ExecuteSql("delete from packagedetail where pd_barcode='" + barcode.Text + "' and pd_paid=(select pa_id from package where pa_outboxcode='" + pa_outboxcode.Text + "')", "delete");
-                                //更新已装数 
-                                dh.UpdateByCondition("Package", "pa_packageqty=pa_packageqty-1", "pa_outboxcode='" + pa_outboxcode.Text + "'");
-                                OperateResult.AppendText(">>已从该箱中移除序列号" + barcode.Text + "\n", Color.Green);
-                                LoadData();
+                                if (outboxcode == pa_outboxcode.Text)
+                                {
+                                    //删除明细行的数据
+                                    dh.ExecuteSql("delete from packagedetail where pd_barcode='" + sn_code.Text + "' and pd_paid=(select pa_id from package where pa_outboxcode='" + pa_outboxcode.Text + "')", "delete");
+                                    //更新已装数 
+                                    dh.UpdateByCondition("Package", "pa_packageqty=pa_packageqty-1,pa_currentqty=pa_currentqty-1", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                                    //清除序列号箱号
+                                    dh.UpdateByCondition("makeserial", "ms_outboxcode=''", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ms_makecode.Text + "'");
+                                    OperateResult.AppendText(">>已从该箱中移除序列号" + sn_code.Text + "\n", Color.Green);
+                                    LoadData();
+                                }
+                                else OperateResult.AppendText(">>序列号" + sn_code.Text + "不在箱" + pa_outboxcode.Text + "内\n", Color.Red);
                             }
-                            else OperateResult.AppendText(">>序列号" + barcode.Text + "不在该箱内，请输入正确的序列号\n", Color.Red);
+                            else OperateResult.AppendText(">>序列号" + sn_code.Text + "尚未装箱\n", Color.Red);
                         }
+                        else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已经封箱，不允许取消采集\n", Color.Red);
                     }
-                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 }
-                else LoadData();
+                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
             }
         }
 
@@ -260,7 +266,7 @@ namespace UAS_MES.Make
         {
             if (AutoPrint.Checked)
             {
-                if (pr_outboxinnerqty.Text == pa_packageqty.Text)
+                if (pr_outboxinnerqty.Text == pa_currentqty.Text)
                 {
                     OperateResult.AppendText(">>打印箱号" + pa_outboxcode.Text + "\n", Color.Green);
                     if (PrintLabel.Items.Count != 0)
@@ -277,7 +283,7 @@ namespace UAS_MES.Make
 
         private void pa_code_IconClick(object sender, EventArgs e)
         {
-            if (ma_code.Text == "")
+            if (ms_makecode.Text == "")
             {
                 OperateResult.AppendText(">>请先选择工单号\n", Color.Red);
             }
@@ -285,7 +291,7 @@ namespace UAS_MES.Make
 
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            pa_outboxcode.MakeCode = ma_code.Text;
+            pa_outboxcode.MakeCode = ms_makecode.Text;
             pa_outboxcode.ProdCode = pr_code.Text;
             pa_outboxcode.Caller = "PACKAGE";
             dt = (DataTable)dh.ExecuteSql("select pl_labelcode||':'||pl_labelname pl_laname,pl_labelname,pl_labelcode,pl_labelurl,pl_indate from productlabel where pl_prodcode='" + pr_code.Text + "' order by pl_isdefault desc ", "select");
@@ -307,26 +313,14 @@ namespace UAS_MES.Make
             dh.Dispose();
         }
 
-        private void ma_code_UserControlTextChanged(object sender, EventArgs e)
+        private void Packing_Click(object sender, EventArgs e)
         {
-            if (ma_code.Text.Length > 5)
+            if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "' and pa_status<>1"))
             {
-                //加载表单数据
-                sql.Clear();
-                sql.Append("select ma_prodcode,pr_detail,pr_id,ma_code from product left join make on ma_prodcode=pr_code where ma_code='" + ma_code.Text + "'");
-                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                if (dt.Rows.Count > 0)
-                {
-                    BaseUtil.SetFormValue(this.Controls, dt);
-                }
+                dh.UpdateByCondition("package", "pa_status=1", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "封箱成功\n", Color.Green);
             }
-        }
-
-        private void pa_outboxcode_IconClick(object sender, EventArgs e)
-        {
-            pa_restqty.Text = "";
-            pa_packageqty.Text = "";
-            BaseUtil.CleanDGVData(PackageDetail);
+            else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "错误或者已封箱\n", Color.Red);
         }
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollection.resx

@@ -128,99 +128,6 @@
         aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
         /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Printing.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
 </value>
   </data>
   <data name="Printing.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -259,99 +166,6 @@
         aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
         /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Clean.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
 </value>
   </data>
   <data name="Clean.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -410,4 +224,42 @@
   <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="Packing.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Packing.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Packing.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
 </root>

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -88,17 +88,18 @@ namespace UAS_MES.Make
             {
                 if (mbr_id != "")
                 {
-                    string id = dh.GetSEQ("makebadrspart_seq");
-                    sql.Clear();
-                    sql.Append("insert when (not exists(select 1 from makebadrspart where mbp_sncode='"+GetSNCode.Text+"' and mbp_part='"+bd_soncode.Text+"')) ");
-                    sql.Append("then into makebadrspart(mbp_id,mbp_mbrid,mbp_part,mbp_badcode,");
-                    sql.Append("mbp_brcode,mbp_sncode,mbp_makecode,mbp_indate,mbp_inman)");
-                    sql.Append("select '"+ id + "'," + mbr_id + ",'" + bd_soncode.Text + "',");
-                    sql.Append("'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
-                    sql.Append("sysdate,'" + User.UserCode + "' from dual");
-                    dh.ExecuteSql(sql.GetString(), "insert");
-                    DataTable dt = (DataTable)dh.ExecuteSql("select mbp_id,mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
-                    BaseUtil.FillDgvWithDataTable(mbp_partdgv, dt);
+                    if (!dh.CheckExist("makebadrspart", "mbp_sncode='"+GetSNCode.Text+"' and mbp_part='"+bd_soncode.Text+"'"))
+                    {
+                        sql.Clear();
+                        sql.Append("insert into makebadrspart(mbp_id,mbp_mbrid,mbp_part,mbp_badcode,");
+                        sql.Append("mbp_brcode,mbp_sncode,mbp_makecode,mbp_indate,mbp_inman)");
+                        sql.Append("select makebadrspart_seq.nextval," + mbr_id + ",'" + bd_soncode.Text + "',");
+                        sql.Append("'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
+                        sql.Append("sysdate,'" + User.UserCode + "' from dual");
+                        dh.ExecuteSql(sql.GetString(), "insert");
+                        DataTable dt = (DataTable)dh.ExecuteSql("select mbp_id,mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
+                        BaseUtil.FillDgvWithDataTable(mbp_partdgv, dt);
+                    }
                 }
                 else OperatResult.AppendText(">>请先选择不良原因\n", Color.Red);
             }