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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2024-11-12 17:56:08 +08:00
parent 57a4adcd9e ef607782ee
commit 4ecfb2d567
15 changed files with 725 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
View File

@ -48,6 +48,9 @@ namespace BLL
UnitId = constructionRisk.UnitId,
RiskLevel = constructionRisk.RiskLevel,
Coordinate = constructionRisk.Coordinate,
SubUnitDutyPerson = constructionRisk.SubUnitDutyPerson,
MainUnitDutyPerson = constructionRisk.MainUnitDutyPerson,
MainUnitCheckPerson = constructionRisk.MainUnitCheckPerson,
};
Funs.DB.HSSE_ConstructionRisk.InsertOnSubmit(newconstructionRisk);
Funs.DB.SubmitChanges();
@ -139,6 +142,9 @@ namespace BLL
newHazardList.UnitId = hazardList.UnitId;
newHazardList.RiskLevel = hazardList.RiskLevel;
newHazardList.Coordinate = hazardList.Coordinate;
newHazardList.SubUnitDutyPerson = hazardList.SubUnitDutyPerson;
newHazardList.MainUnitDutyPerson = hazardList.MainUnitDutyPerson;
newHazardList.MainUnitCheckPerson = hazardList.MainUnitCheckPerson;
db.SubmitChanges();
}
else

40
SGGL/BLL/Person/Person_PersonsService.cs
View File

