JHSYS
/
AMES
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1. 修正生產履歷顯示錯誤 

2. 工單修改 KeyParts新增自動給順序 燒機時間顯示'分'
3. 修正登入後首頁選單全開問題
PTD
ray 3 years ago
parent
07fc902d8f
commit
452b336bab
5 changed files with 48 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      AMESCoreStudio.Web/Controllers/HomeController.cs
  2. 19
      AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
  3. 20
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  4. 40
      AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
  5. 8
      AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs

6
AMESCoreStudio.Web/Controllers/HomeController.cs
View File

@ -81,10 +81,10 @@ namespace AMESCoreStudio.Web.Controllers
if (user_module.Module != null) if (user_module.Module != null)
{ {
menuData = menuData + "<a class='border active'>"; menuData = menuData + "<a class=''>";
menuData = menuData + "<i class='fa fa-star fa-fw' style='color:#77B272;'></i><cite style='color:#77B272;'> " + user_module.Module.ModuleName + " </cite><i class='fa fa-angle-up fa-fw nav_right'></i>"; menuData = menuData + "<i class='fa fa-star fa-fw' style='color:#77B272;'></i><cite style='color:#77B272;'> " + user_module.Module.ModuleName + " </cite><i class='fa fa-angle-down fa-fw nav_right'></i>";
menuData = menuData + "</a>"; menuData = menuData + "</a>";
menuData = menuData + "<ul class='sub-menu' style='display: block;'>"; menuData = menuData + "<ul class='sub-menu' style='display: none;'>";
} }
foreach (var user_program in userProgram.Data) foreach (var user_program in userProgram.Data)

19
AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
View File

