添加打印文件记录，栈板记录长宽高

UAS_MES_YDCY/FunctionCode/Make/Make_OutBoxSnCheckDN.Designer.cs

@@ -187,7 +187,7 @@
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CheckSnDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_YDCY/FunctionCode/OQC/OQC_PlanMaintain_NEW.cs

@@ -161,8 +161,8 @@ namespace UAS_MES_NEW.OQC
                 sql.Append("insert into OQCItemSamples (ois_id,ois_stepcode,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
                 sql.Append("ois_ifng,ois_defectlevel,ois_remark,ois_indate)select OQCItemSamples_seq.nextval,'" + ms_stepcode + "','','" + oMakeCode + "'");
                 sql.Append(",'" + ms_sncode.Text + "','" + pr_code.Text + "',:ois_itemcode,:ois_ifng,'','',sysdate from dual ");
-                sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
-                dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
+                //sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
+                dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng"/*, "ois_itemcode" */},
                     oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
                 if (pcd_okretuenstep != "")
                 {
@@ -192,8 +192,8 @@ namespace UAS_MES_NEW.OQC
                 sql.Append("insert into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
                 sql.Append("ois_ifng,ois_defectlevel,ois_remark,ois_indate)select OQCItemSamples_seq.nextval,'','" + oMakeCode + "'");
                 sql.Append(",'" + ms_sncode.Text + "','" + pr_code.Text + "',:ois_itemcode,:ois_ifng,'','',sysdate from dual ");
-                sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
-                dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
+                //sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
+                dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng"/*, "ois_itemcode" */},
                     oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
                 dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_status=3,ms_nextstepcode='' where ms_id='" + oMSID + "'", "select");
                 OperateResult.AppendText(">>" + ms_sncode.Text + "不良品采集成功\n", Color.Green, ms_sncode);

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.Designer.cs

@@ -129,6 +129,12 @@
             this.label2 = new System.Windows.Forms.Label();
             this.ComList = new System.Windows.Forms.Label();
             this.BaudRate = new System.Windows.Forms.Label();
+            this.pa_long = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label12 = new System.Windows.Forms.Label();
+            this.pa_width = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label14 = new System.Windows.Forms.Label();
+            this.pa_height = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label15 = new System.Windows.Forms.Label();
             this.groupBoxWithBorder2.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
@@ -381,7 +387,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(532, 34);
+            this.label1.Location = new System.Drawing.Point(533, 35);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(146, 41);
@@ -404,7 +410,7 @@
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Red;
-            this.checkweightlabel.Location = new System.Drawing.Point(58, 50);
+            this.checkweightlabel.Location = new System.Drawing.Point(59, 51);
             this.checkweightlabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.checkweightlabel.MaximumSize = new System.Drawing.Size(400, 0);
             this.checkweightlabel.Name = "checkweightlabel";
@@ -415,7 +421,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(694, 178);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(695, 179);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 41);
@@ -425,7 +431,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(694, 102);
+            this.ob_batchqty.Location = new System.Drawing.Point(695, 103);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 41);
@@ -435,7 +441,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(532, 178);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(533, 179);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(146, 41);
@@ -446,7 +452,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(532, 106);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(533, 107);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(146, 41);
@@ -457,7 +463,7 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(694, 34);
+            this.ob_checkno.Location = new System.Drawing.Point(695, 35);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 41);
@@ -522,7 +528,7 @@
             // 
             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(18, 180);
+            this.label3.Location = new System.Drawing.Point(19, 181);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(146, 41);
@@ -572,7 +578,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(18, 100);
+            this.PrintList_label.Location = new System.Drawing.Point(19, 101);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(178, 41);
@@ -583,7 +589,7 @@
             // 
             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(418, 262);
+            this.PrintNum_label.Location = new System.Drawing.Point(419, 263);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(82, 41);
@@ -630,7 +636,7 @@
             this.locksalecode.AutoSize = true;
             this.locksalecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.locksalecode.ForeColor = System.Drawing.Color.Red;
-            this.locksalecode.Location = new System.Drawing.Point(586, 36);
+            this.locksalecode.Location = new System.Drawing.Point(587, 37);
             this.locksalecode.Margin = new System.Windows.Forms.Padding(6);
             this.locksalecode.Name = "locksalecode";
             this.locksalecode.Size = new System.Drawing.Size(186, 28);
@@ -642,7 +648,7 @@
             // 
             this.PreFix_label.AutoSize = true;
             this.PreFix_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PreFix_label.Location = new System.Drawing.Point(360, 32);
