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

1. 工單資料 上傳檔案加入檔案下載功能

PTD
ray 2 years ago
parent
4f9d9a02b9
commit
d105cabda8
5 changed files with 172 additions and 106 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. 40
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 50
      AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
  3. 86
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  4. 98
      AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
  5. 2
      AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

40
AMESCoreStudio.Web/Controllers/PCSController.cs
View File

@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.StaticFiles;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -26,7 +27,6 @@ using ClosedXML.Excel;
namespace AMESCoreStudio.Web.Controllers namespace AMESCoreStudio.Web.Controllers
{ {
public class PCSController : Controller public class PCSController : Controller
{ {
@ -2961,6 +2961,42 @@ namespace AMESCoreStudio.Web.Controllers
} }
} }
/// <summary>
/// 檔案下載
/// </summary>
/// <param name="Path">路徑</param>
/// <param name="FileName">檔名</param>
/// <returns></returns>
public async Task<IActionResult> FileDownload(string Path, string FileName)
{
var path = $@"{_env.WebRootPath}\{Path}{FileName}";
var memoryStream = new MemoryStream();
using (var stream = new FileStream(path, FileMode.Open))
{
await stream.CopyToAsync(memoryStream);
}
memoryStream.Seek(0, SeekOrigin.Begin);
string contentType = await GetFileContentTypeAsync(FileName);
// 回傳檔案到 Client 需要附上 Content Type，否則瀏覽器會解析失敗。
return File(memoryStream, contentType, FileName);
}
/// <summary>
/// 获取文件ContentType
/// </summary>
/// <param name="fileName">文件名称</param>
/// <returns></returns>
public async static Task<string> GetFileContentTypeAsync(string fileName)
{
return await Task.Run(() =>
{
string suffix = Path.GetExtension(fileName);
var provider = new FileExtensionContentTypeProvider();
var contentType = provider.Mappings[suffix];
return contentType;
});
}
#region PCS034 工單投產可修改 #region PCS034 工單投產可修改
public async Task<IActionResult> PCS034(int id) public async Task<IActionResult> PCS034(int id)
{ {
@ -7618,7 +7654,7 @@ namespace AMESCoreStudio.Web.Controllers
} }
private async Task<Result> PCS0311inhouse(string InhouseNo, string boxNo, int seq, string recordNumber,string locationNo) private async Task<Result> PCS0311inhouse(string InhouseNo, string boxNo, int seq, string recordNumber, string locationNo)
{ {
/* 1.依barcodeinfo 查詢 該箱號所屬序號 /* 1.依barcodeinfo 查詢 該箱號所屬序號
* 2.查詢所有序號查詢該流程 是否為最後一個流程(入庫)，即在可入庫狀態 * 2.查詢所有序號查詢該流程 是否為最後一個流程(入庫)，即在可入庫狀態

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

@ -471,18 +471,12 @@
<label class="layui-form-label">DIP</label> <label class="layui-form-label">DIP</label>
<div class="layui-input-block"> <div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox> <cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
@(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
} type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" /> <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />
<input @if (Model.wipBoard != null) {
@(Model.wipBoard.DipTape == "Y" ? "checked" : "")
} type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
<input @if (Model.wipBoard != null) {
@(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "")
} type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />
@*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" /> @*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
<input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" /> <input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@ <input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
</div> </div>
</div> </div>
</div> </div>
@ -498,9 +492,7 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">燒錄</label> <label class="layui-form-label">燒錄</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input @if (Model.wipBoard != null) { <input @if (Model.wipBoard != null) { @(Model.wipBoard.Burn == "Y" ? "checked" : "") } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
@(Model.wipBoard.Burn == "Y" ? "checked" : "")
} type="checkbox" title="是否燒入" name="wipBoard.Burn" />
@*<input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />*@ @*<input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />*@
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
@ -522,9 +514,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<input @if (Model.wipBoard != null) { <input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
@(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "")
} type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">零件烘烤溫度</label> <label class="layui-form-label">零件烘烤溫度</label>
@ -853,9 +843,7 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">FINE_PACKAGE</label> <label class="layui-form-label">FINE_PACKAGE</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="checkbox" title="是否為精裝" @if (Model.wipSystem != null) { <input type="checkbox" title="是否為精裝" @if (Model.wipSystem != null) { @(Model.wipSystem.FinePackage == "Y" ? "checked" : "") } />
@(Model.wipSystem.FinePackage == "Y" ? "checked" : "")
} />
</div> </div>
</div> </div>
@ -966,8 +954,8 @@
@index.SOPName @index.SOPName
</td> </td>
@*<td> @*<td>
@index.SOPPath @index.SOPPath
</td>*@ </td>*@
<td> <td>
@index.SOPTypeName @index.SOPTypeName
</td> </td>
@ -1027,13 +1015,15 @@
@* 上傳資料sheet *@ @* 上傳資料sheet *@
<div class="layui-tab-item"> <div class="layui-tab-item">
<span style="color:red">**預覽只能顯示圖檔、PDF、文字檔**</span>
<div class="layui-form-item"> <div class="layui-form-item">
<table lay-filter="demo" class="layui-table"> <table lay-filter="demo" class="layui-table">
<thead> <thead>
<tr> <tr>
<th lay-data="{field:'username', width:100}">檔案名稱</th> <th lay-data="{field:'username'}">檔案名稱</th>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th> <th lay-data="{field:'experience', sort:true}">檔案路徑</th>
<th lay-data="{field:'right', width:80, sort:true}">預覽</th> <th lay-data="{field:'right', width:80, sort:true}">預覽</th>
<th lay-data="{field:'right', width:80, sort:true}">下載</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -1049,6 +1039,9 @@
<td> <td>
<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a> <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a>
</td> </td>
<td>
<a class="layui-btn layui-btn-normal layui-btn-xs" onclick="filedownload(this)">下載</a>
</td>
</tr> </tr>
} }
</tbody> </tbody>
@ -1136,6 +1129,15 @@
}); });
}; };
// 檔案下載
function filedownload(obj) {
var Path = $(obj).closest("TR").find('span[id*=Filepath]').text();
var FileName = $(obj).closest("TR").find('span[id*=FileName]').text();
filePath = `/PCS/FileDownload?Path=${Path}&FileName=${FileName}`;
console.log(filePath);
$(obj).attr("href", filePath);
};
var tableCols = [[ var tableCols = [[
{ {
field: 'unitName', field: 'unitName',

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

@ -1043,47 +1043,52 @@
</div> </div>
@* 上傳資料sheet *@ @* 上傳資料sheet *@
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-form-item"> <span style="color:red">**預覽只能顯示圖檔、PDF、文字檔**</span>
<table lay-filter="demo" class="layui-table"> <div class="layui-form-item">
<thead> <table lay-filter="demo" class="layui-table">
<thead>
<tr>
<th lay-data="{field:'username'}">檔案名稱</th>
<th lay-data="{field:'experience', sort:true}">檔案路徑</th>
<th lay-data="{field:'right', width:80, sort:true}">預覽</th>
<th lay-data="{field:'right', width:80, sort:true}">下載</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipInfoBlobs)
{
<tr> <tr>
<th lay-data="{field:'username', width:100}">檔案名稱</th> <td>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th> <span id="FileName">@index.ImageName</span>
<th lay-data="{field:'right', width:80, sort:true}">預覽</th> </td>
<td>
<span id="Filepath">@index.Filepath</span>
</td>
<td>
<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a>
</td>
<td>
<a class="layui-btn layui-btn-normal layui-btn-xs" onclick="filedownload(this)">下載</a>
</td>
</tr> </tr>
</thead> }
<tbody> </tbody>
@foreach (var index in Model.wipInfoBlobs) </table>
{ </div>
<tr> <div class="layui-form-item">
<td> <div class="layui-inline">
<span id="FileName">@index.ImageName</span> <label class="layui-form-label" asp-for="wipInfoBlob.ImageName">檔案</label>
</td> <label class="layui-btn">
<td> <input type="file" name="formFile">
<span id="Filepath">@index.Filepath</span>
</td> @*<i class="layui-icon">&#xe67c;</i>上傳文件*@
<td> </label>
<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a> <input type="hidden" asp-for="wipInfoBlob.ImageName">
</td>
</tr>
}
</tbody>
</table>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipInfoBlob.ImageName">檔案</label>
<label class="layui-btn">
<input type="file" name="formFile">
@*<i class="layui-icon">&#xe67c;</i>上傳文件*@
</label>
<input type="hidden" asp-for="wipInfoBlob.ImageName">
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span> <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
@ -1369,6 +1374,15 @@
}); });
}; };
// 檔案下載
function filedownload(obj) {
var Path = $(obj).closest("TR").find('span[id*=Filepath]').text();
var FileName = $(obj).closest("TR").find('span[id*=FileName]').text();
filePath = `/PCS/FileDownload?Path=${Path}&FileName=${FileName}`;
console.log(filePath);
$(obj).attr("href", filePath);
};
function getFlowRuleList(data) function getFlowRuleList(data)
{ {
$.ajax( $.ajax(

98
AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
View File

@ -25,9 +25,9 @@
<input asp-for="wipInfo.WipID" type="hidden" value="@Model.wipInfo.WipID" /> <input asp-for="wipInfo.WipID" type="hidden" value="@Model.wipInfo.WipID" />
<input asp-for="wipInfo.UnitNO" type="hidden" value="@Model.wipInfo.UnitNO" /> <input asp-for="wipInfo.UnitNO" type="hidden" value="@Model.wipInfo.UnitNO" />
<input asp-for="wipInfo.WipNO" type="hidden" value="@Model.wipInfo.WipNO" /> <input asp-for="wipInfo.WipNO" type="hidden" value="@Model.wipInfo.WipNO" />
@* <input asp-for="wipInfo.PlanQTY" type="hidden" value="@Model.wipInfo.PlanQTY" />*@ @* <input asp-for="wipInfo.PlanQTY" type="hidden" value="@Model.wipInfo.PlanQTY" />*@
<input asp-for="wipInfo.WipType" type="hidden" value="@Model.wipInfo.WipType" /> <input asp-for="wipInfo.WipType" type="hidden" value="@Model.wipInfo.WipType" />
@* <input asp-for="wipInfo.FlowRuleID" type="hidden" value="@Model.wipInfo.FlowRuleID" />*@ @* <input asp-for="wipInfo.FlowRuleID" type="hidden" value="@Model.wipInfo.FlowRuleID" />*@
<input asp-for="wipAtt.ItemNO" type="hidden" value="@Model.wipAtt.ItemNO" /> <input asp-for="wipAtt.ItemNO" type="hidden" value="@Model.wipAtt.ItemNO" />
<input asp-for="wipBarcodeOther.OtherID" type="hidden" value="@if(Model.wipBarcodeOther != null){ @Model.wipBarcodeOther.OtherID }" /> <input asp-for="wipBarcodeOther.OtherID" type="hidden" value="@if(Model.wipBarcodeOther != null){ @Model.wipBarcodeOther.OtherID }" />
<input asp-for="wipMAC.WipNO" type="hidden" value="@if(Model.wipMAC != null){ @Model.wipMAC.WipNO }" /> <input asp-for="wipMAC.WipNO" type="hidden" value="@if(Model.wipMAC != null){ @Model.wipMAC.WipNO }" />
@ -941,8 +941,8 @@
SOP文件敘述 SOP文件敘述
</th> </th>
@*<th> @*<th>
檔案路徑 檔案路徑
</th>*@ </th>*@
<th> <th>
SOP類型 SOP類型
</th> </th>
@ -963,8 +963,8 @@
<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPName" name="WipSops[@i].SOPName" /> <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPName" name="WipSops[@i].SOPName" />
</td> </td>
@*<td> @*<td>
<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPPath" name="WipSops[@i].SOPPath" /> <input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPPath" name="WipSops[@i].SOPPath" />
</td>*@ </td>*@
<td> <td>
<select asp-for="@index.SOPType" name="WipSops[@i].SOPType" asp-items="@ViewBag.GetSOPTypeSelect" class=""></select> <select asp-for="@index.SOPType" name="WipSops[@i].SOPType" asp-items="@ViewBag.GetSOPTypeSelect" class=""></select>
</td> </td>
@ -1031,47 +1031,52 @@
</div> </div>
@* 上傳資料sheet *@ @* 上傳資料sheet *@
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-form-item"> <span style="color:red">**預覽只能顯示圖檔、PDF、文字檔**</span>
<table lay-filter="demo" class="layui-table"> <div class="layui-form-item">
<thead> <table lay-filter="demo" class="layui-table">
<thead>
<tr>
<th lay-data="{field:'username', width:100}">檔案名稱</th>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
<th lay-data="{field:'right', width:80, sort:true}">預覽</th>
<th lay-data="{field:'right', width:80, sort:true}">下載</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipInfoBlobs)
{
<tr> <tr>
<th lay-data="{field:'username', width:100}">檔案名稱</th> <td>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th> <span id="FileName">@index.ImageName</span>
<th lay-data="{field:'right', width:80, sort:true}">預覽</th> </td>
<td>
<span id="Filepath">@index.Filepath</span>
</td>
<td>
<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a>
</td>
<td>
<a class="layui-btn layui-btn-normal layui-btn-xs" onclick="filedownload(this)">下載</a>
</td>
</tr> </tr>
</thead> }
<tbody> </tbody>
@foreach (var index in Model.wipInfoBlobs) </table>
{ </div>
<tr> <div class="layui-form-item">
<td> <div class="layui-inline">
<span id="FileName">@index.ImageName</span> <label class="layui-form-label" asp-for="wipInfoBlob.ImageName">檔案</label>
</td> <label class="layui-btn">
<td> <input type="file" name="formFile">
<span id="Filepath">@index.Filepath</span>
</td> @*<i class="layui-icon">&#xe67c;</i>上傳文件*@
<td> </label>
<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a> <input type="hidden" asp-for="wipInfoBlob.ImageName">
</td>
</tr>
}
</tbody>
</table>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipInfoBlob.ImageName">檔案</label>
<label class="layui-btn">
<input type="file" name="formFile">
@*<i class="layui-icon">&#xe67c;</i>上傳文件*@
</label>
<input type="hidden" asp-for="wipInfoBlob.ImageName">
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span> <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
@ -1311,6 +1316,15 @@
}); });
}; };
// 檔案下載
function filedownload(obj) {
var Path = $(obj).closest("TR").find('span[id*=Filepath]').text();
var FileName = $(obj).closest("TR").find('span[id*=FileName]').text();
filePath = `/PCS/FileDownload?Path=${Path}&FileName=${FileName}`;
console.log(filePath);
$(obj).attr("href", filePath);
};
function getFlowRuleList(data) function getFlowRuleList(data)
{ {
$.ajax( $.ajax(

2
AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
View File

@ -736,7 +736,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
q = q.Where(w => w.factoryNo == value.factoryno); q = q.Where(w => w.factoryNo == value.factoryno);
} }
q.Take(1000);
// 紀錄筆數 // 紀錄筆數
result.DataTotal = q.Count(); result.DataTotal = q.Count();

Write Preview
Loading…
Cancel
Save