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

1. 工單加入檔案上傳功能

PTD
ray 3 years ago
parent
404df3147e
commit
e5942452ad
11 changed files with 906 additions and 556 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 11
      AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
  3. 8
      AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
  4. 8
      AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
  5. 718
      AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
  6. 437
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  7. 3
      AMESCoreStudio.WebApi/Controllers/AMES/WipBoardController.cs
  8. 123
      AMESCoreStudio.WebApi/Controllers/AMES/WipInfoBlobController.cs
  9. 29
      AMESCoreStudio.WebApi/Controllers/AMES/WipSystemController.cs
  10. 82
      AMESCoreStudio.WebApi/Models/AMES/WipInfoBlob.cs
  11. 6
      AMESCoreStudio.WebApi/Models/AMESContext.cs

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

@ -1502,6 +1502,8 @@ namespace AMESCoreStudio.Web.Controllers
model.WipOutfits = await _pcsApi.GetWipOutfitByWipNo(model.wipInfo.WipNO);
model.WipSops = await _pcsApi.GetWipSopByWipNo(model.wipInfo.WipNO);
model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipID);
}
await GetItemsList();
await GetProductType();
@ -1587,6 +1589,8 @@ namespace AMESCoreStudio.Web.Controllers
model.WipOutfits = await _pcsApi.GetWipOutfitByWipNo(model.wipInfo.WipNO);
model.WipSops = await _pcsApi.GetWipSopByWipNo(model.wipInfo.WipNO);
model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipID);
}
await GetItemsList();
await GetProductType();
@ -1616,7 +1620,7 @@ namespace AMESCoreStudio.Web.Controllers
return View(model);
}
[HttpPost]
public async Task<IActionResult> PCS003Async(WipDataViewModel model, string action)
public async Task<IActionResult> PCS003Async(WipDataViewModel model, string action, IFormFile formFile)
{
#region 選單
@ -1855,6 +1859,37 @@ namespace AMESCoreStudio.Web.Controllers
else
await _pcsApi.PutWipSop(JsonConvert.SerializeObject(item));
}
// 檔案上傳
string FileName = string.Empty;
string NewName = string.Empty;
string FilePath = string.Empty;
//var fileProvider = _fileServerProvider.GetProvider("/aa");
//var fileInfo = fileProvider.GetFileInfo("/");
if (formFile != null)
{
if (formFile.Length > 0)
{
//取得使用者上傳檔案的原始檔名
FileName = Path.GetFileName(formFile.FileName);
//取原始檔名中的副檔名
var fileExt = Path.GetExtension(FileName);
//為避免使用者上傳的檔案名稱發生重複，重新給一個亂數名稱
NewName = Path.GetRandomFileName() + fileExt;
//指定要寫入的路徑、檔名和副檔名
FilePath = $"\\PDF\\";//本機目錄
using (var stream = new FileStream(_env.WebRootPath + FilePath + FileName, FileMode.Create))
{
await formFile.CopyToAsync(stream);
}
model.wipInfoBlob.WipID = model.wipInfo.WipID;
model.wipInfoBlob.ImageName = FileName;
model.wipInfoBlob.Filepath = FilePath;
result = await _pcsApi.PostWipInfoBlob(JsonConvert.SerializeObject(model.wipInfoBlob));
}
}
}

11
AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
View File

@ -989,5 +989,16 @@ namespace AMESCoreStudio.Web
ITask<ResultModel<WipCheck>> PutWipCheckByPMC([FromBody, RawJsonContent] string model);
#endregion
#region WipInfoBlob 工單上傳圖檔資料表
[WebApiClient.Attributes.HttpPut("api/WipInfoBlob")]
ITask<ResultModel<WipInfoBlob>> PutWipInfoBlob([FromBody, RawJsonContent] string model);
[WebApiClient.Attributes.HttpPost("api/WipInfoBlob")]
ITask<ResultModel<WipInfoBlob>> PostWipInfoBlob([FromBody, RawJsonContent] string model);
[WebApiClient.Attributes.HttpGet("api/WipInfoBlob/{id}")]
ITask<List<WipInfoBlob>> GetWipInfoBlob(int id);
#endregion
}
}