@ -46,7 +46,7 @@ namespace BLL
/// <param name="personType">人员类型</param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType, string account,string[] workPostIds, Grid Grid1)
public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType, string account, string[] workPostIds, Grid Grid1)
{
IQueryable<Model.Person_Persons> getDataList = getDataLists.OrderBy(x => x.UnitId).ThenBy(x => x.DepartId);
if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
@ -94,7 +94,7 @@ namespace BLL
}
}
if (workPostIds != null && workPostIds.Count() > 0)
if (workPostIds != null && workPostIds.Count() > 0)
{
getDataList = getDataList.Where(e => workPostIds.Contains(e.WorkPostId));
}
@ -170,7 +170,7 @@ namespace BLL
{
foreach (var item in getItem)
{
string pname= ProjectService.GetShortNameByProjectId(item.ProjectId);
string pname = ProjectService.GetShortNameByProjectId(item.ProjectId);
if (string.IsNullOrEmpty(name))
{
name = pname;
@ -237,11 +237,11 @@ namespace BLL
/// <param name="PersonId"></param>
/// <param name="ProjectId"></param>
/// <returns></returns>
public static bool IsGeneralUnitByPersonId(string PersonId,string ProjectId)
public static bool IsGeneralUnitByPersonId(string PersonId, string ProjectId)
{
bool result = false;
var PersonEntity = GetPerson_PersonsById(PersonId);
if (PersonEntity!=null)
if (PersonEntity != null)
{
var pUnit = Funs.DB.Project_ProjectUnit.FirstOrDefault(e => e.ProjectId == ProjectId && e.UnitId == PersonEntity.UnitId);
if (pUnit != null)
@ -253,7 +253,7 @@ namespace BLL
}
}
return result;
}
@ -466,8 +466,8 @@ namespace BLL
Url = getUser.PersonName;
if (!string.IsNullOrEmpty(getUser.SignatureUrl))
{
Url = Funs.RootPath + getUser.SignatureUrl;
Url = Funs.RootPath + getUser.SignatureUrl;
}
}
return Url;
@ -526,7 +526,7 @@ namespace BLL
return returUsers;
}
else
{
{
if (!string.IsNullOrEmpty(unitId))
{
users = (from x in db.Person_Persons
@ -571,11 +571,11 @@ namespace BLL
if (!string.IsNullOrEmpty(projectId))
{
var getProjectPersons = from x in db.SitePerson_Person
where x.ProjectId == projectId && x.States == Const.State_1 && x.RoleIds != null
where x.ProjectId == projectId && x.States == Const.State_1 && x.RoleIds != null && x.RoleIds != ""
select x;
if (listUnitIds.Count() > 0)
{
getProjectPersons = getProjectPersons.Where(x => listUnitIds.Contains(x.UnitId)).OrderBy(x => x.PersonName);
getProjectPersons = getProjectPersons.Where(x => listUnitIds.Contains(x.UnitId)).OrderBy(x => x.PersonName);
}
if (listRoles.Count() > 0)
{
@ -602,11 +602,11 @@ namespace BLL
{
var getPersons = from x in db.Person_Persons
where x.PersonId != Const.hfnbdId && x.PersonId != Const.sedinId
&& (x.IsPost == true || !x.IsPost.HasValue) && x.Account != null
&& (x.IsPost == true || !x.IsPost.HasValue) && x.Account != null
select x;
if (listUnitIds.Count() > 0)
{
getPersons = getPersons.Where(x => listUnitIds.Contains(x.UnitId)).OrderBy(x=>x.PersonName);
getPersons = getPersons.Where(x => listUnitIds.Contains(x.UnitId)).OrderBy(x => x.PersonName);
}
if (listRoles.Count() > 0)
{
@ -699,7 +699,7 @@ namespace BLL
PersonName = person.PersonName,
Account = person.Account,
RawPassword = password,
Password =Funs.EncryptionPassword(password),
Password = Funs.EncryptionPassword(password),
IsOffice = person.IsOffice,
RoleIds = person.RoleIds,
IdentityCard = person.IdentityCard,
@ -759,7 +759,7 @@ namespace BLL
}
if (!string.IsNullOrEmpty(person.SignatureUrl))
{
newPerson. SignatureUrl = person.SignatureUrl;
newPerson.SignatureUrl = person.SignatureUrl;
}
@ -783,9 +783,9 @@ namespace BLL
if (newPerson.UnitId != person.UnitId)
{
newPerson.UnitId = person.UnitId;
isChange=true;
isChange = true;
}
newPerson.DepartId = person.DepartId;
newPerson.WorkPostId = person.WorkPostId;
newPerson.JobNum = person.JobNum;
@ -970,7 +970,7 @@ namespace BLL
}
}
}
public static void DeletePerson_PersonsById(string PersonId)
@ -993,7 +993,7 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getSitepersons = from x in db.SitePerson_Person
var getSitepersons = from x in db.SitePerson_Person
where x.PersonId == person.PersonId
select x;
if (getSitepersons.Count() > 0)
@ -1140,7 +1140,7 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var m = db.Person_Persons.FirstOrDefault(e => e.PersonId == personId);
var m = db.Person_Persons.FirstOrDefault(e => e.PersonId == personId);
if (m != null)
{
m.RawPassword = password;

86
SGGL/BLL/WebService/CNCECHSSEWebService.cs
View File

@ -1840,6 +1840,92 @@
}
#endregion
#region 项目推送 新增方法
/// <summary>
/// 推送项目到集团
/// </summary>
/// <returns></returns>
public static string PushProject()
{
string code = "0";
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
try
{
//查询所有在建项目
var upReport = (from x in db.Base_Project
where (x.ProjectState == "1" || x.ProjectState == null)
select new Model.BaseProjectItem
{
ProjectId = x.ProjectId,
UnitId = BLL.Const.UnitId_SEDIN,
ProjectCode = x.ProjectCode,
ProjectName = x.ProjectName,
StartDate = x.StartDate,
EndDate = x.EndDate,
ProjectAddress = x.ProjectAddress,
ShortName = x.ShortName,
ProjectType = x.ProjectType,
PostCode = x.PostCode,
Remark = x.Remark,
ProjectState = x.ProjectState,
ContractNo = x.ContractNo,
WorkRange = x.WorkRange,
Duration = x.Duration,
IsUpTotalMonth = x.IsUpTotalMonth,
ProjectMainPerson = x.ProjectMainPerson,
ProjectLiaisonPerson = x.ProjectLiaisonPerson,
IsForeign = x.IsForeign,
FromProjectId = x.FromProjectId,
MapCoordinates = x.MapCoordinates,
ProjectMoney = x.ProjectMoney,
ConstructionMoney = x.ConstructionMoney,
Country = x.Country,
Province = x.Province,
City = x.City,
Telephone = x.Telephone,
EnglishRemark = x.EnglishRemark,
//IsFace = x.IsFace,
//ProjectState2 = x.ProjectState2,
//Progress = x.Progress,
//MonitorPW = x.MonitorPW,
//MonitorId = x.MonitorId,
//ProjectAttribute = x.ProjectAttribute,
SourceUnitId = BLL.Const.UnitId_SEDIN,
}
);
code = PushApiProject(upReport).ToString();
if (code == "1")
{
}
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("【在建项目】上传到服务器", ex);
}
return code;
}
}
/// <summary>
/// 推送项目
/// </summary>
/// <param name="upReport"></param>
/// <returns></returns>
private static int PushApiProject(IQueryable<Model.BaseProjectItem> upReport)
{
string baseurl = "/api/InspectionBrigade/SaveBaseProjectData";
var resultJsonReport = JsonConvert.SerializeObject(upReport);
resultJsonReport = "{\"BaseProjectItems\":" + resultJsonReport.Replace("}{", ",") + "}";
var responeData = BLL.ServerService.PushCNCEC(resultJsonReport, baseurl);
return responeData.code;
}
#endregion
#endregion

2
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
View File

@ -38,7 +38,7 @@
<f:FormRow ColumnWidths="66% 34%">
<Items>
<f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
<f:DropDownList ID="DropDownList1" runat="server" EnableEdit="true" Label="施工单位" LabelWidth="140px"
<f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px"
>
</f:DropDownList>
</Items>

20
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
View File

@ -94,6 +94,8 @@ namespace FineUIPro.Web.HSSE.Hazard
if (!string.IsNullOrEmpty(constructionRisk.UnitId))
{
drpUnit.SelectedValue = constructionRisk.UnitId;
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
this.drpSubUnitDutyPerson.SelectedValue = constructionRisk.SubUnitDutyPerson;
}
if (!string.IsNullOrEmpty(constructionRisk.RefLicense))
{
@ -166,6 +168,7 @@ namespace FineUIPro.Web.HSSE.Hazard
drpHandleType.DataSource = BLL.ConstructionRiskListService.GetDHandleTypeByState(BLL.Const.ConstructionRisk_Compile);
drpHandleType.DataBind();
this.drpUnit.SelectedValue = this.CurrUser.UnitId;
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
}
drpHandleType_SelectedIndexChanged(null, null);
Grid1.DataSource = constructionRiskControls;
@ -207,6 +210,11 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (this.drpSubUnitDutyPerson.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择施工单位责任人！", MessageBoxIcon.Warning);
return;
}
if (this.drpWorkArea.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择主项！", MessageBoxIcon.Warning);
@ -240,6 +248,11 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpSubUnitDutyPerson.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择施工单位责任人！", MessageBoxIcon.Warning);
return;
}
if (this.drpWorkArea.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择主项！", MessageBoxIcon.Warning);
@ -312,6 +325,10 @@ namespace FineUIPro.Web.HSSE.Hazard
{
newConstructionRisk.UnitId = drpUnit.SelectedValue;
}
if (this.drpSubUnitDutyPerson.SelectedValue != BLL.Const._Null)
{
newConstructionRisk.SubUnitDutyPerson = this.drpSubUnitDutyPerson.SelectedValue;
}
newConstructionRisk.DateA = Funs.GetNewDateTime(this.dpDateA.Text.Trim());
newConstructionRisk.DateZ = Funs.GetNewDateTime(this.dpDateZ.Text.Trim());
if (this.drpLicenseDes.SelectedValueArray.Length == 1 && this.drpLicenseDes.SelectedValue == BLL.Const._Null)
@ -652,7 +669,8 @@ namespace FineUIPro.Web.HSSE.Hazard
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
this.drpSubUnitDutyPerson.SelectedValue = BLL.Const._Null;
}
}
}

4
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs generated
View File

@ -76,13 +76,13 @@ namespace FineUIPro.Web.HSSE.Hazard {
protected global::FineUIPro.TextBox txtConstructionContent;
/// <summary>
/// DropDownList1 控件。
/// drpSubUnitDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
/// <summary>
/// drpWorkArea 控件。

8
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
View File

@ -35,10 +35,12 @@
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="15% 85%">
<f:FormRow ColumnWidths="66% 34%">
<Items>
<f:Label runat="server" ID="txtC" LabelWidth="140px" Label="施工内容" ShowRedStar="true"></f:Label>
<f:Label runat="server" ID="txtConstructionContent"></f:Label>
<f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
<f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" Readonly="true"
>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>

2
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.cs
View File

@ -88,6 +88,8 @@ namespace FineUIPro.Web.HSSE.Hazard
if (!string.IsNullOrEmpty(constructionRisk.UnitId))
{
drpUnit.SelectedValue = constructionRisk.UnitId;
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
this.drpSubUnitDutyPerson.SelectedValue = constructionRisk.SubUnitDutyPerson;
}
if (!string.IsNullOrEmpty(constructionRisk.RefLicense))
{

20
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.designer.cs generated
View File

@ -66,15 +66,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// </remarks>
protected global::FineUIPro.DatePicker dpDateZ;
/// <summary>
/// txtC 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtC;
/// <summary>
/// txtConstructionContent 控件。
/// </summary>
@ -82,7 +73,16 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtConstructionContent;
protected global::FineUIPro.TextBox txtConstructionContent;
/// <summary>
/// drpSubUnitDutyPerson 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
/// <summary>
/// drpWorkArea 控件。

3
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx
View File

@ -46,6 +46,9 @@
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnUpdata" Text ="推送" Icon="PageSave" runat="server" Hidden="true" ConfirmText="确定推送？"
ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px">
</f:Button>
<f:HiddenField runat="server" ID="hdStr"></f:HiddenField>
</Items>
</f:Toolbar>

18
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
View File

@ -255,6 +255,7 @@ namespace FineUIPro.Web.ProjectData
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
this.btnUpdata.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify) || buttonList.Contains(BLL.Const.BtnSave))
{
@ -442,5 +443,22 @@ namespace FineUIPro.Web.ProjectData
}
}
#region 推送项目信息到集团
protected void btnPush_Click(object sender, EventArgs e)
{
string code = CNCECHSSEWebService.PushProject();
if (code == "1")
{
ShowNotify("同步成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
}
else
{
Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error);
}
}
#endregion
}
}

