Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

.vs/SGGL_SeDin_New/v17/DocumentLayout.json

@@ -11,6 +11,10 @@
           "DockedWidth": 386,
           "SelectedChildIndex": -1,
           "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            },
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
@@ -59,10 +63,6 @@
               "$type": "Bookmark",
               "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
             },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
-            },
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
@@ -70,6 +70,10 @@
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
             }
           ]
         }

DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql

@@ -0,0 +1,3 @@
+alter table HSSE_ConstructionRisk add IsLarge bit null
+alter table HSSE_ConstructionRisk add IsSuperLarge bit null
+GO

SGGL/BLL/CLGL/TwArrivalStatisticsService.cs

@@ -171,15 +171,29 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                var results = new List<Tw_PipeMatMatchOutput>();
+                var results = new List<Tw_PipeMatMatchOutput>(); 
+                string [] taskPipeLineList= null;
 
+                var inoutPlanMasterl = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId);
+                if (inoutPlanMasterl!=null)
+                {
+                    if (inoutPlanMasterl.WeldTaskId.Split('|').Length==4)
+                    { 
+                         taskPipeLineList = Funs.DB.View_HJGL_WeldingTask.Where(e =>
+                            e.UnitWorkId == inoutPlanMasterl.WeldTaskId.Split('|')[0].ToString()
+                            && e.UnitId == inoutPlanMasterl.WeldTaskId.Split('|')[1].ToString()
+                            && e.TaskDate.Value.Date == DateTime
+                                .ParseExact(inoutPlanMasterl.WeldTaskId.Split('|')[2].ToString(), "yyyyMMdd", null).Date
+                            && e.SerialNumber == inoutPlanMasterl.WeldTaskId.Split('|')[3].ToString()
+                        ).Distinct().OrderBy(x => x.PipeLineSortIndex).Select(x => x.PipelineId).ToArray();
+                    }
+                }
                 // 获取所需材料列表
                 var requiredMaterials = (from x in db.Tw_InOutPlanDetail_Relation
                                          join master in db.Tw_InOutPlanMaster on x.InOutPlanMasterId equals master.Id
                                          join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
                                          join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId      
-                                         join t in db.HJGL_WeldTask on  master.WeldTaskId equals t.WeldTaskId
+                                         where x.InOutPlanMasterId == outPlanMasterId 
-                                         where x.InOutPlanMasterId == outPlanMasterId
                                          select new Tw_PipeMatMatchOutput
                                          {
                                              Id = Guid.NewGuid().ToString(),
@@ -191,12 +205,17 @@ namespace BLL
                                              MaterialSpec = y.MaterialSpec,
                                              MaterialUnit = y.MaterialUnit,
                                              MaterialDef = y.MaterialDef,
-                                             NeedNum = x.Number, 
+                                             NeedNum = x.Number
-                                             PipeLineSortIndex=t.PipeLineSortIndex
                                          }
                     ).ToList();
+                if (taskPipeLineList != null && taskPipeLineList.Any())
+                {
+                    requiredMaterials = requiredMaterials.OrderBy(x => Array.IndexOf(taskPipeLineList, x.PipelineId.ToString())).ToList();
+
+                }
+
                 var masterModle = db.Tw_InOutPlanMaster.FirstOrDefault(x => x.Id == outPlanMasterId);                   
-                results = GetMatMatchOutput(requiredMaterials.OrderBy(x=>x.PipelineId).ThenBy(x=>x.MaterialCode).ToList(), masterModle.WarehouseCode, masterModle.ProjectId);
+                results = GetMatMatchOutput(requiredMaterials, masterModle.WarehouseCode, masterModle.ProjectId);
                 return results;
             }
 

SGGL/BLL/CLGL/TwInOutplanmasterService.cs

@@ -32,7 +32,7 @@ namespace BLL
         {
             var q = from x in Funs.DB.Tw_InOutPlanMaster
                     join y in Funs.DB.HJGL_WeldTask on x.WeldTaskId equals y.WeldTaskId into yy
-                    from y in yy.DefaultIfEmpty() 
+                    from y in yy.DefaultIfEmpty()
                     join person in Funs.DB.Person_Persons  on x.CreateMan equals person.PersonId into persons
                     from person in persons.DefaultIfEmpty()
                     join auditperson in Funs.DB.Person_Persons on x.AuditMan equals auditperson.PersonId into auditpersons
@@ -284,8 +284,14 @@ namespace BLL
                     return responeData;
                 }
             }
-            var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的材料编码
+            var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的类型
-            if (typeString.Contains("采购入库") && typeString.Contains("退料入库"))
+            if (typeString.Where(x=>string.IsNullOrEmpty(x)).Count()>0)
+            {
+                responeData.code = 0;
+                responeData.message ="导入数据中类型列不能为空！";
+                return responeData;
+            }
+            if (typeString.Contains("采购入库") && typeString.Contains("其他入库"))
             {
                 responeData.code = 0;
                 responeData.message = errorWarehouseCode + "每次只能导入一种类型！";
@@ -350,9 +356,9 @@ namespace BLL
                     twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.采购入库;
 
                 }
-                else if ("退料入库".Equals(FirstCusBillCodeDtoIns.TypeString))
+                else if ("其他入库".Equals(FirstCusBillCodeDtoIns.TypeString))
                 {
-                    twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.退料入库;
+                    twInOutPlanMaster.TypeInt = (int)TwConst.TypeInt.其他入库;
                 }
                 else
                 {
@@ -555,7 +561,13 @@ namespace BLL
             TwInOutplandetailService.AddList(details, planMasterModel.Id);
             return message;
         } 
-
+        /// <summary>
+        /// 获取出库申请单编号
+        /// </summary>
+        /// <param name="taskCode"></param>
+        /// <param name="typeInt"></param>
+        /// <param name="category"></param>
+        /// <returns></returns>
         public static string GetCusBillCodeByTaskCode(string taskCode,TwConst.TypeInt typeInt,TwConst.Category category )
         {
             string cusBillCode = "";
@@ -601,17 +613,17 @@ namespace BLL
 
         public static string GetDataInCusBillCode(string projectid, string unitcode,string typeString,string unitWorkCode="",string Category = "")
         {
-            if (typeString == TwConst.TypeInt.退料入库.ToString())
+            if (typeString == TwConst.TypeInt.其他入库.ToString())
             {
                 //生成规则是20240919-unitcode-AP-GR01
-                string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) + "-" + unitcode + "-AP-GR";
+                string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now) ;
                 var queryAll = new Tw_InOutMasterOutput()
                 {
                     ProjectId = projectid,
                     CusBillCode = cusBillCode,
                 };
                 var queryAllresult = GetModle(queryAll).Count();
-                cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0');
+                cusBillCode = cusBillCode + "-AP-" + (queryAllresult + 1).ToString().PadLeft(2, '0');
                 return cusBillCode;
             }
             else if (typeString == TwConst.TypeInt.散件出库.ToString())
