修改计数显示

UAS_MES_PW/FunctionCode/Make/Make_SeqTransformPrint.cs

@@ -338,7 +338,7 @@ namespace UAS_MES_NEW.Make
                                 }
                                 for (int i = 0; i < _dt.Rows.Count; i++)
                                 {
-                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "彩盒标", "0", out errorMessage))
+                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out errorMessage))
                                     {
                                         //提示用户打印成功
                                         OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
@@ -481,14 +481,14 @@ namespace UAS_MES_NEW.Make
                             afterTransSNPre.Text = rules.Rows[0]["psr_prefix"].ToString();
                             afterTransSNPre.Enabled = false;
                             afterTransSNPre_checkBox.Checked = true;
-                            afterTransSNPre_checkBox.Enabled = false;
+                            //afterTransSNPre_checkBox.Enabled = false;
                         }
                         if (rules.Rows[0]["psr_length"].ToString() != "")
                         {
                             afterTransSNLength.Text = rules.Rows[0]["psr_length"].ToString();
                             afterTransSNLength.Enabled = false;
                             afterTransSNLength_checkBox.Checked = true;
-                            afterTransSNLength_checkBox.Enabled = false;
+                            //afterTransSNLength_checkBox.Enabled = false;
                         }
                     }
                 }
@@ -683,7 +683,7 @@ namespace UAS_MES_NEW.Make
 
         private void ma_prodcode_TextChanged(object sender, EventArgs e)
         {
-            _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + ma_prodcode.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + ma_prodcode.Text + "' and la_templatetype='机身标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
             PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";

UAS_MES_PW/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -61,6 +61,8 @@ namespace UAS_MES_NEW.Make
             this.mcd_inqty_label = new System.Windows.Forms.Label();
             this.mc_restqty_label = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.mcd_ngqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.label1 = new System.Windows.Forms.Label();
             this.ob_sendqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.label7 = new System.Windows.Forms.Label();
             this.ob_checkno = new System.Windows.Forms.Label();
@@ -98,6 +100,10 @@ namespace UAS_MES_NEW.Make
             this.ms_sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.WriteSoftWare = new UAS_MES_NEW.CustomControl.CustomCheckBox.ReSetCheckBox();
             this.SoftWarePath = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.mcd_okqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.label8 = new System.Windows.Forms.Label();
+            this.mcd_totalng = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.label9 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).BeginInit();
             this.SuspendLayout();
@@ -384,14 +390,15 @@ namespace UAS_MES_NEW.Make
             // panel1
             // 
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.ob_sendqty);
-            this.panel1.Controls.Add(this.label7);
+            this.panel1.Controls.Add(this.mcd_totalng);
+            this.panel1.Controls.Add(this.label9);
+            this.panel1.Controls.Add(this.mcd_okqty);
+            this.panel1.Controls.Add(this.label8);
+            this.panel1.Controls.Add(this.mcd_ngqty);
+            this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.ob_checkno);
             this.panel1.Controls.Add(this.SendCheck);
             this.panel1.Controls.Add(this.ob_batchqty);
-            this.panel1.Controls.Add(this.ob_batchqty_label);
-            this.panel1.Controls.Add(this.ob_nowcheckqty);
-            this.panel1.Controls.Add(this.ob_nowcheckqty_label);
             this.panel1.Controls.Add(this.mcd_remainqty);
             this.panel1.Controls.Add(this.mc_restqty_label);
             this.panel1.Controls.Add(this.mcd_inqty);
@@ -402,31 +409,57 @@ namespace UAS_MES_NEW.Make
             this.panel1.Size = new System.Drawing.Size(628, 252);
             this.panel1.TabIndex = 71;
             // 
