添加自定义参数设定

UAS-出货标签管理(吉利通)/CustomerRule.Designer.cs

@@ -49,14 +49,19 @@
             this.cu_print_checkonly = new System.Windows.Forms.CheckBox();
             this.Expression = new System.Windows.Forms.RadioButton();
             this.Equal = new System.Windows.Forms.RadioButton();
+            this.label5 = new System.Windows.Forms.Label();
+            this.CustProdAndSpec = new System.Windows.Forms.RadioButton();
+            this.BarcodeAndSpec = new System.Windows.Forms.RadioButton();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
             ((System.ComponentModel.ISupportInitialize)(this.cu_print_papercount)).BeginInit();
+            this.groupBox1.SuspendLayout();
             this.SuspendLayout();
             // 
             // cu_print_midlotno
             // 
             this.cu_print_midlotno.AutoSize = true;
             this.cu_print_midlotno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_midlotno.Location = new System.Drawing.Point(301, 332);
+            this.cu_print_midlotno.Location = new System.Drawing.Point(301, 376);
             this.cu_print_midlotno.Name = "cu_print_midlotno";
             this.cu_print_midlotno.Size = new System.Drawing.Size(93, 25);
             this.cu_print_midlotno.TabIndex = 1;
@@ -68,7 +73,7 @@
             // 
             this.cu_print_midprod.AutoSize = true;
             this.cu_print_midprod.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_midprod.Location = new System.Drawing.Point(746, 332);
+            this.cu_print_midprod.Location = new System.Drawing.Point(746, 376);
             this.cu_print_midprod.Name = "cu_print_midprod";
             this.cu_print_midprod.Size = new System.Drawing.Size(125, 25);
             this.cu_print_midprod.TabIndex = 2;
@@ -80,7 +85,7 @@
             // 
             this.cu_print_midspec.AutoSize = true;
             this.cu_print_midspec.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_midspec.Location = new System.Drawing.Point(467, 332);
+            this.cu_print_midspec.Location = new System.Drawing.Point(467, 376);
             this.cu_print_midspec.Name = "cu_print_midspec";
             this.cu_print_midspec.Size = new System.Drawing.Size(93, 25);
             this.cu_print_midspec.TabIndex = 3;
@@ -92,7 +97,7 @@
             // 
             this.cu_print_midpo.AutoSize = true;
             this.cu_print_midpo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_midpo.Location = new System.Drawing.Point(610, 332);
+            this.cu_print_midpo.Location = new System.Drawing.Point(610, 376);
             this.cu_print_midpo.Name = "cu_print_midpo";
             this.cu_print_midpo.Size = new System.Drawing.Size(93, 25);
             this.cu_print_midpo.TabIndex = 4;
@@ -150,7 +155,7 @@
             // 
             this.cu_print_outprod.AutoSize = true;
             this.cu_print_outprod.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outprod.Location = new System.Drawing.Point(746, 442);
+            this.cu_print_outprod.Location = new System.Drawing.Point(746, 486);
             this.cu_print_outprod.Name = "cu_print_outprod";
             this.cu_print_outprod.Size = new System.Drawing.Size(125, 25);
             this.cu_print_outprod.TabIndex = 47;
@@ -162,7 +167,7 @@
             // 
             this.cu_print_outpo.AutoSize = true;
             this.cu_print_outpo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outpo.Location = new System.Drawing.Point(610, 442);
+            this.cu_print_outpo.Location = new System.Drawing.Point(610, 486);
             this.cu_print_outpo.Name = "cu_print_outpo";
             this.cu_print_outpo.Size = new System.Drawing.Size(93, 25);
             this.cu_print_outpo.TabIndex = 48;
@@ -174,7 +179,7 @@
             // 
             this.cu_print_outspec.AutoSize = true;
             this.cu_print_outspec.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outspec.Location = new System.Drawing.Point(467, 442);
+            this.cu_print_outspec.Location = new System.Drawing.Point(467, 486);
             this.cu_print_outspec.Name = "cu_print_outspec";
             this.cu_print_outspec.Size = new System.Drawing.Size(93, 25);
             this.cu_print_outspec.TabIndex = 49;
@@ -186,7 +191,7 @@
             // 
             this.cu_print_outlotno.AutoSize = true;
             this.cu_print_outlotno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outlotno.Location = new System.Drawing.Point(301, 442);
+            this.cu_print_outlotno.Location = new System.Drawing.Point(301, 486);
             this.cu_print_outlotno.Name = "cu_print_outlotno";
             this.cu_print_outlotno.Size = new System.Drawing.Size(93, 25);
             this.cu_print_outlotno.TabIndex = 50;
@@ -198,7 +203,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(297, 287);
+            this.label2.Location = new System.Drawing.Point(297, 331);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(106, 21);
             this.label2.TabIndex = 51;
@@ -208,7 +213,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(297, 402);
+            this.label3.Location = new System.Drawing.Point(297, 446);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(106, 21);
             this.label3.TabIndex = 52;
@@ -269,11 +274,58 @@
             this.Equal.UseVisualStyleBackColor = true;
             this.Equal.CheckedChanged += new System.EventHandler(this.Equal_CheckedChanged);
             // 
