lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交施工日志修改

Browse Source
This commit is contained in:
高飞
2023-10-11 10:19:12 +08:00
parent b574fe7220
commit 9a73b66ee1
15 changed files with 681 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+1 -1
View File
@@ -633,7 +633,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static Model.SitePerson_Person getSitePerson_PersonByRoleId(string projectId, string roleId) public static Model.SitePerson_Person getSitePerson_PersonByRoleId(string projectId, string roleId)
{ {
return Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.RoleIds.Contains(roleId)); return Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.RoleIds.Contains(roleId) && x.States == Const.ProjectPersonStates_1);
} }
/// <summary> /// <summary>
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
+219 -1
View File
@@ -425,7 +425,7 @@ namespace BLL
} }
for (int i = 0; i < workPostIds.Count; i++) for (int i = 0; i < workPostIds.Count; i++)
{ {
var workEfficiency = workEfficiencys.FirstOrDefault(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId== item.Id); var workEfficiency = workEfficiencys.FirstOrDefault(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
if (workEfficiency != null) if (workEfficiency != null)
{ {
if (workEfficiency.ConsumeHours != null) if (workEfficiency.ConsumeHours != null)
@@ -464,6 +464,224 @@ namespace BLL
return table; return table;
} }
} }
/// <summary>
/// 获取模拟树表格
/// </summary>
/// <returns></returns>
public static DataTable GetProjectAllTreeDataTable(string projectId, string IsOut, List<string> contractNoList, List<string> professionalList, List<string> workPostIds, List<string> machineIds, string compileDate)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var pros = BLL.PHTGL_QuantityService.GetMajorItems();
List<string> proNames = new List<string>();
foreach (var item in professionalList)
{
var pro = pros.FirstOrDefault(x => x.Text == item);
if (pro != null)
{
proNames.Add(pro.Value);
}
}
IQueryable<Model.PHTGL_ContractTrack> getContractTracks = from x in db.PHTGL_ContractTrack
where x.ProjectId == projectId && contractNoList.Contains(x.ContractId) && proNames.Contains(x.MajorName)
orderby x.ProjectCode, x.ProjectName
select x;
DateTime date = Funs.GetNewDateTimeOrNow(compileDate);
var personLogIds = (from x in db.ZHGL_ConstructionLog
where x.ProjectId == projectId && x.CompileDate == date
orderby x.CompileDate descending
select x.ConstructionLogId).ToList();
IQueryable<Model.ZHGL_ConstructionLogWorkEfficiency> workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
where personLogIds.Contains(x.ConstructionLogId)
select x;
var unitWorks = (from x in getContractTracks
select new { MainItemCode = x.MainItemCode, MainItemName = x.MainItemName }).Distinct().ToList();
DataTable table = new DataTable();
table.Columns.Add(new DataColumn("Id", typeof(String)));
table.Columns.Add(new DataColumn("Code", typeof(String)));
table.Columns.Add(new DataColumn("ProjectCode", typeof(String)));
table.Columns.Add(new DataColumn("ProjectName", typeof(String)));
table.Columns.Add(new DataColumn("UnitOfMeasurement", typeof(String)));
table.Columns.Add(new DataColumn("PhysicalCompletionQuantity", typeof(String)));
table.Columns.Add(new DataColumn("MaterialConsumption", typeof(String)));
table.Columns.Add(new DataColumn("ShowId", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours0", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency0", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours1", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency1", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours2", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency2", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours3", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency3", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours4", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency4", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours5", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency5", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours6", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency6", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours7", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency7", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours8", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency8", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours9", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency9", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours10", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency10", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours11", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency11", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours12", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency12", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours13", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency13", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours14", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency14", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours15", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency15", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours16", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency16", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours17", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency17", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours18", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency18", typeof(String)));
table.Columns.Add(new DataColumn("PersonConsumeHours19", typeof(String)));
table.Columns.Add(new DataColumn("PersonWorkEfficiency19", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours0", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency0", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours1", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency1", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours2", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency2", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours3", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency3", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours4", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency4", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours5", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency5", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours6", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency6", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours7", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency7", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours8", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency8", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours9", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency9", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours10", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency10", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours11", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency11", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours12", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency12", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours13", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency13", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours14", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency14", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours15", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency15", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours16", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency16", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours17", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency17", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours18", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency18", typeof(String)));
table.Columns.Add(new DataColumn("MachineConsumeHours19", typeof(String)));
table.Columns.Add(new DataColumn("MachineWorkEfficiency19", typeof(String)));
DataRow row;
int a = 1;
foreach (var unitWork in unitWorks)
{
row = table.NewRow();
row[0] = unitWork.MainItemCode;
row[1] = a;
row[2] = string.Empty;
row[3] = unitWork.MainItemName;
table.Rows.Add(row);
int b = 1;
foreach (var proName in proNames)
{
row = table.NewRow();
row[0] = unitWork.MainItemCode + b.ToString();
row[1] = a + "." + b;
row[2] = string.Empty;
row[3] = proName;
table.Rows.Add(row);
int c = 1;
var contractTracks = getContractTracks.Where(x => x.MainItemCode == unitWork.MainItemCode && x.MajorName == proName);
foreach (Model.PHTGL_ContractTrack item in contractTracks)
{
row = table.NewRow();
row[0] = item.Id;
row[1] = a + "." + b + "." + c;
row[2] = item.ProjectCode;
row[3] = item.ProjectName;
row[4] = item.UnitOfMeasurement;
row[7] = item.Id;
if (workEfficiencys.Count() > 0)
{
var we = workEfficiencys.FirstOrDefault(x => x.ContractTrackId == item.Id);
if (we != null)
{
row[5] = we.PhysicalCompletionQuantity;
row[6] = we.MaterialConsumption;
}
for (int i = 0; i < workPostIds.Count; i++)
{
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
if (workEfficiencyList.Count() > 0)
{
decimal d = 0;
foreach (var workEfficiency in workEfficiencyList)
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
if (d > 0)
{
row[8 + i * 2] = decimal.Round(d, 2);
if (we.PhysicalCompletionQuantity != null && we.PhysicalCompletionQuantity > 0)
{
row[9 + i * 2] = decimal.Round(Convert.ToDecimal(we.PhysicalCompletionQuantity / d), 2);
}
}
}
}
for (int i = 0; i < machineIds.Count; i++)
{
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id);
if (workEfficiencyList.Count() > 0)
{
decimal d = 0;
foreach (var workEfficiency in workEfficiencyList)
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
if (d > 0)
{
row[48 + i * 2] = decimal.Round(d, 2);
if (we.PhysicalCompletionQuantity != null && we.PhysicalCompletionQuantity > 0)
{
row[49 + i * 2] = decimal.Round(Convert.ToDecimal(we.PhysicalCompletionQuantity / d), 2);
}
}
}
}
}
table.Rows.Add(row);
c++;
}
b++;
}
a++;
}
return table;
}
}
} }
public class PHTGL_ContractTrackDtoIn public class PHTGL_ContractTrackDtoIn
{ {
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+8
View File
@@ -1333,6 +1333,7 @@
<Content Include="PZHGL\InformationProject\PictureEdit.aspx" /> <Content Include="PZHGL\InformationProject\PictureEdit.aspx" />
<Content Include="PZHGL\InformationProject\PictureView.aspx" /> <Content Include="PZHGL\InformationProject\PictureView.aspx" />
<Content Include="PZHGL\InformationProject\ProjectConstructionLog.aspx" /> <Content Include="PZHGL\InformationProject\ProjectConstructionLog.aspx" />
<Content Include="PZHGL\InformationProject\ProjectConstructionLogWorkEfficiency.aspx" />
<Content Include="PZHGL\InformationProject\ReceiveFileManager.aspx" /> <Content Include="PZHGL\InformationProject\ReceiveFileManager.aspx" />
<Content Include="PZHGL\InformationProject\ReceiveFileManagerEdit.aspx" /> <Content Include="PZHGL\InformationProject\ReceiveFileManagerEdit.aspx" />
<Content Include="PZHGL\InformationProject\ReceiveFileManagerView.aspx" /> <Content Include="PZHGL\InformationProject\ReceiveFileManagerView.aspx" />
@@ -12897,6 +12898,13 @@
<Compile Include="PZHGL\InformationProject\ProjectConstructionLog.aspx.designer.cs"> <Compile Include="PZHGL\InformationProject\ProjectConstructionLog.aspx.designer.cs">
<DependentUpon>ProjectConstructionLog.aspx</DependentUpon> <DependentUpon>ProjectConstructionLog.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="PZHGL\InformationProject\ProjectConstructionLogWorkEfficiency.aspx.cs">
<DependentUpon>ProjectConstructionLogWorkEfficiency.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PZHGL\InformationProject\ProjectConstructionLogWorkEfficiency.aspx.designer.cs">
<DependentUpon>ProjectConstructionLogWorkEfficiency.aspx</DependentUpon>
</Compile>
<Compile Include="PZHGL\InformationProject\ReceiveFileManager.aspx.cs"> <Compile Include="PZHGL\InformationProject\ReceiveFileManager.aspx.cs">
<DependentUpon>ReceiveFileManager.aspx</DependentUpon> <DependentUpon>ReceiveFileManager.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx
+1 -1
View File
@@ -374,7 +374,7 @@
</f:MenuButton> </f:MenuButton>
</f:Menu> </f:Menu>
<f:Menu ID="Menu2" runat="server"> <f:Menu ID="Menu2" runat="server">
<f:MenuButton ID="btnMenuDelete2" OnClick="btnMenuDelete2_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuDelete2" OnClick="btnMenuDelete2_Click" EnablePostBack="true" Hidden="true"
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
Text="删除"> Text="删除">
</f:MenuButton> </f:MenuButton>
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs
+1
View File
@@ -677,6 +677,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
/// <param name="e"></param> /// <param name="e"></param>
protected void btnMenuDown_Click(object sender, EventArgs e) protected void btnMenuDown_Click(object sender, EventArgs e)
{ {
} }
#endregion #endregion
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx
+5 -3
View File
@@ -78,9 +78,11 @@
<f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" Readonly="true" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList> <f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" Readonly="true" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ColumnWidths="33% 67%"> <f:FormRow ColumnWidths="13% 20% 67%">
<Items> <Items>
<f:TextBox ID="txtState" Label="填报状态" runat="server" LabelAlign="Right" LabelWidth="120px" Readonly="true"></f:TextBox> <f:Label runat="server" Text="填报状态：" EncodeText="false" ShowRedStar="true" Label="附件：" CssStyle="padding-left:42px" Width="110px" CssClass="marginr" ShowLabel="false" ></f:Label>
<f:Button ID="btnWorkEfficiency" Text="未填报" ToolTip="填报工效数据" Icon="TableCell" OnClick="btnWorkEfficiency_Click" runat="server">
</f:Button>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelAlign="Right" Readonly="true" LabelWidth="120px"></f:TextBox> <f:TextBox ID="txtRemark" Label="备注" runat="server" LabelAlign="Right" Readonly="true" LabelWidth="120px"></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
@@ -306,7 +308,7 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="false" <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="false"
Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1300px" Height="680px"> Width="1300px" Height="650px">
</f:Window> </f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
+52 -2
View File
@@ -303,6 +303,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.txtCQMSTomorrowPlanRemark.Text = log.CQMSTomorrowPlanRemark; this.txtCQMSTomorrowPlanRemark.Text = log.CQMSTomorrowPlanRemark;
var persons = BLL.ConstructionLogPersonService.GetConstructionLogPersonsByConstructionLogId(ConstructionLogId); var persons = BLL.ConstructionLogPersonService.GetConstructionLogPersonsByConstructionLogId(ConstructionLogId);
List<string> unitWorkList = Funs.GetStrListByStr(log.UnitWorks, ','); List<string> unitWorkList = Funs.GetStrListByStr(log.UnitWorks, ',');
ChangeText();
List<Model.ConstructionLogPersonItem> personItems = new List<Model.ConstructionLogPersonItem>(); List<Model.ConstructionLogPersonItem> personItems = new List<Model.ConstructionLogPersonItem>();
if (persons.Count > 0) if (persons.Count > 0)
{ {
@@ -622,7 +623,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
} }
} }
} }
this.txtState.Text = string.Empty;
this.txtRemark.Text = string.Empty; this.txtRemark.Text = string.Empty;
this.txtHSETodaySummary.Text = string.Empty; this.txtHSETodaySummary.Text = string.Empty;
this.txtHSETodaySummaryRemark.Text = string.Empty; this.txtHSETodaySummaryRemark.Text = string.Empty;
@@ -657,7 +657,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.drpContractNo.SelectedIndex = 0; this.drpContractNo.SelectedIndex = 0;
this.drpUnitWork.SelectedIndex = 0; this.drpUnitWork.SelectedIndex = 0;
this.drpProfessional.SelectedIndex = 0; this.drpProfessional.SelectedIndex = 0;
this.txtState.Text = string.Empty;
this.txtRemark.Text = string.Empty; this.txtRemark.Text = string.Empty;
this.txtHSETodaySummary.Text = string.Empty; this.txtHSETodaySummary.Text = string.Empty;
this.txtHSETodaySummaryRemark.Text = string.Empty; this.txtHSETodaySummaryRemark.Text = string.Empty;
@@ -926,7 +925,22 @@ namespace FineUIPro.Web.PZHGL.InformationProject
/// <param name="e"></param> /// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e) protected void Window1_Close(object sender, WindowCloseEventArgs e)
{ {
ChangeText();
}
private void ChangeText()
{
var workEfficiencys = from x in Funs.DB.ZHGL_ConstructionLogWorkEfficiency
where x.ConstructionLogId == this.tvControlItem.SelectedNodeID
select x;
if (workEfficiencys.Count() > 0)
{
this.btnWorkEfficiency.Text = "已填报";
}
else
{
this.btnWorkEfficiency.Text = "未填报";
}
} }
#endregion #endregion
@@ -1249,5 +1263,41 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{ {
TextNew(); TextNew();
} }
protected void btnWorkEfficiency_Click(object sender, EventArgs e)
{
string contractNo = string.Empty;
foreach (var item in this.drpContractNo.SelectedValueArray)
{
if (item != BLL.Const._Null)
{
contractNo += item + ",";
}
}
if (!string.IsNullOrEmpty(contractNo))
{
contractNo = contractNo.Substring(0, contractNo.Length - 1);
}
string professional = string.Empty;
foreach (var item in this.drpProfessional.SelectedValueArray)
{
if (item != BLL.Const._Null)
{
professional += item + ",";
}
}
if (!string.IsNullOrEmpty(professional))
{
professional = professional.Substring(0, professional.Length - 1);
}
if (!string.IsNullOrEmpty(contractNo) && !string.IsNullOrEmpty(professional))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConstructionLogWorkEfficiency.aspx?ConstructionLogId={0}&contractNo={1}&professional={2}&WorkPostId={3}&MachineId={4}&View=View", this.ConstructionLogId, contractNo, professional, hdWorkPostId.Text, hdMachineId.Text, "导入 - ")));
}
else
{
Alert.ShowInTop("请选择合同编号和专业工程！", MessageBoxIcon.Warning);
}
}
} }
} }
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.designer.cs
Generated
+2 -2
View File
@@ -229,13 +229,13 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
protected global::FineUIPro.DropDownList drpProfessional; protected global::FineUIPro.DropDownList drpProfessional;
/// <summary> /// <summary>
/// txtState 控件。 /// btnWorkEfficiency 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtState; protected global::FineUIPro.Button btnWorkEfficiency;
/// <summary> /// <summary>
/// txtRemark 控件。 /// txtRemark 控件。
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs
+4
View File
@@ -126,6 +126,10 @@ namespace FineUIPro.Web.PZHGL.InformationProject
string contractNo = Request.Params["contractNo"]; string contractNo = Request.Params["contractNo"];
string professional = Request.Params["professional"]; string professional = Request.Params["professional"];
string constructionLogId = Request.Params["ConstructionLogId"]; string constructionLogId = Request.Params["ConstructionLogId"];
if (!string.IsNullOrEmpty(Request.Params["View"]))
{
this.btnSave.Hidden = true;
}
List<string> contractNoList = Funs.GetStrListByStr(contractNo, ','); List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
List<string> professionalList = Funs.GetStrListByStr(professional, ','); List<string> professionalList = Funs.GetStrListByStr(professional, ',');
List<string> workPostIds = Funs.GetStrListByStr(Request.Params["WorkPostId"], ','); List<string> workPostIds = Funs.GetStrListByStr(Request.Params["WorkPostId"], ',');
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx
+5 -3
View File
@@ -80,9 +80,11 @@
<f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" EnableEdit="true" Readonly="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList> <f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" EnableEdit="true" Readonly="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ColumnWidths="33% 67%"> <f:FormRow ColumnWidths="13% 20% 67%">
<Items> <Items>
<f:TextBox ID="txtState" Label="填报状态" runat="server" LabelAlign="Right" LabelWidth="120px" Readonly="true"></f:TextBox> <f:Label runat="server" Text="填报状态：" EncodeText="false" ShowRedStar="true" Label="附件：" CssStyle="padding-left:42px" Width="110px" CssClass="marginr" ShowLabel="false" ></f:Label>
<f:Button ID="btnWorkEfficiency" Text="未填报" ToolTip="填报工效数据" Icon="TableCell" OnClick="btnWorkEfficiency_Click" runat="server">
</f:Button>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelAlign="Right" LabelWidth="120px"></f:TextBox> <f:TextBox ID="txtRemark" Label="备注" runat="server" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
@@ -384,7 +386,7 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="false" <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="false"
Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1300px" Height="680px"> Width="1300px" Height="650px">
</f:Window> </f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
+73 -4
View File
@@ -69,7 +69,9 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.hdWorkPostId.Text = workPostId; this.hdWorkPostId.Text = workPostId;
this.hdMachineId.Text = machineId; this.hdMachineId.Text = machineId;
List<string> list = Funs.GetStrListByStr(this.hdWorkPostId.Text, ','); List<string> list = Funs.GetStrListByStr(this.hdWorkPostId.Text, ',');
list.Distinct(); list = list.Distinct().ToList();
workPostId = Funs.GetStrListByList(list);
this.hdWorkPostId.Text = workPostId;
for (int i = 0; i < list.Count; i++) for (int i = 0; i < list.Count; i++)
{ {
RenderField rdPlan = new RenderField(); RenderField rdPlan = new RenderField();
@@ -86,7 +88,9 @@ namespace FineUIPro.Web.PZHGL.InformationProject
Grid1.Columns.Add(rdPlan); Grid1.Columns.Add(rdPlan);
} }
List<string> list2 = Funs.GetStrListByStr(this.hdMachineId.Text, ','); List<string> list2 = Funs.GetStrListByStr(this.hdMachineId.Text, ',');
list2.Distinct(); list2 = list2.Distinct().ToList();
machineId = Funs.GetStrListByList(list2);
this.hdMachineId.Text = machineId;
for (int i = 0; i < list2.Count; i++) for (int i = 0; i < list2.Count; i++)
{ {
RenderField rdPlan = new RenderField(); RenderField rdPlan = new RenderField();
@@ -461,7 +465,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
} }
} }
} }
this.txtState.Text = string.Empty;
this.txtRemark.Text = string.Empty; this.txtRemark.Text = string.Empty;
this.Grid1.DataSource = null; this.Grid1.DataSource = null;
this.Grid1.DataBind(); this.Grid1.DataBind();
@@ -474,6 +477,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.Grid5.DataSource = null; this.Grid5.DataSource = null;
this.Grid5.DataBind(); this.Grid5.DataBind();
drpUnitWork_SelectedIndexChanged(null, null); drpUnitWork_SelectedIndexChanged(null, null);
ChangeText();
} }
private void TextEmpty() private void TextEmpty()
@@ -488,7 +492,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
this.drpContractNo.SelectedIndex = 0; this.drpContractNo.SelectedIndex = 0;
this.drpUnitWork.SelectedIndex = 0; this.drpUnitWork.SelectedIndex = 0;
this.drpProfessional.SelectedIndex = 0; this.drpProfessional.SelectedIndex = 0;
this.txtState.Text = string.Empty;
this.txtRemark.Text = string.Empty; this.txtRemark.Text = string.Empty;
this.Grid1.DataSource = null; this.Grid1.DataSource = null;
this.Grid1.DataBind(); this.Grid1.DataBind();
@@ -669,7 +672,32 @@ namespace FineUIPro.Web.PZHGL.InformationProject
/// <param name="e"></param> /// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e) protected void Window1_Close(object sender, WindowCloseEventArgs e)
{ {
ChangeText();
}
private void ChangeText()
{
DateTime today = DateTime.Now.Date;
if (!string.IsNullOrEmpty(this.txtCompileDate.Text.Trim()))
{
today = Convert.ToDateTime(this.txtCompileDate.Text.Trim()).Date;
}
var personLogIds = (from x in Funs.DB.ZHGL_ConstructionLog
where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileDate == today
orderby x.CompileDate descending
select x.ConstructionLogId).ToList();
var workEfficiencys = from x in Funs.DB.ZHGL_ConstructionLogWorkEfficiency
where personLogIds.Contains(x.ConstructionLogId)
select x;
if (workEfficiencys.Count() > 0)
{
this.btnWorkEfficiency.Text = "已填报";
}
else
{
this.btnWorkEfficiency.Text = "未填报";
}
} }
#endregion #endregion
@@ -1205,5 +1233,46 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{ {
TextNew(); TextNew();
} }
protected void btnWorkEfficiency_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.txtCompileDate.Text.Trim()))
{
Alert.ShowInTop("请选择日期！", MessageBoxIcon.Warning);
return;
}
string contractNo = string.Empty;
foreach (var item in this.drpContractNo.SelectedValueArray)
{
if (item != BLL.Const._Null)
{
contractNo += item + ",";
}
}
if (!string.IsNullOrEmpty(contractNo))
{
contractNo = contractNo.Substring(0, contractNo.Length - 1);
}
string professional = string.Empty;
foreach (var item in this.drpProfessional.SelectedValueArray)
{
if (item != BLL.Const._Null)
{
professional += item + ",";
}
}
if (!string.IsNullOrEmpty(professional))
{
professional = professional.Substring(0, professional.Length - 1);
}
if (!string.IsNullOrEmpty(contractNo) && !string.IsNullOrEmpty(professional))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectConstructionLogWorkEfficiency.aspx?CompileDate={0}&contractNo={1}&professional={2}&WorkPostId={3}&MachineId={4}", this.txtCompileDate.Text.Trim(), contractNo, professional, hdWorkPostId.Text, hdMachineId.Text, "导入 - ")));
}
else
{
Alert.ShowInTop("请选择合同编号和专业工程！", MessageBoxIcon.Warning);
}
}
} }
} }
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs
Generated
+2 -2
View File
@@ -238,13 +238,13 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
protected global::FineUIPro.DropDownList drpProfessional; protected global::FineUIPro.DropDownList drpProfessional;
/// <summary> /// <summary>
/// txtState 控件。 /// btnWorkEfficiency 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtState; protected global::FineUIPro.Button btnWorkEfficiency;
/// <summary> /// <summary>
/// txtRemark 控件。 /// txtRemark 控件。
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx
+79
View File
@@ -0,0 +1,79 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectConstructionLogWorkEfficiency.aspx.cs" Inherits="FineUIPro.Web.PZHGL.InformationProject.ProjectConstructionLogWorkEfficiency" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>工效录入</title>
<style type="text/css">
.f-grid-row.noEdit {
pointer-events: none;
}
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工效情况" BoxFlex="1" AllowColumnLocking="true"
runat="server" EnableCollapse="true" DataKeyNames="Id,ProjectName,ShowId" EnableTree="true" EnableColumnLines="true" ClicksToEdit="1" AllowCellEditing="true"
DataIDField="Id">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="60px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" EnableLock="true" Locked="true"
FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" EnableLock="true" Locked="true"
FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement" EnableLock="true" Locked="true"
FieldType="String" HeaderText="单位" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="PhysicalCompletionQuantity" DataField="PhysicalCompletionQuantity" FieldType="Double" EnableLock="true" Locked="true"
HeaderText="实物完成量" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialConsumption" DataField="MaterialConsumption" FieldType="Double" EnableLock="true" Locked="true"
HeaderText="材料消耗量（净量+损耗量）" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
</form>
<script type="text/javascript">
var hdIdClientID = '<%= hdId.ClientID %>';
function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId;
if (columnId.indexOf('ConsumeHours') != -1) {
var physicalCompletionQuantity = me.getCellValue(rowId, 'PhysicalCompletionQuantity');
var hours = me.getCellValue(rowId, columnId);
var workEfficiencyId = columnId.replace('ConsumeHours', 'WorkEfficiency');
if (physicalCompletionQuantity.toString() != "" && hours.toString() != "") {
me.updateCellValue(rowId, workEfficiencyId, (physicalCompletionQuantity / hours).toFixed(2));
}
}
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx.cs
+160
View File
@@ -0,0 +1,160 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.PZHGL.InformationProject
{
public partial class ProjectConstructionLogWorkEfficiency : PageBase
{
#region 定义变量
/// <summary>
/// 列数量
/// </summary>
public int ColumnNum
{
get
{
return (int)ViewState["ColumnNum"];
}
set
{
ViewState["ColumnNum"] = value;
}
}
#endregion
/// <summary>
/// 加载表头
/// </summary>
protected void Page_Init(object sender, EventArgs e)
{
InitGrid();
}
#region 表头
/// <summary>
/// 表头
/// </summary>
private void InitGrid()
{
ColumnNum = 0;
List<string> workPostIds = Funs.GetStrListByStr(Request.Params["WorkPostId"], ',');
List<string> machineIds = Funs.GetStrListByStr(Request.Params["MachineId"], ',');
GroupField gf1 = new GroupField();
gf1.ColumnID = "Person";
gf1.HeaderText = "人工消耗（工·h）";
gf1.HeaderTextAlign = TextAlign.Center;
for (int i = 0; i < workPostIds.Count; i++)
{
GroupField gf = new GroupField();
gf.ColumnID = "Person" + i.ToString();
gf.HeaderText = BLL.WorkPostService.getWorkPostNameById(workPostIds[i]);
gf.HeaderTextAlign = TextAlign.Center;
RenderField rd1 = new RenderField();
rd1.ColumnID = "PersonConsumeHours" + i.ToString();
rd1.Width = Unit.Pixel(100);
rd1.DataField = "PersonConsumeHours" + i.ToString();
rd1.FieldType = FieldType.Double;
rd1.HeaderText = "消耗工时";
rd1.HeaderTextAlign = TextAlign.Center;
gf.Columns.Add(rd1);
RenderField rd2 = new RenderField();
rd2.ColumnID = "PersonWorkEfficiency" + i.ToString();
rd2.Width = Unit.Pixel(100);
rd2.DataField = "PersonWorkEfficiency" + i.ToString();
rd2.FieldType = FieldType.Double;
rd2.HeaderText = "工效";
rd2.HeaderTextAlign = TextAlign.Center;
gf.Columns.Add(rd2);
gf1.Columns.Add(gf);
}
Grid1.Columns.Add(gf1);
GroupField gf2 = new GroupField();
gf2.ColumnID = "Machine";
gf2.HeaderText = "机械消耗（台·h）";
gf2.HeaderTextAlign = TextAlign.Center;
for (int i = 0; i < machineIds.Count; i++)
{
GroupField gf = new GroupField();
gf.ColumnID = "Machine" + i.ToString();
gf.HeaderText = BLL.SpecialEquipmentService.GetSpecialEquipmentNameById(machineIds[i]);
gf.HeaderTextAlign = TextAlign.Center;
RenderField rd1 = new RenderField();
rd1.ColumnID = "MachineConsumeHours" + i.ToString();
rd1.Width = Unit.Pixel(100);
rd1.DataField = "MachineConsumeHours" + i.ToString();
rd1.FieldType = FieldType.Double;
rd1.HeaderText = "消耗台时";
rd1.HeaderTextAlign = TextAlign.Center;
gf.Columns.Add(rd1);
RenderField rd2 = new RenderField();
rd2.ColumnID = "MachineWorkEfficiency" + i.ToString();
rd2.Width = Unit.Pixel(100);
rd2.DataField = "MachineWorkEfficiency" + i.ToString();
rd2.FieldType = FieldType.Double;
rd2.HeaderText = "工效";
rd2.HeaderTextAlign = TextAlign.Center;
gf.Columns.Add(rd2);
gf2.Columns.Add(gf);
}
Grid1.Columns.Add(gf2);
}
#endregion
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
string contractNo = Request.Params["contractNo"];
string professional = Request.Params["professional"];
string compileDate = Request.Params["CompileDate"];
List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
List<string> professionalList = Funs.GetStrListByStr(professional, ',');
List<string> workPostIds = Funs.GetStrListByStr(Request.Params["WorkPostId"], ',');
List<string> machineIds = Funs.GetStrListByStr(Request.Params["MachineId"], ',');
DataTable table = BLL.PhtglContractTrackService.GetProjectAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, contractNoList, professionalList, workPostIds, machineIds, compileDate);
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < this.Grid1.Rows.Count; i++)
{
if (string.IsNullOrEmpty(this.Grid1.Rows[i].DataKeys[2].ToString()))
{
foreach (GridColumn column in Grid1.Columns)
{
if (column.ColumnIndex != 0 && column.ColumnIndex != 1 && column.ColumnIndex != 2)
{
if (column.ColumnIndex > 5)
{
GroupField gf1 = column as GroupField;
foreach (var column1 in gf1.Columns)
{
GroupField gf2 = column1 as GroupField;
foreach (var column2 in gf2.Columns)
{
this.Grid1.Rows[i].CellCssClasses[column2.ColumnIndex] = "f-grid-cell-uneditable";
}
}
}
else
{
this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable";
}
}
}
}
}
}
}
#endregion
}
}
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx.designer.cs
Generated
+69
View File
@@ -0,0 +1,69 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.PZHGL.InformationProject {
public partial class ProjectConstructionLogWorkEfficiency {
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// hdId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdId;
}
}