+            // mcd_ngqty
+            // 
+            this.mcd_ngqty.AutoSize = true;
+            this.mcd_ngqty.CutLength = null;
+            this.mcd_ngqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_ngqty.Location = new System.Drawing.Point(228, 99);
+            this.mcd_ngqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.mcd_ngqty.MaximumSize = new System.Drawing.Size(300, 0);
+            this.mcd_ngqty.Name = "mcd_ngqty";
+            this.mcd_ngqty.Size = new System.Drawing.Size(0, 41);
+            this.mcd_ngqty.TabIndex = 80;
+            this.mcd_ngqty.Tag = "mcd_inqty";
+            // 
+            // 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(32, 99);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(178, 41);
+            this.label1.TabIndex = 79;
+            this.label1.Text = "当前不良数";
+            // 
             // ob_sendqty
             // 
             this.ob_sendqty.AutoSize = true;
             this.ob_sendqty.CutLength = null;
             this.ob_sendqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_sendqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_sendqty.Location = new System.Drawing.Point(218, 182);
+            this.ob_sendqty.Location = new System.Drawing.Point(860, 241);
             this.ob_sendqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_sendqty.MaximumSize = new System.Drawing.Size(300, 0);
             this.ob_sendqty.Name = "ob_sendqty";
             this.ob_sendqty.Size = new System.Drawing.Size(0, 41);
             this.ob_sendqty.TabIndex = 78;
             this.ob_sendqty.Tag = "ob_batchqty";
+            this.ob_sendqty.Visible = false;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label7.ForeColor = System.Drawing.Color.Black;
-            this.label7.Location = new System.Drawing.Point(32, 182);
+            this.label7.Location = new System.Drawing.Point(674, 241);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(146, 41);
             this.label7.TabIndex = 77;
             this.label7.Text = "已送检数";
+            this.label7.Visible = false;
             // 
             // ob_checkno
             // 
@@ -468,7 +501,7 @@ namespace UAS_MES_NEW.Make
             this.ob_batchqty.CutLength = null;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_batchqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_batchqty.Location = new System.Drawing.Point(218, 102);
+            this.ob_batchqty.Location = new System.Drawing.Point(376, 180);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty.MaximumSize = new System.Drawing.Size(300, 0);
             this.ob_batchqty.Name = "ob_batchqty";
@@ -481,12 +514,13 @@ namespace UAS_MES_NEW.Make
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_batchqty_label.ForeColor = System.Drawing.Color.Black;
-            this.ob_batchqty_label.Location = new System.Drawing.Point(32, 102);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(832, 239);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(146, 41);
             this.ob_batchqty_label.TabIndex = 74;
             this.ob_batchqty_label.Text = "抽检批数";
+            this.ob_batchqty_label.Visible = false;
             // 
             // ob_nowcheckqty
             // 
@@ -494,32 +528,34 @@ namespace UAS_MES_NEW.Make
             this.ob_nowcheckqty.CutLength = null;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_nowcheckqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(496, 102);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(968, 241);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(300, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 41);
             this.ob_nowcheckqty.TabIndex = 73;
             this.ob_nowcheckqty.Tag = "ob_nowcheckqty";
+            this.ob_nowcheckqty.Visible = false;
             // 
             // ob_nowcheckqty_label
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_nowcheckqty_label.ForeColor = System.Drawing.Color.Black;
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(314, 102);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(786, 241);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(146, 41);
             this.ob_nowcheckqty_label.TabIndex = 72;
             this.ob_nowcheckqty_label.Text = "当前批数";