8
AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
View File

@ -19,6 +19,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
Outfits = new List<MaterialOutfit>();
WipSops = new List<WipSopDto>();
WipOutfits = new List<WipOutfitDto>();
wipInfoBlobs = new List<WipInfoBlob>();
wipMAC = new WipMAC();
wipBarcodeOther = new WipBarcodeOther();
@ -58,6 +59,8 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
public IEnumerable<MaterialOutfit> Outfits { get; set; }
public IEnumerable<WipInfoBlob> wipInfoBlobs { get; set; }
/// <summary>
///
/// </summary>
@ -77,6 +80,11 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
/// 條碼區間設定
/// </summary>
public WipBarcodeOther wipBarcodeOther { get; set; }
/// <summary>
/// 工單圖檔資料
/// </summary>
public WipInfoBlob wipInfoBlob { get; set; }
}
public class WipDataViewModel : WipNoDetailViewModel

8
AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
View File

@ -340,11 +340,9 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
</div>
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
</div>
</div>

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

@ -148,14 +148,15 @@
<div class="layui-tab layui-tab-brief">
<ul class="layui-tab-title">
<li class="layui-this">工單屬性</li>
<li>生產流程</li>
<li>序號編碼</li>
<li>Keypart組合</li>
<li>治具組合</li>
<li>生產流程</li>
<li id="board">板卡-工程資訊</li>
<li id="system">系統-工程資訊</li>
<li>標籤選項</li>
<li>治具組合</li>
<li>SOP文件</li>
<li>標籤選項</li>
<li>上傳檔案</li>
</ul>
<div class="layui-tab-content">
@* 工單屬性sheet *@
@ -223,129 +224,70 @@
</div>
@* 生產流程sheet *@
@* 序號編碼sheet *@
<div class="layui-tab-item">
<label class="layui-form-label">生產序號</label>
<table id="MydataTable" class="layui-table">
<thead>
<tr>
<th>
起始生產序號
</th>
<th>
結束生產序號
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipBarcodes)
{
<tr>
<td>
@index.StartNO
</td>
<td>
@index.EndNO
</td>
</tr>
}
</tbody>
</table>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipInfo.FlowRuleID" class="layui-form-label"></label>
<label class="layui-form-label">出貨序號</label>
<div class="layui-input-inline">
<select disabled lay-filter="flow" asp-for="wipInfo.FlowRuleID" asp-items="@ViewBag.FlowRuleList" class=""></select>
<input asp-for="wipBarcodeOther.StartNO" class="layui-input" />
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline">
<input asp-for="wipBarcodeOther.EndNO" class="layui-input" />
</div>
<input id="flowId" type="hidden" name="flowId" value="" />
</div>
<div class="layui-inline">
<input asp-for="wipInfo.SFISFlowCk" type="checkbox" title="途程確認" />
</div>
<table id="rulestionOld" class="layui-table">
<thead>
<tr>
<th>
生產單位
</th>
<th>
流程名稱
</th>
<th>
站別描述
</th>
<th>
站別順序
</th>
<th>
站別類型
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.ruleStations)
{
<tr>
<td>
@index.UnitNoName
</td>
<td>
@index.FlowRuleName
</td>
<td>
@index.StationDesc
</td>
<td>
@index.Sequence
</td>
<td>
@index.StationType
</td>
</tr>
}
</tbody>
</table>
</div>
</div>
@* 序號編碼sheet *@
<div class="layui-tab-item">
<label class="layui-form-label">生產序號</label>
<table id="MydataTable" class="layui-table">
<thead>
<tr>
<th>
起始生產序號
</th>
<th>
結束生產序號
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipBarcodes)
{
<tr>
<td>
@index.StartNO
</td>
<td>
@index.EndNO
</td>
</tr>
}
</tbody>
</table>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">出貨序號</label>
<div class="layui-input-inline">
<input asp-for="wipBarcodeOther.StartNO" class="layui-input" />
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline">
<input asp-for="wipBarcodeOther.EndNO" class="layui-input" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">MAC</label>
<div class="layui-input-inline">
<input asp-for="wipMAC.StartNO" class="layui-input" />
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline">
<input asp-for="wipMAC.EndNO" class="layui-input" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">MAC</label>
<div class="layui-input-inline">
<input asp-for="wipMAC.StartNO" class="layui-input" />
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline">
<input asp-for="wipMAC.EndNO" class="layui-input" />
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input asp-for="wipBarcode.Remarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input asp-for="wipBarcode.Remarks" class="layui-input" type="text" />
</div>
</div>
</div>
@* Keypart組合sheet *@
<div class="layui-tab-item">
<table id="MydataTable" class="layui-table">
@ -406,278 +348,301 @@
</table>
</div>
@* 治具組合sheet *@
@* 生產流程sheet *@
<div class="layui-tab-item">
<table id="MydataTable" class="layui-table">
@{ int j = 0;}
<thead>
<tr>
<th>
設備編碼
</th>
<th>
設備名稱
</th>
<th>
生產單位
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.WipOutfits)
{
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipInfo.FlowRuleID" class="layui-form-label"></label>
<div class="layui-input-inline">
<select disabled lay-filter="flow" asp-for="wipInfo.FlowRuleID" asp-items="@ViewBag.FlowRuleList" class=""></select>
</div>
<input id="flowId" type="hidden" name="flowId" value="" />
</div>
<div class="layui-inline">
<input type="checkbox" title="途程確認" @(Model.wipInfo.SFISFlowCk == "Y" ? "checked" : "") />
</div>
<table id="rulestionOld" class="layui-table">
<thead>
<tr>
<td>
@index.OutfitNo
</td>
<td>
@index.PartNo
</td>
<td>
@index.UnitNoName
</td>
<th>
生產單位
</th>
<th>
流程名稱
</th>
<th>
站別描述
</th>
<th>
站別順序
</th>
<th>
站別類型
</th>
</tr>
j++;
}
</tbody>
</table>
</thead>
<tbody>
@foreach (var index in Model.ruleStations)
{
<tr>
<td>
@index.UnitNoName
</td>
<td>
@index.FlowRuleName
</td>
<td>
@index.StationDesc
</td>
<td>
@index.Sequence
</td>
<td>
@index.StationType
</td>
</tr>
}
</tbody>
</table>
</div>
</div>
@* 板卡-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer" onchange="getUserName(this);" />
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer" onchange="getUserName(this);" />
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點紅膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點紅膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">SMD點紅膠備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-form-item">
<label class="layui-form-label">SMD點紅膠備註</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SmdSMRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">DIP</label>
<div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
<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.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
<input asp-for="wipBoard.SmdSMRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">DIP備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.DipRemarks" class="layui-input" type="text" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">燒錄</label>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.Burn == "Y" ? "checked" : "") } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
@*<input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />*@
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BurnLocation" class="layui-form-label"></label>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">DIP</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnLocation" class="layui-input" />
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
<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.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">燒錄備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">DIP備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.DipRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">燒錄</label>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.Burn == "Y" ? "checked" : "") } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
@*<input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />*@
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BurnLocation" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnLocation" class="layui-input" />
</div>
</div>
<label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤時間</label>
<div class="layui-form-item">
<label class="layui-form-label">燒錄備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeTime" class="layui-input" />
<span asp-validation-for="wipBoard.PartsBakeTime" class="layui-bg-red"></span>
<input asp-for="wipBoard.BurnRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">零件烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤時間</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeTime" class="layui-input" />
<span asp-validation-for="wipBoard.PartsBakeTime" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB烘烤</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
<div class="layui-form-item">
<label class="layui-form-label">零件烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbBakeRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB烘烤</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.SolderPaste"></label>
<div class="layui-form-item">
<label class="layui-form-label">PCB烘烤備註</label>
<div class="layui-input-block">
<select disabled asp-items="@ViewBag.GetSolderPasteSelect" asp-for="wipBoard.SolderPaste"></select>
<input asp-for="wipBoard.PcbBakeRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">錫膏備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SolderPasteRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.SolderPaste"></label>
<div class="layui-input-block">
<select disabled asp-items="@ViewBag.GetSolderPasteSelect" asp-for="wipBoard.SolderPaste"></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB加工</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPCBProcessingTypeSelect" asp-for="wipBoard.PcbProcessing" class=""></select>
<div class="layui-form-item">
<label class="layui-form-label">錫膏備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SolderPasteRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB加工備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbProcessingRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB加工</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPCBProcessingTypeSelect" asp-for="wipBoard.PcbProcessing" class=""></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
<label asp-for="wipBoard.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRatio" class="layui-input" />
<span asp-validation-for="wipBoard.BiRatio" class="layui-bg-red"></span>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB加工備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbProcessingRemarks" class="layui-input" type="text" />
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTemperature" class="layui-input" />
<span asp-validation-for="wipBoard.BiTemperature" class="layui-bg-red"></span>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
<label asp-for="wipBoard.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRatio" class="layui-input" />
<span asp-validation-for="wipBoard.BiRatio" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTime" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTime" class="layui-input" />
<span asp-validation-for="wipBoard.BiTime" class="layui-bg-red"></span>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTemperature" class="layui-input" />
<span asp-validation-for="wipBoard.BiTemperature" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTime" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTime" class="layui-input" />
<span asp-validation-for="wipBoard.BiTime" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">燒機備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">燒機備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.BiosVer" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.BiosVer" class="layui-input" placeholder="請輸入BIOS" />
<span asp-validation-for="wipBoard.BiosVer" class="layui-bg-red"></span>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.BiosVer" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.BiosVer" class="layui-input" placeholder="請輸入BIOS" />
<span asp-validation-for="wipBoard.BiosVer" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">BIOS備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiosRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">BIOS備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiosRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.Checksum" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.Checksum" class="layui-input" placeholder="請輸入Checksum" />
<span asp-validation-for="wipBoard.Checksum" class="layui-bg-red"></span>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.Checksum" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.Checksum" class="layui-input" placeholder="請輸入Checksum" />
<span asp-validation-for="wipBoard.Checksum" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">Check Sum備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.CsRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">Check Sum備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.CsRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
</div>
@* 系統-工程資訊sheet *@
<div class="layui-tab-item">
@ -844,6 +809,81 @@
</div>
</div>
@* 治具組合sheet *@
<div class="layui-tab-item">
<table id="MydataTable" class="layui-table">
@{ int j = 0;}
<thead>
<tr>
<th>
設備編碼
</th>
<th>
設備名稱
</th>
<th>
生產單位
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.WipOutfits)
{
<tr>
<td>
@index.OutfitNo
</td>
<td>
@index.PartNo
</td>
<td>
@index.UnitNoName
</td>
</tr>
j++;
}
</tbody>
</table>
</div>
@* SOP文件 sheet *@
<div class="layui-tab-item" lay-filter="test2">
<table class="layui-hide" id="query" lay-filter="query"></table>
<table lay-filter="demo" class="layui-table">
@{ int l = 0;}
<thead>
<tr>
<th lay-data="{field:'username', width:100}">SOP文件敘述</th>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
<th lay-data="{field:'sign'}">SOP類型</th>
<th lay-data="{field:'sign'}">生產單位</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.WipSops)
{
<tr>
<td>
@index.SOPName
</td>
<td>
@index.SOPPath
</td>
<td>
@index.SOPTypeName
</td>
<td>
@index.UnitNoName
</td>
</tr>
l++;
}
</tbody>
</table>
</div>
@* 標籤選項sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
@ -887,43 +927,33 @@
</div>
</div>
@* SOP文件 sheet *@
<div class="layui-tab-item" lay-filter="test2">
<table class="layui-hide" id="query" lay-filter="query"></table>
<table lay-filter="demo" class="layui-table">
@{ int l = 0;}
<thead>
<tr>
<th lay-data="{field:'username', width:100}">SOP文件敘述</th>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
<th lay-data="{field:'sign'}">SOP類型</th>
<th lay-data="{field:'sign'}">生產單位</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.WipSops)
{
@* 上傳資料sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<table lay-filter="demo" class="layui-table">
<thead>
<tr>
<td>
@index.SOPName
</td>
<td>
@index.SOPPath
</td>
<td>
@index.SOPTypeName
</td>
<td>
@index.UnitNoName
</td>
<th lay-data="{field:'username', width:100}">檔案名稱</th>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
</tr>
l++;
}
</tbody>
</table>
</div>
</thead>
<tbody>
@foreach (var index in Model.wipInfoBlobs)
{
<tr>
<td>
@index.ImageName
</td>
<td>
@index.Filepath
</td>
</tr>
}
</tbody>
</table>
</div>
</div>
</div>
</div>
</form>

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

