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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
李鹏飞
2024-02-04 11:13:06 +08:00
parent a43e2cde43 df83f9713f
commit 07fc46b27e
101 changed files with 10502 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+3
View File
@@ -165,6 +165,7 @@
<Compile Include="BaseInfo\SteelService.cs" />
<Compile Include="BaseInfo\TrainLevelService.cs" />
<Compile Include="BaseInfo\TrainTypeService.cs" />
<Compile Include="BaseInfo\TransferMajorService.cs" />
<Compile Include="BaseInfo\UnitTypeService.cs" />
<Compile Include="BaseInfo\WorkPostService.cs" />
<Compile Include="BaseInfo\WorkStageService.cs" />
@@ -770,6 +771,8 @@
<Compile Include="BoSheng\BOSHENGMonitorService.cs" />
<Compile Include="Transfer\PipingService.cs" />
<Compile Include="Transfer\ProjectSetupService.cs" />
<Compile Include="Transfer\RotatingEquipmentService.cs" />
<Compile Include="Transfer\StaticEquipmentService.cs" />
<Compile Include="WebService\MCSWebService.cs" />
<Compile Include="WebService\CNCECHSSEWebService.cs" />
<Compile Include="WebService\CNCECHSSEMonitorService.cs" />
SGGL/BLL/BaseInfo/TransferMajorService.cs
+86
View File
@@ -0,0 +1,86 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 移交专业
/// </summary>
public static class TransferMajorService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取移交专业
/// </summary>
/// <param name="TransferMajorId"></param>
/// <returns></returns>
public static Model.Base_TransferMajor GetTransferMajorById(string TransferMajorId)
{
return Funs.DB.Base_TransferMajor.FirstOrDefault(e => e.TransferMajorId == TransferMajorId);
}
/// <summary>
/// 添加移交专业
/// </summary>
/// <param name="TransferMajor"></param>
public static void AddTransferMajor(Model.Base_TransferMajor TransferMajor)
{
Model.SGGLDB db = Funs.DB;
Model.Base_TransferMajor newTransferMajor = new Model.Base_TransferMajor
{
TransferMajorId = TransferMajor.TransferMajorId,
Discipline = TransferMajor.Discipline,
Major = TransferMajor.Major,
DisciplineCode = TransferMajor.DisciplineCode,
Remark = TransferMajor.Remark
};
db.Base_TransferMajor.InsertOnSubmit(newTransferMajor);
db.SubmitChanges();
}
/// <summary>
/// 修改移交专业
/// </summary>
/// <param name="TransferMajor"></param>
public static void UpdateTransferMajor(Model.Base_TransferMajor TransferMajor)
{
Model.SGGLDB db = Funs.DB;
Model.Base_TransferMajor newTransferMajor = db.Base_TransferMajor.FirstOrDefault(e => e.TransferMajorId == TransferMajor.TransferMajorId);
if (newTransferMajor != null)
{
newTransferMajor.Discipline = TransferMajor.Discipline;
newTransferMajor.Major = TransferMajor.Major;
newTransferMajor.DisciplineCode = TransferMajor.DisciplineCode;
newTransferMajor.Remark = TransferMajor.Remark;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除移交专业
/// </summary>
/// <param name="TransferMajorId"></param>
public static void DeleteTransferMajorById(string TransferMajorId)
{
Model.SGGLDB db = Funs.DB;
Model.Base_TransferMajor TransferMajor = db.Base_TransferMajor.FirstOrDefault(e => e.TransferMajorId == TransferMajorId);
if (TransferMajor != null)
{
db.Base_TransferMajor.DeleteOnSubmit(TransferMajor);
db.SubmitChanges();
}
}
/// <summary>
/// 获取移交专业下拉列表项
/// </summary>
/// <returns></returns>
public static List<Model.Base_TransferMajor> GetTransferMajorList()
{
return (from x in Funs.DB.Base_TransferMajor orderby x.DisciplineCode select x).ToList();
}
}
}
SGGL/BLL/Common/ChartControlService.cs
+44
View File
@@ -109,5 +109,49 @@
return chart;
}
#endregion
/// <summary>
/// 给chart类赋值
/// </summary>
/// <param name="dt">数据源表值</param>
/// <param name="title">图标题</param>
/// <param name="type">图类型</param>
/// <param name="width">图显示宽度</param>
/// <param name="height">图显示高度</param>
/// <param name="isNotEnable3D">是否显示3D效果</param>
/// <returns>返回图</returns>
public static Model.DataSourceChart GetDataSourceChartByYijiao(DataTable dt, string title, string type, int width, int height, bool isNotEnable3D)
{
Model.DataSourceChart dataSourceChart = new Model.DataSourceChart
{
Width = width,
Height = height,
Title = title,
IsNotEnable3D = isNotEnable3D,
ChartType = GetChartType(type)
};
List<Model.DataSourceTeam> dataSourceTeams = new List<Model.DataSourceTeam>();
for (int i = 1; i < dt.Columns.Count; i++)
{
Model.DataSourceTeam dataSourceTeam = new Model.DataSourceTeam
{
DataPointName = dt.Columns[i].ToString()
};
List<Model.DataSourcePoint> dataSourcePoints = new List<Model.DataSourcePoint>();
for (int j = 0; j < dt.Rows.Count; j++)
{
Model.DataSourcePoint dataSourcePoint = new Model.DataSourcePoint
{
PointText = dt.Rows[j][0].ToString(),
PointValue = dt.Rows[j][i].ToString()
};
dataSourcePoints.Add(dataSourcePoint);
}
dataSourceTeam.DataSourcePoints = dataSourcePoints;
dataSourceTeams.Add(dataSourceTeam);
}
dataSourceChart.DataSourceTeams = dataSourceTeams;
return dataSourceChart;
}
}
}
SGGL/BLL/Common/Const.cs
+4
View File
@@ -1026,6 +1026,10 @@ namespace BLL
/// 风险等级
/// </summary>
public const string RiskLevelMenuId = "E4B526CC-805E-4131-8E18-2FFA6871507E";
/// <summary>
/// 移交专业
/// </summary>
public const string TransferMajorMenuId = "D0850615-BF32-4CFA-84CA-EEA261676EA8";
#endregion
#region 质量基础信息
SGGL/BLL/TestRun/DriverRun/DriverRunPlanService.cs
+3 -4
View File
@@ -83,10 +83,9 @@ namespace BLL
Model.DriverRun_DriverRunPlan newDriverRunPlan = Funs.DB.DriverRun_DriverRunPlan.FirstOrDefault(e => e.DriverRunPlanId == driverRunPlanId);
if (newDriverRunPlan != null)
{
if (!string.IsNullOrEmpty(newDriverRunPlan.AttachUrl))
{
UploadAttachmentService.DeleteFile(Funs.RootPath, newDriverRunPlan.AttachUrl);
}
////删除附件表
BLL.CommonService.DeleteAttachFileById(newDriverRunPlan.DriverRunPlanId);
BLL.CommonService.DeleteAttachFileById(newDriverRunPlan.DriverRunPlanId + "K");
Funs.DB.DriverRun_DriverRunPlan.DeleteOnSubmit(newDriverRunPlan);
Funs.DB.SubmitChanges();
}
SGGL/BLL/Transfer/RotatingEquipmentService.cs
+79
View File
@@ -0,0 +1,79 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public class RotatingEquipmentService
{
/// <summary>
/// 根据主键获取设备材料报验信息
/// </summary>
/// <param name="RotatingEquipmentId"></param>
/// <returns></returns>
public static Model.Transfer_RotatingEquipment GetRotatingEquipmentById(string Id)
{
return Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(e => e.Id == Id);
}
/// <summary>
/// 添加设备材料报验
/// </summary>
/// <param name="RotatingEquipment"></param>
public static void AddRotatingEquipment(Model.Transfer_RotatingEquipment RotatingEquipment)
{
Model.SGGLDB db = Funs.DB;
Model.Transfer_RotatingEquipment newRotatingEquipment = new Model.Transfer_RotatingEquipment();
newRotatingEquipment.Id = RotatingEquipment.Id;
newRotatingEquipment.ProjectId = RotatingEquipment.ProjectId;
newRotatingEquipment.RotatingEquipment = RotatingEquipment.RotatingEquipment;
newRotatingEquipment.SYSTEM = RotatingEquipment.SYSTEM;
newRotatingEquipment.Subsystem = RotatingEquipment.Subsystem;
newRotatingEquipment.TestPackage = RotatingEquipment.TestPackage;
newRotatingEquipment.TestPackageSTART = RotatingEquipment.TestPackageSTART;
newRotatingEquipment.TestPackageFINISH = RotatingEquipment.TestPackageFINISH;
newRotatingEquipment.MechanicalFINALStatus = RotatingEquipment.MechanicalFINALStatus;
db.Transfer_RotatingEquipment.InsertOnSubmit(newRotatingEquipment);
db.SubmitChanges();
}
/// <summary>
/// 修改设备材料报验
/// </summary>
/// <param name="RotatingEquipment"></param>
public static void UpdateRotatingEquipment(Model.Transfer_RotatingEquipment RotatingEquipment)
{
Model.SGGLDB db = Funs.DB;
Model.Transfer_RotatingEquipment newRotatingEquipment = db.Transfer_RotatingEquipment.FirstOrDefault(e => e.Id == RotatingEquipment.Id);
if (newRotatingEquipment != null)
{
newRotatingEquipment.ProjectId = RotatingEquipment.ProjectId;
newRotatingEquipment.RotatingEquipment = RotatingEquipment.RotatingEquipment;
newRotatingEquipment.SYSTEM = RotatingEquipment.SYSTEM;
newRotatingEquipment.Subsystem = RotatingEquipment.Subsystem;
newRotatingEquipment.TestPackage = RotatingEquipment.TestPackage;
newRotatingEquipment.TestPackageSTART = RotatingEquipment.TestPackageSTART;
newRotatingEquipment.TestPackageFINISH = RotatingEquipment.TestPackageFINISH;
newRotatingEquipment.MechanicalFINALStatus = RotatingEquipment.MechanicalFINALStatus;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除设备材料报验
/// </summary>
/// <param name="Id"></param>
public static void DeleteRotatingEquipment(string Id)
{
Model.SGGLDB db = Funs.DB;
Model.Transfer_RotatingEquipment RotatingEquipment = db.Transfer_RotatingEquipment.FirstOrDefault(e => e.Id == Id);
if (RotatingEquipment != null)
{
db.Transfer_RotatingEquipment.DeleteOnSubmit(RotatingEquipment);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/Transfer/StaticEquipmentService.cs
+79
View File
@@ -0,0 +1,79 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public class StaticEquipmentService
{
/// <summary>
/// 根据主键获取设备材料报验信息
/// </summary>
/// <param name="StaticEquipmentId"></param>
/// <returns></returns>
public static Model.Transfer_StaticEquipment GetStaticEquipmentById(string Id)
{
return Funs.DB.Transfer_StaticEquipment.FirstOrDefault(e => e.Id == Id);
}
/// <summary>
/// 添加设备材料报验
/// </summary>
/// <param name="StaticEquipment"></param>
public static void AddStaticEquipment(Model.Transfer_StaticEquipment StaticEquipment)
{
Model.SGGLDB db = Funs.DB;
Model.Transfer_StaticEquipment newStaticEquipment = new Model.Transfer_StaticEquipment();
newStaticEquipment.Id = StaticEquipment.Id;
newStaticEquipment.ProjectId = StaticEquipment.ProjectId;
newStaticEquipment.StaticEquipment = StaticEquipment.StaticEquipment;
newStaticEquipment.SYSTEM = StaticEquipment.SYSTEM;
newStaticEquipment.Subsystem = StaticEquipment.Subsystem;
newStaticEquipment.TestPackage = StaticEquipment.TestPackage;
newStaticEquipment.TestPackageSTART = StaticEquipment.TestPackageSTART;
newStaticEquipment.TestPackageFINISH = StaticEquipment.TestPackageFINISH;
newStaticEquipment.MechanicalFINALStatus = StaticEquipment.MechanicalFINALStatus;
db.Transfer_StaticEquipment.InsertOnSubmit(newStaticEquipment);
db.SubmitChanges();
}
/// <summary>
/// 修改设备材料报验
/// </summary>
/// <param name="StaticEquipment"></param>
public static void UpdateStaticEquipment(Model.Transfer_StaticEquipment StaticEquipment)
{
Model.SGGLDB db = Funs.DB;
Model.Transfer_StaticEquipment newStaticEquipment = db.Transfer_StaticEquipment.FirstOrDefault(e => e.Id == StaticEquipment.Id);
if (newStaticEquipment != null)
{
newStaticEquipment.ProjectId = StaticEquipment.ProjectId;
newStaticEquipment.StaticEquipment = StaticEquipment.StaticEquipment;
newStaticEquipment.SYSTEM = StaticEquipment.SYSTEM;
newStaticEquipment.Subsystem = StaticEquipment.Subsystem;
newStaticEquipment.TestPackage = StaticEquipment.TestPackage;
newStaticEquipment.TestPackageSTART = StaticEquipment.TestPackageSTART;
newStaticEquipment.TestPackageFINISH = StaticEquipment.TestPackageFINISH;
newStaticEquipment.MechanicalFINALStatus = StaticEquipment.MechanicalFINALStatus;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除设备材料报验
/// </summary>
/// <param name="Id"></param>
public static void DeleteStaticEquipment(string Id)
{
Model.SGGLDB db = Funs.DB;
Model.Transfer_StaticEquipment StaticEquipment = db.Transfer_StaticEquipment.FirstOrDefault(e => e.Id == Id);
if (StaticEquipment != null)
{
db.Transfer_StaticEquipment.DeleteOnSubmit(StaticEquipment);
db.SubmitChanges();
}
}
}
}