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

1. 工單鎖定 加入ECN選項 

2. 工單資料維護 新增981工單可查詢目前DB KeyParts數量
PTD
Ray 2 years ago
parent
c9dca73098
commit
6e4ca468e2
2 changed files with 259 additions and 196 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. 18
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 63
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

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

@ -876,6 +876,11 @@ namespace AMESCoreStudio.Web.Controllers
Value = "1",
},
new SelectListItem
{
Text = "ECN",
Value = "2",
},
new SelectListItem
{
Text = "維修換料待分析",
Value = "3",
@ -1399,7 +1404,6 @@ namespace AMESCoreStudio.Web.Controllers
return Json(new { data = items });
}
/// <summary>
/// 取出貨序號 取到資料先儲存出貨序號
/// </summary>
@ -1523,6 +1527,18 @@ namespace AMESCoreStudio.Web.Controllers
}
/// <summary>
/// 取It提供的工單EAN
/// </summary>
/// <param name="wipNo">工單號碼</param>
/// <returns></returns>
[HttpPost]
public async Task<JsonResult> GetKpDbCount(string wipNo)
{
var result = await _pcsApi.GetWipKpByWipNo(wipNo);
return Json(new Result() { success = true, data = result.Count() });
}
#endregion
///// <summary>

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

@ -346,6 +346,11 @@
<button type="button" id="attachment" title="文件上傳" lay-submit lay-filter="attachment" class="layui-btn layui-btn-normal">
<i class="layui-icon layui-icon-upload-circle" style="font-size: 20px"></i>
</button>
<span>確認筆數：</span>
<input class="layui-input" style="width:50px;display: initial;" id="wipKpDbCount" name="wipKpDbCount" readonly="readonly" />
<a onclick="GetKpDbCount();" class="layui-btn layui-btn-sm layui-btn-normal" style="padding: 0 5px;" title="更新燒機資訊">
<i class="layui-icon layui-icon-sm">&#xe669;</i>
</a>
</div>
</div>
<input type="hidden" value=@Model.WipKps.Count() id="WipKpCount" />
@ -502,9 +507,18 @@
<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.DipSolderMask" />
<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.DipSolderMask" />
</div>
</div>
</div>
@ -520,7 +534,10 @@
<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 @if (Model.wipBoard != null)
{
@(Model.wipBoard.Burn == "Y" ? "checked" : "")
} type="checkbox" title="是否燒入" name="wipBoard.Burn" />
</div>
<label class="layui-form-label">燒機位置</label>
@ -541,7 +558,10 @@
<div class="layui-inline">
<label class="layui-form-label">零件烘烤</label>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
<input @if (Model.wipBoard != null)
{
@(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "")
} type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
</div>
<label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline" style="width:100px">
@ -554,7 +574,10 @@
</div>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.PartsBakeOvertime == "Y" ? "checked" : "") } type="checkbox" title="零件烘烤超過48hrs" name="wipBoard.PartsBakeOvertime" />
<input @if (Model.wipBoard != null)
{
@(Model.wipBoard.PartsBakeOvertime == "Y" ? "checked" : "")
} type="checkbox" title="零件烘烤超過48hrs" name="wipBoard.PartsBakeOvertime" />
</div>
</div>
</div>
@ -570,7 +593,10 @@
<div class="layui-inline">
<label class="layui-form-label">PCB烘烤</label>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPcbBake == "Y" ? "checked" : "") } type="checkbox" title="PCB是否需要烘烤" name="wipBoard.ISPcbBake" />
<input @if (Model.wipBoard != null)
{
@(Model.wipBoard.ISPcbBake == "Y" ? "checked" : "")
} type="checkbox" title="PCB是否需要烘烤" name="wipBoard.ISPcbBake" />
</div>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
@ -878,7 +904,10 @@
<div class="layui-inline">
<label class="layui-form-label">FINE_PACKAGE</label>
<div class="layui-input-inline">
<input @if (Model.wipSystem != null) { @(Model.wipSystem.FinePackage == "Y" ? "checked" : "") } type="checkbox" title="是否為精裝" name="wipSystem.FinePackage" />
<input @if (Model.wipSystem != null)
{
@(Model.wipSystem.FinePackage == "Y" ? "checked" : "")
} type="checkbox" title="是否為精裝" name="wipSystem.FinePackage" />
</div>
</div>
</div>
@ -2078,5 +2107,23 @@
layer.closeAll('dialog');
})
}
// 抓DB目前KP數量
function GetKpDbCount() {
$.ajax({
url: "@Url.Action("GetKpDbCount", "PCS")",
type: "Post",
async: true,
data: { "wipNo": '@Model.wipInfo.WipNO' },
success: function (result) {
if (result.success) {
$("#wipKpDbCount").val(result.data);
}
},
error: function (result) {
parent.hg.msg(`呼叫API失敗`);
}
});
}
</script>
}

Write Preview
Loading…
Cancel
Save