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

合并

Browse Source
This commit is contained in:
李鹏飞
2025-10-24 10:11:15 +08:00
parent c23d113eae 8c85a5f15e
commit 3866641217
20 changed files with 907 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
+1 -1
View File
@@ -793,7 +793,7 @@ namespace FineUIPro.Web.CQMS.WBS
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum,case CheckAcceptType when '1' then '关键工序验收' when '2' then '特殊过程验收' when '3' then '隐蔽工程验收' when '4' then '单位工程一次验收' when '5' then '材料进场复验' else '' end as CheckAcceptType "
string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum,case CheckAcceptType when '1' then '关键工序验收' when '2' then '特殊过程验收' when '3' then '隐蔽工程验收' when '4' then '单位工程验收' when '5' then '分部工程验收' when '6' then '分项工程验收' else '' end as CheckAcceptType "
+ @" FROM WBS_ControlItemAndCycle ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " where WorkPackageId = @WorkPackageId and IsApprove=1 ";
SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx
+35 -18
View File
@@ -50,7 +50,7 @@
EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="UnitWorkId,FlowingSection" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField=""
AllowSorting="true" SortField="UnitWorkName,FlowingSection" SortDirection="ASC"
AllowPaging="true" IsDatabasePaging="true" PageSize="15"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnSort="Grid2_Sort" OnPageIndexChange="Grid2_PageIndexChange"
EnableTextSelection="True" Height="300px" OnRowDataBound="Grid2_RowDataBound">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
@@ -75,26 +75,46 @@
DataField="PlanEndDate" SortField="PlanEndDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="总天数" ColumnID="TotalDays"
<%--<f:RenderField HeaderText="总天数" ColumnID="TotalDays"
DataField="TotalDays" FieldType="Int" HeaderTextAlign="Center" TextAlign="Left"
Width="90px">
</f:RenderField>
<f:RenderField HeaderText="剩余天数" ColumnID="RemainingDays"
</f:RenderField>--%>
<f:TemplateField HeaderText="有效总天数" HeaderTextAlign="Center" TextAlign="Center" ColumnID="TotalDays" Width="110px">
<ItemTemplate>
<asp:Label ID="lblTotalDay" runat="server" Text='<%# getTotalDays(Eval("ProjectId").ToString(),Eval("UnitWorkId").ToString(),Eval("FlowingSection").ToString()) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:RenderField HeaderText="剩余天数" ColumnID="RemainingDays"
DataField="RemainingDays" FieldType="Int" HeaderTextAlign="Center" TextAlign="Left"
Width="90px">
</f:RenderField>
<f:RenderField HeaderText="平均每日应完成工作量" ColumnID="AvgDayCompleteDia"
</f:RenderField>--%>
<f:TemplateField HeaderText="剩余天数" HeaderTextAlign="Center" TextAlign="Center" ColumnID="RemainingDays" Width="90px">
<ItemTemplate>
<asp:Label ID="lblRemainingDays" runat="server" Text='<%# getRemainingDays(Eval("ProjectId").ToString(),Eval("UnitWorkId").ToString(),Eval("FlowingSection").ToString()) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:RenderField HeaderText="平均每日应完成工作量" ColumnID="AvgDayCompleteDia"
DataField="AvgDayCompleteDia" SortField="AvgDayCompleteDia" FieldType="Float" HeaderTextAlign="Center" TextAlign="Left"
Width="180px">
</f:RenderField>
</f:RenderField>--%>
<f:TemplateField HeaderText="平均每日应完成工作量" HeaderTextAlign="Center" TextAlign="Center" ColumnID="AvgDayCompleteDia" Width="180px">
<ItemTemplate>
<asp:Label ID="lblAvgDayCompleteDia" runat="server" Text='<%# getAvgDayCompleteDia(Eval("ProjectId").ToString(),Eval("UnitWorkId").ToString(),Eval("FlowingSection").ToString()) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="当日完成工作量" ColumnID="CurrentDayCompletedDia"
DataField="CurrentDayCompletedDia" SortField="CurrentDayCompletedDia" FieldType="Float" HeaderTextAlign="Center" TextAlign="Left"
Width="140px">
</f:RenderField>
<f:RenderField HeaderText="次日应完成量(平均)" ColumnID="NextDayComplete"
<%--<f:RenderField HeaderText="次日应完成量(平均)" ColumnID="NextDayComplete"
DataField="NextDayComplete" SortField="NextDayComplete" FieldType="Float" HeaderTextAlign="Center" TextAlign="Left"
Width="150px">
</f:RenderField>
</f:RenderField>--%>
<f:TemplateField HeaderText="次日应完成量(平均)" HeaderTextAlign="Center" TextAlign="Center" ColumnID="NextDayComplete" Width="150px">
<ItemTemplate>
<asp:Label ID="lblNextDayComplete" runat="server" Text='<%# getNextDayComplete(Eval("ProjectId").ToString(),Eval("UnitWorkId").ToString(),Eval("FlowingSection").ToString()) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="累计已完成量" ColumnID="totalCompletedDia"
DataField="totalCompletedDia" SortField="totalCompletedDia" FieldType="Float" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
@@ -107,8 +127,8 @@
DataField="WelderCount" FieldType="Int" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="预警焊工数量" ColumnID="WarningWelderCount"
DataField="WarningWelderCount" FieldType="Int" HeaderTextAlign="Center" TextAlign="Left"
<f:RenderField HeaderText="焊工日功效" ColumnID="WarningWelderCount"
DataField="WarningWelderCount" FieldType="Float" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
</f:RenderField>
</Columns>
@@ -135,8 +155,8 @@
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="ProductionSchedulingPlanId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="ProductionSchedulingPlanId"
AllowSorting="true" SortField="FlowNum,Material,Caliber" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" OnRowDataBound="Grid1_RowDataBound" >
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" OnRowDataBound="Grid1_RowDataBound">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
@@ -304,12 +324,12 @@
const daysDifference = timeDifference / (1000 * 60 * 60 * 24);
//平均每日应完成量=达因数/天数
const avgDailyWorkload = dain / (daysDifference + 1);
const currentTime = Math.abs(endDate - Date.now());//获取剩余天数（毫秒）
const daysTime = Math.ceil(currentTime / (1000 * 60 * 60 * 24));//将时间差转换为天数
if (daysTime > 0) {
//次日应完成量=剩余工程量(达因数-累计已完成量)/剩余天数（结束时间-当前时间）
//次日应完成量=剩余工程量(达因数-累计已完成量)/剩余天数（结束时间-当前时间）
var nextDayCompleteDyne = (dain - completedCount) / daysTime;
}
@@ -317,9 +337,6 @@
me.updateCellValue(rowId, 'AvgDailyWorkload', avgDailyWorkload.toFixed(2));//平均每天工作量
me.updateCellValue(rowId, 'NextDayCompleteDyne', nextDayCompleteDyne.toFixed(2));//次日应完成量
}
}
</script>
</body>
SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs
+340 -29
View File
@@ -7,6 +7,7 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.HJGL.PreDesign
{
@@ -199,7 +200,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
e.Node.Nodes.Clear();
BindNodes(e.Node);
}
}
#endregion
@@ -211,6 +211,153 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// <param name="e"></param>
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
#region 实时统计生产看板数据
string projectId = this.CurrUser.LoginProjectId;
string steelType = string.Empty;//材质id
//统计生产看板当日已完成量、次日应完成量、累计已完成量、已完成百分比、已完成百分比汇总
if (tvControlItem.SelectedNode.CommandName == "流水段")//点击流水段
{
var planLists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, tvControlItem.SelectedNode.Text, tvControlItem.SelectedNode.ParentNode.NodeID);
if (planLists.Count > 0)
{
foreach (var item in planLists)
{
var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanById(item.ProductionSchedulingPlanId);
if (plan != null)
{
if (plan.Material == "碳钢")
{
steelType = "1";
}
else if (plan.Material == "不锈钢")
{
steelType = "2";
}
else if (plan.Material == "铬钼钢")
{
steelType = "3";
}
else if (plan.Material == "低合金钢")
{
steelType = "4";
}
else if (plan.Material == "镍合金钢")
{
steelType = "5";
}
else if (plan.Material == "钛合金钢")
{
steelType = "6";
}
else if (plan.Material == "其他")
{
steelType = "7";
}
//当日已完成量
var currentDay = BLL.WeldJointService.GetCurrentDaySizeSum(projectId, plan.PipelineId, plan.FlowNum, steelType, plan.Caliber);
if (currentDay != null)
{
plan.OnDayCompleteDyne = currentDay;
}
else
{
plan.OnDayCompleteDyne = 0;
}
plan.CompletedCount = BLL.WeldJointService.GetSizeSum(projectId, plan.PipelineId, plan.FlowNum, steelType, plan.Caliber, "2");//累计已完成量
if (plan.Dain > 0)
{
plan.CompletedRate = (plan.CompletedCount / plan.Dain) * 100;//已完成百分比
}
else
{
plan.CompletedRate = 0;
}
if (plan.PriorityTotalDyne > 0)
{
decimal? completeDinSum = BLL.WeldJointService.GetSizeSumByUnitWorkIdAndFlowingSection(projectId, plan.PipelineId, plan.FlowNum, "2");//完成总达因
plan.TotalCompletedRate = (completeDinSum / plan.PriorityTotalDyne) * 100;//已完成百分比汇总
}
else
{
plan.TotalCompletedRate = 0;
}
BLL.ProductionSchedulingPlanService.UpdateProductionSchedulingPlan(plan);
}
}
}
}
else if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2)//点击单位工程
{
var planLists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByUnitWorkId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.NodeID);
if (planLists.Count > 0)
{
foreach (var item in planLists)
{
var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanById(item.ProductionSchedulingPlanId);
if (plan != null)
{
if (plan.Material == "碳钢")
{
steelType = "1";
}
else if (plan.Material == "不锈钢")
{
steelType = "2";
}
else if (plan.Material == "铬钼钢")
{
steelType = "3";
}
else if (plan.Material == "低合金钢")
{
steelType = "4";
}
else if (plan.Material == "镍合金钢")
{
steelType = "5";
}
else if (plan.Material == "钛合金钢")
{
steelType = "6";
}
else if (plan.Material == "其他")
{
steelType = "7";
}
//当日已完成量
var currentDay = BLL.WeldJointService.GetCurrentDaySizeSum(projectId, plan.PipelineId, plan.FlowNum, steelType, plan.Caliber);
if (currentDay != null)
{
plan.OnDayCompleteDyne = currentDay;
}
else
{
plan.OnDayCompleteDyne = 0;
}
plan.CompletedCount = BLL.WeldJointService.GetSizeSum(projectId, plan.PipelineId, plan.FlowNum, steelType, plan.Caliber, "2");//累计已完成量
if (plan.Dain > 0)
{
plan.CompletedRate = (plan.CompletedCount / plan.Dain) * 100;//已完成百分比
}
else
{
plan.CompletedRate = 0;
}
if (plan.PriorityTotalDyne > 0)
{
decimal? completeDinSum = BLL.WeldJointService.GetSizeSumByUnitWorkIdAndFlowingSection(projectId, plan.PipelineId, plan.FlowNum, "2");//完成总达因
plan.TotalCompletedRate = (completeDinSum / plan.PriorityTotalDyne) * 100;//已完成百分比汇总
}
else
{
plan.TotalCompletedRate = 0;
}
BLL.ProductionSchedulingPlanService.UpdateProductionSchedulingPlan(plan);
}
}
}
}
#endregion
this.BindGrid();
}
@@ -597,34 +744,22 @@ namespace FineUIPro.Web.HJGL.PreDesign
var newPlan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanById(rowId);
if (newPlan != null)
{
if (!string.IsNullOrEmpty(values.Value<string>("TotalPriority")))
{
newPlan.TotalPriority = values.Value<string>("TotalPriority");
}
else
if (!string.IsNullOrEmpty(totalPriority))
{
newPlan.TotalPriority = totalPriority;
totalPriority = string.Empty;
}
else
{
newPlan.TotalPriority = values.Value<string>("TotalPriority");
totalPriority = newPlan.TotalPriority;
}
newPlan.PlanStartDate = Funs.GetNewDateTime(values.Value<string>("PlanStartDate"));
newPlan.PlanEndDate = Funs.GetNewDateTime(values.Value<string>("PlanEndDate"));
newPlan.Days = Funs.GetNewInt(values.Value<string>("Days"));
newPlan.AvgDailyWorkload = Funs.GetNewDecimal(values.Value<string>("AvgDailyWorkload"));
newPlan.NextDayCompleteDyne = Funs.GetNewDecimal(values.Value<string>("NextDayCompleteDyne"));
BLL.ProductionSchedulingPlanService.UpdateProductionSchedulingPlan(newPlan);
//更新合并单元格的总达因（按材质）优先级
if (!string.IsNullOrEmpty(newPlan.TotalPriority))
{
var pLists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByMaterialLists(this.CurrUser.LoginProjectId, newPlan.FlowNum, newPlan.PipelineId, newPlan.Material);
foreach (var item in pLists)
{
if (string.IsNullOrEmpty(item.TotalPriority))
{
totalPriority = newPlan.TotalPriority;
}
}
}
}
}
ShowNotify("保存成功！", MessageBoxIcon.Success);
@@ -932,16 +1067,24 @@ namespace FineUIPro.Web.HJGL.PreDesign
#region 生产看板
protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
{
Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
this.BindGrid2();
}
protected void Grid2_Sort(object sender, GridSortEventArgs e)
{
this.BindGrid2();
}
protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
{
this.BindGrid2();
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid2()
{
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
@@ -961,17 +1104,22 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// <param name="e"></param>
protected void Grid2_RowDataBound(object sender, GridRowEventArgs e)
{
DataRowView row = e.DataItem as DataRowView;
//DataRowView row = e.DataItem as DataRowView;
double avgDailyWorkload = 0;
double nextDayCompleteDyne = 0;
if (row["AvgDayCompleteDia"] != null && !string.IsNullOrEmpty(row["AvgDayCompleteDia"].ToString()))
{
avgDailyWorkload = Convert.ToDouble(row["AvgDayCompleteDia"]);//平均每日应完成工作量
}
if (row["NextDayComplete"] != null && !string.IsNullOrEmpty(row["NextDayComplete"].ToString()))
{
nextDayCompleteDyne = Convert.ToDouble(row["NextDayComplete"]);//次日应完成量
}
//if (row["AvgDayCompleteDia"] != null && !string.IsNullOrEmpty(row["AvgDayCompleteDia"].ToString()))
//{
// avgDailyWorkload = Convert.ToDouble(row["AvgDayCompleteDia"]);//平均每日应完成工作量
//}
//if (row["NextDayComplete"] != null && !string.IsNullOrEmpty(row["NextDayComplete"].ToString()))
//{
// nextDayCompleteDyne = Convert.ToDouble(row["NextDayComplete"]);//次日应完成量
//}
//avgDailyWorkload=(e.RowID["lblAvgDayCompleteDia") as AspNet.Label).Text
avgDailyWorkload = Convert.ToDouble((e.Row.FindControl("lblAvgDayCompleteDia") as AspNet.Label).Text);//平均每日应完成工作量
nextDayCompleteDyne = Convert.ToDouble((e.Row.FindControl("lblNextDayComplete") as AspNet.Label).Text); //次日应完成量(平均)
if (avgDailyWorkload < nextDayCompleteDyne)
{
e.RowCssClass = "color1";
@@ -979,5 +1127,168 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
#endregion
#region 格式化字符串
/// <summary>
/// 获取有效总天数
/// </summary>
/// <param name="projectId"></param>
/// <param name="unitWorkId"></param>
/// <param name="flowNum"></param>
/// <returns></returns>
public static int getTotalDays(string projectId, string unitWorkId, string flowNum)
{
var lists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, flowNum, unitWorkId);
List<(DateTime, DateTime)> combinedList = new List<(DateTime, DateTime)>();
foreach (var item in lists)
{
if (item.PlanStartDate.HasValue && item.PlanEndDate.HasValue)
{
var dateRanges = new List<(DateTime, DateTime)>
{
(new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)),
};
combinedList.AddRange(dateRanges);
}
}
return GetEffectiveDaysLinq(combinedList);
}
/// <summary>
/// 获取剩余天数
/// </summary>
/// <param name="projectId"></param>
/// <param name="unitWorkId"></param>
/// <param name="flowNum"></param>
/// <returns></returns>
public static int getRemainingDays(string projectId, string unitWorkId, string flowNum)
{
var lists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, flowNum, unitWorkId);
List<(DateTime, DateTime)> combinedList = new List<(DateTime, DateTime)>();
foreach (var item in lists)
{
if (item.PlanStartDate.HasValue && item.PlanEndDate.HasValue)
{
if (item.PlanEndDate > DateTime.Now)
{
var dateRanges = new List<(DateTime, DateTime)>
{
(new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)),
};
combinedList.AddRange(dateRanges);
}
}
}
return GetEffectiveDaysLinq(combinedList);
}
/// <summary>
/// 获取平均每日应完成工作量
/// </summary>
/// <param name="projectId"></param>
/// <param name="unitWorkId"></param>
/// <param name="flowNum"></param>
/// <returns></returns>
public static double getAvgDayCompleteDia(string projectId, string unitWorkId, string flowNum)
{
double AvgDayCompleteDia = 0;
int totalDays = 0;
var lists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, flowNum, unitWorkId);
List<(DateTime, DateTime)> combinedList = new List<(DateTime, DateTime)>();
foreach (var item in lists)
{
if (item.PlanStartDate.HasValue && item.PlanEndDate.HasValue)
{
var dateRanges = new List<(DateTime, DateTime)>
{
(new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)),
};
combinedList.AddRange(dateRanges);
}
}
totalDays = GetEffectiveDaysLinq(combinedList);
///总达因
decimal? dia = (from x in Funs.DB.HJGL_WeldJoint
join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
where x.ProjectId == projectId && y.UnitWorkId == unitWorkId && y.FlowingSection == flowNum
&& x.JointAttribute == "预制口"
select x.Size).Sum();
if (totalDays > 0)
{
//平均每日应完成工作量=总达因/有效总天数
AvgDayCompleteDia = Math.Round(Convert.ToDouble(dia / totalDays), 2);
}
return AvgDayCompleteDia;
}
/// <summary>
/// 获取次日应完成量（平均）
/// </summary>
/// <param name="projectId"></param>
/// <param name="unitWorkId"></param>
/// <param name="flowNum"></param>
/// <returns></returns>
public static double getNextDayComplete(string projectId, string unitWorkId, string flowNum)
{
double nextDayComplete = 0;
int remainingDays = 0;
var lists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, flowNum, unitWorkId);
List<(DateTime, DateTime)> combinedList = new List<(DateTime, DateTime)>();
foreach (var item in lists)
{
if (item.PlanStartDate.HasValue && item.PlanEndDate.HasValue)
{
if (item.PlanEndDate > DateTime.Now)
{
var dateRanges = new List<(DateTime, DateTime)>
{
(new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)),
};
combinedList.AddRange(dateRanges);
}
}
}
remainingDays = GetEffectiveDaysLinq(combinedList);
///总达因
decimal? totalDia = (from x in Funs.DB.HJGL_WeldJoint
join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
where x.ProjectId == projectId && y.UnitWorkId == unitWorkId && y.FlowingSection == flowNum
&& x.JointAttribute == "预制口"
select x.Size).Sum();
//完成达因
decimal? completedDia = (from x in Funs.DB.HJGL_WeldJoint
join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
where x.ProjectId == projectId && y.UnitWorkId == unitWorkId && y.FlowingSection == flowNum
&& x.JointAttribute == "预制口" && x.WeldingDailyId != null && x.WeldingDailyId != ""
select x.Size).Sum();
if (remainingDays > 0)
{
//次日应完成量（平均）=(总达因-完成达因)/剩余天数
nextDayComplete = Math.Round(Convert.ToDouble((totalDia - completedDia) / remainingDays), 2);
}
return nextDayComplete;
}
/// <summary>
/// 生成所有日期并去重
/// </summary>
/// <param name="dateRanges"></param>
/// <returns></returns>
public static int GetEffectiveDaysLinq(List<(DateTime start, DateTime end)> dateRanges)
{
if (dateRanges == null || !dateRanges.Any())
return 0;
// 生成所有日期并去重
var allDates = dateRanges
.SelectMany(range =>
Enumerable.Range(0, (range.end - range.start).Days + 1)
.Select(offset => range.start.AddDays(offset).Date))
.Distinct();
return allDates.Count();
}
#endregion
}
}
SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.designer.cs
Generated
+67 -33
View File
@@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.PreDesign
{
public partial class ProductionSchedulingPlan
{
namespace FineUIPro.Web.HJGL.PreDesign {
public partial class ProductionSchedulingPlan {
/// <summary>
/// form1 控件。
/// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// txtSize 控件。
/// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSize;
/// <summary>
/// btnStatics 控件。
/// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnStatics;
/// <summary>
/// hdUnitWorkId 控件。
/// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdUnitWorkId;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// panelCenterTop 控件。
/// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterTop;
/// <summary>
/// Grid2 控件。
/// </summary>
@@ -112,7 +110,43 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// lblTotalDay 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblTotalDay;
/// <summary>
/// lblRemainingDays 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblRemainingDays;
/// <summary>
/// lblAvgDayCompleteDia 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblAvgDayCompleteDia;
/// <summary>
/// lblNextDayComplete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNextDayComplete;
/// <summary>
/// ToolbarSeparator2 控件。
/// </summary>
@@ -121,7 +155,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
/// <summary>
/// ToolbarText2 控件。
/// </summary>
@@ -130,7 +164,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText2;
/// <summary>
/// ddlPageSize2 控件。
/// </summary>
@@ -139,7 +173,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize2;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -148,7 +182,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@@ -157,7 +191,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -166,7 +200,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -175,7 +209,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -184,7 +218,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// txtTotalPriority 控件。
/// </summary>
@@ -193,7 +227,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTotalPriority;
/// <summary>
/// txtPlanStartDate 控件。
/// </summary>
@@ -202,7 +236,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanStartDate;
/// <summary>
/// txtPlanEndDate 控件。
/// </summary>
@@ -211,7 +245,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanEndDate;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -220,7 +254,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -229,7 +263,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -238,7 +272,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -247,7 +281,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx
+8 -1
View File
@@ -618,13 +618,20 @@
</f:GroupField>
<f:GroupField ColumnID="Sp" HeaderText="特殊机具设备" TextAlign="Center" Width="110px" HeaderTextAlign="Center">
<Columns>
<f:RenderField Width="110px" ColumnID="S01" DataField="S01" FieldType="Int"
<f:RenderField Width="70px" ColumnID="S01" DataField="S01" FieldType="Int"
HeaderText="吊篮" HeaderTextAlign="Center">
<Editor>
<f:NumberBox NoDecimal="true" NoNegative="true" runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
<f:RenderField Width="140px" ColumnID="S02" DataField="S02" FieldType="Int"
HeaderText="高空作业升降平台" HeaderTextAlign="Center">
<Editor>
<f:NumberBox NoDecimal="true" NoNegative="true" runat="server">
</f:NumberBox>
</Editor>
</f:RenderField>
</Columns>
</f:GroupField>
<f:BoundField ColumnID="TotalNum" DataField="TotalNum" Width="60px" HeaderTextAlign="Center"
SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
+5 -1
View File
@@ -396,6 +396,7 @@ namespace FineUIPro.Web.HSSE.Manager
int sumD03 = getLists.Sum(x => x.D03) ?? 0;
int sumD04 = getLists.Sum(x => x.D04) ?? 0;
int sumS01 = getLists.Sum(x => x.S01) ?? 0;
int sumS02 = getLists.Sum(x => x.S02) ?? 0;
if (this.GvSeDinMonthReport4Item.Rows.Count > 0)
{
JObject summary = new JObject
@@ -412,7 +413,8 @@ namespace FineUIPro.Web.HSSE.Manager
{ "D03", sumD03 },
{ "D04", sumD04 },
{ "S01", sumS01 },
{ "TotalNum", sumS01+sumT02+sumT03+sumT04+sumT05+sumT06+sumD01+sumD02+sumD03+sumD04+sumS01 }
{ "S02", sumS02 },
{ "TotalNum", sumT01+sumT02+sumT03+sumT04+sumT05+sumT06+sumD01+sumD02+sumD03+sumD04+sumS01+sumS02 }
};
GvSeDinMonthReport5Item.SummaryData = summary;
}
@@ -878,6 +880,7 @@ namespace FineUIPro.Web.HSSE.Manager
var d03 = values.Value<string>("D03");
var d04 = values.Value<string>("D04");
var s01 = values.Value<string>("S01");
var s02 = values.Value<string>("S02");
Model.SeDinMonthReport5Item newReport5Item = new Model.SeDinMonthReport5Item();
newReport5Item.UnitName = unitName;
newReport5Item.T01 = Funs.GetNewInt(t01);
@@ -891,6 +894,7 @@ namespace FineUIPro.Web.HSSE.Manager
newReport5Item.D03 = Funs.GetNewInt(d03);
newReport5Item.D04 = Funs.GetNewInt(d04);
newReport5Item.S01 = Funs.GetNewInt(s01);
newReport5Item.S02 = Funs.GetNewInt(s02);
listSeDinMonthReport5Item.Add(newReport5Item);
}
newItem.SeDinMonthReport5Item = listSeDinMonthReport5Item;
SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx
+1 -1
View File
@@ -58,7 +58,7 @@
SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="SpecialEquipmentName" DataField="SpecialEquipmentName"
<f:RenderField Width="120px" ColumnID="SpecialEquipmentName" DataField="SpecialEquipmentName"
SortField="SpecialEquipmentName" FieldType="String"
HeaderText="设备类别" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
///机具设备下拉框
SpecialEquipmentService.InitSpecialEquipmentDropDownList(this.drpSpecialEquipmentId, true, true);
SpecialEquipmentService.InitSpecialEquipmentDropDownList2(this.drpSpecialEquipmentId, "3", true);
this.EquipmentQualityId = Request.Params["EquipmentQualityId"];
if (!string.IsNullOrEmpty(this.EquipmentQualityId))
{
SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs
+5 -5
View File
@@ -99,15 +99,15 @@ namespace FineUIPro.Web.ProjectData
UnitWork.ProjectId = this.CurrUser.LoginProjectId;
UnitWork.UnitWorkCode = this.txtUnitWorkCode.Text.Trim();
UnitWork.UnitWorkName = this.txtUnitWorkName.Text.Trim();
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
UnitWork.UnitId = string.Join(",", this.drpUnit.SelectedValueArray);
}
else
if (this.drpUnit.SelectedValue == BLL.Const._Null && this.drpUnit.SelectedValueArray.Length == 1)
{
Alert.ShowInTop("请选择施工单位！");
return;
}
else
{
UnitWork.UnitId = string.Join(",", this.drpUnit.SelectedValueArray);
}
if (this.drpSupervisorUnit.SelectedValue != BLL.Const._Null)
{
UnitWork.SupervisorUnitId = this.drpSupervisorUnit.SelectedValue;