11

2025-12-22 21:16:45 +08:00
parent f0c35de27d 808beba1fd
commit 0341d5c568
1273 changed files with 65829 additions and 11147 deletions
@@ -33,6 +33,29 @@ namespace WebAPI.Controllers
        }
        #endregion

+        #region 根据groupType获取检查类型
+        /// <summary>
+        ///  根据groupType获取检查类型
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public Model.ResponeData getHazardRegisterTypes2(string type)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = BLL.APIBaseInfoService.getHazardRegisterTypes(type);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
        #region 获取项目列表
        /// <summary>
        /// 获取项目列表
@@ -19,7 +19,7 @@ namespace WebAPI.Controllers
        /// 获取质量统计数据
        /// </summary>
        /// <returns></returns>
-        public Model.ReturnData PostGetCQMSData()
+        public async Task<Model.ReturnData> PostGetCQMSData()
        {
            var returnData = new Model.ReturnData();
            returnData.type = "CQMS";
@@ -29,7 +29,7 @@ namespace WebAPI.Controllers
            returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime;
            if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now)
            {
-                returnData.data = CQMSDataService.GetTodayCQMSData_CQMS();
+                returnData.data = await CQMSDataService.GetTodayCQMSData_CQMS();
            }
            else
            {
@@ -70,7 +70,7 @@ namespace WebAPI.Controllers
        /// 获取焊接统计数据
        /// </summary>
        /// <returns></returns>
-        public Model.ReturnData PostGetHJGLData()
+        public async Task<ReturnData> PostGetHJGLData()
        {
            var returnData = new Model.ReturnData();
            returnData.type = "HJGL";
@@ -80,7 +80,7 @@ namespace WebAPI.Controllers
            returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime;
            if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now)
            {
-                returnData.data = HJGLData_HJGLService.GetTodayHJGLData_HJGL();
+                returnData.data = await HJGLData_HJGLService.GetTodayHJGLData_HJGLAsync();
            }
            else
            {
@@ -120,6 +120,35 @@ namespace WebAPI.Controllers
        /// 获取安全统计数据
        /// </summary>
        /// <returns></returns>
+        /*public Model.ReturnData PostGetHSSEData()
+        {
+            var returnData = new Model.ReturnData();
+            returnData.type = "HSSE";
+            returnData.time = DateTime.Now.ToString();
+            ServerService.GetToken();
+            returnData.token = BLL.SysConstSetService.CNCECToken;
+            returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime;
+            if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now)
+            {
+                try
+                {
+                    returnData.data = HSSEData_HSSEService.StatisticalDataAsync().Result;
+
+                }
+                catch (Exception ex)
+                {
+
+                    returnData.code = 0;
+                    returnData.message = ex.ToString();
+                }
+            }
+            else
+            {
+                returnData.code = 500;
+                returnData.message = "token失效";
+            }
+            return returnData;
+        }*/
        public async Task<Model.ReturnData> PostGetHSSEData()
        {
            var returnData = new Model.ReturnData();
@@ -147,6 +176,7 @@ namespace WebAPI.Controllers
            }
            return returnData;
        }
+
        /// <summary>
        /// 获取安全统计数据成功后，回调通知上报成功
        /// </summary>
@@ -309,5 +339,216 @@ namespace WebAPI.Controllers
        }

        #endregion
