章政 il y a 7 ans
Parent
commit
02a4fb4e61

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

@@ -858,7 +858,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(60, 135);
+            this.label18.Location = new System.Drawing.Point(59, 134);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(13, 17);
             this.label18.TabIndex = 90;
@@ -892,7 +892,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(59, 72);
+            this.label16.Location = new System.Drawing.Point(58, 71);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(13, 17);
             this.label16.TabIndex = 87;
@@ -926,7 +926,7 @@
             // 
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(5, 100);
+            this.label12.Location = new System.Drawing.Point(4, 99);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(56, 17);
             this.label12.TabIndex = 77;
@@ -936,7 +936,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(5, 22);
+            this.label7.Location = new System.Drawing.Point(4, 21);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(56, 17);
             this.label7.TabIndex = 76;
@@ -1035,7 +1035,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(-3, 169);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(-32, 168);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(68, 26);
@@ -1050,7 +1050,7 @@
             this.SingleLabelAutoPrint.Checked = true;
             this.SingleLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(4, 88);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(3, 87);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1108,7 +1108,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(7, 115);
+            this.label2.Location = new System.Drawing.Point(6, 114);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(32, 17);
             this.label2.TabIndex = 92;
@@ -1131,7 +1131,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(6, 150);
+            this.label5.Location = new System.Drawing.Point(5, 149);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(32, 17);
             this.label5.TabIndex = 50;
@@ -1164,7 +1164,7 @@
             this.MidLabelAutoPrint.Checked = true;
             this.MidLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidLabelAutoPrint.Location = new System.Drawing.Point(2, 87);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(1, 86);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1207,7 +1207,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(97, -2);
+            this.LogingOut.Location = new System.Drawing.Point(96, -3);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(42, 21);
             this.LogingOut.TabIndex = 77;
@@ -1233,7 +1233,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(6, 144);
+            this.label10.Location = new System.Drawing.Point(5, 143);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(32, 17);
             this.label10.TabIndex = 90;
@@ -1243,7 +1243,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(5, 107);
+            this.label6.Location = new System.Drawing.Point(4, 106);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(32, 17);
             this.label6.TabIndex = 87;
@@ -1331,6 +1331,7 @@
             this.pib_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.pib_prodcode.DataPropertyName = "pib_prodcode";
             this.pib_prodcode.HeaderText = "物料编号";
+            this.pib_prodcode.MinimumWidth = 120;
             this.pib_prodcode.Name = "pib_prodcode";
             this.pib_prodcode.ReadOnly = true;
             this.pib_prodcode.Width = 120;
@@ -1340,6 +1341,7 @@
             this.pd_custprodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
             this.pd_custprodcode.HeaderText = "CPN";
+            this.pd_custprodcode.MinimumWidth = 120;
             this.pd_custprodcode.Name = "pd_custprodcode";
             this.pd_custprodcode.Width = 120;
             // 
@@ -1406,6 +1408,7 @@
             this.pib_custbarcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
             this.pib_custbarcode.HeaderText = "料盘条码";
+            this.pib_custbarcode.MinimumWidth = 100;
             this.pib_custbarcode.Name = "pib_custbarcode";
             this.pib_custbarcode.ReadOnly = true;
             // 

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

@@ -469,8 +469,8 @@ namespace UAS_LabelMachine
             SingleLabelCombox.DataSource = dt;
             if (SingleLabelCombox.Text != "")
             {
-                if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                    SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
+                //if (!SingleLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
+                //    SingleReport.Load(SingleLabelCombox.SelectedValue.ToString());
             }
             sql.Clear();
             sql.Append("select to_char(nvl(cl_date,sysdate),'YYYY-MM-DD HH24:Mi:SS') cl_date,cl_labelurl,cl_labelname,cl_isdefault,la_id||'#'||cl_labelurl||'#'||to_char(cl_date,'YYYY-MM-DD HH24:Mi:SS')  la_id,cl_custcode from customerlabel left join prodinout on pi_cardcode=cl_custcode ");
@@ -482,8 +482,8 @@ namespace UAS_LabelMachine
             MidLabelCombox.DataSource = dt;
             if (MidLabelCombox.Text != "")
             {
-                if (!MidLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                    MidReport.Load(MidLabelCombox.SelectedValue.ToString());
+                //if (!MidLabelCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
+                //    MidReport.Load(MidLabelCombox.SelectedValue.ToString());
             }
             sql.Clear();
             sql.Append("select to_char(nvl(cl_date,sysdate),'YYYY-MM-DD HH24:Mi:SS') cl_date,cl_labelurl,cl_labelname,cl_isdefault,la_id||'#'||cl_labelurl||'#'||to_char(cl_date,'YYYY-MM-DD HH24:Mi:SS')  la_id,cl_custcode from customerlabel left join prodinout on pi_cardcode=cl_custcode ");
@@ -495,10 +495,10 @@ namespace UAS_LabelMachine
             OutBoxCombox.DataSource = dt;
             if (OutBoxCombox.Text != "")
             {
-                if (!OutBoxCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
-                    OutReport.Load(OutBoxCombox.SelectedValue.ToString());
+                //if (!OutBoxCombox.SelectedValue.ToString().Contains("System.Data.DataRowView"))
+                //    OutReport.Load(OutBoxCombox.SelectedValue.ToString());
             }
-            FootReport.Load(@"\\10.2.10.238\PRINTE\FASTREPORT\唛头.frx");
+            //FootReport.Load(@"\\10.2.10.238\PRINTE\FASTREPORT\唛头.frx");
             ComBoxClickChangeLabelDoc = true;
         }