change -修改数据查询及导出并判断

ProductionSystem/Forms/HomeForm.cs

@@ -828,7 +828,7 @@ namespace ProductionSystem.Forms
                 //步骤6模式2内漏
 
                 var d1310 = GetPlcValue("D1310");
-                d1310 = "1";
+               // d1310 = "1";
                 if (d1310.ToDouble().ToInt() == 1)
                 {
                     Step6();
@@ -1574,6 +1574,8 @@ namespace ProductionSystem.Forms
                 GetPlc(Program.BZ4, "BZ4");
                 GetPlc(Program.BZ5, "BZ5");
                 GetPlc(Program.BZ6, "BZ6");
+                GetPlc(Program.BZ7, "BZ7");
+                GetPlc(Program.BZ8, "BZ8");
 
 
                 count++;
@@ -1596,6 +1598,7 @@ namespace ProductionSystem.Forms
                 SetMiddleData("BZ4_DB");
                 SetMiddleData("BZ5_DB");
                 SetMiddleData("BZ6_DB");
+                SetMiddleData("BZ7_DB");
 
                 Thread.Sleep(Program.ReadPlcRate);
             }

ProductionSystem/Forms/SearchResultForm.cs

@@ -71,6 +71,13 @@ namespace ProductionSystem.Forms
             try
             {
                 FolderBrowserDialog path = new FolderBrowserDialog();
+                //是否已选择产品型号
+                if (cmbProductType.EditValue.ToString() == "--请选择--")
+                {
+                    CustomMessageBoxHelper.XtraMessageBoxShow("请选择产品型号！");
+                }
+                else
+                {
                     if (path.ShowDialog() == DialogResult.OK)
                     {
                         Loading.ShowWaitForm();
@@ -80,21 +87,29 @@ namespace ProductionSystem.Forms
 
                         #region 设置列名称
                         var mappingColumns = new List<ExportColumns>();
-                    var co1 = new ExportColumns { Field = "CreatedTime", Title = "创建时间" };
+                        var co1 = new ExportColumns { Field = "CreateTime", Title = "创建时间" };
                         var co2 = new ExportColumns { Field = "ProductType", Title = "产品型号" };
-                    var co3 = new ExportColumns { Field = "ProductCode", Title = "产品条码" };
+                        var co3 = new ExportColumns { Field = "ProductBarcode", Title = "产品条码" };
+                        var co4 = new ExportColumns { Field = "Voltage", Title = "电压" };
+                        var co5 = new ExportColumns { Field = "Electricity", Title = "电流" };
+                        var co6 = new ExportColumns { Field = "Xll", Title = "泄露量" };
+                        var co7 = new ExportColumns { Field = "Xllzt", Title = "泄露量状态" };
                         mappingColumns.Add(co1);
                         mappingColumns.Add(co2);
                         mappingColumns.Add(co3);
+                        mappingColumns.Add(co4);
+                        mappingColumns.Add(co5);
+                        mappingColumns.Add(co6);
+                        mappingColumns.Add(co7);
                         //查询点位信息
-                    var plcPoints = _plcPointService.QueryActiveSaveDbPlcPoints();
-                    foreach (var item in plcPoints)
-                    {
-                        var resultField = item.ResultField;
-                        var fieldName = resultField.Substring(0, 1).ToUpper() + resultField.Substring(1);
-                        var column = new ExportColumns { Field = fieldName, Title = item.PointName };
-                        mappingColumns.Add(column);
-                    }
+                        //var plcPoints = _plcPointService.QueryActiveSaveDbPlcPoints();
+                        //foreach (var item in plcPoints)
+                        //{
+                        //    var resultField = item.ResultField;
+                        //    var fieldName = resultField.Substring(0, 1).ToUpper() + resultField.Substring(1);
+                        //    var column = new ExportColumns { Field = fieldName, Title = item.PointName };
+                        //    mappingColumns.Add(column);
+                        //}
                         #endregion
 
                         if (list == null || list.Count <= 0)
@@ -108,6 +123,7 @@ namespace ProductionSystem.Forms
                         CustomMessageBoxHelper.XtraMessageBoxShow("导出成功！");
                     }
                 }               
+            }
             catch (Exception ex)
             {
                 Loading.CloseWaitForm();
@@ -161,13 +177,25 @@ namespace ProductionSystem.Forms
 
                 queryResultVM.BeginTime = dtBeginDate.ToString();
                 queryResultVM.EndTime = dtEndDate.ToString();
-                queryResultVM.ProductType = cmbProductType.EditValue.ToString();
+                var typeName = cmbProductType.EditValue.ToString();
+                if(typeName == "--请选择--")
+                {
+                    CustomMessageBoxHelper.XtraMessageBoxShow("请选择产品型号！");
+                }
+                queryResultVM.ProductType = typeName;
                 queryResultVM.ProductCode = txtProductCode.Text.ToString();
-
-                var entity=_resultService.Query(queryResultVM);
+                if(isPage == true)
+                {
+                    var entity = _resultService.Query(queryResultVM);
                     totalCount = entity.Total;
                     return entity.Data;
                 }
+                else
+                {
+                    var entity2 = _resultService.Query2(queryResultVM);
+                    return entity2;
+                }          
+            }
             catch (Exception ex)
             {
                 var msg = ex == null ? "执行SearchResult中DataSource方法时异常" : ex.Message;

ProductionSystem_Service/TResult2Service.cs

@@ -42,7 +42,11 @@ namespace ProductionSystem_Service
             return db.Queryable<T_Result2>().Where(m => m.ProductType == productType && m.ProductBarcode == productBarcode).First();
         }
 
-
+        /// <summary>
+        /// 分页查询
+        /// </summary>
+        /// <param name="vm"></param>
+        /// <returns></returns>
         public TestResut2Res Query(TestResut2Vm vm)
         {
                int totalRecord = 0;
@@ -63,8 +67,22 @@ namespace ProductionSystem_Service
             testResut2Res.Next = totalPage > vm.PageIndex;
 
             return testResut2Res;
-
-
+        }
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="vm"></param>
+        /// <returns></returns>
+        public List<T_Result2> Query2(TestResut2Vm vm)
+        {
+            int totalRecord = 0;
+            var iq = db.Queryable<T_Result2>().
+              WhereIF(!string.IsNullOrEmpty(vm.ProductType), x => x.ProductType == vm.ProductType)
+              .WhereIF(!string.IsNullOrEmpty(vm.ProductCode), x => x.ProductBarcode == vm.ProductCode)
+              .WhereIF(!string.IsNullOrEmpty(vm.BeginTime), x => x.CreateTime >= Convert.ToDateTime(vm.BeginTime))
+              .WhereIF(!string.IsNullOrEmpty(vm.EndTime), xy => xy.CreateTime <= Convert.ToDateTime(vm.EndTime))
+              .ToList();
+            return iq;
         }
     }