+
+        #region 推送项目安全隐患数据
+
+        /// <summary>
+        /// 推送项目安全隐患数据
+        /// </summary>
+        /// <returns></returns> 
+        //[HttpPost]
+        public Model.ResponeData PushProjectHazardRegisterData(int pushNum)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var returndata = Project_HSSEData_HSSEService.PushProjectHazardRegisterData(pushNum);
+                responeData.code = returndata.code;
+                responeData.message = returndata.message;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 推送项目质量巡检数据
+
+        /// <summary>
+        /// 推送项目质量巡检数据
+        /// </summary>
+        /// <returns></returns> 
+        //[HttpPost]
+        public Model.ResponeData PushProjectCheckControlData()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var returndata = Project_CQMSDataService.PushProjectHazardRegisterData();
+                responeData.code = returndata.code;
+                responeData.message = returndata.message;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 推送危大工程业务明细数据
+
+        /// <summary>
+        /// 推送危大工程业务明细数据
+        /// </summary>
+        /// <returns></returns> 
+        //[HttpPost]
+        public Model.ResponeData PushProjectLargeEngineeringData(int pushNum)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var returndata = Project_HSSEData_HSSEService.PushProjectLargeEngineeringData(pushNum);
+                responeData.code = returndata.code;
+                responeData.message = returndata.message;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion
+
+
+        #region 推送安全作业许可业务明细数据
+
+        /// <summary>
+        /// 推送安全作业许可业务明细数据
+        /// </summary>
+        /// <returns></returns> 
+        //[HttpPost]
+        public Model.ResponeData PushProjectLicenseData(int pushNum)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var returndata = Project_HSSEData_HSSEService.PushProjectLicenseData(pushNum);
+                responeData.code = returndata.code;
+                responeData.message = returndata.message;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 推送项目质量隐患数据
+
+        /// <summary>
+        /// 推送项目质量隐患数据
+        /// </summary>
+        /// <returns></returns> 
+        //[HttpPost]
+        public Model.ResponeData PushProjectQualityProblemData(int pushNum)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var returndata = Project_CQMSDataService.PushProjectQualityProblemData(pushNum);
+                responeData.code = returndata.code;
+                responeData.message = returndata.message;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion
+
+
+        #region 推送质量QC活动注册数据
+
+        /// <summary>
+        /// 推送质量QC活动注册数据
+        /// </summary>
+        /// <returns></returns> 
+        //[HttpPost]
+        public Model.ResponeData PushQCRegistrationData(int pushNum)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var returndata = Project_CQMSDataService.PushQCRegistrationData(pushNum);
+                responeData.code = returndata.code;
+                responeData.message = returndata.message;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 推送安全风险数据
+
+        /// <summary>
+        /// 推送安全风险数据HSSEData_ProjectSecurityRisk
+        /// </summary>
+        /// <returns></returns> 
+        //[HttpPost]
+        public Model.ResponeData PushProjectSecurityRiskData(int pushNum)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var returndata = Project_HSSEData_HSSEService.PushProjectSecurityRiskData(pushNum);
+                responeData.code = returndata.code;
+                responeData.message = returndata.message;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion
+
+
+        #region 推送企业级检查明细数据检查
+
+        /// <summary>
+        /// 推送企业级检查明细数据检查 HSSEDate_SuperviseCheckReport
+        /// </summary>
+        /// <returns></returns> 
+        //[HttpPost]
+        public Model.ResponeData PushSuperviseCheckReportData(int pushNum)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var returndata = HSSEData_HSSEService.PushSuperviseCheckReportData(pushNum);
+                responeData.code = returndata.code;
+                responeData.message = returndata.message;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion
    }
 }
