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

1. 修正WIPSOP相關參數 

2. 工單修改加入治具及SOP新增刪除
PTD
Ray 3 years ago
parent
7535764814
commit
87521b276a
16 changed files with 1222 additions and 532 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. 214
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 25
      AMESCoreStudio.Web/Enums/EnumPCS.cs
  3. 90
      AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
  4. 17
      AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
  5. 361
      AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
  6. 338
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  7. 2
      AMESCoreStudio.WebApi/Controllers/AMES/PlmMeterialInfoeController.cs
  8. 38
      AMESCoreStudio.WebApi/Controllers/AMES/WipKpsController.cs
  9. 171
      AMESCoreStudio.WebApi/Controllers/AMES/WipOutfitController.cs
  10. 193
      AMESCoreStudio.WebApi/Controllers/AMES/WipSopController.cs
  11. 55
      AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs
  12. 61
      AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs
  13. 107
      AMESCoreStudio.WebApi/Models/AMES/WipOutfit.cs
  14. 74
      AMESCoreStudio.WebApi/Models/AMES/WipSop.cs
  15. 2
      AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
  16. 6
      AMESCoreStudio.WebApi/Models/AMESContext.cs

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

@ -121,6 +121,7 @@ namespace AMESCoreStudio.Web.Controllers
!string.IsNullOrWhiteSpace(model.Checksum) ||
!string.IsNullOrWhiteSpace(model.Cpu) ||
!string.IsNullOrWhiteSpace(model.DmiBi) ||
!string.IsNullOrWhiteSpace(model.Bios) ||
!string.IsNullOrWhiteSpace(model.Ec) ||
!string.IsNullOrWhiteSpace(model.Fw) ||
!string.IsNullOrWhiteSpace(model.Fw) ||
@ -147,6 +148,9 @@ namespace AMESCoreStudio.Web.Controllers
if (string.IsNullOrWhiteSpace(model.Ram))
Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Ram)).Name + "，";
if (string.IsNullOrWhiteSpace(model.Bios))
Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Bios)).Name + "，";
}
return Msg;
@ -734,7 +738,6 @@ namespace AMESCoreStudio.Web.Controllers
ViewBag.GetWipSystemPMTypeSelect = q;
}
/// <summary>
/// 工單資訊 系統工程資訊 Type
/// </summary>
@ -757,33 +760,24 @@ namespace AMESCoreStudio.Web.Controllers
}
/// <summary>
/// PCS List1 共用 BIOS/Checksum
/// SOP_Type
/// </summary>
private void GetPCSList1()
/// <param name="SelectedValue"></param>
private void GetSOPTypeSelect(string SelectedValue = null)
{
var PCSList1 = new List<SelectListItem>(){
new SelectListItem() {
Text = "NA",
Value = "NA",
},
new SelectListItem
{
Text = "Check",
Value = "Check",
},
new SelectListItem
{
Text = "Program",
Value = "Program",
},
new SelectListItem
{
Text = "備註說明",
Value = "備註說明",
}
};
List<string> values = new List<string>();
if (SelectedValue != null)
{
values = SelectedValue.Split(',').ToList();
}
var q = Enum.GetValues(typeof(Enums.EnumWipSopType)).Cast<Enums.EnumWipSopType>()
.Select(s => new SelectListItem
{
Text = Enums.GetDisplayName(s).ToString(),
Value = s.ToString()
}).ToList();
ViewBag.PCSList1 = PCSList1;
ViewBag.GetSOPTypeSelect = q;
}
/// <summary>
@ -958,7 +952,7 @@ namespace AMESCoreStudio.Web.Controllers
}
#endregion
#region JSON
#region resut Ajax JSON
/// <summary>
/// 生產單位
/// </summary>
@ -1010,6 +1004,19 @@ namespace AMESCoreStudio.Web.Controllers
return Json(new { data = item });
}
[HttpPost]
public JsonResult GetSOPTypeJson(string id, string search)
{
var q = Enum.GetValues(typeof(Enums.EnumWipSopType)).Cast<Enums.EnumWipSopType>()
.Select(s => new SelectListItem
{
Text = Enums.GetDisplayName(s).ToString(),
Value = s.ToString()
}).ToList();
return Json(new { data = q });
}
/// <summary>
/// 回傳PLM料號品名
/// </summary>
@ -1109,9 +1116,10 @@ namespace AMESCoreStudio.Web.Controllers
GetSolderPaste();
GetWipType();
GetCustomerType();
GetPCSList1();
GetPCSOPList();
GetSOPTypeSelect();
GetWipSystemTypeSelect();
GetWipSystemPMTypeSelect();
GetCheckboxApproveLogo();
GetCheckboxCompanyLogo();
GetCheckboxPrintMode();
@ -1143,8 +1151,10 @@ namespace AMESCoreStudio.Web.Controllers
GetSolderPaste();
GetWipType();
GetCustomerType();
GetPCSList1();
GetPCSOPList();
GetSOPTypeSelect();
GetWipSystemTypeSelect();
GetWipSystemPMTypeSelect();
GetCheckboxApproveLogo();
GetCheckboxCompanyLogo();
GetCheckboxPrintMode();
@ -1247,8 +1257,8 @@ namespace AMESCoreStudio.Web.Controllers
var q = await _pcsApi.GetMaterialSopQuery(itemNo: model.wipAtt.ItemNO, unitNo: model.wipInfo.UnitNO, state: "Y");
if (q.Data.Count() != 0)
{
model.wipSop.MaterialSopID = q.Data.FirstOrDefault().MaterialSopID;
await _pcsApi.PostWipSop(JsonConvert.SerializeObject(model.wipSop));
////model.wipSop.MaterialSopID = q.Data.FirstOrDefault().MaterialSopID;
////await _pcsApi.PostWipSop(JsonConvert.SerializeObject(model.wipSop));
}
// 內部條碼
@ -1338,6 +1348,60 @@ namespace AMESCoreStudio.Web.Controllers
return View();
}
[HttpPost]
public async Task<IActionResult> PCS001CreateWipNo(WipDataViewModel model)
{
//await GetUnitList();
await GetProductType();
await GetFactoryInfo();
await GetFactoryUnit();
await GetLineInfo();
await GetMFGType();
await GetProcessTypes();
await GetFlowRuleList();
GetSMDType();
GetDIPType();
GetWipSEQType();
GetBurnType();
GetPartsBakeType();
GetPCBBakeType();
GetPCBWorkingType();
GetSolderPaste();
GetWipType();
GetCustomerType();
GetPCSOPList();
GetSOPTypeSelect();
GetWipSystemTypeSelect();
GetWipSystemPMTypeSelect();
GetCheckboxApproveLogo();
GetCheckboxCompanyLogo();
GetCheckboxPrintMode();
GetCheckboxWipAttr();
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("PCS001", model);
}
public async Task<IActionResult> PCS001R(int id)
{
@ -1384,8 +1448,9 @@ namespace AMESCoreStudio.Web.Controllers
GetSolderPaste();
GetWipType();
GetCustomerType();
GetPCSList1();
GetPCSOPList();
GetWipSystemTypeSelect();
GetWipSystemPMTypeSelect();
GetCheckboxApproveLogo(model.wipLabel != null ? model.wipLabel.ApproveLogo : null);
GetCheckboxCompanyLogo(model.wipLabel != null ? model.wipLabel.CompanyLogo : null);
GetCheckboxPrintMode(model.wipLabel != null ? model.wipLabel.PrintMode : null);
@ -1415,11 +1480,8 @@ namespace AMESCoreStudio.Web.Controllers
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);
//var q1 = await _pcsApi.GetMaterialSopQuery(itemNo: model.wipAtt.ItemNO);
//model.materialSops = q1.Data;
model.wipBoard = await _pcsApi.GetWipBoard(model.wipInfo.WipNO);
model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
@ -1430,7 +1492,11 @@ namespace AMESCoreStudio.Web.Controllers
model.wipBarcodeOther = await _pcsApi.GetWipBarcodeOther(model.wipInfo.WipNO);
model.Outfits = await _pcsApi.GetMaterialOutfitByItemNo(model.wipAtt.ItemNO);
model.WipKps = await _pcsApi.GetWipKpByWipNo(model.wipInfo.WipNO);
model.WipOutfits = await _pcsApi.GetWipOutfitByWipNo(model.wipInfo.WipNO);
model.WipSops = await _pcsApi.GetWipSopByWipNo(model.wipInfo.WipNO);
}
await GetProductType();
await GetFactoryInfo();
@ -1451,8 +1517,8 @@ namespace AMESCoreStudio.Web.Controllers
GetWipSystemTypeSelect();
GetWipSystemPMTypeSelect();
GetCustomerType();
GetPCSList1();
GetPCSOPList();
GetSOPTypeSelect();
GetCheckboxApproveLogo(model.wipLabel != null ? model.wipLabel.ApproveLogo : null);
GetCheckboxCompanyLogo(model.wipLabel != null ? model.wipLabel.CompanyLogo : null);
GetCheckboxPrintMode(model.wipLabel != null ? model.wipLabel.PrintMode : null);
@ -1481,8 +1547,8 @@ namespace AMESCoreStudio.Web.Controllers
GetWipType();
GetWipSystemTypeSelect();
GetCustomerType();
GetPCSList1();
GetPCSOPList();
GetSOPTypeSelect();
GetCheckboxApproveLogo();
GetCheckboxCompanyLogo();
GetCheckboxPrintMode();
@ -1491,9 +1557,6 @@ namespace AMESCoreStudio.Web.Controllers
model.ruleStations = await _pcsApi.GetRuleStationByWipNo(model.wipInfo.WipNO);
model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO);
var q1 = await _pcsApi.GetMaterialSopQuery(itemNo: model.wipAtt.ItemNO);
model.materialSops = q1.Data;
model.Outfits = await _pcsApi.GetMaterialOutfitByItemNo(model.wipAtt.ItemNO);
IResultModel result;
// Checkbox轉換
@ -1517,13 +1580,6 @@ namespace AMESCoreStudio.Web.Controllers
wipDataViewModel.wipBarcodeOther = model.wipBarcodeOther;
var Msg = CheckWipInfoInsert(wipDataViewModel);
// KeyParts 判斷
foreach (var item in model.WipKps)
{
item.WipNo = model.wipInfo.WipNO;
item.ItemNo = model.wipAtt.ItemNO;
}
if (!string.IsNullOrWhiteSpace(Msg))
{
//model.wipInfo.ECNCheck = model.wipInfo.ECNCheck == "Y" ? "true" : "false";
@ -1630,15 +1686,59 @@ namespace AMESCoreStudio.Web.Controllers
result = await _pcsApi.PutMACInfoByClassGroup(mACInfo.ClassGroup, model.wipMAC.EndNO);
}
}
// KeyParts
// 先比對新舊ID 當舊ID有 新的沒有代表已刪除
var resultOld_WipKp = await _pcsApi.GetWipKpByWipNo(model.wipInfo.WipNO);
var delete_WipKpID = resultOld_WipKp.Select(s => s.WipKpID).Except(model.WipKps.Select(s => s.WipKpID));
foreach(var id in delete_WipKpID)
{
await _pcsApi.DeleteWipKp(id);
}
foreach (var item in model.WipKps)
{
item.WipNo = model.wipInfo.WipNO;
item.ItemNo = model.wipAtt.ItemNO;
if (item.WipKpID == 0)
await _pcsApi.PostWipKp(JsonConvert.SerializeObject(item));
else
await _pcsApi.PutWipKp(JsonConvert.SerializeObject(item));
}
// 治具
// 先比對新舊ID 當舊ID有 新的沒有代表已刪除
var resultOld_WipOutfit = await _pcsApi.GetWipOutfitByWipNo(model.wipInfo.WipNO);
var delete_WipOutfit = resultOld_WipOutfit.Select(s => s.WipOutfitID).Except(model.WipOutfits.Select(s => s.WipOutfitID));
foreach (var id in delete_WipOutfit)
{
await _pcsApi.DeleteWipOutfit(id);
}
foreach (var item in model.WipOutfits)
{
item.WipNo = model.wipInfo.WipNO;
item.ItemNo = model.wipAtt.ItemNO;
if (item.WipOutfitID == 0)
await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(item));
else
await _pcsApi.PutWipOutfit(JsonConvert.SerializeObject(item));
}
// SOP
// 先比對新舊ID 當舊ID有 新的沒有代表已刪除
var resultOld_WipSop = await _pcsApi.GetWipSopByWipNo(model.wipInfo.WipNO);
var delete_WipSop = resultOld_WipSop.Select(s => s.WipSOPID).Except(model.WipSops.Select(s => s.WipSOPID));
foreach (var id in delete_WipSop)
{
await _pcsApi.DeleteWipSop(id);
}
foreach (var item in model.WipSops)
{
item.WipNo = model.wipInfo.WipNO;
item.ItemNo = model.wipAtt.ItemNO;
if (item.WipSOPID == 0)
await _pcsApi.PostWipSop(JsonConvert.SerializeObject(item));
else
await _pcsApi.PutWipSop(JsonConvert.SerializeObject(item));
}
}
WipCheck wipCheck = new WipCheck
@ -2001,8 +2101,6 @@ namespace AMESCoreStudio.Web.Controllers
[HttpPost]
public async Task<JsonResult> PCS006ActiveStopAsync(int wipID, string statusNO, int LineID)
{
IActionResult result;
WipLog wipLog = new WipLog();
wipLog.WipID = wipID;
wipLog.WipDesc = ".";
@ -2922,11 +3020,11 @@ namespace AMESCoreStudio.Web.Controllers
}
}
var wipsop = await _pcsApi.GetWipSop(q.FirstOrDefault().WipID);
if (wipsop != null)
{
model.SopPath = wipsop.GetMaterialSop.FilePath + wipsop.GetMaterialSop.NewName;
}
//var wipsop = await _pcsApi.GetWipSop(q.FirstOrDefault().WipID);
//if (wipsop != null)
//{
// ////model.SopPath = wipsop.GetMaterialSop.FilePath + wipsop.GetMaterialSop.NewName;
//}
}