+            // label5
+            // 
+            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(297, 277);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(74, 21);
+            this.label5.TabIndex = 59;
+            this.label5.Text = "复核数据";
+            // 
+            // CustProdAndSpec
+            // 
+            this.CustProdAndSpec.AutoSize = true;
+            this.CustProdAndSpec.Checked = true;
+            this.CustProdAndSpec.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.CustProdAndSpec.Location = new System.Drawing.Point(5, 6);
+            this.CustProdAndSpec.Name = "CustProdAndSpec";
+            this.CustProdAndSpec.Size = new System.Drawing.Size(136, 25);
+            this.CustProdAndSpec.TabIndex = 60;
+            this.CustProdAndSpec.TabStop = true;
+            this.CustProdAndSpec.Text = "客户料号+型号";
+            this.CustProdAndSpec.UseVisualStyleBackColor = true;
+            // 
+            // BarcodeAndSpec
+            // 
+            this.BarcodeAndSpec.AutoSize = true;
+            this.BarcodeAndSpec.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.BarcodeAndSpec.Location = new System.Drawing.Point(168, 6);
+            this.BarcodeAndSpec.Name = "BarcodeAndSpec";
+            this.BarcodeAndSpec.Size = new System.Drawing.Size(120, 25);
+            this.BarcodeAndSpec.TabIndex = 61;
+            this.BarcodeAndSpec.TabStop = true;
+            this.BarcodeAndSpec.Text = "唯一码+型号";
+            this.BarcodeAndSpec.UseVisualStyleBackColor = true;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.BarcodeAndSpec);
+            this.groupBox1.Controls.Add(this.CustProdAndSpec);
+            this.groupBox1.Location = new System.Drawing.Point(410, 271);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(294, 30);
+            this.groupBox1.TabIndex = 62;
+            this.groupBox1.TabStop = false;
+            // 
             // CustomerRule
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1082, 634);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.label5);
             this.Controls.Add(this.Equal);
             this.Controls.Add(this.Expression);
             this.Controls.Add(this.cu_print_checkonly);
@@ -299,6 +351,8 @@
             this.Load += new System.EventHandler(this.CustomerRule_Load);
             this.SizeChanged += new System.EventHandler(this.CustomerRule_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.cu_print_papercount)).EndInit();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -325,5 +379,9 @@
         private System.Windows.Forms.CheckBox cu_print_checkonly;
         private System.Windows.Forms.RadioButton Expression;
         private System.Windows.Forms.RadioButton Equal;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.RadioButton CustProdAndSpec;
+        private System.Windows.Forms.RadioButton BarcodeAndSpec;
+        private System.Windows.Forms.GroupBox groupBox1;
     }
 }

UAS-出货标签管理(吉利通)/CustomerRule.cs

@@ -85,6 +85,7 @@ namespace UAS_LabelMachine
             sql.Append("cu_print_checkonly='" + (cu_print_checkonly.Checked ? -1 : 0) + "',");
             sql.Append("cu_print_papercount='" + cu_print_papercount.Value + "',");
             sql.Append("cu_print_custprodmatchmodel='" + (Equal.Checked ? "Equal" : "Expression") + "',");
+            sql.Append("cu_print_recheck='" + (CustProdAndSpec.Checked ? "CP" : "BR") + "',");
             sql.Append("cu_print_regexpression=:cu_print_regexpression where cu_code='" + CUCODE + "'");
             dh.ExecuteSql(sql.ToString(), "update", cu_print_regexpression.Text);
             MessageBox.Show("保存成功!", "提示");
@@ -100,7 +101,7 @@ namespace UAS_LabelMachine
             if (e.KeyCode == Keys.Enter)
             {
                 if (Customer.Text != "")
-                    dt = (DataTable)dh.ExecuteSql("select cu_name,cu_code   from customer where (cu_name like '%" + Customer.Text + "%' or cu_code like '%" + Customer.Text + "%') and cu_auditstatuscode<>'DISABLE'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select cu_name,cu_code from customer where (cu_name like '%" + Customer.Text + "%' or cu_code like '%" + Customer.Text + "%') and cu_auditstatuscode<>'DISABLE'", "select");
                 else
                     dt = (DataTable)dh.ExecuteSql("select cu_name,cu_code from customer where rownum<500 and cu_auditstatuscode<>'DISABLE'", "select");
                 CustomerTreeView.Nodes.Clear();

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

@@ -640,7 +640,7 @@ namespace UAS_LabelMachine
                     //获取客户自定义设置
                     sql.Clear();
                     sql.Append("select cu_print_midlotno,nvl(cu_print_custprodmatchmodel,'Equal')cu_print_custprodmatchmodel,cu_print_midspec,cu_print_midpo,cu_print_midprod,cu_print_outlotno,cu_print_outspec,cu_print_outpo");
-                    sql.Append(",cu_print_outprod,cu_print_checkonly,nvl(cu_print_papercount,0)cu_print_papercount,cu_print_regexpression from customer where cu_code='" + pi_cardcode.Text + "'");
+                    sql.Append(",cu_print_outprod,cu_print_checkonly,nvl(cu_print_papercount,0)cu_print_papercount,cu_print_regexpression,cu_print_recheck from customer where cu_code='" + pi_cardcode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     if (dt.Rows.Count > 0)
                     {
@@ -654,6 +654,19 @@ namespace UAS_LabelMachine
                                 Expression.Checked = true;
                                 break;
                             default:
+                                Equal.Checked = true;
+                                break;
+                        }
+                        switch (dt.Rows[0]["cu_print_recheck"].ToString())
+                        {
+                            case "CP":
+                                RecheckCuprodcode.Checked = true;
+                                break;
+                            case "BR":
+                                RecheckBarcode.Checked = true;
+                                break;
+                            default:
+                                RecheckCuprodcode.Checked = true;
                                 break;
                         }
                     }