@@ -1,86 +0,0 @@
-using BLL;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-
-namespace WebAPI.Controllers
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public class PackagingManageController : ApiController
-    {
-        public Model.ResponeData GetPackagingInformationList(string projectid, int pagesize, int pageindex)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                var getDataList = BLL.APIPackagingManageService.GetPackagingManageList(projectid);
-                int pageCount = getDataList.Count();
-                if ( pageCount > 0 && pageindex > 0)
-                {
-                    getDataList = getDataList.Skip(pagesize * (pageindex - 1)).Take(pagesize).ToList();
-                }
-                responeData.data = new { pageCount, getDataList };
-            }       
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-
-        public Model.ResponeData GetPackagingInformationById(string projectId,string personId, string packagingManageId)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                responeData.data = BLL.APIPackagingManageService.GetPackagingInformationById(projectId, personId, packagingManageId);
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-
-        public Model.ResponeData getSavePackagingInformationById(string packagingManageId, string PipelineComponentIds)
-        {
-
-            var responeData = new Model.ResponeData();
-            try
-            {
-                BLL.APIPackagingManageService.getSavePackagingInformationById(packagingManageId, PipelineComponentIds);
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        public Model.ResponeData GetPackingInfoConfirmArrival( string packagingManageId,string PersonId)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-               BLL.APIPackagingManageService.GetPackingInfoConfirmArrival( packagingManageId, PersonId);
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-    }
-}
@@ -0,0 +1,234 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace WebAPI.Controllers
+{
+    /// <summary>
+    /// 包装管理接口
+    /// </summary>
+    public class PackagingManageController : ApiController
+    {
+        #region Methods
+
+        /// <summary>
+        /// 删除包装与预制组件的关联
+        /// </summary>
+        /// <param name="pipelineComponentId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData DeletePipelineComponentFromPackaging(string pipelineComponentId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                HJGLPackagingmanageService.DeletePipelineComponentFromPackaging(pipelineComponentId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 获取指定包装信息
+        /// </summary>
+        /// <param name="projectId">项目ID</param>
+        /// <param name="personId">人员ID</param>
+        /// <param name="packagingManageId">包装ID</param>
+        /// <returns>包装信息</returns>
+        public Model.ResponeData GetPackagingInformationById(string projectId, string personId, string packagingManageId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = BLL.HJGLPackagingmanageService.GetPackagingInformationById(projectId, personId, packagingManageId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        /// <summary>
+        /// 获取包装信息列表
+        /// </summary>
+        /// <param name="filter">过滤条件</param>
+        /// <param name="pagesize">每页数量</param>
+        /// <param name="pageindex">页码（从1开始）</param>
+        /// <returns>包装信息分页列表</returns>
+        public Model.ResponeData GetPackagingInformationList([FromUri] PackagingManageInput filter, int pagesize, int pageindex)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = BLL.HJGLPackagingmanageService.GetPackagingManageList(filter, pageindex, pagesize, out int totalCount);
+
+                responeData.data = new { totalCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        /// <summary>
+        /// 获取新包装编号
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public Model.ResponeData GetPackagingNumberByProjectId(string projectId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = BLL.HJGLPackagingmanageService.GetNewPackagingCode(projectId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        /// <summary>
+        /// 包装到场验收
+        /// </summary>
+        /// <param name="packagingManageId">包装ID</param>
+        /// <param name="PersonId">人员ID</param>
+        /// <returns>操作结果</returns>
+        public Model.ResponeData GetPackingInfoConfirmArrival(string packagingManageId, string PersonId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                BLL.HJGLPackagingmanageService.GetPackingInfoConfirmArrival(packagingManageId, PersonId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        /// <summary>
+        /// 保存包装信息（组件明细）
+        /// </summary>
+        /// <param name="packagingManageId">包装ID</param>
+        /// <param name="PipelineComponentIds">组件ID集合</param>
+        /// <returns>操作结果</returns>
+        public Model.ResponeData getSavePackagingInformationById(string packagingManageId, string PipelineComponentIds)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                BLL.HJGLPackagingmanageService.getSavePackagingInformationById(packagingManageId, PipelineComponentIds);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        /// <summary>
+        /// 新增或更新包装信息（Id为空则新增，否则更新），返回创建或更新后的Id。
+        /// </summary>
+        /// <param name="model">包装信息实体</param>
+        /// <returns>创建或更新后的Id</returns>
+        [HttpPost]
+        public Model.ResponeData SavePackaging(Model.HJGL_PackagingManage model)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var id = HJGLPackagingmanageService.AddOrUpdatePackaging(model);
+                responeData.data = new { id };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 车次关联包装（设置包装的TrainNumberId）
+        /// </summary>
+        /// <param name="packagingManageId">包装ID</param>
+        /// <param name="trainNumberId">车次ID</param>
+        /// <returns>操作结果</returns>
+        [HttpGet]
+        public Model.ResponeData SavePackingInformation(string packagingManageId, string trainNumberId)
+
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var packModel = HJGLPackagingmanageService.GetHJGL_PackagingManageById(packagingManageId);
+                if (packModel == null)
+                {
+                    responeData.code = 0;
+                    responeData.message = "未找到对应的包装信息";
+                    return responeData;
+                }
+                if (packModel.State != 0)
+                {
+                    responeData.code = 0;
+                    responeData.message = "当前包装状态不可修改车次号";
+                    return responeData;
+                }
+                packModel.TrainNumberId = trainNumberId;
+                HJGLPackagingmanageService.UpdateHJGL_PackagingManage(packModel);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 添加包装与预制组件关联关系
+        /// </summary>
+        /// <param name="packagingManageId"></param>
+        /// <param name="pipelineComponentId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData SavePipelineComponentToPackaging(string packagingManageId, string pipelineComponentId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                HJGLPackagingmanageService.AddPipelineComponentToPackaging(packagingManageId, pipelineComponentId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion Methods
+    }
+}
@@ -0,0 +1,153 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace WebAPI.Controllers
+{
+    /// <summary>
+    /// 车次管理接口
+    /// </summary>
+    public class TrainNumberManageController : ApiController
+    {
+        #region Methods
+
+        /// <summary>
+        /// 删除包装与车次的关联（清空 HJGL_PackagingManage.TrainNumberId）
+        /// </summary>
+        /// <param name="packagingManageId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData DeletePackagingFromTrain(string packagingManageId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                APITrainNumberManagerService.RemovePackagingFromTrain(packagingManageId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 获取指定车次的包装明细
+        /// </summary>
+        /// <param name="trainNumberId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData GetPackagingByTrain(string trainNumberId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var list = APITrainNumberManagerService.GetPackagingByTrainId(trainNumberId);
+                responeData.data = list;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 获取发货列表
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <param name="pagesize"></param>
+        /// <param name="pageindex"></param>
+        /// <returns></returns>
+        public Model.ResponeData GetTrainNumberList([FromUri] Model.HJGL_TrainNumberManage filter , int pagesize, int pageindex)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            { 
+                var result = TrainNumberManageService.GetListByQueryModle(filter, pageindex, pagesize);
+                var getDataList = result.Data;
+                int pageCount = result.Total;
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 添加车次包装关联
+        /// </summary>
+        /// <param name="packagingManageId"></param>
+        /// <param name="trainNumberId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData SavePackagingToTrain(string packagingManageId, string trainNumberId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                APITrainNumberManagerService.AddPackagingToTrain(packagingManageId, trainNumberId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 发货验收
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="PersonId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData SaveTrainInfoConfirmArrival(string Id, string PersonId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                BLL.APITrainNumberManagerService.SaveTrainInfoConfirmArrival(Id, PersonId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        /// <summary>
+        /// 新增或更新车次（如果 Id 为空则新增，否则更新）
+        /// </summary>
+        [HttpPost]
+        public Model.ResponeData SaveTrainNumber(Model.HJGL_TrainNumberManage model)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var id = APITrainNumberManagerService.AddOrUpdateTrainNumber(model);
+                responeData.data = new { id };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        #endregion Methods 
+    }
+}
@@ -244,5 +244,27 @@ namespace WebAPI.Controllers
            return responeData;
        }
        #endregion
+
+        #region 获取考试试题类型列表
+        /// <summary>
+        /// 获取考试试题类型列表
+        /// </summary>
+        /// <param name="testPlanId">考试计划ID</param>
+        /// <returns>试题类型</returns>
+        public Model.ResponeData getTestTrainingList()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = APITestPlanService.getTestTraining();
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
    }
 }
@@ -65,6 +65,9 @@
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Data.Linq" />
    <Reference Include="System.Drawing" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
    <Reference Include="System.Web.DynamicData" />
    <Reference Include="System.Web.Entity" />
    <Reference Include="System.Web.ApplicationServices" />
@@ -184,8 +187,9 @@
    <Compile Include="Controllers\DataSync\CNCECServerController.cs" />
    <Compile Include="Controllers\DataSync\EnvironmentalController.cs" />
    <Compile Include="Controllers\HJGL\HJGLIndexController.cs" />
-    <Compile Include="Controllers\HJGL\PackagingManageController.cs" />
-    <Compile Include="Controllers\HJGL\PipelineComponentController.cs" />
+    <Compile Include="Controllers\HJGL\PreDesign\PackagingManageController.cs" />
+    <Compile Include="Controllers\HJGL\PreDesign\PipelineComponentController.cs" />
+    <Compile Include="Controllers\HJGL\PreDesign\TrainNumberManageController.cs" />
    <Compile Include="Controllers\HTGL\HTGLPersonController.cs" />
    <Compile Include="Controllers\Person\PersonCheckController.cs" />
    <Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />
@@ -201,9 +205,9 @@
    <Compile Include="Controllers\CQMS\TechnicalContactController.cs" />
    <Compile Include="Controllers\HJGL\HotProcessHardController.cs" />
    <Compile Include="Controllers\HJGL\NDETrustController.cs" />
-    <Compile Include="Controllers\HJGL\PipeJointController.cs" />
-    <Compile Include="Controllers\HJGL\PreWeldingDailyController.cs" />
-    <Compile Include="Controllers\HJGL\ReportQueryController.cs" />
+    <Compile Include="Controllers\HJGL\WeldingManage\PipeJointController.cs" />
+    <Compile Include="Controllers\HJGL\WeldingManage\PreWeldingDailyController.cs" />
+    <Compile Include="Controllers\HJGL\WeldingManage\ReportQueryController.cs" />
    <Compile Include="Controllers\HJGL\TestPackageController.cs" />
    <Compile Include="Controllers\HSSE\ChartAnalysisController.cs" />
    <Compile Include="Controllers\HSSE\CheckSpecialController.cs" />