+            this.PreFix_label.Location = new System.Drawing.Point(361, 33);
             this.PreFix_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PreFix_label.Name = "PreFix_label";
             this.PreFix_label.Size = new System.Drawing.Size(71, 36);
@@ -670,7 +676,7 @@
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(422, 276);
+            this.pa_salecode_label.Location = new System.Drawing.Point(423, 277);
             this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_salecode_label.Name = "pa_salecode_label";
             this.pa_salecode_label.Size = new System.Drawing.Size(146, 41);
@@ -681,7 +687,7 @@
             // 
             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(14, 276);
+            this.ma_code_label.Location = new System.Drawing.Point(15, 277);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_code_label.Name = "ma_code_label";
             this.ma_code_label.Size = new System.Drawing.Size(114, 41);
@@ -692,7 +698,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(584, 276);
+            this.ms_salecode.Location = new System.Drawing.Point(585, 277);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 41);
@@ -702,7 +708,7 @@
             // 
             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(186, 276);
+            this.ms_makecode.Location = new System.Drawing.Point(187, 277);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -713,7 +719,7 @@
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(164, 32);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(165, 33);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(71, 36);
@@ -779,7 +785,7 @@
             this.AutoGenBoxCode.AutoSize = true;
             this.AutoGenBoxCode.Checked = true;
             this.AutoGenBoxCode.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(498, 92);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(499, 93);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(178, 45);
@@ -792,7 +798,7 @@
             // 
             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(426, 156);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(427, 157);
             this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(146, 41);
@@ -803,7 +809,7 @@
             // 
             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(422, 212);
+            this.pr_detail_label.Location = new System.Drawing.Point(423, 213);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
@@ -832,7 +838,7 @@
             // 
             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(582, 152);
+            this.pa_currentqty.Location = new System.Drawing.Point(583, 153);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 41);
@@ -842,7 +848,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             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(14, 212);
+            this.pr_code_label.Location = new System.Drawing.Point(15, 213);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(146, 41);
@@ -853,7 +859,7 @@
             // 
             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(584, 212);
+            this.pr_detail.Location = new System.Drawing.Point(585, 213);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 41);
@@ -863,7 +869,7 @@
             // 
             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(14, 150);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(15, 151);
             this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(146, 41);
@@ -874,7 +880,7 @@
             // 
             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(186, 212);
+            this.pr_code.Location = new System.Drawing.Point(187, 213);
             this.pr_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_code.Name = "pr_code";
@@ -886,7 +892,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(14, 90);
+            this.pa_code_label.Location = new System.Drawing.Point(15, 91);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(114, 41);
@@ -1086,11 +1092,11 @@
             this.groupBoxWithBorder3.Controls.Add(this.weight);
             this.groupBoxWithBorder3.Controls.Add(this.label5);
             this.groupBoxWithBorder3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder3.Location = new System.Drawing.Point(1271, 356);
+            this.groupBoxWithBorder3.Location = new System.Drawing.Point(1271, 439);
             this.groupBoxWithBorder3.Margin = new System.Windows.Forms.Padding(4);
             this.groupBoxWithBorder3.Name = "groupBoxWithBorder3";
             this.groupBoxWithBorder3.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBoxWithBorder3.Size = new System.Drawing.Size(474, 482);
+            this.groupBoxWithBorder3.Size = new System.Drawing.Size(474, 399);
             this.groupBoxWithBorder3.TabIndex = 211;
             this.groupBoxWithBorder3.TabStop = false;
             this.groupBoxWithBorder3.Text = "称量信息";
@@ -1123,7 +1129,7 @@
             this.RefreshWeigh.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.RefreshWeigh.Image = null;
             this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(287, 242);
+            this.RefreshWeigh.Location = new System.Drawing.Point(287, 211);
             this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(6);
             this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
             this.RefreshWeigh.Name = "RefreshWeigh";
@@ -1139,7 +1145,7 @@
             // 
             this.sumpalletweight.AutoSize = true;
             this.sumpalletweight.Font = new System.Drawing.Font("微软雅黑", 25F);
-            this.sumpalletweight.Location = new System.Drawing.Point(28, 322);
+            this.sumpalletweight.Location = new System.Drawing.Point(29, 292);
             this.sumpalletweight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sumpalletweight.Name = "sumpalletweight";
             this.sumpalletweight.Size = new System.Drawing.Size(0, 88);
@@ -1149,7 +1155,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(12, 248);
+            this.label4.Location = new System.Drawing.Point(13, 218);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(210, 41);
@@ -1161,7 +1167,7 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.DarkGreen;
-            this.weight.Location = new System.Drawing.Point(24, 110);
+            this.weight.Location = new System.Drawing.Point(25, 111);
             this.weight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.weight.Name = "weight";
             this.weight.Size = new System.Drawing.Size(0, 121);
