Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

.gitignore

@@ -1,2 +1,31 @@
 /SGGL/FineUIPro.Web/File/Excel/Temp
 /SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-02
+/SGGL/FineUIPro.Web/FileUpload/QRCodeFile
+/SGGL/FineUIPro.Web/FileUpload/DataBase/ConstructionStandardProject/2023-05
+/SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05
+/SGGL/FineUIPro.Web/FileUpload/CQMS
+/SGGL/FineUIPro.Web/FileUpload/LargerHazard/2023-06
+/SGGLPackFile.rar
+/SGGL/FineUIPro.Web/FileUpload/Solution/2023-08
+/SGGL/FineUIPro.Web/FileUpload/ProjectAttachUrl/2023-09
+/CreateModel_lpf.bat
+/ReleasePackerALL2017 - 副本 (2).bat
+/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverPrepare/DriverData/2024-01
+/SGGL/.vs/SGGL/v15
+/SGGL/.vs/SGGL/v16
+/SGGL/.vs
+/SGGL/BLL/bin
+/SGGL/FineUIPro.Web/bin
+/SGGL/MigrationBackup/696c986d/BLL
+/SGGL/Model/bin
+/SGGL/packages
+/SGGL/SgManager.AI/bin
+/SGGL/SgManager.AI/obj
+/SGGL/WebAPI/bin
+/SGGL/WebAPI/obj
+/SGGL/BLL/obj
+/SGGL/FineUIPro.Web/obj
+/SGGL/Model/obj
+/SGGL/FineUIPro.Web/web.config
+/SGGL/FineUIPro.Web/ErrLog.txt
+/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSub/DriverSub/2024-02

DataBase/版本日志/SGGLDB_WH_2024-02-19-lpf.sql

@@ -0,0 +1,106 @@
+
+alter table dbo.DriverSub_DriverSubContact
+    drop column ContactInfo
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    drop column ChargeManInfo
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    drop column ContactContent
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    add IsBidirectional bit
+go
+
+exec sp_addextendedproperty 'MS_Description', N'是否中标', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSubContact',
+     'COLUMN', 'IsBidirectional'
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    drop column Result
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    drop column IntTime
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    drop column OutTime
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    drop column AttachUrl
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开车分包计划主键', 'SCHEMA', 'dbo', 'TABLE',
+     'DriverSub_DriverSubContact', 'COLUMN', 'DriverSubPlanId'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开车联络商表主键', 'SCHEMA', 'dbo', 'TABLE',
+     'DriverSub_DriverSubContact', 'COLUMN', 'DriverSubContractorsId'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开车分包类别', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSubContact',
+     'COLUMN', 'SubcontractingType'
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    drop constraint FK_DriverSub_DriverSubContact_Base_Unit
+go
+
+alter table dbo.DriverSub_DriverSubContact
+    drop column SubUnitId
+go
+
+alter table dbo.DriverSub_DriverSub
+    drop column Implement
+go
+
+alter table dbo.DriverSub_DriverSub
+    drop column Instruction
+go
+
+alter table dbo.DriverSub_DriverSub
+    drop column AttachUrl
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开车分包计划Id', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSub',
+     'COLUMN', 'DriverSubPlanId'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开车分包商主键', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSub',
+     'COLUMN', 'DriverSubContractorsId'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'评价数据', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSub', 'COLUMN',
+     'EvaluationData'
+go
+
+alter table dbo.DriverSub_DriverSub
+    drop constraint FK_DriverSub_DriverSub_Base_Unit
+go
+
+alter table dbo.DriverSub_DriverSub
+    drop column SubUnitId
+go
+exec sp_rename 'dbo.DriverSub_DriverSubPlan.DriverSubNames', SubcontractingTypes, 'COLUMN'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开发分包类别（多条数据用，隔开）', 'SCHEMA', 'dbo', 'TABLE',
+     'DriverSub_DriverSubPlan', 'COLUMN', 'SubcontractingTypes'
+go
+
+alter table dbo.DriverSub_DriverSubPlan
+    add State int
+go
+
+exec sp_addextendedproperty 'MS_Description', N'状态', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSubPlan', 'COLUMN',
+     'State'
+go
+
+
+
+

SGGL/BLL/DropListService.cs

@@ -206,6 +206,19 @@
             list[3] = new ListItem("开车队", "4");
             return list;
         }
