设定匹配字段

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

@@ -7,6 +7,7 @@ using System.Linq;
 using UAS_LabelMachine.PublicMethod;
 using System.Windows.Forms;
 using UAS_LabelMachine.CustomControl;
+using UAS_LabelMachine.Entity;
 
 namespace UAS_LabelMachine
 {
@@ -31,7 +32,7 @@ namespace UAS_LabelMachine
 
         private void ParamSetting_Load(object sender, EventArgs e)
         {
-            dbhelper = new AccessDBHelper("LabelPrint.accdb");
+            dbhelper = SystemInf.adh;
             loaddata();
         }
 

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

@@ -249,6 +249,10 @@
             this.ManBackendCheck = new UAS_LabelMachine.CustomControl.SerialPortWithTag();
             this.label30 = new System.Windows.Forms.Label();
             this.cu_print_limiteddate = new System.Windows.Forms.NumericUpDown();
+            this.prodcodefront = new System.Windows.Forms.Label();
+            this.prodcodeback = new System.Windows.Forms.Label();
+            this.guestlabeldata = new System.Windows.Forms.Label();
+            this.primarydata = new System.Windows.Forms.Label();
             this.LogMenu.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PageSizeNum)).BeginInit();
             this.CollectionProcess.SuspendLayout();
@@ -2339,6 +2343,10 @@
             // 
             // OutBoxLabel
             // 
+            this.OutBoxLabel.Controls.Add(this.primarydata);
+            this.OutBoxLabel.Controls.Add(this.guestlabeldata);
+            this.OutBoxLabel.Controls.Add(this.prodcodeback);
+            this.OutBoxLabel.Controls.Add(this.prodcodefront);
             this.OutBoxLabel.Controls.Add(this.OutDocRefresh);
             this.OutBoxLabel.Controls.Add(this.label27);
             this.OutBoxLabel.Controls.Add(this.label9);
@@ -2632,6 +2640,46 @@
             this.cu_print_limiteddate.Size = new System.Drawing.Size(61, 21);
             this.cu_print_limiteddate.TabIndex = 112;
             // 
+            // prodcodefront
+            // 
+            this.prodcodefront.AutoSize = true;
+            this.prodcodefront.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.prodcodefront.Location = new System.Drawing.Point(21, 163);
+            this.prodcodefront.Name = "prodcodefront";
+            this.prodcodefront.Size = new System.Drawing.Size(0, 20);
+            this.prodcodefront.TabIndex = 113;
+            this.prodcodefront.Visible = false;
+            // 
+            // prodcodeback
+            // 
+            this.prodcodeback.AutoSize = true;
+            this.prodcodeback.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.prodcodeback.Location = new System.Drawing.Point(21, 190);
+            this.prodcodeback.Name = "prodcodeback";
+            this.prodcodeback.Size = new System.Drawing.Size(0, 20);
+            this.prodcodeback.TabIndex = 120;
+            this.prodcodeback.Visible = false;
+            // 
+            // guestlabeldata
+            // 
+            this.guestlabeldata.AutoSize = true;
+            this.guestlabeldata.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.guestlabeldata.Location = new System.Drawing.Point(21, 215);
+            this.guestlabeldata.Name = "guestlabeldata";
+            this.guestlabeldata.Size = new System.Drawing.Size(0, 20);
+            this.guestlabeldata.TabIndex = 121;
+            this.guestlabeldata.Visible = false;
+            // 
+            // primarydata
+            // 
+            this.primarydata.AutoSize = true;
+            this.primarydata.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.primarydata.Location = new System.Drawing.Point(21, 241);
+            this.primarydata.Name = "primarydata";
+            this.primarydata.Size = new System.Drawing.Size(0, 20);
+            this.primarydata.TabIndex = 122;
+            this.primarydata.Visible = false;
+            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -2948,5 +2996,9 @@
         private System.Windows.Forms.Label cu_print_dateformat;
         private System.Windows.Forms.Label label30;
         private System.Windows.Forms.NumericUpDown cu_print_limiteddate;
+        private System.Windows.Forms.Label primarydata;
+        private System.Windows.Forms.Label guestlabeldata;
+        private System.Windows.Forms.Label prodcodeback;
+        private System.Windows.Forms.Label prodcodefront;
     }
 }

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

@@ -477,14 +477,14 @@ namespace UAS_LabelMachine
                                     case "PN":
                                         PN = matchs1.Groups[reg.GroupNumberFromName(groupName)].Value;
                                         //自动匹配客户PN
-                                        string sql = "select min(rownum) as rn from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' and pr_orispeccode='" + PN + "'";
+                                        string sql = "select min(rownum) as rn from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "'";
                                         if (CheckType == "FrontCheck")
                                         {
-                                            sql += "and pib_ifpick=0";
+                                            sql += " and pib_ifpick=0 and " + (prodcodefront.Text == "" ? "pr_orispeccode" : prodcodefront.Text) + "='" + PN + "'";
                                         }
                                         else if (CheckType == "BackCheck")
                                         {
-                                            sql += "and pib_ifrecheck=0";
+                                            sql += " and pib_ifrecheck=0 and " + (prodcodeback.Text == "" ? "pr_orispeccode" : prodcodeback.Text)+ "='" + PN + "'";
                                         }
                                         DataTable pndt = (DataTable)adh.ExecuteSql(sql, "select");
                                         if (pndt.Rows[0][0].ToString() != "")
