diff --git a/DataBase/版本日志/SGGLDB_V2025-12-20.sql b/DataBase/版本日志/SGGLDB_V2025-12-20.sql
index 83d9a18f..1457e7be 100644
--- a/DataBase/版本日志/SGGLDB_V2025-12-20.sql
+++ b/DataBase/版本日志/SGGLDB_V2025-12-20.sql
@@ -34,3 +34,39 @@ CREATE TABLE [dbo].[Project_Devices](
GO
+Alter TABLE [dbo].[Person_Persons]
+add [YunMouState] [nvarchar](50) NULL
+GO
+
+
+
+
+CREATE TABLE [dbo].[Kqgl_DateManage](
+ [Id] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [AmStartTime1] [time](7) NULL,
+ [AmStartTime2] [time](7) NULL,
+ [AmEndTime1] [time](7) NULL,
+ [AmEndTime2] [time](7) NULL,
+ [PmStartTime1] [time](7) NULL,
+ [PmStartTime2] [time](7) NULL,
+ [PmEndTime1] [time](7) NULL,
+ [PmEndTime2] [time](7) NULL,
+ [LateTime] [int] NULL,
+ [LeaveTime] [int] NULL,
+ [EquipmentCode] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Kqgl_DateManage] 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
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'允许迟到' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Kqgl_DateManage', @level2type=N'COLUMN',@level2name=N'LateTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'允许早退' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Kqgl_DateManage', @level2type=N'COLUMN',@level2name=N'LeaveTime'
+GO
+
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index ba58f7e9..a4dfcd34 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -16838,7 +16838,7 @@
-
+
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 9d3b943d..d873c5d0 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -914,6 +914,9 @@ namespace Model
partial void InsertInterFaceTask(InterFaceTask instance);
partial void UpdateInterFaceTask(InterFaceTask instance);
partial void DeleteInterFaceTask(InterFaceTask instance);
+ partial void InsertKqgl_DateManage(Kqgl_DateManage instance);
+ partial void UpdateKqgl_DateManage(Kqgl_DateManage instance);
+ partial void DeleteKqgl_DateManage(Kqgl_DateManage instance);
partial void InsertLaw_HSSEStandardsList(Law_HSSEStandardsList instance);
partial void UpdateLaw_HSSEStandardsList(Law_HSSEStandardsList instance);
partial void DeleteLaw_HSSEStandardsList(Law_HSSEStandardsList instance);
@@ -4292,6 +4295,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table Kqgl_DateManage
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table Law_HSSEStandardsList
{
get
@@ -144327,6 +144338,356 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Kqgl_DateManage")]
+ public partial class Kqgl_DateManage : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _Id;
+
+ private string _ProjectId;
+
+ private System.Nullable _AmStartTime1;
+
+ private System.Nullable _AmStartTime2;
+
+ private System.Nullable _AmEndTime1;
+
+ private System.Nullable _AmEndTime2;
+
+ private System.Nullable _PmStartTime1;
+
+ private System.Nullable _PmStartTime2;
+
+ private System.Nullable _PmEndTime1;
+
+ private System.Nullable _PmEndTime2;
+
+ private System.Nullable _LateTime;
+
+ private System.Nullable _LeaveTime;
+
+ private string _EquipmentCode;
+
+ #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 OnAmStartTime1Changing(System.Nullable value);
+ partial void OnAmStartTime1Changed();
+ partial void OnAmStartTime2Changing(System.Nullable value);
+ partial void OnAmStartTime2Changed();
+ partial void OnAmEndTime1Changing(System.Nullable value);
+ partial void OnAmEndTime1Changed();
+ partial void OnAmEndTime2Changing(System.Nullable value);
+ partial void OnAmEndTime2Changed();
+ partial void OnPmStartTime1Changing(System.Nullable value);
+ partial void OnPmStartTime1Changed();
+ partial void OnPmStartTime2Changing(System.Nullable value);
+ partial void OnPmStartTime2Changed();
+ partial void OnPmEndTime1Changing(System.Nullable value);
+ partial void OnPmEndTime1Changed();
+ partial void OnPmEndTime2Changing(System.Nullable value);
+ partial void OnPmEndTime2Changed();
+ partial void OnLateTimeChanging(System.Nullable value);
+ partial void OnLateTimeChanged();
+ partial void OnLeaveTimeChanging(System.Nullable value);
+ partial void OnLeaveTimeChanged();
+ partial void OnEquipmentCodeChanging(string value);
+ partial void OnEquipmentCodeChanged();
+ #endregion
+
+ public Kqgl_DateManage()
+ {
+ 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))
+ {
+ this.OnProjectIdChanging(value);
+ this.SendPropertyChanging();
+ this._ProjectId = value;
+ this.SendPropertyChanged("ProjectId");
+ this.OnProjectIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AmStartTime1", DbType="Time(7)")]
+ public System.Nullable AmStartTime1
+ {
+ get
+ {
+ return this._AmStartTime1;
+ }
+ set
+ {
+ if ((this._AmStartTime1 != value))
+ {
+ this.OnAmStartTime1Changing(value);
+ this.SendPropertyChanging();
+ this._AmStartTime1 = value;
+ this.SendPropertyChanged("AmStartTime1");
+ this.OnAmStartTime1Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AmStartTime2", DbType="Time(7)")]
+ public System.Nullable AmStartTime2
+ {
+ get
+ {
+ return this._AmStartTime2;
+ }
+ set
+ {
+ if ((this._AmStartTime2 != value))
+ {
+ this.OnAmStartTime2Changing(value);
+ this.SendPropertyChanging();
+ this._AmStartTime2 = value;
+ this.SendPropertyChanged("AmStartTime2");
+ this.OnAmStartTime2Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AmEndTime1", DbType="Time(7)")]
+ public System.Nullable AmEndTime1
+ {
+ get
+ {
+ return this._AmEndTime1;
+ }
+ set
+ {
+ if ((this._AmEndTime1 != value))
+ {
+ this.OnAmEndTime1Changing(value);
+ this.SendPropertyChanging();
+ this._AmEndTime1 = value;
+ this.SendPropertyChanged("AmEndTime1");
+ this.OnAmEndTime1Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AmEndTime2", DbType="Time(7)")]
+ public System.Nullable AmEndTime2
+ {
+ get
+ {
+ return this._AmEndTime2;
+ }
+ set
+ {
+ if ((this._AmEndTime2 != value))
+ {
+ this.OnAmEndTime2Changing(value);
+ this.SendPropertyChanging();
+ this._AmEndTime2 = value;
+ this.SendPropertyChanged("AmEndTime2");
+ this.OnAmEndTime2Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PmStartTime1", DbType="Time(7)")]
+ public System.Nullable PmStartTime1
+ {
+ get
+ {
+ return this._PmStartTime1;
+ }
+ set
+ {
+ if ((this._PmStartTime1 != value))
+ {
+ this.OnPmStartTime1Changing(value);
+ this.SendPropertyChanging();
+ this._PmStartTime1 = value;
+ this.SendPropertyChanged("PmStartTime1");
+ this.OnPmStartTime1Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PmStartTime2", DbType="Time(7)")]
+ public System.Nullable PmStartTime2
+ {
+ get
+ {
+ return this._PmStartTime2;
+ }
+ set
+ {
+ if ((this._PmStartTime2 != value))
+ {
+ this.OnPmStartTime2Changing(value);
+ this.SendPropertyChanging();
+ this._PmStartTime2 = value;
+ this.SendPropertyChanged("PmStartTime2");
+ this.OnPmStartTime2Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PmEndTime1", DbType="Time(7)")]
+ public System.Nullable PmEndTime1
+ {
+ get
+ {
+ return this._PmEndTime1;
+ }
+ set
+ {
+ if ((this._PmEndTime1 != value))
+ {
+ this.OnPmEndTime1Changing(value);
+ this.SendPropertyChanging();
+ this._PmEndTime1 = value;
+ this.SendPropertyChanged("PmEndTime1");
+ this.OnPmEndTime1Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PmEndTime2", DbType="Time(7)")]
+ public System.Nullable PmEndTime2
+ {
+ get
+ {
+ return this._PmEndTime2;
+ }
+ set
+ {
+ if ((this._PmEndTime2 != value))
+ {
+ this.OnPmEndTime2Changing(value);
+ this.SendPropertyChanging();
+ this._PmEndTime2 = value;
+ this.SendPropertyChanged("PmEndTime2");
+ this.OnPmEndTime2Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LateTime", DbType="Int")]
+ public System.Nullable LateTime
+ {
+ get
+ {
+ return this._LateTime;
+ }
+ set
+ {
+ if ((this._LateTime != value))
+ {
+ this.OnLateTimeChanging(value);
+ this.SendPropertyChanging();
+ this._LateTime = value;
+ this.SendPropertyChanged("LateTime");
+ this.OnLateTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LeaveTime", DbType="Int")]
+ public System.Nullable LeaveTime
+ {
+ get
+ {
+ return this._LeaveTime;
+ }
+ set
+ {
+ if ((this._LeaveTime != value))
+ {
+ this.OnLeaveTimeChanging(value);
+ this.SendPropertyChanging();
+ this._LeaveTime = value;
+ this.SendPropertyChanged("LeaveTime");
+ this.OnLeaveTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentCode", DbType="NVarChar(500)")]
+ public string EquipmentCode
+ {
+ get
+ {
+ return this._EquipmentCode;
+ }
+ set
+ {
+ if ((this._EquipmentCode != value))
+ {
+ this.OnEquipmentCodeChanging(value);
+ this.SendPropertyChanging();
+ this._EquipmentCode = value;
+ this.SendPropertyChanged("EquipmentCode");
+ this.OnEquipmentCodeChanged();
+ }
+ }
+ }
+
+ 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.Law_HSSEStandardsList")]
public partial class Law_HSSEStandardsList : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -167237,6 +167598,8 @@ namespace Model
private System.Nullable _IsInspectionBrigade;
+ private string _YunMouState;
+
private EntitySet _Accident_AccidentHandle;
private EntitySet _Accident_AccidentPersonRecord;
@@ -167851,6 +168214,8 @@ namespace Model
partial void OnLogMachineIdChanged();
partial void OnIsInspectionBrigadeChanging(System.Nullable value);
partial void OnIsInspectionBrigadeChanged();
+ partial void OnYunMouStateChanging(string value);
+ partial void OnYunMouStateChanged();
#endregion
public Person_Persons()
@@ -169433,6 +169798,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YunMouState", DbType="NVarChar(50)")]
+ public string YunMouState
+ {
+ get
+ {
+ return this._YunMouState;
+ }
+ set
+ {
+ if ((this._YunMouState != value))
+ {
+ this.OnYunMouStateChanging(value);
+ this.SendPropertyChanging();
+ this._YunMouState = value;
+ this.SendPropertyChanged("YunMouState");
+ this.OnYunMouStateChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Person_Persons", Storage="_Accident_AccidentHandle", ThisKey="PersonId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
public EntitySet Accident_AccidentHandle
{