diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 60ab5882..0d938fb0 100644 Binary files a/.vs/SGGL_SeDin_New/v17/.wsuo and b/.vs/SGGL_SeDin_New/v17/.wsuo differ diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json index d8a6cc55..81a66a8a 100644 --- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json +++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json @@ -67,6 +67,10 @@ "$type": "Bookmark", "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}" }, + { + "$type": "Bookmark", + "Name": "ST:2:0:{b9f91511-5ca5-40ec-9726-f3e3a7e534e2}" + }, { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json index d8a6cc55..4a8a0ea7 100644 --- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json +++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json @@ -67,9 +67,17 @@ "$type": "Bookmark", "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}" }, + { + "$type": "Bookmark", + "Name": "ST:2:0:{b9f91511-5ca5-40ec-9726-f3e3a7e534e2}" + }, { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" } ] } diff --git a/DataBase/版本日志/SGGLDB_V2025-05-14-001_bwj.sql b/DataBase/版本日志/SGGLDB_V2025-05-14-001_bwj.sql new file mode 100644 index 00000000..87bbe5db --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-05-14-001_bwj.sql @@ -0,0 +1,57 @@ + +CREATE VIEW [dbo].[View_HJGL_ProductionSchedulingPlanStatistics] +as +/************Ųƻͳ**********/ +SELECT distinct unitWork.UnitWorkId, +unitWork.UnitWorkCode, +unitWork.UnitWorkName, +unitWork.ProjectId, +pipeline.FlowingSection, +(case p.SteelType when '1' then '̼' when '2' then '' when '3' then '' when '4' then 'ͺϽ' when '5' then 'Ͻ' when '6' then 'ѺϽ' when '7' then '' end) as Material, +'<100' as Caliber, +isnull(weldJoint.Dia,0) as Dia +FROM WBS_UnitWork AS unitWork +LEFT JOIN (select FlowingSection,UnitWorkId from HJGL_Pipeline where PipeArea='1') as pipeline on pipeline.UnitWorkId = unitWork.UnitWorkId + +LEFT JOIN (select distinct Base_Material.SteelType,UnitWorkId from HJGL_WeldJoint + left join HJGL_Pipeline on HJGL_Pipeline.PipelineId = HJGL_WeldJoint.PipelineId + left join Base_Material on Base_Material.MaterialId = HJGL_WeldJoint.Material1Id + where PipeArea='1' and HJGL_WeldJoint.JointAttribute='Ԥƿ') as p on p.UnitWorkId = unitWork.UnitWorkId +-- +LEFT JOIN (select sum(Dia) as Dia,HJGL_Pipeline.UnitWorkId,HJGL_Pipeline.FlowingSection,Base_Material.SteelType,HJGL_WeldJoint.DNDia from HJGL_WeldJoint + left join HJGL_Pipeline on HJGL_Pipeline.PipelineId = HJGL_WeldJoint.PipelineId + left join Base_Material on Base_Material.MaterialId = HJGL_WeldJoint.Material1Id + where HJGL_Pipeline.PipeArea='1' and HJGL_WeldJoint.JointAttribute='Ԥƿ' + and cast(SUBSTRING(HJGL_WeldJoint.DNDia,CHARINDEX('N',HJGL_WeldJoint.DNDia)+1,len(HJGL_WeldJoint.DNDia)-charindex('N',HJGL_WeldJoint.DNDia)) as int)<100 + group by HJGL_Pipeline.UnitWorkId,HJGL_Pipeline.FlowingSection,Base_Material.SteelType,HJGL_WeldJoint.DNDia) as weldJoint on weldJoint.UnitWorkId =unitWork.UnitWorkId + and weldJoint.FlowingSection = pipeline.FlowingSection + +union + +SELECT distinct unitWork.UnitWorkId, +unitWork.UnitWorkCode, +unitWork.UnitWorkName, +unitWork.ProjectId, +pipeline.FlowingSection, +(case p.SteelType when '1' then '̼' when '2' then '' when '3' then '' when '4' then 'ͺϽ' when '5' then 'Ͻ' when '6' then 'ѺϽ' when '7' then '' end) as Material, +'100' as Caliber, +isnull(weldJoint.Dia,0) as Dia +FROM WBS_UnitWork AS unitWork +LEFT JOIN (select FlowingSection,UnitWorkId from HJGL_Pipeline where PipeArea='1') as pipeline on pipeline.UnitWorkId = unitWork.UnitWorkId + +LEFT JOIN (select distinct Base_Material.SteelType,UnitWorkId from HJGL_WeldJoint + left join HJGL_Pipeline on HJGL_Pipeline.PipelineId = HJGL_WeldJoint.PipelineId + left join Base_Material on Base_Material.MaterialId = HJGL_WeldJoint.Material1Id + where PipeArea='1' and HJGL_WeldJoint.JointAttribute='Ԥƿ') as p on p.UnitWorkId = unitWork.UnitWorkId + +LEFT JOIN (select sum(Dia) as Dia,HJGL_Pipeline.UnitWorkId,HJGL_Pipeline.FlowingSection,Base_Material.SteelType,HJGL_WeldJoint.DNDia from HJGL_WeldJoint + left join HJGL_Pipeline on HJGL_Pipeline.PipelineId = HJGL_WeldJoint.PipelineId + left join Base_Material on Base_Material.MaterialId = HJGL_WeldJoint.Material1Id + where HJGL_Pipeline.PipeArea='1' and HJGL_WeldJoint.JointAttribute='Ԥƿ' + and cast(SUBSTRING(HJGL_WeldJoint.DNDia,CHARINDEX('N',HJGL_WeldJoint.DNDia)+1,len(HJGL_WeldJoint.DNDia)-charindex('N',HJGL_WeldJoint.DNDia)) as int)>=100 + group by HJGL_Pipeline.UnitWorkId,HJGL_Pipeline.FlowingSection,Base_Material.SteelType,HJGL_WeldJoint.DNDia) as weldJoint on weldJoint.UnitWorkId =unitWork.UnitWorkId + and weldJoint.FlowingSection = pipeline.FlowingSection + +GO + + diff --git a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs index 95f4e477..e0cbf222 100644 --- a/SGGL/BLL/API/HJGL/APIPackagingManageService.cs +++ b/SGGL/BLL/API/HJGL/APIPackagingManageService.cs @@ -130,9 +130,29 @@ namespace BLL } table.PipelineComponentId = string.Join(",", set); + } } BLL.HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(table); + var newDetailList = new List(); + foreach (var item in table.PipelineComponentId.Split(',')) + { + var ComponentModel = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(item); + if (ComponentModel != null) + { + var model = new Model.HJGL_PackagingManageDetail() + { + Id = SQLHelper.GetNewID(), + PackagingManageId = table.PackagingManageId, + PipelineId = ComponentModel.PipelineId, + PipelineComponentId = item, + CreateTime = DateTime.Now, + }; + newDetailList.Add(model); + } + } + HJGLPackagingmanagedetailService.DeleteByPackagingManageId(table.PackagingManageId); + HJGLPackagingmanagedetailService.AddBulk(newDetailList); } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 5a9981a1..00cd10f3 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -4801,6 +4801,11 @@ namespace BLL /// public const string Pipeline_ComponentPath = "File\\Excel\\DataIn\\组件管理二维码信息导入.xlsx"; + /// + /// 排产计划导出模板 + /// + public const string HJGL_ProductionSchedulingPlanPath = "File\\Excel\\DataOut\\排产计划导出模板.xlsx"; + #region 焊接报表 /// diff --git a/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs b/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs index dcfbca42..7f2a10b4 100644 --- a/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs +++ b/SGGL/BLL/HJGL/PreDesign/HJGLPackagingmanagedetailService.cs @@ -231,6 +231,23 @@ namespace BLL } } + public static void DeleteByPackagingManageId(string packagingManageId) + { + + var list = Funs.DB.HJGL_PackagingManageDetail.Where(x => x.PackagingManageId == packagingManageId).ToList(); + if (list.Count>0) + { + Funs.DB.HJGL_PackagingManageDetail.DeleteAllOnSubmit(list); + Funs.DB.SubmitChanges(); + } + + } + public static void AddBulk(List newtables) + { + + Funs.DB.HJGL_PackagingManageDetail.InsertAllOnSubmit(newtables); + Funs.DB.SubmitChanges(); + } } } \ No newline at end of file diff --git a/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs b/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs index 878660bf..ae787f4c 100644 --- a/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs +++ b/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs @@ -23,22 +23,17 @@ namespace BLL return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProductionSchedulingPlanId == productionSchedulingPlanId); } - /// - /// 根据管线Id获取排产计划 - /// - /// - /// - /// - public static Model.HJGL_ProductionSchedulingPlan GetProductionSchedulingPlanByPipelineId(string projectId, string pipelineId) + + public static Model.HJGL_ProductionSchedulingPlan GetProductionSchedulingPlan(string loginProjectId, string flowingSection, string unitWorkName, string material, string caliber) { - return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProjectId == projectId && e.PipelineId == pipelineId); + return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProjectId == loginProjectId && e.FlowNum == flowingSection && e.MainItemName == unitWorkName && e.Caliber == caliber); } - /// - /// 增加排产计划 - /// - /// - public static void AddProductionSchedulingPlan(Model.HJGL_ProductionSchedulingPlan plan) + /// + /// 增加排产计划 + /// + /// + public static void AddProductionSchedulingPlan(Model.HJGL_ProductionSchedulingPlan plan) { SGGLDB db = Funs.DB; Model.HJGL_ProductionSchedulingPlan newPlan = new HJGL_ProductionSchedulingPlan(); @@ -83,7 +78,7 @@ namespace BLL newPlan.PlanStartDate = plan.PlanStartDate; newPlan.PlanEndDate = plan.PlanEndDate; newPlan.Days = plan.Days; - newPlan.AvgDailyWorkload = plan.Days; + newPlan.AvgDailyWorkload = plan.AvgDailyWorkload; try { db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict); @@ -120,5 +115,6 @@ namespace BLL db.SubmitChanges(); } } + } } diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs index 160c451a..f2f06986 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs @@ -466,6 +466,8 @@ namespace BLL baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(model.PipelineCode)); if (!string.IsNullOrEmpty(model.WeldJointCode)) baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains(model.WeldJointCode)); + //构建排序 + baseQuery = baseQuery.OrderBy(x => x.PipelineId).ThenBy(x => x.WeldJointCode); return baseQuery.ToList(); } @@ -503,7 +505,7 @@ namespace BLL baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains( model.WeldJointCode)); // 阶段三：排序与分页控制（索引优化关键） - var orderedQuery = baseQuery.OrderBy(x => x.WeldJointCode); + var orderedQuery = baseQuery.OrderBy(x=>x.PipelineId).ThenBy(x => x.WeldJointCode); // 阶段四：分页执行（数据库层面分页） var pagedData = orderedQuery diff --git a/SGGL/BLL/HSSE/CostGoods/CostManageService.cs b/SGGL/BLL/HSSE/CostGoods/CostManageService.cs index f8921e18..fab4c19f 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostManageService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostManageService.cs @@ -1,8 +1,12 @@ using Model; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using NPOI.SS.UserModel; using System; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Numerics; namespace BLL { @@ -11,7 +15,7 @@ namespace BLL /// public static class CostManageService { - + /// /// 根据主键获取安全费用管理 @@ -29,12 +33,12 @@ namespace BLL /// /// /// - public static decimal GetSumHSECost(string ProjectId, string UnitId, string costManageId ) + public static decimal GetSumHSECost(string ProjectId, string UnitId, string costManageId) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { decimal sumCost = 0; - var getData = from x in db.CostGoods_CostManage + var getData = from x in db.CostGoods_CostManage where x.ProjectId == ProjectId && x.UnitId == UnitId && x.States == Const.State_2 && x.CostManageId != costManageId select x; if (getData.Count() > 0) @@ -70,12 +74,12 @@ namespace BLL States = costManage.States, CompileMan = costManage.CompileMan, CompileDate = costManage.CompileDate, - NextManId= costManage.NextManId, + NextManId = costManage.NextManId, }; db.CostGoods_CostManage.InsertOnSubmit(newCostManage); db.SubmitChanges(); - + AddCostManageFlowOperate(newCostManage); } @@ -172,7 +176,7 @@ namespace BLL /// /// public static Model.CostGoods_CostManageFlowOperate getNowCostManageFlowOperateList(string costManageId) - { + { var getAllNoClose = Funs.DB.CostGoods_CostManageFlowOperate.Where(x => x.CostManageId == costManageId && (x.IsClosed == null || x.IsClosed == false)); if (getAllNoClose.Count() > 0) { @@ -190,10 +194,10 @@ namespace BLL /// /// /// - public static Model.CostGoods_CostManageFlowOperate getNextCostManageFlowOperateList(string costManageId,string operaterId) + public static Model.CostGoods_CostManageFlowOperate getNextCostManageFlowOperateList(string costManageId, string operaterId) { int minSortIndex = 1; - var getAllNoClose = Funs.DB.CostGoods_CostManageFlowOperate.Where(x => x.CostManageId == costManageId && (x.IsClosed == null || x.IsClosed == false)); + var getAllNoClose = Funs.DB.CostGoods_CostManageFlowOperate.Where(x => x.CostManageId == costManageId && (x.IsClosed == null || x.IsClosed == false)); if (getAllNoClose.Count() > 0) { var getFlowOperate = getAllNoClose.Where(x => x.OperaterId == operaterId); @@ -210,7 +214,7 @@ namespace BLL } else { - return null; + return null; } } @@ -342,10 +346,10 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - var getDatas = db.CostGoods_CostManageFlowOperate.Where(x => x.CostManageId == costManageId && x.IsClosed==true); - foreach ( var item in getDatas) + var getDatas = db.CostGoods_CostManageFlowOperate.Where(x => x.CostManageId == costManageId && x.IsClosed == true); + foreach (var item in getDatas) { - item.IsClosed= false; + item.IsClosed = false; db.SubmitChanges(); } } @@ -367,5 +371,107 @@ namespace BLL } } } + + + /// 推送数据到HSE系统 + /// + public static string PushDataToHSE(string projectId, string contractNum) + { + try + { + string message = ""; + // 查询当前合同所有审核通过的数据 + var costData = from x in Funs.DB.CostGoods_CostManage + where x.ProjectId == projectId && x.ContractNum == contractNum && x.States == Const.State_2 + orderby x.CostManageDate descending + select x; + + if (costData.Any()) + { + // 获取所有附件文件 + var files = new List(); + decimal totalAmount = 0; + + foreach (var item in costData) + { + var fileDetails = GetBase64FilesWithDetails(item.CostManageId); + if (fileDetails != null && fileDetails.Count > 0) + { + files.AddRange(fileDetails); + totalAmount += item.SumMoney ?? 0; + } + } + + // 构建请求体 + var requestBody = new + { + projectId = projectId, + contractNo = contractNum, + amountHSE = totalAmount.ToString(), + files = files + }; + var jsonBody = JsonConvert.SerializeObject(requestBody); + // 调用HSE接口推送数据 + // TODO: 实现实际的HSE接口调用逻辑 + var url="http://172.29.60.33:8080"; + var requestGetTokenUrl = url + "/api/Token/GetToken"; + string requestGetTokenBody = "{\r\n\r\n\"username\": \"coadmin\",\r\n\r\n\"password\": \"coadminPu@2025\"\r\n\r\n}"; + var response = Funs.RequestPost(requestGetTokenUrl, "", requestGetTokenBody); + var responseStr = JsonConvert.DeserializeObject(response); + if (responseStr == null || responseStr["data"].ToString() != "200") + { + message = "获取Pu系统Token失败"; + + } + string accessToken = responseStr["data"]["token"].ToString(); + var requestUrl = url + "/api/PuPayCraftAmount/AddPuPayCraftAmount"; + var responseHSE = Funs.RequestPost(requestUrl, accessToken, jsonBody); + var responseHSEStr = JsonConvert.DeserializeObject(responseHSE); + if (responseHSEStr == null || responseHSEStr["data"].ToString()!= "200") + { + message = "推送数据到HSE系统失败"; + } + } + return message; + + } + catch (Exception ex) + { + // 记录错误日志 + ErrLogInfo.WriteLog(ex.Message, ex.StackTrace); + return "推送数据失败"+ex.Message; + + } + } + + /// + /// 获取Base64编码的附件文件 + /// + public static List GetBase64FilesWithDetails(string costManageId) + { + var result = new List(); + // 获取费用管理信息 + var costManage = GetCostManageById(costManageId); + // 获取附件文件 + var attachments = AttachFileService.getFileUrl(costManageId); + + if (!string.IsNullOrEmpty(attachments)) + { + string filePath=Funs.RootPath+attachments.Split(',')[0]; + FileInfo file = new FileInfo(filePath); + byte[] fileBytes = File.ReadAllBytes(filePath); + string base64Content = Convert.ToBase64String(fileBytes); + + result.Add(new Model.PuPayCraftAmountFileInput + { + name = file.Name, + content = base64Content, + thisamount = costManage?.SumMoney?.ToString() ?? "0", + date = costManage?.CostManageDate?.ToString("yyyy-MM-dd") ?? DateTime.Now.ToString("yyyy-MM-dd") + }); + } + + return result; + } } } diff --git a/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs b/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs index c7704a71..bce910e4 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs +++ b/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs @@ -44,8 +44,22 @@ namespace BLL select y).ToList(); return list; } - - + /// + /// 获取审批完成的主合同 + /// + /// + /// + public static List GetCompletedContracts(string ProjectId) + { + var q= from x in Funs.DB.PHTGL_Contract + join y in Funs.DB.PHTGL_ContractReview on x.ContractId equals y.ContractId + where + y.State== Const.ContractReview_Complete && + x.ContractAttribute==0 && + x.ProjectId==ProjectId + select x; + return q.ToList(); + } public static void InitAllProjectCodeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) { dropName.DataValueField = "ProjectId"; @@ -62,7 +76,14 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } - + public static void InitCompletedContractsDropDownList(string projectId, FineUIPro.DropDownList dropName) + { + dropName.DataValueField = "ContractNum"; + dropName.DataTextField = "ContractNum"; + var CompletedContractslist = GetCompletedContracts(projectId); + dropName.DataSource = CompletedContractslist; + dropName.DataBind(); + } /// /// 增加合同基本信息 diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/排产计划导出模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/排产计划导出模板.xlsx new file mode 100644 index 00000000..af9e3643 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataOut/排产计划导出模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx index e84a3140..99752f7d 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -45,7 +45,8 @@ namespace FastReport Table4.PrintColumns(); Table4.PrintRow(5); Table4.PrintColumns(); - + Table4.PrintRow(6); + Table4.PrintColumns(); // go next data source row rowData.Next(); @@ -89,7 +90,7 @@ namespace FastReport } - + @@ -169,8 +170,8 @@ namespace FastReport - - + + @@ -239,9 +240,24 @@ namespace FastReport + + + + + + + + + + + + + + + - + @@ -272,8 +288,8 @@ namespace FastReport - - + + @@ -297,7 +313,7 @@ namespace FastReport - + @@ -338,7 +354,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx index 8e28c107..5ca4de20 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 3cbf319c..a99cd7a5 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -487,14 +487,18 @@ namespace FineUIPro.Web.HJGL.InfoQuery /// protected void btnOut_Click(object sender, EventArgs e) { + string fileName = ""; if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2) //单位工程 { Model.View_HJGL_WeldJoint model = new Model.View_HJGL_WeldJoint(); model.UnitWorkId = this.tvControlItem.SelectedNodeID; var list = BLL.WeldJointService.GetViewWeldJointsBymodel(model); View_HJGL_WeldJoint = list; - /* PrintByUnitWork(this.tvControlItem.SelectedNodeID); - return;*/ + fileName = UnitWorkService.GetNameById(model.UnitWorkId); + } + else if (this.tvControlItem.SelectedNode.CommandName == "管线") + { + fileName = PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID)?.PipelineCode; } string path = Funs.RootPath + @"File\Excel\Temp\JointQuery.xlsx"; @@ -537,7 +541,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery }).ToList(); MiniExcel.SaveAs(path, q); - string fileName = "焊口信息总览.xlsx"; + fileName = fileName+ "-焊口信息总览.xlsx"; FileInfo info = new FileInfo(path); long fileSize = info.Length; System.Web.HttpContext.Current.Response.Clear(); diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs index f636dc99..ffcd1152 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs @@ -1082,9 +1082,7 @@ namespace FineUIPro.Web.HJGL.PointTrust //{ //} - #endregion - - + #endregion #region 切除焊口 diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx index 469afc47..3d22fdea 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx @@ -75,7 +75,7 @@ --%> + diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs index 56165d31..46930720 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs @@ -989,6 +989,9 @@ namespace FineUIPro.Web.HJGL.PointTrust } } + protected void btnBack_Click(object sender, EventArgs e) + { + } #region 判断是否可删除 /// /// 判断是否可以删除 diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.designer.cs index 1b5a6891..742b613c 100644 --- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.PointTrust { - - - public partial class TrustBatch { - +namespace FineUIPro.Web.HJGL.PointTrust +{ + + + public partial class TrustBatch + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// drpUnit 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// Toolbar4 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar4; - + /// /// txtWelderCode 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWelderCode; - + /// /// Toolbar1 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// txtTrustDateMonth 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtTrustDateMonth; - + /// /// tvControlItem 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar3 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// ToolbarFill1 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnAudit 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAudit; - + /// /// btnDelete 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDelete; - + /// /// btnPrint 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnPrint; - + /// /// SimpleForm1 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtTrustBatchCode 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTrustBatchCode; - + /// /// txtTrustDate 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtTrustDate; - + /// /// txtDetectionTypeCode 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label txtDetectionTypeCode; - + /// /// lbNDEUnit 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbNDEUnit; - + /// /// lbIsTrust 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbIsTrust; - + /// /// lbIsAudit 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbIsAudit; - + /// /// Button1 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button Button1; - + /// /// Grid1 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolbarSeparator1 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// Menu1 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.HJGL.PointTrust { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnPointAudit 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs index 60908f79..31f1e319 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs @@ -229,36 +229,36 @@ namespace FineUIPro.Web.HJGL.PreDesign private DataTable BindData() { string strSql = @"WITH cte as (select pipeline.PipelineCode as PipelineCode, -comonent.PipelineComponentCode as PipelineComponentCode, -'' as matdef, -packdetail.Number as Number, -pack.PackagingCode as PackagingCode, -trainnumber.TrainNumber as TrainNumber, -pipeline.FlowingSection as FlowingSection, -pipeline.UnitWorkId as UnitWorkId -from HJGL_Pipeline pipeline -left join HJGL_PackagingManageDetail packdetail on pipeline.PipelineId = packdetail.PipelineId -left join HJGL_Pipeline_Component comonent -on packdetail.PipelineComponentId = comonent.PipelineComponentId -left join HJGL_PackagingManage pack on packdetail.PackagingManageId = pack.PackagingManageId -left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id -where (packdetail.PipelineComponentId is not null or packdetail.PipelineComponentId != '') -union all -select pipeline.PipelineCode as PipelineCode, -packdetail.MaterialCode as PipelineComponentCode, -matlib.MaterialDef as matdef, -packdetail.Number as Number, -pack.PackagingCode as PackagingCode, -trainnumber.TrainNumber as TrainNumber, -pipeline.FlowingSection as FlowingSection, -pipeline.UnitWorkId as UnitWorkId -from HJGL_Pipeline pipeline -left join HJGL_PackagingManageDetail packdetail on pipeline.PipelineId = packdetail.PipelineId -left join HJGL_MaterialCodeLib matlib on packdetail.MaterialCode = matlib.MaterialCode -left join HJGL_PackagingManage pack on packdetail.PackagingManageId = pack.PackagingManageId -left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id -where (packdetail.PipelineComponentId is null or packdetail.PipelineComponentId = '')) -SELECT * FROM cte WHERE 1=1 "; + comonent.PipelineComponentCode as PipelineComponentCode, + '' as matdef, + packdetail.Number as Number, + pack.PackagingCode as PackagingCode, + trainnumber.TrainNumber as TrainNumber, + pipeline.FlowingSection as FlowingSection, + pipeline.UnitWorkId as UnitWorkId + from HJGL_Pipeline pipeline + left join HJGL_PackagingManageDetail packdetail on pipeline.PipelineId = packdetail.PipelineId + left join HJGL_Pipeline_Component comonent + on packdetail.PipelineComponentId = comonent.PipelineComponentId + left join HJGL_PackagingManage pack on packdetail.PackagingManageId = pack.PackagingManageId + left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id + where (packdetail.PipelineComponentId is not null or packdetail.PipelineComponentId != '') + union all + select pipeline.PipelineCode as PipelineCode, + packdetail.MaterialCode as PipelineComponentCode, + matlib.MaterialDef as matdef, + packdetail.Number as Number, + pack.PackagingCode as PackagingCode, + trainnumber.TrainNumber as TrainNumber, + pipeline.FlowingSection as FlowingSection, + pipeline.UnitWorkId as UnitWorkId + from HJGL_Pipeline pipeline + left join HJGL_PackagingManageDetail packdetail on pipeline.PipelineId = packdetail.PipelineId + left join HJGL_MaterialCodeLib matlib on packdetail.MaterialCode = matlib.MaterialCode + left join HJGL_PackagingManage pack on packdetail.PackagingManageId = pack.PackagingManageId + left join HJGL_TrainNumberManage trainnumber on pack.TrainNumberId = TrainNumber.Id + where (packdetail.PipelineComponentId is null or packdetail.PipelineComponentId = '')) + SELECT * FROM cte WHERE 1=1 "; List listStr = new List(); if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2) @@ -390,7 +390,7 @@ SELECT * FROM cte WHERE 1=1 "; 管线号 = x.Field("PipelineCode"), 组件编号 = x.Field("PipelineComponentCode"), 预制散件材料描述 = !string.IsNullOrWhiteSpace(x.Field("matdef")) ? x.Field("matdef") : "-", - 数量 = x.Field("Number"), + 数量 = x.Field("Number"), 所在包装编号 = x.Field("PackagingCode"), 车次 = x.Field("TrainNumber"), 流水段 = x.Field("FlowingSection") diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs index af9cc677..15f29f23 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using Model; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -122,6 +123,27 @@ namespace FineUIPro.Web.HJGL.PreDesign { table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values); + var newDetailList= new List(); + foreach (var item in dropPipelineComponentCode.Values) + { + var ComponentModel = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(item); + if (ComponentModel != null) + { + var model = new Model.HJGL_PackagingManageDetail() + { + Id = SQLHelper.GetNewID(), + PackagingManageId = this.PackagingManageId, + PipelineId = ComponentModel.PipelineId, + PipelineComponentId = item, + CreateTime = DateTime.Now, + CreateUser = this.CurrUser.PersonId, + }; + newDetailList.Add(model); + } + } + HJGLPackagingmanagedetailService.DeleteByPackagingManageId(this.PackagingManageId); + HJGLPackagingmanagedetailService.AddBulk(newDetailList); + } } BLL.HJGL_PackagingmanageService.UpdateHJGL_PackagingManage(table); diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx index 37679631..c6f83703 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx @@ -53,7 +53,7 @@ @@ -103,45 +103,41 @@ DataField="PriorityTotalDyne" SortField="PriorityTotalDyne" FieldType="Float" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> - + - + - + - + - + - <%-- - - - - --%> + + + @@ -166,6 +162,10 @@ function reloadGrid() { __doPostBack(null, 'reloadGrid'); } + + function onGridDataLoad(event) { + this.mergeColumns(['FlowNum', 'MainItemName', 'Material', 'TotalDyne']); + } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs index 45ea38ee..54a1c395 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs @@ -26,17 +26,6 @@ namespace FineUIPro.Web.HJGL.PreDesign { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.InitTreeMenu();//加载树 - //HJGL_PipelineComponentService.InitMainItemDownList(drpState, true); - //HJGL_PipelineComponentService.InitMainItemDownProductionStateList(drpProductionState, true); - - //var pipeline = (from x in Funs.DB.HJGL_Pipeline - // where x.ProjectId == this.CurrUser.LoginProjectId - // select x.FlowingSection).Distinct().ToList(); - //this.drpFlowingSection.DataTextField = "Value"; - //this.drpFlowingSection.DataValueField = "Value"; - //this.drpFlowingSection.DataSource = pipeline; - //this.drpFlowingSection.DataBind(); - //Funs.FineUIPleaseSelect(drpFlowingSection); } } @@ -123,11 +112,12 @@ namespace FineUIPro.Web.HJGL.PreDesign { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" && x.PipelineCode.Contains(txtPipelineCode.Text.Trim()) select x.FlowingSection).Distinct().Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; - tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + //tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + tn2.Text = q.UnitWorkName; if (q.UnitWorkId == this.hdUnitWorkId.Text) { tn2.Expanded = true; @@ -155,42 +145,42 @@ namespace FineUIPro.Web.HJGL.PreDesign private void BindNodes(TreeNode node) { - List pipeline = new List(); - var pipelines = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.PipeArea == "1" select x; - pipeline = (from x in pipelines - where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) - orderby x.PipelineCode - select x).ToList(); - int pageindex = int.Parse(node.CommandName.Split('|')[0]); - int pageCount = int.Parse(node.CommandName.Split('|')[1]); - if (pageindex <= pageCount) + List flowingSection = new List(); + //List pipeline = new List(); + var list = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.PipeArea == "1" && x.UnitWorkId == node.NodeID && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x.FlowingSection).ToList(); + flowingSection = list.Where(x => !string.IsNullOrWhiteSpace(x) == true).Distinct().OrderBy(x => x).ToList(); + //int pageindex = int.Parse(node.CommandName.Split('|')[0]); + //int pageCount = int.Parse(node.CommandName.Split('|')[1]); + //if (pageindex <= pageCount) + //{ + // flowingSection = flowingSection.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); + foreach (var item in flowingSection) { - pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); - foreach (var item in pipeline) - { - var comCount = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineId == item.PipelineId select x).Count(); - TreeNode newNode = new TreeNode(); - newNode.Text = item.PipelineCode + "【" + comCount.ToString() + " " + "组件" + "】"; - newNode.ToolTip = "管线号【组件数】"; - newNode.CommandName = "管线"; - newNode.NodeID = item.PipelineId; - newNode.EnableClickEvent = true; - node.Nodes.Add(newNode); - } - if (pageindex < pageCount) - { - TreeNode newNode = new TreeNode(); - newNode.Text = "加载"; - newNode.NodeID = SQLHelper.GetNewID(); - newNode.CommandName = "加载"; - newNode.Icon = Icon.ArrowDown; - newNode.EnableClickEvent = true; - node.Nodes.Add(newNode); - } + //var comCount = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineId == item.PipelineId select x).Count(); + TreeNode newNode = new TreeNode(); + //newNode.Text = item.PipelineCode + "【" + comCount.ToString() + " " + "组件" + "】"; + + newNode.Text = item; + newNode.ToolTip = "流水段"; + newNode.CommandName = "流水段"; + newNode.NodeID = SQLHelper.GetNewID(); + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); } - - + // if (pageindex < pageCount) + // { + // TreeNode newNode = new TreeNode(); + // newNode.Text = "加载"; + // newNode.NodeID = "加载"; + // //newNode.NodeID = SQLHelper.GetNewID(); + // newNode.CommandName = "加载"; + // newNode.Icon = Icon.ArrowDown; + // newNode.EnableClickEvent = true; + // node.Nodes.Add(newNode); + // } + //} } + #endregion protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) { @@ -209,13 +199,9 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { - if (e.CommandName.Split('|').Length == 2) + if (e.CommandName == "流水段") { - this.hdUnitWorkId.Text = this.tvControlItem.SelectedNodeID; - } - else if (e.CommandName == "管线") - { - Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); + Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByFlowingSection(this.tvControlItem.SelectedNode.Text); this.hdUnitWorkId.Text = string.Empty; if (pipeline != null) { @@ -223,14 +209,6 @@ namespace FineUIPro.Web.HJGL.PreDesign SaveProductionSchedulingPlan(); } } - else if (e.CommandName == "加载") - { - string CommandName = e.Node.ParentNode.CommandName; - e.Node.ParentNode.CommandName = (int.Parse(CommandName.Split('|')[0]) + 1) + "|" + int.Parse(CommandName.Split('|')[1]); - TreeNode treeNode = e.Node.ParentNode; - treeNode.Nodes.Remove(e.Node); - BindNodes(e.Node.ParentNode); - } this.BindGrid(); } @@ -242,27 +220,24 @@ namespace FineUIPro.Web.HJGL.PreDesign { if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { - var schedulingPlan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByPipelineId(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNodeID); - if (schedulingPlan == null) + List lists = (from x in Funs.DB.View_HJGL_ProductionSchedulingPlanStatistics.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.FlowingSection == this.tvControlItem.SelectedNode.Text) select x).ToList(); + foreach (var item in lists) { - Model.HJGL_ProductionSchedulingPlan newPlan = new HJGL_ProductionSchedulingPlan(); - newPlan.ProductionSchedulingPlanId = SQLHelper.GetNewID(typeof(Model.HJGL_ProductionSchedulingPlan)); - newPlan.ProjectId = this.CurrUser.LoginProjectId; - newPlan.PipelineId = this.tvControlItem.SelectedNodeID; - var pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); - if (pipeline!=null) + var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlan(this.CurrUser.LoginProjectId, item.FlowingSection, item.UnitWorkName, item.Material, item.Caliber); + if (plan == null) { - newPlan.FlowNum = pipeline.FlowingSection; - if (!string.IsNullOrEmpty(pipeline.UnitWorkId)) - { - newPlan.MainItemName = BLL.UnitWorkService.getUnitWorkByUnitWorkId(pipeline.UnitWorkId).UnitWorkName; - } - if (!string.IsNullOrEmpty(pipeline.PipingClassId)) - { - newPlan.Material = BLL.Base_PipingClassService.GetPipingClassByPipingClassId(pipeline.PipingClassId).SteelType; - } + Model.HJGL_ProductionSchedulingPlan newPlan = new HJGL_ProductionSchedulingPlan(); + newPlan.ProductionSchedulingPlanId = SQLHelper.GetNewID(typeof(Model.HJGL_ProductionSchedulingPlan)); + newPlan.ProjectId = this.CurrUser.LoginProjectId; + //newPlan.PipelineId = this.tvControlItem.SelectedNodeID; + newPlan.FlowNum = item.FlowingSection; + newPlan.MainItemName = item.UnitWorkName; + newPlan.Material = item.Material; + newPlan.Caliber = item.Caliber; + newPlan.Dain = item.Dia; + newPlan.TotalDyne = lists.Sum(x => x.Dia); + BLL.ProductionSchedulingPlanService.AddProductionSchedulingPlan(newPlan); } - BLL.ProductionSchedulingPlanService.AddProductionSchedulingPlan(newPlan); } } } @@ -289,23 +264,21 @@ namespace FineUIPro.Web.HJGL.PreDesign p.PlanStartDate, p.PlanEndDate, p.Days, - p.AvgDailyWorkload, - pipeline.UnitWorkId + p.AvgDailyWorkload FROM HJGL_ProductionSchedulingPlan p - left join HJGL_Pipeline as pipeline on pipeline.PipelineId = p.PipelineId WHERE 1=1 "; List listStr = new List(); if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2) { - strSql += " and pipeline.UnitWorkId =@UnitWorkId"; - listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); + strSql += " and p.MainItemName =@UnitWorkId"; + listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNode.Text)); } - else if (tvControlItem.SelectedNode.CommandName == "管线") + else if (tvControlItem.SelectedNode.CommandName == "流水段") { - strSql += " and p.PipelineId = @PipelineId "; - listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + strSql += " and p.FlowNum = @FlowNum "; + listStr.Add(new SqlParameter("@FlowNum", this.tvControlItem.SelectedNode.Text)); } SqlParameter[] parameter = listStr.ToArray(); @@ -419,8 +392,134 @@ namespace FineUIPro.Web.HJGL.PreDesign #region 导出 protected void btnOut_Click(object sender, EventArgs e) { - + string rootPath = Server.MapPath("~/"); + string initTemplatePath = Const.HJGL_ProductionSchedulingPlanPath; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + uploadfilepath = rootPath + initTemplatePath; + var lists = (from x in Funs.DB.HJGL_ProductionSchedulingPlan + where x.ProjectId == this.CurrUser.LoginProjectId + select x); + + if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2) + { + lists = lists.Where(x => x.MainItemName == this.tvControlItem.SelectedNode.Text); + } + else if (tvControlItem.SelectedNode.CommandName == "流水段") + { + lists = lists.Where(x => x.FlowNum == this.tvControlItem.SelectedNode.Text); + } + + if (lists != null) + { + newUrl = uploadfilepath.Replace("排产计划导出模板", "排产计划（" + DateTime.Now.ToString("yyyyMMdd") + ")"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } + File.Copy(uploadfilepath, newUrl); + // 第一步：读取文件流 + NPOI.SS.UserModel.IWorkbook workbook; + using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + { + workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + //workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + } + // 创建单元格样式 + NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + cellStyle.WrapText = true;//自动换行 + var font = workbook.CreateFont(); + font.FontHeightInPoints = 11; + cellStyle.SetFont(font); + // 第二步：创建新数据行 + NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + NPOI.SS.UserModel.ICell cell; + int i = 1; + foreach (var item in lists) + { + // 第二步：创建新数据行 + row = sheet.CreateRow(i); + // 添加数据 + cell = row.CreateCell(0); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.FlowNum);//流水段号 + + cell = row.CreateCell(1); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.MainItemName);//主项名称 + + cell = row.CreateCell(2); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Material);//材质 + + cell = row.CreateCell(3); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Caliber);//口径 + + cell = row.CreateCell(4); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Dain.HasValue ? item.Dain.ToString() : "");//达因数 + + cell = row.CreateCell(5); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.TotalDyne.HasValue?item.TotalDyne.ToString():"");//总达因数 + + cell = row.CreateCell(6); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.TotalPriority);//总优先级 + + cell = row.CreateCell(7); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PriorityTotalDyne.HasValue ? item.PriorityTotalDyne.ToString() : "");//优先级总达因 + + cell = row.CreateCell(8); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PlanStartDate) : "");//计划开始时间 + + cell = row.CreateCell(9); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.PlanEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PlanEndDate) : "");//计划结束时间 + + cell = row.CreateCell(10); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.Days.HasValue?item.Days.ToString():"");//天数 + + cell = row.CreateCell(11); + cell.CellStyle = cellStyle; + cell.SetCellValue(item.AvgDailyWorkload.HasValue ? item.AvgDailyWorkload.ToString():"");//平均每天工作量 + + i++; + } + // 第三步：写入文件流 + using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + { + workbook.Write(stream); + workbook.Close(); + } + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + } } #endregion } diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx index c28b1360..798ec89a 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx @@ -32,6 +32,8 @@ + + diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.cs index 9697773f..03c9f175 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.cs @@ -329,5 +329,35 @@ namespace FineUIPro.Web.HSSE.CostGoods PrinterDocService.PrinterDocMethod(Const.ProjectCostManageMenuId, Grid1.SelectedRowID, "HSSE费用管理"); } + + protected void Button1_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string costManageId = Grid1.SelectedRowID; + var costManage = CostManageService.GetCostManageById(costManageId); + if (costManage != null && costManage.States == Const.State_2) + { + if (string.IsNullOrEmpty(costManage.ContractNum)) + { + Alert.ShowInTop("未关联合同，无法推送！", MessageBoxIcon.Warning); + + } + else + { + string messaage = CostManageService.PushDataToHSE(this.CurrUser.LoginProjectId, costManage.ContractNum); + + } + + } + else + { + Alert.ShowInTop("未审核完成无法推送！", MessageBoxIcon.Warning); + + } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.designer.cs index 0289b609..0ba3452f 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManage.aspx.designer.cs @@ -86,6 +86,15 @@ namespace FineUIPro.Web.HSSE.CostGoods /// protected global::FineUIPro.Button btnNew; + /// + /// Button1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button Button1; + /// /// btnOut 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageAudit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageAudit.aspx.cs index 10a014c6..942ea3d1 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageAudit.aspx.cs @@ -187,7 +187,7 @@ namespace FineUIPro.Web.HSSE.CostGoods /// /// private void SaveData() - { + { var getCost = CostManageService.GetCostManageById(this.CostManageId); if (getCost != null) { @@ -227,7 +227,7 @@ namespace FineUIPro.Web.HSSE.CostGoods } PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); - } + } #endregion #region 附件上传 diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx index 34bce891..9c8b5f26 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx @@ -29,8 +29,10 @@ - - + <%-- + --%> + + @@ -39,8 +41,9 @@ - + + diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.cs index f85a854b..5f6ab11d 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.cs @@ -52,7 +52,7 @@ namespace FineUIPro.Web.HSSE.CostGoods { this.btnClose.OnClientClick = ActiveWindow.GetHideRefreshReference(); this.ProjectId = this.CurrUser.LoginProjectId; - + BLL.ContractService.InitCompletedContractsDropDownList(this.ProjectId,this.drpContractNum); BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, false); this.CostManageId = Request.Params["CostManageId"] ?? SQLHelper.GetNewID(); var costManage = BLL.CostManageService.GetCostManageById(this.CostManageId); @@ -68,7 +68,7 @@ namespace FineUIPro.Web.HSSE.CostGoods { this.drpUnit.SelectedValue = costManage.UnitId; } - this.txtContractNum.Text = costManage.ContractNum; + this.drpContractNum.SelectedValue = costManage.ContractNum; this.txtCostManageDate.Text = string.Format("{0:yyyy-MM-dd}", costManage.CostManageDate); } @@ -303,13 +303,17 @@ namespace FineUIPro.Web.HSSE.CostGoods { ProjectId = this.ProjectId, UnitId = this.drpUnit.SelectedValue == Const._Null ? null : this.drpUnit.SelectedValue, - ContractNum = this.txtContractNum.Text.Trim(), + ContractNum = this.drpContractNum.SelectedValue, CostManageDate = Funs.GetNewDateTime(this.txtCostManageDate.Text.Trim()), States = BLL.Const.State_0, CompileMan = this.CurrUser.PersonId, CompileDate = DateTime.Now, }; - + var costManageItems = CostManageItemService.GetCostManageItemByCostManageId(this.CostManageId); + if (costManageItems.Count ==0) + { + costManage.SumMoney = decimal.Parse(txtHseCost.Text.Trim()); + } if (type == Const.BtnSubmit) { costManage.States = BLL.Const.State_1; diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.designer.cs index 29d8b08a..eb84ce00 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.designer.cs @@ -60,13 +60,13 @@ namespace FineUIPro.Web.HSSE.CostGoods protected global::FineUIPro.DropDownList drpUnit; /// - /// txtContractNum 控件。 + /// drpContractNum 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtContractNum; + protected global::FineUIPro.DropDownList drpContractNum; /// /// txtCostManageDate 控件。 @@ -95,6 +95,15 @@ namespace FineUIPro.Web.HSSE.CostGoods /// protected global::FineUIPro.TextBox txtGetCost; + /// + /// txtSumMoney 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtSumMoney; + /// /// Grid1 控件。 /// diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index be8fc4c9..f01d72d1 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -18,6 +18,7 @@ + diff --git a/SGGL/Model/HSSE/PuPayCraftAmountInput.cs b/SGGL/Model/HSSE/PuPayCraftAmountInput.cs new file mode 100644 index 00000000..bfd31626 --- /dev/null +++ b/SGGL/Model/HSSE/PuPayCraftAmountInput.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + /// + /// pu推送安全费用模型 + /// + public class PuPayCraftAmountInput + { + public string projectId { get; set; } + public string contractNo { get; set; } + public string amountHSE { get; set; } + public PuPayCraftAmountFileInput[] files { get; set; } + } + /// + /// pu推送安全费用文件模型 + /// + public class PuPayCraftAmountFileInput + { + public string name { get; set; } + public string content { get; set; } + public string thisamount { get; set; } + public string date { get; set; } + } +} diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index e69ef43e..6e9e2250 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -6857,6 +6857,14 @@ namespace Model } } + public System.Data.Linq.Table View_HJGL_ProductionSchedulingPlanStatistics + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table View_HJGL_WeldingTask { get @@ -287569,6 +287577,159 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_ProductionSchedulingPlanStatistics")] + public partial class View_HJGL_ProductionSchedulingPlanStatistics + { + + private string _UnitWorkId; + + private string _UnitWorkCode; + + private string _UnitWorkName; + + private string _ProjectId; + + private string _FlowingSection; + + private string _Material; + + private string _Caliber; + + private decimal _Dia; + + public View_HJGL_ProductionSchedulingPlanStatistics() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string UnitWorkId + { + get + { + return this._UnitWorkId; + } + set + { + if ((this._UnitWorkId != value)) + { + this._UnitWorkId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkCode", DbType="NVarChar(10)")] + public string UnitWorkCode + { + get + { + return this._UnitWorkCode; + } + set + { + if ((this._UnitWorkCode != value)) + { + this._UnitWorkCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkName", DbType="NVarChar(30)")] + public string UnitWorkName + { + get + { + return this._UnitWorkName; + } + set + { + if ((this._UnitWorkName != value)) + { + this._UnitWorkName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this._ProjectId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FlowingSection", DbType="NVarChar(200)")] + public string FlowingSection + { + get + { + return this._FlowingSection; + } + set + { + if ((this._FlowingSection != value)) + { + this._FlowingSection = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="VarChar(8)")] + public string Material + { + get + { + return this._Material; + } + set + { + if ((this._Material != value)) + { + this._Material = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Caliber", DbType="VarChar(5) NOT NULL", CanBeNull=false)] + public string Caliber + { + get + { + return this._Caliber; + } + set + { + if ((this._Caliber != value)) + { + this._Caliber = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Dia", DbType="Decimal(38,3) NOT NULL")] + public decimal Dia + { + get + { + return this._Dia; + } + set + { + if ((this._Dia != value)) + { + this._Dia = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_WeldingTask")] public partial class View_HJGL_WeldingTask { diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 9e7d979a..fad607a9 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -236,6 +236,7 @@ + diff --git a/SGGL/WebAPI/Controllers/HSSE/PayCraftAmountController.cs b/SGGL/WebAPI/Controllers/HSSE/PayCraftAmountController.cs new file mode 100644 index 00000000..e69de29b