@@ -628,15 +640,30 @@ namespace BLL
                 var queryAllresult = GetModle(queryAll).Count();
                 if (Category == TwConst.Category.管段.ToString())
                 {
-                    cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0') + "-GI-P01";
+                    cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0') + "-AP-P01";
                 }
                 else
                 {
-                    cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0') + "-GI-PF01";
+                    cusBillCode = cusBillCode + (queryAllresult + 1).ToString().PadLeft(2, '0') + "-AP-PF01";
 
                 }
                 return cusBillCode;
             }
+            else if (typeString == TwConst.TypeInt.其他出库.ToString())
+            {
+                //生成规则是20240919-01
+                string cusBillCode = string.Format("{0:yyyyMMdd}", DateTime.Now);
+                var queryAll = new Tw_InOutMasterOutput()
+                {
+                    ProjectId = projectid,
+                    CusBillCode = cusBillCode,
+                    TypeInt = (int)TwConst.TypeInt.其他出库,
+                };
+                var queryAllresult = GetModle(queryAll).Count();
+                cusBillCode = cusBillCode +"-AP-"+ (queryAllresult + 1).ToString().PadLeft(2, '0');
+                return cusBillCode;
+            }
+
             else
             {
                 //生成规则是20240919-unitcode-AP-GR01
@@ -678,11 +705,11 @@ namespace BLL
             {
                 return;
             } 
-            var  pipelineList = db.View_HJGL_WeldingTask.Where(e =>  e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber).Select(x=>x.PipelineId).Distinct().ToList();
+            var  pipelineList = db.View_HJGL_WeldingTask.Where(e =>  e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber).OrderBy(x=>x.PipeLineSortIndex).Select(x=>x.PipelineId).Distinct().ToList();
-             
+            //领料出库需要排除散件材料
             var MaterDatial= from x in db.HJGL_PipeLineMat
                              join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
-                             where pipelineList.Contains(x.PipelineId)
+                             where pipelineList.Contains(x.PipelineId) && x.PrefabricatedComponents !=null  
                              select new
                              {
                                  x.PipelineId,

SGGL/BLL/CLGL/TwInputmasterService.cs

@@ -273,16 +273,8 @@ namespace BLL
                 WarehouseMan = plan.WarehouseMan,
                 WarehouseDate = plan.WarehouseDate
             };
-            if ((TwConst.TypeInt)plan.TypeInt!= TwConst.TypeInt.采购入库)
+            master.CusBillCode = GetCusBillCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt,
-            {
+                    (BLL.TwConst.Category)plan.Category, plan.CusBillCode);
-                master.CusBillCode = GetCusBillCodeByTaskCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt,
-                    (BLL.TwConst.Category)plan.Category);
-
-            }
-            else
-            {
-                master.CusBillCode= plan.CusBillCode.Replace("-AP", "");
-            }
             Add(master);
             //生成明细 
             foreach (var detail in detailLists)
@@ -338,7 +330,15 @@ namespace BLL
             TwInOutplanmasterService.Update(plan);
 
         }
-        public static string GetCusBillCodeByTaskCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category)
+        /// <summary>
+        /// 获取入库单编号
+        /// </summary>
+        /// <param name="taskCode"></param>
+        /// <param name="typeInt"></param>
+        /// <param name="category"></param>
+        /// <returns></returns>
+        /// <param name="planCusBillCode"></param>
+        public static string GetCusBillCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category, string planCusBillCode = "")
         {
             string cusBillCode = "";
             switch (typeInt)
@@ -353,6 +353,12 @@ namespace BLL
                         cusBillCode = taskCode + "-GI-PF01-RE01";
                     }
 
+                    break;
+                case TwConst.TypeInt.其他入库:
+                    cusBillCode = planCusBillCode.Replace("-AP-", "-GI-");
+                    break;
+                case TwConst.TypeInt.采购入库:
+                    cusBillCode = planCusBillCode.Replace("-AP", ""); ;
                     break;
             }
             return cusBillCode;

SGGL/BLL/CLGL/TwOutputmasterService.cs

@@ -78,7 +78,8 @@ namespace BLL
                     AuditDate2 = x.AuditDate2,
                     WarehouseMan = x.WarehouseMan,
                     WarehouseDate = x.WarehouseDate,
-                    WarehouseManName = warehouseperson.PersonName
+                    WarehouseManName = warehouseperson.PersonName,
+                    Remark=y.Remark
                 };
 
             return q;
@@ -281,7 +282,7 @@ namespace BLL
                 Id = Guid.NewGuid().ToString(),
                 InOutPlanMasterId = plan.Id,
                 ProjectId = plan.ProjectId,
-                CusBillCode = GetCusBillCodeByTaskCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt, (BLL.TwConst.Category)plan.Category),
+                CusBillCode = GetCusBillCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt, (BLL.TwConst.Category)plan.Category,plan.CusBillCode),
                 WarehouseCode = plan.WarehouseCode,
                 Category = plan.Category,
                 Source = plan.Source,
@@ -295,7 +296,8 @@ namespace BLL
                 AuditMan2 = plan.AuditMan2,
                 AuditDate2 = plan.AuditDate2,
                 WarehouseMan = plan.WarehouseMan,
-                WarehouseDate = plan.WarehouseDate
+                WarehouseDate = plan.WarehouseDate,
+                
             }; 
             Add(master);
             //生成出库单明细 
@@ -350,7 +352,15 @@ namespace BLL
             return result;
         }
 
-        public static string GetCusBillCodeByTaskCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category)
+        /// <summary>
+        /// 获取出库单编号
+        /// </summary>
+        /// <param name="taskCode"></param>
+        /// <param name="typeInt"></param>
+        /// <param name="category"></param>
+        /// <returns></returns>
+        /// <param name="planCusBillCode"></param>
+        public static string GetCusBillCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category, string planCusBillCode = "")
         {
             string cusBillCode = "";
             switch (typeInt)
@@ -377,7 +387,13 @@ namespace BLL
                     }
 
                     break;