@@ -1171,7 +1177,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(12, 42);
+            this.label5.Location = new System.Drawing.Point(13, 43);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(146, 41);
@@ -1396,13 +1402,103 @@
             this.BaudRate.Text = "BaudRate";
             this.BaudRate.Visible = false;
             // 
+            // pa_long
+            // 
+            this.pa_long.AllPower = null;
+            this.pa_long.BackColor = System.Drawing.Color.White;
+            this.pa_long.Enabled = false;
+            this.pa_long.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_long.ID = null;
+            this.pa_long.Location = new System.Drawing.Point(1329, 374);
+            this.pa_long.Margin = new System.Windows.Forms.Padding(6);
+            this.pa_long.Name = "pa_long";
+            this.pa_long.Power = null;
+            this.pa_long.Size = new System.Drawing.Size(89, 39);
+            this.pa_long.Str = null;
+            this.pa_long.Str1 = null;
+            this.pa_long.Str2 = null;
+            this.pa_long.TabIndex = 195;
+            // 
+            // label12
+            // 
+            this.label12.AutoSize = true;
+            this.label12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label12.Location = new System.Drawing.Point(1267, 372);
+            this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(50, 41);
+            this.label12.TabIndex = 194;
+            this.label12.Text = "长";
+            // 
+            // pa_width
+            // 
+            this.pa_width.AllPower = null;
+            this.pa_width.BackColor = System.Drawing.Color.White;
+            this.pa_width.Enabled = false;
+            this.pa_width.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_width.ID = null;
+            this.pa_width.Location = new System.Drawing.Point(1481, 374);
+            this.pa_width.Margin = new System.Windows.Forms.Padding(6);
+            this.pa_width.Name = "pa_width";
+            this.pa_width.Power = null;
+            this.pa_width.Size = new System.Drawing.Size(87, 39);
+            this.pa_width.Str = null;
+            this.pa_width.Str1 = null;
+            this.pa_width.Str2 = null;
+            this.pa_width.TabIndex = 197;
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label14.Location = new System.Drawing.Point(1430, 372);
+            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(50, 41);
+            this.label14.TabIndex = 196;
+            this.label14.Text = "宽";
+            // 
+            // pa_height
+            // 
+            this.pa_height.AllPower = null;
+            this.pa_height.BackColor = System.Drawing.Color.White;
+            this.pa_height.Enabled = false;
+            this.pa_height.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_height.ID = null;
+            this.pa_height.Location = new System.Drawing.Point(1639, 374);
+            this.pa_height.Margin = new System.Windows.Forms.Padding(6);
+            this.pa_height.Name = "pa_height";
+            this.pa_height.Power = null;
+            this.pa_height.Size = new System.Drawing.Size(90, 39);
+            this.pa_height.Str = null;
+            this.pa_height.Str1 = null;
+            this.pa_height.Str2 = null;
+            this.pa_height.TabIndex = 199;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label15.Location = new System.Drawing.Point(1581, 372);
+            this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(50, 41);
+            this.label15.TabIndex = 198;
+            this.label15.Text = "高";
+            // 
             // Packing_PackageCollectionPallet
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ClientSize = new System.Drawing.Size(1758, 1168);
+            this.Controls.Add(this.pa_long);
+            this.Controls.Add(this.label12);
+            this.Controls.Add(this.pa_width);
+            this.Controls.Add(this.pa_height);
+            this.Controls.Add(this.label14);
             this.Controls.Add(this.ComList);
+            this.Controls.Add(this.label15);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.PalletCode);
             this.Controls.Add(this.label2);
@@ -1566,5 +1662,11 @@
         private System.Windows.Forms.Label ComList;
         private System.Windows.Forms.Label BaudRate;
         private CustomControl.ButtonUtil.NormalButton StartWeight;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_long;
+        private System.Windows.Forms.Label label12;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_width;
+        private System.Windows.Forms.Label label14;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_height;
+        private System.Windows.Forms.Label label15;
     }
 }

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.cs