+        /// <summary>
+        /// 开车分包状态
+        /// </summary>
+        /// <returns></returns>
+        public static ListItem[] drpDriverSubPlanStateList()
+        {
+            ListItem[] list = new ListItem[3];
+            list[0] = new ListItem("已招标完成", "0");
+            list[1] = new ListItem("实施中", "1");
+            list[2] = new ListItem("实施完成", "2");
+            return list;
+        }
+
         #endregion
 
         /// <summary>

SGGL/BLL/TestRun/DriverSub/DriverSubContactService.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using FineUIPro;
+using Model;
 
 namespace BLL
 {
@@ -38,18 +40,11 @@ namespace BLL
             newDriverSubContact.DriverSubContactId = DriverSubContact.DriverSubContactId;
             newDriverSubContact.ProjectId = DriverSubContact.ProjectId;
             newDriverSubContact.Code = DriverSubContact.Code;
-            newDriverSubContact.SubUnitId = DriverSubContact.SubUnitId;
-            newDriverSubContact.ContactInfo = DriverSubContact.ContactInfo;
-            newDriverSubContact.ChargeManInfo = DriverSubContact.ChargeManInfo;
-            newDriverSubContact.ContactContent = DriverSubContact.ContactContent;
-            newDriverSubContact.Result = DriverSubContact.Result;
-            newDriverSubContact.IntTime = DriverSubContact.IntTime;
-            newDriverSubContact.OutTime = DriverSubContact.OutTime;
-            newDriverSubContact.AttachUrl = DriverSubContact.AttachUrl;
             newDriverSubContact.Remark = DriverSubContact.Remark;
             newDriverSubContact.DriverSubPlanId= DriverSubContact.DriverSubPlanId;
             newDriverSubContact.DriverSubContractorsId = DriverSubContact.DriverSubContractorsId;
             newDriverSubContact.SubcontractingType = DriverSubContact.SubcontractingType;
+            newDriverSubContact.IsBidirectional = DriverSubContact.IsBidirectional;
             Funs.DB.DriverSub_DriverSubContact.InsertOnSubmit(newDriverSubContact);
             Funs.DB.SubmitChanges();
         }
@@ -64,18 +59,11 @@ namespace BLL
             if (newDriverSubContact != null)
             {
                 newDriverSubContact.Code = DriverSubContact.Code;
-                newDriverSubContact.SubUnitId = DriverSubContact.SubUnitId;
-                newDriverSubContact.ContactInfo = DriverSubContact.ContactInfo;
-                newDriverSubContact.ChargeManInfo = DriverSubContact.ChargeManInfo;
-                newDriverSubContact.ContactContent = DriverSubContact.ContactContent;
-                newDriverSubContact.Result = DriverSubContact.Result;
-                newDriverSubContact.IntTime = DriverSubContact.IntTime;
-                newDriverSubContact.OutTime = DriverSubContact.OutTime;
-                newDriverSubContact.AttachUrl = DriverSubContact.AttachUrl;
                 newDriverSubContact.Remark = DriverSubContact.Remark;
                 newDriverSubContact.DriverSubPlanId = DriverSubContact.DriverSubPlanId;
                 newDriverSubContact.DriverSubContractorsId = DriverSubContact.DriverSubContractorsId;
                 newDriverSubContact.SubcontractingType = DriverSubContact.SubcontractingType;
+                newDriverSubContact.IsBidirectional = DriverSubContact.IsBidirectional;
                 Funs.DB.SubmitChanges();
             }
         }
@@ -89,30 +77,87 @@ namespace BLL
             Model.DriverSub_DriverSubContact DriverSubContact = Funs.DB.DriverSub_DriverSubContact.FirstOrDefault(e => e.DriverSubContactId == DriverSubContactId);
             if (DriverSubContact != null)
             {
-                if (!string.IsNullOrEmpty(DriverSubContact.AttachUrl))
-                {
-                    BLL.UploadAttachmentService.DeleteFile(Funs.RootPath, DriverSubContact.AttachUrl);//删除附件
-                }
                 Funs.DB.DriverSub_DriverSubContact.DeleteOnSubmit(DriverSubContact);
                 Funs.DB.SubmitChanges();
             }
         }
-
+        /// <summary>
+        /// 根据开车分包计划主键删除开车分包联络
+        /// </summary>
+        /// <param name="DriverSubPlanId"></param>
         public static void DeleteDriverSubContactByDriverSubPlanId(string DriverSubPlanId)
         {
             List<Model.DriverSub_DriverSubContact> DriverSubContact = Funs.DB.DriverSub_DriverSubContact.Where(e => e.DriverSubPlanId == DriverSubPlanId).ToList();
-            if (DriverSubContact != null)
+            if (DriverSubContact.Count>0)
             {
-                foreach (var item in DriverSubContact)
+                Funs.DB.DriverSub_DriverSubContact.DeleteAllOnSubmit(DriverSubContact);
-                {
+                Funs.DB.SubmitChanges();
-                    if (!string.IsNullOrEmpty(item.AttachUrl))
-                    {
-                        BLL.UploadAttachmentService.DeleteFile(Funs.RootPath, item.AttachUrl);//删除附件
-                    }
-                    Funs.DB.DriverSub_DriverSubContact.DeleteOnSubmit(item);
-                    Funs.DB.SubmitChanges();
-                }
             }
         }
+        
+        public static void InitDropListByDriverSubPlanId(string driverSubPlanId, string type, DropDownList dropDownList)
+        {
+            dropDownList.DataSource = from x in Funs.DB.DriverSub_DriverSubContact
+                join y in Funs.DB.DriverSub_DriverSubContractors on x.DriverSubContractorsId equals y
+                    .DriverSubContractorsId
+                where x.DriverSubPlanId== driverSubPlanId && x.SubcontractingType == type
+                                      select new { x.DriverSubContractorsId, y.SubUnitName };
+            dropDownList.DataTextField = "SubUnitName";
+            dropDownList.DataValueField = "DriverSubContractorsId";
+            dropDownList.DataBind();
+        }
+
+        /// <summary>
+        /// 根据driverSubPlanId判断是否选标完成
+        /// </summary>
+        /// <param name="driverSubPlanId"></param>
+        /// <returns></returns>
+        public static bool IsAllBidirectional(string driverSubPlanId)
+        {
+            //获取DriverSubPlanId对应的所有数据
+            var list = Funs.DB.DriverSub_DriverSubContact.Where(e => e.DriverSubPlanId == driverSubPlanId).ToList();
+
+            //按SubcontractingType分组，检查每组数据是否都存在一个中标单位
+            var allExist = list.GroupBy(item => item.SubcontractingType)
+                .All(g => g.Any(item => item.IsBidirectional == true));
+
+            return allExist;
+        }
+
+        public static Model.DriverSub_DriverSubContact GetBidirectional(string driverSubPlanId ,string subcontractingType)
+        {
+            return Funs.DB.DriverSub_DriverSubContact.FirstOrDefault(e => e.DriverSubPlanId == driverSubPlanId && e.IsBidirectional == true && e.SubcontractingType== subcontractingType);
+        }
+        //根据driverSubPlanId 和DriverSubContractorsId 确定中标单位，使其IsBidirectional为true，且当前SubcontractingType下其他为false
+        /// <summary>
+        /// 确定中标单位
+        /// </summary>
+        /// <param name="driverSubPlanId"></param>
+        /// <param name="driverSubContractorsId"></param>
+        public static void SetBidirectional(string driverSubPlanId, string driverSubContractorsId)
+        {
+            //根据driverSubPlanId 和DriverSubContractorsId 获取SubcontractingType
+            var subcontractingType= Funs.DB.DriverSub_DriverSubContact.FirstOrDefault(e => e.DriverSubContractorsId == driverSubContractorsId &&e.DriverSubPlanId== driverSubPlanId
+            
+            )?.SubcontractingType;
+            var list = Funs.DB.DriverSub_DriverSubContact.Where(e => e.DriverSubPlanId == driverSubPlanId && e.SubcontractingType == subcontractingType).ToList();
+            foreach (var item in list)
+            {
+                if (item.DriverSubContractorsId == driverSubContractorsId)
+                {
+                    item.IsBidirectional = true;
+                }
+                else
+                {
+                    item.IsBidirectional = false;
+                }
+            }
+            Funs.DB.SubmitChanges();
+        }
+
+       
+
+
+
     }
 }

SGGL/BLL/TestRun/DriverSub/DriverSubPlanService.cs

@@ -37,7 +37,7 @@ namespace BLL
                               (string.IsNullOrEmpty(table.InstallationNames) || x.InstallationNames.Contains(table.InstallationNames)) &&
                               (string.IsNullOrEmpty(table.AttachUrl) || x.AttachUrl.Contains(table.AttachUrl)) &&
                               (string.IsNullOrEmpty(table.Remark) || x.Remark.Contains(table.Remark)) &&