-                
+                case TwConst.TypeInt.散件出库:
+                    cusBillCode = planCusBillCode.Replace("-AP-", "-GI-");
+                    break;
+                case TwConst.TypeInt.其他出库:
+                    cusBillCode = planCusBillCode.Replace("-AP-", "-GI-");
+                    break;
+
             }
             return cusBillCode;
         }

SGGL/BLL/HJGL/WeldingManage/HJGL_ComponentJointService.cs

@@ -137,7 +137,7 @@ namespace BLL
             var  q = Funs.DB.HJGL_Pipeline_ComponentJoint.Where(x => x.PipelineComponentId == PipelineComponentId).ToList();
             if (q.Count!=0)
             {
-                var NotProductionNum = (from x in q where x.State == 0 select x).Count(); //未生产数量
+                var NotProductionNum = (from x in q where x.State == 0||x.State ==null select x).Count(); //未生产数量
                 var ProductionNum = (from x in q where x.State == 1 select x).Count(); //已生产数量
                 if (NotProductionNum == 0) //全部完成
                 {

SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs

@@ -93,33 +93,25 @@ namespace BLL
         /// <param name="IsCheckPrint"></param>
         /// <returns></returns>
         public static IEnumerable<PipelineComponentPrintDto> GetPrintModelByPipelineComponentIds(
-            string[] PipelineComponentId, string[] PipelineId, bool IsCheckPrint)
+    string[] PipelineComponentId, string[] PipelineId, bool IsCheckPrint)
         {
             var db = Funs.DB;
             var query =
                 from com in db.HJGL_Pipeline_Component
-
                 join mat in db.HJGL_PipeLineMat on com.PipeLineMatId equals mat.PipeLineMatId into matJoin
-
                 from mat in matJoin.DefaultIfEmpty()
                 join pipe in db.HJGL_Pipeline on com.PipelineId equals pipe.PipelineId into pipeJoin
-
                 from pipe in pipeJoin.DefaultIfEmpty()
                 join punit in db.Base_Unit on com.PreUnit equals punit.UnitId into punitJoin
-
                 from punit in punitJoin.DefaultIfEmpty()
                 join aunit in db.Base_Unit on com.AssembleUnit equals aunit.UnitId into aunitJoin
-
                 from aunit in aunitJoin.DefaultIfEmpty()
                 join unitwork in db.WBS_UnitWork on pipe.UnitWorkId equals unitwork.UnitWorkId into unitworkJoin
-
                 from unitwork in unitworkJoin.DefaultIfEmpty()
                 join mater in db.Base_Material on pipe.MaterialId equals mater.MaterialId into materJoin
-
                 from mater in materJoin.DefaultIfEmpty()
-                where com.QRCode != "" 
+                where com.QRCode != ""
-                orderby com.PipelineComponentCode,com.PipelineId
+                orderby com.PipelineComponentCode, com.PipelineId
-
                 select new PipelineComponentPrintDto
                 {
                     PipelineComponentId = com.PipelineComponentId,
@@ -138,26 +130,32 @@ namespace BLL
                     QRCode2 = "PrePipeline$" + com.PipelineComponentId,
                     MaterialCode = mater.MaterialCode,
                     IsPrint = com.IsPrint
-
                 };
+
             var result = query.ToList();
-            if (PipelineComponentId!=null &&PipelineComponentId.Length > 0)
+
+            if (PipelineComponentId != null && PipelineComponentId.Length > 0)
             {
                 result = result.Where(x => PipelineComponentId.Contains(x.PipelineComponentId.ToString())).ToList();
             }
+
             if (PipelineId != null && PipelineId.Length > 0)
             {
                 result = result.Where(x => PipelineId.Contains(x.PipelineId.ToString())).ToList();
+                // 按照传入的 PipelineId 顺序排序
+                result = result.OrderBy(x => Array.IndexOf(PipelineId, x.PipelineId.ToString())).ToList();
             }
 
-            //if (IsCheckPrint != null & IsCheckPrint ==true)
+            // if (IsCheckPrint != null & IsCheckPrint == true)
-            //{
+            // {
-            //    result = result.Where(x =>  x.IsPrint==false||x.IsPrint==null).ToList();
+            //     result = result.Where(x => x.IsPrint == false || x.IsPrint == null).ToList();
-            //}
+            // }
+
             return result;
         }
 
-       
+
+
 
         /// <summary>
         /// 判断管线组件Code是否存在

SGGL/BLL/HSSE/EduTrain/TestRecordService.cs

@@ -36,14 +36,16 @@ namespace BLL
         /// <returns></returns>
         public static IEnumerable getListData(string personId, Grid Grid1)
         {
-            IQueryable<Model.Training_TestRecord> getDataList = getDataLists.Where(x => x.TestManId == personId);
+            var db1 = Funs.DB;
+            IQueryable<Model.Training_TestRecord> getDataList = (from x in db1.Training_TestRecord
+                                                                 where x.TestStartTime.HasValue
+                                                                 select x).Where(x => x.TestManId == personId);
             count = getDataList.Count();
             if (count == 0)
             {
                 return null;
             }
             getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
-            var db1 = Funs.DB;
             return from x in getDataList
                    join y in db1.Training_TestPlan on x.TestPlanId equals y.TestPlanId
                    join z in db1.Training_Plan on y.PlanId equals z.PlanId into g

SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs

@@ -8,7 +8,7 @@ namespace BLL
 {
     public static class ConstructionRiskListService
     {
-        
+
 
         /// <summary>
         /// 要求主键获取危险清单信息
@@ -48,6 +48,8 @@ namespace BLL
                 UnitId = constructionRisk.UnitId,
                 RiskLevel = constructionRisk.RiskLevel,
                 Coordinate = constructionRisk.Coordinate,
+                IsLarge = constructionRisk.IsLarge,
+                IsSuperLarge = constructionRisk.IsSuperLarge,
                 SubUnitDutyPerson = constructionRisk.SubUnitDutyPerson,
                 MainUnitDutyPerson = constructionRisk.MainUnitDutyPerson,
                 MainUnitCheckPerson = constructionRisk.MainUnitCheckPerson,
@@ -142,6 +144,8 @@ namespace BLL
                 newHazardList.UnitId = hazardList.UnitId;
                 newHazardList.RiskLevel = hazardList.RiskLevel;
                 newHazardList.Coordinate = hazardList.Coordinate;
+                newHazardList.IsLarge = hazardList.IsLarge;
+                newHazardList.IsSuperLarge = hazardList.IsSuperLarge;
                 newHazardList.SubUnitDutyPerson = hazardList.SubUnitDutyPerson;
                 newHazardList.MainUnitDutyPerson = hazardList.MainUnitDutyPerson;
                 newHazardList.MainUnitCheckPerson = hazardList.MainUnitCheckPerson;
@@ -175,7 +179,27 @@ namespace BLL
         }
 
         /// <summary>
-        /// 获取作业风险描述下拉项
+        /// 获取涉及的高风险作业下拉项
+        /// </summary>
+        /// <returns></returns>
+        public static ListItem[] RefLicenseList()
+        {
+            ListItem[] lis = new ListItem[10];
+            lis[0] = new ListItem("不涉及", "不涉及");
+            lis[1] = new ListItem("动火作业", "动火作业");
+            lis[2] = new ListItem("高处作业", "高处作业");
+            lis[3] = new ListItem("受限空间作业", "受限空间作业");
+            lis[4] = new ListItem("射线作业", "射线作业");
+            lis[5] = new ListItem("断路（占道）作业", "断路（占道）作业");
+            lis[6] = new ListItem("夜间施工作业", "夜间施工作业");
+            lis[7] = new ListItem("吊装作业", "吊装作业");
+            lis[8] = new ListItem("动土作业", "动土作业");
+            lis[9] = new ListItem("试压作业", "试压作业");
+            return lis;
+        }
+
+        /// <summary>
+        /// 获取作业风险下拉项
         /// </summary>
         /// <returns></returns>
         public static ListItem[] LicenseDesList()
@@ -230,6 +254,17 @@ namespace BLL
             return lis;
         }
 
+        /// <summary>
+        /// 获取风险等级下拉项
+        /// </summary>
+        /// <returns></returns>
+        public static ListItem[] RiskLevelList3()
+        {
+            ListItem[] lis = new ListItem[1];
+            lis[0] = new ListItem("重大风险", "重大风险");
+            return lis;
+        }
+
         /// <summary>
         /// 根据状态选择下一步办理类型
         /// </summary>

SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs

@@ -37,7 +37,9 @@ namespace BLL
        /// <returns></returns>
         public static IEnumerable getListData(string projectId, string personName,  Grid Grid1)
         {
-            IQueryable<Model.SitePerson_Person> getDataList = getDataLists;
+            var db1 = Funs.DB;
+            IQueryable<Model.SitePerson_Person> getDataList = from x in db1.SitePerson_Person
+                                                              select x;
             if (!string.IsNullOrEmpty(projectId))
             {
                 getDataList = getDataList.Where(e => e.ProjectId == projectId);
@@ -53,7 +55,7 @@ namespace BLL
                 return null;
             }
             getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
-            var db1 = Funs.DB;
+    
             return from x in getDataList
                    select new
                    {

SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs

@@ -38,14 +38,16 @@ namespace BLL
         /// <returns></returns>
         public static IEnumerable getListData(string personId, Grid Grid1)
         {
-            IQueryable<Model.QualityAudit_PersonQuality> getDataList = getDataLists.Where(x => x.PersonId == personId);
+            var db1 = Funs.DB;
+            IQueryable<Model.QualityAudit_PersonQuality> getDataList = (from x in db1.QualityAudit_PersonQuality
+                                                                        select x).Where(x => x.PersonId == personId);
             count = getDataList.Count();
             if (count == 0)
             {
                 return null;
             }
             getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
-            var db1 = Funs.DB;
+    
             return from x in getDataList
                    select new
                    {

SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx

@@ -41,6 +41,7 @@
                                     LabelWidth="70px" LabelAlign="Right" Width="170px">
                                 </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtMaterialCode"  Label="材料编码" EmptyText="输入查询条件" Width="230px" LabelWidth="100px"></f:TextBox>
+                                <f:CheckBox runat="server" ID="cbIsItAPerfectMatch" Label="仅未完全匹配材料"  LabelWidth="150px"></f:CheckBox>
                                 <f:Label runat="server"  ID="lbRate"></f:Label>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>

SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs

@@ -47,7 +47,10 @@ namespace FineUIPro.Web.CLGL
             {
                 lbRate.Text = "总体匹配率：0%";
             }
-
+            if (cbIsItAPerfectMatch.Checked)
+            {
+                tb = tb.Where(x => x.MatchRate < 1).ToList();
+            }
             //tb = GetFilteredTable(Grid1.FilteredData, tb);
             Grid1.DataSource = tb;
             Grid1.DataBind();

SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.designer.cs

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

SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs

@@ -35,7 +35,7 @@ namespace FineUIPro.Web.CLGL
                     table.Id = Id;
 
                     var model = TwInOutplanmasterService.GetListData(table).FirstOrDefault();
-                    txtCusBillCode.Text = TwOutputmasterService.GetCusBillCodeByTaskCode(model.WeldTaskCode, (TwConst.TypeInt)model.TypeInt, (BLL.TwConst.Category)model.Category);
+                    txtCusBillCode.Text = TwOutputmasterService.GetCusBillCode(model.WeldTaskCode, (TwConst.TypeInt)model.TypeInt, (BLL.TwConst.Category)model.Category);
                     txtWarehouseCode.Text = model.WarehouseCode;
                     txtCreateDate.Text = string.Format("{0:yyyy-MM-dd}", model.CreateDate);
                     txtCreateMan.Text = Person_PersonsService.GetPersonsNameById(model.CreateMan);

SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs

@@ -255,6 +255,7 @@ namespace FineUIPro.Web.CLGL
             var inoutplandetail = (from x in Funs.DB.Tw_InOutPlanDetail_Relation
                                    //where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID
                                    where  x.PipelineId == this.tvControlItem.SelectedNodeID
+                                   && (x.PrefabricatedComponents == null || x.PrefabricatedComponents == "")
                                    select x).ToList();
 
             // 优化 Linq 过滤条件

SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs

@@ -303,7 +303,12 @@ namespace FineUIPro.Web.CLGL
             {
                 ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
             }
-        } 
+        }
+        /// <summary>
+        /// 生成退料通知单
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void btnGenInPlanMaster_Click(object sender, EventArgs e)
         {
             if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.Tw_OutputMasterMenuId, Const.BtnModify))
@@ -329,7 +334,11 @@ namespace FineUIPro.Web.CLGL
                 ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
             }
         }
-
+        /// <summary>
+        /// 生成补料通知单
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void btnGenOutPlanMaster_Click(object sender, EventArgs e)
         {
             if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.Tw_OutputMasterMenuId, Const.BtnModify))

SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/05/2024 15:40:34" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="02/14/2025 15:25:56" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFZYev4O4t/luX5wZaXxxBH"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFMchzse3CjVTAfySORKU+B"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="pipelineCode" DataType="System.String" PropName="PipelineComponentId"/>
       <Column Name="Mat" DataType="System.String" PropName="PipelineComponentCode"/>

SGGL/FineUIPro.Web/File/Fastreport/管道焊接任务单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/20/2024 20:21:18" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="02/19/2025 17:36:29" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -59,7 +59,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFnv70ikz3Acipe8KbCgMqz"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFQPhjrCqee9t6Yw/Fyq9Re"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -145,7 +145,7 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="170.36" Width="1047.06" Height="71.82">
+    <DataBand Name="Data1" Top="169.45" Width="1047.06" Height="71.82">
       <TableObject Name="Tabel_Data" Left="9.45" Width="1030.05" Height="71.82" Border.Lines="Top" ManualBuildEvent="Tabel_Data_ManualBuild">
         <TableColumn Name="Column21" Width="85.32"/>
         <TableColumn Name="Column22" Width="227.12"/>
@@ -164,7 +164,7 @@ namespace FastReport
           <TableCell Name="Cell236" Border.Lines="All" Text="焊接工程量" HorzAlign="Center" VertAlign="Center"/>
         </TableRow>
         <TableRow Name="Row21" Height="49.14">
