安全报表增加系统外工时统计

DataBase/版本日志/SUBQHSE_V2026-01-22-gf(安全报表增加系统外工时统计).sql

@@ -0,0 +1,6 @@
+alter table Project_ProjectUnit add IsOutSideUnit bit null
+GO
+alter table InformationProject_MillionsMonthlyReport add OutSideUnitWorkNum decimal(18,4) null
+GO
+alter table Information_MillionsMonthlyReportItem add OutSideUnitWorkNum decimal(18,4) null
+GO

SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs

@@ -45,6 +45,7 @@ namespace BLL
                 ContractorNum = millionsMonthlyReport.ContractorNum,
                 SumPersonNum = millionsMonthlyReport.SumPersonNum,
                 TotalWorkNum = millionsMonthlyReport.TotalWorkNum,
+                OutSideUnitWorkNum = millionsMonthlyReport.OutSideUnitWorkNum,
                 DeathAccidentNum = millionsMonthlyReport.DeathAccidentNum,
                 DeathAccidentPersonNum = millionsMonthlyReport.DeathAccidentPersonNum,
                 DeathAccidentLossHour = millionsMonthlyReport.DeathAccidentLossHour,
@@ -115,6 +116,7 @@ namespace BLL
                 newMillionsMonthlyReport.ContractorNum = millionsMonthlyReport.ContractorNum;
                 newMillionsMonthlyReport.SumPersonNum = millionsMonthlyReport.SumPersonNum;
                 newMillionsMonthlyReport.TotalWorkNum = millionsMonthlyReport.TotalWorkNum;
+                newMillionsMonthlyReport.OutSideUnitWorkNum = millionsMonthlyReport.OutSideUnitWorkNum;
                 newMillionsMonthlyReport.DeathAccidentNum = millionsMonthlyReport.DeathAccidentNum;
                 newMillionsMonthlyReport.DeathAccidentPersonNum = millionsMonthlyReport.DeathAccidentPersonNum;
                 newMillionsMonthlyReport.DeathAccidentLossHour = millionsMonthlyReport.DeathAccidentLossHour;

SGGL/BLL/ProjectData/ProjectUnitService.cs

@@ -77,8 +77,9 @@
                 PlanCostA = projectUnit.PlanCostA,
                 PlanCostB = projectUnit.PlanCostB,
                 ContractRange = projectUnit.ContractRange,
-                RealNamePushTime= projectUnit.RealNamePushTime,
+                RealNamePushTime = projectUnit.RealNamePushTime,
                 IsSynchro = projectUnit.IsSynchro,
+                IsOutSideUnit = projectUnit.IsOutSideUnit,
             };
             db.Project_ProjectUnit.InsertOnSubmit(newProjectUnit);
             db.SubmitChanges();
@@ -102,6 +103,7 @@
                 newProjectUnit.ContractRange = projectUnit.ContractRange;
                 newProjectUnit.RealNamePushTime = projectUnit.RealNamePushTime;
                 newProjectUnit.IsSynchro = projectUnit.IsSynchro;
+                newProjectUnit.IsOutSideUnit = projectUnit.IsOutSideUnit;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/Service References/CNCECHSSEService/Reference.cs