-                              (string.IsNullOrEmpty(table.DriverSubNames) || x.DriverSubNames.Contains(table.DriverSubNames)) 
+                              (string.IsNullOrEmpty(table.SubcontractingTypes) || x.SubcontractingTypes.Contains(table.SubcontractingTypes)) 
                     select x
                   ;
 
@@ -75,8 +75,8 @@ namespace BLL
                        x.IsInvited,
                        x.AttachUrl,
                        x.Remark,
-                       x.DriverSubNames,
+                       x.SubcontractingTypes,
-
+                       StateName = GetSubStateName(x.State)
                    };
         }
         #endregion
@@ -113,7 +113,8 @@ namespace BLL
             newDriverSubPlan.IsInvited = DriverSubPlan.IsInvited;
             newDriverSubPlan.AttachUrl = DriverSubPlan.AttachUrl;
             newDriverSubPlan.Remark = DriverSubPlan.Remark;
-            newDriverSubPlan.DriverSubNames= DriverSubPlan.DriverSubNames;
+            newDriverSubPlan.SubcontractingTypes= DriverSubPlan.SubcontractingTypes;
+            newDriverSubPlan.State = DriverSubPlan.State;
             Funs.DB.DriverSub_DriverSubPlan.InsertOnSubmit(newDriverSubPlan);
             Funs.DB.SubmitChanges();
         }
@@ -137,8 +138,8 @@ namespace BLL
                 newDriverSubPlan.IsInvited = DriverSubPlan.IsInvited;
                 newDriverSubPlan.AttachUrl = DriverSubPlan.AttachUrl;
                 newDriverSubPlan.Remark = DriverSubPlan.Remark;
-                newDriverSubPlan.DriverSubNames = DriverSubPlan.DriverSubNames;
+                newDriverSubPlan.SubcontractingTypes = DriverSubPlan.SubcontractingTypes;
-
+                newDriverSubPlan.State = DriverSubPlan.State;
                 Funs.DB.SubmitChanges();
             }
         }
@@ -171,5 +172,51 @@ namespace BLL
                 Funs.FineUIPleaseSelect(dropName);
             }
         }
-    }   
+
+        public static  string GetSubcontractingTypeNames(object str)
+        {
+            string strName = "";
+
+            if (str != null)
+            {
+                string[] strArr = str.ToString().Split(',');
+
+                foreach (string s in strArr)
+                {
+                    foreach (System.Web.UI.WebControls.ListItem item in DropListService.drpDriverSubNameList())
+                    {
+                        if (item.Value == s)
+                        {
+                            strName += item.Text + ",";
+                        }
+                    }
+                }
+            }
+            return strName.TrimEnd(',');
+        }
+
+        public static string GetSubStateName(int? str)
+        {
+
+            string strName = "";
+
+            if (str != null)
+            {
+                string[] strArr = str.ToString().Split(',');
+
+                foreach (string s in strArr)
+                {
+                    foreach (System.Web.UI.WebControls.ListItem item in DropListService.drpDriverSubPlanStateList())
+                    {
+                        if (item.Value == s)
+                        {
+                            strName += item.Text + ",";
+                        }
+                    }
+                }
+            }
+            return strName.TrimEnd(',');
+        }
+
+    }
 }

SGGL/BLL/TestRun/DriverSub/DriverSubService.cs

@@ -41,14 +41,10 @@ namespace BLL
             newDriverSub.DriverSubId = DriverSub.DriverSubId;
             newDriverSub.ProjectId = DriverSub.ProjectId;
             newDriverSub.Code = DriverSub.Code;
-            newDriverSub.SubUnitId = DriverSub.SubUnitId;
-            newDriverSub.Implement = DriverSub.Implement;
-            newDriverSub.Instruction = DriverSub.Instruction;
-            newDriverSub.AttachUrl = DriverSub.AttachUrl;
             newDriverSub.Remark = DriverSub.Remark;
             newDriverSub.DriverSubPlanId= DriverSub.DriverSubPlanId;
             newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId;
-            newDriverSub.EvaluationData = DriverSub.EvaluationData;
+            newDriverSub.EvaluationData = DriverSub.EvaluationData; 
             Funs.DB.DriverSub_DriverSub.InsertOnSubmit(newDriverSub);
             Funs.DB.SubmitChanges();
         }