-          <TableCell Name="Cell137" Border.Lines="All" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
+          <TableCell Name="Cell137" Border.Lines="All" Text="[x]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell138" Border.Lines="All" Text=" [Data.PipelineCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell140" Border.Lines="All" Text=" [Data.FlowingSection]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell141" Border.Lines="All" Text="[Data.MaterialCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
@@ -173,7 +173,7 @@ namespace FastReport
           <TableCell Name="Cell144" Border.Lines="All" Text="[Data.Dia] " HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
         </TableRow>
       </TableObject>
-      <DataFooterBand Name="DataFooter1" Top="246.22" Width="1047.06" Height="175.72">
+      <DataFooterBand Name="DataFooter1" Top="244.39" Width="1047.06" Height="175.72">
         <TableObject Name="Table6" Left="9.45" Width="1030.05" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
           <TableColumn Name="Column65" Width="86.9"/>
           <TableColumn Name="Column66" Width="358.73"/>

SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/20/2024 20:20:57" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="02/14/2025 15:25:26" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRE1ChH6wUKa5kJPPhfRyqPI"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHphOkRPB8TewDYcFP4HzUI"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="PipelineComponentId" DataType="System.String"/>
       <Column Name="PipelineComponentCode" DataType="System.String"/>

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs

@@ -360,6 +360,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                                     hJGL_Pipeline_ComponentJoint.PipelineComponentId = item.PipelineComponentId;
                                     hJGL_Pipeline_ComponentJoint.WeldJointCode = joint.WeldJointCode;
                                     hJGL_Pipeline_ComponentJoint.WeldJointId=joint.WeldJointId;
+                                    hJGL_Pipeline_ComponentJoint.State = 0;
                                     HJGL_PipelineComponentjointService.AddHJGL_Pipeline_ComponentJoint(hJGL_Pipeline_ComponentJoint);
 
                                 }

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs

@@ -235,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                          where x.UnitWorkId == node.NodeID
                               && x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
                               && x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
-                         select new { x.TaskDate.Value.Date, x.UnitId,x.SerialNumber, x.PipeLineSortIndex }).Distinct().ToList().OrderBy(x => x.PipeLineSortIndex);
+                         select new { x.TaskDate.Value.Date, x.UnitId,x.SerialNumber }).Distinct().ToList().OrderBy(x => x.SerialNumber);
                 if (p.Count() > 0)
                 {
                     foreach (var item in p)
@@ -255,7 +255,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                          join y in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
                          where x.UnitWorkId == node.NodeID && y.WeldJointCode.Contains(this.txtWeldJointCode.Text.Trim())
                          orderby x.TaskDate descending
-                         select new { x.TaskDate.Value.Date, x.UnitId, x.SerialNumber ,x.PipeLineSortIndex}).Distinct().ToList().OrderBy(x => x.PipeLineSortIndex);
+                         select new { x.TaskDate.Value.Date, x.UnitId, x.SerialNumber }).Distinct().ToList().OrderBy(x => x.SerialNumber);
                 if (p.Count() > 0)
                 {
                     foreach (var item in p)
@@ -282,7 +282,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
             {
-                weldingTask = weldingTask.Where(e => e.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
+                weldingTask = weldingTask.Where(e => e.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).OrderBy(x=>x.PipeLineSortIndex).ToList();
             }
             DataTable tb = this.LINQToDataTable(weldingTask);
 
@@ -1223,7 +1223,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[2]);
             if (taskTime != null)
             {
-                var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue, tvControlItem.SelectedNodeID.Split('|')[3]).Select(x => x.PipelineId).Distinct().ToList();
+                var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue, tvControlItem.SelectedNodeID.Split('|')[3]).OrderBy(z=>z.PipeLineSortIndex).Select(x => x.PipelineId).Distinct().ToList();
 
                 if (pipelines.Any())
                 {
@@ -1277,7 +1277,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 this.BindGrid(GetWeldingTaskList);
             }
         }
-
+        /// <summary>
+        /// 生成出库申请单
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void btnGenOutPlanMaster_Click(object sender, EventArgs e)
         {
             if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
@@ -1354,7 +1358,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     if (taskTime != null)
                     {
                         var weldTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], tvControlItem.SelectedNodeID.Split('|')[1], Convert.ToDateTime(taskTime), this.rbIsAudit.SelectedValue, tvControlItem.SelectedNodeID.Split('|')[3]);
