Browse Source

去除16禁止打印,User赋值

callm 14 hours ago
parent
commit
c8f6680707

+ 0 - 2
UAS_MES_YDCY/FunctionCode/Make/Make_FuselageLabelPrintRFID.Designer.cs

@@ -341,8 +341,6 @@
             // Hex
             // 
             this.Hex.AutoSize = true;
-            this.Hex.Checked = true;
-            this.Hex.CheckState = System.Windows.Forms.CheckState.Checked;
             this.Hex.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.Hex.Location = new System.Drawing.Point(1437, 558);
             this.Hex.Margin = new System.Windows.Forms.Padding(6);

+ 6 - 6
UAS_MES_YDCY/FunctionCode/Make/Make_FuselageLabelPrintRFID.cs

@@ -314,12 +314,12 @@ namespace UAS_MES_NEW.Make
                                 goto SAMPLE_END;
                             }
 
-                            uRet = DSTP2x_SetTmplRFIDData(tmp_prt, "USER-01", "123ABC", "123ABC".Length);
-                            if (uRet != 0)
-                            {
-                                OperateResult.AppendText("Failed to set USER data in template,error code:[" + uRet.ToString() + "]");
-                                goto SAMPLE_END;
-                            }
+                            //uRet = DSTP2x_SetTmplRFIDData(tmp_prt, "USER-01", "123ABC", "123ABC".Length);
+                            //if (uRet != 0)
+                            //{
+                            //    OperateResult.AppendText("Failed to set USER data in template,error code:[" + uRet.ToString() + "]");
+                            //    goto SAMPLE_END;
+                            //}
 
                             //8.Print template and get the RFID data.
                             uRet = DSTP2x_PrintTmpl(dev_prt, tmp_prt, szOutFile, ref pOutFileSize, szOutRFID, ref pOutRFIDSize);

+ 64 - 66
UAS_MES_YDCY/FunctionCode/Special/Special_RePrintRFID.Designer.cs

@@ -33,14 +33,14 @@
             this.pr_detail = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.pr_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.Clean = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.ms_sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label3 = new System.Windows.Forms.Label();
-            this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
             this.label1 = new System.Windows.Forms.Label();
             this.Hex = new System.Windows.Forms.CheckBox();
+            this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
+            this.ms_sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pr_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.Clean = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.SuspendLayout();
             // 
             // pr_detail
@@ -75,6 +75,65 @@
             this.label5.TabIndex = 232;
             this.label5.Text = "产品代码";
             // 
+            // label3
+            // 
+            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(109, 272);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(62, 41);
+            this.label3.TabIndex = 244;
+            this.label3.Text = "SN";
+            // 
+            // label1
+            // 
+            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(99, 342);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(82, 41);
+            this.label1.TabIndex = 246;
+            this.label1.Text = "标签";
+            // 
+            // Hex
+            // 
+            this.Hex.AutoSize = true;
+            this.Hex.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.Hex.Location = new System.Drawing.Point(220, 414);
+            this.Hex.Margin = new System.Windows.Forms.Padding(6);
+            this.Hex.Name = "Hex";
+            this.Hex.Size = new System.Drawing.Size(160, 39);
+            this.Hex.TabIndex = 248;
+            this.Hex.Text = "转16进制";
+            this.Hex.UseVisualStyleBackColor = true;
+            // 
+            // PrintLabel
+            // 
+            this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.PrintLabel.FormattingEnabled = true;
+            this.PrintLabel.Location = new System.Drawing.Point(220, 351);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.PrintLabel.Name = "PrintLabel";
+            this.PrintLabel.Size = new System.Drawing.Size(382, 32);
+            this.PrintLabel.TabIndex = 247;
+            // 
+            // ms_sncode
+            // 
+            this.ms_sncode.AllPower = null;
+            this.ms_sncode.BackColor = System.Drawing.Color.White;
+            this.ms_sncode.ID = null;
+            this.ms_sncode.Location = new System.Drawing.Point(214, 272);
+            this.ms_sncode.Name = "ms_sncode";
+            this.ms_sncode.Power = null;
+            this.ms_sncode.Size = new System.Drawing.Size(388, 35);
+            this.ms_sncode.Str = null;
+            this.ms_sncode.Str1 = null;
+            this.ms_sncode.Str2 = null;
+            this.ms_sncode.TabIndex = 245;
+            this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_sncode_KeyDown);
+            // 
             // pr_code
             // 
             this.pr_code.AllPower = null;
@@ -120,67 +179,6 @@
             this.OperateResult.TabIndex = 142;
             this.OperateResult.Text = "";
             // 
-            // ms_sncode
-            // 
-            this.ms_sncode.AllPower = null;
-            this.ms_sncode.BackColor = System.Drawing.Color.White;
-            this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(214, 272);
-            this.ms_sncode.Name = "ms_sncode";
-            this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(388, 35);
-            this.ms_sncode.Str = null;
-            this.ms_sncode.Str1 = null;
-            this.ms_sncode.Str2 = null;
-            this.ms_sncode.TabIndex = 245;
-            this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_sncode_KeyDown);
-            // 
-            // label3
-            // 
-            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(109, 272);
-            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 41);
-            this.label3.TabIndex = 244;
-            this.label3.Text = "SN";
-            // 
-            // PrintLabel
-            // 
-            this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(220, 351);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
-            this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(382, 32);
-            this.PrintLabel.TabIndex = 247;
-            // 
-            // label1
-            // 
-            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(99, 342);
-            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(82, 41);
-            this.label1.TabIndex = 246;
-            this.label1.Text = "标签";
-            // 
-            // Hex
-            // 
-            this.Hex.AutoSize = true;
-            this.Hex.Checked = true;
-            this.Hex.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.Hex.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.Hex.Location = new System.Drawing.Point(220, 414);
-            this.Hex.Margin = new System.Windows.Forms.Padding(6);
-            this.Hex.Name = "Hex";
-            this.Hex.Size = new System.Drawing.Size(160, 39);
-            this.Hex.TabIndex = 248;
-            this.Hex.Text = "转16进制";
-            this.Hex.UseVisualStyleBackColor = true;
-            // 
             // Special_RePrintRFID
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);

+ 6 - 6
UAS_MES_YDCY/FunctionCode/Special/Special_RePrintRFID.cs

@@ -186,12 +186,12 @@ namespace UAS_MES_NEW.Special
                     goto SAMPLE_END;
                 }
 
-                uRet = DSTP2x_SetTmplRFIDData(tmp_prt, "USER-01", "123ABC", "123ABC".Length);
-                if (uRet != 0)
-                {
-                    OperateResult.AppendText("Failed to set USER data in template,error code:[" + uRet.ToString() + "]");
-                    goto SAMPLE_END;
-                }
+                //uRet = DSTP2x_SetTmplRFIDData(tmp_prt, "USER-01", "123ABC", "123ABC".Length);
+                //if (uRet != 0)
+                //{
+                //    OperateResult.AppendText("Failed to set USER data in template,error code:[" + uRet.ToString() + "]");
+                //    goto SAMPLE_END;
+                //}
 
                 //8.Print template and get the RFID data.
                 uRet = DSTP2x_PrintTmpl(dev_prt, tmp_prt, szOutFile, ref pOutFileSize, szOutRFID, ref pOutRFIDSize);