@@ -162,8 +162,7 @@ namespace UAS_MES_NEW.Packing
             {
                 if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
                 {
-                    dh.ExecuteSql("update package set pa_printcount=pa_printcount+1,pa_remark='" + PrintLabel.Text + "' where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
-
+                    dh.ExecuteSql("update package set PA_WEIGHT='" + weight.Text + "',PA_WIDTH='" + pa_width.Text + "', PA_HEIGTH='" + pa_height.Text + "', PA_LENGTH='" + pa_long.Text + "',pa_printcount=pa_printcount+1,pa_remark='" + PrintLabel.Text + "' where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                     if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), oMakeCode == "" ? pa_makecode.Text : oMakeCode, pr_code.Text, "栈板标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(">>开始打印箱号" + pa_outboxcode.Text + "\n", Color.Black);

UAS_MES_YDCY/FunctionCode/SystemSetting/SystemSetting_PrinterTest.cs

@@ -51,7 +51,7 @@ namespace UAS_MES_NEW.SystemSetting
 
         private void Export_Click(object sender, EventArgs e)
         {
-            if (!dh.CheckExist("make", "ma_code='" + ma_code.Text + "'"))
+            if (!dh.CheckExist("make", "ma_code='" + ma_code.Text + "'")&& Material.Checked==false)
             {
                 MessageBox.Show("工单号不存在");
                 return;

UAS_MES_YDCY/PublicMethod/LogicHandler.cs

@@ -1487,13 +1487,13 @@ namespace UAS_MES_NEW.PublicMethod
         /// <param name="stepcode"></param>
         /// <param name="ifRePrint"></param>
         /// <param name="userCode"></param>
-        public static void doLabelPrintLog(string printValue, string printType, string MakeCode, string prodCode, string sourceCode, string stepcode, string ifRePrint, string userCode)
+        public static void doLabelPrintLog(string printValue, string printType, string MakeCode, string prodCode, string sourceCode, string stepcode, string ifRePrint, string userCode,string fileName)
         {
             sql.Clear();
-            sql.Append("insert into labelprintlog(LPL_ID,LPL_VALUE,LPL_TYPE,LPL_MAKECODE,LPL_PRODCODE,LPL_SOURCECODE,LPL_STEPCODE,LPL_IFREPRINT,LPL_INDATE,LPL_INMAN) ");
+            sql.Append("insert into labelprintlog(LPL_ID,LPL_VALUE,LPL_TYPE,LPL_MAKECODE,LPL_PRODCODE,LPL_SOURCECODE,LPL_STEPCODE,LPL_IFREPRINT,LPL_INDATE,LPL_INMAN,lpl_file) ");
             sql.Append("values( labelprintlog_seq.nextval,:lpl_value,:lpl_type,:makecode,:prodcode,");
-            sql.Append(":SourceCode,:stepcode,:ifreprint,sysdate,:inman)");
-            dh.ExecuteSql(sql.ToString(), "insert", printValue, printType, MakeCode, prodCode, sourceCode, stepcode, ifRePrint, userCode);
+            sql.Append(":SourceCode,:stepcode,:ifreprint,sysdate,:inman,:filename)");
+            dh.ExecuteSql(sql.ToString(), "insert", printValue, printType, MakeCode, prodCode, sourceCode, stepcode, ifRePrint, userCode, fileName);
         }
 
 

UAS_MES_YDCY/PublicMethod/Print.cs

@@ -104,7 +104,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 doc.Variables.FormVariables.Item(k + 1).Value = null;
             }
-            LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode);
+            LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode, LabelName);
             return true;
         }
 
@@ -207,7 +207,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 doc.Variables.FormVariables.Item(k + 1).Value = null;
             }
-            LogicHandler.doLabelPrintLog(SnCode, LabelType + LabelName, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode);
+            LogicHandler.doLabelPrintLog(SnCode, LabelType + LabelName, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode, LabelName);
             return true;
         }
 
@@ -215,19 +215,15 @@ namespace UAS_MES_NEW.PublicMethod
         {
             ErrorMessage = "";
             DataTable dt = new DataTable();
-            if (IfRePrint != "-1"  && LabelType != "栈板标")
+            if (IfRePrint != "-1" && LabelType != "栈板标")
             {
-                if (LabelType == "")
-                {
-
-                }
                 if (LabelType == "卡通箱标" || LabelType == "大箱标" || LabelType == "栈板标" || LabelType == "彩盒标")
                 {
-                    dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "' and lpl_file='" + LabelName + "'", "select");
                 }
                 else
                 {
-                    dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "' and  lpl_file='" + LabelName + "'", "select");
                 }
                 ////如果已经打印过了,则不允许再打印
                 if (dt.Rows.Count > 0)
@@ -324,7 +320,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
 
             }
-            LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode);
+            LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode, LabelName);
             return true;
         }
 
@@ -439,7 +435,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
 
             }
-            LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode);
+            LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode, LabelName);
             return true;
         }
     }