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

This commit is contained in:
潘鸿锋 2024-07-26 09:38:35 +08:00
parent 47e63fb706 724edd0121
commit 2c1cd6b767
5 changed files with 146 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -2021,9 +2021,6 @@
<Content Include="Transfer\Chart\Instrumentation.aspx" />
<Content Include="Transfer\Chart\PunchlistFrom.aspx" />
<Content Include="Transfer\Chart\PunchlistFromChart.aspx" />
<Content Include="Transfer\Chart\PunchlistFromChartNew.aspx" />
<Content Include="Transfer\Chart\PunchlistFromProgress.aspx" />
<Content Include="Transfer\Chart\PunchlistFromSort.aspx" />
<Content Include="Transfer\Chart\TransferChart.aspx" />
<Content Include="Transfer\CivilStructure.aspx" />
<Content Include="Transfer\CivilStructureDataIn.aspx" />
@ -17590,27 +17587,6 @@
<Compile Include="Transfer\Chart\PunchlistFromChart.aspx.designer.cs">
<DependentUpon>PunchlistFromChart.aspx</DependentUpon>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromChartNew.aspx.cs">
<DependentUpon>PunchlistFromChartNew.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromChartNew.aspx.designer.cs">
<DependentUpon>PunchlistFromChartNew.aspx</DependentUpon>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromProgress.aspx.cs">
<DependentUpon>PunchlistFromProgress.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromProgress.aspx.designer.cs">
<DependentUpon>PunchlistFromProgress.aspx</DependentUpon>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromSort.aspx.cs">
<DependentUpon>PunchlistFromSort.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Transfer\Chart\PunchlistFromSort.aspx.designer.cs">
<DependentUpon>PunchlistFromSort.aspx</DependentUpon>
</Compile>
<Compile Include="Transfer\Chart\TransferChart.aspx.cs">
<DependentUpon>TransferChart.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -19096,10 +19072,8 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<!--<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
To modify your build process, add your task inside one of the targets below and uncomment it.
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />

2
SGGL/FineUIPro.Web/Web.config
View File

@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.6.1"/>
<compilation debug="false" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

213
SGGL/Model/Model.cs
View File