@@ -11219,543 +11219,737 @@ namespace BLL.CNCECHSSEService {
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     [System.Runtime.Serialization.DataContractAttribute(Name="Information_MillionsMonthlyReportItem", Namespace="http://schemas.datacontract.org/2004/07/BLL.OpenService")]
     [System.SerializableAttribute()]
-    public partial class Information_MillionsMonthlyReportItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
+    public partial class Information_MillionsMonthlyReportItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
-        
+    {
+
         [System.NonSerializedAttribute()]
         private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private string AffiliationField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> AttemptedEventNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> ContractorNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> EquipmentNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> ExplosionNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> FireNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> FirstAidDressingsNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> LossDayNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> MedicalTreatmentLossHourField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> MedicalTreatmentPersonNumField;
-        
+
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private string UnitIdField;
+
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private string ProjectIdField;
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private string MillionsMonthlyReportIdField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private string MillionsMonthlyReportItemIdField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> MinorAccidentLossHourField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> MinorAccidentNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> MinorAccidentPersonNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private string NameField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> OtherAccidentLossHourField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> OtherAccidentNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> OtherAccidentPersonNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> OtherNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> PostPersonNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> QualityNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> RestrictedWorkLossHourField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> RestrictedWorkPersonNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> SeriousInjuriesLossHourField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> SeriousInjuriesNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> SeriousInjuriesPersonNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> SnapPersonNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> SortIndexField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> SumPersonNumField;
-        
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<decimal> TotalWorkNumField;
-        
+
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private System.Nullable<decimal> OutSideUnitWorkNumField;
+
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> TrafficNumField;
-        
+
         [global::System.ComponentModel.BrowsableAttribute(false)]
-        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
+        public System.Runtime.Serialization.ExtensionDataObject ExtensionData
-            get {
+        {
+            get
+            {
                 return this.extensionDataField;
             }
-            set {
+            set
+            {
                 this.extensionDataField = value;
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Affiliation {
+        public string Affiliation
-            get {
+        {
+            get
+            {
                 return this.AffiliationField;
             }
-            set {
+            set
-                if ((object.ReferenceEquals(this.AffiliationField, value) != true)) {
+            {
+                if ((object.ReferenceEquals(this.AffiliationField, value) != true))
+                {
                     this.AffiliationField = value;
                     this.RaisePropertyChanged("Affiliation");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> AttemptedEventNum {
+        public System.Nullable<int> AttemptedEventNum
-            get {
+        {
+            get
+            {
                 return this.AttemptedEventNumField;
             }
-            set {
+            set
-                if ((this.AttemptedEventNumField.Equals(value) != true)) {
+            {
+                if ((this.AttemptedEventNumField.Equals(value) != true))
+                {
                     this.AttemptedEventNumField = value;
                     this.RaisePropertyChanged("AttemptedEventNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> ContractorNum {
+        public System.Nullable<int> ContractorNum
-            get {
+        {
+            get
+            {
                 return this.ContractorNumField;
             }
-            set {
+            set
-                if ((this.ContractorNumField.Equals(value) != true)) {
+            {
+                if ((this.ContractorNumField.Equals(value) != true))
+                {
                     this.ContractorNumField = value;
                     this.RaisePropertyChanged("ContractorNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> EquipmentNum {
+        public System.Nullable<int> EquipmentNum
-            get {
+        {
+            get
+            {
                 return this.EquipmentNumField;
             }
-            set {
+            set
-                if ((this.EquipmentNumField.Equals(value) != true)) {
+            {
+                if ((this.EquipmentNumField.Equals(value) != true))
+                {
                     this.EquipmentNumField = value;
                     this.RaisePropertyChanged("EquipmentNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> ExplosionNum {
+        public System.Nullable<int> ExplosionNum
-            get {
+        {
+            get
+            {
                 return this.ExplosionNumField;
             }
-            set {
+            set
-                if ((this.ExplosionNumField.Equals(value) != true)) {
+            {
+                if ((this.ExplosionNumField.Equals(value) != true))
+                {
                     this.ExplosionNumField = value;
                     this.RaisePropertyChanged("ExplosionNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> FireNum {
+        public System.Nullable<int> FireNum
-            get {
+        {
+            get
+            {
                 return this.FireNumField;
             }
-            set {
+            set
-                if ((this.FireNumField.Equals(value) != true)) {
+            {
+                if ((this.FireNumField.Equals(value) != true))
+                {
                     this.FireNumField = value;
                     this.RaisePropertyChanged("FireNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> FirstAidDressingsNum {
+        public System.Nullable<int> FirstAidDressingsNum
-            get {
+        {
+            get
+            {
                 return this.FirstAidDressingsNumField;
             }
-            set {
+            set
-                if ((this.FirstAidDressingsNumField.Equals(value) != true)) {
+            {
+                if ((this.FirstAidDressingsNumField.Equals(value) != true))
+                {
                     this.FirstAidDressingsNumField = value;
                     this.RaisePropertyChanged("FirstAidDressingsNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> LossDayNum {
+        public System.Nullable<int> LossDayNum
-            get {
+        {
+            get
+            {
                 return this.LossDayNumField;
             }
-            set {
+            set
-                if ((this.LossDayNumField.Equals(value) != true)) {
+            {
+                if ((this.LossDayNumField.Equals(value) != true))
+                {
                     this.LossDayNumField = value;
                     this.RaisePropertyChanged("LossDayNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> MedicalTreatmentLossHour {
+        public System.Nullable<int> MedicalTreatmentLossHour
-            get {
+        {
+            get
+            {
                 return this.MedicalTreatmentLossHourField;
             }
-            set {
+            set
-                if ((this.MedicalTreatmentLossHourField.Equals(value) != true)) {
+            {
+                if ((this.MedicalTreatmentLossHourField.Equals(value) != true))
+                {
                     this.MedicalTreatmentLossHourField = value;
                     this.RaisePropertyChanged("MedicalTreatmentLossHour");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> MedicalTreatmentPersonNum {
+        public System.Nullable<int> MedicalTreatmentPersonNum
-            get {
+        {
+            get
+            {
                 return this.MedicalTreatmentPersonNumField;
             }
-            set {
+            set
-                if ((this.MedicalTreatmentPersonNumField.Equals(value) != true)) {
+            {
+                if ((this.MedicalTreatmentPersonNumField.Equals(value) != true))
+                {
                     this.MedicalTreatmentPersonNumField = value;
                     this.RaisePropertyChanged("MedicalTreatmentPersonNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string MillionsMonthlyReportId {
+        public string UnitId
-            get {
+        {
+            get
+            {
+                return this.UnitIdField;
+            }
+            set
+            {
+                if ((object.ReferenceEquals(this.UnitIdField, value) != true))
+                {
+                    this.UnitIdField = value;
+                    this.RaisePropertyChanged("UnitId");
+                }
+            }
+        }
+
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public string ProjectId
+        {
+            get
+            {
+                return this.ProjectIdField;
+            }
+            set
+            {
+                if ((object.ReferenceEquals(this.ProjectIdField, value) != true))
+                {
+                    this.ProjectIdField = value;
+                    this.RaisePropertyChanged("ProjectId");
+                }
+            }
+        }
+
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public string MillionsMonthlyReportId
+        {
+            get
+            {
                 return this.MillionsMonthlyReportIdField;
             }
-            set {
+            set
-                if ((object.ReferenceEquals(this.MillionsMonthlyReportIdField, value) != true)) {
+            {
+                if ((object.ReferenceEquals(this.MillionsMonthlyReportIdField, value) != true))
+                {
                     this.MillionsMonthlyReportIdField = value;
                     this.RaisePropertyChanged("MillionsMonthlyReportId");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string MillionsMonthlyReportItemId {
+        public string MillionsMonthlyReportItemId
-            get {
+        {
+            get
+            {
                 return this.MillionsMonthlyReportItemIdField;
             }
-            set {
+            set
-                if ((object.ReferenceEquals(this.MillionsMonthlyReportItemIdField, value) != true)) {
+            {
+                if ((object.ReferenceEquals(this.MillionsMonthlyReportItemIdField, value) != true))
+                {
                     this.MillionsMonthlyReportItemIdField = value;
                     this.RaisePropertyChanged("MillionsMonthlyReportItemId");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> MinorAccidentLossHour {
+        public System.Nullable<int> MinorAccidentLossHour
-            get {
+        {
+            get
+            {
                 return this.MinorAccidentLossHourField;
             }
-            set {
+            set
-                if ((this.MinorAccidentLossHourField.Equals(value) != true)) {
+            {
+                if ((this.MinorAccidentLossHourField.Equals(value) != true))
+                {
                     this.MinorAccidentLossHourField = value;
                     this.RaisePropertyChanged("MinorAccidentLossHour");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> MinorAccidentNum {
+        public System.Nullable<int> MinorAccidentNum
-            get {
+        {
+            get
+            {
                 return this.MinorAccidentNumField;
             }
-            set {
+            set
-                if ((this.MinorAccidentNumField.Equals(value) != true)) {
+            {
+                if ((this.MinorAccidentNumField.Equals(value) != true))
+                {
                     this.MinorAccidentNumField = value;
                     this.RaisePropertyChanged("MinorAccidentNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> MinorAccidentPersonNum {
+        public System.Nullable<int> MinorAccidentPersonNum
-            get {
+        {
+            get
+            {
                 return this.MinorAccidentPersonNumField;
             }
-            set {
+            set
-                if ((this.MinorAccidentPersonNumField.Equals(value) != true)) {
+            {
+                if ((this.MinorAccidentPersonNumField.Equals(value) != true))
+                {
                     this.MinorAccidentPersonNumField = value;
                     this.RaisePropertyChanged("MinorAccidentPersonNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Name {
+        public string Name
-            get {
+        {
+            get
+            {
                 return this.NameField;
             }
-            set {
+            set
-                if ((object.ReferenceEquals(this.NameField, value) != true)) {
+            {
+                if ((object.ReferenceEquals(this.NameField, value) != true))
+                {
                     this.NameField = value;
                     this.RaisePropertyChanged("Name");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> OtherAccidentLossHour {
+        public System.Nullable<int> OtherAccidentLossHour
-            get {
+        {
+            get
+            {
                 return this.OtherAccidentLossHourField;
             }
-            set {
+            set
-                if ((this.OtherAccidentLossHourField.Equals(value) != true)) {
+            {
+                if ((this.OtherAccidentLossHourField.Equals(value) != true))
+                {
                     this.OtherAccidentLossHourField = value;
                     this.RaisePropertyChanged("OtherAccidentLossHour");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> OtherAccidentNum {
+        public System.Nullable<int> OtherAccidentNum
-            get {
+        {
+            get
+            {
                 return this.OtherAccidentNumField;
             }
-            set {
+            set
-                if ((this.OtherAccidentNumField.Equals(value) != true)) {
+            {
+                if ((this.OtherAccidentNumField.Equals(value) != true))
+                {
                     this.OtherAccidentNumField = value;
                     this.RaisePropertyChanged("OtherAccidentNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> OtherAccidentPersonNum {
+        public System.Nullable<int> OtherAccidentPersonNum
-            get {
+        {
+            get
+            {
                 return this.OtherAccidentPersonNumField;
             }
-            set {
+            set
-                if ((this.OtherAccidentPersonNumField.Equals(value) != true)) {
+            {
+                if ((this.OtherAccidentPersonNumField.Equals(value) != true))
+                {
                     this.OtherAccidentPersonNumField = value;
                     this.RaisePropertyChanged("OtherAccidentPersonNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> OtherNum {
+        public System.Nullable<int> OtherNum
-            get {
+        {
+            get
+            {
                 return this.OtherNumField;
             }
-            set {
+            set
-                if ((this.OtherNumField.Equals(value) != true)) {
+            {
+                if ((this.OtherNumField.Equals(value) != true))
+                {
                     this.OtherNumField = value;
                     this.RaisePropertyChanged("OtherNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> PostPersonNum {
+        public System.Nullable<int> PostPersonNum
-            get {
+        {
+            get
+            {
                 return this.PostPersonNumField;
             }
-            set {
+            set
-                if ((this.PostPersonNumField.Equals(value) != true)) {
+            {
+                if ((this.PostPersonNumField.Equals(value) != true))
+                {
                     this.PostPersonNumField = value;
                     this.RaisePropertyChanged("PostPersonNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> QualityNum {
+        public System.Nullable<int> QualityNum
-            get {
+        {
+            get
+            {
                 return this.QualityNumField;
             }
-            set {
+            set
-                if ((this.QualityNumField.Equals(value) != true)) {
+            {
+                if ((this.QualityNumField.Equals(value) != true))
+                {
                     this.QualityNumField = value;
                     this.RaisePropertyChanged("QualityNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> RestrictedWorkLossHour {
+        public System.Nullable<int> RestrictedWorkLossHour
-            get {
+        {
+            get
+            {
                 return this.RestrictedWorkLossHourField;
             }
-            set {
+            set
-                if ((this.RestrictedWorkLossHourField.Equals(value) != true)) {
+            {
+                if ((this.RestrictedWorkLossHourField.Equals(value) != true))
+                {
                     this.RestrictedWorkLossHourField = value;
                     this.RaisePropertyChanged("RestrictedWorkLossHour");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> RestrictedWorkPersonNum {
+        public System.Nullable<int> RestrictedWorkPersonNum
-            get {
+        {
+            get
+            {
                 return this.RestrictedWorkPersonNumField;
             }
-            set {
+            set
-                if ((this.RestrictedWorkPersonNumField.Equals(value) != true)) {
+            {
+                if ((this.RestrictedWorkPersonNumField.Equals(value) != true))
+                {
                     this.RestrictedWorkPersonNumField = value;
                     this.RaisePropertyChanged("RestrictedWorkPersonNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> SeriousInjuriesLossHour {
+        public System.Nullable<int> SeriousInjuriesLossHour
-            get {
+        {
+            get
+            {
                 return this.SeriousInjuriesLossHourField;
             }
-            set {
+            set
-                if ((this.SeriousInjuriesLossHourField.Equals(value) != true)) {
+            {
+                if ((this.SeriousInjuriesLossHourField.Equals(value) != true))
+                {
                     this.SeriousInjuriesLossHourField = value;
                     this.RaisePropertyChanged("SeriousInjuriesLossHour");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> SeriousInjuriesNum {
+        public System.Nullable<int> SeriousInjuriesNum
-            get {
+        {
+            get
+            {
                 return this.SeriousInjuriesNumField;
             }
-            set {
+            set
-                if ((this.SeriousInjuriesNumField.Equals(value) != true)) {
+            {
+                if ((this.SeriousInjuriesNumField.Equals(value) != true))
+                {
                     this.SeriousInjuriesNumField = value;
                     this.RaisePropertyChanged("SeriousInjuriesNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> SeriousInjuriesPersonNum {
+        public System.Nullable<int> SeriousInjuriesPersonNum
-            get {
+        {
+            get
+            {
                 return this.SeriousInjuriesPersonNumField;
             }
-            set {
+            set
-                if ((this.SeriousInjuriesPersonNumField.Equals(value) != true)) {
+            {
+                if ((this.SeriousInjuriesPersonNumField.Equals(value) != true))
+                {
                     this.SeriousInjuriesPersonNumField = value;
                     this.RaisePropertyChanged("SeriousInjuriesPersonNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> SnapPersonNum {
+        public System.Nullable<int> SnapPersonNum
-            get {
+        {
+            get
+            {
                 return this.SnapPersonNumField;
             }
-            set {
+            set
-                if ((this.SnapPersonNumField.Equals(value) != true)) {
+            {
+                if ((this.SnapPersonNumField.Equals(value) != true))
+                {
                     this.SnapPersonNumField = value;
                     this.RaisePropertyChanged("SnapPersonNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> SortIndex {
+        public System.Nullable<int> SortIndex
-            get {
+        {
+            get
+            {
                 return this.SortIndexField;
             }
-            set {
+            set
-                if ((this.SortIndexField.Equals(value) != true)) {
+            {
+                if ((this.SortIndexField.Equals(value) != true))
+                {
                     this.SortIndexField = value;
                     this.RaisePropertyChanged("SortIndex");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> SumPersonNum {
+        public System.Nullable<int> SumPersonNum
-            get {
+        {
+            get
+            {
                 return this.SumPersonNumField;
             }
-            set {
+            set
-                if ((this.SumPersonNumField.Equals(value) != true)) {
+            {
+                if ((this.SumPersonNumField.Equals(value) != true))
+                {
                     this.SumPersonNumField = value;
                     this.RaisePropertyChanged("SumPersonNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> TotalWorkNum {
+        public System.Nullable<decimal> TotalWorkNum
-            get {
+        {
+            get
+            {
                 return this.TotalWorkNumField;
             }
-            set {
+            set
-                if ((this.TotalWorkNumField.Equals(value) != true)) {
+            {
+                if ((this.TotalWorkNumField.Equals(value) != true))
+                {
                     this.TotalWorkNumField = value;
                     this.RaisePropertyChanged("TotalWorkNum");
                 }
             }
         }
-        
+
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> TrafficNum {
+        public System.Nullable<decimal> OutSideUnitWorkNum
-            get {
+        {
+            get
+            {
+                return this.OutSideUnitWorkNumField;
+            }
+            set
+            {
+                if ((this.OutSideUnitWorkNumField.Equals(value) != true))
+                {
+                    this.OutSideUnitWorkNumField = value;
+                    this.RaisePropertyChanged("OutSideUnitWorkNum");
+                }
+            }
+        }
+
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Nullable<int> TrafficNum
+        {
+            get
+            {
                 return this.TrafficNumField;
             }
-            set {
+            set
-                if ((this.TrafficNumField.Equals(value) != true)) {
+            {
+                if ((this.TrafficNumField.Equals(value) != true))
+                {
                     this.TrafficNumField = value;
                     this.RaisePropertyChanged("TrafficNum");
                 }
             }
         }
-        
+
         public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
+
-        protected void RaisePropertyChanged(string propertyName) {
+        protected void RaisePropertyChanged(string propertyName)
+        {
             System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
+            if ((propertyChanged != null))
+            {
                 propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
             }
         }
     }
-    
+
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     [System.Runtime.Serialization.DataContractAttribute(Name="Information_SafetyQuarterlyReport", Namespace="http://schemas.datacontract.org/2004/07/BLL.OpenService")]

SGGL/BLL/WebService/CNCECHSSEWebService.cs

@@ -210,6 +210,7 @@
                                            ContractorNum = x.ContractorNum,
                                            SumPersonNum = x.SumPersonNum,
                                            TotalWorkNum = x.TotalWorkNum,
+                                           OutSideUnitWorkNum = x.OutSideUnitWorkNum,
                                            SeriousInjuriesNum = x.SeriousInjuriesNum,
                                            SeriousInjuriesPersonNum = x.SeriousInjuriesPersonNum,
                                            SeriousInjuriesLossHour = x.SeriousInjuriesLossHour,

SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs

@@ -103,12 +103,15 @@ namespace BLL
                 MillionsMonthlyReportId = MillionsMonthlyReportItem.MillionsMonthlyReportId,
                 SortIndex = MillionsMonthlyReportItem.SortIndex,
                 Affiliation = MillionsMonthlyReportItem.Affiliation,
+                //UnitId = MillionsMonthlyReportItem.UnitId,
                 Name = MillionsMonthlyReportItem.Name,
+                //ProjectId = MillionsMonthlyReportItem.ProjectId,
                 PostPersonNum = MillionsMonthlyReportItem.PostPersonNum,
                 SnapPersonNum = MillionsMonthlyReportItem.SnapPersonNum,
                 ContractorNum = MillionsMonthlyReportItem.ContractorNum,
                 SumPersonNum = MillionsMonthlyReportItem.SumPersonNum,
                 TotalWorkNum = MillionsMonthlyReportItem.TotalWorkNum,
+                OutSideUnitWorkNum = MillionsMonthlyReportItem.OutSideUnitWorkNum,
                 DeathAccidentNum = MillionsMonthlyReportItem.DeathAccidentNum,
                 DeathAccidentPersonNum = MillionsMonthlyReportItem.DeathAccidentPersonNum,
                 DeathAccidentLossHour = MillionsMonthlyReportItem.DeathAccidentLossHour,
@@ -150,12 +153,15 @@ namespace BLL
             Model.Information_MillionsMonthlyReportItem newMillionsMonthlyReportItem = Funs.DB.Information_MillionsMonthlyReportItem.FirstOrDefault(e => e.MillionsMonthlyReportItemId == MillionsMonthlyReportItem.MillionsMonthlyReportItemId);
             newMillionsMonthlyReportItem.SortIndex = MillionsMonthlyReportItem.SortIndex;
             newMillionsMonthlyReportItem.Affiliation = MillionsMonthlyReportItem.Affiliation;
+            //newMillionsMonthlyReportItem.UnitId = MillionsMonthlyReportItem.UnitId;
             newMillionsMonthlyReportItem.Name = MillionsMonthlyReportItem.Name;
+            //newMillionsMonthlyReportItem.ProjectId = MillionsMonthlyReportItem.ProjectId;
             newMillionsMonthlyReportItem.PostPersonNum = MillionsMonthlyReportItem.PostPersonNum;
             newMillionsMonthlyReportItem.SnapPersonNum = MillionsMonthlyReportItem.SnapPersonNum;
             newMillionsMonthlyReportItem.ContractorNum = MillionsMonthlyReportItem.ContractorNum;
             newMillionsMonthlyReportItem.SumPersonNum = MillionsMonthlyReportItem.SumPersonNum;
             newMillionsMonthlyReportItem.TotalWorkNum = MillionsMonthlyReportItem.TotalWorkNum;
+            newMillionsMonthlyReportItem.OutSideUnitWorkNum = MillionsMonthlyReportItem.OutSideUnitWorkNum;
             newMillionsMonthlyReportItem.DeathAccidentNum = MillionsMonthlyReportItem.DeathAccidentNum;
             newMillionsMonthlyReportItem.DeathAccidentPersonNum = MillionsMonthlyReportItem.DeathAccidentPersonNum;
             newMillionsMonthlyReportItem.DeathAccidentLossHour = MillionsMonthlyReportItem.DeathAccidentLossHour;

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx

@@ -1,224 +1,250 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MillionsMonthlyReport.aspx.cs"
     Inherits="FineUIPro.Web.InformationProject.MillionsMonthlyReport" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title>企业安全数据统计月报</title>
     <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style>
+        .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
 </head>
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <items>
-            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业安全数据统计月报" EnableCollapse="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MillionsMonthlyReportId"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="MillionsMonthlyReportId"
+                    <items>
-                    AllowSorting="true" SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort"
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            BodyPadding="0px">
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
-                    <Toolbars>
+                        </f:ContentPanel>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                    </items>
-                            <Items>
+                </f:Panel>
-                                <f:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
-                                </f:DropDownList>
+                    <items>
-                                <f:DropDownList ID="drpMonth" runat="server" Label="月度" LabelAlign="Right" Width="250px"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业安全数据统计月报" EnableCollapse="true"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MillionsMonthlyReportId"
-                                </f:DropDownList>
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="MillionsMonthlyReportId"
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                            AllowSorting="true" SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort"
-                                </f:ToolbarFill>
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                                    runat="server">
+                            <toolbars>
-                                </f:Button>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            </Items>
+                                    <items>
-                        </f:Toolbar>
+                                        <f:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
-                    </Toolbars>
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                    <Columns>
+                                        </f:DropDownList>
-                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="40px" HeaderTextAlign="Center"
+                                        <f:DropDownList ID="drpMonth" runat="server" Label="月度" LabelAlign="Right" Width="250px"
-                            TextAlign="Center" />
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                        <f:RenderField Width="100px" ColumnID="YearAndMonth" DataField="YearAndMonth" SortField="YearAndMonth"
+                                        </f:DropDownList>
-                            FieldType="String" HeaderText="月报日期" HeaderTextAlign="Center" TextAlign="Left">
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                        </f:RenderField>
+                                        </f:ToolbarFill>
-                        <%-- <f:RenderField Width="150px" ColumnID="Affiliation" DataField="Affiliation" SortField="Affiliation"
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                        FieldType="String" HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
+                                            runat="server">
-                    </f:RenderField>
+                                        </f:Button>
-                    <f:RenderField Width="150px" ColumnID="Name" DataField="Name" SortField="Name" FieldType="String"
+                                    </items>
-                        HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:Toolbar>
-                    </f:RenderField>--%>
+                            </toolbars>
-                        <f:GroupField EnableLock="true" HeaderText="员工总数" TextAlign="Center">
+                            <columns>
-                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="40px" HeaderTextAlign="Center"
-                                <f:RenderField Width="80px" ColumnID="PostPersonNum" DataField="PostPersonNum" FieldType="String"
+                                    TextAlign="Center" />
-                                    HeaderText="在岗员工" HeaderTextAlign="Center" TextAlign="Center">
+                                <f:RenderField Width="100px" ColumnID="YearAndMonth" DataField="YearAndMonth" SortField="YearAndMonth"
+                                    FieldType="String" HeaderText="月报日期" HeaderTextAlign="Center" TextAlign="Left">
                                 </f:RenderField>
-                                <f:RenderField Width="80px" ColumnID="SnapPersonNum" DataField="SnapPersonNum" FieldType="String"
+                                <%-- <f:RenderField Width="150px" ColumnID="Affiliation" DataField="Affiliation" SortField="Affiliation"
-                                    HeaderText="临时员工" HeaderTextAlign="Center" TextAlign="Center">
+                                         FieldType="String" HeaderText="所属单位" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
+                                     </f:RenderField>
-                                <f:RenderField Width="70px" ColumnID="ContractorNum" DataField="ContractorNum" FieldType="String"
+                                     <f:RenderField Width="150px" ColumnID="Name" DataField="Name" SortField="Name" FieldType="String"
-                                    HeaderText="承包商" HeaderTextAlign="Center" TextAlign="Center">
+                                         HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
-                                </f:RenderField>
+                                     </f:RenderField>--%>
-                                <f:RenderField Width="70px" ColumnID="SumPersonNum" DataField="SumPersonNum" FieldType="String"
+                                <f:GroupField EnableLock="true" HeaderText="员工总数" TextAlign="Center">
-                                    HeaderText="合计" HeaderTextAlign="Center" TextAlign="Center">
+                                    <columns>
-                                </f:RenderField>
+                                        <f:RenderField Width="80px" ColumnID="PostPersonNum" DataField="PostPersonNum" FieldType="String"
-                            </Columns>
+                                            HeaderText="在岗员工" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:GroupField>
-                        <f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
-                            HeaderText="总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
-                            <Columns>
-                                <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="DeathAccidentNum" DataField="DeathAccidentNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="70px" ColumnID="DeathAccidentPersonNum" DataField="DeathAccidentPersonNum"
+                                        <f:RenderField Width="80px" ColumnID="SnapPersonNum" DataField="SnapPersonNum" FieldType="String"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                            HeaderText="临时员工" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="DeathAccidentLossHour" DataField="DeathAccidentLossHour"
+                                        <f:RenderField Width="70px" ColumnID="ContractorNum" DataField="ContractorNum" FieldType="String"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                            HeaderText="承包商" HeaderTextAlign="Center" TextAlign="Center">
                                         </f:RenderField>
-                                    </Columns>
+                                        <f:RenderField Width="70px" ColumnID="SumPersonNum" DataField="SumPersonNum" FieldType="String"
-                                </f:GroupField>
+                                            HeaderText="合计" HeaderTextAlign="Center" TextAlign="Center">
-                                <f:GroupField EnableLock="true" HeaderText="重伤事故" TextAlign="Center">
+                                        </f:RenderField>
-                                    <Columns>
+                                    </columns>
-                                        <f:RenderField Width="70px" ColumnID="SeriousInjuriesNum" DataField="SeriousInjuriesNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="70px" ColumnID="SeriousInjuriesPersonNum" DataField="SeriousInjuriesPersonNum"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="SeriousInjuriesLossHour" DataField="SeriousInjuriesLossHour"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="轻伤事故" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="MinorAccidentNum" DataField="MinorAccidentNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="70px" ColumnID="MinorAccidentPersonNum" DataField="MinorAccidentPersonNum"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="MinorAccidentLossHour" DataField="MinorAccidentLossHour"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
                                 </f:GroupField>
+                                <f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
+                                    HeaderText="总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
+                                    HeaderText="去除系统内单位的总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
+                                    <columns>
+                                        <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="70px" ColumnID="DeathAccidentNum" DataField="DeathAccidentNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="70px" ColumnID="DeathAccidentPersonNum" DataField="DeathAccidentPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="DeathAccidentLossHour" DataField="DeathAccidentLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="重伤事故" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="70px" ColumnID="SeriousInjuriesNum" DataField="SeriousInjuriesNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="70px" ColumnID="SeriousInjuriesPersonNum" DataField="SeriousInjuriesPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="SeriousInjuriesLossHour" DataField="SeriousInjuriesLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="轻伤事故" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="70px" ColumnID="MinorAccidentNum" DataField="MinorAccidentNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="70px" ColumnID="MinorAccidentPersonNum" DataField="MinorAccidentPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="MinorAccidentLossHour" DataField="MinorAccidentLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
 
-                                <f:GroupField EnableLock="true" HeaderText="工作受限" TextAlign="Center">
+                                        <f:GroupField EnableLock="true" HeaderText="工作受限" TextAlign="Center">
-                                    <Columns>
+                                            <columns>
-                                        <f:RenderField Width="70px" ColumnID="RestrictedWorkPersonNum" DataField="RestrictedWorkPersonNum"
+                                                <f:RenderField Width="70px" ColumnID="RestrictedWorkPersonNum" DataField="RestrictedWorkPersonNum"
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
+                                                </f:RenderField>
-                                        <f:RenderField Width="80px" ColumnID="RestrictedWorkLossHour" DataField="RestrictedWorkLossHour"
+                                                <f:RenderField Width="80px" ColumnID="RestrictedWorkLossHour" DataField="RestrictedWorkLossHour"
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
+                                                </f:RenderField>
-                                    </Columns>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="医疗处置" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="70px" ColumnID="MedicalTreatmentPersonNum" DataField="MedicalTreatmentPersonNum"
+                                                    FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="80px" ColumnID="MedicalTreatmentLossHour" DataField="MedicalTreatmentLossHour"
+                                                    FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                    </columns>
                                 </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="医疗处置" TextAlign="Center">
+                                <f:RenderField Width="80px" ColumnID="LossDayNum" DataField="LossDayNum" FieldType="String"
-                                    <Columns>
+                                    HeaderText="损失工日" HeaderTextAlign="Center" TextAlign="Center">
-                                        <f:RenderField Width="70px" ColumnID="MedicalTreatmentPersonNum" DataField="MedicalTreatmentPersonNum"
+                                </f:RenderField>
-                                            FieldType="String" HeaderText="人数" HeaderTextAlign="Center" TextAlign="Center">
+                                <f:GroupField EnableLock="true" HeaderText="无伤害事故" TextAlign="Center">
-                                        </f:RenderField>
+                                    <columns>
-                                        <f:RenderField Width="80px" ColumnID="MedicalTreatmentLossHour" DataField="MedicalTreatmentLossHour"
+                                        <f:GroupField EnableLock="true" HeaderText="火灾" TextAlign="Center">
-                                            FieldType="String" HeaderText="损失工时" HeaderTextAlign="Center" TextAlign="Center">
+                                            <columns>
-                                        </f:RenderField>
+                                                <f:RenderField Width="70px" ColumnID="FireNum" DataField="FireNum" FieldType="String"
-                                    </Columns>
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="环保" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="70px" ColumnID="EnvironmenNum" DataField="EnvironmenNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="交通" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="70px" ColumnID="TrafficNum" DataField="TrafficNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="机械设备" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="80px" ColumnID="EquipmentNum" DataField="EquipmentNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="质量" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="70px" ColumnID="QualityNum" DataField="QualityNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="其它" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="70px" ColumnID="OtherNum" DataField="OtherNum" FieldType="String"
+                                                    HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="急救包扎" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="80px" ColumnID="FirstAidDressingsNum" DataField="FirstAidDressingsNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                        <f:GroupField EnableLock="true" HeaderText="未遂事件" TextAlign="Center">
+                                            <columns>
+                                                <f:RenderField Width="80px" ColumnID="AttemptedEventNum" DataField="AttemptedEventNum"
+                                                    FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                                </f:RenderField>
+                                            </columns>
+                                        </f:GroupField>
+                                    </columns>
                                 </f:GroupField>
-                            </Columns>
+                                <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        </f:GroupField>
+                                    SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        <f:RenderField Width="80px" ColumnID="LossDayNum" DataField="LossDayNum" FieldType="String"
+                                    TextAlign="Left">
-                            HeaderText="损失工日" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
-                        </f:RenderField>
+                                <f:TemplateField HeaderText="打印" Width="80px">
-                        <f:GroupField EnableLock="true" HeaderText="无伤害事故" TextAlign="Center">
+                                    <itemtemplate>
-                            <Columns>
+                                        <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
-                                <f:GroupField EnableLock="true" HeaderText="火灾" TextAlign="Center">
+                                    </itemtemplate>
-                                    <Columns>
+                                </f:TemplateField>
-                                        <f:RenderField Width="70px" ColumnID="FireNum" DataField="FireNum" FieldType="String"
+                            </columns>
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                            <listeners>
-                                        </f:RenderField>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                                    </Columns>
+                            </listeners>
-                                </f:GroupField>
+                            <pageitems>
-                                <f:GroupField EnableLock="true" HeaderText="环保" TextAlign="Center">
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                                    <Columns>
+                                </f:ToolbarSeparator>
-                                        <f:RenderField Width="70px" ColumnID="EnvironmenNum" DataField="EnvironmenNum" FieldType="String"
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:ToolbarText>
-                                        </f:RenderField>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                                    </Columns>
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                                </f:GroupField>
+                                </f:DropDownList>
-                                <f:GroupField EnableLock="true" HeaderText="交通" TextAlign="Center">
+                            </pageitems>
-                                    <Columns>
+                        </f:Grid>
-                                        <f:RenderField Width="70px" ColumnID="TrafficNum" DataField="TrafficNum" FieldType="String"
+                    </items>
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
+                </f:Panel>
-                                        </f:RenderField>
+            </items>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="机械设备" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="80px" ColumnID="EquipmentNum" DataField="EquipmentNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="质量" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="QualityNum" DataField="QualityNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="其它" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="70px" ColumnID="OtherNum" DataField="OtherNum" FieldType="String"
-                                            HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="急救包扎" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="80px" ColumnID="FirstAidDressingsNum" DataField="FirstAidDressingsNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                                <f:GroupField EnableLock="true" HeaderText="未遂事件" TextAlign="Center">
-                                    <Columns>
-                                        <f:RenderField Width="80px" ColumnID="AttemptedEventNum" DataField="AttemptedEventNum"
-                                            FieldType="String" HeaderText="起数" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                </f:GroupField>
-                            </Columns>
-                        </f:GroupField>
-                        <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                            SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:TemplateField HeaderText="打印" Width="80px">
-                            <ItemTemplate>
-                                <asp:LinkButton ID="btnPrint" runat="server" Text="打印" OnClick="btnPrint_Click"></asp:LinkButton>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
-            </Items>
         </f:Panel>
+
         <f:Window ID="Window1" Title="编辑企业安全数据统计月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
             Height="560px">

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs

@@ -43,8 +43,14 @@ namespace FineUIPro.Web.InformationProject
                     this.ProjectId = Request.Params["projectId"];
                 }
 
-                ////权限按钮方法
+                this.ucTree.UnitId = this.CurrUser.UnitId;
-                this.GetButtonPower();    
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
 
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, BLL.ConstValue.Group_0009, true);
@@ -59,11 +65,29 @@ namespace FineUIPro.Web.InformationProject
                 this.BindGrid();
             }
         }
+        
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+           
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT MillionsMonthlyReport.MillionsMonthlyReportId,"
                           + @"MillionsMonthlyReport.ProjectId,"
                           + @"MillionsMonthlyReport.Year,"
@@ -79,6 +103,7 @@ namespace FineUIPro.Web.InformationProject
                           + @"MillionsMonthlyReport.ContractorNum,"
                           + @"MillionsMonthlyReport.SumPersonNum,"
                           + @"MillionsMonthlyReport.TotalWorkNum,"
+                          + @"MillionsMonthlyReport.OutSideUnitWorkNum,"
                           + @"MillionsMonthlyReport.DeathAccidentNum,"
                           + @"MillionsMonthlyReport.DeathAccidentPersonNum,"
                           + @"MillionsMonthlyReport.DeathAccidentLossHour,"
@@ -298,6 +323,12 @@ namespace FineUIPro.Web.InformationProject
                     this.btnMenuDelete.Hidden = false;
                 }
             }
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+                btnMenuDelete.Hidden = true;
+                btnMenuEdit.Hidden = true;
+            }
         }
         #endregion
     }

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.InformationProject {
+namespace FineUIPro.Web.InformationProject
-    
+{
-    
+
-    public partial class MillionsMonthlyReport {
+
-        
+    public partial class MillionsMonthlyReport
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// drpMonth 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpMonth;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton btnPrint;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx

@@ -24,7 +24,7 @@
                                 </f:TextBox>
                             </Items>
                         </f:FormRow>
-                        <f:FormRow>
+                        <f:FormRow ColumnWidths="20% 20% 25% 35%">
                             <Items>
                                 <f:DropDownList ID="drpYear" runat="server" Label="年度" EnableEdit="true" LabelAlign="Right"
                                     Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpYear_SelectedIndexChanged">
@@ -37,6 +37,8 @@
                             </f:NumberBox>--%>
                                 <f:TextBox ID="txtTotalWorkNum" runat="server" Label="总工时数（万）" LabelWidth="140px" LabelAlign="Right" EmptyText="0">
                                 </f:TextBox>
+                                <f:TextBox ID="txtOutSideUnitWorkNum" runat="server" Label="去除系统内单位的总工时数（万）" LabelWidth="240px" Readonly="true" LabelAlign="Right" EmptyText="0">
+                                </f:TextBox>
                             </Items>
                         </f:FormRow>
                         <%-- <f:FormRow>

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs

@@ -87,6 +87,10 @@ namespace FineUIPro.Web.InformationProject
                         {
                             this.txtTotalWorkNum.Text = Convert.ToString(millionsMonthlyReport.TotalWorkNum);
                         }
+                        if (millionsMonthlyReport.OutSideUnitWorkNum != null)
+                        {
+                            this.txtOutSideUnitWorkNum.Text = Convert.ToString(millionsMonthlyReport.OutSideUnitWorkNum);
+                        }
                         if (millionsMonthlyReport.PostPersonNum != null)
                         {
                             this.txtPostPersonNum.Text = Convert.ToString(millionsMonthlyReport.PostPersonNum);
@@ -353,7 +357,7 @@ namespace FineUIPro.Web.InformationProject
                 if (flowOperate != null)
                 {
                     millionsMonthlyReport.States = BLL.Const.State_2;
-                }               
+                }
                 else
                 {
                     millionsMonthlyReport.States = this.ctlAuditFlow.NextStep;
@@ -366,6 +370,7 @@ namespace FineUIPro.Web.InformationProject
             millionsMonthlyReport.ContractorNum = Funs.GetNewIntOrZero(this.txtContractorNum.Text.Trim());
             millionsMonthlyReport.SumPersonNum = millionsMonthlyReport.PostPersonNum + millionsMonthlyReport.SnapPersonNum + millionsMonthlyReport.ContractorNum;
             millionsMonthlyReport.TotalWorkNum = Funs.GetNewDecimalOrZero(this.txtTotalWorkNum.Text.Trim());
+            millionsMonthlyReport.OutSideUnitWorkNum = Funs.GetNewDecimalOrZero(this.txtOutSideUnitWorkNum.Text.Trim());
             millionsMonthlyReport.SeriousInjuriesNum = Funs.GetNewInt(this.txtSeriousInjuriesNum.Text.Trim());
             millionsMonthlyReport.SeriousInjuriesPersonNum = Funs.GetNewInt(this.txtSeriousInjuriesPersonNum.Text.Trim());
             millionsMonthlyReport.SeriousInjuriesLossHour = Funs.GetNewInt(this.txtSeriousInjuriesLossHour.Text.Trim());
@@ -381,7 +386,7 @@ namespace FineUIPro.Web.InformationProject
             millionsMonthlyReport.MedicalTreatmentLossHour = Funs.GetNewInt(this.txtMedicalTreatmentLossHour.Text.Trim());
             millionsMonthlyReport.FireNum = Funs.GetNewInt(this.txtFireNum.Text.Trim());
             millionsMonthlyReport.EnvironmenNum = Funs.GetNewInt(this.txtEnvironmenNum.Text.Trim());
-            millionsMonthlyReport.TrafficNum = Funs.GetNewInt(this.txtTrafficNum.Text.Trim()); 
+            millionsMonthlyReport.TrafficNum = Funs.GetNewInt(this.txtTrafficNum.Text.Trim());
             millionsMonthlyReport.EquipmentNum = Funs.GetNewInt(this.txtEquipmentNum.Text.Trim());
             millionsMonthlyReport.QualityNum = Funs.GetNewInt(this.txtQualityNum.Text.Trim());
             millionsMonthlyReport.OtherNum = Funs.GetNewInt(this.txtOtherNum.Text.Trim());
@@ -409,7 +414,7 @@ namespace FineUIPro.Web.InformationProject
                 millionsMonthlyReport.MillionsMonthlyReportId = this.MillionsMonthlyReportId;
                 BLL.ProjectMillionsMonthlyReportService.UpdateMillionsMonthlyReport(millionsMonthlyReport);
                 BLL.LogService.AddSys_Log(this.CurrUser, millionsMonthlyReport.Year.ToString() + "-" + millionsMonthlyReport.Month.ToString(), millionsMonthlyReport.MillionsMonthlyReportId, BLL.Const.ProjectMillionsMonthlyReportMenuId, BLL.Const.BtnModify);
-                
+
             }
             else
             {
@@ -474,7 +479,18 @@ namespace FineUIPro.Web.InformationProject
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 int? sumTotalPanhours = 0;
-
+                int? sumOutSideTotalPanhours = 0;
+                List<string> outSideUnitIds = new List<string>();
+                var projectUnits = from x in db.Project_ProjectUnit
+                                   where x.ProjectId == this.ProjectId
+                                   select x;
+                foreach (var projectUnit in projectUnits)
+                {
+                    if (projectUnit.UnitType == BLL.Const.ProjectUnitType_1 || projectUnit.IsOutSideUnit == true)
+                    {
+                        outSideUnitIds.Add(projectUnit.UnitId);
+                    }
+                }
                 //获取当期人工时日报
                 List<Model.SitePerson_DayReport> dayReports = BLL.SitePerson_DayReportService.GetDayReportsByCompileDate(startTime, endTime, this.ProjectId);
                 if (dayReports.Count > 0)
@@ -482,10 +498,15 @@ namespace FineUIPro.Web.InformationProject
                     foreach (var dayReport in dayReports)
                     {
                         sumTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail where y.DayReportId == dayReport.DayReportId select y.PersonWorkTime as decimal?).Sum());
+                        sumOutSideTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail
+                                                                    where y.DayReportId == dayReport.DayReportId && outSideUnitIds.Contains(y.UnitId)
+                                                                    select y.PersonWorkTime as decimal?).Sum());
                     }
 
                     //总工时数（万）
                     this.txtTotalWorkNum.Text = decimal.Round(decimal.Round(Convert.ToDecimal(sumTotalPanhours), 4) / 10000, 4).ToString();
+                    //去除系统内单位的总工时数（万）
+                    this.txtOutSideUnitWorkNum.Text = decimal.Round(decimal.Round(Convert.ToDecimal(sumOutSideTotalPanhours), 4) / 10000, 4).ToString();
                     //在岗员工
                     //获取单位集合
                     var unitIds = (from x in dayReports
@@ -499,7 +520,7 @@ namespace FineUIPro.Web.InformationProject
                         if (unit != null)
                         {
                             int count = BLL.SitePerson_DayReportService.GetDayReportsByCompileDateAndUnitId(startTime, endTime, this.CurrUser.LoginProjectId, unitId).Count();
-                            if (unit.UnitId == BLL.Const.UnitId_CWCEC)    //本单位
+                            if (unit.UnitId == CommonService.GetThisUnitId())    //本单位
                             {
                                 //本单位在岗员工
                                 decimal personNum = (from x in dayReports
@@ -594,7 +615,7 @@ namespace FineUIPro.Web.InformationProject
                             Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(unitId);
                             if (unit != null)
                             {
-                                if (unit.UnitId == BLL.Const.UnitId_CWCEC)    //本单位
+                                if (unit.UnitId == CommonService.GetThisUnitId())    //本单位
                                 {
                                     //本单位在岗员工
                                     decimal? personNum = db.SitePerson_MonthReportDetail.Where(x => x.MonthReportId == monthReport.MonthReportId && x.UnitId == unitId).Sum(x => x.RealPersonNum);

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.designer.cs

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

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx

@@ -24,7 +24,7 @@
                             </f:TextBox>
                         </Items>
                     </f:FormRow>
-                    <f:FormRow>
+                    <f:FormRow ColumnWidths="20% 20% 25% 35%">
                         <Items>
                             <f:TextBox ID="txtYear" runat="server" Label="年度" LabelAlign="Right" Readonly="true">
                             </f:TextBox>
@@ -32,6 +32,8 @@
                             </f:TextBox>
                              <f:TextBox ID="txtTotalWorkNum" runat="server" Label="总工时数（万）" Readonly="true" LabelWidth="140px" LabelAlign="Right" EmptyText="0">
                     </f:TextBox>
+                            <f:TextBox ID="txtOutSideUnitWorkNum" runat="server" Label="去除系统内单位的总工时数（万）" LabelWidth="240px" Readonly="true" LabelAlign="Right" EmptyText="0">
+                                </f:TextBox>
                         </Items>
                     </f:FormRow>
                     <%-- <f:FormRow>

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.cs

@@ -87,6 +87,10 @@ namespace FineUIPro.Web.InformationProject
                         {
                             this.txtTotalWorkNum.Text = Convert.ToString(millionsMonthlyReport.TotalWorkNum);
                         }
+                        if (millionsMonthlyReport.OutSideUnitWorkNum != null)
+                        {
+                            this.txtOutSideUnitWorkNum.Text = Convert.ToString(millionsMonthlyReport.OutSideUnitWorkNum);
+                        }
                         if (millionsMonthlyReport.PostPersonNum != null)
                         {
                             this.txtPostPersonNum.Text = Convert.ToString(millionsMonthlyReport.PostPersonNum);

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.designer.cs

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

SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx

@@ -5,21 +5,19 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>项目单位</title>
-    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />  
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
     <style type="text/css">
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
-        }     
+        }
-        
+
-         .f-grid-row.red
+        .f-grid-row.red {
-        {
             background-color: #FF7575;
             background-image: none;
         }
-        
+
-        .fontred
+        .fontred {
-        {
             color: #FF7575;
             background-image: none;
         }
@@ -27,93 +25,97 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1"  runat="server" />
+        <f:pagemanager id="PageManager1" autosizepanelid="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" 
+        <f:panel id="Panel1" runat="server" margin="5px" bodypadding="5px" showborder="false"
-       ShowHeader="false"  Layout="VBox" BoxConfigAlign="Stretch" >
+            showheader="false" layout="VBox" boxconfigalign="Stretch">
-        <Items>
+            <items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目单位" 
+                <f:grid id="Grid1" showborder="true" showheader="false" title="项目单位"
-                EnableCollapse="true" runat="server" BoxFlex="1"  EnableColumnLines="true"
+                    enablecollapse="true" runat="server" boxflex="1" enablecolumnlines="true"
-                DataKeyNames="ProjectUnitId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="ProjectUnitId"
+                    datakeynames="ProjectUnitId" allowcellediting="true" clickstoedit="2" dataidfield="ProjectUnitId"
-                AllowSorting="true" SortField="UnitType,UnitCode" SortDirection="ASC"  OnSort="Grid1_Sort"                
+                    allowsorting="true" sortfield="UnitType,UnitCode" sortdirection="ASC" onsort="Grid1_Sort"
-                AllowPaging="true" IsDatabasePaging="true"  PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" 
+                    allowpaging="true" isdatabasepaging="true" pagesize="10" onpageindexchange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    enablerowdoubleclickevent="true" onrowdoubleclick="Grid1_RowDoubleClick" enabletextselection="True">
-                <Toolbars>
+                    <toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                        <f:toolbar id="Toolbar2" position="Top" runat="server" toolbaralign="Left">
-                        <Items>
+                            <items>
-                             <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="300px" LabelWidth="60px" EmptyText="请选择项目"
+                                <f:dropdownlist id="drpProject" runat="server" label="项目" width="300px" labelwidth="60px" emptytext="请选择项目"
-                                EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    enableedit="true" autopostback="true" onselectedindexchanged="TextBox_TextChanged">
-                            </f:DropDownList>
+                                </f:dropdownlist>
-                            <f:TextBox runat="server" Label="单位名称" ID="txtUnitName" EmptyText="输入查询条件" 
+                                <f:textbox runat="server" label="单位名称" id="txtUnitName" emptytext="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"></f:TextBox>                       
+                                    autopostback="true" ontextchanged="TextBox_TextChanged" width="250px" labelwidth="80px">
-                            <f:Label runat="server" Label="说明" CssClass="fontred" Text="请双击填报单位类型" LabelAlign="right"></f:Label>
+                                </f:textbox>
-                            <f:ToolbarFill runat="server"></f:ToolbarFill>                        
+                                <f:label runat="server" label="说明" cssclass="fontred" text="请双击填报单位类型" labelalign="right"></f:label>
-                            <f:Button ID="btnSelect" ToolTip="新增" Icon="Add" Hidden="true" runat="server" 
+                                <f:toolbarfill runat="server"></f:toolbarfill>
-                                 OnClick="btnSelect_Click">
+                                <f:button id="btnSelect" tooltip="新增" icon="Add" hidden="true" runat="server"
-                            </f:Button> 
+                                    onclick="btnSelect_Click">
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                </f:button>
-                                EnableAjax="false" DisableControlBeforePostBack="false">
+                                <f:button id="btnOut" onclick="btnOut_Click" runat="server" tooltip="导出" icon="FolderUp"
-                            </f:Button>
+                                    enableajax="false" disablecontrolbeforepostback="false">
-                        </Items>
+                                </f:button>
-                    </f:Toolbar>
+                            </items>
-                </Toolbars>
+                        </f:toolbar>
-                <Columns>
+                    </toolbars>
-                   <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                    <columns>
-                        TextAlign="Center">
+                        <f:templatefield columnid="tfNumber" width="55px" headertext="序号" headertextalign="Center"
-                        <ItemTemplate>
+                            textalign="Center">
-                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            <itemtemplate>
-                        </ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                    </f:TemplateField>
+                            </itemtemplate>
-                     <f:RenderField Width="150px" ColumnID="UnitTypeName" DataField="UnitTypeName" SortField="UnitTypeName"
+                        </f:templatefield>
-                        FieldType="String" HeaderText="单位类型"  HeaderTextAlign="Center" TextAlign="Left">
+                        <f:renderfield width="150px" columnid="UnitTypeName" datafield="UnitTypeName" sortfield="UnitTypeName"
-                    </f:RenderField>
+                            fieldtype="String" headertext="单位类型" headertextalign="Center" textalign="Left">
-                    <f:RenderField Width="180px" ColumnID="UnitCode" DataField="UnitCode" SortField="UnitCode" FieldType="String"
+                        </f:renderfield>
-                        HeaderText="单位代码">
+                        <f:renderfield width="180px" columnid="UnitCode" datafield="UnitCode" sortfield="UnitCode" fieldtype="String"
-                    </f:RenderField>
+                            headertext="单位代码">
-                    <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                        </f:renderfield>
-                        FieldType="String" HeaderText="单位名称"  HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                        <f:renderfield width="250px" columnid="UnitName" datafield="UnitName" sortfield="UnitName"
-                    </f:RenderField>
+                            fieldtype="String" headertext="单位名称" headertextalign="Center" textalign="Left" expandunusedspace="true">
-                    <f:RenderField Width="120px" ColumnID="CollCropCode" DataField="CollCropCode" SortField="CollCropCode"
+                        </f:renderfield>
-                        FieldType="String" HeaderText="信用代码"  HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                        <f:renderfield width="120px" columnid="CollCropCode" datafield="CollCropCode" sortfield="CollCropCode"
-                    </f:RenderField>
+                            fieldtype="String" headertext="信用代码" headertextalign="Center" textalign="Left" expandunusedspace="true">
-                    <f:RenderField Width="110px" ColumnID="InTime" DataField="InTime" SortField="InTime"
+                        </f:renderfield>
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
+                        <f:renderfield width="110px" columnid="InTime" datafield="InTime" sortfield="InTime"
-                         HeaderTextAlign="Center" TextAlign="Center">
+                            fieldtype="Date" renderer="Date" rendererargument="yyyy-MM-dd" headertext="入场时间"
-                    </f:RenderField>
+                            headertextalign="Center" textalign="Center">
-                    <f:RenderField Width="110px" ColumnID="OutTime" DataField="OutTime" SortField="OutTime"
+                        </f:renderfield>
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="出场时间"
+                        <f:renderfield width="110px" columnid="OutTime" datafield="OutTime" sortfield="OutTime"
-                       HeaderTextAlign="Center" TextAlign="Center">
+                            fieldtype="Date" renderer="Date" rendererargument="yyyy-MM-dd" headertext="出场时间"
-                    </f:RenderField>           
+                            headertextalign="Center" textalign="Center">
-                      <f:CheckBoxField Width="100px" SortField="IsSynchro" RenderAsStaticField="true" DataField="IsSynchro"
+                        </f:renderfield>
-                            HeaderText="同步实名制" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:checkboxfield width="100px" sortfield="IsSynchro" renderasstaticfield="true" datafield="IsSynchro"
-                        </f:CheckBoxField>
+                            headertext="同步实名制" headertextalign="Center" textalign="Center">
-                </Columns>
+                        </f:checkboxfield>
-                <Listeners>
+                        <f:checkboxfield width="120px" sortfield="IsOutSideUnit" renderasstaticfield="true" datafield="IsOutSideUnit"
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            headertext="系统外单位" headertextalign="Center" textalign="Center">
-                    <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                        </f:checkboxfield>
-                </Listeners>
+                    </columns>
-            <PageItems>
+                    <listeners>
-                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        <f:listener event="beforerowcontextmenu" handler="onRowContextMenu" />
-                </f:ToolbarSeparator>
+                        <f:listener event="dataload" handler="onGridDataLoad" />
-                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                    </listeners>
-                </f:ToolbarText>
+                    <pageitems>
-                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        <f:toolbarseparator id="ToolbarSeparator1" runat="server">
-                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">             
+                        </f:toolbarseparator>
-                </f:DropDownList>        
+                        <f:toolbartext id="ToolbarText1" runat="server" text="每页记录数：">
-            </PageItems>            
+                        </f:toolbartext>
-            </f:Grid>
+                        <f:dropdownlist runat="server" id="ddlPageSize" width="80px" autopostback="true"
-        </Items>
+                            onselectedindexchanged="ddlPageSize_SelectedIndexChanged">
-    </f:Panel> 
+                        </f:dropdownlist>
-    <f:Window ID="Window1" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+                    </pageitems>
-        Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true">
+                </f:grid>
-    </f:Window>                  
+            </items>
-    <f:Menu ID="Menu1" runat="server">
+        </f:panel>
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Hidden="true"
+        <f:window id="Window1" hidden="true" enableiframe="true" enablemaximize="true"
-           Icon="Pencil" runat="server" Text="编辑">
+            target="Parent" enableresize="false" runat="server" onclose="Window1_Close" ismodal="true">
-        </f:MenuButton>
+        </f:window>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true"
+        <f:menu id="Menu1" runat="server">
-            Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+            <f:menubutton id="btnMenuEdit" onclick="btnMenuEdit_Click" enablepostback="true" hidden="true"
-        </f:MenuButton>
+                icon="Pencil" runat="server" text="编辑">
-    </f:Menu>
+            </f:menubutton>
+            <f:menubutton id="btnMenuDelete" onclick="btnMenuDelete_Click" enablepostback="true" hidden="true"
+                icon="Delete" confirmtext="删除选中行？" confirmtarget="Parent" runat="server" text="删除">
+            </f:menubutton>
+        </f:menu>
     </form>
     <script type="text/javascript">       
         var menuID = '<%= Menu1.ClientID %>';

SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs

@@ -55,7 +55,7 @@ namespace FineUIPro.Web.ProjectData
             {
                 string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.CollCropCode
                         ,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime
-                        ,ProjectUnit.OutTime,ProjectUnit.IsSynchro "
+                        ,ProjectUnit.OutTime,ProjectUnit.IsSynchro,ProjectUnit.IsOutSideUnit "
                                 + @" FROM Project_ProjectUnit AS ProjectUnit "
                                 + @" LEFT JOIN Base_Project AS Project ON ProjectUnit.ProjectId = Project.ProjectId "
                                 + @" LEFT JOIN Base_Unit AS Unit ON ProjectUnit.UnitId = Unit.UnitId "

SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx

@@ -8,101 +8,101 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" LabelWidth="140px"
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" LabelWidth="140px"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-        <rows>
+            <Rows>
-            <f:FormRow>
-                <Items>                 
-                   <f:Label ID="lbProjectName" runat="server" Label="项目名称"></f:Label>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>                 
-                   <f:Label ID="lbUnitName" runat="server" Label="单位名称"></f:Label>
-                </Items>
-            </f:FormRow>            
-            <f:FormRow>
-                <Items>
-                    <f:DropDownList ID="drpUnitType" Label="单位类型" runat="server" FocusOnPageLoad="true">
-                    </f:DropDownList> 
-                    <f:TextBox ID="txtCollCropCode" runat="server" Label="社会统一信用代码" Required="true"
-                         MaxLength="50" ShowRedStar="true" >
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>  
-            <f:FormRow>                 
-                <Items>
-                    <f:TextBox ID="txtLinkName" runat="server" Label="联系人姓名"  
-                         MaxLength="50" >
-                    </f:TextBox>
-                    <f:DropDownList ID="drpIdcardType" runat="server" Label="联系人证件类型" EnableEdit="true"
-                       >
-                    </f:DropDownList>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>                 
-                <Items>
-                    <f:TextBox ID="txtIdcardNumber" runat="server" Label="联系人证件号"  
-                         MaxLength="50" >
-                    </f:TextBox>
-                    <f:TextBox ID="txtLinkMobile" runat="server" Label="联系人电话"  
-                         MaxLength="50" >
-                    </f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>                 
-                <Items>
-                    <f:RadioButtonList runat="server" ID="rblIsChina" Label="是否中国企业">
-                        <f:RadioItem Value="Y" Text="是" Selected="true"/>
-                        <f:RadioItem Value="N" Text="否"  />
-                    </f:RadioButtonList>
-                    <f:RadioButtonList runat="server" ID="rblCollCropStatus" Label="是否黑名单企业">
-                        <f:RadioItem Value="Y" Text="是" />
-                        <f:RadioItem Value="N" Text="否" Selected="true" />
-                    </f:RadioButtonList>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>  
-                 <f:DatePicker runat="server" Label="入场时间" ID="txtInTime"></f:DatePicker>
-                     <f:DatePicker runat="server" Label="出场时间" ID="txtOutTime"></f:DatePicker>
-                </Items>
-            </f:FormRow>    
-            <f:FormRow>
-                <Items>  
-                 <f:NumberBox ID="nbPlanCostA" NoDecimal="false" NoNegative="false" MinValue="0" runat="server" 
-                        Label="安全生产费</br>计划额（总额）"  LabelWidth="120px" Hidden="true">
-                    </f:NumberBox>
-                    <f:NumberBox ID="nbPlanCostB" NoDecimal="false" NoNegative="false" MinValue="0" runat="server" 
-                        Label="文明施工措施费</br>计划额（总额）"  LabelWidth="120px" Hidden="true">
-                    </f:NumberBox>
-                </Items>
-            </f:FormRow>   
-            <f:FormRow>
-                <Items>  
-                 <f:TextArea runat="server" ID="txtContractRange" Label="承包范围" Height="60px">
-                            </f:TextArea>
-                </Items>
-            </f:FormRow>      
                 <f:FormRow>
-                <Items>  
+                    <Items>
-                 <f:CheckBox runat="server" ID="ckIsSynchro" Label="是否同步实名制"></f:CheckBox>
+                        <f:Label ID="lbProjectName" runat="server" Label="项目名称"></f:Label>
-                </Items>
+                    </Items>
-            </f:FormRow>
+                </f:FormRow>
-        </rows>
+                <f:FormRow>
-        <toolbars>
+                    <Items>
-            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                        <f:Label ID="lbUnitName" runat="server" Label="单位名称"></f:Label>
-                <Items>
+                    </Items>
-                    <f:Button ID="btnSave" Icon="SystemSave" runat="server"  ValidateForms="SimpleForm1"
+                </f:FormRow>
-                        OnClick="btnSave_Click">
+                <f:FormRow>
-                    </f:Button>
+                    <Items>
-                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                        <f:DropDownList ID="drpUnitType" Label="单位类型" runat="server" FocusOnPageLoad="true">
-                    </f:Button>
+                        </f:DropDownList>
-                </Items>
+                        <f:TextBox ID="txtCollCropCode" runat="server" Label="社会统一信用代码" Required="true"
-            </f:Toolbar>
+                            MaxLength="50" ShowRedStar="true">
-        </toolbars>
+                        </f:TextBox>
-    </f:Form>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtLinkName" runat="server" Label="联系人姓名"
+                            MaxLength="50">
+                        </f:TextBox>
+                        <f:DropDownList ID="drpIdcardType" runat="server" Label="联系人证件类型" EnableEdit="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtIdcardNumber" runat="server" Label="联系人证件号"
+                            MaxLength="50">
+                        </f:TextBox>
+                        <f:TextBox ID="txtLinkMobile" runat="server" Label="联系人电话"
+                            MaxLength="50">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsChina" Label="是否中国企业">
+                            <f:RadioItem Value="Y" Text="是" Selected="true" />
+                            <f:RadioItem Value="N" Text="否" />
+                        </f:RadioButtonList>
+                        <f:RadioButtonList runat="server" ID="rblCollCropStatus" Label="是否黑名单企业">
+                            <f:RadioItem Value="Y" Text="是" />
+                            <f:RadioItem Value="N" Text="否" Selected="true" />
+                        </f:RadioButtonList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DatePicker runat="server" Label="入场时间" ID="txtInTime"></f:DatePicker>
+                        <f:DatePicker runat="server" Label="出场时间" ID="txtOutTime"></f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox ID="nbPlanCostA" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
+                            Label="安全生产费</br>计划额（总额）" LabelWidth="120px" Hidden="true">
+                        </f:NumberBox>
+                        <f:NumberBox ID="nbPlanCostB" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
+                            Label="文明施工措施费</br>计划额（总额）" LabelWidth="120px" Hidden="true">
+                        </f:NumberBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea runat="server" ID="txtContractRange" Label="承包范围" Height="60px">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:CheckBox runat="server" ID="ckIsSynchro" Label="是否同步实名制"></f:CheckBox>
+                        <f:CheckBox runat="server" ID="ckIsOutSideUnit" Label="是否系统外单位"></f:CheckBox>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs

@@ -90,6 +90,10 @@ namespace FineUIPro.Web.ProjectData
                         {
                             this.ckIsSynchro.Checked = true;
                         }
+                        if (projectUnit.IsOutSideUnit == true)
+                        {
+                            this.ckIsOutSideUnit.Checked = true;
+                        }
                     }
                 }
             }
@@ -122,6 +126,14 @@ namespace FineUIPro.Web.ProjectData
                 {
                     newProjectUnit.IsSynchro = false;
                 }
+                if (this.ckIsOutSideUnit.Checked)
+                {
+                    newProjectUnit.IsOutSideUnit = true;
+                }
+                else
+                {
+                    newProjectUnit.IsOutSideUnit = null;
+                }
                 BLL.ProjectUnitService.UpdateProjectUnit(newProjectUnit);
                 Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(newProjectUnit.UnitId);
                 if (unit != null)

SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData {
+namespace FineUIPro.Web.ProjectData
-    
+{
-    
+
-    public partial class ProjectUnitSave {
+
-        
+    public partial class ProjectUnitSave
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// lbProjectName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbProjectName;
-        
+
         /// <summary>
         /// lbUnitName 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbUnitName;
-        
+
         /// <summary>
         /// drpUnitType 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitType;
-        
+
         /// <summary>
         /// txtCollCropCode 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCollCropCode;
-        
+
         /// <summary>
         /// txtLinkName 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtLinkName;
-        
+
         /// <summary>
         /// drpIdcardType 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIdcardType;
-        
+
         /// <summary>
         /// txtIdcardNumber 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtIdcardNumber;
-        
+
         /// <summary>
         /// txtLinkMobile 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtLinkMobile;
-        
+
         /// <summary>
         /// rblIsChina 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsChina;
-        
+
         /// <summary>
         /// rblCollCropStatus 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblCollCropStatus;
-        
+
         /// <summary>
         /// txtInTime 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtInTime;
-        
+
         /// <summary>
         /// txtOutTime 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtOutTime;
-        
+
         /// <summary>
         /// nbPlanCostA 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox nbPlanCostA;
-        
+
         /// <summary>
         /// nbPlanCostB 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox nbPlanCostB;
-        
+
         /// <summary>
         /// txtContractRange 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtContractRange;
-        
+
         /// <summary>
         /// ckIsSynchro 控件。
         /// </summary>
@@ -182,7 +184,16 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsSynchro;
-        
+
+        /// <summary>
+        /// ckIsOutSideUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckIsOutSideUnit;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx

@@ -162,6 +162,9 @@
                                 <f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
                                     HeaderText="总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
+                               HeaderText="去除系统内单位的总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
+                </f:RenderField>
                                 <f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
                                     <Columns>
                                         <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs

@@ -123,6 +123,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 yearTotalItem.ContractorNum = yearSumItems.Sum(x => x.ContractorNum ?? 0);
                 yearTotalItem.SumPersonNum = yearSumItems.Sum(x => x.SumPersonNum ?? 0);
                 yearTotalItem.TotalWorkNum = yearSumItems.Sum(x => x.TotalWorkNum ?? 0);
+                yearTotalItem.OutSideUnitWorkNum = yearSumItems.Sum(x => x.OutSideUnitWorkNum ?? 0);
                 yearTotalItem.SeriousInjuriesNum = yearSumItems.Sum(x => x.SeriousInjuriesNum ?? 0);
                 yearTotalItem.SeriousInjuriesPersonNum = yearSumItems.Sum(x => x.SeriousInjuriesPersonNum ?? 0);
                 yearTotalItem.SeriousInjuriesLossHour = yearSumItems.Sum(x => x.SeriousInjuriesLossHour ?? 0);

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx

@@ -12,6 +12,11 @@
             white-space: normal;
             word-break: break-all;
         }
+
+         .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
     </style>
 </head>
 <body>
@@ -221,15 +226,19 @@
                                 <f:RenderField Width="120px" ColumnID="Affiliation" DataField="Affiliation" FieldType="String"
                                     HeaderText="所属单位" HeaderTextAlign="Center">
                                     <Editor>
-                                        <f:TextBox runat="server" ID="txtAffiliation" Text='<%# Eval("Affiliation")%>'>
+                                        <%-- <f:TextBox runat="server" ID="txtAffiliation" Text='<%# Eval("Affiliation")%>'> --%>
-                                        </f:TextBox>
+                                        <%-- </f:TextBox> --%>
+                                        <f:DropDownList ID="drpAffiliation" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpAffiliation_SelectedIndexChanged">
+                                        </f:DropDownList>
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="200px" ColumnID="Name" DataField="Name" FieldType="String"
                                     HeaderText="名称" HeaderTextAlign="Center">
                                     <Editor>
-                                        <f:TextBox runat="server" ID="txtName" Text='<%# Eval("Name")%>'>
+                                        <%-- <f:TextBox runat="server" ID="txtName" Text='<%# Eval("Name")%>'> --%>
-                                        </f:TextBox>
+                                        <%-- </f:TextBox> --%>
+                                        <f:DropDownList ID="drpName" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpName_SelectedIndexChanged">
+                                        </f:DropDownList>
                                     </Editor>
                                 </f:RenderField>
                                 <f:GroupField EnableLock="true" HeaderText="员工总数" TextAlign="Center">
@@ -270,6 +279,16 @@
                                         </f:NumberBox>
                                     </Editor>
                                 </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
+                                    HeaderText="去除系统内单位的总工时数(万)" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <%-- <f:TextBox runat="server" ID="txtTotalWorkNum" Text='<%# Eval("TotalWorkNum")%>'>
+                                    </f:TextBox>--%>
+                                        <f:NumberBox ID="txtOutSideUnitWorkNum" NoDecimal="false" NoNegative="true" MinValue="0.00"
+                                            Text='<%# Eval("TotalWorkNum")%>' runat="server" DecimalPrecision="4">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
                                 <f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
                                     <Columns>
                                         <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
@@ -519,6 +538,9 @@
                                     </Editor>
                                 </f:RenderField>
                             </Columns>
+                        <Listeners>
+                            <f:Listener Event="beforeedit" Handler="onGridBeforeEdit"/>
+                        </Listeners>
                         </f:Grid>
                     </Items>
                 </f:FormRow>
@@ -550,3 +572,65 @@
     </form>
 </body>
 </html>
+<script type="text/javascript">
+    // 存储已绑定事件的下拉框ID，避免重复绑定
+    var boundDrpIds = [];
+    var grid1ClientID = '<%= Grid1.ClientID %>';
+    // Grid 单元格点击事件（核心：纯DOM解析，不依赖事件参数）
+    function onGridBeforeEdit(e) {
+        // 1. 解析点击的单元格DOM，获取行索引和列ID
+        var cellDom = $(e.target).closest(".f-grid-cell"); // 找到单元格DOM
+        if (!cellDom.length) return;
+        // 2. 获取行索引（从行DOM的属性中解析）
+        var rowDom = cellDom.closest(".f-grid-row");
+        var rowIndex = rowDom.attr("data-rowid"); // 行索引
+        if (rowIndex === undefined) return;
+        // 3. 获取列ID（从单元格DOM的属性中解析）
+        var columnId = cellDom.attr("data-columnid"); // 列ID（Name）
+        if (columnId !== "Name") return;
+        // 4. 触发单元格进入编辑态
+        var grid = F(grid1ClientID);
+        // 通过遍历columns数组查找匹配的列
+        var column = null;
+        for (var i = 0; i < grid.columns.length; i++) {
+            if (grid.columns[i].columnId === columnId) {    
+                column = grid.columns[i];
+                break;
+            }
+        }
+        if (!column) return;
+        
+        if (columnId === "Name") {
+            var unitName = "";
+            for (var i = 0; i < grid.data.length; i++) {
+                if (grid.data[i].id === rowIndex) { 
+                    unitName = grid.data[i].values.Affiliation;
+                    break;
+                }
+            }
+            // 动态加载选项 获取项目名称
+            loadDynamicProject(column,unitName)
+        };
+    }
+
+    function loadDynamicProject(column,unitName) {
+            $.ajax({
+                url: "MillionsMonthlyReportSave.aspx/InitDrpNameDataSource",
+                type: "POST",
+                contentType: "application/json; charset=utf-8",
+                dataType: "json", 
+                data: JSON.stringify({
+                    unitName: unitName,
+                }),
+                success: function(data) {
+                    var items = data.d;
+                    if(items.length>0){
+                        column.editor.data = items;
+                    }
+                },
+                error: function(xhr) {
+                    console.log("加载选项失败：" + xhr.responseText);
+                }
+            });
+        }
+</script>

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Web.Services;
 using System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.ZHGL.Information
@@ -43,6 +44,11 @@ namespace FineUIPro.Web.ZHGL.Information
         {
             if (!IsPostBack)
             {
+                drpAffiliation.DataTextField = "UnitName";
+                drpAffiliation.DataValueField = "UnitName";
+                drpAffiliation.DataSource = BLL.UnitService.GetBranchUnitList(false);
+                drpAffiliation.DataBind();
+
                 this.GetButtonPower();
                 items.Clear();
                 BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, false);
@@ -414,50 +420,52 @@ namespace FineUIPro.Web.ZHGL.Information
         private string AuditData()
         {
             string err = string.Empty;
-            Model.SGGLDB db = Funs.DB;
+            //Model.SUBQHSEDB db = Funs.DB;
-            var reports = from x in db.Information_MillionsMonthlyReport
+            //var reports = from x in db.Information_MillionsMonthlyReport
-                          where x.FillingDate < DateTime.Now
+            //              where x.FillingDate < DateTime.Now
-                          orderby x.FillingDate descending
+            //              orderby x.FillingDate descending
-                          select x;
+            //              select x;
-            if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
+            //if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
-            {
+            //{
-                reports = from x in reports
+            //    reports = from x in reports
-                          where x.MillionsMonthlyReportId != this.MillionsMonthlyReportId
+            //              where x.MillionsMonthlyReportId != this.MillionsMonthlyReportId
-                          orderby x.FillingDate descending
+            //              orderby x.FillingDate descending
-                          select x;
+            //              select x;
-            }
+            //}
-            var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList();
+            //var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList();
+            ////var items = from x in db.Information_MillionsMonthlyReportItem
+            ////            where reportIds.Contains(x.MillionsMonthlyReportId)
+            ////            select new { x.Name, x.TotalWorkNum };
             //var items = from x in db.Information_MillionsMonthlyReportItem
             //            where reportIds.Contains(x.MillionsMonthlyReportId)
             //            select new { x.Name, x.TotalWorkNum };
-            var items = from x in db.Information_MillionsMonthlyReportItem
+            //foreach (JObject mergedRow in Grid1.GetMergedData())
-                        where reportIds.Contains(x.MillionsMonthlyReportId)
+            //{
-                        select new { x.Name, x.TotalWorkNum };
+            //    JObject values = mergedRow.Value<JObject>("values");
-            foreach (JObject mergedRow in Grid1.GetMergedData())
+            //    if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString()))
-            {
+            //    {
-                JObject values = mergedRow.Value<JObject>("values");
+            //        string name = values.Value<string>("Name");
-                if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString()))
+            //        decimal d = values.Value<decimal>("TotalWorkNum");
-                {
+            //        var list = items.Where(x => x.Name == name);
-                    string name = values.Value<string>("Name");
+            //        decimal a = 0;
-                    decimal d = values.Value<decimal>("TotalWorkNum");
+            //        if (list.Count() > 0)
-                    var list = items.Where(x => x.Name == name);
+            //        {
-                    decimal a = 0;
+            //            foreach (var item in list)
-                    if (list.Count() > 0)
+            //            {
-                    {
+            //                a += item.TotalWorkNum ?? 0;
-                        foreach (var item in list)
+            //            }
-                        {
+            //        }
-                            a += item.TotalWorkNum ?? 0;
+            //        if (list.Count() > 0)
-                        }
+            //        {
-
+            //            decimal b = a / list.Count();
-                        //decimal b = a / list.Count();
+            //            if (d > b * 5)
-                        //if (d > b * 5)
+            //            {
-                        //{
+            //                err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！";
-                        //    err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！";
+            //                break;
-                        //    break;
+            //            }
-                        //}
+            //        }
-                    }
+            //    }
-                }
+            //}
-            }
             return err;
         }
         #endregion
@@ -465,7 +473,7 @@ namespace FineUIPro.Web.ZHGL.Information
         #region 增加本月明细
         private void GetItems(string millionsMonthlyReportId)
         {
-            decimal TotalWorkNumSum = 0;
+            decimal TotalWorkNumSum = 0, OutSideUnitWorkNumSum = 0;
             int PostPersonNumSum = 0, SnapPersonNumSum = 0, ContractorNumSum = 0, SumPersonNumSum = 0, SeriousInjuriesNumSum = 0, SeriousInjuriesPersonNumSum = 0, SeriousInjuriesLossHourSum = 0, MinorAccidentNumSum = 0,
                            MinorAccidentPersonNumSum = 0, MinorAccidentLossHourSum = 0, DeathAccidentNumSum = 0, DeathAccidentPersonNumSum = 0, DeathAccidentLossHourSum = 0, RestrictedWorkPersonNumSum = 0, RestrictedWorkLossHourSum = 0, MedicalTreatmentPersonNumSum = 0, MedicalTreatmentLossHourSum = 0,
                            FireNumSum = 0, EnvironmenNumSum = 0, TrafficNumSum = 0, EquipmentNumSum = 0, QualityNumSum = 0, OtherNumSum = 0, FirstAidDressingsNumSum = 0, AttemptedEventNumSum = 0, LossDayNumSum = 0;
@@ -475,7 +483,7 @@ namespace FineUIPro.Web.ZHGL.Information
             {
                 JObject values = mergedRow.Value<JObject>("values");
                 int SumPersonNum = 0;
-                Model.Information_MillionsMonthlyReportItem item = new Information_MillionsMonthlyReportItem();
+                Information_MillionsMonthlyReportItem item = new Information_MillionsMonthlyReportItem();
                 if (values["MillionsMonthlyReportItemId"].ToString() != "")
                 {
                     item.MillionsMonthlyReportItemId = values.Value<string>("MillionsMonthlyReportItemId");
@@ -485,10 +493,21 @@ namespace FineUIPro.Web.ZHGL.Information
                 if (!string.IsNullOrEmpty(values["Affiliation"].ToString()))
                 {
                     item.Affiliation = values.Value<string>("Affiliation");
+                    //var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == values.Value<string>("Affiliation"));
+                    //if (getUnit != null)
+                    //{
+                    //    item.UnitId = getUnit.UnitId;
+                    //}
                 }
                 if (!string.IsNullOrEmpty(values["Name"].ToString()))
                 {
                     item.Name = values.Value<string>("Name");
+                    //var Name = System.Text.RegularExpressions.Regex.Replace(values.Value<string>("Name"), @"\[[^\]]*\]", "").Trim();
+                    //var getProject = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectName == Name);
+                    //if (getProject != null)
+                    //{
+                    //    item.ProjectId = getProject.ProjectId;
+                    //}
                 }
                 if (!string.IsNullOrEmpty(values["PostPersonNum"].ToString()))
                 {
@@ -536,6 +555,15 @@ namespace FineUIPro.Web.ZHGL.Information
                 {
                     item.TotalWorkNum = 0;
                 }
+                if (!string.IsNullOrEmpty(values["OutSideUnitWorkNum"].ToString()))
+                {
+                    item.OutSideUnitWorkNum = values.Value<decimal>("OutSideUnitWorkNum");
+                    OutSideUnitWorkNumSum += values.Value<decimal>("OutSideUnitWorkNum");
+                }
+                else
+                {
+                    item.OutSideUnitWorkNum = 0;
+                }
                 if (!string.IsNullOrEmpty(values["SeriousInjuriesNum"].ToString()))
                 {
                     item.SeriousInjuriesNum = values.Value<int>("SeriousInjuriesNum");
@@ -742,6 +770,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 ContractorNum = ContractorNumSum,
                 SumPersonNum = SumPersonNumSum,
                 TotalWorkNum = TotalWorkNumSum,
+                OutSideUnitWorkNum = OutSideUnitWorkNumSum,
                 SeriousInjuriesNum = SeriousInjuriesNumSum,
                 SeriousInjuriesPersonNum = SeriousInjuriesPersonNumSum,
                 SeriousInjuriesLossHour = SeriousInjuriesLossHourSum,
@@ -787,6 +816,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 {
                     newItem.SortIndex = oldItem.SortIndex + 1;
                     newItem.Affiliation = oldItem.Affiliation;
+                    drpAffiliation_SelectedIndexChanged(sender, e);
                 }
                 else
                 {
@@ -848,6 +878,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 ContractorNum = 0,
                 SumPersonNum = 0,
                 TotalWorkNum = 0,
+                OutSideUnitWorkNum = 0,
                 SeriousInjuriesNum = 0,
                 SeriousInjuriesPersonNum = 0,
                 SeriousInjuriesLossHour = 0,
@@ -884,6 +915,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 ContractorNum = 0,
                 SumPersonNum = 0,
                 TotalWorkNum = 0,
+                OutSideUnitWorkNum = 0,
                 SeriousInjuriesNum = 0,
                 SeriousInjuriesPersonNum = 0,
                 SeriousInjuriesLossHour = 0,
@@ -938,7 +970,7 @@ namespace FineUIPro.Web.ZHGL.Information
                     }
                 }
 
-                Model.InformationProject_MillionsMonthlyReport report = millionsMonthlyReports.FirstOrDefault(x => x.ProjectId == p.ProjectId);
+                InformationProject_MillionsMonthlyReport report = millionsMonthlyReports.FirstOrDefault(x => x.ProjectId == p.ProjectId);
                 if (report != null)
                 {
                     item.PostPersonNum = report.PostPersonNum;
@@ -946,6 +978,7 @@ namespace FineUIPro.Web.ZHGL.Information
                     item.ContractorNum = report.ContractorNum;
                     item.SumPersonNum = report.SumPersonNum;
                     item.TotalWorkNum = report.TotalWorkNum;
+                    item.OutSideUnitWorkNum = report.OutSideUnitWorkNum;
                     item.SeriousInjuriesNum = report.SeriousInjuriesNum;
                     item.SeriousInjuriesPersonNum = report.SeriousInjuriesPersonNum;
                     item.SeriousInjuriesLossHour = report.SeriousInjuriesLossHour;
@@ -976,6 +1009,7 @@ namespace FineUIPro.Web.ZHGL.Information
                     item.ContractorNum = 0;
                     item.SumPersonNum = 0;
                     item.TotalWorkNum = 0;
+                    item.OutSideUnitWorkNum = 0;
                     item.SeriousInjuriesNum = 0;
                     item.SeriousInjuriesPersonNum = 0;
                     item.SeriousInjuriesLossHour = 0;
@@ -1131,6 +1165,7 @@ namespace FineUIPro.Web.ZHGL.Information
                                     ContractorNum = item.ContractorNum,
                                     SumPersonNum = item.SumPersonNum,
                                     TotalWorkNum = item.TotalWorkNum,
+                                    OutSideUnitWorkNum = item.OutSideUnitWorkNum,
                                     SeriousInjuriesNum = item.SeriousInjuriesNum,
                                     SeriousInjuriesPersonNum = item.SeriousInjuriesPersonNum,
                                     SeriousInjuriesLossHour = item.SeriousInjuriesLossHour,
@@ -1282,5 +1317,92 @@ namespace FineUIPro.Web.ZHGL.Information
             }
             this.txtKeyWorkOKRate.Text = rate;
         }
+
+        protected void drpAffiliation_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(drpAffiliation.SelectedValue))
+            {
+                var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == drpAffiliation.SelectedValue);
+                if (getUnit != null)
+                {
+                    var originalProjects = ProjectService.GetProjectWorkList(getUnit.UnitId);
+                    var getSProjects = originalProjects.Select(x => new
+                    {
+                        x.ProjectId,
+                        ProjectName = $"[{x.ProjectCode}]{x.ProjectName}",
+                    }).ToList();
+                    drpName.DataTextField = "ProjectName";
+                    drpName.DataValueField = "ProjectName";
+                    drpName.DataSource = getSProjects;
+                    drpName.DataBind();
+                }
+            }
+        }
+
+        protected void drpName_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            bool isDuplicate = false;
+
+            if (!string.IsNullOrEmpty(drpName.SelectedValue))
+            {
+                foreach (JObject mergedRow in Grid1.GetMergedData())
+                {
+                    JObject values = mergedRow.Value<JObject>("values");
+                    if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["Affiliation"].ToString()))
+                    {
+                        if (values.Value<string>("Name") == drpName.SelectedValue && values.Value<string>("Affiliation") == drpAffiliation.SelectedValue)
+                        {
+                            isDuplicate = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (isDuplicate)
+            {
+                drpName.SelectedValue = string.Empty;
+                Alert.Show("此项目已被选择，请勿重复！");
+            }
+        }
+
+        #region 动态加载下拉框
+
+        [WebMethod]
+        public static List<object> InitDrpNameDataSource(string unitName)
+        {
+            List<object> result = new List<object>();
+            try
+            {
+                var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == unitName);
+                if (getUnit != null)
+                {
+                    var originalProjects = ProjectService.GetProjectWorkList(getUnit.UnitId);
+                    var getSProjects = originalProjects.Select(x => new
+                    {
+                        x.ProjectId,
+                        ProjectName = $"[{x.ProjectCode}]{x.ProjectName}",
+                    }).ToList();
+
+                    foreach (var project in getSProjects)
+                    {
+                        result.Add(new
+                        {
+                            display = project.ProjectName ?? "",
+                            enabled = 1,
+                            group = "",
+                            prefix = string.Empty,
+                            value = project.ProjectName ?? "",
+                            text = project.ProjectName ?? "",
+                        });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+            return result;
+        }
+
+        #endregion
     }
 }

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs

@@ -436,22 +436,22 @@ namespace FineUIPro.Web.ZHGL.Information {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// txtAffiliation 控件。
+        /// drpAffiliation 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtAffiliation;
+        protected global::FineUIPro.DropDownList drpAffiliation;
         
         /// <summary>
-        /// txtName 控件。
+        /// drpName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtName;
+        protected global::FineUIPro.DropDownList drpName;
         
         /// <summary>
         /// txtPostPersonNum 控件。
@@ -489,6 +489,15 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// </remarks>
         protected global::FineUIPro.NumberBox txtTotalWorkNum;
         
+        /// <summary>
+        /// txtOutSideUnitWorkNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtOutSideUnitWorkNum;
+        
         /// <summary>
         /// txtDeathAccidentNum 控件。
         /// </summary>

SGGL/Model/Model.cs

@@ -204295,6 +204295,8 @@ namespace Model
 		
 		private System.Nullable<int> _EnvironmenNum;
 		
+		private System.Nullable<decimal> _OutSideUnitWorkNum;
+		
 		private EntityRef<Information_MillionsMonthlyReport> _Information_MillionsMonthlyReport;
 		
     #region 可扩展性方法定义
@@ -204373,6 +204375,8 @@ namespace Model
     partial void OnDeathAccidentLossHourChanged();
     partial void OnEnvironmenNumChanging(System.Nullable<int> value);
     partial void OnEnvironmenNumChanged();
+    partial void OnOutSideUnitWorkNumChanging(System.Nullable<decimal> value);
+    partial void OnOutSideUnitWorkNumChanged();
     #endregion
 		
 		public Information_MillionsMonthlyReportItem()
@@ -205105,6 +205109,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSideUnitWorkNum", DbType="Decimal(18,4)")]
+		public System.Nullable<decimal> OutSideUnitWorkNum
+		{
+			get
+			{
+				return this._OutSideUnitWorkNum;
+			}
+			set
+			{
+				if ((this._OutSideUnitWorkNum != value))
+				{
+					this.OnOutSideUnitWorkNumChanging(value);
+					this.SendPropertyChanging();
+					this._OutSideUnitWorkNum = value;
+					this.SendPropertyChanged("OutSideUnitWorkNum");
+					this.OnOutSideUnitWorkNumChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_MillionsMonthlyReportItem_Information_MillionsMonthlyReport", Storage="_Information_MillionsMonthlyReport", ThisKey="MillionsMonthlyReportId", OtherKey="MillionsMonthlyReportId", IsForeignKey=true)]
 		public Information_MillionsMonthlyReport Information_MillionsMonthlyReport
 		{
@@ -216511,6 +216535,8 @@ namespace Model
 		
 		private System.Nullable<int> _SoleDutyNum;
 		
+		private System.Nullable<decimal> _OutSideUnitWorkNum;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -216631,6 +216657,8 @@ namespace Model
     partial void OnCommissionerNumChanged();
     partial void OnSoleDutyNumChanging(System.Nullable<int> value);
     partial void OnSoleDutyNumChanged();
+    partial void OnOutSideUnitWorkNumChanging(System.Nullable<decimal> value);
+    partial void OnOutSideUnitWorkNumChanged();
     #endregion
 		
 		public InformationProject_MillionsMonthlyReport()
@@ -217768,6 +217796,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSideUnitWorkNum", DbType="Decimal(18,4)")]
+		public System.Nullable<decimal> OutSideUnitWorkNum
+		{
+			get
+			{
+				return this._OutSideUnitWorkNum;
+			}
+			set
+			{
+				if ((this._OutSideUnitWorkNum != value))
+				{
+					this.OnOutSideUnitWorkNumChanging(value);
+					this.SendPropertyChanging();
+					this._OutSideUnitWorkNum = value;
+					this.SendPropertyChanged("OutSideUnitWorkNum");
+					this.OnOutSideUnitWorkNumChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_InformationProject_MillionsMonthlyReport_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -302096,7 +302144,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ControlPointType", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ControlPointType", DbType="NVarChar(100)")]
 		public string ControlPointType
 		{
 			get
@@ -302116,7 +302164,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(200)")]
 		public string AcceptanceSite
 		{
 			get
@@ -316471,6 +316519,8 @@ namespace Model
 		
 		private string _QRCodeAttachUrl;
 		
+		private System.Nullable<bool> _IsOutSideUnit;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -316509,6 +316559,8 @@ namespace Model
     partial void OnCQMS_OrganizationPicChanged();
     partial void OnQRCodeAttachUrlChanging(string value);
     partial void OnQRCodeAttachUrlChanged();
+    partial void OnIsOutSideUnitChanging(System.Nullable<bool> value);
+    partial void OnIsOutSideUnitChanged();
     #endregion
 		
 		public Project_ProjectUnit()
@@ -316826,6 +316878,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOutSideUnit", DbType="Bit")]
+		public System.Nullable<bool> IsOutSideUnit
+		{
+			get
+			{
+				return this._IsOutSideUnit;
+			}
+			set
+			{
+				if ((this._IsOutSideUnit != value))
+				{
+					this.OnIsOutSideUnitChanging(value);
+					this.SendPropertyChanging();
+					this._IsOutSideUnit = value;
+					this.SendPropertyChanged("IsOutSideUnit");
+					this.OnIsOutSideUnitChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_ProjectUnit_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -429530,7 +429602,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(200)")]
 		public string AcceptanceSite
 		{
 			get
@@ -448847,7 +448919,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceSite", DbType="NVarChar(200)")]
 		public string AcceptanceSite
 		{
 			get