-                        var pipelines = weldTaskList.Select(x => x.PipelineId).Distinct().ToList();
+                        var pipelines = weldTaskList.OrderBy(x=>x.PipeLineSortIndex).Select(x => x.PipelineId).Distinct().ToList();
 
                         if (pipelines.Any())
                         {

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx

@@ -88,7 +88,7 @@
                                     HeaderTextAlign="Center">
                                 </f:RenderField>
                                   <f:RenderField Width="200px" ColumnID="LicenseDes" DataField="LicenseDes"
-                                    SortField="LicenseDes" FieldType="String" HeaderText="作业风险描述" TextAlign="Left"
+                                    SortField="LicenseDes" FieldType="String" HeaderText="作业风险" TextAlign="Left"
                                     HeaderTextAlign="Center">
                                 </f:RenderField>
                                   <f:RenderField Width="100px" ColumnID="RiskLevel" DataField="RiskLevel"
@@ -125,7 +125,7 @@
         </f:Panel>
         <f:Window ID="Window1" Title="施工作业风险" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="1000px" Height="600px">
+            Width="1000px" Height="800px">
         </f:Window>
          <f:Window ID="Window2" Title="施工作业风险" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="true" runat="server" OnClose="Window2_Close" IsModal="true"

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx

@@ -22,34 +22,45 @@
             <Rows>
                 <f:FormRow>
                     <Items>
+                        <f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true" Label="主项" LabelWidth="140px" ShowRedStar="true">
+                        </f:DropDownList>
                         <f:DropDownList ID="drpUnit" runat="server" EnableEdit="true" Label="施工单位" LabelWidth="140px"
                             AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
                         </f:DropDownList>
+                        <f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" ShowRedStar="true"
+                            >
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow >
+                    <Items>
                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="本周开始日期" ID="dpDateA" LabelWidth="140px" AutoPostBack="true"
                             ShowRedStar="true" Required="true" EnableDateSelectEvent="true" OnDateSelect="dpDateA_SelectedIndexChanged">
                         </f:DatePicker>
                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="本周结束日期" ID="dpDateZ" LabelWidth="140px"
                             ShowRedStar="true" Required="true">
                         </f:DatePicker>
-
+                        
-
+                        <f:Label runat="server"></f:Label>
                     </Items>
                 </f:FormRow>
                 <f:FormRow ColumnWidths="66% 34%">
                     <Items>
-                        <f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
+                         <f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
-                        <f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" ShowRedStar="true"
+                        <f:Label runat="server"></f:Label>
-                            >
+                        </Items>
-                        </f:DropDownList>
-                    </Items>
                 </f:FormRow>
-                <f:FormRow>
+                <f:FormRow ColumnWidths="66% 17% 17%">
                     <Items>
-                        <f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true" Label="主项" LabelWidth="140px" ShowRedStar="true">
-                        </f:DropDownList>
                         <f:DropDownList ID="drpRefLicense" runat="server" EnableEdit="true" Label="涉及的高风险作业" LabelWidth="140px" EnableMultiSelect="true"
                             AutoPostBack="true" OnSelectedIndexChanged="drpRefLicense_SelectedIndexChanged">
                         </f:DropDownList>
+                        <f:CheckBox runat="server" ID="cbIsLarge" Text="危大工程" AutoPostBack="true" OnCheckedChanged="cbIsLarge_CheckedChanged"></f:CheckBox>
+                        <f:CheckBox runat="server" ID="cbIsSuperLarge" AutoPostBack="true" Text="超危大工程" OnCheckedChanged="cbIsLarge_CheckedChanged"></f:CheckBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="34% 66%">
+                    <Items>
                         <f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" LabelWidth="140px" ShowRedStar="true"
                             AutoPostBack="true">
                             <%--<f:ListItem Value="低风险" Text="低风险" />
@@ -57,11 +68,12 @@
                              <f:ListItem Value="较大风险" Text="较大风险" />
                              <f:ListItem Value="重大风险" Text="重大风险" />--%>
                         </f:DropDownList>
-                    </Items>
+                        <f:Label runat="server"></f:Label>
+                        </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Label="作业风险描述" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true">
+                        <f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Label="作业风险" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true">
                              <%--<f:ListItem Value="物体打击" Text="物体打击" />
                             <f:ListItem Value="车辆伤害" Text="车辆伤害" />
                             <f:ListItem Value="机械伤害" Text="机械伤害" />
@@ -93,7 +105,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" Height="300px"
                             DataIDField="ControlId" DataKeyNames="ControlId" ForceFit="true"
                             EnableMultiSelect="true" ShowGridHeader="true" EnableColumnLines="true" AllowSorting="true"
                             SortField="ShowIndex" SortDirection="ASC" EnableRowDoubleClickEvent="true"

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs

@@ -123,6 +123,14 @@ namespace FineUIPro.Web.HSSE.Hazard
                     {
                         this.drpLicenseDes.SelectedValueArray = constructionRisk.LicenseDes.Split(',');
                     }
+                    if (constructionRisk.IsLarge == true)
+                    {
+                        this.cbIsLarge.Checked = true;
+                    }
+                    if (constructionRisk.IsSuperLarge == true)
+                    {
+                        this.cbIsSuperLarge.Checked = true;
+                    }
                     this.hdCoordinate.Text = constructionRisk.Coordinate;
                     constructionRiskControls = (from x in Funs.DB.HSSE_ConstructionRiskControl where x.ConstructionRiskId == this.ConstructionRiskId orderby x.ShowIndex select x).ToList();
                     gvApprove.DataSource = BLL.ConstructionRiskApproveService.getListData(this.ConstructionRiskId);
@@ -199,11 +207,10 @@ namespace FineUIPro.Web.HSSE.Hazard
             ///区域下拉框
             BLL.MainItemService.InitMainItemDownList(this.drpWorkArea, this.ProjectId, true);
 
-            drpRefLicense.DataValueField = "LicenseTypeName";
+            drpRefLicense.DataValueField = "Value";
-            drpRefLicense.DataTextField = "LicenseTypeName";
+            drpRefLicense.DataTextField = "Text";
-            drpRefLicense.DataSource = (from x in Funs.DB.Base_LicenseType orderby x.LicenseTypeCode select x).ToList();
+            drpRefLicense.DataSource = BLL.ConstructionRiskListService.RefLicenseList();
             drpRefLicense.DataBind();
-            Funs.FineUIPleaseSelect(this.drpRefLicense);
             this.drpRiskLevel.DataTextField = "Text";
             this.drpRiskLevel.DataValueField = "Value";
             this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
@@ -388,6 +395,14 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 newConstructionRisk.SubUnitDutyPerson = this.drpSubUnitDutyPerson.SelectedValue;
             }
+            if (this.cbIsLarge.Checked)
+            {
+                newConstructionRisk.IsLarge = true;
+            }
+            if (this.cbIsSuperLarge.Checked)
+            {
+                newConstructionRisk.IsSuperLarge = true;
+            }
             newConstructionRisk.DateA = Funs.GetNewDateTime(this.dpDateA.Text.Trim());
             newConstructionRisk.DateZ = Funs.GetNewDateTime(this.dpDateZ.Text.Trim());
             if (this.drpLicenseDes.SelectedValueArray.Length == 1 && this.drpLicenseDes.SelectedValue == BLL.Const._Null)
