diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index e47cfd0..1963de0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index d599766..b902115 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/BLL/BLL.csproj b/HJGL/BLL/BLL.csproj index b94c0d4..7458eeb 100644 --- a/HJGL/BLL/BLL.csproj +++ b/HJGL/BLL/BLL.csproj @@ -178,6 +178,7 @@ + diff --git a/HJGL/BLL/Common/Const.cs b/HJGL/BLL/Common/Const.cs index 53fe3ce..b265600 100644 --- a/HJGL/BLL/Common/Const.cs +++ b/HJGL/BLL/Common/Const.cs @@ -530,6 +530,11 @@ namespace BLL /// public const string HJGL_PreWeldReportMenuId = "8D92CA4E-F267-4175-9152-56F095668FC9"; + /// + /// 日报完成情况 + /// + public const string DailyReportCompleteMenuId = "948B01F1-27B4-49DF-9315-C42BB7BBE7AF"; + #endregion diff --git a/HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs b/HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs index 7c0425d..288c9ff 100644 --- a/HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs +++ b/HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs @@ -84,24 +84,6 @@ namespace BLL return (from x in Funs.DB.Welder_TeamGroup orderby x.TeamGroupCode select x).ToList(); } - /// - /// 班组下拉选择项 - /// - /// - /// - /// - public static void InitTeamGroupDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease,string itemText) - { - dropName.DataValueField = "TeamGroupId"; - dropName.DataTextField = "TeamGroupName"; - dropName.DataSource = GetTeamGroupList(); - dropName.DataBind(); - if (isShowPlease) - { - Funs.FineUIPleaseSelect(dropName,itemText); - } - } - /// /// 获取班组下拉选择项 /// diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/DailyReportCompleteService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/DailyReportCompleteService.cs new file mode 100644 index 0000000..227b95b --- /dev/null +++ b/HJGL/BLL/WeldingProcess/WeldingManage/DailyReportCompleteService.cs @@ -0,0 +1,92 @@ +using Model; +using NPOI.SS.Formula.Functions; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + public partial class DailyReportCompleteService + { + /// + /// 获取日报完成信息 + /// + /// Id + /// + public static Model.Pipeline_DailyReportComplete GetDailyReportComplete(string completeId) + { + return Funs.DB.Pipeline_DailyReportComplete.FirstOrDefault(x => x.DailyReportCompleteId == completeId); + } + + /// + /// 增加日报完成信息 + /// + /// + public static void AddDailyReportComplete(Model.Pipeline_DailyReportComplete complete) + { + Model.HJGLDB db = Funs.DB; + Model.Pipeline_DailyReportComplete newR = new Model.Pipeline_DailyReportComplete(); + newR.DailyReportCompleteId = complete.DailyReportCompleteId; + newR.ProjectId =complete.ProjectId; + newR.UnitId = complete.UnitId; + newR.TeamGroupId =complete.TeamGroupId; + newR.DailyReportDate = complete.DailyReportDate; + newR.IsComplete = complete.IsComplete; + + db.Pipeline_DailyReportComplete.InsertOnSubmit(newR); + db.SubmitChanges(); + } + + /// + /// 修改日报完成信息 + /// + /// + public static void UpdateDailyReportComplete(Model.Pipeline_DailyReportComplete complete) + { + Model.HJGLDB db = Funs.DB; + Model.Pipeline_DailyReportComplete newR = db.Pipeline_DailyReportComplete.First(e => e.DailyReportCompleteId == complete.DailyReportCompleteId); + newR.ProjectId = complete.ProjectId; + newR.UnitId = complete.UnitId; + newR.TeamGroupId = complete.TeamGroupId; + newR.DailyReportDate = complete.DailyReportDate; + newR.IsComplete = complete.IsComplete; + + db.SubmitChanges(); + } + + /// + /// 删除日报完成信息 + /// + /// + public static void DeleteDailyReportComplete(string completeId) + { + Model.HJGLDB db = Funs.DB; + Model.Pipeline_DailyReportComplete delR = db.Pipeline_DailyReportComplete.First(e => e.DailyReportCompleteId == completeId); + db.Pipeline_DailyReportComplete.DeleteOnSubmit(delR); + db.SubmitChanges(); + } + + /// + /// 是否存在日报完成信息 + /// + /// + /// + /// + /// + /// 是否存在 + public static bool IsExistDailyReportComplete(string projectId , string completeId, string teamGroup, DateTime reportDate) + { + bool isExist = false; + var role = Funs.DB.Pipeline_DailyReportComplete.FirstOrDefault(x => x.ProjectId == projectId && x.TeamGroupId==teamGroup && x.DailyReportDate== reportDate && x.DailyReportCompleteId != completeId); + if (role != null) + { + isExist = true; + } + return isExist; + } + + + + + } +} diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index f843a5d..60b98c7 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1259,6 +1259,8 @@ + + @@ -5591,6 +5593,20 @@ TrustBatchSelect.aspx + + DailyReportComplete.aspx + ASPXCodeBehind + + + DailyReportComplete.aspx + + + DailyReportCompleteEdit.aspx + ASPXCodeBehind + + + DailyReportCompleteEdit.aspx + GetWdldingDailyItem.ashx diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs index 6cb9eb9..bd29e42 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs @@ -485,7 +485,7 @@ namespace FineUIPro.Web.CheckManage if (ndtItem != string.Empty) { var q = BLL.Batch_NDEItemService.GetNDEItemById(ndtItem); - if (q.PassFilm != q.TotalFilm && q.SubmitDate.HasValue) + if ((q.PassFilm != q.TotalFilm || q.Remark.Contains("修磨") || q.Remark.Contains("异物")) && q.SubmitDate.HasValue) { string window = String.Format("RepairNotice.aspx?NDEItemID={0}", ndtItem, "返修通知单"); PageContext.RegisterStartupScript(WindowRepair.GetShowReference(window)); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs index f69a03a..bfe4d97 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs @@ -210,7 +210,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage if (repairRecord != null && !string.IsNullOrEmpty(repairRecord.RepairRecordCode)) { // 取返修单后4位 - code4 = repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4); + code4 = repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 5); // 取返修单后2位 code2 = repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 2); } @@ -245,7 +245,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage List listStr = new List(); listStr.Add(new SqlParameter("@DetectionTypeId", repairRecord.DetectionTypeId)); // 如果是第二次返修不加载扩透口 - if (!code4.Contains("K1") && code2 == "R2") + if (!code4.Contains("EX1") && code2 == "R2") { listStr.Add(new SqlParameter("@ProjectId", "0")); } @@ -263,7 +263,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage } else { - if (ndtItem.JudgeGrade == "修磨" || ndtItem.JudgeGrade == "异物") + if (ndtItem.Remark.Contains("修磨") || ndtItem.Remark.Contains("异物")) { listStr.Add(new SqlParameter("@ProjectId", "0")); } @@ -724,7 +724,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage if (code != null && !string.IsNullOrEmpty(code.RepairRecordCode)) { // 取返修单后4位 - string code4 = code.RepairRecordCode.Substring(code.RepairRecordCode.Length - 4); + string code4 = code.RepairRecordCode.Substring(code.RepairRecordCode.Length - 5); // 取返修单后2位 string code2 = code.RepairRecordCode.Substring(code.RepairRecordCode.Length - 2); if (code2 == "R1") @@ -749,7 +749,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage } else { - if (code4.Contains("K1") && code2 == "R2") + if (code4.Contains("EX1") && code2 == "R2") { Grid1.SelectAllRows(); } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs index 58ef0cc..2059ef1 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs @@ -81,7 +81,10 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage { newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "P1"; } - + else if (q.Remark.Contains("异物")) + { + newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "S1"; + } else { newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "R1"; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs index 4306801..fa2bedd 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs @@ -664,13 +664,20 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage Alert.ShowInTop("请选择打印报表！", MessageBoxIcon.Warning); return; } - if (string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) ) + if (string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { Alert.ShowInTop("请选择试压包！", MessageBoxIcon.Warning); return; } - CreateDataExcel(selectValArray); + try + { + CreateDataExcel(selectValArray); + } + catch (Exception ex) + { + ShowNotify($"导出失败：{ex.Message}", MessageBoxIcon.Error); + } } #region 绘画模版 @@ -745,7 +752,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.GetRow(rowIndex + 11).Height = 11 * 20; ws.GetRow(rowIndex + 10).GetCell(1).SetCellValue("试压包号\r\nTest Package No."); - ws.GetRow(rowIndex + 10).GetCell(4).SetCellValue("UG-130-FW-HT-0001"); + ws.GetRow(rowIndex + 10).GetCell(4).SetCellValue(this.tvControlItem.SelectedNode.Text); ws.AddMergedRegion(new CellRangeAddress(rowIndex + 12, rowIndex + 13, 2, 4)); ws.AddMergedRegion(new CellRangeAddress(rowIndex + 12, rowIndex + 13, 6, 7)); @@ -3110,32 +3117,66 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { var info = GetTestPackageInfo(this.tvControlItem.SelectedNodeID); - string sql = @" SELECT - WeldSilkId, - a.PipelineCode, - e.WorkAreaCode, - a.WeldJointCode, - a.Specification, - a.Material1Code, - a.WeldingMethodCode, - a.WeldingDate, - a.WeldSilkCode, - a.WeldMatCode, - a.BackingWelderCode, - a.CoverWelderCode, - a.ProjectName, - (select top 1 EnProjectName from Base_Project where ProjectId=b.ProjectId ) as EnProjectName, - (select top 1 WorkAreaName from Project_WorkArea where WorkAreaId=c.WorkAreaId) as WorkAreaName, - (select top 1 EnWorkAreaName from Project_WorkArea where WorkAreaId=c.WorkAreaId) as EnWorkAreaName, - a.IsHotProess,(case a.IsHotProess when 1 then '是' else '否' end) as IsHotProessName,PrepareTemp, - WeldingLocationCode,a.WeldTypeCode, - (SELECT TOP 1 n.NDEReportNo FROM dbo.Batch_NDEItem n WHERE n.TrustBatchItemId= - (SELECT TOP 1 bt.TrustBatchItemId FROM dbo.Batch_BatchTrustItem bt WHERE bt.WeldJointId=a.WeldJointId)) AS NDEReportNo - FROM PTP_TestPackage as b inner join - PTP_PipelineList as c on b.PTP_ID=c.PTP_ID - inner join View_Pipeline_WeldJoint as a on c.PipelineId=a.PipelineId - left join Project_WorkArea as e on e.WorkAreaId=c.WorkAreaId - WHERE Is_hjName='是' and b.PTP_ID=@PTPID and a.projectId=@projectId + string sql = @" SELECT * FROM ( + SELECT + b.PTP_ID, + a.projectId, + WeldSilkId, + a.PipelineCode, + a.WeldJointCode, + a.Specification, + a.MaterialCode, + a.WeldingMethodCode, + a.WeldingDate, + (CASE WHEN a.WeldMatId IS NOT NULL AND a.WeldSilkId IS NOT NULL THEN a.WeldSilkId+'|'+ a.WeldMatId + WHEN a.WeldMatId IS NOT NULL AND a.WeldSilkId IS NULL THEN a.WeldMatId + WHEN a.WeldSilkId IS NOT NULL AND a.WeldMatId IS NULL THEN a.WeldSilkId + ELSE '' END) AS WeldMaterial, + a.BackingWelderCode, + a.CoverWelderCode, + a.ProjectName, + (select top 1 EnProjectName from Base_Project where ProjectId=b.ProjectId ) as EnProjectName, + (select top 1 WorkAreaName from Project_WorkArea where WorkAreaId=c.WorkAreaId) as WorkAreaName, + (select top 1 EnWorkAreaName from Project_WorkArea where WorkAreaId=c.WorkAreaId) as EnWorkAreaName, + a.IsHotProess,(case a.IsHotProess when 1 then '是' else '否' end) as IsHotProessName,PrepareTemp, + WeldingLocationCode,a.WeldTypeCode, + (SELECT TOP 1 n.NDEReportNo FROM dbo.Batch_NDEItem n WHERE n.TrustBatchItemId= + (SELECT TOP 1 bt.TrustBatchItemId FROM dbo.Batch_BatchTrustItem bt WHERE bt.WeldJointId=a.WeldJointId)) AS NDEReportNo + FROM PTP_TestPackage as b inner join + PTP_PipelineList as c on b.PTP_ID=c.PTP_ID + inner join View_Pipeline_WeldJoint as a on c.PipelineId=a.PipelineId + WHERE c.isAll=1 + UNION ALL + SELECT + b.PTP_ID, + a.projectId, + WeldSilkId, + a.PipelineCode, + a.WeldJointCode, + a.Specification, + a.MaterialCode, + a.WeldingMethodCode, + a.WeldingDate, + (CASE WHEN a.WeldMatId IS NOT NULL AND a.WeldSilkId IS NOT NULL THEN a.WeldSilkId+'|'+ a.WeldMatId + WHEN a.WeldMatId IS NOT NULL AND a.WeldSilkId IS NULL THEN a.WeldMatId + WHEN a.WeldSilkId IS NOT NULL AND a.WeldMatId IS NULL THEN a.WeldSilkId + ELSE '' END) AS WeldMaterial, + a.BackingWelderCode, + a.CoverWelderCode, + a.ProjectName, + (select top 1 EnProjectName from Base_Project where ProjectId=b.ProjectId ) as EnProjectName, + (select top 1 WorkAreaName from Project_WorkArea where WorkAreaId=c.WorkAreaId) as WorkAreaName, + (select top 1 EnWorkAreaName from Project_WorkArea where WorkAreaId=c.WorkAreaId) as EnWorkAreaName, + a.IsHotProess,(case a.IsHotProess when 1 then '是' else '否' end) as IsHotProessName,PrepareTemp, + WeldingLocationCode,a.WeldTypeCode, + (SELECT TOP 1 n.NDEReportNo FROM dbo.Batch_NDEItem n WHERE n.TrustBatchItemId= + (SELECT TOP 1 bt.TrustBatchItemId FROM dbo.Batch_BatchTrustItem bt WHERE bt.WeldJointId=a.WeldJointId)) AS NDEReportNo + FROM PTP_TestPackage as b inner join + PTP_PipelineList as c on b.PTP_ID=c.PTP_ID + inner join View_Pipeline_WeldJoint as a on c.PipelineId=a.PipelineId + WHERE c.isAll=0 AND CHARINDEX(','+a.WeldJointCode+',',','+c.WeldJonintCode+',')>0 + + ) AS T WHERE PTP_ID=@PTPID and projectId=@projectId "; SqlParameter[] parms = { @@ -3334,23 +3375,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage //规格mm ws.GetRow(dataIndex).GetCell(5).SetCellValue(dr["Specification"].ToString()); //材质 - ws.GetRow(dataIndex).GetCell(6).SetCellValue(dr["Material1Code"].ToString()); + ws.GetRow(dataIndex).GetCell(6).SetCellValue(dr["MaterialCode"].ToString()); //焊接位置 ws.GetRow(dataIndex).GetCell(7).SetCellValue(dr["WeldingLocationCode"].ToString()); //焊接方法 ws.GetRow(dataIndex).GetCell(8).SetCellValue(dr["WeldingMethodCode"].ToString()); - //焊材牌号 - List silkMats = new List(); - if (!string.IsNullOrWhiteSpace(dr["WeldSilkCode"].ToString())) - { - silkMats.Add(dr["WeldSilkCode"].ToString()); - } - if (!string.IsNullOrWhiteSpace(dr["WeldMatCode"].ToString())) - { - silkMats.Add(dr["WeldMatCode"].ToString()); - } - if (silkMats.Count > 0) silkMats = silkMats.GroupBy(x => x).Select(x => x.Key).ToList(); - ws.GetRow(dataIndex).GetCell(10).SetCellValue(string.Join("/", silkMats)); + + string silkMats = ConvertWeldMaterial(dr["WeldMaterial"].ToString()); + + ws.GetRow(dataIndex).GetCell(10).SetCellValue(silkMats); //实际预热温度 ws.GetRow(dataIndex).GetCell(12).SetCellValue(dr["PrepareTemp"].ToString()); //焊接日期 @@ -3718,7 +3751,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.GetRow(dataIndex).GetCell(5).SetCellValue(dr["totalNum"].ToString()); ws.GetRow(dataIndex).GetCell(7).SetCellValue(dr["Fnum"].ToString()); ws.GetRow(dataIndex).GetCell(9).SetCellValue(dr["WelderCode"].ToString()); - ws.GetRow(dataIndex).GetCell(11).SetCellValue(dr["Fnum"].ToString()); + ws.GetRow(dataIndex).GetCell(11).SetCellValue(dr["totalNum"].ToString()); ws.GetRow(dataIndex).GetCell(13).SetCellValue(dr["NdeNum"].ToString()); ws.GetRow(dataIndex).GetCell(15).SetCellValue(dr["FNdeNum"].ToString()); string a = string.IsNullOrEmpty(dr["NdeNum"].ToString())?"0": dr["NdeNum"].ToString(); @@ -4812,8 +4845,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.GetRow(dataIndex).GetCell(9).SetCellValue(dr["RTNDEReportNo"].ToString()); ws.GetRow(dataIndex).GetCell(11).SetCellValue(dr["PTCheckResult"].ToString()); ws.GetRow(dataIndex).GetCell(12).SetCellValue(dr["PTNDEReportNo"].ToString()); - ws.GetRow(dataIndex).GetCell(14).SetCellValue(dr[""].ToString()); - ws.GetRow(dataIndex).GetCell(15).SetCellValue(dr[""].ToString()); + ws.GetRow(dataIndex).GetCell(14).SetCellValue(""); + ws.GetRow(dataIndex).GetCell(15).SetCellValue(""); ws.GetRow(dataIndex).GetCell(17).SetCellValue(dr["Remark"].ToString()); j++; } @@ -6534,7 +6567,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { Directory.CreateDirectory(filePath); } - string fileName = "模版报表-" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx"; + string fileName = "试压包报表-" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx"; string ReportFileName = filePath + fileName; //XSSFWorkbook hssfworkbook = new XSSFWorkbook(); @@ -6735,7 +6768,87 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage #region 私有方法 + protected string ConvertWeldMaterial(object WeldMaterial) + { + string weldMaterial = string.Empty; + string silkName = string.Empty; + string fluxName = string.Empty; + string matName = string.Empty; + if (WeldMaterial != null) + { + string[] wmts = WeldMaterial.ToString().Split('|'); + if (wmts.Count() > 0) + { + if (wmts.Count() == 1) + { + string[] silks = wmts[0].Split(','); + if (silks.Count() > 1) // 焊丝 + { + foreach (string s in silks) + { + var silk = BLL.Base_ConsumablesService.GetConsumablesByConsumablesId(s); + if (!string.IsNullOrEmpty(silk.UserFlux)) + { + fluxName = fluxName + silk.UserFlux + "/"; + silkName = silkName + silk.ConsumablesName + "/"; + } + else + { + silkName = silkName + silk.ConsumablesName + "/"; + } + } + + if (fluxName.Length > 0) + { + fluxName = fluxName.Substring(0, fluxName.Length - 1); + weldMaterial = silkName + fluxName; + } + else + { + weldMaterial = silkName.Substring(0, silkName.Length - 1); + } + + + } + else + { + var mat = BLL.Base_ConsumablesService.GetConsumablesByConsumablesId(wmts[0]); + weldMaterial = mat==null?"": mat.ConsumablesName; + } + + } + else + { + + string[] silks = wmts[0].Split(','); + foreach (string s in silks) + { + var silk = BLL.Base_ConsumablesService.GetConsumablesByConsumablesId(s); + if (!string.IsNullOrEmpty(silk.UserFlux)) + { + fluxName = fluxName + silk.UserFlux + "/"; + silkName = silkName + silk.ConsumablesName + "/"; + } + else + { + silkName = silkName + silk.ConsumablesName + "/"; + } + } + + var mat = BLL.Base_ConsumablesService.GetConsumablesByConsumablesId(wmts[1]); + weldMaterial = silkName + mat.ConsumablesName; + + if (fluxName.Length > 0) + { + fluxName = fluxName.Substring(0, fluxName.Length - 1); + weldMaterial = silkName + mat.ConsumablesName + "/" + fluxName; + } + } + } + } + return weldMaterial; + } public static TestPackageInfoViewModel GetTestPackageInfo(string ptpId) { var result = (from a in Funs.DB.PTP_TestPackage diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx index 5a31b11..e884cc5 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx @@ -118,7 +118,7 @@ runat="server" OnClick="btnbtnOpenResetPoint_Click"> + ConfirmText="确定要手动关闭批的待处理状态吗？" OnClick="btnbtnClear_Click">