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/BLL/API/HSSE/APISeDinMonthReportService.cs
+6 -2
View File
@@ -439,6 +439,7 @@ namespace BLL
int D03 = getUAll.Where(x => x.BaseInfoName == "拖板车").Count();
int D04 = getUAll.Where(x => x.BaseInfoName == "桩机").Count();
int S01 = getUAll.Where(x => x.BaseInfoName == "吊篮").Count();
int S02 = getUAll.Where(x => x.BaseInfoName == "高空作业升降平台").Count();
Model.SeDinMonthReport5Item newItem = new Model.SeDinMonthReport5Item
{
UnitName = item.UnitName,
@@ -453,7 +454,8 @@ namespace BLL
D03 = D03,
D04 = D04,
S01 = S01,
TotalNum = (T01 + T02 + T03 + T04 + T05 + T06 + D01 + D02 + D03 + D04 + S01)
S02 = S02,
TotalNum = (T01 + T02 + T03 + T04 + T05 + T06 + D01 + D02 + D03 + D04 + S01 + S02)
};
getLists.Add(newItem);
}
@@ -1294,8 +1296,9 @@ namespace BLL
D03 = x.D03 ?? 0,
D04 = x.D04 ?? 0,
S01 = x.S01 ?? 0,
S02 = x.S02 ?? 0,
TotalNum = (x.T01 + x.T02 + x.T03 + x.T04 + x.T05 + x.T06
+ x.D01 + x.D02 + x.D03 + x.D04 + x.S01)
+ x.D01 + x.D02 + x.D03 + x.D04 + x.S01 + x.S02)
}).ToList();
}
return getInfo;
@@ -2115,6 +2118,7 @@ namespace BLL
D03 = item.D03,
D04 = item.D04,
S01 = item.S01,
S02 = item.S02,
};
db.SeDin_MonthReport5.InsertOnSubmit(newReport5Item);
db.SubmitChanges();
SGGL/BLL/API/HSSE/APITestPlanService.cs
+21
View File
@@ -532,5 +532,26 @@ namespace BLL
APITrainRecordService.InsertTrainRecord(getTestPlan);
}
}
#region 获取考试试题类型列表
/// <summary>
/// 获取考试试题类型列表
/// </summary>
/// <returns></returns>
public static List<Model.TestPlanTrainingItem> getTestTraining()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getDataLists = (from x in db.Training_TestTraining
orderby x.TrainingCode
select new Model.TestPlanTrainingItem
{
TrainingTypeId = x.TrainingId,
TrainingTypeName = x.TrainingName,
}).ToList();
return getDataLists;
}
}
#endregion
}
}
SGGL/BLL/BaseInfo/SpecialEquipmentService.cs
+30
View File
@@ -132,6 +132,36 @@ namespace BLL
}
}
/// <summary>
/// 设备下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isSpecial">项目id</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitSpecialEquipmentDropDownList2(DropDownList dropName, string type, bool isShowPlease)
{
dropName.DataValueField = "SpecialEquipmentId";
dropName.DataTextField = "SpecialEquipmentName";
dropName.DataSource = GetSpecialEquipmentList2(type);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 获取机具设备列表
/// </summary>
/// <returns></returns>
public static List<Model.Base_SpecialEquipment> GetSpecialEquipmentList2(string type)
{
return (from x in Funs.DB.Base_SpecialEquipment
where x.SpecialEquipmentType == type || x.IsSpecial == true
orderby x.SpecialEquipmentCode
select x).ToList();
}
/// <summary>
/// 设备下拉框
/// </summary>
SGGL/BLL/Common/PrinterDocService.cs
+19 -15
View File
@@ -1165,29 +1165,30 @@
#region 5、本月大型、特种设备投入情况
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;font-size: 10.5pt;\">");
sb.Append("<tr style=\"height: 30px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"13\" style=\"width: 100%;font-weight: bold;\">{0}</td> "
sb.AppendFormat("<td align=\"left\" colspan=\"14\" style=\"width: 100%;font-weight: bold;\">{0}</td> "
, "5、本月大型、特种设备投入情况：");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 20px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 16%;\" rowspan=\"2\">{0}</td> ", "单位名称");
sb.AppendFormat("<td align=\"center\" colspan=\"6\">{0}</td> ", "特种设备");
sb.AppendFormat("<td align=\"center\" colspan=\"4\">{0}</td> ", "大型机具设备");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "特殊机具设备");
sb.AppendFormat("<td align=\"center\" colspan=\"2\">{0}</td> ", "特殊机具设备");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\" rowspan=\"2\">{0}</td> ", "合计");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 20px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "汽车吊");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "履带吊");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\" >{0}</td> ", "塔吊");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "门式起重机");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "升降机");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "叉车");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "挖掘机");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "装载机");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "拖板车");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "桩机");
sb.AppendFormat("<td align=\"center\" style=\"width: 7%;\">{0}</td> ", "吊篮");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "汽车吊");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "履带吊");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\" >{0}</td> ", "塔吊");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "门式起重机");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "升降机");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "叉车");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "挖掘机");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "装载机");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "拖板车");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "桩机");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "吊篮");
sb.AppendFormat("<td align=\"center\" style=\"width: 6%;\">{0}</td> ", "高空作业升降平台");
sb.Append("</tr>");
var getMonthReport5 = from x in Funs.DB.SeDin_MonthReport5
where x.MonthReportId == monthReportId
@@ -1211,9 +1212,10 @@
sb.AppendFormat("<td align=\"left\">{0}</td> ", item.D03);
sb.AppendFormat("<td align=\"left\">{0}</td> ", item.D04);
sb.AppendFormat("<td align=\"left\">{0}</td> ", item.S01);
sb.AppendFormat("<td align=\"left\">{0}</td> ", item.S02);
sb.AppendFormat("<td align=\"left\">{0}</td> ", (item.T01 ?? 0) + (item.T02 ?? 0) + (item.T03 ?? 0) + (item.T04 ?? 0) + (item.T05 ?? 0) + (item.T06 ?? 0)
+ (item.D01 ?? 0) + (item.D02 ?? 0) + (item.D03 ?? 0) + (item.D04 ?? 0) + (item.S01 ?? 0));
+ (item.D01 ?? 0) + (item.D02 ?? 0) + (item.D03 ?? 0) + (item.D04 ?? 0) + (item.S01 ?? 0) + (item.S02 ?? 0));
sb.Append("</tr>");
}
@@ -1230,6 +1232,7 @@
int sumd03 = getMonthReport5.Sum(x => x.D03) ?? 0;
int sumd04 = getMonthReport5.Sum(x => x.D04) ?? 0;
int sums01 = getMonthReport5.Sum(x => x.S01) ?? 0;
int sums02 = getMonthReport5.Sum(x => x.S02) ?? 0;
sb.AppendFormat("<td align=\"left\">{0}</td> ", sumt01);
sb.AppendFormat("<td align=\"left\">{0}</td> ", sumt02);
sb.AppendFormat("<td align=\"left\">{0}</td> ", sumt03);
@@ -1241,7 +1244,8 @@
sb.AppendFormat("<td align=\"left\">{0}</td> ", sumd03);
sb.AppendFormat("<td align=\"left\">{0}</td> ", sumd04);
sb.AppendFormat("<td align=\"left\">{0}</td> ", sums01);
sb.AppendFormat("<td align=\"left\">{0}</td> ", sumt02 + sumt03 + sumt01 + sumt05 + sumt06 + sumd01 + sumd02 + sumd03 + sumd04 + sums01);
sb.AppendFormat("<td align=\"left\">{0}</td> ", sums02);
sb.AppendFormat("<td align=\"left\">{0}</td> ", sumt01 + sumt02 + sumt03 + sumt04+ sumt05 + sumt06 + sumd01 + sumd02 + sumd03 + sumd04 + sums01+ sums02);
sb.Append("</tr>");
sb.Append("</table>");
SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs
+29 -3
View File
@@ -19,15 +19,41 @@ namespace BLL
return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProductionSchedulingPlanId == productionSchedulingPlanId);
}
/// <summary>
/// 根据单位工程、流水段、材质、口径获取排产计划
/// </summary>
/// <param name="loginProjectId"></param>
/// <param name="flowingSection"></param>
/// <param name="unitWorkId"></param>
/// <param name="material"></param>
/// <param name="caliber"></param>
/// <returns></returns>
public static Model.HJGL_ProductionSchedulingPlan GetProductionSchedulingPlan(string loginProjectId, string flowingSection, string unitWorkId, string material, string caliber)
{
return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProjectId == loginProjectId && e.FlowNum == flowingSection && e.PipelineId == unitWorkId && e.Material == material && e.Caliber == caliber);
}
public static List<Model.HJGL_ProductionSchedulingPlan> GetProductionSchedulingPlanByMaterialLists(string loginProjectId, string flowingSection, string unitWorkId, string material)
/// <summary>
/// 根据单位工程、流水段获取排产计划信息
/// </summary>
/// <param name="loginProjectId"></param>
/// <param name="flowingSection"></param>
/// <param name="unitWorkId"></param>
/// <returns></returns>
public static List<Model.HJGL_ProductionSchedulingPlan> GetProductionSchedulingPlanByFlowingSection(string loginProjectId, string flowingSection, string unitWorkId)
{
return (from x in Funs.DB.HJGL_ProductionSchedulingPlan where x.ProjectId == loginProjectId && x.FlowNum == flowingSection && x.PipelineId == unitWorkId && x.Material == material select x).ToList();
return (from x in Funs.DB.HJGL_ProductionSchedulingPlan where x.ProjectId == loginProjectId && x.FlowNum == flowingSection && x.PipelineId == unitWorkId select x).ToList();
}
/// <summary>
/// 根据单位工程获取排产计划信息
/// </summary>
/// <param name="loginProjectId"></param>
/// <param name="unitWorkId"></param>
/// <returns></returns>
public static List<Model.HJGL_ProductionSchedulingPlan> GetProductionSchedulingPlanByUnitWorkId(string loginProjectId, string unitWorkId)
{
return (from x in Funs.DB.HJGL_ProductionSchedulingPlan where x.ProjectId == loginProjectId && x.PipelineId == unitWorkId select x).ToList();
}
/// <summary>
SGGL/BLL/ZHGL/DataSync/BaseDataService.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace BLL
from projectType in projectTypeJoin.DefaultIfEmpty()
join sysConst in Funs.DB.Sys_Const on new { ProjectState2 = project.ProjectState, GroupId = BLL.ConstValue.GroupId_ProjectState } equals new { ProjectState2 = sysConst.ConstValue, GroupId = sysConst.GroupId } into sysConstJoin
from sysConst in sysConstJoin.DefaultIfEmpty()
where project.ProjectState == "1" && project.MasterSysId != null
where project.ProjectState == "1" && project.MasterSysId != null && project.IsCNCECShow == true
select new ProjectOutput
{
ProjectId = project.ProjectId,