@@ -627,7 +642,7 @@ namespace FineUIPro.Web.HSSE.Hazard
 
         protected void btnAdd_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(this.ConstructionRiskId))
+            if (string.IsNullOrEmpty(this.hdConstructionRiskId.Text))
             {
                 this.hdConstructionRiskId.Text = SQLHelper.GetNewID(typeof(Model.Hazard_EnvironmentalRiskList));
             }
@@ -643,7 +658,7 @@ namespace FineUIPro.Web.HSSE.Hazard
 
         protected void drpRefLicense_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (this.drpRefLicense.SelectedValueArray.Length == 1 && this.drpRefLicense.SelectedValue == BLL.Const._Null)
+            if (this.drpRefLicense.SelectedValueArray.Length == 1 && this.drpRefLicense.SelectedValue == "不涉及")
             {
                 this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
             }
@@ -654,6 +669,14 @@ namespace FineUIPro.Web.HSSE.Hazard
             this.drpRiskLevel.DataBind();
             Funs.FineUIPleaseSelect(this.drpRiskLevel);
             this.drpRiskLevel.SelectedValue = BLL.Const._Null;
+            foreach (var item in this.drpRefLicense.SelectedValueArray)
+            {
+                if (item == "不涉及")
+                {
+                    this.drpRefLicense.SelectedValue = "不涉及";
+                    break;
+                }
+            }
         }
 
         #region 选择施工内容
@@ -771,5 +794,27 @@ namespace FineUIPro.Web.HSSE.Hazard
                 this.drpMainUnitCheckPerson.SelectedValueArray = strs.ToArray();
             }
         }
+
+        protected void cbIsLarge_CheckedChanged(object sender, CheckedEventArgs e)
+        {
+            if (this.cbIsSuperLarge.Checked)
+            {
+                this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList3();
+            }
+            else
+            {
+                if (this.cbIsLarge.Checked)
+                {
+                    this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList2();
+                }
+                else
+                {
+                    this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
+                }
+            }
+            this.drpRiskLevel.DataBind();
+            Funs.FineUIPleaseSelect(this.drpRiskLevel);
+            this.drpRiskLevel.SelectedValue = BLL.Const._Null;
+        }
     }
 }

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs

@@ -39,6 +39,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
         
+        /// <summary>
+        /// drpWorkArea 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWorkArea;
+        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -48,6 +57,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
         
+        /// <summary>
+        /// drpSubUnitDutyPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
+        
         /// <summary>
         /// dpDateA 控件。
         /// </summary>
@@ -75,24 +93,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.TextBox txtConstructionContent;
         
-        /// <summary>
-        /// drpSubUnitDutyPerson 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
-        
-        /// <summary>
-        /// drpWorkArea 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpWorkArea;
-        
         /// <summary>
         /// drpRefLicense 控件。
         /// </summary>
@@ -102,6 +102,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpRefLicense;
         
+        /// <summary>
+        /// cbIsLarge 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox cbIsLarge;
+        
+        /// <summary>
+        /// cbIsSuperLarge 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox cbIsSuperLarge;
+        
         /// <summary>
         /// drpRiskLevel 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs

