1102-gaofei
This commit is contained in:
parent
d830ad232c
commit
97904d080f
|
@ -0,0 +1,57 @@
|
|||
alter table [dbo].[Base_Project] add HJProjectCode nvarchar(50) null
|
||||
alter table [dbo].[Base_Project] add KZProjectCode nvarchar(50) null
|
||||
GO
|
||||
|
||||
|
||||
CREATE TABLE [dbo].[HJGL_FinishRate](
|
||||
[Id] [nvarchar](50) NOT NULL,
|
||||
[ProjectId] [nvarchar](50) NULL,
|
||||
[Type] [nvarchar](50) NULL,
|
||||
[Code] [nvarchar](50) NULL,
|
||||
[Name] [nvarchar](50) NULL,
|
||||
[TotalNum] [int] NULL,
|
||||
[FinishNum] [int] NULL,
|
||||
[Rate] [nvarchar](20) NULL,
|
||||
CONSTRAINT [PK_HJGL_FinishRate] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[Id] ASC
|
||||
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
|
||||
) ON [PRIMARY]
|
||||
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[HJGL_FinishRate] WITH CHECK ADD CONSTRAINT [FK_HJGL_FinishRate_Base_Project] FOREIGN KEY([ProjectId])
|
||||
REFERENCES [dbo].[Base_Project] ([ProjectId])
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[HJGL_FinishRate] CHECK CONSTRAINT [FK_HJGL_FinishRate_Base_Project]
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate', @level2type=N'COLUMN',@level2name=N'Id'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate', @level2type=N'COLUMN',@level2name=N'ProjectId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate', @level2type=N'COLUMN',@level2name=N'Type'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'代号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate', @level2type=N'COLUMN',@level2name=N'Code'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate', @level2type=N'COLUMN',@level2name=N'Name'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'总量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate', @level2type=N'COLUMN',@level2name=N'TotalNum'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'已完成量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate', @level2type=N'COLUMN',@level2name=N'FinishNum'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'完成进度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate', @level2type=N'COLUMN',@level2name=N'Rate'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'焊接完成进度表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_FinishRate'
|
||||
GO
|
||||
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
public static class APIGetHJDataService
|
||||
{
|
||||
#region 保存完成情况
|
||||
/// <summary>
|
||||
/// 保存完成情况
|
||||
/// </summary>
|
||||
/// <param name="list">完成情况</param>
|
||||
/// <returns></returns>
|
||||
public static string SaveFinishRate(List<Model.HJGL_FinishRate> list)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
string message = string.Empty;
|
||||
if (list.Count > 0)
|
||||
{
|
||||
|
||||
var project = db.Base_Project.FirstOrDefault(x => x.HJProjectCode == list[0].ProjectId);
|
||||
if (project != null)
|
||||
{
|
||||
string projectId = project.ProjectId;
|
||||
foreach (var item in list)
|
||||
{
|
||||
Model.HJGL_FinishRate newFinishRate = new Model.HJGL_FinishRate
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
ProjectId = projectId,
|
||||
Type = item.Type,
|
||||
Code = item.Code,
|
||||
Name = item.Name,
|
||||
TotalNum = item.TotalNum,
|
||||
FinishNum = item.FinishNum,
|
||||
Rate = item.Rate,
|
||||
};
|
||||
db.HJGL_FinishRate.InsertOnSubmit(newFinishRate);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
message = "提交成功!";
|
||||
}
|
||||
else
|
||||
{
|
||||
message = "项目号不存在!";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
message = "记录为空!";
|
||||
}
|
||||
return message;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
|
@ -93,6 +93,7 @@
|
|||
<Compile Include="API\APIUnitService.cs" />
|
||||
<Compile Include="API\APIUpLoadFileService.cs" />
|
||||
<Compile Include="API\APIUserService.cs" />
|
||||
<Compile Include="API\HJGL\APIGetHJDataService.cs" />
|
||||
<Compile Include="API\HJGL\APIHotProcessHardService.cs" />
|
||||
<Compile Include="API\HJGL\APINDETrustService.cs" />
|
||||
<Compile Include="API\HJGL\APIPipeJointService.cs" />
|
||||
|
|
|
@ -135,6 +135,8 @@
|
|||
Province = project.Province,
|
||||
City = project.City,
|
||||
EnglishRemark = project.EnglishRemark,
|
||||
HJProjectCode = project.HJProjectCode,
|
||||
KZProjectCode = project.KZProjectCode,
|
||||
Progress = project.Progress,
|
||||
};
|
||||
db.Base_Project.InsertOnSubmit(newProject);
|
||||
|
@ -181,6 +183,8 @@
|
|||
newProject.Province = project.Province;
|
||||
newProject.City = project.City;
|
||||
newProject.EnglishRemark = project.EnglishRemark;
|
||||
newProject.HJProjectCode = project.HJProjectCode;
|
||||
newProject.KZProjectCode = project.KZProjectCode;
|
||||
newProject.Progress = project.Progress;
|
||||
db.SubmitChanges();
|
||||
HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
|
||||
|
@ -446,7 +450,7 @@
|
|||
string name = string.Empty;
|
||||
if (projectId != null)
|
||||
{
|
||||
name = (from x in db.Project_ProjectUser
|
||||
name = (from x in db.Project_ProjectUser
|
||||
join y in db.Sys_User on x.UserId equals y.UserId
|
||||
where x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.HSSEManager)
|
||||
select y.UserName).FirstOrDefault();
|
||||
|
@ -462,7 +466,7 @@
|
|||
/// <returns></returns>
|
||||
public static Model.Project_ProjectUser getHSSEManager(string projectId)
|
||||
{
|
||||
return Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.HSSEManager));
|
||||
return Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.HSSEManager));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -141,6 +141,12 @@
|
|||
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtHJProjectCode" runat="server" Label="焊接软件项目编号" LabelWidth="150px" MaxLength="50" ></f:TextBox>
|
||||
<f:TextBox ID="txtKZProjectCode" runat="server" Label="控制软件项目编号" LabelWidth="150px" MaxLength="50" ></f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:NumberBox runat="server" ID="txtProgress" Label="项目进度(%)" NoNegative="true" ></f:NumberBox>
|
||||
|
|
|
@ -163,9 +163,11 @@ namespace FineUIPro.Web.ProjectData
|
|||
this.drpProvince.SelectedValue = project.Province;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
this.txtCity.Text = project.City;
|
||||
this.txtEnglishRemark.Text = project.EnglishRemark;
|
||||
this.txtHJProjectCode.Text = project.HJProjectCode;
|
||||
this.txtKZProjectCode.Text = project.KZProjectCode;
|
||||
if (project.Progress != null)
|
||||
{
|
||||
this.txtProgress.Text = project.Progress.ToString();
|
||||
|
@ -197,7 +199,8 @@ namespace FineUIPro.Web.ProjectData
|
|||
ConstructionMoney = Funs.GetNewDecimal(this.txtConstructionMoney.Text),
|
||||
Remark = this.txtRemark.Text.Trim(),
|
||||
Telephone = this.txtTelephone.Text.Trim(),
|
||||
|
||||
HJProjectCode = this.txtHJProjectCode.Text.Trim(),
|
||||
KZProjectCode = this.txtKZProjectCode.Text.Trim(),
|
||||
City = this.txtCity.Text.Trim(),
|
||||
EnglishRemark = this.txtEnglishRemark.Text.Trim(),
|
||||
Progress = Funs.GetNewDecimal(this.txtProgress.Text),
|
||||
|
@ -396,7 +399,7 @@ namespace FineUIPro.Web.ProjectData
|
|||
OldProjectManager = m.UserId;
|
||||
}
|
||||
////此人不在项目中
|
||||
if (!string.IsNullOrEmpty(newProjectManager) && newProjectManager !=Const._Null && newProjectManager != OldProjectManager)
|
||||
if (!string.IsNullOrEmpty(newProjectManager) && newProjectManager != Const._Null && newProjectManager != OldProjectManager)
|
||||
{
|
||||
BLL.ProjectUserService.DeleteProjectUserByProjectIdUserId(projectId, newProjectManager);
|
||||
BLL.ProjectUserService.DeleteProjectUserByProjectIdUserId(projectId, OldProjectManager);
|
||||
|
|
|
@ -309,6 +309,24 @@ namespace FineUIPro.Web.ProjectData {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtEnglishRemark;
|
||||
|
||||
/// <summary>
|
||||
/// txtHJProjectCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtHJProjectCode;
|
||||
|
||||
/// <summary>
|
||||
/// txtKZProjectCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtKZProjectCode;
|
||||
|
||||
/// <summary>
|
||||
/// txtProgress 控件。
|
||||
/// </summary>
|
||||
|
|
|
@ -100,6 +100,12 @@
|
|||
<f:TextBox ID="txtMapCoordinates" runat="server" Label="坐标" Readonly="true"></f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtHJProjectCode" runat="server" Label="焊接软件项目编号" LabelWidth="150px" MaxLength="50" Readonly="true"></f:TextBox>
|
||||
<f:TextBox ID="txtKZProjectCode" runat="server" Label="控制软件项目编号" LabelWidth="150px" MaxLength="50" Readonly="true"></f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" Readonly="true"></f:TextBox>
|
||||
|
|
|
@ -100,6 +100,8 @@ namespace FineUIPro.Web.ProjectData
|
|||
this.txtProvince.Text = project.Province;
|
||||
this.txtCity.Text = project.City;
|
||||
this.txtEnglishRemark.Text = project.EnglishRemark;
|
||||
this.txtHJProjectCode.Text = project.HJProjectCode;
|
||||
this.txtKZProjectCode.Text = project.KZProjectCode;
|
||||
if (project.Progress != null)
|
||||
{
|
||||
this.txtProgress.Text = project.Progress.ToString();
|
||||
|
|
|
@ -282,6 +282,24 @@ namespace FineUIPro.Web.ProjectData {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtMapCoordinates;
|
||||
|
||||
/// <summary>
|
||||
/// txtHJProjectCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtHJProjectCode;
|
||||
|
||||
/// <summary>
|
||||
/// txtKZProjectCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtKZProjectCode;
|
||||
|
||||
/// <summary>
|
||||
/// txtEnglishRemark 控件。
|
||||
/// </summary>
|
||||
|
|
|
@ -731,6 +731,9 @@ namespace Model
|
|||
partial void InsertHJGL_Batch_PointBatchItem(HJGL_Batch_PointBatchItem instance);
|
||||
partial void UpdateHJGL_Batch_PointBatchItem(HJGL_Batch_PointBatchItem instance);
|
||||
partial void DeleteHJGL_Batch_PointBatchItem(HJGL_Batch_PointBatchItem instance);
|
||||
partial void InsertHJGL_FinishRate(HJGL_FinishRate instance);
|
||||
partial void UpdateHJGL_FinishRate(HJGL_FinishRate instance);
|
||||
partial void DeleteHJGL_FinishRate(HJGL_FinishRate instance);
|
||||
partial void InsertHJGL_Hard_Report(HJGL_Hard_Report instance);
|
||||
partial void UpdateHJGL_Hard_Report(HJGL_Hard_Report instance);
|
||||
partial void DeleteHJGL_Hard_Report(HJGL_Hard_Report instance);
|
||||
|
@ -3910,6 +3913,14 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<HJGL_FinishRate> HJGL_FinishRate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetTable<HJGL_FinishRate>();
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<HJGL_Hard_Report> HJGL_Hard_Report
|
||||
{
|
||||
get
|
||||
|
@ -22375,6 +22386,10 @@ namespace Model
|
|||
|
||||
private string _JTProjectCode;
|
||||
|
||||
private string _HJProjectCode;
|
||||
|
||||
private string _KZProjectCode;
|
||||
|
||||
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
|
||||
|
||||
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
|
||||
|
@ -22601,6 +22616,8 @@ namespace Model
|
|||
|
||||
private EntitySet<HJGL_Batch_BatchTrust> _HJGL_Batch_BatchTrust;
|
||||
|
||||
private EntitySet<HJGL_FinishRate> _HJGL_FinishRate;
|
||||
|
||||
private EntitySet<HJGL_LV_LeakVacuum> _HJGL_LV_LeakVacuum;
|
||||
|
||||
private EntitySet<HJGL_PC_PurgingCleaning> _HJGL_PC_PurgingCleaning;
|
||||
|
@ -22977,6 +22994,10 @@ namespace Model
|
|||
partial void OnProgressChanged();
|
||||
partial void OnJTProjectCodeChanging(string value);
|
||||
partial void OnJTProjectCodeChanged();
|
||||
partial void OnHJProjectCodeChanging(string value);
|
||||
partial void OnHJProjectCodeChanged();
|
||||
partial void OnKZProjectCodeChanging(string value);
|
||||
partial void OnKZProjectCodeChanged();
|
||||
#endregion
|
||||
|
||||
public Base_Project()
|
||||
|
@ -23094,6 +23115,7 @@ namespace Model
|
|||
this._Hazard_EnvironmentalRiskList = new EntitySet<Hazard_EnvironmentalRiskList>(new Action<Hazard_EnvironmentalRiskList>(this.attach_Hazard_EnvironmentalRiskList), new Action<Hazard_EnvironmentalRiskList>(this.detach_Hazard_EnvironmentalRiskList));
|
||||
this._Hazard_HazardList = new EntitySet<Hazard_HazardList>(new Action<Hazard_HazardList>(this.attach_Hazard_HazardList), new Action<Hazard_HazardList>(this.detach_Hazard_HazardList));
|
||||
this._HJGL_Batch_BatchTrust = new EntitySet<HJGL_Batch_BatchTrust>(new Action<HJGL_Batch_BatchTrust>(this.attach_HJGL_Batch_BatchTrust), new Action<HJGL_Batch_BatchTrust>(this.detach_HJGL_Batch_BatchTrust));
|
||||
this._HJGL_FinishRate = new EntitySet<HJGL_FinishRate>(new Action<HJGL_FinishRate>(this.attach_HJGL_FinishRate), new Action<HJGL_FinishRate>(this.detach_HJGL_FinishRate));
|
||||
this._HJGL_LV_LeakVacuum = new EntitySet<HJGL_LV_LeakVacuum>(new Action<HJGL_LV_LeakVacuum>(this.attach_HJGL_LV_LeakVacuum), new Action<HJGL_LV_LeakVacuum>(this.detach_HJGL_LV_LeakVacuum));
|
||||
this._HJGL_PC_PurgingCleaning = new EntitySet<HJGL_PC_PurgingCleaning>(new Action<HJGL_PC_PurgingCleaning>(this.attach_HJGL_PC_PurgingCleaning), new Action<HJGL_PC_PurgingCleaning>(this.detach_HJGL_PC_PurgingCleaning));
|
||||
this._HJGL_Pipeline = new EntitySet<HJGL_Pipeline>(new Action<HJGL_Pipeline>(this.attach_HJGL_Pipeline), new Action<HJGL_Pipeline>(this.detach_HJGL_Pipeline));
|
||||
|
@ -23899,6 +23921,46 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HJProjectCode", DbType="NVarChar(50)")]
|
||||
public string HJProjectCode
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._HJProjectCode;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._HJProjectCode != value))
|
||||
{
|
||||
this.OnHJProjectCodeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._HJProjectCode = value;
|
||||
this.SendPropertyChanged("HJProjectCode");
|
||||
this.OnHJProjectCodeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KZProjectCode", DbType="NVarChar(50)")]
|
||||
public string KZProjectCode
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._KZProjectCode;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._KZProjectCode != value))
|
||||
{
|
||||
this.OnKZProjectCodeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._KZProjectCode = value;
|
||||
this.SendPropertyChanged("KZProjectCode");
|
||||
this.OnKZProjectCodeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
|
||||
{
|
||||
|
@ -25410,6 +25472,19 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FinishRate_Base_Project", Storage="_HJGL_FinishRate", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<HJGL_FinishRate> HJGL_FinishRate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._HJGL_FinishRate;
|
||||
}
|
||||
set
|
||||
{
|
||||
this._HJGL_FinishRate.Assign(value);
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_LV_LeakVacuum_Base_Project", Storage="_HJGL_LV_LeakVacuum", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<HJGL_LV_LeakVacuum> HJGL_LV_LeakVacuum
|
||||
{
|
||||
|
@ -28764,6 +28839,18 @@ namespace Model
|
|||
entity.Base_Project = null;
|
||||
}
|
||||
|
||||
private void attach_HJGL_FinishRate(HJGL_FinishRate entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Base_Project = this;
|
||||
}
|
||||
|
||||
private void detach_HJGL_FinishRate(HJGL_FinishRate entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
entity.Base_Project = null;
|
||||
}
|
||||
|
||||
private void attach_HJGL_LV_LeakVacuum(HJGL_LV_LeakVacuum entity)
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
|
@ -71078,7 +71165,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualifiedProjectCode", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualifiedProjectCode", DbType="NVarChar(500)")]
|
||||
public string QualifiedProjectCode
|
||||
{
|
||||
get
|
||||
|
@ -116551,6 +116638,277 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_FinishRate")]
|
||||
public partial class HJGL_FinishRate : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
|
||||
|
||||
private string _Id;
|
||||
|
||||
private string _ProjectId;
|
||||
|
||||
private string _Type;
|
||||
|
||||
private string _Code;
|
||||
|
||||
private string _Name;
|
||||
|
||||
private System.Nullable<int> _TotalNum;
|
||||
|
||||
private System.Nullable<int> _FinishNum;
|
||||
|
||||
private string _Rate;
|
||||
|
||||
private EntityRef<Base_Project> _Base_Project;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
partial void OnLoaded();
|
||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||
partial void OnCreated();
|
||||
partial void OnIdChanging(string value);
|
||||
partial void OnIdChanged();
|
||||
partial void OnProjectIdChanging(string value);
|
||||
partial void OnProjectIdChanged();
|
||||
partial void OnTypeChanging(string value);
|
||||
partial void OnTypeChanged();
|
||||
partial void OnCodeChanging(string value);
|
||||
partial void OnCodeChanged();
|
||||
partial void OnNameChanging(string value);
|
||||
partial void OnNameChanged();
|
||||
partial void OnTotalNumChanging(System.Nullable<int> value);
|
||||
partial void OnTotalNumChanged();
|
||||
partial void OnFinishNumChanging(System.Nullable<int> value);
|
||||
partial void OnFinishNumChanged();
|
||||
partial void OnRateChanging(string value);
|
||||
partial void OnRateChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_FinishRate()
|
||||
{
|
||||
this._Base_Project = default(EntityRef<Base_Project>);
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
|
||||
public string Id
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Id;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Id != value))
|
||||
{
|
||||
this.OnIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Id = value;
|
||||
this.SendPropertyChanged("Id");
|
||||
this.OnIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
|
||||
public string ProjectId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ProjectId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._ProjectId != value))
|
||||
{
|
||||
if (this._Base_Project.HasLoadedOrAssignedValue)
|
||||
{
|
||||
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
|
||||
}
|
||||
this.OnProjectIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._ProjectId = value;
|
||||
this.SendPropertyChanged("ProjectId");
|
||||
this.OnProjectIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="NVarChar(50)")]
|
||||
public string Type
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Type;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Type != value))
|
||||
{
|
||||
this.OnTypeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Type = value;
|
||||
this.SendPropertyChanged("Type");
|
||||
this.OnTypeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")]
|
||||
public string Code
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Code;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Code != value))
|
||||
{
|
||||
this.OnCodeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Code = value;
|
||||
this.SendPropertyChanged("Code");
|
||||
this.OnCodeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
|
||||
public string Name
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Name;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Name != value))
|
||||
{
|
||||
this.OnNameChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Name = value;
|
||||
this.SendPropertyChanged("Name");
|
||||
this.OnNameChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalNum", DbType="Int")]
|
||||
public System.Nullable<int> TotalNum
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._TotalNum;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._TotalNum != value))
|
||||
{
|
||||
this.OnTotalNumChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._TotalNum = value;
|
||||
this.SendPropertyChanged("TotalNum");
|
||||
this.OnTotalNumChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FinishNum", DbType="Int")]
|
||||
public System.Nullable<int> FinishNum
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._FinishNum;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._FinishNum != value))
|
||||
{
|
||||
this.OnFinishNumChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._FinishNum = value;
|
||||
this.SendPropertyChanged("FinishNum");
|
||||
this.OnFinishNumChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rate", DbType="NVarChar(20)")]
|
||||
public string Rate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Rate;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._Rate != value))
|
||||
{
|
||||
this.OnRateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._Rate = value;
|
||||
this.SendPropertyChanged("Rate");
|
||||
this.OnRateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_FinishRate_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
|
||||
public Base_Project Base_Project
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Base_Project.Entity;
|
||||
}
|
||||
set
|
||||
{
|
||||
Base_Project previousValue = this._Base_Project.Entity;
|
||||
if (((previousValue != value)
|
||||
|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
|
||||
{
|
||||
this.SendPropertyChanging();
|
||||
if ((previousValue != null))
|
||||
{
|
||||
this._Base_Project.Entity = null;
|
||||
previousValue.HJGL_FinishRate.Remove(this);
|
||||
}
|
||||
this._Base_Project.Entity = value;
|
||||
if ((value != null))
|
||||
{
|
||||
value.HJGL_FinishRate.Add(this);
|
||||
this._ProjectId = value.ProjectId;
|
||||
}
|
||||
else
|
||||
{
|
||||
this._ProjectId = default(string);
|
||||
}
|
||||
this.SendPropertyChanged("Base_Project");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event PropertyChangingEventHandler PropertyChanging;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
protected virtual void SendPropertyChanging()
|
||||
{
|
||||
if ((this.PropertyChanging != null))
|
||||
{
|
||||
this.PropertyChanging(this, emptyChangingEventArgs);
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void SendPropertyChanged(String propertyName)
|
||||
{
|
||||
if ((this.PropertyChanged != null))
|
||||
{
|
||||
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_Hard_Report")]
|
||||
public partial class HJGL_Hard_Report : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
@ -333924,7 +334282,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(100)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(102)")]
|
||||
public string Name
|
||||
{
|
||||
get
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Web.Http;
|
||||
using BLL;
|
||||
|
||||
namespace WebAPI.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
/// 获取焊接数据接口
|
||||
/// </summary>
|
||||
public class GetHJDataController : ApiController
|
||||
{
|
||||
#region 保存完成情况
|
||||
/// <summary>
|
||||
/// 保存完成情况
|
||||
/// </summary>
|
||||
/// <param name="list">完成情况</param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public Model.ResponeData SaveFinishRate([FromBody] List<Model.HJGL_FinishRate> list)
|
||||
{
|
||||
var responeData = new Model.ResponeData();
|
||||
try
|
||||
{
|
||||
responeData.message = APIGetHJDataService.SaveFinishRate(list);
|
||||
if (responeData.message == "提交成功!")
|
||||
{
|
||||
responeData.code = 1;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = ex.Message;
|
||||
}
|
||||
|
||||
return responeData;
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
|
@ -178,6 +178,7 @@
|
|||
<Compile Include="Controllers\DoorProject\uploadController.cs" />
|
||||
<Compile Include="Controllers\FaceController.cs" />
|
||||
<Compile Include="Controllers\DoorServerController.cs" />
|
||||
<Compile Include="Controllers\HJGL\GetHJDataController.cs" />
|
||||
<Compile Include="Controllers\Person\PersonCheckController.cs" />
|
||||
<Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />
|
||||
<Compile Include="Controllers\CQMS\CheckListController.cs" />
|
||||
|
|
Loading…
Reference in New Issue