章政 6 лет назад
Родитель
Сommit
e4aa854243

+ 1 - 1
UAS-出货标签管理(吉利通)/CustomControl/BlurSearch.cs

@@ -214,7 +214,7 @@ namespace UAS_LabelMachine.CustomControl
                 con = Field1 + " like '%" + EnterTextBox.Text + "%' and rownum<=10 and " + condition;
             }
             dt = dh.getFieldsDatasByCondition(TableName1, new string[] { Field1, valueField, "rownum" }, con.ToUpper());
-            if (dt.Rows.Count > 0)
+            if (dt.Rows.Count > 0 && EnterTextBox.Text != "")
             {
                 ListBox.Items.Clear();
                 for (int i = 0; i < dt.Rows.Count; i++)

+ 4 - 5
UAS-出货标签管理(吉利通)/CustomControl/PrinterCombox.Designer.cs

@@ -37,19 +37,18 @@
             this.PrinterList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrinterList.FormattingEnabled = true;
             this.PrinterList.Location = new System.Drawing.Point(0, 0);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(284, 26);
+            this.PrinterList.Size = new System.Drawing.Size(189, 20);
             this.PrinterList.TabIndex = 0;
+            this.PrinterList.SelectedIndexChanged += new System.EventHandler(this.PrinterList_SelectedIndexChanged);
             // 
             // PrinterCombox
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.PrinterList);
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "PrinterCombox";
-            this.Size = new System.Drawing.Size(284, 28);
+            this.Size = new System.Drawing.Size(189, 19);
             this.Load += new System.EventHandler(this.PrinterCombox_Load);
             this.ResumeLayout(false);
 

+ 13 - 2
UAS-出货标签管理(吉利通)/CustomControl/PrinterCombox.cs

@@ -16,12 +16,15 @@ namespace UAS_LabelMachine.CustomControl
         {
             InitializeComponent();
         }
+        public delegate void OnSelectIndexChange(object sender, EventArgs e);
+
+        public event OnSelectIndexChange UserOnSelectIndexChange;
 
         public override string Text
         {
             get
             {
-                return PrinterList.Text; 
+                return PrinterList.Text;
             }
 
             set
@@ -30,17 +33,25 @@ namespace UAS_LabelMachine.CustomControl
             }
         }
 
+        bool Loading = true;
+
         private void PrinterCombox_Load(object sender, EventArgs e)
         {
             PrintDocument print = new PrintDocument();
             string sDefault = print.PrinterSettings.PrinterName;//默认打印机名
-
             foreach (string sPrint in PrinterSettings.InstalledPrinters)//获取所有打印机名称
             {
                 PrinterList.Items.Add(sPrint);
                 if (sPrint == sDefault)
                     PrinterList.SelectedIndex = PrinterList.Items.IndexOf(sPrint);
             }
+            Loading = false;
+        }
+
+        private void PrinterList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(!Loading)
+            UserOnSelectIndexChange.Invoke(sender, e);
         }
     }
 }

Разница между файлами не показана из-за своего большого размера
+ 990 - 986
UAS-出货标签管理(吉利通)/UAS_出货标签管理.Designer.cs


+ 28 - 2
UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -142,8 +142,13 @@ namespace UAS_LabelMachine
             adh = SystemInf.adh;
             back_adh = SystemInf.back_adh;
             CheckForIllegalCrossThreadCalls = false;
-            pi_inoutno.Focus();
+            pi_inoutno.TableName = "prodinout";
+            pi_inoutno.Field = "pi_inoutno";
+            pi_inoutno.ValueField = "pi_inoutno";
+            pi_inoutno.Condition = "pi_class in('出货单','拨出单')";
+
 
+            pi_inoutno.Focus();
             Point pt = new Point();
             //禁止所有列的排序
             foreach (DataGridViewColumn dgv in LabelInf.Columns)
@@ -162,7 +167,7 @@ namespace UAS_LabelMachine
             OutBoxCapacity.Value = Properties.Settings.Default.OutboxCapacity;
             asc.controllInitializeSize(this);
             asc.controlAutoSize(this);
-
+            pi_inoutno.BringToFront();
             //实例化打印进程
             try
             {
@@ -2663,5 +2668,26 @@ namespace UAS_LabelMachine
         {
             int.TryParse(Process_outboxcode.Text, out Outbox2);
         }
+
+        private void LabelPrinter_UserOnSelectIndexChange(object sender, EventArgs e)
+        {
+            switch ((sender as Control).Parent.Name)
+            {
+                case "SingleLabelPrinter":
+                    if (SingleDoc != null)
+                        SingleDoc.Printer.SwitchTo(SingleLabelPrinter.Text);
+                    break;
+                case "MidLabelPrinter":
+                    if (MidDoc != null)
+                        MidDoc.Printer.SwitchTo(MidLabelPrinter.Text);
+                    break;
+                case "OutBoxPrinter":
+                    if (OutBoxDoc != null)
+                        OutBoxDoc.Printer.SwitchTo(OutBoxLabelPrint.Text);
+                    break;
+                default:
+                    break;
+            }
+        }
     }
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов