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/Comprehensive/DesignDrawingsEdit.aspx.cs
+1 -2
View File
@@ -36,8 +36,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
GetButtonPower();
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false);
BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
this.DesignDrawingsId = Request.Params["DesignDrawingsId"];
Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.DesignDrawingsId);
if (designDrawings != null)
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
+4 -3
View File
@@ -58,12 +58,13 @@
<f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
HeaderTextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField ColumnID="EquipmentNO" DataField="EquipmentNO" FieldType="String" HeaderText="设备位号" TextAlign="Center"
HeaderTextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="EquipmentOrMatail" DataField="EquipmentOrMatail" FieldType="String" HeaderText="设备/材料" TextAlign="Center"
HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField ColumnID="InspectionName" DataField="InspectionName" FieldType="String" HeaderText="名称" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs
+1 -1
View File
@@ -31,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive
/// </summary>
public void BindGrid()
{
string strSql = @"select InspectionEquipmentId,ProjectId,C.UnitId, U.UnitName,InspectionCode,CN.ProfessionalName,InspectionName,Specifications,
string strSql = @"select InspectionEquipmentId,ProjectId,C.UnitId, U.UnitName,InspectionCode,CN.ProfessionalName,EquipmentOrMatail,InspectionName,Specifications,
Supplier,Counts,SamplingCount,(CASE WHEN SamplingResult=1 THEN '合格' WHEN SamplingResult=0 THEN '不合格' ELSE '' END) AS SamplingResult,
InspectionDate,AttachUrl,Attribute,RemarkCode,UsedPlace,EquipmentNO from Comprehensive_InspectionEquipment C
left join Base_Unit U on C.UnitId=U.UnitId
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataIn.aspx.cs
+47 -30
View File
@@ -187,15 +187,32 @@ namespace FineUIPro.Web.CQMS.Comprehensive
result += (i + 2).ToString() + "," + "报验编号" + "," + "此项为必填项！" + "|";
}
string row3 = pds.Rows[i][3].ToString();
if (!string.IsNullOrEmpty(row3))
string row2 = pds.Rows[i][2].ToString();
if (!string.IsNullOrEmpty(row2))
{
var cn = cns.Where(x => x.ProfessionalName == row3.Trim()).FirstOrDefault();
var cn = cns.Where(x => x.ProfessionalName == row2.Trim()).FirstOrDefault();
if (cn == null)
{
result += (i + 2).ToString() + "," + "专业名称" + "," + "[" + row3 + "]不存在！" + "|";
result += (i + 2).ToString() + "," + "专业名称" + "," + "[" + row2 + "]不存在！" + "|";
}
}
else
{
result += (i + 2).ToString() + "," + "专业名称" + "," + "此项为必填项！" + "|";
}
string row3 = pds.Rows[i][3].ToString().Trim();
if (!string.IsNullOrEmpty(row3))
{
if (row3 != "设备" && row3 != "材料")
{
result += (i + 2).ToString() + "," + "设备/材料" + "," + "[" + row2 + "]错误！" + "|";
}
}
else
{
result += (i + 2).ToString() + "," + "设备/材料" + "," + "此项为必填项！" + "|";
}
string row9 = pds.Rows[i][9].ToString().Trim();
if (!string.IsNullOrEmpty(row9))
@@ -244,7 +261,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
errorInfos.Clear();
if (!string.IsNullOrEmpty(result))
{
string results = result;
List<string> errorInfoList = results.Split('|').ToList();
foreach (var item in errorInfoList)
@@ -393,31 +410,31 @@ namespace FineUIPro.Web.CQMS.Comprehensive
// ).FirstOrDefault();
//if (oldViewInfo == null)
//{
Model.Comprehensive_InspectionEquipment Ins = new Model.Comprehensive_InspectionEquipment();
Ins.ProjectId = this.CurrUser.LoginProjectId;
Ins.UnitId = unitInfo.UnitId;
Ins.InspectionCode = pds.Rows[i][1].ToString().Trim();
Ins.EquipmentNO = pds.Rows[i][2].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][3].ToString().Trim()))
{
Ins.CNProfessionalId = Funs.DB.Base_CNProfessional.First(e => e.ProfessionalName == pds.Rows[i][3].ToString().Trim()).CNProfessionalId;
}
Ins.InspectionName = pds.Rows[i][4].ToString().Trim();
Ins.Specifications = pds.Rows[i][5].ToString().Trim();
Ins.Supplier = pds.Rows[i][6].ToString().Trim();
Ins.Counts = pds.Rows[i][7].ToString().Trim();
Ins.SamplingCount = pds.Rows[i][8].ToString().Trim();
Ins.SamplingResult = pds.Rows[i][9].ToString().Trim() == "合格" ? "1" : "2";
Model.Comprehensive_InspectionEquipment Ins = new Model.Comprehensive_InspectionEquipment();
Ins.ProjectId = this.CurrUser.LoginProjectId;
Ins.UnitId = unitInfo.UnitId;
Ins.InspectionCode = pds.Rows[i][1].ToString().Trim();
if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim()))
{
Ins.CNProfessionalId = Funs.DB.Base_CNProfessional.First(e => e.ProfessionalName == pds.Rows[i][2].ToString().Trim()).CNProfessionalId;
}
Ins.EquipmentOrMatail = pds.Rows[i][3].ToString().Trim();
Ins.InspectionName = pds.Rows[i][4].ToString().Trim();
Ins.Specifications = pds.Rows[i][5].ToString().Trim();
Ins.Supplier = pds.Rows[i][6].ToString().Trim();
Ins.Counts = pds.Rows[i][7].ToString().Trim();
Ins.SamplingCount = pds.Rows[i][8].ToString().Trim();
Ins.SamplingResult = pds.Rows[i][9].ToString().Trim() == "合格" ? "1" : "2";
if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim()))
{
Ins.InspectionDate = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
}
Ins.RemarkCode = pds.Rows[i][11].ToString().Trim();
Ins.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment));
Ins.CompileMan = this.CurrUser.UserId;
Ins.CompileDate = DateTime.Now.Date;
BLL.InspectionEquipmentService.AddInspectionEquipment(Ins);
if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString().Trim()))
{
Ins.InspectionDate = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
}
Ins.RemarkCode = pds.Rows[i][11].ToString().Trim();
Ins.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment));
Ins.CompileMan = this.CurrUser.UserId;
Ins.CompileDate = DateTime.Now.Date;
BLL.InspectionEquipmentService.AddInspectionEquipment(Ins);
//}
//else
@@ -431,7 +448,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + row0 + "]不存在！" + "|";
}
}
}
else
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx
+6 -2
View File
@@ -21,8 +21,12 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtEquipmentNo" runat="server" Label="设备位号" MaxLength="50" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
<f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="120px"></f:DropDownList>
<f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right" ShowRedStar="true" LabelWidth="120px"></f:DropDownList>
<f:DropDownList ID="drpEquipmentOrMatail" runat="server" Label="设备/材料" LabelAlign="Right" ShowRedStar="true" LabelWidth="120px">
<f:ListItem Value="设备" Text="设备" />
<f:ListItem Value="材料" Text="材料" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs
+16 -3
View File
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
BLL.InspectionEquipmentService.InitAttributeDropDownList(this.drpAttribute, true);
Funs.FineUIPleaseSelect(this.drpEquipmentOrMatail);
this.InspectionEquipmentId = Request.Params["InspectionEquipmentId"];
var inspectionEquipment = BLL.InspectionEquipmentService.GetInspectionEquipmentById(this.InspectionEquipmentId);
if (inspectionEquipment != null)
@@ -53,6 +53,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.drpCNProfessionalId.SelectedValue = inspectionEquipment.CNProfessionalId;
}
if (!string.IsNullOrEmpty(inspectionEquipment.EquipmentOrMatail))
{
this.drpEquipmentOrMatail.SelectedValue = inspectionEquipment.EquipmentOrMatail;
}
this.txtInspectionName.Text = inspectionEquipment.InspectionName;
this.txtSpecifications.Text = inspectionEquipment.Specifications;
this.txtSupplier.Text = inspectionEquipment.Supplier;
@@ -74,7 +78,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.txtInspectionDate.Text = inspectionEquipment.InspectionDate.HasValue ? string.Format("{0:yyyy-MM-dd}", inspectionEquipment.InspectionDate) : "";
this.txtRemarkCode.Text = inspectionEquipment.RemarkCode;
this.txtEquipmentNo.Text = inspectionEquipment.EquipmentNO;
this.txtUsedPlace.Text = inspectionEquipment.UsedPlace;
}
else
@@ -98,6 +101,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning);
return;
}
if (this.drpCNProfessionalId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
return;
}
if (this.drpEquipmentOrMatail.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择设备/材料！", MessageBoxIcon.Warning);
return;
}
Model.Comprehensive_InspectionEquipment newInspectionEquipment = new Model.Comprehensive_InspectionEquipment();
newInspectionEquipment.ProjectId = this.CurrUser.LoginProjectId;
newInspectionEquipment.UnitId = this.drpUnitId.SelectedValue;
@@ -109,7 +122,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newInspectionEquipment.InspectionName = this.txtInspectionName.Text.Trim();
newInspectionEquipment.Specifications = this.txtSpecifications.Text.Trim();
newInspectionEquipment.Supplier = this.txtSupplier.Text.Trim();
newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim();
newInspectionEquipment.EquipmentOrMatail = this.drpEquipmentOrMatail.SelectedValue;
newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim();
newInspectionEquipment.Counts = this.txtCounts.Text.Trim();
newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim();
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs
Generated
+9 -9
View File
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.TextBox txtInspectionCode;
/// <summary>
/// txtEquipmentNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEquipmentNo;
/// <summary>
/// drpCNProfessionalId 控件。
/// </summary>
@@ -75,6 +66,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessionalId;
/// <summary>
/// drpEquipmentOrMatail 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpEquipmentOrMatail;
/// <summary>
/// txtInspectionName 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx
+1 -1
View File
@@ -96,7 +96,7 @@
<PageItems>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged1" AutoPostBack="true">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs
+7 -1
View File
@@ -292,7 +292,7 @@ namespace FineUIPro.Web.Comprehensive
{
lbfAction1.Enabled = true;
}
else
else
{
lbfAction1.Enabled = false;
}
@@ -329,5 +329,11 @@ namespace FineUIPro.Web.Comprehensive
Response.End();
}
#endregion
protected void ddlPageSize_SelectedIndexChanged1(object sender, EventArgs e)
{
this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
BindGrid();
}
}
}
SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx
+10 -7
View File
@@ -27,9 +27,9 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="StandardCode" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="StandardCode" AllowSorting="true" SortField="StandardCode"
SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
ClicksToEdit="2" DataIDField="StandardCode" AllowSorting="true" SortField="StandardCode"
SortDirection="DESC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="200" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnRowDataBound="Grid1_RowDataBound" OnRowCommand="Grid1_RowCommand">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@@ -42,6 +42,9 @@
<f:Button ID="btnNew" ToolTip="增加" Icon="Add" runat="server" Hidden="true"
OnClick="btnNew_Click">
</f:Button>
<f:Button ID="btnSave" ToolTip="保存" Icon="SystemSave" runat="server" Text="" Hidden="true"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@@ -105,10 +108,10 @@
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="30" Value="30" />
<f:ListItem Text="200" Value="200" />
<f:ListItem Text="300" Value="300" />
<f:ListItem Text="400" Value="400" />
<f:ListItem Text="500" Value="500" />
</f:DropDownList>
</PageItems>
</f:Grid>
SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx.cs
+121
View File
@@ -12,10 +12,42 @@ namespace FineUIPro.Web.CQMS.DataBase
{
public partial class ConstructionStandardListProject : PageBase
{
/// <summary>
/// 被选择项列表
/// </summary>
public List<string> SelectedList
{
get
{
return (List<string>)ViewState["SelectedList"];
}
set
{
ViewState["SelectedList"] = value;
}
}
/// <summary>
/// 未被选择项列表
/// </summary>
public List<string> NoSelectedList
{
get
{
return (List<string>)ViewState["NoSelectedList"];
}
set
{
ViewState["NoSelectedList"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.SelectedList = new List<string>();
this.NoSelectedList = new List<string>();
GetButtonPower();
InitTreeMenu();
BindGrid();
@@ -53,6 +85,17 @@ namespace FineUIPro.Web.CQMS.DataBase
/// <param name="e"></param>
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
for (int i = 0; i < this.Grid1.Rows.Count; i++)
{
if (this.Grid1.SelectedRowIDArray.Contains(this.Grid1.Rows[i].RowID))
{
SelectedList.Add(this.Grid1.Rows[i].RowID);
}
else
{
NoSelectedList.Add(this.Grid1.Rows[i].RowID);
}
}
BindGrid();
}
#endregion
@@ -79,6 +122,7 @@ namespace FineUIPro.Web.CQMS.DataBase
standardList.IsSelected8,
standardList.IsSelected9,
standardList.IsSelected10,
standardList.IsChecked,
standardList.pubDate,
standardList.ImpDate,
standardList.ReplaceStandard,
@@ -113,6 +157,26 @@ namespace FineUIPro.Web.CQMS.DataBase
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
if (tb.Rows.Count > 0)
{
List<string> ids = new List<string>();
for (int i = 0; i < tb.Rows.Count; i++)
{
if (tb.Rows[i][16].ToString() == "True")
{
ids.Add(tb.Rows[i][0].ToString());
}
}
if (ids.Count() > 0)
{
this.Grid1.SelectedRowIDArray = ids.ToArray();
}
}
//var selectIds = (from x in Funs.DB.WBS_BreakdownProject where x.DivisionProjectId == this.trWBS.SelectedNodeID && x.IsSelected == true select x.BreakdownProjectId).ToList();
//if (selectIds.Count() > 0)
//{
// this.Grid1.SelectedRowIDArray = selectIds.ToArray();
//}
}
#endregion
@@ -124,6 +188,17 @@ namespace FineUIPro.Web.CQMS.DataBase
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
for (int i = 0; i < this.Grid1.Rows.Count; i++)
{
if (this.Grid1.SelectedRowIDArray.Contains(this.Grid1.Rows[i].RowID))
{
SelectedList.Add(this.Grid1.Rows[i].RowID);
}
else
{
NoSelectedList.Add(this.Grid1.Rows[i].RowID);
}
}
Grid1.PageIndex = e.NewPageIndex;
BindGrid();
}
@@ -279,6 +354,48 @@ namespace FineUIPro.Web.CQMS.DataBase
}
#endregion
#region 保存事件
protected void btnSave_Click(object sender, EventArgs e)
{
for (int i = 0; i < this.Grid1.Rows.Count; i++)
{
if (this.Grid1.SelectedRowIDArray.Contains(this.Grid1.Rows[i].RowID))
{
SelectedList.Add(this.Grid1.Rows[i].RowID);
}
else
{
NoSelectedList.Add(this.Grid1.Rows[i].RowID);
}
}
foreach (var item in SelectedList.Distinct())
{
var rows = BLL.ConstructionStandardListProjectService.GetConstructionStandardListProjectByStandardCode(Convert.ToInt32(item), this.CurrUser.LoginProjectId);
rows.IsChecked = true;
BLL.ConstructionStandardListProjectService.UpdateConstructionStandardListProject(rows);
}
NoSelectedList = NoSelectedList.Distinct().ToList();
var q = NoSelectedList.Distinct().ToList();
foreach (var item in q)
{
foreach (var i in SelectedList.Distinct())
{
if (item == i)
{
NoSelectedList.Remove(item);
}
}
}
foreach (var item in NoSelectedList)
{
var rows = BLL.ConstructionStandardListProjectService.GetConstructionStandardListProjectByStandardCode(Convert.ToInt32(item), this.CurrUser.LoginProjectId);
rows.IsChecked = null;
BLL.ConstructionStandardListProjectService.UpdateConstructionStandardListProject(rows);
}
Alert.ShowInTop("保存成功！", MessageBoxIcon.Success);
}
#endregion
#region 权限设置
/// <summary>
/// 权限设置
@@ -297,6 +414,10 @@ namespace FineUIPro.Web.CQMS.DataBase
this.btnMenuModify.Hidden = false;
this.Grid1.EnableRowDoubleClickEvent = true;
}
if (buttonList.Contains(BLL.Const.BtnSave))
{
this.btnSave.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
this.btnMenuDel.Hidden = false;
SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx.designer.cs
Generated
+9
View File
@@ -138,6 +138,15 @@ namespace FineUIPro.Web.CQMS.DataBase {
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProjectEdit.aspx.cs
+11 -8
View File
@@ -26,7 +26,7 @@ namespace FineUIPro.Web.CQMS.DataBase
string standardCode = Request.Params["StandardCode"];
if (!string.IsNullOrEmpty(standardCode))
{
Model.CQMS_Law_ConstructionStandardListProject standard = BLL.ConstructionStandardListProjectService.GetConstructionStandardListProjectByStandardCode(Convert.ToInt32(standardCode),this.CurrUser.LoginProjectId);
Model.CQMS_Law_ConstructionStandardListProject standard = BLL.ConstructionStandardListProjectService.GetConstructionStandardListProjectByStandardCode(Convert.ToInt32(standardCode), this.CurrUser.LoginProjectId);
if (standard != null)
{
this.drpStandardType.SelectedValue = standard.StandardType;
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.CQMS.DataBase
{
maxStandardCode = BLL.ConstructionStandardListProjectService.GetMaxStandardCode(this.CurrUser.LoginProjectId);
}
this.hdStandardCode.Text = (maxStandardCode + 1).ToString()+this.CurrUser.LoginProjectId;
this.hdStandardCode.Text = (maxStandardCode + 1).ToString() + this.CurrUser.LoginProjectId;
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/DataBase/ConstructionStandardProject&menuId={1}", this.hdStandardCode.Text, BLL.Const.CQMSConstructionStandardListProjectMenuId)));
}
@@ -122,6 +122,8 @@ namespace FineUIPro.Web.CQMS.DataBase
if (!string.IsNullOrEmpty(standardCode))
{
newStandard.StandardCode = Convert.ToInt32(standardCode);
Model.CQMS_Law_ConstructionStandardListProject standard = BLL.ConstructionStandardListProjectService.GetConstructionStandardListProjectByStandardCode(Convert.ToInt32(standardCode), this.CurrUser.LoginProjectId);
newStandard.IsChecked = standard.IsChecked;
BLL.ConstructionStandardListProjectService.UpdateConstructionStandardListProject(newStandard);
}
else
@@ -132,12 +134,13 @@ namespace FineUIPro.Web.CQMS.DataBase
//}
//else
//{
int maxStandardCode = 0;
if (BLL.ConstructionStandardListProjectService.GetCountConstructionStandardListProject(this.CurrUser.LoginProjectId) != 0)
{
maxStandardCode = BLL.ConstructionStandardListProjectService.GetMaxStandardCode(this.CurrUser.LoginProjectId);
}
newStandard.StandardCode = maxStandardCode + 1;
int maxStandardCode = 0;
if (BLL.ConstructionStandardListProjectService.GetCountConstructionStandardListProject(this.CurrUser.LoginProjectId) != 0)
{
maxStandardCode = BLL.ConstructionStandardListProjectService.GetMaxStandardCode(this.CurrUser.LoginProjectId);
}
newStandard.StandardCode = maxStandardCode + 1;
newStandard.IsChecked = true;
//}
BLL.ConstructionStandardListProjectService.AddConstructionStandardListProject(newStandard);
}
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();