@ -666,7 +666,7 @@
<div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;"> <div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;">
@if (!string.IsNullOrWhiteSpace(Model.itemNoCT1)) @if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
{ {
<span style="color:red">標準工時:@Model.itemNoCT1 秒/個 </span> <span style="color:red">標準工時:@Model.itemNoCT1 分/個 </span>
} }
else else
{ {
@ -698,18 +698,15 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<div class="layui-input-inline"> <label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
<label asp-for="wipSystem.BiRatio" class="layui-form-label"></label> <div class="layui-input-block">
<div class="layui-input-block"> <input asp-for="wipSystem.BiRatio" class="layui-input" />
<input asp-for="wipSystem.BiRatio" class="layui-input" />
</div>
</div> </div>
<div class="layui-input-inline"> <label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
<label asp-for="wipSystem.BiTime" class="layui-form-label"></label> <div class="layui-input-block">
<div class="layui-input-block"> <input asp-for="wipSystem.BiTime" class="layui-input" />
<input asp-for="wipSystem.BiTime" class="layui-input" />
</div>
</div> </div>
<div class="layui-form-mid layui-word-aux">分</div>
<label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label> <label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-inline" style="width:150px;"> <div class="layui-input-inline" style="width:150px;">
<input asp-for="wipSystem.BiTemperature" class="layui-input" /> <input asp-for="wipSystem.BiTemperature" class="layui-input" />

20
AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
View File

@ -697,7 +697,7 @@
<div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;"> <div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;">
@if (!string.IsNullOrWhiteSpace(Model.itemNoCT1)) @if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
{ {
<span style="color:red">標準工時:@Model.itemNoCT1 秒/個 </span> <span style="color:red">標準工時:@Model.itemNoCT1 分/個 </span>
} }
else else
{ {
@ -729,18 +729,18 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<label asp-for="wipSystem.BiRatio" class="layui-form-label"></label> <input style="background-color: #acdbe36b" asp-for="wipSystem.BiRatio" class="layui-input" />
<div class="layui-input-block">
<input style="background-color: #acdbe36b" asp-for="wipSystem.BiRatio" class="layui-input" />
</div>
</div> </div>
<label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<label asp-for="wipSystem.BiTime" class="layui-form-label"></label> <input asp-for="wipSystem.BiTime" class="layui-input" />
<div class="layui-input-block">
<input asp-for="wipSystem.BiTime" class="layui-input" />
</div>
</div> </div>
<div class="layui-form-mid layui-word-aux">分</div>
<label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label> <label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-inline" style="width:150px;"> <div class="layui-input-inline" style="width:150px;">
<select asp-for="wipSystem.BiTemperature" asp-items="@ViewBag.GetWipBITemperatuerSelect" class=""></select> <select asp-for="wipSystem.BiTemperature" asp-items="@ViewBag.GetWipBITemperatuerSelect" class=""></select>
@ -1479,7 +1479,7 @@
'<td><input type="hidden" value="" name="WipKps[' + No + '].WipKpID" />' + '<td><input type="hidden" value="" name="WipKps[' + No + '].WipKpID" />' +
'<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpName" /></td>' + '<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpName" /></td>' +
'<td>'+SelectKPNo+'</td>' + '<td>'+SelectKPNo+'</td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpSeq" /></td>' + '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpSeq" value=' + (No+1)+' /></td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Title" /></td>' + '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Title" /></td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Length" /></td>' + '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Length" /></td>' +
'<td>' + Select + '</td>' + '<td>' + Select + '</td>' +

40
AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
View File

@ -253,23 +253,26 @@
<tbody> <tbody>
@foreach (var index in Model.BarCodeKPs) @foreach (var index in Model.BarCodeKPs)
{ {
<tr> <tr>
<td> <td>
@index.StationName @index.StationName
</td> </td>
<td> <td>
@index.ItemNoName @index.ItemNoName
</td> </td>
<td> <td>
@index.PartNo @index.PartNo
</td> </td>
<td> <td>
@index.KpItemNo @index.KpItemNo
</td> </td>
<td> <td>
@index.CreateDate.ToString("yyyy/MM/dd HH:mm:ss") @index.CreateUser
</td> </td>
</tr> <td>
@index.CreateDate.ToString("yyyy/MM/dd HH:mm:ss")
</td>
</tr>
} }
</tbody> </tbody>
</table> </table>
@ -317,6 +320,9 @@
<td> <td>
@index.LocationNo @index.LocationNo
</td> </td>
<td>
@index.RepairNo
</td>
<td> <td>
@index.Status @index.Status
</td> </td>

8
AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
View File

@ -147,9 +147,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
join q5 in _context.NgRepairs on q3.ComponentID equals q5.ComponentID join q5 in _context.NgRepairs on q3.ComponentID equals q5.ComponentID
into s1 into s1
from q5 in s1.DefaultIfEmpty() from q5 in s1.DefaultIfEmpty()
join q6 in _context.RMAReasons on q5.RepairNo equals q6.RMAReasonNo join q6 in _context.RMAReasons on q5.RepairNo equals q6.RMAReasonNo into s2
into s2
from q6 in s2.DefaultIfEmpty() from q6 in s2.DefaultIfEmpty()
join q7 in _context.UserInfoes on q3.ReplyUserID equals q7.UserID
select new NGInfoDto select new NGInfoDto
{ {
StationName = q2.Station.StationName, StationName = q2.Station.StationName,
@ -160,11 +160,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
RepairNo = q5.RepairNo, RepairNo = q5.RepairNo,
RepairDesc = q5.RepairDesc, RepairDesc = q5.RepairDesc,
RepairNoDesc = q6.RMAReasonDesc, RepairNoDesc = q6.RMAReasonDesc,
ReplyUser = q3.ReplyUserID.ToString(), ReplyUser = q7.UserName,
ReplyDate = q3.ReplyDate.ToString("yyyy/MM/dd") ReplyDate = q3.ReplyDate.ToString("yyyy/MM/dd")
}; };
return await q.ToListAsync(); return await q.Distinct().ToListAsync();
} }
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save