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

1. 修正工單資料

PTD
Ray 3 years ago
parent
2ee4edad75
commit
404df3147e
9 changed files with 467 additions and 418 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. 47
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 20
      AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
  3. 17
      AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
  4. 18
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  5. 33
      AMESCoreStudio.WebApi/Controllers/AMES/WipBoardController.cs
  6. 27
      AMESCoreStudio.WebApi/Controllers/AMES/WipSystemController.cs
  7. 2
      AMESCoreStudio.WebApi/Enums/EnumPCS.cs
  8. 22
      AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs
  9. 7
      AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs

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

@ -823,7 +823,7 @@ namespace AMESCoreStudio.Web.Controllers
} }
/// <summary> /// <summary>
/// SMD點膠 /// SMD點紅膠
/// </summary> /// </summary>
/// <param name="SelectedValue"></param> /// <param name="SelectedValue"></param>
private void GetCheckboxSMD(string SelectedValue = null) private void GetCheckboxSMD(string SelectedValue = null)
@ -833,6 +833,8 @@ namespace AMESCoreStudio.Web.Controllers
{ {
values = SelectedValue.Split(',').ToList(); values = SelectedValue.Split(',').ToList();
} }
else
values.Add("F"); //預設
var q = Enum.GetValues(typeof(EnumPCS.EnumWipBoardSMDType)).Cast<EnumPCS.EnumWipBoardSMDType>() var q = Enum.GetValues(typeof(EnumPCS.EnumWipBoardSMDType)).Cast<EnumPCS.EnumWipBoardSMDType>()
.Select(s => new SelectListItem .Select(s => new SelectListItem
{ {
@ -844,6 +846,30 @@ namespace AMESCoreStudio.Web.Controllers
ViewBag.GetCheckboxSMD = q; ViewBag.GetCheckboxSMD = q;
} }
/// <summary>
/// SMD點防焊膠
/// </summary>
/// <param name="SelectedValue"></param>
private void GetCheckboxSMDSolderMa(string SelectedValue = null)
{
List<string> values = new List<string>();
if (SelectedValue != null)
{
values = SelectedValue.Split(',').ToList();
}
else
values.Add("F"); //預設
var q = Enum.GetValues(typeof(EnumPCS.EnumWipBoardSMDType)).Cast<EnumPCS.EnumWipBoardSMDType>()
.Select(s => new SelectListItem
{
Text = EnumPCS.GetDisplayName(s).ToString(),
Value = s.ToString(),
Selected = values.Where(v => v.Contains(s.ToString())).Count() != 0
}).ToList();
ViewBag.GetCheckboxSMDSolderMa = q;
}
/// <summary> /// <summary>
/// DIP /// DIP
/// </summary> /// </summary>
@ -855,6 +881,8 @@ namespace AMESCoreStudio.Web.Controllers
{ {
values = SelectedValue.Split(',').ToList(); values = SelectedValue.Split(',').ToList();
} }
else
values.Add("A"); //預設
var q = Enum.GetValues(typeof(EnumPCS.EnumWipBoardDIPType)).Cast<EnumPCS.EnumWipBoardDIPType>() var q = Enum.GetValues(typeof(EnumPCS.EnumWipBoardDIPType)).Cast<EnumPCS.EnumWipBoardDIPType>()
.Select(s => new SelectListItem .Select(s => new SelectListItem
{ {
@ -1144,11 +1172,12 @@ namespace AMESCoreStudio.Web.Controllers
model.wipInfo.Priority = model.wipInfo.Priority == "true" ? "Y" : "N"; model.wipInfo.Priority = model.wipInfo.Priority == "true" ? "Y" : "N";
model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "true" ? "Y" : "N"; model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "true" ? "Y" : "N";
model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "true" ? "Y" : "N"; model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "true" ? "Y" : "N";
model.wipInfo.SFISFlowCk = model.wipInfo.SFISFlowCk == "true" ? "Y" : "N";
//板卡 //板卡
model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "true" ? "Y" : "N"; model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "true" ? "Y" : "N";
model.wipBoard.DipTape = model.wipBoard.DipTape == "true" ? "Y" : "N"; model.wipBoard.DipTape = model.wipBoard.DipTape == "true" ? "Y" : "N";
model.wipBoard.DipSolderMask = model.wipBoard.DipSolderMask == "true" ? "Y" : "N";
model.wipBoard.Burn = model.wipBoard.Burn == "true" ? "Y" : "N"; model.wipBoard.Burn = model.wipBoard.Burn == "true" ? "Y" : "N";
model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMask == "true" ? "Y" : "N";
model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "true" ? "Y" : "N"; model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "true" ? "Y" : "N";
//系統 //系統
model.wipSystem.FinePackage = model.wipSystem.FinePackage == "true" ? "Y" : "N"; model.wipSystem.FinePackage = model.wipSystem.FinePackage == "true" ? "Y" : "N";
@ -1175,10 +1204,11 @@ namespace AMESCoreStudio.Web.Controllers
model.wipInfo.Priority = model.wipInfo.Priority == "Y" ? "true" : "false"; model.wipInfo.Priority = model.wipInfo.Priority == "Y" ? "true" : "false";
model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "Y" ? "true" : "false"; model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "Y" ? "true" : "false";
model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "Y" ? "true" : "false"; model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "Y" ? "true" : "false";
model.wipInfo.SFISFlowCk = model.wipInfo.SFISFlowCk == "Y" ? "true" : "false";
//板卡 //板卡
model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "Y" ? "true" : "false"; model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "Y" ? "true" : "false";
model.wipBoard.DipTape = model.wipBoard.DipTape == "Y" ? "true" : "false"; model.wipBoard.DipTape = model.wipBoard.DipTape == "Y" ? "true" : "false";
model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMask == "Y" ? "true" : "false"; model.wipBoard.DipSolderMask = model.wipBoard.DipSolderMask == "Y" ? "true" : "false";
model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "Y" ? "true" : "false"; model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "Y" ? "true" : "false";
model.wipBoard.Burn = model.wipBoard.Burn == "Y" ? "true" : "false"; model.wipBoard.Burn = model.wipBoard.Burn == "Y" ? "true" : "false";
@ -1243,6 +1273,7 @@ namespace AMESCoreStudio.Web.Controllers
{ {
model.wipBoard.Smd = model.wipBoard.SMDs == null ? null : string.Join(',', model.wipBoard.SMDs); model.wipBoard.Smd = model.wipBoard.SMDs == null ? null : string.Join(',', model.wipBoard.SMDs);
model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides); model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides);
model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMasks == null ? null : string.Join(',', model.wipBoard.SmdSolderMasks);
model.wipBoard.ItemNo = model.wipAtt.ItemNO; model.wipBoard.ItemNo = model.wipAtt.ItemNO;
model.wipBoard.WipNo = model.wipInfo.WipNO; model.wipBoard.WipNo = model.wipInfo.WipNO;
await _pcsApi.PostWipBoard(JsonConvert.SerializeObject(model.wipBoard)); await _pcsApi.PostWipBoard(JsonConvert.SerializeObject(model.wipBoard));
@ -1450,7 +1481,7 @@ namespace AMESCoreStudio.Web.Controllers
model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO); model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
if (model.wipSystem != null) if (model.wipSystem != null)
{ {
if (!string.IsNullOrWhiteSpace(model.wipBoard.Engineer)) if (!string.IsNullOrWhiteSpace(model.wipSystem.Engineer))
{ {
var UserInof = _sysApi.GetUserInfoByUserNo(model.wipSystem.Engineer).InvokeAsync().Result; var UserInof = _sysApi.GetUserInfoByUserNo(model.wipSystem.Engineer).InvokeAsync().Result;
if (UserInof != null) if (UserInof != null)
@ -1495,6 +1526,7 @@ namespace AMESCoreStudio.Web.Controllers
GetCheckboxWipAttr(model.wipLabel != null ? model.wipLabel.WipAttr : null); GetCheckboxWipAttr(model.wipLabel != null ? model.wipLabel.WipAttr : null);
GetCheckboxDIP(model.wipBoard != null ? model.wipBoard.DipSide : null); GetCheckboxDIP(model.wipBoard != null ? model.wipBoard.DipSide : null);
GetCheckboxSMD(model.wipBoard != null ? model.wipBoard.Smd : null); GetCheckboxSMD(model.wipBoard != null ? model.wipBoard.Smd : null);
GetCheckboxSMDSolderMa(model.wipBoard != null ? model.wipBoard.SmdSolderMask : null);
return View(model); return View(model);
} }
@ -1536,7 +1568,7 @@ namespace AMESCoreStudio.Web.Controllers
model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO); model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
if (model.wipSystem != null) if (model.wipSystem != null)
{ {
if (!string.IsNullOrWhiteSpace(model.wipBoard.Engineer)) if (!string.IsNullOrWhiteSpace(model.wipSystem.Engineer))
{ {
var UserInof = _sysApi.GetUserInfoByUserNo(model.wipSystem.Engineer).InvokeAsync().Result; var UserInof = _sysApi.GetUserInfoByUserNo(model.wipSystem.Engineer).InvokeAsync().Result;
if (UserInof != null) if (UserInof != null)
@ -1580,6 +1612,7 @@ namespace AMESCoreStudio.Web.Controllers
GetCheckboxWipAttr(model.wipLabel != null ? model.wipLabel.WipAttr : null); GetCheckboxWipAttr(model.wipLabel != null ? model.wipLabel.WipAttr : null);
GetCheckboxDIP(model.wipBoard != null ? model.wipBoard.DipSide : null); GetCheckboxDIP(model.wipBoard != null ? model.wipBoard.DipSide : null);
GetCheckboxSMD(model.wipBoard != null ? model.wipBoard.Smd : null); GetCheckboxSMD(model.wipBoard != null ? model.wipBoard.Smd : null);
GetCheckboxSMDSolderMa(model.wipBoard != null ? model.wipBoard.SmdSolderMask : null);
return View(model); return View(model);
} }
[HttpPost] [HttpPost]
@ -1625,11 +1658,12 @@ namespace AMESCoreStudio.Web.Controllers
model.wipInfo.Priority = model.wipInfo.Priority == "on" ? "Y" : "N"; model.wipInfo.Priority = model.wipInfo.Priority == "on" ? "Y" : "N";
model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "on" ? "Y" : "N"; model.wipInfo.CustomerMedical = model.wipInfo.CustomerMedical == "on" ? "Y" : "N";
model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "on" ? "Y" : "N"; model.wipInfo.CustomerVIP = model.wipInfo.CustomerVIP == "on" ? "Y" : "N";
model.wipInfo.SFISFlowCk = model.wipInfo.SFISFlowCk == "on" ? "Y" : "N";
//板卡 //板卡
model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "on" ? "Y" : "N"; model.wipBoard.DipCarrier = model.wipBoard.DipCarrier == "on" ? "Y" : "N";
model.wipBoard.DipTape = model.wipBoard.DipTape == "on" ? "Y" : "N"; model.wipBoard.DipTape = model.wipBoard.DipTape == "on" ? "Y" : "N";
model.wipBoard.Burn = model.wipBoard.Burn == "on" ? "Y" : "N"; model.wipBoard.Burn = model.wipBoard.Burn == "on" ? "Y" : "N";
model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMask == "on" ? "Y" : "N"; model.wipBoard.DipSolderMask = model.wipBoard.DipSolderMask == "on" ? "Y" : "N";
model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "on" ? "Y" : "N"; model.wipBoard.ISPartsBake = model.wipBoard.ISPartsBake == "on" ? "Y" : "N";
//系統 //系統
model.wipSystem.FinePackage = model.wipSystem.FinePackage == "on" ? "Y" : "N"; model.wipSystem.FinePackage = model.wipSystem.FinePackage == "on" ? "Y" : "N";
@ -1701,6 +1735,7 @@ namespace AMESCoreStudio.Web.Controllers
if (!string.IsNullOrWhiteSpace(model.wipBoard.BiTemperature)) if (!string.IsNullOrWhiteSpace(model.wipBoard.BiTemperature))
{ {
model.wipBoard.Smd = model.wipBoard.SMDs == null ? null : string.Join(',', model.wipBoard.SMDs); model.wipBoard.Smd = model.wipBoard.SMDs == null ? null : string.Join(',', model.wipBoard.SMDs);
model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMasks == null ? null : string.Join(',', model.wipBoard.SmdSolderMasks);
model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides); model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides);
model.wipBoard.ItemNo = model.wipAtt.ItemNO; model.wipBoard.ItemNo = model.wipAtt.ItemNO;
model.wipBoard.WipNo = model.wipInfo.WipNO; model.wipBoard.WipNo = model.wipInfo.WipNO;

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

@ -301,7 +301,7 @@
<input id="flowId" type="hidden" name="flowId" value="" /> <input id="flowId" type="hidden" name="flowId" value="" />
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<input type="checkbox" title="SFIS途程確認" /> <input asp-for="wipInfo.SFISFlowCk" type="checkbox" title="途程確認" />
</div> </div>
</div> </div>
<table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table> <table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table>
@ -325,7 +325,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">SMD點膠</label> <label class="layui-form-label">SMD點紅膠</label>
<div class="layui-input-block"> <div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox> <cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
</div> </div>
@ -333,12 +333,21 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">SMD備註</label> <label class="layui-form-label">SMD點紅膠</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" /> <input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label> <label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -356,7 +365,7 @@
<input @if (Model.wipBoard != null) { @(Model.wipBoard. == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />*@ <input @if (Model.wipBoard != null) { @(Model.wipBoard. == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />*@
<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" /> <input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
<input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" /> <input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" /> <input asp-for="wipBoard.DipSolderMask" type="checkbox" title="點防焊膠" />
</div> </div>
</div> </div>
</div> </div>
@ -393,8 +402,9 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<div class="layui-input-inline">
<input asp-for="wipBoard.ISPartsBake" type="checkbox" title="零件是否需要烘烤" /> <input asp-for="wipBoard.ISPartsBake" type="checkbox" title="零件是否需要烘烤" />
</div>
<label class="layui-form-label">零件烘烤溫度</label> <label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select> <select asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>

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

@ -234,7 +234,7 @@
<input id="flowId" type="hidden" name="flowId" value="" /> <input id="flowId" type="hidden" name="flowId" value="" />
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<input type="checkbox" title="SFIS途程確認" /> <input asp-for="wipInfo.SFISFlowCk" type="checkbox" title="途程確認" />
</div> </div>
<table id="rulestionOld" class="layui-table"> <table id="rulestionOld" class="layui-table">
<thead> <thead>
@ -462,7 +462,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">SMD點膠</label> <label class="layui-form-label">SMD點紅膠</label>
<div class="layui-input-block"> <div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox> <cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
</div> </div>
@ -470,12 +470,21 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">SMD備註</label> <label class="layui-form-label">SMD點紅膠備註</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" /> <input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label> <label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -490,7 +499,7 @@
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox> <cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" /> <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" /> <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.SmdSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" /> <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />
@*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" /> @*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
<input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" /> <input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@ <input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@

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

@ -374,7 +374,7 @@
<input id="flowId" type="hidden" name="flowId" value=@Model.wipInfo.FlowRuleID /> <input id="flowId" type="hidden" name="flowId" value=@Model.wipInfo.FlowRuleID />
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<input type="checkbox" title="SFIS途程確認" name="" /> <input @(Model.wipInfo.SFISFlowCk == "Y" ? "checked" : "") type="checkbox" title="途程確認" name="wipInfo.SFISFlowCk" />
</div> </div>
<table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table> <table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table>
<table id="rulestionOld" class="layui-table"> <table id="rulestionOld" class="layui-table">
@ -441,7 +441,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">SMD點膠</label> <label class="layui-form-label">SMD點紅膠</label>
<div class="layui-input-block"> <div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox> <cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
</div> </div>
@ -449,12 +449,21 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">SMD備註</label> <label class="layui-form-label">SMD點紅膠備註</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" /> <input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label> <label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -469,7 +478,7 @@
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox> <cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" /> <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" /> <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.SmdSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" /> <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />
@*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" /> @*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
<input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" /> <input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@ <input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
@ -511,7 +520,6 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" /> <input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
<label class="layui-form-label">零件烘烤溫度</label> <label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select> <select asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>

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

@ -83,38 +83,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
public async Task<ResultModel<WipBoard>> PutWipBoard([FromBody] WipBoard wipBoard) public async Task<ResultModel<WipBoard>> PutWipBoard([FromBody] WipBoard wipBoard)
{ {
ResultModel<WipBoard> result = new ResultModel<WipBoard>(); ResultModel<WipBoard> result = new ResultModel<WipBoard>();
try
var getWipBoard = GetWipBoard(wipBoard.WipNo).Result.Value;
if (getWipBoard != null)
{ {
_context.Entry(getWipBoard).State = EntityState.Modified; if (GetWipBoard(wipBoard.WipNo).Result.Value != null)
getWipBoard.BiosVer = wipBoard.BiosVer; {
getWipBoard.BiRatio = wipBoard.BiRatio; _context.Entry(wipBoard).State = EntityState.Modified;
getWipBoard.BiTemperature = wipBoard.BiTemperature; _context.Entry<WipBoard>(wipBoard).Property("CreateDate").IsModified = false;
getWipBoard.BiTime = wipBoard.BiTime; _context.Entry<WipBoard>(wipBoard).Property("CreateUserID").IsModified = false;
getWipBoard.Burn = wipBoard.Burn; wipBoard.UpdateDate = DateTime.Now;
getWipBoard.BurnLocation = wipBoard.BurnLocation; wipBoard.UpdateUserID = 0;
getWipBoard.Checksum = wipBoard.Checksum;
getWipBoard.DipCarrier = wipBoard.DipCarrier;
getWipBoard.DipSide = wipBoard.DipSide;
getWipBoard.DipTape = wipBoard.DipTape;
getWipBoard.PartsBake = wipBoard.PartsBake;
getWipBoard.PartsBakeTime = wipBoard.PartsBakeTime;
getWipBoard.PcbBake = wipBoard.PcbBake;
getWipBoard.Smd = wipBoard.Smd;
getWipBoard.SolderPaste = wipBoard.SolderPaste;
getWipBoard.Engineer = wipBoard.Engineer;
getWipBoard.UpdateDate = DateTime.Now;
getWipBoard.UpdateUserID = 0;
} }
else else
{ {
_context.WipBoards.Add(wipBoard); _context.WipBoards.Add(wipBoard);
} }
try
{
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
result.Success = true; result.Success = true;
result.Msg = "OK"; result.Msg = "OK";

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

@ -83,28 +83,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
var getwipSystem = GetWipSystem(wipSystem.WipNo).Result.Value; var getwipSystem = GetWipSystem(wipSystem.WipNo).Result.Value;
if (getwipSystem != null) if (getwipSystem != null)
{ {
_context.Entry(getwipSystem).State = EntityState.Modified; _context.Entry(wipSystem).State = EntityState.Modified;
getwipSystem.BiMemo = wipSystem.BiMemo; _context.Entry<WipSystem>(wipSystem).Property("CreateDate").IsModified = false;
getwipSystem.BiosVer = wipSystem.BiosVer; _context.Entry<WipSystem>(wipSystem).Property("CreateUserID").IsModified = false;
getwipSystem.BiRatio = wipSystem.BiRatio; wipSystem.UpdateDate = DateTime.Now;
getwipSystem.BiTemperature = wipSystem.BiTemperature; wipSystem.UpdateUserID = 0;
getwipSystem.BiTime = wipSystem.BiTime;
getwipSystem.Checksum = wipSystem.Checksum;
getwipSystem.Cpu = wipSystem.Cpu;
getwipSystem.DmiBi = wipSystem.DmiBi;
getwipSystem.Ec = wipSystem.Ec;
getwipSystem.FinePackage = wipSystem.FinePackage;
getwipSystem.Fw = wipSystem.Fw;
getwipSystem.Fw1 = wipSystem.Fw1;
getwipSystem.Fw2 = wipSystem.Fw2;
getwipSystem.Jumper = wipSystem.Jumper;
getwipSystem.Memo = wipSystem.Memo;
getwipSystem.OsVer = wipSystem.OsVer;
getwipSystem.PowerMode = wipSystem.PowerMode;
getwipSystem.Ram = wipSystem.Ram;
getwipSystem.Engineer = wipSystem.Engineer;
getwipSystem.UpdateDate = DateTime.Now;
getwipSystem.UpdateUserID = 0;
} }
else else
{ {

2
AMESCoreStudio.WebApi/Enums/EnumPCS.cs
View File

@ -276,7 +276,7 @@ namespace AMESCoreStudio.WebApi.Enum
/// NA /// NA
/// </summary> /// </summary>
[Display(Name = "NA")] [Display(Name = "NA")]
N = 0, N = 3,
} }
/// <summary> /// <summary>

22
AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs
View File

@ -60,11 +60,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES
public string SmdRemarks { get; set; } public string SmdRemarks { get; set; }
/// <summary> /// <summary>
/// SMD點防焊膠(Y/N) /// SMD點防焊膠
/// </summary> /// </summary>
[Required]
[Column("SMD_SOLDER_MASK")] [Column("SMD_SOLDER_MASK")]
[StringLength(2)] [StringLength(30)]
[DataMember] [DataMember]
public string SmdSolderMask { get; set; } public string SmdSolderMask { get; set; }
@ -73,7 +72,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary> /// </summary>
[Column("SMD_SM_REMARKS")] [Column("SMD_SM_REMARKS")]
[DataMember] [DataMember]
[Display(Name = "SMD點膠")] [Display(Name = "SMD點防焊膠備註")]
public string SmdSMRemarks { get; set; } public string SmdSMRemarks { get; set; }
/// <summary> /// <summary>
@ -114,6 +113,15 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[Display(Name = "貼付膠帶")] [Display(Name = "貼付膠帶")]
public string DipTape { get; set; } public string DipTape { get; set; }
/// <summary>
/// 是否需要點防焊膠(Y/N)
/// </summary>
[Required]
[Column("DIP_SOLDER_MASK")]
[StringLength(2)]
[DataMember]
public string DipSolderMask { get; set; }
/// <summary> /// <summary>
/// 是否燒錄(Y/N) /// 是否燒錄(Y/N)
/// </summary> /// </summary>
@ -340,6 +348,12 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[NotMapped] [NotMapped]
public virtual List<string> SMDs { get; set; } public virtual List<string> SMDs { get; set; }
/// <summary>
/// SMD防焊膠s
/// </summary>
[NotMapped]
public virtual List<string> SmdSolderMasks { get; set; }
/// <summary> /// <summary>
/// 正背面 /// 正背面
/// </summary> /// </summary>

7
AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs
View File

@ -137,6 +137,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[Display(Name = "單箱數量")] [Display(Name = "單箱數量")]
public int BoxCNT { get; set; } = 0; public int BoxCNT { get; set; } = 0;
/// <summary>
/// SFIS流程確認(Y/N)
/// </summary>
[Column("SFIS_FLOW_CK")]
[DataMember]
public string SFISFlowCk { get; set; } = "N";
/// <summary> /// <summary>
/// 判斷前製程是否已經投入 (Y-判斷;N-不判斷) /// 判斷前製程是否已經投入 (Y-判斷;N-不判斷)
/// </summary> /// </summary>

Write Preview
Loading…
Cancel
Save