报表

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DryMixer/SelectRowAction.cs

@@ -102,9 +102,20 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DryMixer
                 dbHelper.AddParameter("@reportId", lR_planID);
                 DataTable table = dbHelper.ToDataTable();
 
+                string bathNo = "";
 
                 foreach (DataRow row in table.Rows)
                 {
+                    string a=  row["批次号"].ToString().Trim();
+                    if (a != "0")
+                    {
+                        bathNo = a;
+                    }
+                    else
+                    {
+                        row["批次号"] = bathNo;
+                    }
+
                     row["实际重量"]= Convert.ToSingle(row["实际重量"]).ToString("#0.00");
                     row["实际公差"] = Convert.ToSingle(row["实际公差"]).ToString("#0.00");
                 }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/GelDoser/SelectRowAction.cs

@@ -108,8 +108,21 @@ t1.actValue as 实际重量,t1.actToler as 实际公差
                 dbHelper.CommandType = System.Data.CommandType.Text;
                 dbHelper.AddParameter("@reportId", lR_planID);
                 DataTable table = dbHelper.ToDataTable();
+
+                string bathNo = "";
+
                 foreach (DataRow item in table.Rows)
                 {
+                    string a = item["批次号"].ToString().Trim();
+                    if (a != "0")
+                    {
+                        bathNo = a;
+                    }
+                    else
+                    {
+                        item["批次号"] = bathNo;
+                    }
+
                     var dr = tableNew.NewRow();
                     dr["批次号"] = item["批次号"];
                     dr["物料"] = item["物料"];

Main/MCEdit/MCEdit.csproj

@@ -410,6 +410,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Data\MCProject\nodeDevice.xml" />
+    <Content Include="Data\MCProject\nodeForm\FormGhWuLiao.xml" />
     <Content Include="Data\MCProject\nodeForm\FormMuFence.xml" />
     <Content Include="Data\MCProject\nodeForm\FrmAlarmInfo.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>