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

1. 修正

PTD
ray 3 years ago
parent
1dc4d7ab2c
commit
a13894cb99
11 changed files with 562 additions and 677 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. 259
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 2
      AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
  3. 812
      AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
  4. 52
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  5. 73
      AMESCoreStudio.Web/Views/PCS/PCS999.cshtml
  6. 4
      AMESCoreStudio.Web/wwwroot/js/layAutoComplete.js
  7. 27
      AMESCoreStudio.WebApi/Enums/EnumPCS.cs
  8. 4
      AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
  9. 29
      AMES程式測試回報(2022-02-12).docx
  10. BIN
      TxBarcodeInfo001.vsd
  11. BIN
      安勤問題待處理/AMES待解決之問題_All總表.xlsx

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

@ -711,6 +711,27 @@ namespace AMESCoreStudio.Web.Controllers
ViewBag.GetWipSystemTypeSelect = q;
}
/// <summary>
/// 工單資訊 系統工程資訊 DMI燒入 Type
/// </summary>
/// <param name="SelectedValue"></param>
private void GetWipSystemDMITypeSelect(string SelectedValue = null)
{
List<string> values = new List<string>();
if (SelectedValue != null)
{
values = SelectedValue.Split(',').ToList();
}
var q = Enum.GetValues(typeof(EnumPCS.EnumWipSystemDMIBIType)).Cast<EnumPCS.EnumWipSystemDMIBIType>()
.Select(s => new SelectListItem
{
Text = EnumPCS.GetDisplayName(s).ToString(),
Value = Convert.ToInt32(Enum.Parse(typeof(EnumPCS.EnumWipSystemDMIBIType), s.ToString())).ToString()
}).ToList();
ViewBag.GetWipSystemDMITypeSelect = q;
}
/// <summary>
/// SOP_Type
/// </summary>
@ -1008,7 +1029,7 @@ namespace AMESCoreStudio.Web.Controllers
}
/// <summary>
/// 生產單位 Json By WipNp
/// 生產單位 Json By WipNo
/// </summary>
/// <returns></returns>
[HttpPost]
@ -1242,7 +1263,7 @@ namespace AMESCoreStudio.Web.Controllers
/// <summary>
/// 用工單號碼查詢綁定作業站
/// </summary>
/// <returns>RuleStation </returns>
/// <returns>StationID</returns>
[HttpPost]
public async Task<JsonResult> GetRuleStationByWipNoUnitNoJson(string wipNo)
{
@ -1357,7 +1378,6 @@ namespace AMESCoreStudio.Web.Controllers
#region PCS001 工單資料維護
public async Task<IActionResult> PCS001(WipDataViewModel model = null)
{
//await GetUnitList();
await GetProductType();
await GetFactoryInfo();
await GetFactoryUnit();
@ -1784,26 +1804,7 @@ namespace AMESCoreStudio.Web.Controllers
model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipNO);
}
await GetItemsList();
await GetProductType();
await GetFactoryInfo();
await GetFactoryUnit();
await GetLineInfo();
await GetMFGType();
await GetProcessTypes();
await GetMaterialFlowRuleJson(model.wipAtt.ItemNO, model.wipInfo.UnitNO);
await GetOutfitCommodityInfoJson();
await GetFactoryUnitByWipNoJson(model.wipInfo.WipNO);
await GetRuleStationByWipNoUnitNoJson(model.wipInfo.WipNO);
GetWipSEQType();
GetBurnType();
GetPartsBakeType();
GetPCBBakeTypeSelect();
GetPCBProcessingTypeSelect();
GetSolderPasteSelect();
GetWipType();
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);
@ -1884,27 +1885,9 @@ namespace AMESCoreStudio.Web.Controllers
model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipNO);
}
await GetItemsList();
await GetProductType();
await GetFactoryInfo();
await GetFactoryUnit();
await GetLineInfo();
await GetMFGType();
await GetProcessTypes();
await GetMaterialFlowRuleJson(model.wipAtt.ItemNO, model.wipInfo.UnitNO);
await GetOutfitCommodityInfoJson();
await GetFactoryUnitByWipNoJson(model.wipInfo.WipNO);
await GetRuleStationByWipNoUnitNoJson(model.wipInfo.WipNO);
GetWipSEQType();
GetBurnType();
GetPartsBakeType();
GetPCBBakeTypeSelect();
GetPCBProcessingTypeSelect();
GetSolderPasteSelect();
GetWipType();
GetWipSystemTypeSelect();
GetWipSystemPMTypeSelect();
GetSOPTypeSelect();
await WipDataSelectAll(model.wipAtt.WipNO, model.wipAtt.ItemNO, model.wipInfo.UnitNO);
GetCheckboxApproveLogo(model.wipLabel != null ? model.wipLabel.ApproveLogo : null);
GetCheckboxCompanyLogo(model.wipLabel != null ? model.wipLabel.CompanyLogo : null);
GetCheckboxPrintMode(model.wipLabel != null ? model.wipLabel.PrintMode : null);
@ -1922,34 +1905,7 @@ namespace AMESCoreStudio.Web.Controllers
{
#region 選單
await GetItemsList();
await GetProductType();
await GetFactoryInfo();
await GetFactoryUnit();
await GetLineInfo();
await GetMFGType();
await GetProcessTypes();
await GetFlowRuleList();
await GetFactoryUnitByWipNoJson(model.wipInfo.WipNO);
await GetMaterialFlowRuleJson(model.wipAtt.ItemNO, model.wipInfo.UnitNO);
await GetOutfitCommodityInfoJson();
await GetRuleStationByWipNoUnitNoJson(model.wipInfo.WipNO);
GetWipSEQType();
GetBurnType();
GetPartsBakeType();
GetPCBBakeTypeSelect();
GetPCBProcessingTypeSelect();
GetSolderPasteSelect();
GetWipType();
GetWipSystemTypeSelect();
GetSOPTypeSelect();
GetCheckboxApproveLogo();
GetCheckboxCompanyLogo();
GetCheckboxPrintMode();
GetCheckboxWipAttr();
GetCheckboxDIP();
GetCheckboxSMD();
GetWipSystemPMTypeSelect();
#endregion
@ -2206,19 +2162,26 @@ namespace AMESCoreStudio.Web.Controllers
//取得使用者上傳檔案的原始檔名
FileName = Path.GetFileName(formFile.FileName);
//取原始檔名中的副檔名
var fileExt = Path.GetExtension(FileName);
//var fileExt = Path.GetExtension(FileName);
//為避免使用者上傳的檔案名稱發生重複，重新給一個亂數名稱
NewName = Path.GetRandomFileName() + fileExt;
//NewName = Path.GetRandomFileName() + fileExt;
//指定要寫入的路徑、檔名和副檔名
FilePath = $"\\PDF\\";//本機目錄
using (var stream = new FileStream(_env.WebRootPath + FilePath + FileName, FileMode.Create))
FilePath = $@"{_env.WebRootPath}\UploadFolder\{model.wipInfo.WipNO}";
var path = $@"{FilePath}\{FileName}";
if (!System.IO.Directory.Exists(FilePath))
{
System.IO.Directory.CreateDirectory(FilePath);
}
using (var stream = new FileStream(path, FileMode.Create))
{
await formFile.CopyToAsync(stream);
}
model.wipInfoBlob.WipNo = model.wipInfo.WipNO;
model.wipInfoBlob.ImageName = FileName;
model.wipInfoBlob.Filepath = FilePath;
model.wipInfoBlob.Filepath = $@"\UploadFolder\{model.wipInfo.WipNO}\";
result = await _pcsApi.PostWipInfoBlob(JsonConvert.SerializeObject(model.wipInfoBlob));
}
}
@ -2267,6 +2230,63 @@ namespace AMESCoreStudio.Web.Controllers
}
}
/// <summary>
/// 工單資料畫面 Select All
/// </summary>
/// <param name="WipNo">工單號碼</param>
/// <param name="ItemNo">工單料號</param>
/// <param name="UnitNo">生產單位</param>
/// <returns></returns>
public async Task WipDataSelectAll(string WipNo = null , string ItemNo = null , string UnitNo=null)
{
// KP Items
await GetItemsList();
// 產品別
await GetProductType();
// 廠別 委外廠
await GetFactoryInfo();
// 生產單位
await GetFactoryUnit();
// 線別
await GetLineInfo();
// 正背面
await GetMFGType();
// 工單類型
await GetProcessTypes();
// 料號流程
await GetMaterialFlowRuleJson(ItemNo, UnitNo);
// 治具種類
await GetOutfitCommodityInfoJson();
// 生產單位 By WipNo
await GetFactoryUnitByWipNoJson(WipNo);
// 工單號碼綁定作業站 治具使用
await GetRuleStationByWipNoUnitNoJson(WipNo);
// 工程資訊-DMI 燒入
GetWipSystemDMITypeSelect();
// 制令序號
GetWipSEQType();
// 燒入
GetBurnType();
// 零件烘烤
GetPartsBakeType();
// 板卡資訊 PCB烘烤
GetPCBBakeTypeSelect();
// 板卡資訊 PCB加工
GetPCBProcessingTypeSelect();
// 板卡資訊 錫膏
GetSolderPasteSelect();
// 工單狀態 標準 重工
GetWipType();
// 工程資訊 軟體料號Type
GetWipSystemTypeSelect();
// 工程資訊 Power Model
GetWipSystemPMTypeSelect();
// SOP Type
GetSOPTypeSelect();
}
/// <summary>
/// CheckMAC 資料是否正確
/// </summary>
@ -4330,78 +4350,6 @@ namespace AMESCoreStudio.Web.Controllers
return PartialView("_SOPPartial", Json(new Table() { count = 0, data = null }));
}
#region PCS025組件资料维护相关
public IActionResult PCS025()
@ -4586,19 +4534,6 @@ namespace AMESCoreStudio.Web.Controllers
#endregion
public async Task<IActionResult> PCS999()
{
return View();
}
//頁面提交，id=0 添加，id>0 修改
[HttpPost]
public async Task<IActionResult> PCS999Async(MaterialKpDtos model)
{
var aa = "string";
return View(model);
}
/// <summary>
/// 登入UserID
/// </summary>

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