@@ -63,10 +59,6 @@ namespace BLL
             if (newDriverSub != null)
             {
                 newDriverSub.Code = DriverSub.Code;
-                newDriverSub.SubUnitId = DriverSub.SubUnitId;
-                newDriverSub.Implement = DriverSub.Implement;
-                newDriverSub.Instruction = DriverSub.Instruction;
-                newDriverSub.AttachUrl = DriverSub.AttachUrl;
                 newDriverSub.Remark = DriverSub.Remark;
                 newDriverSub.DriverSubPlanId = DriverSub.DriverSubPlanId;
                 newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId;
@@ -84,10 +76,6 @@ namespace BLL
             Model.DriverSub_DriverSub DriverSub = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubId == DriverSubId);
             if (DriverSub != null)
             {
-                if (!string.IsNullOrEmpty(DriverSub.AttachUrl))
-                {
-                    BLL.UploadAttachmentService.DeleteFile(Funs.RootPath, DriverSub.AttachUrl);//删除附件
-                }
                 Funs.DB.DriverSub_DriverSub.DeleteOnSubmit(DriverSub);
                 Funs.DB.SubmitChanges();
             }
@@ -147,19 +135,53 @@ namespace BLL
         /// 获取初始化数据List<Model.DriverSubEvaluationData> 
         /// </summary>
         /// <returns></returns>
-        public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData()
+        public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData(string type )
         {
+           
             List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
-            list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "业主人员培训", Grade = "" });
+            switch (type)
-            list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "编制技术方案", Grade = "" });
+            {
-            list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "预试车", Grade = "" });
+                case "1"://催化剂装填
-            list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "联动试车", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
-            list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "投料试车", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "催化剂装填准备", Grade = "" });
-            list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "生产试运行", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
-            list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "性能考核", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "催化剂装填实施", Grade = "" });
-            list.Add(new Model.DriverSubEvaluationData() { Number = 8, Matter = "生产安全", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "装填结果认定", Grade = "" });
-            list.Add(new Model.DriverSubEvaluationData() { Number = 9, Matter = "试车进度", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
-            list.Add(new Model.DriverSubEvaluationData() { Number = 10, Matter = "其他", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
+                    break;
+                case "2"://烘炉
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "烘炉准备", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "烘炉实施", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "烘炉结果认定", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
+                    break;
+                case "3"://化学清洗
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "化学清洗准备", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "化学清洗实施", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "清洗结果认定", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
+                    break;
+                case "4"://开车队
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "业主人员培训", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "编制技术方案", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "预试车", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "联动试车", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "投料试车", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "生产试运行", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "性能考核", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 8, Matter = "生产安全", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 9, Matter = "试车进度", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 10, Matter = "其他", Grade = "" });
+                    break;
+            }
+           
             return list;
         }
 

SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05/638197437231575873_下载地址.txt

@@ -1,17 +0,0 @@
-https://lygcgs.com.cn/qhse/File/SUbQHSEPackFile_V1.0.zip
-https://lygcgs.com.cn/qhse/File/WebAPI(SUBQHSE)_V1.0.zip
-https://lygcgs.com.cn/qhse/File/DataExChangePackFile_V1.0.zip
-
-
-数据看板
-基础信息
-焊工管理
-焊接工艺评定
-焊接管理
-点口管理
-热处理/硬度管理
-无损委托
-返修委托
-检测管理
-试压管理
-焊接报表和通用导入

SGGL/FineUIPro.Web/FileUpload/DataBase/ConstructionStandardProject/2023-05/638210637938596159_子公司添加sysgly账号脚本.sql

@@ -1,7 +0,0 @@
-insert into [Sys_User]([UserId],[Account],[Password],[UserName],[IsPost],[LastIsOffice],[RawPassword])
-values('AF17168B-87BD-4GLY-1111-F0A0A1158F9B','sysgly','4CFB8FC1DB2A75D59348DD4995C05CC2','ϵͳ¹ÜÀíÔ±',1,1,'cncec.1234')
-GO
-
-insert into [Sys_User]([UserId],[Account],[Password],[UserName],[IsPost],[LastIsOffice],[RawPassword])
-values('C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0','hfnbd','B59C67BF196A4758191E42F76670CEBA','JT',1,1,'1111')
-GO