|
|
|
@ -30,11 +30,13 @@ namespace AMESCoreStudio.Web.Controllers |
|
|
|
private readonly ILogger<PCSController> _logger; |
|
|
|
public readonly IFQC _fqcApi; |
|
|
|
private readonly IWebHostEnvironment _env; |
|
|
|
public FQCController(ILogger<PCSController> logger, IFQC fqcApi, IWebHostEnvironment env) |
|
|
|
public readonly IPCS _pcsApi; |
|
|
|
public FQCController(ILogger<PCSController> logger, IFQC fqcApi, IWebHostEnvironment env , IPCS pcsApi) |
|
|
|
{ |
|
|
|
_logger = logger; |
|
|
|
_fqcApi = fqcApi; |
|
|
|
_env = env; |
|
|
|
_pcsApi = pcsApi; |
|
|
|
} |
|
|
|
|
|
|
|
#region 下拉選單
|
|
|
|
@ -161,6 +163,28 @@ namespace AMESCoreStudio.Web.Controllers |
|
|
|
//将数据Json化并传到前台视图
|
|
|
|
return Json(new { data = item }); |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 廠別/委外廠
|
|
|
|
/// </summary>
|
|
|
|
/// <returns></returns>
|
|
|
|
private async Task GetFactoryInfo() |
|
|
|
{ |
|
|
|
var result = await _pcsApi.GetFactoryInfo(); |
|
|
|
|
|
|
|
var FactoryInfo = new List<SelectListItem>(); |
|
|
|
for (int i = 0; i < result.Count; i++) |
|
|
|
{ |
|
|
|
FactoryInfo.Add(new SelectListItem(result[i].FactoryNo + "-" + result[i].FactoryNameCh, result[i].FactoryID.ToString())); |
|
|
|
} |
|
|
|
|
|
|
|
if (FactoryInfo.Count == 0) |
|
|
|
{ |
|
|
|
FactoryInfo.Add(new SelectListItem("N/A", null)); |
|
|
|
} |
|
|
|
|
|
|
|
ViewBag.FactoryInfoList = FactoryInfo; |
|
|
|
} |
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region FQC001 檢驗類別維護
|
|
|
|
@ -1135,19 +1159,21 @@ namespace AMESCoreStudio.Web.Controllers |
|
|
|
#endregion
|
|
|
|
|
|
|
|
#region FQC008 FQC查詢
|
|
|
|
public IActionResult FQC008() |
|
|
|
public async Task<IActionResult> FQC008() |
|
|
|
{ |
|
|
|
await GetFactoryInfo(); |
|
|
|
return View(); |
|
|
|
} |
|
|
|
|
|
|
|
public async Task<IActionResult> FQC008QueryAsync(string barcodeNo, string wipNo |
|
|
|
, string boxNo, string inhouseNo, string date_str, string date_end |
|
|
|
, string boxNo, string inhouseNo, string date_str, string date_end ,string factoryID |
|
|
|
, string status, int page = 0, int limit = 10) |
|
|
|
{ |
|
|
|
IResultModel<FqcInhouseMasterDto> result = await _fqcApi.GetFqcInhouseMasterQuery(barcodeNo: barcodeNo, wipNo: wipNo |
|
|
|
, boxNo: boxNo, inhouseNo: inhouseNo, date_str: date_str, date_end: date_end |
|
|
|
, status: status, page: page, limit: limit); |
|
|
|
, status: status, page: page, limit: limit , factoryID: factoryID); |
|
|
|
|
|
|
|
await GetFactoryInfo(); |
|
|
|
if (result.Data.Count() != 0) |
|
|
|
{ |
|
|
|
return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); |
|
|
|
|
Ray
3 years ago