@ -56,7 +56,7 @@ namespace AMESCoreStudio.Web
ITask<List<MFGType>> GetMFGTypes();
/// <summary>
/// 正背面
/// 工單類型
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/ProcessTypes")]

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

@ -411,559 +411,557 @@
}
</tbody>
</table>
</div>
</div>
@* 板卡-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer" onchange="getUserName(this);" />
</div>
@* 板卡-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer" onchange="getUserName(this);" />
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點紅膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點紅膠</label>
<div class="layui-form-item">
<label class="layui-form-label">SMD點紅膠備註</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMD" asp-for="wipBoard.SMDs" asp-skin="defult"></cl-checkbox>
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">SMD點紅膠備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SmdRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">SMD點防焊膠</label>
<div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxSMDSolderMa" asp-for="wipBoard.SmdSolderMasks" asp-skin="defult"></cl-checkbox>
<input asp-for="wipBoard.SmdSMRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">SMD點防焊膠備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SmdSMRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">DIP</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />
@*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
<input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">DIP</label>
<div class="layui-form-item">
<label class="layui-form-label">DIP備註</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxDIP" asp-for="wipBoard.DipSides" asp-skin="defult"></cl-checkbox>
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") } type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />
@*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
<input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
<input asp-for="wipBoard.DipRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">DIP備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.DipRemarks" class="layui-input" type="text" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">燒錄</label>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.Burn == "Y" ? "checked" : "") } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
@*<input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />*@
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BurnLocation" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnLocation" class="layui-input" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">燒錄</label>
<div class="layui-input-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.Burn == "Y" ? "checked" : "") } type="checkbox" title="是否燒入" name="wipBoard.Burn" />
@*<input asp-for="wipBoard.Burn" type="checkbox" title="是否燒入" />*@
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BurnLocation" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnLocation" class="layui-input" />
</div>
</div>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">燒錄備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">燒錄備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BurnRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>
<div class="layui-form-item">
<div class="layui-inline">
<input @if (Model.wipBoard != null) { @(Model.wipBoard.ISPartsBake == "Y" ? "checked" : "") } type="checkbox" title="零件是否需要烘烤" name="wipBoard.ISPartsBake" />
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤溫度</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPartsBakeTypeList" asp-for="wipBoard.PartsBake" class=""></select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤時間</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeTime" class="layui-input" />
<span asp-validation-for="wipBoard.PartsBakeTime" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">零件烘烤時間</label>
<div class="layui-form-item">
<label class="layui-form-label">零件烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeTime" class="layui-input" />
<span asp-validation-for="wipBoard.PartsBakeTime" class="layui-bg-red"></span>
<input asp-for="wipBoard.PartsBakeRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">零件烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PartsBakeRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB烘烤</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB烘烤</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPCBBakeTypeSelect" asp-for="wipBoard.PcbBake" class=""></select>
<div class="layui-form-item">
<label class="layui-form-label">PCB烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbBakeRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB烘烤備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbBakeRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.SolderPaste"></label>
<div class="layui-input-block">
<select disabled asp-items="@ViewBag.GetSolderPasteSelect" asp-for="wipBoard.SolderPaste"></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.SolderPaste"></label>
<div class="layui-form-item">
<label class="layui-form-label">錫膏備註</label>
<div class="layui-input-block">
<select disabled asp-items="@ViewBag.GetSolderPasteSelect" asp-for="wipBoard.SolderPaste"></select>
<input asp-for="wipBoard.SolderPasteRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">錫膏備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.SolderPasteRemarks" class="layui-input" type="text" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB加工</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPCBProcessingTypeSelect" asp-for="wipBoard.PcbProcessing" class=""></select>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">PCB加工</label>
<div class="layui-input-inline">
<select disabled asp-items="@ViewBag.GetPCBProcessingTypeSelect" asp-for="wipBoard.PcbProcessing" class=""></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB加工備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbProcessingRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">PCB加工備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.PcbProcessingRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
<label asp-for="wipBoard.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRatio" class="layui-input" />
<span asp-validation-for="wipBoard.BiRatio" class="layui-bg-red"></span>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
<label asp-for="wipBoard.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRatio" class="layui-input" />
<span asp-validation-for="wipBoard.BiRatio" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTemperature" class="layui-input" />
<span asp-validation-for="wipBoard.BiTemperature" class="layui-bg-red"></span>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTemperature" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTemperature" class="layui-input" />
<span asp-validation-for="wipBoard.BiTemperature" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTime" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTime" class="layui-input" />
<span asp-validation-for="wipBoard.BiTime" class="layui-bg-red"></span>
<div class="layui-input-inline">
<label asp-for="wipBoard.BiTime" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiTime" class="layui-input" />
<span asp-validation-for="wipBoard.BiTime" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">燒機備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">燒機備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.BiosVer" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.BiosVer" class="layui-input" />
<span asp-validation-for="wipBoard.BiosVer" class="layui-bg-red"></span>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.BiosVer" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.BiosVer" class="layui-input" />
<span asp-validation-for="wipBoard.BiosVer" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">BIOS備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiosRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">BIOS備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.BiosRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.Checksum" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.Checksum" class="layui-input" />
<span asp-validation-for="wipBoard.Checksum" class="layui-bg-red"></span>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipBoard.Checksum" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipBoard.Checksum" class="layui-input" />
<span asp-validation-for="wipBoard.Checksum" class="layui-bg-red"></span>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">Check Sum備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.CsRemarks" class="layui-input" type="text" />
<div class="layui-form-item">
<label class="layui-form-label">Check Sum備註</label>
<div class="layui-input-block">
<input asp-for="wipBoard.CsRemarks" class="layui-input" type="text" />
</div>
</div>
</div>
</div>
@* 系統-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Engineer" readonly="readonly" />
</div>
@* 系統-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Engineer" readonly="readonly" />
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Engineer_Name" readonly="readonly" />
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">Power Mode</label>
<div class="layui-input-inline">
<select disabled asp-for="wipSystem.PowerModeType" asp-items="@ViewBag.GetWipSystemPMTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.PowerMode" autocomplete="off" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">Power Mode</label>
<div class="layui-input-inline">
<select disabled asp-for="wipSystem.PowerModeType" asp-items="@ViewBag.GetWipSystemPMTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<input class="layui-input" style="text-transform:uppercase;" asp-for="wipSystem.PowerMode" autocomplete="off" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PLM參考</label>
<div class="layui-input-block">
<input class="layui-input" asp-for="wipSystem.PowerMode_Desc" readonly="readonly" />
<div class="layui-form-item">
<label class="layui-form-label">PLM生產備註</label>
<div class="layui-input-block">
<textarea class="layui-textarea" asp-for="wipSystem.PowerMode_Desc" readonly="readonly"></textarea>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
<label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipSystem.BiRatio" class="layui-input" />
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
<label asp-for="wipSystem.BiRatio" class="layui-form-label"></label>
<div class="layui-input-block">
<input asp-for="wipSystem.BiRatio" class="layui-input" />
</div>
</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" />
<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" />
</div>
</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" />
<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" />
</div>
</div>
<label asp-for="wipSystem.BiMemo" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipSystem.BiMemo" class="layui-input" />
</div>
</div>
<label asp-for="wipSystem.BiMemo" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipSystem.BiMemo" class="layui-input" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipSystem.BiosVer" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipSystem.BiosVer" class="layui-input" />
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label asp-for="wipSystem.BiosVer" class="layui-form-label"></label>
<div class="layui-input-inline">
<input asp-for="wipSystem.BiosVer" class="layui-input" />
</div>
<label asp-for="wipSystem.Checksum" class="layui-form-label">Checksum</label>
<div class="layui-input-inline">
<input asp-for="wipSystem.Checksum" class="layui-input" />
<label asp-for="wipSystem.Checksum" class="layui-form-label">Checksum</label>
<div class="layui-input-inline">
<input asp-for="wipSystem.Checksum" class="layui-input" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Cpu"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Cpu" autocomplete="off" />
</div>
<label class="layui-form-label" asp-for="wipSystem.Ram"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ram" autocomplete="off" />
</div>
<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" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Cpu"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Cpu" autocomplete="off" />
</div>
<label class="layui-form-label" asp-for="wipSystem.Ram"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ram" autocomplete="off" />
</div>
<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" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">EC</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ec" autocomplete="off" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">EC</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Ec" autocomplete="off" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw" autocomplete="off" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw" autocomplete="off" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW1</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw1" autocomplete="off" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW1</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw1" autocomplete="off" />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW2</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw2" autocomplete="off" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW2</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Fw2" autocomplete="off" />
</div>
</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 type="checkbox" title="是否為精裝" @if (Model.wipSystem != null) { @(Model.wipSystem.FinePackage == "Y" ? "checked" : "") } />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FINE_PACKAGE</label>
<div class="layui-input-inline">
<input type="checkbox" title="是否為精裝" @if (Model.wipSystem != null) { @(Model.wipSystem.FinePackage == "Y" ? "checked" : "") } />
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.DmiBi"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.DmiBi" autocomplete="off" />
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.DmiBi"></label>
<div class="layui-input-inline">
<select disabled asp-for="wipSystem.DmiBi" asp-items="@ViewBag.GetWipSystemDMITypeSelect" class=""></select>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-form-item">
<label class="layui-form-label" asp-for="wipSystem.Jumper"></label>
<div class="layui-input-inline">
<div class="layui-input-block">
<input class="layui-input" asp-for="wipSystem.Jumper" autocomplete="off" />
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input class="layui-input" asp-for="wipSystem.Memo" />
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<textarea class="layui-textarea" asp-for="wipSystem.Memo"></textarea>
</div>
</div>
</div>
</div>
@* 治具組合sheet *@
<div class="layui-tab-item">
<table id="MydataTable" class="layui-table">
@{ int j = 0;}
<thead>
<tr>
<th>
治具種類
</th>
<th>
生產單位
</th>
<th>
作業站
</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.WipOutfits)
{
<tr>
<td>
@index.PartNoName
</td>
<td>
@index.UnitNoName
</td>
<td>
@index.StationName
</td>
</tr>
j++;
}
</tbody>
</table>
</div>
@* SOP文件 sheet *@
<div class="layui-tab-item" lay-filter="test2">
<table class="layui-hide" id="query" lay-filter="query"></table>
<table lay-filter="demo" class="layui-table">
@{ int l = 0;}
<thead>
<tr>
<th lay-data="{field:'username', width:100}">SOP文件敘述</th>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
<th lay-data="{field:'sign'}">SOP類型</th>
<th lay-data="{field:'sign'}">生產單位</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.WipSops)
{
@* 治具組合sheet *@
<div class="layui-tab-item">
<table id="MydataTable" class="layui-table">
@{ int j = 0;}
<thead>
<tr>
<td>
@index.SOPName
</td>
<td>
@index.SOPPath
</td>
<td>
@index.SOPTypeName
</td>
<td>
@index.UnitNoName
</td>
<th>
治具種類
</th>
<th>
生產單位
</th>
<th>
作業站
</th>
</tr>
l++;
}
</tbody>
</table>
</div>
@* 標籤選項sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<label class="layui-form-label">列印方式</label>
<cl-radio asp-items="@ViewBag.GetCheckboxPrintMode" asp-for="wipLabel.PrintMode"></cl-radio>
</div>
<div class="layui-form-item">
<label class="layui-form-label">列印張數</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" asp-for="wipLabel.PrintPage" />
</div>
<div class="layui-form-mid layui-word-aux">張</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">認證LOGO</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxApproveLogo" asp-for="wipLabel.ApproveLogos" asp-skin="defult"></cl-checkbox>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">公司LOGO</label>
<div class="layui-input-block">
<cl-radio asp-items="@ViewBag.GetCheckboxCompanyLogo" asp-for="wipLabel.CompanyLogo"></cl-radio>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">工單屬性</label>
<div class="layui-input-block">
<cl-radio asp-items="@ViewBag.GetCheckboxWipAttr" asp-for="wipLabel.WipAttr"></cl-radio>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input asp-for="wipLabel.Remarks" class="layui-input" type="text" />
</div>
</thead>
<tbody>
@foreach (var index in Model.WipOutfits)
{
<tr>
<td>
@index.PartNoName
</td>
<td>
@index.UnitNoName
</td>
<td>
@index.StationName
</td>
</tr>
j++;
}
</tbody>
</table>
</div>
</div>
@* 上傳資料sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
@* SOP文件 sheet *@
<div class="layui-tab-item" lay-filter="test2">
<table class="layui-hide" id="query" lay-filter="query"></table>
<table lay-filter="demo" class="layui-table">
@{ int l = 0;}
<thead>
<tr>
<th lay-data="{field:'username', width:100}">檔案名稱</th>
<th lay-data="{field:'username', width:100}">SOP文件敘述</th>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
<th lay-data="{field:'sign'}">SOP類型</th>
<th lay-data="{field:'sign'}">生產單位</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipInfoBlobs)
@foreach (var index in Model.WipSops)
{
<tr>
<td>
@index.ImageName
@index.SOPName
</td>
<td>
@index.SOPPath
</td>
<td>
@index.SOPTypeName
</td>
<td>
@index.Filepath
@index.UnitNoName
</td>
</tr>
l++;
}
</tbody>
</table>
</div>
@* 標籤選項sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<label class="layui-form-label">列印方式</label>
<cl-radio asp-items="@ViewBag.GetCheckboxPrintMode" asp-for="wipLabel.PrintMode"></cl-radio>
</div>
<div class="layui-form-item">
<label class="layui-form-label">列印張數</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" asp-for="wipLabel.PrintPage" />
</div>
<div class="layui-form-mid layui-word-aux">張</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">認證LOGO</label>
<div class="layui-input-block">
<cl-checkbox asp-items="@ViewBag.GetCheckboxApproveLogo" asp-for="wipLabel.ApproveLogos" asp-skin="defult"></cl-checkbox>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">公司LOGO</label>
<div class="layui-input-block">
<cl-radio asp-items="@ViewBag.GetCheckboxCompanyLogo" asp-for="wipLabel.CompanyLogo"></cl-radio>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">工單屬性</label>
<div class="layui-input-block">
<cl-radio asp-items="@ViewBag.GetCheckboxWipAttr" asp-for="wipLabel.WipAttr"></cl-radio>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input asp-for="wipLabel.Remarks" class="layui-input" type="text" />
</div>
</div>
</div>
@* 上傳資料sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<table lay-filter="demo" class="layui-table">
<thead>
<tr>
<th lay-data="{field:'username', width:100}">檔案名稱</th>
<th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipInfoBlobs)
{
<tr>
<td>
@index.ImageName
</td>
<td>
@index.Filepath
</td>
</tr>
}
</tbody>
</table>
</div>
</div>
</div>
</div>
</form>
</div>
</form>
</div>
</div>
@section Scripts {

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

@ -719,9 +719,9 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">PLM參考</label>
<label class="layui-form-label">PLM生產備註</label>
<div class="layui-input-block">
<input class="layui-input" asp-for="wipSystem.PowerMode_Desc" readonly="readonly" />
<textarea class="layui-textarea" asp-for="wipSystem.PowerMode_Desc" readonly="readonly"></textarea>
</div>
</div>
@ -755,13 +755,13 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">BIOS</label>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<select asp-for="wipSystem.BiosType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Bios" autocomplete="off" />
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:300px;">
<input class="layui-input" asp-for="wipSystem.Bios_Desc" readonly="readonly" />
</div>
<label class="layui-form-label">Ver.</label>
@ -778,13 +778,13 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">EC</label>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<select asp-for="wipSystem.ECType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Ec" autocomplete="off" />
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:300px;">
<input class="layui-input" asp-for="wipSystem.Ec_Desc" readonly="readonly" />
</div>
</div>
@ -793,13 +793,13 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW</label>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<select asp-for="wipSystem.FWType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Fw" autocomplete="off" />
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width: 300px;">
<input class="layui-input" asp-for="wipSystem.Fw_Desc" readonly="readonly" />
</div>
</div>
@ -808,13 +808,13 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW1</label>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<select asp-for="wipSystem.FW1Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.Fw1" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width: 300px; ">
<input class="layui-input" asp-for="wipSystem.Fw1_Desc" readonly="readonly" />
</div>
</div>
@ -823,13 +823,13 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">FW2</label>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<select asp-for="wipSystem.FW2Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.Fw2" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width: 300px;">
<input class="layui-input" asp-for="wipSystem.Fw2_Desc" readonly="readonly" />
</div>
</div>
@ -838,13 +838,13 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.OsVer"></label>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<select asp-for="wipSystem.OsType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width:150px;">
<input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.OsVer" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
</div>
<div class="layui-input-inline">
<div class="layui-input-inline" style="width: 300px;">
<input class="layui-input" asp-for="wipSystem.OsVer_Desc" readonly="readonly" />
</div>
</div>
@ -876,24 +876,22 @@
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.DmiBi"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.DmiBi" autocomplete="off" />
<select asp-for="wipSystem.DmiBi" asp-items="@ViewBag.GetWipSystemDMITypeSelect" class=""></select>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Jumper"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Jumper" autocomplete="off" />
</div>
<label class="layui-form-label" asp-for="wipSystem.Jumper"></label>
<div class="layui-input-block">
<input class="layui-input" asp-for="wipSystem.Jumper" autocomplete="off" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input class="layui-input" asp-for="wipSystem.Memo" />
<textarea class="layui-textarea" asp-for="wipSystem.Memo"></textarea>
</div>
</div>
</div>

73
AMESCoreStudio.Web/Views/PCS/PCS999.cshtml
View File

@ -1,73 +0,0 @@
@model AMESCoreStudio.WebApi.DTO.AMES.MaterialKpDtos
@{
ViewData["Title"] = "系統資料管理";
Layout = "~/Views/Shared/_AMESLayout.cshtml";
}
<div class="layui-card">
<div class="col-sm-12">
<form enctype="multipart/form-data" method="post" asp-action="PCS999" id="PCS999Form" class="layui-form">
<div class="layui-form-item">
<div style="text-align:center">
<input type="submit" value="保存" class="layui-btn" />
</div>
<input type="checkbox" checked="" name="open" lay-skin="switch" lay-filter="switchTest" lay-text="ON|OFF">
<input type="checkbox" title="写作" name="MaterialKpDtos[' + key + '].kpSeq" lay-skin="primary" checked="">
</div>
<div class="layui-form-item" style="padding-left:30px">
<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="input();">刷新</a>
<table id="tblCustomers" class="layui-table" cellpadding="0" cellspacing="0">
<tbody id="tblCustomersBody">
</tbody>
</table>
</div>
</form>
</div>
</div>
@section Scripts{
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
<script type="text/javascript">
layui.use(['form', 'laydate'], function () {
var form = layui.form;
});
function input() {
//var Inputs = GetAllEmpData();
//var data = $("#PCS999Form").serialize();
//$.each(Inputs, function (i, item) {
// data += "&Inputs[" + i + "]=" + item;
//});
$.ajax({
url: "@Url.Action("MaterialKpQuery", "PCS")",
type: "POST",
async: false,
data: { 'itemNo': 'JH168-AT-X'},
success: function (result) {
var html = '';
$.each(result.data, function (key, item) {
html += '<tr>';
html += '<td>'+key+ ','+ item.materialKpID + '</td>';
html += '<td><input type="hidden" name="MaterialKpDtos[' + key + '].kpName" value=' + item.itemName+'>' + item.itemName + '</td>';
html += '<td>' + item.kpName + '</td>';
html += '<td>' + item.kpNo + '</td>';
html += '<td><input type="checkbox" name="MaterialKpDtos[' + key + '].Title" lay-skin="primary" checked=""></td>';
html += '</tr>';
});
$("#tblCustomers").html(html);
//$('#tblCustomers').append(html);
}
});
xuanran();
};
function xuanran() {
alert("OK");
layui.use(['form', 'laydate'], function () {
var form = layui.form;
form.render();
});
}
</script>
}

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

@ -117,7 +117,7 @@ layui.define(['jquery'], function (exports) {
$.post(option.url, $.extend({ search: value }, option.query), function (res) {
display(res[option.resArray])
})
}, 500);
}, 300);
}
} else {
$panel.empty()
@ -127,7 +127,7 @@ layui.define(['jquery'], function (exports) {
$el.blur(function () {
setTimeout(function () {
$panel.hide(500)
$panel.hide(300)
}, 100)
})
}

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

@ -144,6 +144,12 @@ namespace AMESCoreStudio.WebApi.Enum
[Display(Name = "H/W AT")]
C = 3,
/// <summary>
/// Other
/// </summary>
[Display(Name = "Other")]
D = 4,
}
/// <summary>
@ -176,6 +182,25 @@ namespace AMESCoreStudio.WebApi.Enum
D = 4,
}
/// <summary>
/// 工單資訊 系統工程資訊 DMI燒入 Type
/// </summary>
public enum EnumWipSystemDMIBIType
{
/// <summary>
/// YES
/// </summary>
[Display(Name = "YES")]
Y = 1,
/// <summary>
/// N/A
/// </summary>
[Display(Name = "N/A")]
N = 2,
}
/// <summary>
/// SOP Type
/// </summary>
@ -359,6 +384,8 @@ namespace AMESCoreStudio.WebApi.Enum
D = 4,
}
/// <summary>
/// Get Enum Display
/// </summary>

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