25
AMESCoreStudio.Web/Enums/EnumPCS.cs
View File

@ -173,6 +173,31 @@ namespace AMESCoreStudio.Web
D = 4,
}
/// <summary>
/// SOP Type
/// </summary>
public enum EnumWipSopType
{
/// <summary>
/// 參考
/// </summary>
[Display(Name = "參考")]
參考 = 1,
/// <summary>
/// 正式
/// </summary>
[Display(Name = "正式")]
正式 = 2,
/// <summary>
/// 發行
/// </summary>
[Display(Name = "發行")]
發行 = 3,
}
/// <summary>
/// Get Enum Display
/// </summary>

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

@ -609,23 +609,6 @@ namespace AMESCoreStudio.Web
ITask<ResultModel<MaterialSop>> PutMaterialSop(int id, string state);
#endregion
#region WipSop 工單對應SOP
/// <summary>
/// 查詢工單對應SOP log
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/WipSop/{id}")]
ITask<WipSop> GetWipSop(int id);
/// <summary>
/// 新增工單對應SOP
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/WipSop")]
ITask<ResultModel<WipSop>> PostWipSop([FromBody, RawJsonContent] string model);
#endregion
#region PCS024組件維護相關
/// <summary>
@ -845,18 +828,87 @@ namespace AMESCoreStudio.Web
ITask<List<WipKpDto>> GetWipKpByWipNo(string id);
/// <summary>
/// 新增工單對應SOP
/// 新增工單KP資訊資料檔
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/WipKps")]
ITask<ResultModel<WipKp>> PostWipKp([FromBody, RawJsonContent] string model);
/// <summary>
/// 新增工單對應SOP
/// 更新工單KP資訊資料檔
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPut("api/WipKps")]
ITask<ResultModel<WipKp>> PutWipKp([FromBody, RawJsonContent] string model);
/// <summary>
/// 刪除工單KP資訊資料檔
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpDelete("api/WipKps/{id}")]
ITask<ResultModel<WipKp>> DeleteWipKp(int id);
#endregion
#region WipOutfit 工單治具資料檔
/// <summary>
/// 查詢工單號碼 對應 WipOutfit
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/WipOutfit/ByWipNo/{id}")]
ITask<List<WipOutfitDto>> GetWipOutfitByWipNo(string id);
/// <summary>
/// 新增工單治具資料檔
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/WipOutfit")]
ITask<ResultModel<WipOutfit>> PostWipOutfit([FromBody, RawJsonContent] string model);
/// <summary>
/// 更新工單治具資料檔
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPut("api/WipOutfit")]
ITask<ResultModel<WipOutfit>> PutWipOutfit([FromBody, RawJsonContent] string model);
/// <summary>
/// 刪除工單治具資料檔
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpDelete("api/WipOutfit/{id}")]
ITask<ResultModel<WipOutfit>> DeleteWipOutfit(int id);
#endregion
#region WipSop 工單對應SOP
/// <summary>
/// 查詢工單號碼 對應 SOP
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/WipSop/ByWipNo/{id}")]
ITask<List<WipSopDto>> GetWipSopByWipNo(string id);
/// <summary>
/// 新增工單對應SOP
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/WipSop")]
ITask<ResultModel<WipSop>> PostWipSop([FromBody, RawJsonContent] string model);
/// <summary>
/// 更新工單對應SOP
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPut("api/WipSop")]
ITask<ResultModel<WipSop>> PutWipSop([FromBody, RawJsonContent] string model);
/// <summary>
/// 刪除工單對應SOP
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpDelete("api/WipSop/{id}")]
ITask<ResultModel<WipSop>>DeleteWipSop(int id);
#endregion
#region RuleStation 流程站別資料維護

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

