lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0813

Browse Source
This commit is contained in:
gaofei
2021-08-13 11:15:59 +08:00
parent 43acc57060
commit d8dff88c39
320 changed files with 37219 additions and 4678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
+6 -2
View File
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
private void GetComprehensive()
{
decimal? count = 0;
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" select x).ToList();
foreach (var item in inspectionEquipments)
{
count += Funs.GetNewIntOrZero(item.Counts);
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.txt3.Text = Convert.ToString(count);
decimal? thisWeekCount = 0;
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
foreach (var item in equpments)
{
thisWeekCount += Funs.GetNewIntOrZero(item.Counts);
@@ -142,6 +142,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
//}
var Uequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text)
&& x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text)
&& x.UnitId == BLL.Const.UnitId_CWCEC
@@ -150,12 +151,14 @@ namespace FineUIPro.Web.CQMS.ManageReport
var Tequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.UnitId == BLL.Const.UnitId_CWCEC
select x).Count();
this.txt6.Text = Tequipments.ToString();
var CUequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text)
&& x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text)
&& x.UnitId != BLL.Const.UnitId_CWCEC
@@ -164,6 +167,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
var CTequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.UnitId != BLL.Const.UnitId_CWCEC
select x).Count();
this.txt8.Text = CTequipments.ToString();
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportPrint.aspx.cs
+7 -10
View File
@@ -140,7 +140,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
private void GetComprehensive()
{
decimal? count = 0;
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" select x).ToList();
foreach (var item in inspectionEquipments)
{
//count += item.Counts;
@@ -148,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.txt3.Text = Convert.ToString(count);
decimal? thisWeekCount = 0;
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
foreach (var item in equpments)
{
//thisWeekCount += item.Counts;
@@ -156,34 +156,31 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.txt2.Text = Convert.ToString(thisWeekCount);
var Uequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text)
&& x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text)
&& y.UnitAttribute == "1"
&& x.UnitId == BLL.Const.UnitId_CWCEC
select x).Count();
this.txt5.Text = Uequipments.ToString();
var Tequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
&& y.UnitAttribute == "1"
&& x.UnitId == BLL.Const.UnitId_CWCEC
select x).Count();
this.txt6.Text = Tequipments.ToString();
var CUequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text)
&& x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text)
&& y.UnitAttribute == "2"
&& x.UnitId != BLL.Const.UnitId_CWCEC
select x).Count();
this.txt7.Text = CUequipments.ToString();
var CTequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
&& y.UnitAttribute == "2"
&& x.UnitId != BLL.Const.UnitId_CWCEC
select x).Count();
this.txt8.Text = CTequipments.ToString();
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
+6 -2
View File
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
private void GetComprehensive()
{
int count = 0;
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" select x).ToList();
foreach (var item in inspectionEquipments)
{
count += Funs.GetNewIntOrZero(item.Counts);
@@ -127,7 +127,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.txt3.Text = Convert.ToString(count);
int thisWeekCount = 0;
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
foreach (var item in equpments)
{
thisWeekCount += Funs.GetNewIntOrZero(item.Counts);
@@ -136,6 +136,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
var Uequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text)
&& x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text)
&& x.UnitId == BLL.Const.UnitId_CWCEC
@@ -144,12 +145,14 @@ namespace FineUIPro.Web.CQMS.ManageReport
var Tequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.UnitId == BLL.Const.UnitId_CWCEC
select x).Count();
this.txt6.Text = Tequipments.ToString();
var CUequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text)
&& x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text)
&& x.UnitId != BLL.Const.UnitId_CWCEC
@@ -158,6 +161,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
var CTequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.UnitId != BLL.Const.UnitId_CWCEC
select x).Count();
this.txt8.Text = CTequipments.ToString();
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportPrint.aspx.cs
+11 -11
View File
@@ -10,7 +10,7 @@ using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.CQMS.ManageReport
{
public partial class WeekReportPrint :PageBase
public partial class WeekReportPrint : PageBase
{
#region 定义项
/// <summary>
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
private void GetComprehensive()
{
decimal? count = 0;
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" select x).ToList();
foreach (var item in inspectionEquipments)
{
//count += item.Counts;
@@ -147,7 +147,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.txt3.Text = Convert.ToString(count);
decimal? thisWeekCount = 0;
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList();
foreach (var item in equpments)
{
//thisWeekCount += item.Counts;
@@ -155,34 +155,34 @@ namespace FineUIPro.Web.CQMS.ManageReport
this.txt2.Text = Convert.ToString(thisWeekCount);
var Uequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text)
&& x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text)
&& y.UnitAttribute == "1"
&& x.UnitId == BLL.Const.UnitId_CWCEC
select x).Count();
this.txt5.Text = Uequipments.ToString();
var Tequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
&& y.UnitAttribute == "1"
&& x.EquipmentOrMatail == "材料"
&& x.UnitId == BLL.Const.UnitId_CWCEC
select x).Count();
this.txt6.Text = Tequipments.ToString();
var CUequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.EquipmentOrMatail == "材料"
&& x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text)
&& x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text)
&& y.UnitAttribute == "2"
&& x.UnitId != BLL.Const.UnitId_CWCEC
select x).Count();
this.txt7.Text = CUequipments.ToString();
var CTequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
&& y.UnitAttribute == "2"
&& x.EquipmentOrMatail == "材料"
&& x.UnitId != BLL.Const.UnitId_CWCEC
select x).Count();
this.txt8.Text = CTequipments.ToString();