@ -162,6 +162,7 @@
<li>治具組合</li>
<li>SOP文件</li>
<li>標籤選項</li>
<li>上傳檔案</li>
</ul>
<div class="layui-tab-content">
@* 工單屬性sheet *@
@ -231,33 +232,48 @@
@* 序號編碼sheet *@
<div class="layui-tab-item">
<label class="layui-form-label">生產序號</label>
<table id="MydataTable" class="layui-table">
<thead>
<tr>
<th>
起始生產序號
</th>
<th>
結束生產序號
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipBarcodes)
{
@*<label class="layui-form-label">生產序號</label>
<table id="MydataTable" class="layui-table">
<thead>
<tr>
<td>
@index.StartNO
</td>
<td>
@index.EndNO
</td>
<th>
起始生產序號
</th>
<th>
結束生產序號
</th>
</tr>
}
</tbody>
</table>
</thead>
<tbody>
@foreach (var index in Model.wipBarcodes)
{
<tr>
<td>
@index.StartNO
</td>
<td>
@index.EndNO
</td>
</tr>
}
</tbody>
</table>*@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">生產序號</label>
<div class="layui-input-inline">
<input asp-for="wipBarcode.StartNO" class="layui-input" />
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline">
<input asp-for="wipBarcode.EndNO" class="layui-input" />
</div>
<div class="layui-input-inline">
<input id="GetBarCode" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生條碼" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@ -424,238 +440,240 @@
</div>
@* 板卡-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer" onchange="getUserName(this);" />
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer" onchange="getUserName(this);" />
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點紅膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點紅膠</label>
<div class="layui-form-item">
<label class="layui-form-label">SMD點紅膠備註</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">SMD點紅膠備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
<input asp-for="wipBoard.SmdSMRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SmdSMRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">DIP</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
<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.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">DIP</label>
<div class="layui-form-item">
<label class="layui-form-label">DIP備註</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
<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.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
<input asp-for="wipBoard.DipRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">DIP備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.DipRemarks" class="layui-input" type="text" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">燒錄</label>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.Burn == "Y" ? "checked" : "") } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
@*<input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />*@
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BurnLocation" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnLocation" class="layui-input" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">燒錄</label>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.Burn == "Y" ? "checked" : "") } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
@*<input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />*@
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BurnLocation" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnLocation" class="layui-input" />
</div>
</div>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">燒錄備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">燒錄備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
<label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>
<div class="layui-form-item">
<div class="layui-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤時間</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeTime" class="layui-input" />
<span asp-validation-for="wipBoard.PartsBakeTime" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤時間</label>
<div class="layui-form-item">
<label class="layui-form-label">零件烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeTime" class="layui-input" />
<span asp-validation-for="wipBoard.PartsBakeTime" class="layui-bg-red"></span>
<input asp-for="wipBoard.PartsBakeRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">零件烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB烘烤</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB烘烤</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
<div class="layui-form-item">
<label class="layui-form-label">PCB烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbBakeRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbBakeRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.SolderPaste"></label>
<div class="layui-input-block">
<select asp-items="@ViewBag.GetSolderPasteSelect" asp-for="wipBoard.SolderPaste"></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.SolderPaste"></label>
<div class="layui-form-item">
<label class="layui-form-label">錫膏備註</label>
<div class="layui-input-block">
<select asp-items="@ViewBag.GetSolderPasteSelect" asp-for="wipBoard.SolderPaste"></select>
<input asp-for="wipBoard.SolderPasteRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">錫膏備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SolderPasteRemarks" class="layui-input" type="text" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB加工</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetPCBProcessingTypeSelect" asp-for="wipBoard.PcbProcessing" class=""></select>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB加工</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetPCBProcessingTypeSelect" asp-for="wipBoard.PcbProcessing" class=""></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB加工備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbProcessingRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">PCB加工備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbProcessingRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
<label asp-for="wipBoard.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRatio" class="layui-input" />
<span asp-validation-for="wipBoard.BiRatio" class="layui-bg-red"></span>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
<label asp-for="wipBoard.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRatio" class="layui-input" />
<span asp-validation-for="wipBoard.BiRatio" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTemperature" class="layui-input" />
<span asp-validation-for="wipBoard.BiTemperature" class="layui-bg-red"></span>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTemperature" class="layui-input" />
<span asp-validation-for="wipBoard.BiTemperature" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTime" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTime" class="layui-input" />
<span asp-validation-for="wipBoard.BiTime" class="layui-bg-red"></span>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTime" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTime" class="layui-input" />
<span asp-validation-for="wipBoard.BiTime" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">燒機備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">燒機備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.BiosVer" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.BiosVer" class="layui-input" placeholder="請輸入BIOS" />
<span asp-validation-for="wipBoard.BiosVer" class="layui-bg-red"></span>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.BiosVer" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.BiosVer" class="layui-input" placeholder="請輸入BIOS" />
<span asp-validation-for="wipBoard.BiosVer" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">BIOS備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiosRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">BIOS備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiosRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.Checksum" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.Checksum" class="layui-input" placeholder="請輸入Checksum" />
<span asp-validation-for="wipBoard.Checksum" class="layui-bg-red"></span>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.Checksum" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.Checksum" class="layui-input" placeholder="請輸入Checksum" />
<span asp-validation-for="wipBoard.Checksum" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">Check Sum備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.CsRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">Check Sum備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.CsRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
</div>
@* 系統-工程資訊sheet *@
<div class="layui-tab-item">
@ -1010,6 +1028,45 @@
<input type="submit" value="製造確認" name="action" class="layui-btn" />
</div>
</div>
@* 上傳資料sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<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>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipInfoBlobs)
{
<tr>
<td>
@index.ImageName
</td>
<td>
@index.Filepath
</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>

3
AMESCoreStudio.WebApi/Controllers/AMES/WipBoardController.cs
View File

@ -83,9 +83,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
public async Task<ResultModel<WipBoard>> PutWipBoard([FromBody] WipBoard wipBoard)
{
ResultModel<WipBoard> result = new ResultModel<WipBoard>();
var wipNo = wipBoard.WipNo;
try
{
if (GetWipBoard(wipBoard.WipNo).Result.Value != null)
if (_context.WipBoards.Any(e => e.WipNo == wipNo))
{
_context.Entry(wipBoard).State = EntityState.Modified;
_context.Entry<WipBoard>(wipBoard).Property("CreateDate").IsModified = false;

123
AMESCoreStudio.WebApi/Controllers/AMES/WipInfoBlobController.cs
View File

@ -0,0 +1,123 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using AMESCoreStudio.WebApi;
using AMESCoreStudio.WebApi.Models.AMES;
using AMESCoreStudio.WebApi.DTO.AMES;
using AMESCoreStudio.CommonTools.Result;
namespace AMESCoreStudio.WebApi.Controllers.AMES
{
/// <summary>
/// 工單上傳圖檔資料表
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class WipInfoBlobController : ControllerBase
{
private readonly AMESContext _context;
public WipInfoBlobController(AMESContext context)
{
_context = context;
}
// GET: api/WipInfoBlob
[HttpGet]
public async Task<ActionResult<IEnumerable<WipInfoBlob>>> GetWipInfoBlobs()
{
return await _context.WipInfoBlobs.ToListAsync();
}
// GET: api/WipInfoBlob/5
[HttpGet("{id}")]
public async Task<ActionResult<IEnumerable<WipInfoBlob>>> GetWipInfoBlob(int id)
{
var wipInfoBlob = await _context.WipInfoBlobs.Where(w => w.WipID == id).ToListAsync();
return wipInfoBlob;
}
/// <summary>
/// 更新工單上傳圖檔資料表
/// </summary>
/// <param name="wipInfoBlob"></param>
/// <returns></returns>
[HttpPut("{id}")]
public async Task<ResultModel<WipInfoBlob>> PutWipInfoBlob(WipInfoBlob wipInfoBlob)
{
ResultModel<WipInfoBlob> result = new ResultModel<WipInfoBlob>();
_context.Entry(wipInfoBlob).State = EntityState.Modified;
//設置容器空間某一個模型的某一個欄位 不提交到資料庫
//DbContent.Entry是要更新到資料庫的整個對象
_context.Entry<WipInfoBlob>(wipInfoBlob).Property("CreateDate").IsModified = false;
_context.Entry<WipInfoBlob>(wipInfoBlob).Property("CreateUserID").IsModified = false;
wipInfoBlob.UpdateDate = DateTime.Now;
wipInfoBlob.UpdateUserID = 0;
try
{
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";
}
catch (Exception ex)
{
result.Success = false;
result.Msg = ex.InnerException.Message;
}
return result;
}
/// <summary>
/// 新增工單上傳圖檔資料表
/// </summary>
/// <param name="wipInfoBlob"></param>
/// <returns></returns>
[HttpPost]
public async Task<ResultModel<WipInfoBlob>> PostWipInfoBlob(WipInfoBlob wipInfoBlob)
{
ResultModel<WipInfoBlob> result = new ResultModel<WipInfoBlob>();
_context.WipInfoBlobs.Add(wipInfoBlob);
try
{
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";
}
catch (Exception ex)
{
result.Success = false;
result.Msg = ex.InnerException.Message;
}
return result;
}
// DELETE: api/WipInfoBlob/5
[HttpDelete("{id}")]
public async Task<ActionResult<WipInfoBlob>> DeleteWipInfoBlob(int id)
{
var wipInfoBlob = await _context.WipInfoBlobs.FindAsync(id);
if (wipInfoBlob == null)
{
return NotFound();
}
_context.WipInfoBlobs.Remove(wipInfoBlob);
await _context.SaveChangesAsync();
return wipInfoBlob;
}
private bool WipInfoBlobExists(int id)
{
return _context.WipInfoBlobs.Any(e => e.WipID == id);
}
}
}

29
AMESCoreStudio.WebApi/Controllers/AMES/WipSystemController.cs
View File

@ -79,23 +79,22 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
public async Task<ResultModel<WipSystem>> PutWipSystem([FromBody] WipSystem wipSystem)
{
ResultModel<WipSystem> result = new ResultModel<WipSystem>();
var getwipSystem = GetWipSystem(wipSystem.WipNo).Result.Value;
if (getwipSystem != null)
{
_context.Entry(wipSystem).State = EntityState.Modified;
_context.Entry<WipSystem>(wipSystem).Property("CreateDate").IsModified = false;
_context.Entry<WipSystem>(wipSystem).Property("CreateUserID").IsModified = false;
wipSystem.UpdateDate = DateTime.Now;
wipSystem.UpdateUserID = 0;
}
else
{
_context.WipSystems.Add(wipSystem);
}
var wipNo = wipSystem.WipNo;
try
{
if (_context.WipSystems.Any(e => e.WipNo == wipNo))
{
_context.Entry(wipSystem).State = EntityState.Modified;
_context.Entry<WipSystem>(wipSystem).Property("CreateDate").IsModified = false;
_context.Entry<WipSystem>(wipSystem).Property("CreateUserID").IsModified = false;
wipSystem.UpdateDate = DateTime.Now;
wipSystem.UpdateUserID = 0;
}
else
{
_context.WipSystems.Add(wipSystem);
}
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";

82
AMESCoreStudio.WebApi/Models/AMES/WipInfoBlob.cs
View File

@ -0,0 +1,82 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
using System.Runtime.Serialization;
#nullable disable
namespace AMESCoreStudio.WebApi.Models.AMES
{
/// <summary>
/// 工單上傳圖檔資料表
/// </summary>
[Keyless]
[Table("WIP_INFO_BLOB", Schema = "JHAMES")]
public partial class WipInfoBlob
{
/// <summary>
/// 工單ID
/// </summary>
[Key]
[Column("WIP_ID")]
[DataMember]
public int WipID { get; set; }
/// <summary>
/// 圖檔名稱
/// </summary>
[Key]
[Required]
[Column("IMAGE_NAME")]
[StringLength(50)]
[DataMember]
public string ImageName { get; set; }
/// <summary>
/// 圖檔
/// </summary>
[Column("IMAGE_BLOB", TypeName = "BLOB")]
[DataMember]
public byte[] ImageBlob { get; set; }
/// <summary>
/// 上傳路徑
/// </summary>
[Required]
[Column("FILEPATH")]
[StringLength(100)]
[DataMember]
public string Filepath { get; set; }
/// <summary>
/// 建立UserID
/// </summary>
[Column("CREATE_USERID")]
[Required]
[DataMember]
public int CreateUserID { get; set; } = 0;
/// <summary>
/// 建立日期
/// </summary>
[Required]
[Column("CREATE_DATE")]
[DataMember]
public DateTime CreateDate { get; set; } = DateTime.Now;
/// <summary>
/// 更新UserID
/// </summary>
[Column("UPDATE_USERID")]
[DataMember]
public int UpdateUserID { get; set; } = 0;
/// <summary>
/// 更新日期
/// </summary>
[Column("UPDATE_DATE")]
[DataMember]
public DateTime? UpdateDate { get; set; } = DateTime.Now;
}
}

6
AMESCoreStudio.WebApi/Models/AMESContext.cs
View File

@ -46,6 +46,7 @@ namespace AMESCoreStudio.WebApi
modelBuilder.Entity<WipRule>().HasKey(c => new { c.WipNO, c.RuleStationID, c.KeyNo });
modelBuilder.Entity<WipMAC>().HasKey(c => new { c.WipNO, c.StartNO, c.EndNO });
modelBuilder.Entity<WipInfoBlob>().HasKey(c => new { c.WipID, c.ImageName});
modelBuilder.Entity<BarcodeItem>().HasOne(r => r.B).WithMany().HasForeignKey(r => r.BarcodeID).IsRequired();
modelBuilder.Entity<BarcodeItem>().HasOne(r => r.I).WithMany().HasForeignKey(r => r.ItemNo).IsRequired();
modelBuilder.Entity<BarcodeItem>().HasOne(r => r.S).WithMany().HasForeignKey(r => r.RuleStationID).IsRequired();
@ -748,6 +749,11 @@ namespace AMESCoreStudio.WebApi
/// 工單治具資料檔
/// </summary>
public virtual DbSet<WipOutfit> WipOutfits { get; set; }
/// <summary>
/// 工單上傳圖檔資料表
/// </summary>
public virtual DbSet<WipInfoBlob> WipInfoBlobs { get; set; }
}
}

Write Preview
Loading…
Cancel
Save