@ -10,6 +10,17 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
{
public class WipNoDetailViewModel
{
public WipNoDetailViewModel()
{
wipBarcodes = new List<WipBarcode>();
ruleStations = new List<RuleStationDto>();
materialSops = new List<MaterialSopDto>();
WipKps = new List<WipKpDto>();
Outfits = new List<MaterialOutfit>();
WipSops = new List<WipSopDto>();
WipOutfits = new List<WipOutfitDto>();
}
/// <summary>
/// 工單屬性
/// </summary>
@ -38,6 +49,10 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
public IEnumerable<WipKpDto> WipKps { get; set; }
public IEnumerable<WipOutfitDto> WipOutfits { get; set; }
public IEnumerable<WipSopDto> WipSops { get; set; }
public IEnumerable<MaterialOutfit> Outfits { get; set; }
/// <summary>
@ -61,7 +76,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
public WipBarcodeOther wipBarcodeOther { get; set; }
}
public class WipDataViewModel: WipNoDetailViewModel
public class WipDataViewModel : WipNoDetailViewModel
{
/// <summary>

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

@ -19,7 +19,7 @@
<div class="col-sm-12">
<form enctype="multipart/form-data" method="post" id="PCS001" asp-action="PCS001" class="layui-form">
<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" />*@
<div class="layui-form-item" style="padding-left:30px">
@ -30,8 +30,10 @@
<div class="layui-inline">
<label asp-for="wipInfo.WipNO" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipInfo.WipNO" class="layui-input" onchange="getCreateWipNo_Detail(this)" autocomplete="off" placeholder="請輸入工單號碼" />
<input asp-for="wipInfo.WipNO" class="layui-input" onchange="getPLMMeterial(this)" autocomplete="off" placeholder="請輸入工單號碼" />
<span asp-validation-for="wipInfo.WipNO" class="layui-bg-red"></span>
<input id="btnCreateWipNo" hidden type="submit" value="submit" asp-controller="PCS" asp-action="PCS001CreateWipNo" />
</div>
<label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label>
<div class="layui-input-inline">
@ -39,7 +41,7 @@
</div>
<label asp-for="wipAtt.ItemNO" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipAtt.ItemNO" class="layui-input" autocomplete="off" placeholder="請輸入料號" />
<input asp-for="wipAtt.ItemNO" class="layui-input" autocomplete="off" placeholder="請輸入料號" />
<span asp-validation-for="wipAtt.ItemNO" class="layui-bg-red"></span>
</div>
<label asp-for="wipInfo.PlanQTY" class="layui-form-label"></label>
@ -147,13 +149,14 @@
<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 id="board">板卡-工程資訊</li>
<li id="system">系統-工程資訊</li>
<li>標籤選項</li>
<li>治具組合</li>
<li>SOP文件</li>
<li>標籤選項</li>
</ul>
<div class="layui-tab-content">
@* 工單屬性sheet *@
@ -221,23 +224,6 @@
</div>
@* 生產流程sheet *@
<div class="layui-tab-item" style="padding-left:30px">
<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 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="SFIS途程確認" />
</div>
</div>
<table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table>
</div>
@* 序號編碼sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
@ -292,6 +278,23 @@
<table class="layui-hide" id="keyparts" lay-filter="keyparts"></table>
</div>
@* 生產流程sheet *@
<div class="layui-tab-item" style="padding-left:30px">
<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 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="SFIS途程確認" />
</div>
</div>
<table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table>
</div>
@* 板卡-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
@ -434,7 +437,7 @@
<div class="layui-inline">
<label class="layui-form-label">工程負責人員</label>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入工號" />
<input class="layui-input" asp-action="PCS001" autocomplete="off" placeholder="請輸入工號" />
<span style="color: #dc3545 !important;"></span>
</div>
@ -450,7 +453,10 @@
<div class="layui-inline">
<label class="layui-form-label">Power Mode</label>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="" />
<select asp-for="wipSystem.PowerModeType" asp-items="@ViewBag.GetWipSystemPMTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" />
<span style="color: #dc3545 !important;"></span>
</div>
</div>
@ -459,7 +465,7 @@
<div class="layui-form-item">
<label class="layui-form-label">PLM參考</label>
<div class="layui-input-block">
<input class="layui-input" placeholder="請輸入工單號碼" />
<input class="layui-input" />
</div>
</div>
@ -469,21 +475,18 @@
<label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipSystem.BiRatio" class="layui-input" />
<span asp-validation-for="wipSystem.BiRatio" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-input-inline">
<label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipSystem.BiTemperature" class="layui-input" />
<span asp-validation-for="wipSystem.BiTemperature" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-input-inline">
<label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipSystem.BiTime" class="layui-input" />
<span asp-validation-for="wipSystem.BiTime" class="layui-bg-red"></span>
</div>
</div>
<label asp-for="wipSystem.BiMemo" class="layui-form-label"></label>
@ -495,81 +498,120 @@
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipSystem.BiosVer" class="layui-form-label"></label>
<label class="layui-form-label">BIOS</label>
<div class="layui-input-inline">
<select asp-for="wipSystem.BiosType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input autocomplete" style="text-transform:uppercase;" asp-for="wipSystem.Bios" autocomplete="off" />
</div>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Bios_Desc" readonly="readonly" />
</div>
<label class="layui-form-label">Ver.</label>
<div class="layui-input-inline" style="width:80px;">
<input asp-for="wipSystem.BiosVer" class="layui-input" />
<span asp-validation-for="wipSystem.BiosVer" class="layui-bg-red"></span>
</div>
<label class="layui-form-label">CS.</label>
<div class="layui-input-inline" style="width:80px;">
<input asp-for="wipSystem.Checksum" style="width:80px;" class="layui-input" />
</div>
</div>
</div>
<label asp-for="wipSystem.Checksum" class="layui-form-label">Checksum</label>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">EC</label>
<div class="layui-input-inline">
<input asp-for="wipSystem.Checksum" class="layui-input" />
<span asp-validation-for="wipSystem.Checksum" class="layui-bg-red"></span>
<select asp-for="wipSystem.ECType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input autocomplete" style="text-transform:uppercase;" asp-for="wipSystem.Ec" autocomplete="off" />
</div>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ec_Desc" readonly="readonly" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Cpu"></label>
<label class="layui-form-label">FW</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Cpu" autocomplete="off" placeholder="CPU" />
<span asp-validation-for="wipSystem.Cpu" class="layui-bg-red"></span>
<select asp-for="wipSystem.FWType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</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" placeholder="RAM" />
<span asp-validation-for="wipSystem.Ram" class="layui-bg-red"></span>
<input class="layui-input autocomplete" style="text-transform:uppercase;" asp-for="wipSystem.Fw" autocomplete="off" />
</div>
<label class="layui-form-label" asp-for="wipSystem.OsVer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.OsVer" autocomplete="off" placeholder="OS版本" />
<input class="layui-input" asp-for="wipSystem.Fw_Desc" readonly="readonly" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">EC</label>
<label class="layui-form-label">FW1</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ec" autocomplete="off" placeholder="請輸入EC" />
<select asp-for="wipSystem.FW1Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input autocomplete" asp-for="wipSystem.Fw1" style="text-transform:uppercase;" autocomplete="off" />
</div>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw1_Desc" readonly="readonly" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW</label>
<label class="layui-form-label">FW2</label>
<div class="layui-input-inline">
<select asp-for="wipSystem.FW2Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input autocomplete" asp-for="wipSystem.Fw2" style="text-transform:uppercase;" autocomplete="off" />
</div>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw" autocomplete="off" placeholder="請輸入FW" />
<input class="layui-input" asp-for="wipSystem.Fw2_Desc" readonly="readonly" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW1</label>
<label class="layui-form-label" asp-for="wipSystem.OsVer"></label>
<div class="layui-input-inline">
<select asp-for="wipSystem.OsType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw1" autocomplete="off" placeholder="請輸入FW1" />
<input class="layui-input autocomplete" asp-for="wipSystem.OsVer" style="text-transform:uppercase;" autocomplete="off" />
</div>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.OsVer_Desc" readonly="readonly" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW2</label>
<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.Fw2" autocomplete="off" placeholder="請輸入FW2" />
<input class="layui-input" asp-for="wipSystem.Ram" autocomplete="off" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FINE_PACKAGE</label>
<div class="layui-input-inline">
<input asp-for="wipSystem.FinePackage" type="checkbox" title="是否燒入" />
<input class="layui-input" asp-for="wipSystem.FinePackage" autocomplete="off" />
</div>
</div>
</div>
@ -592,131 +634,58 @@
</div>
</div>
@*<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.PCSList1" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入FW" />
<span style="color: #dc3545 !important;"></span>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入FW" />
<span style="color: #dc3545 !important;"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW1</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.PCSList1" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入FW1" />
<span style="color: #dc3545 !important;"></span>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入FW1" />
<span style="color: #dc3545 !important;"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW2</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.PCSList1" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入FW2" />
<span style="color: #dc3545 !important;"></span>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入FW2" />
<span style="color: #dc3545 !important;"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">OS</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.PCSList1" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入OS" />
<span style="color: #dc3545 !important;"></span>
</div>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入OS" />
<span style="color: #dc3545 !important;"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">RAM</label>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="RAM" />
<span style="color: #dc3545 !important;"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">B/I</label>
<div class="layui-input-inline">
<input class="layui-input" placeholder="請B/I" />
<span class="text-danger"></span>
</div>
<label class="layui-form-label">溫度</label>
<div class="layui-input-inline">
<input class="layui-input" placeholder="%" />
<span class="text-danger"></span>
</div>
<label asp-for="wipInfo.BoxCNT" class="layui-form-label">時間</label>
<div class="layui-input-inline">
<input asp-for="wipInfo.BoxCNT" class="layui-input" />
<span class="text-danger"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">DMI燒入</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetDIPTypeList" class=""></select>
</div>
</div>
</div>*@
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input class="layui-input" placeholder="請輸入備註" />
<input class="layui-input" />
</div>
</div>
</div>
@* 治具組合sheet *@
<div class="layui-tab-item">
<table id="MydataTable" class="layui-table">
@{ int j = 0;}
<thead>
<tr>
<th>
治具NO
</th>
<th>
治具名稱
</th>
<th>
流程名稱ID
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.Outfits)
{
<tr>
<td>
@index.OutfitNo
</td>
<td>
@index.StationType
</td>
<td>
@index.RuleStationID
</td>
</tr>
j++;
}
</tbody>
</table>
</div>
@* SOP文件 sheet *@
<div class="layui-tab-item" style="padding-left:30px">
<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" lay-submit lay-filter="querysop">刷新</a>
<table class="layui-hide" id="wipsop" lay-filter="wipsop"></table>
</div>
@* 標籤選項sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
@ -752,11 +721,7 @@
</div>
</div>
@* SOP文件 sheet *@
<div class="layui-tab-item" style="padding-left:30px">
<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" lay-submit lay-filter="querysop">刷新</a>
<table class="layui-hide" id="wipsop" lay-filter="wipsop"></table>
</div>
</div>
</div>
@ -773,7 +738,7 @@
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function () {
getFlowRuleList($("#unit").val());
getLineInfoList($("#unit").val());
@ -843,7 +808,13 @@
});
};
layui.use(['form','laydate'], function () {
layui.config({
base: '/js/' //假设这是test.js所在的目录
}).extend({ //设定模块别名
autocomplete: 'layAutoComplete'
});
layui.use(['form', 'laydate', 'autocomplete'], function () {
var form = layui.form,
laydate = layui.laydate;
@ -861,6 +832,23 @@
, theme: 'grid'
});
// PLM料號關鍵字
$(".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.productionMemo);
}
});
})
form.on('select(unit)', function (data) {
$("#unitNo").val(data.value);
getFlowRuleList(data.value);
@ -885,7 +873,7 @@
});
$('#GetBarCode').click(function () {
$('#GetBarCode').click(function () {
var wipNO = $('#wipInfo_WipNO').val();
var planQTY = $('#wipInfo_PlanQTY').val();
if (wipNO == '' || !wipNO) {
@ -902,7 +890,7 @@
});
$('#GetMAC1').click(function () {
$('#GetMAC1').click(function () {
var wipNO = $('#wipAtt_ItemNO').val();
var planQTY = $('#wipInfo_PlanQTY').val();
if (wipNO == '' || !wipNO) {
@ -923,7 +911,7 @@
return (Array(length).join('0') + num).slice(-length);
};
$("#GetMAC").click(function (event) {
$("#GetMAC").click(function (event) {
var wipNO = $('#wipAtt_ItemNO').val();
var planQTY = $('#wipInfo_PlanQTY').val();
if (wipNO == '' || !wipNO) {
@ -1106,18 +1094,17 @@
tableruleStation;
};
//PLM料號
function getCreateWipNo_Detail(val) {
function getPLMMeterial(val) {
var data = $("#PCS001").serialize();
console.info(data);
$.ajax(
{
url: "@Url.Action("getCreateWipNo_Detail", "PCS")",
url: "@Url.Action("PCS001CreateWipNo", "PCS")",
dataType: 'json',
data: { "value": val.value},
type: 'post',
data: data,
type: 'POST',
success: function (result)
{
console.log(result);
$('#PCS001').html(result);
},
error: function (result)
{
@ -1125,5 +1112,5 @@
}
});
};
</script>
</script>
}

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

@ -279,6 +279,9 @@
<div class="layui-input-inline">
<input asp-for="wipMAC.EndNO" class="layui-input" />
</div>
<div class="layui-input-inline">
<input id="GetMAC" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生MAC" />
</div>
</div>
</div>
</div>
@ -701,7 +704,7 @@
<input class="layui-input autocomplete" asp-for="wipSystem.OsVer" style="text-transform:uppercase;" autocomplete="off" />
</div>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Os_Desc" readonly="readonly" />
<input class="layui-input" asp-for="wipSystem.OsVer_Desc" readonly="readonly" />
</div>
</div>
</div>
@ -755,50 +758,105 @@
</div>
@* 治具組合sheet *@
<div class="layui-tab-item">
<table id="MydataTable" class="layui-table">
@{ int j = 0;}
<thead>
<div class="layui-tab-item">
<a id="OutfitTableAdd" class="layui-btn layui-btn-xs layui-icon layui-icon-add-circle">新增</a>
<input type="hidden" value=@Model.WipOutfits.Count() id="WipOutfitCount" />
<table id="OutfitTable" class="layui-table">
@{int l = 0;}
<thead>
<tr>
<th>
設備編碼
</th>
<th>
設備名稱
</th>
<th>
生產單位
</th>
<th>
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.WipOutfits)
{
<tr>
<th>
治具NO
</th>
<th>
治具名稱
</th>
<th>
流程名稱ID
</th>
<td>
<input name="WipOutfits[@l].WipOutfitID" type="hidden" value="@index.WipOutfitID" />
<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.OutfitNo" name="WipOutfits[@l].OutfitNo" />
</td>
<td>
<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.PartNo" name="WipOutfits[@l].PartNo" />
</td>
<td>
<select asp-for="@index.UnitNo" name="WipOutfits[@l].UnitNo" asp-items="@ViewBag.FactoryUnitList" class=""></select>
</td>
<td>
<a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
</td>
</tr>
</thead>
<tbody>
@foreach (var index in Model.Outfits)
{
<tr>
<td>
@index.OutfitNo
</td>
<td>
@index.StationType
</td>
<td>
@index.RuleStationID
</td>
</tr>
j++;
}
</tbody>
</table>
</div>
l++;
}
</tbody>
</table>
</div>
@* SOP文件 sheet *@
<div class="layui-tab-item" lay-filter="test2">
<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 class="layui-tab-item" lay-filter="test2">
<a id="SopTableAdd" class="layui-btn layui-btn-xs layui-icon layui-icon-add-circle">新增</a>
<input type="hidden" value=@Model.WipSops.Count() id="WipSopCount" />
<table id="SopTable" class="layui-table">
@{int i = 0;}
<thead>
<tr>
<th>
SOP檔案名稱
</th>
<th>
SOP路徑
</th>
<th>
SOP類型
</th>
<th>
生產單位
</th>
<th>
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.WipSops)
{
<tr>
<td>
<input name="WipSops[@i].WipSOPID" type="hidden" value="@index.WipSOPID" />
<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPName" name="WipSops[@i].SOPName" />
</td>
<td>
<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" asp-for="@index.SOPPath" name="WipSops[@i].SOPPath" />
</td>
<td>
<select asp-for="@index.SOPType" name="WipSops[@i].SOPType" asp-items="@ViewBag.GetSOPTypeSelect" class=""></select>
</td>
<td>
<select asp-for="@index.UnitNo" name="WipSops[@i].UnitNo" asp-items="@ViewBag.FactoryUnitList" class=""></select>
</td>
<td>
<a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>
</td>
</tr>
i++;
}
</tbody>
</table>
<div style="text-align: right">
<input type="submit" value="工程確認" name="action" class="layui-btn" />
</div>
</div>
@* 標籤選項sheet *@
<div class="layui-tab-item">
@ -880,7 +938,6 @@
element = layui.element,
table = layui.table;
laydate.render({
elem: '#wipInfo_WipScheduleDate'
, trigger: 'click'
@ -895,7 +952,7 @@
, theme: 'grid'
});
// 關鍵字
// PLM料號關鍵字
$(".autocomplete").each(function () {
layui.autocomplete({
element: this,
@ -907,16 +964,11 @@
query: {},
resArray: 'data',
done: function (item) {
$(this.element).closest('div.layui-inline').find('input[id*=' + this.element.id + '_Desc]').val(item.meterialDesc);
$(this.element).closest('div.layui-inline').find('input[id*=' + this.element.id + '_Desc]').val(item.productionMemo);
}
});
})
element.on('tab(test2)', function (data) {
alert("TAB");
table && table.reload(data);
});
form.on('select(flow)', function (data) {
RuleStation(data.value);
});
@ -973,89 +1025,6 @@
});
};
//PLM料號
@*function getPLMMeterial(val) {
$.ajax(
{
url: "@Url.Action("getPLMMeterial", "PCS")",
dataType: 'json',
data: { "value": val.value},
type: 'post',
success: function (result)
{
$(val).closest('div.layui-inline').find('input[id*=' + val.id + '_Desc]').val(result.data);
},
error: function (result)
{
alert(result);
}
});
};*@
var tableCols = [[
{
field: 'itemNo',
width: 150,
title: '料號',
sort: true
},
{
field: 'unitName',
title: '生產單位',
width: 200,
sort: true
},
{
field: 'fileName',
title: '檔案名稱',
sort: true
},
{
field: 'state',
title: '狀態',
width: 100,
sort: true
},
{
field: 'createDate',
title: '建立日期',
width: 150,
templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>'
},
{
field: 'updateDate',
title: '更新日期',
width: 150,
templet: '<div>{{ layui.util.toDateString(d.updateDate, "yyyy/MM/dd") }}</div>'
},
{
field: 'right',
width: 80,
title: '操作',
align: 'center',
fixed: 'right',
templet: function (d) {
return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" lay-event="show">預覽</a>'
}
}]
];
//通过行tool编辑，lay-event="show"
function show(obj) {
layui.use('layer', function () {
var layer = layui.layer;
layer.open({
type: 2,
area: ['900px', '650px'],
fixed: false, //不固定
maxmin: true,
content: obj.data.filePath + obj.data.newName
});
});
};
//基本数据表格
var table = hg.table.datatable('query', 'SOP文件查詢維護', '/PCS/PCS030Query?itemNo=' + "@Model.wipAtt.ItemNO", {}, tableCols, false, 'full-100');
// RuleStation
function RuleStation(NewID) {
if (NewID == null) {
@ -1125,15 +1094,66 @@
layui.form.render("select");//重新渲染 固定写法
});
// OutfitTableAdd
$('#OutfitTableAdd').click();
$('#OutfitTableAdd').on('click', function () {
let No = parseInt($('#WipOutfitCount').val());
var FactoryUnit = getFactoryUnitList();
var Select = "<select name=WipOutfits[" + No + "].UnitNo>";
$.each(FactoryUnit, function (index, item) {
Select += '<option value=' + item.value + '>' + item.text + '</option>';
});
Select += '</select>';
var contactdiv = '<tr>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].OutfitNo" /></td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].PartNo" /></td>' +
'<td>' + Select + '</td>' +
'<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
'</tr>';
$('#OutfitTable').append(contactdiv);
$('#WipOutfitCount').val(No + 1);
layui.form.render("select");//重新渲染 固定写法
});
// SopTableAdd
$('#SopTableAdd').click();
$('#SopTableAdd').on('click', function () {
let No = parseInt($('#WipSopCount').val());
var FactoryUnit = getFactoryUnitList();
var SOPType = getSOPType();
var Select = "<select name=WipSops[" + No + "].UnitNo>";
$.each(FactoryUnit, function (index, item) {
Select += '<option value=' + item.value + '>' + item.text + '</option>';
});
Select += '</select>';
var SelectSOPType = "<select name=WipSops[" + No + "].SOPType>";
$.each(SOPType, function (index, item) {
SelectSOPType += '<option value=' + item.value + '>' + item.text + '</option>';
});
SelectSOPType += '</select>';
var contactdiv = '<tr>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPName" /></td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPPath" /></td>' +
'<td>' + SelectSOPType + '</td>' +
'<td>' + Select + '</td>' +
'<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
'</tr>';
$('#SopTable').append(contactdiv);
$('#WipSopCount').val(No + 1);
layui.form.render("select");//重新渲染 固定写法
});
// Table 刪除
function Remove(button) {
//Determine the reference of the Row using the Button.
var row = $(button).closest("TR");
var table = $("#KPTable")[0];
var table = $(button).closest("TABLE")[0]; //$("#KPTable")[0];
table.deleteRow(row[0].rowIndex);
};
// KPTable 生產單位選單
//生產單位選單
function getFactoryUnitList()
{
var a;
@ -1155,6 +1175,58 @@
});
return a;
};
//SOPType
function getSOPType() {
var a;
$.ajax(
{
url: "@Url.Action("GetSOPTypeJson", "PCS")",
dataType: 'json',
data: {},
async:false,
type: 'post',
success: function (result)
{
a = result.data;
},
error: function (result)
{
alert(result);
}
});
return a;
}
// 產生MAC
$("#GetMAC").click(function (event) {
var wipNO = $('#wipAtt_ItemNO').val();
var planQTY = $('#wipInfo_PlanQTY').val();
if (wipNO == '' || !wipNO) {
parent.hg.msg("請輸入料號");
return;
}
if (planQTY == '' || !planQTY || planQTY == 0) {
parent.hg.msg("請確認計畫數量");
return;
}
$.ajax({
url: '@Url.Action("GetMAC", "PCS")',
dataType:'json',
data: { "itemno": $("#wipAtt_ItemNO").val(), "planQTY": $('#wipInfo_PlanQTY').val()},
cache: false,
type: "POST",
success: function (data, textStatus, jqXHR) {
if (data._msg != undefined) {
parent.hg.msg(data._msg);
}
$("#wipMAC_StartNO").val(data.mix);
$("#wipMAC_EndNO").val(data.max);
},
error: function (jqXHR, textStatus, errorThrown) {
alert("Found error when using Ajax!!");
}
});
});
</script>

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

@ -52,7 +52,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
[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();
var plmMeterialInfo = await _context.PlmMeterialInfos.Where(w => w.MeterialNo.ToUpper().Contains(id.ToUpper())).Take(20).ToListAsync();
return plmMeterialInfo;
}

38
AMESCoreStudio.WebApi/Controllers/AMES/WipKpsController.cs
View File

@ -145,7 +145,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{
ResultModel<WipKp> result = new ResultModel<WipKp>();
Helper helper = new Helper(_context);
wipKp.WipKpID= helper.GetIDKey("WIP_KP_ID").Result;
wipKp.WipKpID = helper.GetIDKey("WIP_KP_ID").Result;
//wipKp.UpdateDate = DateTime.Now;
//wipKp.UpdateUserID = 0;
//wipKp.UpdateDate = DateTime.Now;
@ -165,20 +165,38 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result;
}
// DELETE: api/WipKps/5
/// <summary>
/// 刪除工單KP資訊資料檔
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task<ActionResult<WipKp>> DeleteWipKp(int id)
public async Task<ResultModel<WipKp>> DeleteWipKp(int id)
{
ResultModel<WipKp> result = new ResultModel<WipKp>();
var wipKp = await _context.WipKps.FindAsync(id);
if (wipKp == null)
try
{
return NotFound();
if (wipKp != null)
{
_context.WipKps.Remove(wipKp);
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";
}
else
{
result.Success = true;
result.Msg = "找不到資料刪除";
}
}
_context.WipKps.Remove(wipKp);
await _context.SaveChangesAsync();
return wipKp;
catch (Exception ex)
{
result.Success = false;
result.Msg = ex.InnerException.Message;
}
return result;
}
private bool WipKpExists(int id)

171
AMESCoreStudio.WebApi/Controllers/AMES/WipOutfitController.cs
View File

@ -0,0 +1,171 @@
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.CommonTools.Result;
using AMESCoreStudio.WebApi.DTO.AMES;
namespace AMESCoreStudio.WebApi.Controllers.AMES
{
/// <summary>
/// 工單治具資料檔
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class WipOutfitController : ControllerBase
{
private readonly AMESContext _context;
public WipOutfitController(AMESContext context)
{
_context = context;
}
// GET: api/WipOutfit
[HttpGet]
public async Task<ActionResult<IEnumerable<WipOutfit>>> GetWipOutfits()
{
return await _context.WipOutfits.ToListAsync();
}
// GET: api/WipOutfit/5
[HttpGet("{id}")]
public async Task<ActionResult<WipOutfit>> GetWipOutfit(int id)
{
var wipOutfit = await _context.WipOutfits.FindAsync(id);
if (wipOutfit == null)
{
return NotFound();
}
return wipOutfit;
}
/// <summary>
/// ByWipNo
/// </summary>
/// <param name="id">工單號碼</param>
/// <returns></returns>
[HttpGet("ByWipNo/{id}")]
public async Task<ActionResult<IEnumerable<WipOutfitDto>>> GetWipOutfitByWipNo(string id)
{
var q = from q1 in _context.WipOutfits.Where(w => w.WipNo.Contains(id))
join q2 in _context.FactoryUnits on q1.UnitNo equals q2.UnitNo
select new WipOutfitDto
{
WipOutfitID = q1.WipOutfitID,
WipNo = q1.WipNo,
ItemNo = q1.ItemNo,
OutfitNo = q1.OutfitNo,
PartNo = q1.PartNo,
UnitNo = q1.UnitNo,
UnitNoName = q2.UnitName
};
return await q.ToListAsync();
}
/// <summary>
/// 更新工單治具資料檔
/// </summary>
/// <param name="wipOutfit"></param>
/// <returns></returns>
[HttpPut]
public async Task<ResultModel<WipOutfit>> PutWipOutfit(WipOutfit wipOutfit)
{
ResultModel<WipOutfit> result = new ResultModel<WipOutfit>();
_context.Entry(wipOutfit).State = EntityState.Modified;
//設置容器空間某一個模型的某一個欄位 不提交到資料庫
//DbContent.Entry是要更新到資料庫的整個對象
_context.Entry<WipOutfit>(wipOutfit).Property("CreateDate").IsModified = false;
_context.Entry<WipOutfit>(wipOutfit).Property("CreateUserID").IsModified = false;
wipOutfit.UpdateDate = DateTime.Now;
wipOutfit.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="wipOutfit"></param>
/// <returns></returns>
[HttpPost]
public async Task<ResultModel<WipOutfit>> PostWipOutfit(WipOutfit wipOutfit)
{
ResultModel<WipOutfit> result = new ResultModel<WipOutfit>();
Helper helper = new Helper(_context);
wipOutfit.WipOutfitID = helper.GetIDKey("WIP_OUTFIT_ID").Result;
_context.WipOutfits.Add(wipOutfit);
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="id"></param>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task<ResultModel<WipOutfit>> DeleteWipOutfit(int id)
{
ResultModel<WipOutfit> result = new ResultModel<WipOutfit>();
var wipOutfit = await _context.WipOutfits.FindAsync(id);
try
{
if (wipOutfit != null)
{
_context.WipOutfits.Remove(wipOutfit);
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";
}
else
{
result.Success = true;
result.Msg = "找不到資料刪除";
}
}
catch (Exception ex)
{
result.Success = false;
result.Msg = ex.InnerException.Message;
}
return result;
}
private bool WipOutfitExists(int id)
{
return _context.WipOutfits.Any(e => e.WipOutfitID == id);
}
}
}

193
AMESCoreStudio.WebApi/Controllers/AMES/WipSopController.cs
View File

@ -8,10 +8,13 @@ using Microsoft.EntityFrameworkCore;
using AMESCoreStudio.WebApi.Models.AMES;
using AMESCoreStudio.CommonTools.Result;
using AMESCoreStudio.WebApi.DTO.AMES;
// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
namespace AMESCoreStudio.WebApi.Controllers.AMES
{
/// <summary>
/// 工單製程對應SOP資料檔
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class WipSopController : ControllerBase
@ -35,7 +38,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
public async Task<ActionResult<IEnumerable<WipSop>>> GetWipSop()
{
IQueryable<WipSop> q = _context.WipSops;
q = q.OrderBy(p => p.MaterialSopID);
////q = q.OrderBy(p => p.MaterialSopID);
var WipSop = await q.ToListAsync();
return WipSop;
}
@ -45,7 +48,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{
IQueryable<WipSop> q = _context.WipSops;
var WipSop = await q.Where(p => p.WipID == id).FirstOrDefaultAsync();
var WipSop = await q.Where(p => p.WipSOPID == id).FirstOrDefaultAsync();
//if (WipSopLog == null)
//{
@ -55,75 +58,44 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return WipSop;
}
/// <summary>
/// SOP文件查詢
/// ByWipNo
/// </summary>
/// <param name="itemNo">料號</param>
/// <param name="unitNo">生產單位</param>
/// <param name="fileName">檔案名稱</param>
/// <param name="state">狀態</param>
/// <param name="date_str">建立日期起</param>
/// <param name="date_end">建立日期迄</param>
/// <param name="id">工單號碼</param>
/// <returns></returns>
//[Route("[action]")]
//[HttpGet]
//public async Task<ResultModel<WipSopLogDto>> GetWipSopLogQuery(string itemNo = null, string unitNo = null
// , string fileName = null, string state = null, string date_str = null, string date_end = null)
//{
// IQueryable<WipSopLog> q = _context.WipSopLogs;
// if (!string.IsNullOrWhiteSpace(itemNo))
// q = q.Where(w => w.ItemNo == itemNo);
// if (!string.IsNullOrWhiteSpace(unitNo))
// q = q.Where(w => w.UnitNo == unitNo);
// if (!string.IsNullOrWhiteSpace(fileName))
// q = q.Where(w => w.FileName.Contains(fileName));
// if (!string.IsNullOrWhiteSpace(state))
// q = q.Where(w => w.State == state);
// DateTime dateValue;
// if (DateTime.TryParse(date_str, out dateValue))
// {
// q = q.Where(w => w.CreateDate >= DateTime.Parse(date_str));
// }
// if (DateTime.TryParse(date_end, out dateValue))
// {
// q = q.Where(w => w.CreateDate <= DateTime.Parse(date_end));
// }
// ResultModel<WipSopLogDto> result = new ResultModel<WipSopLogDto>();
// result.Data = await q.Select(s => new WipSopLogDto
// {
// WipSopLogID = s.WipSopLogID,
// ItemNo = s.ItemNo,
// UnitName = s.FactoryUnit.UnitName,
// FileName = s.FileName,
// FilePath = s.FilePath,
// State = s.State == "Y" ? "使用中" : "停用",
// NewName = s.NewName,
// CreateDate = s.CreateDate,
// CreateUserID = s.CreateUserID,
// UpdateDate = s.UpdateDate,
// UpdateUserID = s.UpdateUserID
// }).ToListAsync();
// return result;
//}
[HttpGet("ByWipNo/{id}")]
public async Task<ActionResult<IEnumerable<WipSopDto>>> GetWipSopByWipNo(string id)
{
var q = from q1 in _context.WipSops.Where(w => w.WipNo == id)
join q2 in _context.FactoryUnits on q1.UnitNo equals q2.UnitNo
select new WipSopDto
{
WipSOPID = q1.WipSOPID,
WipNo = q1.WipNo,
ItemNo = q1.ItemNo,
SOPName = q1.SOPName,
SOPPath = q1.SOPPath,
SOPType = q1.SOPType,
UnitNo = q1.UnitNo,
UnitNoName = q2.UnitName
};
return await q.ToListAsync();
}
/// <summary>
/// 新增工單製程對應SOP資料檔
/// </summary>
/// <param name="wipSop"></param>
/// <returns></returns>
[HttpPost]
public async Task<ResultModel<WipSop>> PostWipSop([FromBody] WipSop wipSop)
{
ResultModel<WipSop> result = new ResultModel<WipSop>();
Helper helper = new Helper(_context);
wipSop.WipID = helper.GetIDKeyNoPost("WIP_ID").Result;
wipSop.Status = "Y";
//wipLog.WipSopLogID = wipLog.WipID == 0 ? helper.GetIDKeyNoPost("WIP_ID").Result : wipLog.WipID;
wipSop.WipSOPID = helper.GetIDKey("WIP_SOP_ID").Result;
_context.WipSops.Add(wipSop);
try
{
@ -139,43 +111,70 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result;
}
//// PUT api/<WipSopLogController>/5
//[HttpPut("{id}/{state}")]
//public async Task<ResultModel<WipSopLog>> PutWipSopLog(int id, string state)
//{
// ResultModel<WipSopLog> result = new ResultModel<WipSopLog>();
// var WipSopLog = new WipSopLog {
// WipSopLogID = id,
// State = state,
// UpdateUserID = 1,
// UpdateDate = System.DateTime.Now
// };
// _context.Attach(WipSopLog);
// // 指定更新某個欄位
// _context.Entry(WipSopLog).Property(p => p.State).IsModified = true;
// _context.Entry(WipSopLog).Property(p => p.UpdateUserID).IsModified = true;
// _context.Entry(WipSopLog).Property(p => p.UpdateDate).IsModified = true;
// 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/<WipSopLogController>/5
/// <summary>
/// 更新工單製程對應SOP資料檔
/// </summary>
/// <param name="wipSop"></param>
/// <returns></returns>
[HttpPut]
public async Task<ResultModel<WipKp>> PutWipSop(WipSop wipSop)
{
ResultModel<WipKp> result = new ResultModel<WipKp>();
_context.Entry(wipSop).State = EntityState.Modified;
//設置容器空間某一個模型的某一個欄位 不提交到資料庫
//DbContent.Entry是要更新到資料庫的整個對象
_context.Entry<WipSop>(wipSop).Property("CreateDate").IsModified = false;
_context.Entry<WipSop>(wipSop).Property("CreateUserID").IsModified = false;
wipSop.UpdateDate = DateTime.Now;
wipSop.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>
/// 刪除工單製程對應SOP資料檔
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")]
public void Delete(int id)
public async Task<ResultModel<WipSop>> DeleteWipSop(int id)
{
ResultModel<WipSop> result = new ResultModel<WipSop>();
var wipSop = await _context.WipSops.FindAsync(id);
try
{
if (wipSop != null)
{
_context.WipSops.Remove(wipSop);
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";
}
else
{
result.Success = true;
result.Msg = "找不到資料刪除";
}
}
catch (Exception ex)
{
result.Success = false;
result.Msg = ex.InnerException.Message;
}
return result;
}
}
}

55
AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs
View File

@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
#nullable disable
namespace AMESCoreStudio.WebApi.DTO.AMES
{
/// <summary>
/// 工單治具資料檔 DTO
/// </summary>
public partial class WipOutfitDto
{
/// <summary>
/// 工單治具ID
/// </summary>
public int WipOutfitID { get; set; }
/// <summary>
/// 工單號碼
/// </summary>
public string WipNo { get; set; }
/// <summary>
/// 料號
/// </summary>
public string ItemNo { get; set; }
/// <summary>
/// 設備編碼
/// </summary>
public string OutfitNo { get; set; }
/// <summary>
/// 設備名稱
/// </summary>
public string PartNo { get; set; }
/// <summary>
/// 生產單位代號
/// </summary>
public string UnitNo { get; set; }
/// <summary>
/// 生產單位
/// </summary>
public string UnitNoName { get; set; }
}
}

61
AMESCoreStudio.WebApi/DTO/AMES/WipSopDto.cs
View File

@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
#nullable disable
namespace AMESCoreStudio.WebApi.DTO.AMES
{
/// <summary>
/// 工單製程對應SOP資料檔 DTO
/// </summary>
public partial class WipSopDto
{
/// <summary>
/// 工單SOP_ID
/// </summary>
public int WipSOPID { get; set; }
/// <summary>
/// 工單號碼
/// </summary>
public string WipNo { get; set; }
/// <summary>
/// 料號
/// </summary>
public string ItemNo { get; set; }
/// <summary>
/// SOP檔案名稱
/// </summary>
public string SOPName { get; set; }
/// <summary>
/// SOP路徑
/// </summary>
public string SOPPath { get; set; }
/// <summary>
/// SOP類型
/// </summary>
public string SOPType { get; set; }
/// <summary>
/// 生產單位代號
/// </summary>
public string UnitNo { get; set; }
/// <summary>
/// 生產單位
/// </summary>
public string UnitNoName { get; set; }
}
}

107
AMESCoreStudio.WebApi/Models/AMES/WipOutfit.cs
View File

@ -0,0 +1,107 @@
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>
[Table("WIP_OUTFIT", Schema = "JHAMES")]
public partial class WipOutfit
{
/// <summary>
/// 工單治具ID
/// </summary>
[Key]
[Column("WIP_OUTFIT_ID")]
[DataMember]
public int WipOutfitID { get; set; }
/// <summary>
/// 工單號碼
/// </summary>
[Required]
[Column("WIP_NO")]
[StringLength(30)]
[DataMember]
public string WipNo { get; set; }
/// <summary>
/// 料號
/// </summary>
[Required]
[Column("ITEM_NO")]
[StringLength(20)]
[DataMember]
public string ItemNo { get; set; }
/// <summary>
/// 設備編碼
/// </summary>
[Required]
[Column("OUTFIT_NO")]
[StringLength(15)]
[DataMember]
public string OutfitNo { get; set; }
/// <summary>
/// 設備名稱
/// </summary>
[Required]
[Column("PART_NO")]
[StringLength(50)]
[DataMember]
public string PartNo { get; set; }
/// <summary>
/// 生產單位代號
/// </summary>
[Required]
[Column("UNIT_NO")]
[StringLength(4)]
[DataMember]
public string UnitNo { 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;
///// <summary>
///// Unit
///// </summary>
//[ForeignKey("UnitNo")]
//[DataMember]
//public virtual BAS.FactoryUnit GetFactoryUnit { get; set; }
}
}

74
AMESCoreStudio.WebApi/Models/AMES/WipSop.cs
View File

@ -10,34 +10,67 @@ using System.Runtime.Serialization;
namespace AMESCoreStudio.WebApi.Models.AMES
{
/// <summary>
/// 工單對應SOP文件紀錄
/// 工單製程對應SOP資料檔
/// </summary>
[Table("WIP_SOP", Schema = "JHAMES")]
[DataContract]
public partial class WipSop
{
/// <summary>
/// WIP_ID
/// 工單SOP_ID
/// </summary>
[Key]
[Column("WIP_ID")]
[Column("WIP_SOP_ID")]
[DataMember]
public int WipID { get; set; }
public int WipSOPID { get; set; }
/// <summary>
/// MATERIAL_SOP_ID
/// 工單號碼
/// </summary>
[Key]
[Column("MATERIAL_SOP_ID")]
[Column("WIP_NO")]
[DataMember]
[StringLength(30)]
public string WipNo { get; set; }
/// <summary>
/// 料號
/// </summary>
[Column("ITEM_NO")]
[DataMember]
[StringLength(20)]
public string ItemNo { get; set; }
/// <summary>
/// SOP檔案名稱
/// </summary>
[Column("SOP_NAME")]
[DataMember]
[StringLength(60)]
public string SOPName { get; set; }
/// <summary>
/// SOP路徑
/// </summary>
[Column("SOP_PATH")]
[DataMember]
[StringLength(100)]
public string SOPPath { get; set; }
/// <summary>
/// SOP類型
/// </summary>
[Column("SOP_TYPE")]
[DataMember]
public int MaterialSopID { get; set; }
[StringLength(10)]
public string SOPType { get; set; }
/// <summary>
/// 狀態
/// 生產單位ID
/// </summary>
[Column("STATUS")]
[Column("UNIT_NO")]
[DataMember]
public string Status { get; set; }
[StringLength(10)]
public string UnitNo { get; set; }
/// <summary>
/// 建立UserID
@ -69,18 +102,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[DataMember]
public DateTime? UpdateDate { get; set; } = DateTime.Now;
/// <summary>
/// 工單資料
/// </summary>
[ForeignKey("WipID")]
[DataMember]
public virtual WipInfo GetWipInfo { get; set; }
/// <summary>
/// SOP資料
/// </summary>
[ForeignKey("MaterialSopID")]
[DataMember]
public virtual MaterialSop GetMaterialSop { get; set; }
///// <summary>
///// Unit
///// </summary>
//[ForeignKey("UnitNo")]
//[DataMember]
//public virtual BAS.FactoryUnit GetFactoryUnit { get; set; }
}
}

2
AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
View File

@ -335,6 +335,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary>
[NotMapped]
[DataMember]
public string Os_Desc { get; set; }
public string OsVer_Desc { get; set; }
}
}

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

@ -40,7 +40,6 @@ namespace AMESCoreStudio.WebApi
modelBuilder.Entity<WipBarcode>().HasKey(c => new { c.WipNO, c.StartNO, c.EndNO });
modelBuilder.Entity<WipLog>().HasKey(c => new { c.WipID, c.CreateDate });
modelBuilder.Entity<PartMap>().HasKey(c => new { c.CorpSN });
modelBuilder.Entity<WipSop>().HasKey(c => new { c.WipID, c.MaterialSopID });
modelBuilder.Entity<BarcodeWip>().HasKey(c => new { c.WipID, c.BarcodeID });
modelBuilder.Entity<BarcodeStation>().HasKey(c => new { c.BarcodeID ,c.WipID, c.RuleStationID ,c.RuleStatus ,c.InputDate });
modelBuilder.Entity<BarcodeOutfit>().HasKey(c => new { c.BarcodeNo, c.WipNo, c.OutfitNo});
@ -759,6 +758,11 @@ namespace AMESCoreStudio.WebApi
/// 工單資訊確認
/// </summary>
public virtual DbSet<WipCheck> WipChecks { get; set; }
/// <summary>
/// 工單治具資料檔
/// </summary>
public virtual DbSet<WipOutfit> WipOutfits { get; set; }
}
}

Write Preview
Loading…
Cancel
Save