@@ -629,7 +629,7 @@ namespace UAS_LabelMachine
                         //直接验证两个值相等
                         if (Equal.Checked)
                         {
-                            pibid = back_adh.getFieldDataByCondition("prodiobarcode", "min(pib_id)", "pib_inoutno='" + pi_inoutno.Text + "' and pd_custprodcode='" + msgArr[i] + "' and pib_ifrecheck=0").ToString();
+                            pibid = back_adh.getFieldDataByCondition("prodiobarcode", "min(pib_id)", "pib_inoutno='" + pi_inoutno.Text + "' and "+(guestlabeldata.Text==""? "pd_custprodcode": guestlabeldata.Text) +"='" + msgArr[i] + "' and pib_ifrecheck=0").ToString();
                             if (pibid != "")
                             {
                                 pibid1 = pibid;
@@ -645,9 +645,9 @@ namespace UAS_LabelMachine
                             {
                                 if (groupName == "custPN")
                                 {
-                                    if (LabelInf.Rows[CurrentRowIndex].Cells["pd_custprodcode"].Value.ToString() == matchs1.Groups[re.GroupNumberFromName(groupName)].Value)
+                                    if (LabelInf.Rows[CurrentRowIndex].Cells[(guestlabeldata.Text == "" ? "pd_custprodcode" : guestlabeldata.Text)].Value.ToString() == matchs1.Groups[re.GroupNumberFromName(groupName)].Value)
                                     {
-                                        pibid = back_adh.getFieldDataByCondition("prodiobarcode", "min(pib_id)", "pib_inoutno='" + pi_inoutno.Text + "' and pd_custprodcode='" + msgArr[i] + "' and pib_ifrecheck=0").ToString();
+                                        pibid = back_adh.getFieldDataByCondition("prodiobarcode", "min(pib_id)", "pib_inoutno='" + pi_inoutno.Text + "' and "+ (guestlabeldata.Text == "" ? "pd_custprodcode" : guestlabeldata.Text) + "='" + msgArr[i] + "' and pib_ifrecheck=0").ToString();
                                         if (pibid != "")
                                         {
                                             pibid1 = pibid;
@@ -1613,7 +1613,7 @@ namespace UAS_LabelMachine
             {
                 //嵌套查询重置RowNum
                 sql.Clear();
-                sql.Append("select t.*,rownum from (select pd_ordercode,pib_year,pib_month,pib_day,pr_detail,pib_custoutboxcode,pib_custmidboxcode,pr_orispeccode,pd_id,pd_custprodcode,pib_indate,pi_date,pib_inoutno,pd_custprodspec,");
+                sql.Append("select t.*,rownum from (select pd_ordercode,pib_year,pib_month,pib_day,pr_barcode,pr_detail,pib_custoutboxcode,pib_custmidboxcode,pr_barcode,pr_orispeccode,pd_id,pd_custprodcode,pib_indate,pi_date,pib_inoutno,pd_custprodspec,");
                 sql.Append("nvl(pib_ifrecheck,0)pib_ifrecheck,nvl(pib_ifupload,0)pib_ifupload,nvl(pib_ifmodify,0)pib_ifmodify,pd_pocode,pib_madein,pib_custbarcode,pib_id,pib_pdid,pib_piid,");
                 sql.Append("pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand, pr_vendprodcode,pib_lotno,pib_datecode,pib_qty,pr_spec,pi_title,pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,");
                 sql.Append("pib_outboxcode2,nvl(pib_ifpick,0)pib_ifpick,nvl(pib_ifprint,0)pib_ifprint from prodiobarcode left join prodinout on pib_piid=pi_id left join prodiodetail on pib_piid=pd_piid and  ");
@@ -1648,7 +1648,7 @@ namespace UAS_LabelMachine
             MaxPageSize = DataSize % PageSize == 0 ? DataSize / PageSize : (DataSize / PageSize) + 1;
             PageInf.Text = CurrentPage + "/" + MaxPageSize;
             //获取系统设置的上传数量,如参数异常则默认为100
-            dt = (DataTable)adh.ExecuteSql("select uploadnum,splitback,splitfront from dataextra", "select");
+            dt = (DataTable)adh.ExecuteSql("select * from dataextra", "select");
             if (dt.Rows.Count > 0)
             {
                 if (!int.TryParse(dt.Rows[0]["uploadnum"].ToString(), out UploadNum))
@@ -1657,6 +1657,10 @@ namespace UAS_LabelMachine
                 }
                 front_sg_separator.Text = dt.Rows[0]["splitfront"].ToString();
                 back_sg_separator.Text = dt.Rows[0]["splitback"].ToString();
+                prodcodeback.Text = dt.Rows[0]["prodcodeback"].ToString();
+                prodcodefront.Text = dt.Rows[0]["prodcodefront"].ToString();
+                primarydata.Text = dt.Rows[0]["primarydata"].ToString();
+                guestlabeldata.Text = dt.Rows[0]["guestlabeldata"].ToString();
             }
             //获取所有的匹配脚本
             ScanGroup = (DataTable)dh.ExecuteSql("select distinct sg_brand,sg_id,sg_name,sg_script from prodiobarcode left join scangroup on pib_brand=sg_brand where pib_inoutno='" + pi_inoutno.Text + "' and sg_id is not null and nvl(sg_autolabel,0)=0", "select");