木薯粉总量

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GhWuLiaoInitDb.cs

@@ -49,25 +49,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
 
 
 
-            dt = new DataTable();
-            dt.Columns.Add("机台", typeof(string));
+           
 
-            dt.Columns.Add("小料1总量", typeof(string));
-            dt.Columns.Add("小料2总量", typeof(string));
-            dt.Columns.Add("木粉总量", typeof(string));
-            dt.Columns.Add("炭酸钙总量", typeof(string));
-            dt.Columns.Add("木薯粉总量", typeof(string));
-            dt.Columns.Add("玉米粉总量", typeof(string));
-
-            dt.Columns.Add("炭粉1总量", typeof(string));
-            dt.Columns.Add("炭粉2总量", typeof(string));
-            dt.Columns.Add("炭粉3总量", typeof(string));
-            dt.Columns.Add("炭粉4总量", typeof(string));
-            dt.Columns.Add("炭粉5总量", typeof(string));
-            dt.Columns.Add("炭粉6总量", typeof(string));
-            dt.Columns.Add("炭粉7总量", typeof(string));
-            dt.Columns.Add("炭粉8总量", typeof(string));
-            dt.Columns.Add("回收总量",  typeof(string));
 
 
 
@@ -87,7 +70,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
         private void SelectButton_Click(object sender, EventArgs e)
         {
             DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
-            dt.Rows.Clear();
+            dt = GetDefault();
 
             DateTime starttime = startDate.Value.Date.AddHours(startTime.Value.Hour).AddMinutes(startTime.Value.Minute).AddSeconds(startTime.Value.Second);
             DateTime endtime = endDate.Value.Date.AddHours(endTime.Value.Hour).AddMinutes(endTime.Value.Minute).AddSeconds(endTime.Value.Second);
@@ -99,12 +82,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
 
             for (int i = 1; i <5; i++)
             {
-                string sql = $"select t1.batch ,t1.matCode,\r\n                 " +
-                    $"       t1.actValue, t1.actToler\r\n               " +
-                    $"         from Report_DryDos_Detail t1\r\n" +
-                    $"where eqNo='{i}' and recordTime>'{statValue}' and recordTime<='{endValue}'";
 
 
+                string sql = "select t2.dryNo, eqNo, t1.batch ,t1.matCode,\r\n                " +
+                    "        t1.actValue, t1.actToler, t1.recordTime\r\n                " +
+                    "        from Report_DryDos_Detail t1\r\n                 " +
+                    "       left join  Report_Dry t2  on t1.reportId= t2.reportId\r\nwhere " +
+                    $"t2.dryNo='{i}' and  t1.recordTime>'{statValue}' and t1.recordTime<='{endValue}'\r\n\r\norder by t1.matCode";
+
                 dbHelper.CommandText = sql.ToString();
                 dbHelper.CommandType = CommandType.Text;
                 DataTable table2 = dbHelper.ToDataTable();
@@ -112,7 +97,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
                 foreach (DataRow dr in table2.Rows)
                 {
                     GhWuLiaoIniEntity entity = new GhWuLiaoIniEntity();
-                    entity.eqNo = i;
+                    entity.dryNo = i;
                     entity.matCode = Convert.ToInt32(dr["matCode"].ToString());
                     entity.actValue = Convert.ToSingle(dr["actValue"].ToString());
                     list.Add(entity);
@@ -130,13 +115,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
                 dr[0] = "干混机" + i;
                 for (int j = 1; j <=15; j++) 
                 {
-                   var actValue=  list.Where(x=>x.eqNo==i)
+                   var actValue=  list.Where(x=>x.dryNo == i)
                         .Where(x=>x.matCode==j).Sum(x=>x.actValue);
 
                     dr[j] = actValue.ToString("#0.00");
 
-                  
-
+                 
                 }
 
 
@@ -151,6 +135,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
 
             dt.Rows.Add(drTotal);
 
+            dt.Columns.Remove("木薯粉总量");
+            dt.Columns.Remove("玉米粉总量");
 
             this.dataGridView.AutoGenerateColumns = true;
             this.dataGridView.DataSource = null;
@@ -159,11 +145,37 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
 
 
         }
+
+        private DataTable GetDefault()
+        {
+            dt = new DataTable();
+            dt.Columns.Add("机台", typeof(string));
+
+            dt.Columns.Add("小料1总量", typeof(string));
+            dt.Columns.Add("小料2总量", typeof(string));
+            dt.Columns.Add("木粉总量", typeof(string));
+            dt.Columns.Add("炭酸钙总量", typeof(string));
+
+            dt.Columns.Add("木薯粉总量", typeof(string));
+            dt.Columns.Add("玉米粉总量", typeof(string));
+
+            dt.Columns.Add("炭粉1总量", typeof(string));
+            dt.Columns.Add("炭粉2总量", typeof(string));
+            dt.Columns.Add("炭粉3总量", typeof(string));
+            dt.Columns.Add("炭粉4总量", typeof(string));
+            dt.Columns.Add("炭粉5总量", typeof(string));
+            dt.Columns.Add("炭粉6总量", typeof(string));
+            dt.Columns.Add("炭粉7总量", typeof(string));
+            dt.Columns.Add("炭粉8总量", typeof(string));
+            dt.Columns.Add("回收总量", typeof(string));
+
+            return dt;
+        }
     }
 
     public  class GhWuLiaoIniEntity
     {
-        public int eqNo { get; set; }
+        public int dryNo { get; set; }
 
         /// <summary>
         /// 物料编码
@@ -175,4 +187,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
 
        
     }
+
+    
 }