From 97904d080ff22764be9280967acb1385fc0dbe01 Mon Sep 17 00:00:00 2001
From: gaofei <231232131@163.com>
Date: Tue, 2 Nov 2021 13:32:31 +0800
Subject: [PATCH] 1102-gaofei
---
DataBase/版本日志/SGGLDB_V2021-11-02-001.sql | 57 +++
SGGL/BLL/API/HJGL/APIGetHJDataService.cs | 61 +++
SGGL/BLL/BLL.csproj | 1 +
SGGL/BLL/ProjectData/ProjectService.cs | 8 +-
.../ProjectData/ProjectSetSave.aspx | 6 +
.../ProjectData/ProjectSetSave.aspx.cs | 9 +-
.../ProjectSetSave.aspx.designer.cs | 18 +
.../ProjectData/ProjectSetView.aspx | 6 +
.../ProjectData/ProjectSetView.aspx.cs | 2 +
.../ProjectSetView.aspx.designer.cs | 18 +
SGGL/Model/Model.cs | 362 +++++++++++++++++-
.../Controllers/HJGL/GetHJDataController.cs | 45 +++
SGGL/WebAPI/WebAPI.csproj | 1 +
13 files changed, 587 insertions(+), 7 deletions(-)
create mode 100644 DataBase/版本日志/SGGLDB_V2021-11-02-001.sql
create mode 100644 SGGL/BLL/API/HJGL/APIGetHJDataService.cs
create mode 100644 SGGL/WebAPI/Controllers/HJGL/GetHJDataController.cs
diff --git a/DataBase/版本日志/SGGLDB_V2021-11-02-001.sql b/DataBase/版本日志/SGGLDB_V2021-11-02-001.sql
new file mode 100644
index 00000000..9fa353bd
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2021-11-02-001.sql
@@ -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
+
+
diff --git a/SGGL/BLL/API/HJGL/APIGetHJDataService.cs b/SGGL/BLL/API/HJGL/APIGetHJDataService.cs
new file mode 100644
index 00000000..cc9cad1c
--- /dev/null
+++ b/SGGL/BLL/API/HJGL/APIGetHJDataService.cs
@@ -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 保存完成情况
+ ///
+ /// 保存完成情况
+ ///
+ /// 完成情况
+ ///
+ public static string SaveFinishRate(List 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
+ }
+}
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index db92246e..adc60b50 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -93,6 +93,7 @@
+
diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index ddebd906..4d24477a 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.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 @@
///
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));
}
///
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
index 9b629efa..30dde699 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
@@ -141,6 +141,12 @@
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
index 62e67b33..bb601d9a 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
@@ -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);
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs
index cbeea9bc..d28806d8 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs
@@ -309,6 +309,24 @@ namespace FineUIPro.Web.ProjectData {
///
protected global::FineUIPro.TextBox txtEnglishRemark;
+ ///
+ /// txtHJProjectCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtHJProjectCode;
+
+ ///
+ /// txtKZProjectCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtKZProjectCode;
+
///
/// txtProgress 控件。
///
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx
index de9460fd..91db6d71 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx
@@ -100,6 +100,12 @@
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs
index f1c9b9be..a9b1e359 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs
@@ -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();
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs
index 5b6b0b79..cbd49494 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs
@@ -282,6 +282,24 @@ namespace FineUIPro.Web.ProjectData {
///
protected global::FineUIPro.TextBox txtMapCoordinates;
+ ///
+ /// txtHJProjectCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtHJProjectCode;
+
+ ///
+ /// txtKZProjectCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtKZProjectCode;
+
///
/// txtEnglishRemark 控件。
///
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index fec1ad3c..62e242ad 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -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
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table HJGL_Hard_Report
{
get
@@ -22375,6 +22386,10 @@ namespace Model
private string _JTProjectCode;
+ private string _HJProjectCode;
+
+ private string _KZProjectCode;
+
private EntitySet _Accident_AccidentHandle;
private EntitySet _Accident_AccidentPersonRecord;
@@ -22601,6 +22616,8 @@ namespace Model
private EntitySet _HJGL_Batch_BatchTrust;
+ private EntitySet _HJGL_FinishRate;
+
private EntitySet _HJGL_LV_LeakVacuum;
private EntitySet _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(new Action(this.attach_Hazard_EnvironmentalRiskList), new Action(this.detach_Hazard_EnvironmentalRiskList));
this._Hazard_HazardList = new EntitySet(new Action(this.attach_Hazard_HazardList), new Action(this.detach_Hazard_HazardList));
this._HJGL_Batch_BatchTrust = new EntitySet(new Action(this.attach_HJGL_Batch_BatchTrust), new Action(this.detach_HJGL_Batch_BatchTrust));
+ this._HJGL_FinishRate = new EntitySet(new Action(this.attach_HJGL_FinishRate), new Action(this.detach_HJGL_FinishRate));
this._HJGL_LV_LeakVacuum = new EntitySet(new Action(this.attach_HJGL_LV_LeakVacuum), new Action(this.detach_HJGL_LV_LeakVacuum));
this._HJGL_PC_PurgingCleaning = new EntitySet(new Action(this.attach_HJGL_PC_PurgingCleaning), new Action(this.detach_HJGL_PC_PurgingCleaning));
this._HJGL_Pipeline = new EntitySet(new Action(this.attach_HJGL_Pipeline), new Action(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
{
@@ -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
+ {
+ 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
{
@@ -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 _TotalNum;
+
+ private System.Nullable _FinishNum;
+
+ private string _Rate;
+
+ private EntityRef _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 value);
+ partial void OnTotalNumChanged();
+ partial void OnFinishNumChanging(System.Nullable value);
+ partial void OnFinishNumChanged();
+ partial void OnRateChanging(string value);
+ partial void OnRateChanged();
+ #endregion
+
+ public HJGL_FinishRate()
+ {
+ this._Base_Project = default(EntityRef);
+ 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 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 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
diff --git a/SGGL/WebAPI/Controllers/HJGL/GetHJDataController.cs b/SGGL/WebAPI/Controllers/HJGL/GetHJDataController.cs
new file mode 100644
index 00000000..4ee4c626
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HJGL/GetHJDataController.cs
@@ -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
+{
+ ///
+ /// 获取焊接数据接口
+ ///
+ public class GetHJDataController : ApiController
+ {
+ #region 保存完成情况
+ ///
+ /// 保存完成情况
+ ///
+ /// 完成情况
+ ///
+ [HttpPost]
+ public Model.ResponeData SaveFinishRate([FromBody] List 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
+
+ }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 528f9b32..cbf6a794 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -178,6 +178,7 @@
+