phares3757/mesa-fab-approval
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fixes with ECN workflow and ECN PDF.

Browse Source
This commit is contained in:
ouellette 2022-12-06 16:19:25 -07:00
parent 7e283d3d36
commit 7323f82582
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Fab2ApprovalSystem/v17/.suo
View File

Binary file not shown.

20
Fab2ApprovalSystem/DMO/WorkflowDMO.cs
View File

@ -392,18 +392,18 @@ namespace Fab2ApprovalSystem.DMO
else else
{ {
subRoleItems.Add("'QA Pre Approver'"); subRoleItems.Add("'QA Pre Approver'");
// get the affected Modules // get the affected Department: Removed by JRO per Jeanne
qryString.Clear(); //qryString.Clear();
qryString.Append("SELECT ModuleName FROM ECNModule E INNER JOIN ECNAffectedModule AM ON E.ModuleID = AM.ModuleID WHERE AM.ECNNumber= @ECNNumber"); //qryString.Append("SELECT ModuleName FROM ECNModule E INNER JOIN ECNAffectedModule AM ON E.ModuleID = AM.ModuleID WHERE AM.ECNNumber= @ECNNumber");
var dataRows = this.db.Query<dynamic>(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList(); //var dataRows = this.db.Query<dynamic>(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList();
foreach (var dataRow in dataRows) //foreach (var dataRow in dataRows)
{ //{
subRoleItems.Add("'" + dataRow.ModuleName.ToString() + "'"); // subRoleItems.Add("'" + dataRow.ModuleName.ToString() + "'");
} //}
// get the affected Department // get the approvers
qryString.Clear(); qryString.Clear();
qryString.Append("SELECT SubRoleCategoryItem FROM SubRoleCategory S INNER JOIN ECNAffectedDepartment AD ON S.SubRoleCategoryID = AD.DepartmentID WHERE AD.ECNNumber= @ECNNumber"); qryString.Append("SELECT SubRoleCategoryItem FROM SubRoleCategory S INNER JOIN ECNAffectedDepartment AD ON S.SubRoleCategoryID = AD.DepartmentID WHERE AD.ECNNumber= @ECNNumber");
dataRows = this.db.Query<dynamic>(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList(); var dataRows = this.db.Query<dynamic>(qryString.ToString(), new { ECNNumber = ecnNumber }).ToList();
foreach (var dataRow in dataRows) foreach (var dataRow in dataRows)
{ {
subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'"); subRoleItems.Add("'" + dataRow.SubRoleCategoryItem.ToString() + "'");

2
Fab2ApprovalSystem/Views/ECN/ECNPdf.cshtml
View File

@ -151,7 +151,7 @@
</font> </font>
<font size="1"> <font size="1">
@Convert.ToString(string.Format("{0:dd/MM/yyyy}", @Model.ExtensionDate)) @Convert.ToString(string.Format("{0:MM/dd/yyyy}", @Model.ExtensionDate))
</font> </font>
</td> </td>
<td> <td>