9
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs generated
View File

@ -102,6 +102,15 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnUpdata 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUpdata;
/// <summary>
/// hdStr 控件。
/// </summary>

338
SGGL/Model/APIItem/BaseProjectItem.cs Normal file
View File

@ -0,0 +1,338 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
/// <summary>
/// 推送项目实体类
/// </summary>
public class BaseProjectItem
{
/// <summary>
/// 主键
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// 分公司单位
/// </summary>
public string UnitId
{
get;
set;
}
/// <summary>
/// 项目编码
/// </summary>
public string ProjectCode
{
get;
set;
}
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName
{
get;
set;
}
/// <summary>
///
/// </summary>
public DateTime? StartDate
{
get;
set;
}
/// <summary>
///
/// </summary>
public DateTime? EndDate
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ProjectAddress
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ShortName
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ProjectType
{
get;
set;
}
/// <summary>
///
/// </summary>
public string PostCode
{
get;
set;
}
/// <summary>
///
/// </summary>
public string Remark
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ProjectState
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ContractNo
{
get;
set;
}
/// <summary>
///
/// </summary>
public string WorkRange
{
get;
set;
}
/// <summary>
///
/// </summary>
public decimal? Duration
{
get;
set;
}
/// <summary>
///
/// </summary>
public bool? IsUpTotalMonth
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ProjectMainPerson
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ProjectLiaisonPerson
{
get;
set;
}
/// <summary>
///
/// </summary>
public bool? IsForeign
{
get;
set;
}
/// <summary>
///
/// </summary>
public string FromProjectId
{
get;
set;
}
/// <summary>
///
/// </summary>
public string MapCoordinates
{
get;
set;
}
/// <summary>
///
/// </summary>
public decimal? ProjectMoney
{
get;
set;
}
/// <summary>
///
/// </summary>
public decimal? ConstructionMoney
{
get;
set;
}
/// <summary>
///
/// </summary>
public string Country
{
get;
set;
}
/// <summary>
///
/// </summary>
public string Province
{
get;
set;
}
/// <summary>
///
/// </summary>
public string City
{
get;
set;
}
/// <summary>
///
/// </summary>
public string Telephone
{
get;
set;
}
/// <summary>
///
/// </summary>
public string EnglishRemark
{
get;
set;
}
/// <summary>
///
/// </summary>
public bool? IsFace
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ProjectState2
{
get;
set;
}
/// <summary>
///
/// </summary>
public decimal? Progress
{
get;
set;
}
/// <summary>
///
/// </summary>
public string MonitorPW
{
get;
set;
}
/// <summary>
///
/// </summary>
public string MonitorId
{
get;
set;
}
/// <summary>
///
/// </summary>
public string ProjectAttribute
{
get;
set;
}
/// <summary>
/// 集团公司Base_Unit表中的UnitId
/// </summary>
public string SourceUnitId
{
get;
set;
}
/// <summary>
/// 社会统一信用码
/// </summary>
public string CollCropCode
{
get;
set;
}
}
}

