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

1. 工單修改資料加入AutoComplete

PTD
Ray 3 years ago
parent
80c496c0f8
commit
a99c58ff6a
14 changed files with 468 additions and 2535 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. 114
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 18
      AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
  3. 35
      AMESCoreStudio.Web/ViewModels/PCS/PCS001RViewModel.cs
  4. 22
      AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
  5. 72
      AMESCoreStudio.Web/ViewModels/PCS/WipViewModelNew.cs
  6. 26
      AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
  7. 2
      AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
  8. 82
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  9. 2232
      AMESCoreStudio.Web/wwwroot/js/layAutoComplete.js
  10. 12
      AMESCoreStudio.WebApi/Controllers/AMES/PlmMeterialInfoeController.cs
  11. 9
      AMESCoreStudio.WebApi/Controllers/AMES/WipAttsController.cs
  12. 50
      AMESCoreStudio.WebApi/Controllers/AMES/WipCheckController.cs
  13. 59
      AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
  14. 32
      AMESCoreStudio.WebApi/Models/AMES/WipCheck.cs

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

@ -964,7 +964,7 @@ namespace AMESCoreStudio.Web.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<JsonResult> GetFactoryUnitJson(string id) public async Task<JsonResult> GetFactoryUnitJson(string id, string search)
{ {
var result = await _basApi.GetFactoryUnits(); var result = await _basApi.GetFactoryUnits();
@ -978,6 +978,13 @@ namespace AMESCoreStudio.Web.Controllers
{ {
FactoryUnit.Add(new SelectListItem("N/A", null)); FactoryUnit.Add(new SelectListItem("N/A", null));
} }
if (!string.IsNullOrWhiteSpace(search))
{
FactoryUnit = FactoryUnit.Where(w => w.Text.ToUpper().Contains(search.ToUpper())
|| w.Value.ToUpper().Contains(search.ToUpper())).ToList();
}
//将数据Json化并传到前台视图 //将数据Json化并传到前台视图
return Json(new { data = FactoryUnit }); return Json(new { data = FactoryUnit });
} }
@ -1002,6 +1009,35 @@ namespace AMESCoreStudio.Web.Controllers
//将数据Json化并传到前台视图 //将数据Json化并传到前台视图
return Json(new { data = item }); return Json(new { data = item });
} }
/// <summary>
/// 回傳PLM料號品名
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
[HttpPost]
public async Task<JsonResult> getPLMMeterial(string value)
{
var result = await _pcsApi.GetPlmMeterialInfo(value);
//将数据Json化并传到前台视图
if (result == null)
return Json(new { data = "" });
else
return Json(new { data = result.MeterialDesc });
}
/// <summary>
/// 回傳PLM料號品名_AutoComplete
/// </summary>
/// <param name="search"></param>
/// <returns></returns>
[HttpPost]
public async Task<JsonResult> getPLMMeterialAutoComplete(string search)
{
var result = await _pcsApi.GetPlmMeterialInfoAutoComplete(search);
return Json(new { data = result });
}
#endregion #endregion
[ResponseCache(Duration = 0)] [ResponseCache(Duration = 0)]
@ -1031,16 +1067,25 @@ namespace AMESCoreStudio.Web.Controllers
return Json(new Table() { count = 0, data = null }); return Json(new Table() { count = 0, data = null });
} }
/// <summary>
/// 回傳工單號碼相關資料
/// </summary>
/// <param name="value">工單號碼</param>
/// <returns></returns>
[HttpPost] [HttpPost]
public async Task<JsonResult> getPLMMeterial(string value) public async Task<JsonResult> getCreateWipNo_Detail(string value)
{ {
var result = await _pcsApi.GetPlmMeterialInfo(value); var result_WipAtt = await _pcsApi.GetWipAtt(value);
var result = new WipNoDetailViewModel();
result.wipAtt = result_WipAtt;
//将数据Json化并传到前台视图 //将数据Json化并传到前台视图
if (result == null) if (result == null)
return Json(new { data = "" }); return Json(new { data = "" });
else else
return Json(new { data = result.MeterialDesc }); return Json(new { data = result });
} }
#region PCS001 工單資料維護 #region PCS001 工單資料維護
@ -1296,7 +1341,7 @@ namespace AMESCoreStudio.Web.Controllers
public async Task<IActionResult> PCS001R(int id) public async Task<IActionResult> PCS001R(int id)
{ {
WipDataViewModelNew model = new WipDataViewModelNew(); WipDataViewModel model = new WipDataViewModel();
var q = await _pcsApi.GetWipInfo(id); var q = await _pcsApi.GetWipInfo(id);
if (q.Count != 0) if (q.Count != 0)
{ {
@ -1351,7 +1396,7 @@ namespace AMESCoreStudio.Web.Controllers
public async Task<IActionResult> PCS003(int id) public async Task<IActionResult> PCS003(int id)
{ {
WipDataViewModelNew model = new WipDataViewModelNew(); WipDataViewModel model = new WipDataViewModel();
var q = await _pcsApi.GetWipInfo(id); var q = await _pcsApi.GetWipInfo(id);
if (q.Count != 0) if (q.Count != 0)
{ {
@ -1415,7 +1460,7 @@ namespace AMESCoreStudio.Web.Controllers
return View(model); return View(model);
} }
[HttpPost] [HttpPost]
public async Task<IActionResult> PCS003Async(WipDataViewModelNew model, string action) public async Task<IActionResult> PCS003Async(WipDataViewModel model, string action)
{ {
#region 選單 #region 選單
await GetProductType(); await GetProductType();
@ -1596,12 +1641,13 @@ namespace AMESCoreStudio.Web.Controllers
} }
} }
WipCheck wipCheck = new WipCheck{ WipCheck wipCheck = new WipCheck
{
WipNo = model.wipInfo.WipNO WipNo = model.wipInfo.WipNO
}; };
if (action == "PM確認") if (action == "生管確認")
{ {
await _pcsApi.PutWipCheckByPM(JsonConvert.SerializeObject(wipCheck)); await _pcsApi.PutWipCheckByPMC(JsonConvert.SerializeObject(wipCheck));
} }
else if (action == "工程確認") else if (action == "工程確認")
{ {
@ -1609,7 +1655,7 @@ namespace AMESCoreStudio.Web.Controllers
} }
else if (action == "製造確認") else if (action == "製造確認")
{ {
await _pcsApi.PutWipCheckByMA(JsonConvert.SerializeObject(wipCheck)); await _pcsApi.PutWipCheckByMF(JsonConvert.SerializeObject(wipCheck));
} }
if (result.Success) if (result.Success)
@ -3843,52 +3889,6 @@ namespace AMESCoreStudio.Web.Controllers
#endregion #endregion
public async Task<IActionResult> PCS998()
{
WipDataViewModelNew model = new WipDataViewModelNew();
await GetFactoryUnit();
var q = await _pcsApi.GetWipInfo(1013);
if (q.Count != 0)
{
// 判斷工單號碼是否已經開線
var resultLineInfo = await _basApi.GetLineInfoes();
var resultWipNo = await _pcsApi.GetWipInfoByWipNO(q.FirstOrDefault().WipNO);
var WipIDs = resultWipNo.Select(s => s.WipID);
model.wipInfo = q.FirstOrDefault();
model.wipAtt = await _pcsApi.GetWipAtt(model.wipInfo.WipNO);
model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO);
model.ruleStations = await _pcsApi.GetRuleStationByWipNo(model.wipInfo.WipNO);
var q1 = await _pcsApi.GetMaterialSopQuery(itemNo: model.wipAtt.ItemNO);
model.materialSops = q1.Data;
model.WipKps = await _pcsApi.GetWipKpByWipNo(model.wipInfo.WipNO);
model.wipBoard = await _pcsApi.GetWipBoard(model.wipInfo.WipNO);
model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
model.wipMAC = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
model.wipLabel = await _pcsApi.GetWipLabel(model.wipInfo.WipNO);
model.wipBarcodeOther = await _pcsApi.GetWipBarcodeOther(model.wipInfo.WipNO);
model.Outfits = await _pcsApi.GetMaterialOutfitByItemNo(model.wipAtt.ItemNO);
}
return View(model);
}
//頁面提交，id=0 添加，id>0 修改
[HttpPost]
public async Task<IActionResult> PCS998Async(WipDataViewModelNew model)
{
var aa = "string";
return View(model);
}
public async Task<IActionResult> PCS999() public async Task<IActionResult> PCS999()
{ {
return View(); return View();

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

@ -144,7 +144,7 @@ namespace AMESCoreStudio.Web
ITask<ResultModel<WipAtt>> PutWipAtt([FromBody, RawJsonContent] string model); ITask<ResultModel<WipAtt>> PutWipAtt([FromBody, RawJsonContent] string model);
/// <summary> /// <summary>
/// 查詢工單基本資料-WipID /// 查詢工單基本資料-WipNo
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/WipAtts/{id}")] [WebApiClient.Attributes.HttpGet("api/WipAtts/{id}")]
@ -888,17 +888,25 @@ namespace AMESCoreStudio.Web
/// <returns></returns> /// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/PlmMeterialInfoe/{id}")] [WebApiClient.Attributes.HttpGet("api/PlmMeterialInfoe/{id}")]
ITask<PlmMeterialInfo> GetPlmMeterialInfo(string id); ITask<PlmMeterialInfo> GetPlmMeterialInfo(string id);
/// <summary>
/// 查詢PLM轉入料號說明_AutoComplete
/// </summary>
/// <param name="id">PLM料號</param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/PlmMeterialInfoe/AutoComplete/{id}")]
ITask<List<PlmMeterialInfo>> GetPlmMeterialInfoAutoComplete(string id);
#endregion #endregion
#region WipCheck 工單資訊確認 #region WipCheck 工單資訊確認
[WebApiClient.Attributes.HttpPut("api/WipCheck/ByPE")] [WebApiClient.Attributes.HttpPut("api/WipCheck/ByPE")]
ITask<ResultModel<WipCheck>> PutWipCheckByPE([FromBody, RawJsonContent] string model); ITask<ResultModel<WipCheck>> PutWipCheckByPE([FromBody, RawJsonContent] string model);
[WebApiClient.Attributes.HttpPut("api/WipCheck/ByMA")] [WebApiClient.Attributes.HttpPut("api/WipCheck/ByMF")]
ITask<ResultModel<WipCheck>> PutWipCheckByMA([FromBody, RawJsonContent] string model); ITask<ResultModel<WipCheck>> PutWipCheckByMF([FromBody, RawJsonContent] string model);
[WebApiClient.Attributes.HttpPut("api/WipCheck/ByPM")] [WebApiClient.Attributes.HttpPut("api/WipCheck/ByPMC")]
ITask<ResultModel<WipCheck>> PutWipCheckByPM([FromBody, RawJsonContent] string model); ITask<ResultModel<WipCheck>> PutWipCheckByPMC([FromBody, RawJsonContent] string model);
#endregion #endregion
} }

35
AMESCoreStudio.Web/ViewModels/PCS/PCS001RViewModel.cs
View File

@ -1,35 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using AMESCoreStudio.WebApi.Models.AMES;
using AMESCoreStudio.WebApi.Models.BAS;
using AMESCoreStudio.WebApi.DTO.AMES;
namespace AMESCoreStudio.Web.ViewModels.PCS
{
public class PCS001RViewModel
{
public WipInfo wipInfo { get; set; }
public WipAtt wipAtt { get; set; }
public WipBoard wipBoard { get; set; }
public WipSystem wipSystem { get; set; }
public IEnumerable<WipBarcode> wipBarcode { get; set; }
public IEnumerable<RuleStation> ruleStation { get; set; }
public IEnumerable<MaterialSopDto> materialSop { get; set; }
public IEnumerable<MaterialKpDto> materialKp { get; set; }
public WipLabel wipLabel { get; set; }
public WipMAC wipMAC { get; set; }
public WipBarcodeOther wipBarcodeOther { get; set; }
}
}

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

@ -8,15 +8,8 @@ using AMESCoreStudio.WebApi.DTO.AMES;
namespace AMESCoreStudio.Web.ViewModels.PCS namespace AMESCoreStudio.Web.ViewModels.PCS
{ {
public class WipDataViewModel public class WipNoDetailViewModel
{ {
/// <summary>
/// 工單資料
/// </summary>
public WipInfo wipInfo { get; set; }
/// <summary> /// <summary>
/// 工單屬性 /// 工單屬性
/// </summary> /// </summary>
@ -39,11 +32,13 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
public IEnumerable<WipBarcode> wipBarcodes { get; set; } public IEnumerable<WipBarcode> wipBarcodes { get; set; }
public IEnumerable<RuleStation> ruleStations { get; set; } public IEnumerable<RuleStationDto> ruleStations { get; set; }
public IEnumerable<MaterialSopDto> materialSops { get; set; } public IEnumerable<MaterialSopDto> materialSops { get; set; }
public IEnumerable<MaterialKpDto> materialKps { get; set; } public IEnumerable<WipKpDto> WipKps { get; set; }
public IEnumerable<MaterialOutfit> Outfits { get; set; }
/// <summary> /// <summary>
/// ///
@ -64,7 +59,14 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
/// 條碼區間設定 /// 條碼區間設定
/// </summary> /// </summary>
public WipBarcodeOther wipBarcodeOther { get; set; } public WipBarcodeOther wipBarcodeOther { get; set; }
}
public class WipDataViewModel: WipNoDetailViewModel
{
/// <summary>
/// 工單資料
/// </summary>
public WipInfo wipInfo { get; set; }
} }
} }

72
AMESCoreStudio.Web/ViewModels/PCS/WipViewModelNew.cs
View File

@ -1,72 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using AMESCoreStudio.WebApi.Models.AMES;
using AMESCoreStudio.WebApi.Models.BAS;
using AMESCoreStudio.WebApi.DTO.AMES;
namespace AMESCoreStudio.Web.ViewModels.PCS
{
public class WipDataViewModelNew
{
/// <summary>
/// 工單資料
/// </summary>
public WipInfo wipInfo { get; set; }
/// <summary>
/// 工單屬性
/// </summary>
public WipAtt wipAtt { get; set; }
/// <summary>
/// 生產序號
/// </summary>
public WipBarcode wipBarcode { get; set; }
/// <summary>
/// 板卡資訊
/// </summary>
public WipBoard wipBoard { get; set; }
/// <summary>
/// 系統組裝
/// </summary>
public WipSystem wipSystem { get; set; }
public IEnumerable<WipBarcode> wipBarcodes { get; set; }
public IEnumerable<RuleStationDto> ruleStations { get; set; }
public IEnumerable<MaterialSopDto> materialSops { get; set; }
public IEnumerable<WipKpDto> WipKps { get; set; }
public IEnumerable<MaterialOutfit> Outfits { get; set; }
/// <summary>
///
/// </summary>
public WipSop wipSop { get; set; }
/// <summary>
/// 標籤
/// </summary>
public WipLabel wipLabel { get; set; }
/// <summary>
/// MAC
/// </summary>
public WipMAC wipMAC { get; set; }
/// <summary>
/// 條碼區間設定
/// </summary>
public WipBarcodeOther wipBarcodeOther { get; set; }
}
}

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

@ -17,7 +17,7 @@
<div class="layui-card"> <div class="layui-card">
<div class="col-sm-12"> <div class="col-sm-12">
<form enctype="multipart/form-data" method="post" asp-action="PCS001" class="layui-form"> <form enctype="multipart/form-data" method="post" id="PCS001" asp-action="PCS001" class="layui-form">
<div asp-validation-summary="ModelOnly" class="text-danger"></div> <div asp-validation-summary="ModelOnly" class="text-danger"></div>
<input type="hidden" asp-for="wipSop.Status" value="Y" /> <input type="hidden" asp-for="wipSop.Status" value="Y" />
@ -30,7 +30,7 @@
<div class="layui-inline"> <div class="layui-inline">
<label asp-for="wipInfo.WipNO" class="layui-form-label"></label> <label asp-for="wipInfo.WipNO" class="layui-form-label"></label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input asp-for="wipInfo.WipNO" class="layui-input" autocomplete="off" placeholder="請輸入工單號碼" /> <input asp-for="wipInfo.WipNO" class="layui-input" onchange="getCreateWipNo_Detail(this)" autocomplete="off" placeholder="請輸入工單號碼" />
<span asp-validation-for="wipInfo.WipNO" class="layui-bg-red"></span> <span asp-validation-for="wipInfo.WipNO" class="layui-bg-red"></span>
</div> </div>
<label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label> <label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label>
@ -1081,7 +1081,7 @@
function RuleStation(id) { function RuleStation(id) {
if (id == null) { if (id == null) {
id = 1; id = 1;
} };
var tableCols_rule = [[ var tableCols_rule = [[
{ {
@ -1104,6 +1104,26 @@
]; ];
var tableruleStation = hg.table.datatable('ruleStation', '', '/BAS/GetRuleStationsByFlow?flowId='+id, {}, tableCols_rule,'', false, 'full-100'); var tableruleStation = hg.table.datatable('ruleStation', '', '/BAS/GetRuleStationsByFlow?flowId='+id, {}, tableCols_rule,'', false, 'full-100');
tableruleStation; tableruleStation;
};
//PLM料號
function getCreateWipNo_Detail(val) {
$.ajax(
{
url: "@Url.Action("getCreateWipNo_Detail", "PCS")",
dataType: 'json',
data: { "value": val.value},
type: 'post',
success: function (result)
{
console.log(result);
$('#PCS001').html(result);
},
error: function (result)
{
alert(result);
} }
});
};
</script> </script>
} }

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

@ -1,4 +1,4 @@
@model AMESCoreStudio.Web.ViewModels.PCS.WipDataViewModelNew @model AMESCoreStudio.Web.ViewModels.PCS.WipDataViewModel
@{ ViewData["Title"] = "PCS001C"; @{ ViewData["Title"] = "PCS001C";

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

@ -1,4 +1,4 @@
@model AMESCoreStudio.Web.ViewModels.PCS.WipDataViewModelNew @model AMESCoreStudio.Web.ViewModels.PCS.WipDataViewModel
@{ ViewData["Title"] = "PCS003"; @{ ViewData["Title"] = "PCS003";
@ -345,6 +345,9 @@
} }
</tbody> </tbody>
</table> </table>
<div style="text-align: right">
<input type="submit" value="生管確認" name="action" class="layui-btn" />
</div>
</div> </div>
@* 生產流程sheet *@ @* 生產流程sheet *@
@ -405,9 +408,6 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div style="text-align: right">
<input type="submit" value="PM確認" name="action" class="layui-btn" />
</div>
</div> </div>
@* 板卡-工程資訊sheet *@ @* 板卡-工程資訊sheet *@
@ -609,27 +609,13 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Cpu"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Cpu" autocomplete="off" />
</div>
<label class="layui-form-label" asp-for="wipSystem.Ram"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ram" autocomplete="off" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">BIOS</label> <label class="layui-form-label">BIOS</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select asp-for="wipSystem.BiosType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select> <select asp-for="wipSystem.BiosType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.Bios" onchange="getPLMMeterial(this)" autocomplete="off" /> <input class="layui-input autocomplete" style="text-transform:uppercase;" asp-for="wipSystem.Bios" autocomplete="off" />
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Bios_Desc" readonly="readonly" /> <input class="layui-input" asp-for="wipSystem.Bios_Desc" readonly="readonly" />
@ -652,7 +638,7 @@
<select asp-for="wipSystem.ECType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select> <select asp-for="wipSystem.ECType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.Ec" onchange="getPLMMeterial(this)" autocomplete="off" /> <input class="layui-input autocomplete" style="text-transform:uppercase;" asp-for="wipSystem.Ec" autocomplete="off" />
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ec_Desc" readonly="readonly" /> <input class="layui-input" asp-for="wipSystem.Ec_Desc" readonly="readonly" />
@ -667,7 +653,7 @@
<select asp-for="wipSystem.FWType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select> <select asp-for="wipSystem.FWType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.Fw" onchange="getPLMMeterial(this)" autocomplete="off" /> <input class="layui-input autocomplete" style="text-transform:uppercase;" asp-for="wipSystem.Fw" autocomplete="off" />
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw_Desc" readonly="readonly" /> <input class="layui-input" asp-for="wipSystem.Fw_Desc" readonly="readonly" />
@ -682,7 +668,7 @@
<select asp-for="wipSystem.FW1Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select> <select asp-for="wipSystem.FW1Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw1" onchange="getPLMMeterial(this)" style="text-transform:uppercase;" autocomplete="off" /> <input class="layui-input autocomplete" asp-for="wipSystem.Fw1" style="text-transform:uppercase;" autocomplete="off" />
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw1_Desc" readonly="readonly" /> <input class="layui-input" asp-for="wipSystem.Fw1_Desc" readonly="readonly" />
@ -697,7 +683,7 @@
<select asp-for="wipSystem.FW2Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select> <select asp-for="wipSystem.FW2Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw2" onchange="getPLMMeterial(this)" style="text-transform:uppercase;" autocomplete="off" /> <input class="layui-input autocomplete" asp-for="wipSystem.Fw2" style="text-transform:uppercase;" autocomplete="off" />
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw2_Desc" readonly="readonly" /> <input class="layui-input" asp-for="wipSystem.Fw2_Desc" readonly="readonly" />
@ -712,7 +698,7 @@
<select asp-for="wipSystem.OsType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select> <select asp-for="wipSystem.OsType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.OsVer" onchange="getPLMMeterial(this)" style="text-transform:uppercase;" autocomplete="off" /> <input class="layui-input autocomplete" asp-for="wipSystem.OsVer" style="text-transform:uppercase;" autocomplete="off" />
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Os_Desc" readonly="readonly" /> <input class="layui-input" asp-for="wipSystem.Os_Desc" readonly="readonly" />
@ -720,6 +706,19 @@
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Cpu"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Cpu" autocomplete="off" />
</div>
<label class="layui-form-label" asp-for="wipSystem.Ram"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ram" autocomplete="off" />
</div>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">FINE_PACKAGE</label> <label class="layui-form-label">FINE_PACKAGE</label>
@ -791,14 +790,14 @@
} }
</tbody> </tbody>
</table> </table>
<div style="text-align: right">
<input type="submit" value="工程確認" name="action" class="layui-btn" />
</div>
</div> </div>
@* SOP文件 sheet *@ @* SOP文件 sheet *@
<div class="layui-tab-item" lay-filter="test2"> <div class="layui-tab-item" lay-filter="test2">
<table class="layui-hide" id="query" lay-filter="query"></table> <table class="layui-hide" id="query" lay-filter="query"></table>
<div style="text-align: right">
<input type="submit" value="工程確認" name="action" class="layui-btn" />
</div>
</div> </div>
@* 標籤選項sheet *@ @* 標籤選項sheet *@
@ -868,7 +867,13 @@
getLineInfoList($("#unitNo").val()); getLineInfoList($("#unitNo").val());
}); });
layui.use(['form', 'laydate', 'element','table'], function () { layui.config({
base: '/js/' //假设这是test.js所在的目录
}).extend({ //设定模块别名
autocomplete: 'layAutoComplete'
});
layui.use(['form', 'laydate', 'element', 'table', 'autocomplete'], function () {
var form = layui.form, var form = layui.form,
laydate = layui.laydate, laydate = layui.laydate,
layer = layui.layer, layer = layui.layer,
@ -890,6 +895,23 @@
, theme: 'grid' , theme: 'grid'
}); });
// 關鍵字
$(".autocomplete").each(function () {
layui.autocomplete({
element: this,
display: 'meterialNo',
shortcut: 'modelName',
num: 2,
count: 10,
url: '/PCS/getPLMMeterialAutoComplete',
query: {},
resArray: 'data',
done: function (item) {
$(this.element).closest('div.layui-inline').find('input[id*=' + this.element.id + '_Desc]').val(item.meterialDesc);
}
});
})
element.on('tab(test2)', function (data) { element.on('tab(test2)', function (data) {
alert("TAB"); alert("TAB");
table && table.reload(data); table && table.reload(data);
@ -952,7 +974,7 @@
}; };
//PLM料號 //PLM料號
function getPLMMeterial(val) { @*function getPLMMeterial(val) {
$.ajax( $.ajax(
{ {
url: "@Url.Action("getPLMMeterial", "PCS")", url: "@Url.Action("getPLMMeterial", "PCS")",
@ -968,7 +990,7 @@
alert(result); alert(result);
} }
}); });
}; };*@
var tableCols = [[ var tableCols = [[
{ {

2232
AMESCoreStudio.Web/wwwroot/js/layAutoComplete.js
View File

File diff suppressed because one or more lines are too long

12
AMESCoreStudio.WebApi/Controllers/AMES/PlmMeterialInfoeController.cs
View File

@ -44,6 +44,18 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return plmMeterialInfo; return plmMeterialInfo;
} }
/// <summary>
/// 關鍵字查詢
/// </summary>
/// <param name="id">PLM料號</param>
/// <returns></returns>
[HttpGet("AutoComplete/{id}")]
public async Task<ActionResult<IEnumerable<PlmMeterialInfo>>> GetPlmMeterialInfoAutoComplete(string id)
{
var plmMeterialInfo = await _context.PlmMeterialInfos.Where(w => w.MeterialNo.ToUpper().Contains(id.ToUpper())).ToListAsync();
return plmMeterialInfo;
}
// PUT: api/PlmMeterialInfoe/5 // PUT: api/PlmMeterialInfoe/5
// To protect from overposting attacks, enable the specific properties you want to bind to, for // To protect from overposting attacks, enable the specific properties you want to bind to, for
// more details, see https://go.microsoft.com/fwlink/?linkid=2123754. // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.

9
AMESCoreStudio.WebApi/Controllers/AMES/WipAttsController.cs
View File

@ -54,20 +54,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// </summary> /// </summary>
/// <param name="id">工單號碼</param> /// <param name="id">工單號碼</param>
/// <returns></returns> /// <returns></returns>
// GET: api/WipAtts/4
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<WipAtt>> GetWipAtt(string id) public async Task<ActionResult<WipAtt>> GetWipAtt(string id)
{ {
IQueryable<WipAtt> q = _context.WipAtts.Where(p => p.WipNO == id); IQueryable<WipAtt> q = _context.WipAtts.Where(p => p.WipNO == id);
var WipAtt = await q.ToListAsync(); var WipAtt = await q.ToListAsync();
if (WipAtt == null || WipAtt.Count == 0)
{
return NotFound();
}
return WipAtt.FirstOrDefault(); return WipAtt.FirstOrDefault();
} }

50
AMESCoreStudio.WebApi/Controllers/AMES/WipCheckController.cs
View File

@ -46,7 +46,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// /// 更新工程確認
/// </summary> /// </summary>
/// <param name="wipCheck"></param> /// <param name="wipCheck"></param>
/// <returns></returns> /// <returns></returns>
@ -57,12 +57,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_context.Entry(wipCheck).State = EntityState.Modified; _context.Entry(wipCheck).State = EntityState.Modified;
//設置容器空間某一個模型的某一個欄位 不提交到資料庫 //設置容器空間某一個模型的某一個欄位 不提交到資料庫
//DbContent.Entry是要更新到資料庫的整個對象 //DbContent.Entry是要更新到資料庫的整個對象
_context.Entry<WipCheck>(wipCheck).Property("MaUserID").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("MFUserID").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("MaCheckdate").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("MFCheckdate").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("PMUserID").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("PMCUserID").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("PMCheckdate").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("PMCCheckdate").IsModified = false;
wipCheck.PeUserID = 0; wipCheck.PEUserID = 0;
wipCheck.PeCheckdate = DateTime.Now; wipCheck.PECheckdate = DateTime.Now;
try try
{ {
@ -80,23 +80,23 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// /// 更新製造確認
/// </summary> /// </summary>
/// <param name="wipCheck"></param> /// <param name="wipCheck"></param>
/// <returns></returns> /// <returns></returns>
[HttpPut("ByMA")] [HttpPut("ByMF")]
public async Task<ResultModel<WipCheck>> PutWipCheckByMA(WipCheck wipCheck) public async Task<ResultModel<WipCheck>> PutWipCheckByMF(WipCheck wipCheck)
{ {
ResultModel<WipCheck> result = new ResultModel<WipCheck>(); ResultModel<WipCheck> result = new ResultModel<WipCheck>();
_context.Entry(wipCheck).State = EntityState.Modified; _context.Entry(wipCheck).State = EntityState.Modified;
//設置容器空間某一個模型的某一個欄位 不提交到資料庫 //設置容器空間某一個模型的某一個欄位 不提交到資料庫
//DbContent.Entry是要更新到資料庫的整個對象 //DbContent.Entry是要更新到資料庫的整個對象
_context.Entry<WipCheck>(wipCheck).Property("PeUserID").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("PEUserID").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("PeCheckdate").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("PECheckdate").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("PMUserID").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("PMCUserID").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("PMCheckdate").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("PMCCheckdate").IsModified = false;
wipCheck.MaUserID = 0; wipCheck.MFUserID = 0;
wipCheck.MaCheckdate = DateTime.Now; wipCheck.MFCheckdate = DateTime.Now;
try try
{ {
@ -114,23 +114,23 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// /// 更新生管確認
/// </summary> /// </summary>
/// <param name="wipCheck"></param> /// <param name="wipCheck"></param>
/// <returns></returns> /// <returns></returns>
[HttpPut("ByPM")] [HttpPut("ByPMC")]
public async Task<ResultModel<WipCheck>> PutWipCheckByPM(WipCheck wipCheck) public async Task<ResultModel<WipCheck>> PutWipCheckByPMC(WipCheck wipCheck)
{ {
ResultModel<WipCheck> result = new ResultModel<WipCheck>(); ResultModel<WipCheck> result = new ResultModel<WipCheck>();
_context.Entry(wipCheck).State = EntityState.Modified; _context.Entry(wipCheck).State = EntityState.Modified;
//設置容器空間某一個模型的某一個欄位 不提交到資料庫 //設置容器空間某一個模型的某一個欄位 不提交到資料庫
//DbContent.Entry是要更新到資料庫的整個對象 //DbContent.Entry是要更新到資料庫的整個對象
_context.Entry<WipCheck>(wipCheck).Property("PeUserID").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("PEUserID").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("PeCheckdate").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("PECheckdate").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("MaUserID").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("MFUserID").IsModified = false;
_context.Entry<WipCheck>(wipCheck).Property("MaCheckdate").IsModified = false; _context.Entry<WipCheck>(wipCheck).Property("MFCheckdate").IsModified = false;
wipCheck.PMUserID = 0; wipCheck.PMCUserID = 0;
wipCheck.PMCheckdate = DateTime.Now; wipCheck.PMCCheckdate = DateTime.Now;
try try
{ {

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

@ -185,54 +185,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result; return result;
} }
/// <summary>
/// 查詢工單資料+是否過站 by SelectParameter
/// </summary>
/// <returns></returns>
//[Route("[action]")]
//[HttpGet]
//public async Task<ResultModel<dynamic>> GetWipInfoSelectParameterInBarCodeStation([FromQuery] WipInfoDto value, int page = 0, int limit = 10)
//{
//ResultModel<dynamic> result = new ResultModel<dynamic>();
//var result = GetWipInfoSelectParameter(value, page, limit);
//// 判斷是否已經有過站紀錄
//BarcodeStationController barcodeStation = new BarcodeStationController(_context);
//var WipArray = result.Result.Data.GroupBy(o => o.WipNO)
// .Select(s => new
// {
// s.Key,
// WipID = result.Result.Data.Where(w => w.WipNO == s.Key)
// .Select(s1 => (decimal)s1.WipID).ToList()
// }).ToList();
//foreach (var item in WipArray)
//{
// var q1 = barcodeStation.GetBarcodeStationByWipIDList(item.WipID);
// if (q1 == null)
// {
// result.Result.Data = result.Result.Data.Where(w => w.WipNO == item.Key)
// .Select(s => new { s , BarcodeStation = "N"}).ToList();
// }
// else
// {
// result.Result.Data = result.Result.Data.Where(w => w.WipNO == item.Key)
// .Select(s => { s.BarcodeStation = "Y"; return s; }).ToList();
// }
//}
//if (result.Result.Data == null)
//{
// result.Result.Msg = "查無資料";
// result.Result.Success = false;
// return await result;
//}
//result.Result.Success = true;
//result.Result.Msg = "OK";
//return;
//}
/// <summary> /// <summary>
/// 查詢工單資料Info By WipID /// 查詢工單資料Info By WipID
/// </summary> /// </summary>
@ -280,9 +232,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// </summary> /// </summary>
/// <param name="WipInfo"></param> /// <param name="WipInfo"></param>
/// <returns></returns> /// <returns></returns>
// POST: api/SystemInfoes
// To protect from overposting attacks, enable the specific properties you want to bind to, for
// more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
[HttpPost] [HttpPost]
public async Task<ResultModel<WipInfo>> PostWipInfo([FromBody] WipInfo WipInfo) public async Task<ResultModel<WipInfo>> PostWipInfo([FromBody] WipInfo WipInfo)
{ {
@ -314,9 +263,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <param name="id">工單ID</param> /// <param name="id">工單ID</param>
/// <param name="statusno">狀態</param> /// <param name="statusno">狀態</param>
/// <returns></returns> /// <returns></returns>
// PUT: api/RuleStations/5
// To protect from overposting attacks, enable the specific properties you want to bind to, for
// more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
[HttpPut("{id}/{statusno}")] [HttpPut("{id}/{statusno}")]
public async Task<ActionResult<WipInfo>> PutWipinfoToStatusNO(int id = 0, string statusno = null) public async Task<ActionResult<WipInfo>> PutWipinfoToStatusNO(int id = 0, string statusno = null)
{ {
@ -349,12 +295,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 工單資本資料 /// 更新工單資本資料
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
// PUT: api/RuleStations/5
// To protect from overposting attacks, enable the specific properties you want to bind to, for
// more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
[HttpPut] [HttpPut]
public async Task<ResultModel<WipInfo>> PutWipinfo([FromBody] WipInfo wipInfo) public async Task<ResultModel<WipInfo>> PutWipinfo([FromBody] WipInfo wipInfo)
{ {

32
AMESCoreStudio.WebApi/Models/AMES/WipCheck.cs
View File

@ -24,45 +24,45 @@ namespace AMESCoreStudio.WebApi.Models.AMES
public string WipNo { get; set; } public string WipNo { get; set; }
/// <summary> /// <summary>
/// /// 生管UsesID
/// </summary> /// </summary>
[DataMember] [DataMember]
[Column("PM_USERID")] [Column("PMC_USERID")]
public int? PMUserID { get; set; } public int? PMCUserID { get; set; }
/// <summary> /// <summary>
/// /// 生管確認時間
/// </summary> /// </summary>
[DataMember] [DataMember]
[Column("PM_CHECKDATE")] [Column("PMC_CHECKDATE")]
public DateTime? PMCheckdate { get; set; } public DateTime? PMCCheckdate { get; set; }
/// <summary> /// <summary>
/// /// 製造UserID
/// </summary> /// </summary>
[DataMember] [DataMember]
[Column("MA_USERID")] [Column("MF_USERID")]
public int? MaUserID { get; set; } public int? MFUserID { get; set; }
/// <summary> /// <summary>
/// /// 製造UserID
/// </summary> /// </summary>
[DataMember] [DataMember]
[Column("MA_CHECKDATE")] [Column("MF_CHECKDATE")]
public DateTime? MaCheckdate { get; set; } public DateTime? MFCheckdate { get; set; }
/// <summary> /// <summary>
/// /// 工程確認時間
/// </summary> /// </summary>
[DataMember] [DataMember]
[Column("PE_USERID")] [Column("PE_USERID")]
public int? PeUserID { get; set; } public int? PEUserID { get; set; }
/// <summary> /// <summary>
/// /// 工程確認時間
/// </summary> /// </summary>
[DataMember] [DataMember]
[Column("PE_CHECKDATE")] [Column("PE_CHECKDATE")]
public DateTime? PeCheckdate { get; set; } public DateTime? PECheckdate { get; set; }
} }
} }

Write Preview
Loading…
Cancel
Save