@@ -19,7 +19,7 @@ namespace FineUIPro.Web.ProjectData
             {
                 string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when  RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel
                                   FROM [dbo].[HSSE_ConstructionRisk] a left join  [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId]
-                                  where a.ProjectId=@ProjectId and a.States='4'
+                                  where a.ProjectId=@ProjectId and a.States!='5'
                                   group by b.[MainItemId],b.[Coordinate],b.[MainItemName]";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.ProjectData
       ,[ProjectId]
       ,[Coordinate]
   FROM  [dbo].[HSSE_ConstructionRisk] a left join Base_Unit b on a.[UnitId] = b.[UnitId]
-  where a.WorkAreaId=@WorkAreaId and a.States='4'
+  where a.WorkAreaId=@WorkAreaId and a.States!='5'
                                    ";
 
             //if (!string.IsNullOrEmpty(RiskLevel))
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.ProjectData
             string riskLevel = "";
             string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when  RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel
                                   FROM [dbo].[HSSE_ConstructionRisk] a left join  [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId]
-                                  where a.ProjectId=@ProjectId and a.States='4'
+                                  where a.ProjectId=@ProjectId and a.States!='5'
                                   ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx

@@ -22,46 +22,59 @@
             <Rows>
                 <f:FormRow>
                     <Items>
+                        <f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true" Label="主项" Readonly="true" LabelWidth="140px" ShowRedStar="true">
+                        </f:DropDownList>
                         <f:DropDownList ID="drpUnit" runat="server" EnableEdit="true" Readonly="true" Label="施工单位" LabelWidth="140px"
                             AutoPostBack="true">
                         </f:DropDownList>
-                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Readonly="true" Label="本周开始日期" ID="dpDateA" LabelWidth="140px" AutoPostBack="true"
+                       <f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" Readonly="true"
-                            ShowRedStar="true" Required="true" EnableDateSelectEvent="true" OnDateSelect="dpDateA_SelectedIndexChanged">
-                        </f:DatePicker>
-                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Readonly="true" Label="本周结束日期" ID="dpDateZ" LabelWidth="140px"
-                            ShowRedStar="true" Required="true">
-                        </f:DatePicker>
-
-
-                    </Items>
-                </f:FormRow>
-                <f:FormRow ColumnWidths="66% 34%">
-                    <Items>
-                        <f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
-                        <f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" Readonly="true"
                             >
                         </f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true" Label="主项" Readonly="true" LabelWidth="140px" ShowRedStar="true">
+                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Readonly="true" Label="本周开始日期" ID="dpDateA" LabelWidth="140px" AutoPostBack="true"
-                        </f:DropDownList>
+                            ShowRedStar="true" Required="true" EnableDateSelectEvent="true" OnDateSelect="dpDateA_SelectedIndexChanged">
+                        </f:DatePicker>
+                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Readonly="true" Label="本周结束日期" ID="dpDateZ" LabelWidth="140px"
+                            ShowRedStar="true" Required="true">
+                        </f:DatePicker>
+                       <f:Label runat="server"></f:Label>
+                        
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="66% 34%">
+                    <Items>
+                         <f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
+                        <f:Label runat="server"></f:Label>
+                        </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        
                         <f:DropDownList ID="drpRefLicense" runat="server" EnableEdit="true" Label="涉及的高风险作业" Readonly="true" LabelWidth="140px" EnableMultiSelect="true"
                             AutoPostBack="true" OnSelectedIndexChanged="drpRefLicense_SelectedIndexChanged">
                         </f:DropDownList>
-                        <f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" Readonly="true" LabelWidth="140px" ShowRedStar="true"
+                        <f:CheckBox runat="server" ID="cbIsLarge" Text="危大工程"></f:CheckBox>
+                        <f:CheckBox runat="server" ID="cbIsSuperLarge" Text="超危大工程"></f:CheckBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="34% 66%">
+                    <Items>
+                        <f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" LabelWidth="140px" ShowRedStar="true"
                             AutoPostBack="true">
                             <%--<f:ListItem Value="低风险" Text="低风险" />
                              <f:ListItem Value="一般风险" Text="一般风险" />
                              <f:ListItem Value="较大风险" Text="较大风险" />
                              <f:ListItem Value="重大风险" Text="重大风险" />--%>
                         </f:DropDownList>
-                    </Items>
+                        <f:Label runat="server"></f:Label>
+                        </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Readonly="true" Label="作业风险描述" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true">
+                        <f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Readonly="true" Label="作业风险" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true">
                              <%--<f:ListItem Value="物体打击" Text="物体打击" />
                             <f:ListItem Value="车辆伤害" Text="车辆伤害" />
                             <f:ListItem Value="机械伤害" Text="机械伤害" />
@@ -93,7 +106,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" Height="300px"
                             DataIDField="ControlId" DataKeyNames="ControlId" ForceFit="true"
                             EnableMultiSelect="true" ShowGridHeader="true" EnableColumnLines="true" AllowSorting="true"
                             SortField="ShowIndex" SortDirection="ASC" EnableRowDoubleClickEvent="true"

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.cs

@@ -106,6 +106,14 @@ namespace FineUIPro.Web.HSSE.Hazard
                     {
                         this.txtConstructionContent.Text = HttpUtility.HtmlDecode(constructionRisk.ConstructionContent);
                     }
+                    if (constructionRisk.IsLarge == true)
+                    {
+                        this.cbIsLarge.Checked = true;
+                    }
+                    if (constructionRisk.IsSuperLarge == true)
+                    {
+                        this.cbIsSuperLarge.Checked = true;
+                    }
                     this.hdConstructionContentId.Text = constructionRisk.ConstructionContentId;
                     if (!string.IsNullOrEmpty(constructionRisk.RiskLevel))
                     {
@@ -149,11 +157,10 @@ namespace FineUIPro.Web.HSSE.Hazard
             ///区域下拉框
             BLL.MainItemService.InitMainItemDownList(this.drpWorkArea, this.ProjectId, true);
 
-            drpRefLicense.DataValueField = "LicenseTypeName";
+            drpRefLicense.DataValueField = "Value";
-            drpRefLicense.DataTextField = "LicenseTypeName";
+            drpRefLicense.DataTextField = "Text";
-            drpRefLicense.DataSource = (from x in Funs.DB.Base_LicenseType orderby x.LicenseTypeCode select x).ToList();
+            drpRefLicense.DataSource = BLL.ConstructionRiskListService.RefLicenseList();
             drpRefLicense.DataBind();
-            Funs.FineUIPleaseSelect(this.drpRefLicense);
             this.drpRiskLevel.DataTextField = "Text";
             this.drpRiskLevel.DataValueField = "Value";
             this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.designer.cs

@@ -39,6 +39,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
         
+        /// <summary>
+        /// drpWorkArea 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWorkArea;
+        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -48,6 +57,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
         
+        /// <summary>
+        /// drpSubUnitDutyPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
+        
         /// <summary>
         /// dpDateA 控件。
         /// </summary>
@@ -75,24 +93,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.TextBox txtConstructionContent;
         
-        /// <summary>
-        /// drpSubUnitDutyPerson 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpSubUnitDutyPerson;
-        
-        /// <summary>
-        /// drpWorkArea 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpWorkArea;
-        
         /// <summary>
         /// drpRefLicense 控件。
         /// </summary>
@@ -102,6 +102,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpRefLicense;
         
+        /// <summary>
+        /// cbIsLarge 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox cbIsLarge;
+        
+        /// <summary>
+        /// cbIsSuperLarge 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox cbIsSuperLarge;
+        
         /// <summary>
         /// drpRiskLevel 控件。
         /// </summary>

SGGL/Model/CLGL/Tw_InOutMasterOutput.cs

@@ -18,7 +18,8 @@ namespace Model
         public string AuditManName2 { get; set; } 
         public string ReqUnitName { get; set; }   
         public string UnitWorkId { get; set; } 
-        public string WeldTaskCode { get; set; } 
+        public string WeldTaskCode { get; set; }  
+        public string Remark { get; set; }  
 
         public int? PipeLineSortIndex { get; set; }
     }

SGGL/Model/Model.cs

@@ -104762,6 +104762,10 @@ namespace Model
 		
 		private string _MainUnitCheckPerson;
 		
+		private System.Nullable<bool> _IsLarge;
+		
+		private System.Nullable<bool> _IsSuperLarge;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -104800,6 +104804,10 @@ namespace Model
     partial void OnMainUnitDutyPersonChanged();
     partial void OnMainUnitCheckPersonChanging(string value);
     partial void OnMainUnitCheckPersonChanged();
+    partial void OnIsLargeChanging(System.Nullable<bool> value);
+    partial void OnIsLargeChanged();
+    partial void OnIsSuperLargeChanging(System.Nullable<bool> value);
+    partial void OnIsSuperLargeChanged();
     #endregion
 		
 		public HSSE_ConstructionRisk()
@@ -105147,6 +105155,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLarge", DbType="Bit")]
+		public System.Nullable<bool> IsLarge
+		{
+			get
+			{
+				return this._IsLarge;
+			}
+			set
+			{
+				if ((this._IsLarge != value))
+				{
+					this.OnIsLargeChanging(value);
+					this.SendPropertyChanging();
+					this._IsLarge = value;
+					this.SendPropertyChanged("IsLarge");
+					this.OnIsLargeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSuperLarge", DbType="Bit")]
+		public System.Nullable<bool> IsSuperLarge
+		{
+			get
+			{
+				return this._IsSuperLarge;
+			}
+			set
+			{
+				if ((this._IsSuperLarge != value))
+				{
+					this.OnIsSuperLargeChanging(value);
+					this.SendPropertyChanging();
+					this._IsSuperLarge = value;
+					this.SendPropertyChanged("IsSuperLarge");
+					this.OnIsSuperLargeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;