338
SGGL/Model/Model.cs
View File

@ -12037,7 +12037,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
public string ApproveIdea
{
get
@ -101618,6 +101618,12 @@ namespace Model
private string _ConstructionContentId;
private string _SubUnitDutyPerson;
private string _MainUnitDutyPerson;
private string _MainUnitCheckPerson;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -101650,6 +101656,12 @@ namespace Model
partial void OnCoordinateChanged();
partial void OnConstructionContentIdChanging(string value);
partial void OnConstructionContentIdChanged();
partial void OnSubUnitDutyPersonChanging(string value);
partial void OnSubUnitDutyPersonChanged();
partial void OnMainUnitDutyPersonChanging(string value);
partial void OnMainUnitDutyPersonChanged();
partial void OnMainUnitCheckPersonChanging(string value);
partial void OnMainUnitCheckPersonChanged();
#endregion
public HSSE_ConstructionRisk()
@ -101937,6 +101949,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitDutyPerson", DbType="NVarChar(50)")]
public string SubUnitDutyPerson
{
get
{
return this._SubUnitDutyPerson;
}
set
{
if ((this._SubUnitDutyPerson != value))
{
this.OnSubUnitDutyPersonChanging(value);
this.SendPropertyChanging();
this._SubUnitDutyPerson = value;
this.SendPropertyChanged("SubUnitDutyPerson");
this.OnSubUnitDutyPersonChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainUnitDutyPerson", DbType="NVarChar(50)")]
public string MainUnitDutyPerson
{
get
{
return this._MainUnitDutyPerson;
}
set
{
if ((this._MainUnitDutyPerson != value))
{
this.OnMainUnitDutyPersonChanging(value);
this.SendPropertyChanging();
this._MainUnitDutyPerson = value;
this.SendPropertyChanged("MainUnitDutyPerson");
this.OnMainUnitDutyPersonChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainUnitCheckPerson", DbType="NVarChar(500)")]
public string MainUnitCheckPerson
{
get
{
return this._MainUnitCheckPerson;
}
set
{
if ((this._MainUnitCheckPerson != value))
{
this.OnMainUnitCheckPersonChanging(value);
this.SendPropertyChanging();
this._MainUnitCheckPerson = value;
this.SendPropertyChanged("MainUnitCheckPerson");
this.OnMainUnitCheckPersonChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -154406,7 +154478,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
public string AttentPerson
{
get
@ -185365,7 +185437,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string ProjectDescription
{
get
@ -185485,7 +185557,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string CalculationRule
{
get
@ -185545,7 +185617,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
public string ConstructionSubcontractor
{
get
@ -185929,7 +186001,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
public System.Nullable<decimal> WorkPackageEstimate
{
get
@ -186234,6 +186306,16 @@ namespace Model
private string _ProjectId;
private string _ContractId;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderInDate;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
private System.Nullable<int> _State;
private string _InvoiceCode;
@ -186262,16 +186344,6 @@ namespace Model
private string _CreateUser;
private string _ContractId;
private System.Nullable<System.DateTime> _OrderInDate;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -186280,6 +186352,16 @@ namespace Model
partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable<int> value);
partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value);
@ -186308,16 +186390,6 @@ namespace Model
partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
#endregion
public PHTGL_Invoice()
@ -186365,6 +186437,106 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable<int> State
{
@ -186645,106 +186817,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -301975,7 +302047,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
public string Name
{
get
@ -302552,7 +302624,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@ -302743,7 +302815,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@ -308054,7 +308126,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@ -309526,7 +309598,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@ -319077,7 +319149,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
public string ContractNo
{
get
@ -319097,7 +319169,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
public string UnitWorks
{
get

1
SGGL/Model/Model.csproj
View File

@ -68,6 +68,7 @@
<Compile Include="APIItem\ArchitectureReport.cs" />
<Compile Include="APIItem\ArchitectureReportItem.cs" />
<Compile Include="APIItem\BaseInfoItem.cs" />
<Compile Include="APIItem\BaseProjectItem.cs" />
<Compile Include="APIItem\ChemicalReport.cs" />
<Compile Include="APIItem\ChemicalReportItem.cs" />
<Compile Include="APIItem\DigData\SafeLawItem.cs" />