@ -239,7 +239,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[Column("OS_VER")]
[StringLength(20)]
[DataMember]
[Display(Name = "OS版本")]
[Display(Name = "出貨OS")]
public string OsVer { get; set; }
/// <summary>
@ -255,7 +255,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// JUMPER設定
/// </summary>
[Column("JUMPER")]
[StringLength(20)]
[StringLength(200)]
[DataMember]
[Display(Name = "JUMPER設定")]
public string Jumper { get; set; }

29
AMES程式測試回報(2022-02-12).docx
View File

@ -1,29 +0,0 @@
AMES專案系統測試報告
測試日期：2022-2-14
測試版本：AMES 1.0.0
測試人員：B.B. Wang
測試記錄：
過站時，Table要寫入以下幾個
生產序號在測試戰被判Fail，但是下一站卻可以刷Pass過站
包裝過站，包裝過站的資料，沒有寫入barcode_station
入庫單作業，選擇那些生產序號時，選中的資料移轉時會出錯
包裝裝箱時，出貨序號有綁起訖值？
入庫作業時，入庫過的，做過FQC的生產序號，也會跟著跑出來
WO0002A10001、WO0002A10003已於上一次產生過一張入庫單
一張入庫單，有二箱在該入庫單內，但資料只會顯示一筆箱號，資料庫內茶數量是2箱(MASTER)，但DETAIL內只有一箱紀錄
TTT
------------------------------------------------紀錄截止線------------------------------------------------

BIN
TxBarcodeInfo001.vsd
View File

Binary file not shown.

BIN
安勤問題待處理/AMES待解決之問題_All總表.xlsx
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save