修改进度报表及试车管理

SGGL/BLL/HSSE/License/LicenseManagerService.cs

@@ -51,7 +51,6 @@ namespace BLL
                 UnitId = licenseManager.UnitId,
                 LicenseManageContents = licenseManager.LicenseManageContents,
                 ApplicantMan = licenseManager.ApplicantMan,
-                CNProfessionalId = licenseManager.CNProfessionalId,
                 CompileMan = licenseManager.CompileMan,
                 CompileDate = licenseManager.CompileDate,
                 States = licenseManager.States,
@@ -59,6 +58,7 @@ namespace BLL
                 StartDate = licenseManager.StartDate,
                 EndDate = licenseManager.EndDate,
                 WorkStates = licenseManager.WorkStates,
+                IsHighRisk = licenseManager.IsHighRisk,
             };
             db.License_LicenseManager.InsertOnSubmit(newLicenseManager);
             db.SubmitChanges();
@@ -83,13 +83,13 @@ namespace BLL
                 newLicenseManager.UnitId = licenseManager.UnitId;
                 newLicenseManager.LicenseManageContents = licenseManager.LicenseManageContents;
                 newLicenseManager.ApplicantMan = licenseManager.ApplicantMan;
-                newLicenseManager.CNProfessionalId = licenseManager.CNProfessionalId;
                 newLicenseManager.CompileDate = licenseManager.CompileDate;
                 newLicenseManager.States = licenseManager.States;
                 newLicenseManager.WorkAreaId = licenseManager.WorkAreaId;
                 newLicenseManager.StartDate = licenseManager.StartDate;
                 newLicenseManager.EndDate = licenseManager.EndDate;
                 newLicenseManager.WorkStates = licenseManager.WorkStates;
+                newLicenseManager.IsHighRisk = licenseManager.IsHighRisk;
                 db.SubmitChanges();
             }
         }

SGGL/BLL/JDGL/WBS/CnProfessionInitService.cs

@@ -83,5 +83,23 @@ namespace BLL
             var list = (from x in Funs.DB.WBS_CnProfessionInit orderby x.CnProfessionId select x).ToList();
             return list;
         }
+
+        /// <summary>
+        /// 专业下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="projectId">项目id</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitCnProfessionInitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "CnProfessionId";
+            dropName.DataTextField = "CnProfessionName";
+            dropName.DataSource = GetCnProfessionInitDropDownList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
     }
 }

SGGL/BLL/JDGL/WBS/EquipmentMaterialBigTypeService.cs

@@ -32,6 +32,7 @@ namespace BLL
                 EquipmentMaterialBigTypeId = EquipmentMaterialBigType.EquipmentMaterialBigTypeId,
                 EquipmentMaterialBigTypeCode = EquipmentMaterialBigType.EquipmentMaterialBigTypeCode,
                 EquipmentMaterialBigTypeName = EquipmentMaterialBigType.EquipmentMaterialBigTypeName,
+                CnProfessionId = EquipmentMaterialBigType.CnProfessionId,
                 Remark = EquipmentMaterialBigType.Remark
             };
 
@@ -51,6 +52,7 @@ namespace BLL
             {
                 newEquipmentMaterialBigType.EquipmentMaterialBigTypeCode = EquipmentMaterialBigType.EquipmentMaterialBigTypeCode;
                 newEquipmentMaterialBigType.EquipmentMaterialBigTypeName = EquipmentMaterialBigType.EquipmentMaterialBigTypeName;
+                newEquipmentMaterialBigType.CnProfessionId = EquipmentMaterialBigType.CnProfessionId;
                 newEquipmentMaterialBigType.Remark = EquipmentMaterialBigType.Remark;
                 db.SubmitChanges();
             }