+            this.ob_nowcheckqty_label.Visible = false;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.CutLength = null;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(218, 24);
+            this.mcd_remainqty.Location = new System.Drawing.Point(229, 24);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.mcd_remainqty.MaximumSize = new System.Drawing.Size(300, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
@@ -565,8 +601,6 @@ namespace UAS_MES_NEW.Make
             // NoteForChange
             // 
             this.NoteForChange.AutoSize = true;
-            this.NoteForChange.Checked = false;
-            this.NoteForChange.CheckState = System.Windows.Forms.CheckState.Unchecked;
             this.NoteForChange.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.NoteForChange.Location = new System.Drawing.Point(580, 224);
             this.NoteForChange.Margin = new System.Windows.Forms.Padding(4);
@@ -876,6 +910,54 @@ namespace UAS_MES_NEW.Make
             this.SoftWarePath.Str2 = null;
             this.SoftWarePath.TabIndex = 196;
             // 
+            // mcd_okqty
+            // 
+            this.mcd_okqty.AutoSize = true;
+            this.mcd_okqty.CutLength = null;
+            this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_okqty.Location = new System.Drawing.Point(499, 99);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.mcd_okqty.MaximumSize = new System.Drawing.Size(300, 0);
+            this.mcd_okqty.Name = "mcd_okqty";
+            this.mcd_okqty.Size = new System.Drawing.Size(0, 41);
+            this.mcd_okqty.TabIndex = 82;
+            this.mcd_okqty.Tag = "mcd_inqty";
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(318, 99);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(114, 41);
+            this.label8.TabIndex = 81;
+            this.label8.Text = "良品数";
+            // 
+            // mcd_totalng
+            // 
+            this.mcd_totalng.AutoSize = true;
+            this.mcd_totalng.CutLength = null;
+            this.mcd_totalng.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_totalng.Location = new System.Drawing.Point(228, 182);
+            this.mcd_totalng.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.mcd_totalng.MaximumSize = new System.Drawing.Size(300, 0);
+            this.mcd_totalng.Name = "mcd_totalng";
+            this.mcd_totalng.Size = new System.Drawing.Size(0, 41);
+            this.mcd_totalng.TabIndex = 84;
+            this.mcd_totalng.Tag = "mcd_inqty";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.Location = new System.Drawing.Point(32, 182);
+            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(178, 41);
+            this.label9.TabIndex = 83;
+            this.label9.Text = "累计不良数";
+            // 
             // Make_TestCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
@@ -884,12 +966,17 @@ namespace UAS_MES_NEW.Make
             this.ClientSize = new System.Drawing.Size(1724, 1070);
             this.Controls.Add(this.SoftWarePath);
             this.Controls.Add(this.WriteSoftWare);
+            this.Controls.Add(this.ob_sendqty);
             this.Controls.Add(this.StepCount);
+            this.Controls.Add(this.label7);
             this.Controls.Add(this.pr_sendchecktype);
             this.Controls.Add(this.ma_salecode);
             this.Controls.Add(this.Lock_label);
             this.Controls.Add(this.Filter);
+            this.Controls.Add(this.ob_batchqty_label);
+            this.Controls.Add(this.ob_nowcheckqty);
             this.Controls.Add(this.NoteForChange);
+            this.Controls.Add(this.ob_nowcheckqty_label);
             this.Controls.Add(this.ma_softversion);
             this.Controls.Add(this.ma_softversion_label);
             this.Controls.Add(this.panel1);
@@ -1009,5 +1096,11 @@ namespace UAS_MES_NEW.Make
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
         private ReSetCheckBox WriteSoftWare;
         private CustomControl.TextBoxWithIcon.EnterTextBox SoftWarePath;
+        private CustomControl.ValueLabel.ValueLabel mcd_ngqty;
+        private System.Windows.Forms.Label label1;
+        private CustomControl.ValueLabel.ValueLabel mcd_totalng;
+        private System.Windows.Forms.Label label9;
+        private CustomControl.ValueLabel.ValueLabel mcd_okqty;
+        private System.Windows.Forms.Label label8;
     }
 }

UAS_MES_PW/FunctionCode/Make/Make_TestCollection.cs

@@ -413,7 +413,7 @@ namespace UAS_MES_NEW.Make
 
         private void LoadCollectedNum()
         {
-            dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail_view on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+            dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty,mcd_ngqty,mcd_okqty,mcd_totalng from make left join makecraftdetail_view on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
             BaseUtil.SetFormValue(Controls, dt);
         }
 

UAS_MES_PW/UAS_MES_PW.csproj

@@ -592,6 +592,12 @@
     <Compile Include="FunctionCode\Make\Make_PreFeedingCollection.Designer.cs">
       <DependentUpon>Make_PreFeedingCollection.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_SeqTransformPrint.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SeqTransformPrint.Designer.cs">
+      <DependentUpon>Make_SeqTransformPrint.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_SmtTestCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1336,6 +1342,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_PreFeedingCollection.resx">
       <DependentUpon>Make_PreFeedingCollection.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SeqTransformPrint.resx">
+      <DependentUpon>Make_SeqTransformPrint.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SmtTestCollection.resx">
       <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
     </EmbeddedResource>