@ -62027,6 +62027,8 @@ namespace Model
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -62078,6 +62080,7 @@ namespace Model
public Check_CheckSpecial()
{
this._Base_Project = default(EntityRef<Base_Project>);
this._Technique_CheckItemSet = default(EntityRef<Technique_CheckItemSet>);
OnCreated();
}
@ -62396,6 +62399,10 @@ namespace Model
{
if ((this._CheckItemSetId != value))
{
if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnCheckItemSetIdChanging(value);
this.SendPropertyChanging();
this._CheckItemSetId = value;
@ -62539,6 +62546,40 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)]
public Technique_CheckItemSet Technique_CheckItemSet
{
get
{
return this._Technique_CheckItemSet.Entity;
}
set
{
Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity;
if (((previousValue != value)
|| (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Technique_CheckItemSet.Entity = null;
previousValue.Check_CheckSpecial.Remove(this);
}
this._Technique_CheckItemSet.Entity = value;
if ((value != null))
{
value.Check_CheckSpecial.Add(this);
this._CheckItemSetId = value.CheckItemSetId;
}
else
{
this._CheckItemSetId = default(string);
}
this.SendPropertyChanged("Technique_CheckItemSet");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -370499,6 +370540,8 @@ namespace Model
private System.Nullable<bool> _IsBuiltIn;
private EntitySet<Check_CheckSpecial> _Check_CheckSpecial;
private EntitySet<Technique_CheckItemDetail> _Technique_CheckItemDetail;
#region 可扩展性方法定义
@ -370525,6 +370568,7 @@ namespace Model
public Technique_CheckItemSet()
{
this._Check_CheckSpecial = new EntitySet<Check_CheckSpecial>(new Action<Check_CheckSpecial>(this.attach_Check_CheckSpecial), new Action<Check_CheckSpecial>(this.detach_Check_CheckSpecial));
this._Technique_CheckItemDetail = new EntitySet<Technique_CheckItemDetail>(new Action<Technique_CheckItemDetail>(this.attach_Technique_CheckItemDetail), new Action<Technique_CheckItemDetail>(this.detach_Technique_CheckItemDetail));
OnCreated();
}
@ -370689,6 +370733,19 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
public EntitySet<Check_CheckSpecial> Check_CheckSpecial
{
get
{
return this._Check_CheckSpecial;
}
set
{
this._Check_CheckSpecial.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
public EntitySet<Technique_CheckItemDetail> Technique_CheckItemDetail
{
@ -370722,6 +370779,18 @@ namespace Model
}
}
private void attach_Check_CheckSpecial(Check_CheckSpecial entity)
{
this.SendPropertyChanging();
entity.Technique_CheckItemSet = this;
}
private void detach_Check_CheckSpecial(Check_CheckSpecial entity)
{
this.SendPropertyChanging();
entity.Technique_CheckItemSet = null;
}
private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity)
{
this.SendPropertyChanging();
@ -394283,8 +394352,12 @@ namespace Model
private string _Comments;
private System.Nullable<long> _Num_NO;
private string _System_No;
private string _Sub_Sys_No;
private string _Cat;
private string _Raised_By;
@ -394305,6 +394378,8 @@ namespace Model
private string _PIC_WUH;
private string _Correction_Action;
private System.Nullable<System.DateTime> _Actual_Date;
private string _Cleared_By;
@ -394323,12 +394398,6 @@ namespace Model
private string _Remark;
private string _Sub_Sys_No;
private System.Nullable<long> _Num_NO;
private string _Correction_Action;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -394365,8 +394434,12 @@ namespace Model
partial void OnPUNCH_ITEM_STATUSChanged();
partial void OnCommentsChanging(string value);
partial void OnCommentsChanged();
partial void OnNum_NOChanging(System.Nullable<long> value);
partial void OnNum_NOChanged();
partial void OnSystem_NoChanging(string value);
partial void OnSystem_NoChanged();
partial void OnSub_Sys_NoChanging(string value);
partial void OnSub_Sys_NoChanged();
partial void OnCatChanging(string value);
partial void OnCatChanged();
partial void OnRaised_ByChanging(string value);
@ -394387,6 +394460,8 @@ namespace Model
partial void OnPICChanged();
partial void OnPIC_WUHChanging(string value);
partial void OnPIC_WUHChanged();
partial void OnCorrection_ActionChanging(string value);
partial void OnCorrection_ActionChanged();
partial void OnActual_DateChanging(System.Nullable<System.DateTime> value);
partial void OnActual_DateChanged();
partial void OnCleared_ByChanging(string value);
@ -394405,12 +394480,6 @@ namespace Model
partial void OnStatusChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnSub_Sys_NoChanging(string value);
partial void OnSub_Sys_NoChanged();
partial void OnNum_NOChanging(System.Nullable<long> value);
partial void OnNum_NOChanged();
partial void OnCorrection_ActionChanging(string value);
partial void OnCorrection_ActionChanged();
#endregion
public Transfer_PunchlistFrom()
@ -394738,6 +394807,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="BigInt")]
public System.Nullable<long> Num_NO
{
get
{
return this._Num_NO;
}
set
{
if ((this._Num_NO != value))
{
this.OnNum_NOChanging(value);
this.SendPropertyChanging();
this._Num_NO = value;
this.SendPropertyChanged("Num_NO");
this.OnNum_NOChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")]
public string System_No
{
@ -394758,6 +394847,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
public string Sub_Sys_No
{
get
{
return this._Sub_Sys_No;
}
set
{
if ((this._Sub_Sys_No != value))
{
this.OnSub_Sys_NoChanging(value);
this.SendPropertyChanging();
this._Sub_Sys_No = value;
this.SendPropertyChanged("Sub_Sys_No");
this.OnSub_Sys_NoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")]
public string Cat
{
@ -394958,6 +395067,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
public string Correction_Action
{
get
{
return this._Correction_Action;
}
set
{
if ((this._Correction_Action != value))
{
this.OnCorrection_ActionChanging(value);
this.SendPropertyChanging();
this._Correction_Action = value;
this.SendPropertyChanged("Correction_Action");
this.OnCorrection_ActionChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")]
public System.Nullable<System.DateTime> Actual_Date
{
@ -395138,66 +395267,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
public string Sub_Sys_No
{
get
{
return this._Sub_Sys_No;
}
set
{
if ((this._Sub_Sys_No != value))
{
this.OnSub_Sys_NoChanging(value);
this.SendPropertyChanging();
this._Sub_Sys_No = value;
this.SendPropertyChanged("Sub_Sys_No");
this.OnSub_Sys_NoChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="BigInt")]
public System.Nullable<long> Num_NO
{
get
{
return this._Num_NO;
}
set
{
if ((this._Num_NO != value))
{
this.OnNum_NOChanging(value);
this.SendPropertyChanging();
this._Num_NO = value;
this.SendPropertyChanged("Num_NO");
this.OnNum_NOChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
public string Correction_Action
{
get
{
return this._Correction_Action;
}
set
{
if ((this._Correction_Action != value))
{
this.OnCorrection_ActionChanging(value);
this.SendPropertyChanging();
this._Correction_Action = value;
this.SendPropertyChanged("Correction_Action");
this.OnCorrection_ActionChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />