diff --git a/ProductionSystem/Forms/HomeForm.cs b/ProductionSystem/Forms/HomeForm.cs index 219c8d9..e64fc67 100644 --- a/ProductionSystem/Forms/HomeForm.cs +++ b/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,8 +1574,10 @@ namespace ProductionSystem.Forms GetPlc(Program.BZ4, "BZ4"); GetPlc(Program.BZ5, "BZ5"); GetPlc(Program.BZ6, "BZ6"); + GetPlc(Program.BZ7, "BZ7"); + GetPlc(Program.BZ8, "BZ8"); + - count++; if (count == 5) { @@ -1596,6 +1598,7 @@ namespace ProductionSystem.Forms SetMiddleData("BZ4_DB"); SetMiddleData("BZ5_DB"); SetMiddleData("BZ6_DB"); + SetMiddleData("BZ7_DB"); Thread.Sleep(Program.ReadPlcRate); } diff --git a/ProductionSystem/Forms/SearchResultForm.cs b/ProductionSystem/Forms/SearchResultForm.cs index af066d7..6a1de51 100644 --- a/ProductionSystem/Forms/SearchResultForm.cs +++ b/ProductionSystem/Forms/SearchResultForm.cs @@ -71,42 +71,58 @@ namespace ProductionSystem.Forms try { FolderBrowserDialog path = new FolderBrowserDialog(); - if (path.ShowDialog() == DialogResult.OK) + //是否已选择产品型号 + if (cmbProductType.EditValue.ToString() == "--请选择--") { - Loading.ShowWaitForm(); - int totalCount = 0; - var list = DataSource(ref totalCount, false); - var filePath = string.Format("{0}\\{1}.xlsx", path.SelectedPath, DateTime.Now.ToString("yyyyMMddHHmmss")); - - #region 设置列名称 - var mappingColumns = new List(); - var co1 = new ExportColumns { Field = "CreatedTime", Title = "创建时间" }; - var co2 = new ExportColumns { Field = "ProductType", Title = "产品型号" }; - var co3 = new ExportColumns { Field = "ProductCode", Title = "产品条码" }; - mappingColumns.Add(co1); - mappingColumns.Add(co2); - mappingColumns.Add(co3); - //查询点位信息 - var plcPoints = _plcPointService.QueryActiveSaveDbPlcPoints(); - foreach (var item in plcPoints) + CustomMessageBoxHelper.XtraMessageBoxShow("请选择产品型号！"); + } + else + { + if (path.ShowDialog() == DialogResult.OK) { - 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 + Loading.ShowWaitForm(); + int totalCount = 0; + var list = DataSource(ref totalCount, false); + var filePath = string.Format("{0}\\{1}.xlsx", path.SelectedPath, DateTime.Now.ToString("yyyyMMddHHmmss")); - if (list == null || list.Count <= 0) - { + #region 设置列名称 + var mappingColumns = new List(); + var co1 = new ExportColumns { Field = "CreateTime", Title = "创建时间" }; + var co2 = new ExportColumns { Field = "ProductType", 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); + //} + #endregion + + if (list == null || list.Count <= 0) + { + Loading.CloseWaitForm(); + CustomMessageBoxHelper.XtraMessageBoxShow("无数据！"); + return; + } + ExcelHelper.ToExcel(list, filePath, mappingColumns, true); Loading.CloseWaitForm(); - CustomMessageBoxHelper.XtraMessageBoxShow("无数据！"); - return; + CustomMessageBoxHelper.XtraMessageBoxShow("导出成功！"); } - ExcelHelper.ToExcel(list, filePath, mappingColumns, true); - Loading.CloseWaitForm(); - CustomMessageBoxHelper.XtraMessageBoxShow("导出成功！"); - } + } } catch (Exception ex) { @@ -139,7 +155,7 @@ namespace ProductionSystem.Forms try { totalCount = 0; - TestResut2Vm queryResultVM = new TestResut2Vm + TestResut2Vm queryResultVM = new TestResut2Vm { PageIndex = gridPage.PageIndex, PageSize = gridPage.PageSize @@ -161,12 +177,24 @@ 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); - totalCount = entity.Total; - return entity.Data; + 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) { diff --git a/ProductionSystem_Service/TResult2Service.cs b/ProductionSystem_Service/TResult2Service.cs index a7ce1b7..4f497ca 100644 --- a/ProductionSystem_Service/TResult2Service.cs +++ b/ProductionSystem_Service/TResult2Service.cs @@ -42,7 +42,11 @@ namespace ProductionSystem_Service return db.Queryable().Where(m => m.ProductType == productType && m.ProductBarcode == productBarcode).First(); } - + /// + /// 分页查询 + /// + /// + /// public TestResut2Res Query(TestResut2Vm vm) { int totalRecord = 0; @@ -63,8 +67,22 @@ namespace ProductionSystem_Service testResut2Res.Next = totalPage > vm.PageIndex; return testResut2Res; - - + } + /// + /// 列表 + /// + /// + /// + public List Query2(TestResut2Vm vm) + { + int totalRecord = 0; + var iq = db.Queryable(). + 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; } }