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

補API說明

master
yiru 2 weeks ago
parent
f1ebf0212c
commit
d027d585e2
16 changed files with 226 additions and 124 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. 4
      AMESCoreStudio.WebApi/Controllers/AMES/ActualTimeController.cs
  2. 23
      AMESCoreStudio.WebApi/Controllers/AMES/IPQCTaskMailLogController.cs
  3. 4
      AMESCoreStudio.WebApi/Controllers/AMES/IPQCTaskNoticeController.cs
  4. 20
      AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs
  5. 39
      AMESCoreStudio.WebApi/Controllers/AMES/LabelParamController.cs
  6. 27
      AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintDetailController.cs
  7. 36
      AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintMasterController.cs
  8. 22
      AMESCoreStudio.WebApi/Controllers/AMES/LabelRPrintDetailController.cs
  9. 26
      AMESCoreStudio.WebApi/Controllers/AMES/LabelRPrintMasterController.cs
  10. 25
      AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateDetailController.cs
  11. 39
      AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs
  12. 23
      AMESCoreStudio.WebApi/Controllers/AMES/NgInfoAlertBlobsController.cs
  13. 2
      AMESCoreStudio.WebApi/Controllers/AMES/NgInfoAlertDetailController.cs
  14. 20
      AMESCoreStudio.WebApi/Controllers/AMES/NgInfoAlertMasterController.cs
  15. 32
      AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
  16. 8
      AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeOthersController.cs

4
AMESCoreStudio.WebApi/Controllers/AMES/ActualTimeController.cs
View File

@ -39,9 +39,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// /// 獲取報工明細資料
/// </summary> /// </summary>
/// <param name="ActualDate"></param> /// <param name="ActualDate">生產日期</param>
/// <param name="page"></param> /// <param name="page"></param>
/// <param name="limit"></param> /// <param name="limit"></param>
/// <returns></returns> /// <returns></returns>

23
AMESCoreStudio.WebApi/Controllers/AMES/IPQCTaskMailLogController.cs
View File

@ -15,9 +15,7 @@ using System.Net.Mail;
namespace AMESCoreStudio.WebApi.Controllers.AMES namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
/// <summary>
/// 任務性IPQC表單维护
/// </summary>
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
public class IPQCTaskMailLogController : ControllerBase public class IPQCTaskMailLogController : ControllerBase
@ -34,14 +32,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_config = _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build(); _config = _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build();
_context = context; _context = context;
} }
/// <summary>
///
/// </summary>
/// <param name="context"></param>
/// <summary> /// <summary>
/// 获取全部任務性IPQC表單 /// 获取全部任務性IPQC表單log
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
// GET: api/IPQCTaskMailLogs // GET: api/IPQCTaskMailLogs
@ -61,9 +54,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 用ID获取该任務性IPQC表單 /// 用ID获取该任務性IPQC表單 log
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">id</param>
/// <returns></returns> /// <returns></returns>
// GET: api/IPQCTaskMailLogs/5 // GET: api/IPQCTaskMailLogs/5
[HttpGet("{id}")] [HttpGet("{id}")]
@ -84,9 +77,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 更新任務性IPQC表單资料 /// 更新任務性IPQC表單资料log
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">id</param>
/// <param name="IPQCTaskMailLog"></param> /// <param name="IPQCTaskMailLog"></param>
/// <returns></returns> /// <returns></returns>
[HttpPut("{id}")] [HttpPut("{id}")]
@ -119,7 +112,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 新增任務性IPQC表單资料 /// 新增任務性IPQC表單资料log
/// </summary> /// </summary>
/// <param name="IPQCTaskMailLog"></param> /// <param name="IPQCTaskMailLog"></param>
/// <returns></returns> /// <returns></returns>
@ -150,7 +143,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 删除任務性IPQC表單资料 /// 删除任務性IPQC表單资料log
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>

4
AMESCoreStudio.WebApi/Controllers/AMES/IPQCTaskNoticeController.cs
View File

@ -54,7 +54,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 用ID获取该任務性IPQC表單 /// 用ID获取该任務性IPQC表單
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">id</param>
/// <returns></returns> /// <returns></returns>
// GET: api/IPQCTaskNotices/5 // GET: api/IPQCTaskNotices/5
[HttpGet("{id}")] [HttpGet("{id}")]
@ -78,6 +78,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// </summary> /// </summary>
/// <param name="WipNo">工單號碼</param> /// <param name="WipNo">工單號碼</param>
/// <param name="ItemNO">料號</param> /// <param name="ItemNO">料號</param>
/// <param name="page"></param>
/// <param name="limit"></param>
/// <returns></returns> /// <returns></returns>
// GET: api/IPQCTaskNotices/Query/5 // GET: api/IPQCTaskNotices/Query/5
[HttpGet("ByQuery")] [HttpGet("ByQuery")]

20
AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs
View File

@ -312,16 +312,16 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 用FormID获取该巡檢結果资料 /// 巡檢結果资料
/// </summary> /// </summary>
/// <param name="type"></param> /// <param name="type">巡檢類別</param>
/// <param name="id"></param> /// <param name="id">id</param>
/// <param name="WipNo"></param> /// <param name="WipNo">工單號碼</param>
/// <param name="ItemNo"></param> /// <param name="ItemNo">機種</param>
/// <param name="BarcodeNo"></param> /// <param name="BarcodeNo">生產序號</param>
/// <param name="StatusNo"></param> /// <param name="StatusNo">狀態</param>
/// <param name="sdate"></param> /// <param name="sdate">開始時間</param>
/// <param name="edate"></param>v /// <param name="edate">結束時間</param>
/// <returns></returns> /// <returns></returns>
// GET: api/InspectionItems/5 // GET: api/InspectionItems/5
[HttpGet("QueryAll/{type}/{id}/{WipNo}/{ItemNo}/{BarcodeNo}/{StatusNo}/{sdate}/{edate}")] [HttpGet("QueryAll/{type}/{id}/{WipNo}/{ItemNo}/{BarcodeNo}/{StatusNo}/{sdate}/{edate}")]
@ -454,7 +454,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// IPQC資料 /// 查詢IPQC資料
/// </summary> /// </summary>
/// <param name="InspectionID">IPQCID</param> /// <param name="InspectionID">IPQCID</param>
/// <returns></returns> /// <returns></returns>

39
AMESCoreStudio.WebApi/Controllers/AMES/LabelParamController.cs
View File

@ -25,7 +25,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_context = context; _context = context;
} }
// GET: api/LabelParam /// <summary>
/// 查詢Label參數(全部)
/// </summary>
/// <returns></returns>
[HttpGet] [HttpGet]
public async Task<ActionResult<IEnumerable<LabelParam>>> GetLabelParams() public async Task<ActionResult<IEnumerable<LabelParam>>> GetLabelParams()
{ {
@ -33,7 +36,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
// GET: api/LabelParam/5 /// <summary>
/// 查詢Label參數by ID
/// </summary>
/// <param name="id">ID</param>
/// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<LabelParam>> GetLabelParam(int id) public async Task<ActionResult<LabelParam>> GetLabelParam(int id)
{ {
@ -48,7 +55,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
// GET: api/LabelParam/5 /// <summary>
/// 查詢Label參數by LabelID
/// </summary>
/// <param name="id">Label ID</param>
/// <param name="page">頁數</param>
/// <param name="limit">單頁顯示數量</param>
/// <returns></returns>
[HttpGet("byLabelID/{id}")] [HttpGet("byLabelID/{id}")]
public async Task<ResultModel<LabelParam>> GetLabelParambyLabelID(int id, int page = 0, int limit = 10) public async Task<ResultModel<LabelParam>> GetLabelParambyLabelID(int id, int page = 0, int limit = 10)
{ {
@ -73,7 +86,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
// GET: api/LabelParam/5 /// <summary>
/// 查詢Label參數by狀態
/// </summary>
/// <param name="status">狀態</param>
/// <param name="page">頁數</param>
/// <param name="limit">單頁顯示數量</param>
/// <returns></returns>
[HttpGet("byStatus/{status}")] [HttpGet("byStatus/{status}")]
public async Task<ResultModel<LabelParam>> GetLabelParambyStatus(string status, int page = 0, int limit = 10) public async Task<ResultModel<LabelParam>> GetLabelParambyStatus(string status, int page = 0, int limit = 10)
{ {
@ -192,7 +211,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result; return result;
} }
// DELETE: api/LabelParam/5 /// <summary>
/// 刪除Label參數檔
/// </summary>
/// <param name="id">ID</param>
/// <returns></returns>
[HttpDelete("{id}")] [HttpDelete("{id}")]
public async Task<ActionResult<LabelParam>> DeleteLabelParam(int id) public async Task<ActionResult<LabelParam>> DeleteLabelParam(int id)
{ {
@ -207,7 +230,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return LabelParam; return LabelParam;
} }
//// GET: api/LabelTemplateDetail/5 /// <summary>
/// 查詢Label參數檔 by ID
/// </summary>
/// <param name="id">ID</param>
/// <returns></returns>
[HttpGet("byMulti/{id}")] [HttpGet("byMulti/{id}")]
public async Task<ActionResult<IEnumerable<dynamic>>> GetLabelParambyTemplateIDMulti(int id) public async Task<ActionResult<IEnumerable<dynamic>>> GetLabelParambyTemplateIDMulti(int id)
{ {

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

@ -12,7 +12,7 @@ using AMESCoreStudio.CommonTools.Result;
namespace AMESCoreStudio.WebApi.Controllers.AMES namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
/// <summary> /// <summary>
/// FQC檢驗結果ID ///
/// </summary> /// </summary>
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
@ -25,14 +25,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_context = context; _context = context;
} }
// GET: api/LabelPrintDetail /// <summary>
/// 查詢列印Label 參數值(全部)
/// </summary>
/// <returns></returns>
[HttpGet] [HttpGet]
public async Task<ActionResult<IEnumerable<LabelPrintDetail>>> GetLabelPrintDetails() public async Task<ActionResult<IEnumerable<LabelPrintDetail>>> GetLabelPrintDetails()
{ {
return await _context.LabelPrintDetail.ToListAsync(); return await _context.LabelPrintDetail.ToListAsync();
} }
// GET: api/LabelPrintDetail/5 /// <summary>
/// 查詢列印Label 參數值 by 參數ID
/// </summary>
/// <param name="id">參數ID</param>
/// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<IEnumerable<LabelPrintDetail>>> GetLabelPrintDetail(int id) public async Task<ActionResult<IEnumerable<LabelPrintDetail>>> GetLabelPrintDetail(int id)
{ {
@ -48,9 +55,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return LabelPrintdetail; return LabelPrintdetail;
} }
/// <summary> /// <summary>
/// 更新Label參數檔 /// 更新列印Label 參數值
/// </summary> /// </summary>
/// <param name="LabelPrintDetail"></param> /// <param name="LabelPrintDetail"></param>
/// <returns></returns> /// <returns></returns>
@ -77,9 +84,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result; return result;
} }
/// <summary> /// <summary>
/// 新增更新Label參數檔 /// 新增列印Label 參數值
/// </summary> /// </summary>
/// <param name="LabelPrintDetail"></param> /// <param name="LabelPrintDetail"></param>
/// <returns></returns> /// <returns></returns>
@ -113,7 +120,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
// DELETE: api/LabelPrintDetail/5 /// <summary>
/// 刪除列印Label 參數值
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")] [HttpDelete("{id}")]
public async Task<ResultModel<LabelPrintDetail>> DeleteLabelPrintDetail(int id) public async Task<ResultModel<LabelPrintDetail>> DeleteLabelPrintDetail(int id)
{ {

36
AMESCoreStudio.WebApi/Controllers/AMES/LabelPrintMasterController.cs
View File

@ -26,14 +26,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_context = context; _context = context;
} }
// GET: api/LabelPrintMaster /// <summary>
/// 查詢Label 列印記錄(全部)
/// </summary>
/// <returns></returns>
[HttpGet] [HttpGet]
public async Task<ActionResult<IEnumerable<LabelPrintMaster>>> GetLabelPrintMasters() public async Task<ActionResult<IEnumerable<LabelPrintMaster>>> GetLabelPrintMasters()
{ {
return await _context.LabelPrintMaster.ToListAsync(); return await _context.LabelPrintMaster.ToListAsync();
} }
// GET: api/LabelPrintMaster/5 /// <summary>
/// 查詢Label 列印記錄 by ID
/// </summary>
/// <param name="id">id</param>
/// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<LabelPrintMaster>> GetLabelPrintMaster(int id) public async Task<ActionResult<LabelPrintMaster>> GetLabelPrintMaster(int id)
{ {
@ -47,7 +54,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return LabelPrintMaster; return LabelPrintMaster;
} }
// GET: api/LabelPrintMaster/5 /// <summary>
/// 查詢Label 列印記錄 by 工單+樣板ID
/// </summary>
/// <param name="WipNo">工單</param>
/// <param name="id">樣板ID</param>
/// <returns></returns>
[HttpGet("{WipNo}/{id}")] [HttpGet("{WipNo}/{id}")]
public async Task<ActionResult<IEnumerable<LabelPrintMaster>>> GetLabelPrintMasterbyWipNO(string WipNo,int id) public async Task<ActionResult<IEnumerable<LabelPrintMaster>>> GetLabelPrintMasterbyWipNO(string WipNo,int id)
{ {
@ -65,7 +77,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 更新Label參數檔 /// 更新Label 列印記錄
/// </summary> /// </summary>
/// <param name="LabelPrintMaster"></param> /// <param name="LabelPrintMaster"></param>
/// <returns></returns> /// <returns></returns>
@ -98,7 +110,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 新增更新Label參數檔 /// 新增更新Label 列印記錄
/// </summary> /// </summary>
/// <param name="LabelPrintMaster"></param> /// <param name="LabelPrintMaster"></param>
/// <returns></returns> /// <returns></returns>
@ -132,7 +144,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result; return result;
} }
// DELETE: api/LabelPrintMaster/5 /// <summary>
/// 刪除Label 列印記錄
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")] [HttpDelete("{id}")]
public async Task<ActionResult<LabelPrintMaster>> DeleteLabelPrintMaster(int id) public async Task<ActionResult<LabelPrintMaster>> DeleteLabelPrintMaster(int id)
{ {
@ -149,11 +165,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// /// 查詢要列印的Lable參數檔by Param
/// </summary> /// </summary>
/// <param name="TemplateID"></param> /// <param name="TemplateID">樣板ID</param>
/// <param name="WipNO"></param> /// <param name="WipNO">工單號碼</param>
/// <param name="ExtraNo"></param> /// <param name="ExtraNo">出貨序號</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("byParam")] [HttpGet("byParam")]
public async Task<ActionResult<IEnumerable<LabelPrintMaster>>> GetLabelPrintbyParam(int TemplateID,string WipNO ,string ExtraNo) public async Task<ActionResult<IEnumerable<LabelPrintMaster>>> GetLabelPrintbyParam(int TemplateID,string WipNO ,string ExtraNo)

22
AMESCoreStudio.WebApi/Controllers/AMES/LabelRPrintDetailController.cs
View File

@ -12,7 +12,7 @@ using AMESCoreStudio.CommonTools.Result;
namespace AMESCoreStudio.WebApi.Controllers.AMES namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
/// <summary> /// <summary>
/// FQC檢驗結果ID ///
/// </summary> /// </summary>
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
@ -25,14 +25,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_context = context; _context = context;
} }
// GET: api/LabelRPrintDetail /// <summary>
/// 查詢補印Label 參數值(全部)
/// </summary>
/// <returns></returns>
[HttpGet] [HttpGet]
public async Task<ActionResult<IEnumerable<LabelRPrintDetail>>> GetLabelRPrintDetails() public async Task<ActionResult<IEnumerable<LabelRPrintDetail>>> GetLabelRPrintDetails()
{ {
return await _context.LabelRPrintDetail.ToListAsync(); return await _context.LabelRPrintDetail.ToListAsync();
} }
/// <summary>
// GET: api/LabelRPrintDetail/5 /// 查詢補印Label 參數值 by 參數ID
/// </summary>
/// <param name="id">參數ID</param>
/// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<IEnumerable<LabelRPrintDetail>>> GetLabelRPrintDetail(int id) public async Task<ActionResult<IEnumerable<LabelRPrintDetail>>> GetLabelRPrintDetail(int id)
{ {
@ -79,7 +85,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 新增更新Label補印參數檔 /// 新增Label補印參數檔
/// </summary> /// </summary>
/// <param name="LabelRPrintDetail"></param> /// <param name="LabelRPrintDetail"></param>
/// <returns></returns> /// <returns></returns>
@ -113,7 +119,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
// DELETE: api/LabelRPrintDetail/5 /// <summary>
/// 刪除Label補印參數檔
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")] [HttpDelete("{id}")]
public async Task<ResultModel<LabelRPrintDetail>> DeleteLabelRPrintDetail(int id) public async Task<ResultModel<LabelRPrintDetail>> DeleteLabelRPrintDetail(int id)
{ {

26
AMESCoreStudio.WebApi/Controllers/AMES/LabelRPrintMasterController.cs
View File

@ -26,14 +26,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_context = context; _context = context;
} }
// GET: api/LabelRPrintMaster /// <summary>
/// 查詢Label 補印記錄 by ID
/// </summary>
/// <returns></returns>
[HttpGet] [HttpGet]
public async Task<ActionResult<IEnumerable<LabelRPrintMaster>>> GetLabelRPrintMasters() public async Task<ActionResult<IEnumerable<LabelRPrintMaster>>> GetLabelRPrintMasters()
{ {
return await _context.LabelRPrintMaster.ToListAsync(); return await _context.LabelRPrintMaster.ToListAsync();
} }
// GET: api/LabelRPrintMaster/5 /// <summary>
/// 查詢Label 補印記錄 by 補印ID
/// </summary>
/// <param name="id">補印ID</param>
/// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<LabelRPrintMaster>> GetLabelRPrintMaster(int id) public async Task<ActionResult<LabelRPrintMaster>> GetLabelRPrintMaster(int id)
{ {
@ -47,7 +54,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return LabelRPrintMaster; return LabelRPrintMaster;
} }
// GET: api/LabelRPrintMaster/5 /// <summary>
/// 查詢Label 補印記錄 by 工單+樣板ID
/// </summary>
/// <param name="WipNo">工單</param>
/// <param name="id">樣板ID</param>
/// <returns></returns>
[HttpGet("{WipNo}/{id}")] [HttpGet("{WipNo}/{id}")]
public async Task<ActionResult<IEnumerable<LabelRPrintMaster>>> GetLabelRPrintMasterbyWipNO(string WipNo, int id) public async Task<ActionResult<IEnumerable<LabelRPrintMaster>>> GetLabelRPrintMasterbyWipNO(string WipNo, int id)
{ {
@ -98,7 +110,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 新增更新Label補印參數檔 /// 新增Label補印參數檔
/// </summary> /// </summary>
/// <param name="LabelRPrintMaster"></param> /// <param name="LabelRPrintMaster"></param>
/// <returns></returns> /// <returns></returns>
@ -129,7 +141,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result; return result;
} }
// DELETE: api/LabelRPrintMaster/5 /// <summary>
/// 刪除Label補印參數檔
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")] [HttpDelete("{id}")]
public async Task<ActionResult<LabelRPrintMaster>> DeleteLabelRPrintMaster(int id) public async Task<ActionResult<LabelRPrintMaster>> DeleteLabelRPrintMaster(int id)
{ {

25
AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateDetailController.cs
View File

@ -12,7 +12,7 @@ using AMESCoreStudio.CommonTools.Result;
namespace AMESCoreStudio.WebApi.Controllers.AMES namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
/// <summary> /// <summary>
/// FQC檢驗結果ID /// Label樣板參數
/// </summary> /// </summary>
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
@ -25,14 +25,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_context = context; _context = context;
} }
// GET: api/LabelTemplateDetail /// <summary>
/// Label樣板參數(全部)
/// </summary>
/// <returns></returns>
[HttpGet] [HttpGet]
public async Task<ActionResult<IEnumerable<LabelTemplateDetail>>> GetLabelTemplateDetails() public async Task<ActionResult<IEnumerable<LabelTemplateDetail>>> GetLabelTemplateDetails()
{ {
return await _context.LabelTemplateDetail.ToListAsync(); return await _context.LabelTemplateDetail.ToListAsync();
} }
// GET: api/LabelTemplateDetail/5 /// <summary>
/// 查詢 Label樣板參數 by 樣板ID
/// </summary>
/// <param name="id">樣板ID</param>
/// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<IEnumerable<LabelTemplateDetail>>> GetLabelTemplateDetail(int id) public async Task<ActionResult<IEnumerable<LabelTemplateDetail>>> GetLabelTemplateDetail(int id)
{ {
@ -48,9 +55,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return LabelTemplatedetail; return LabelTemplatedetail;
} }
/// <summary> /// <summary>
/// 更新Label參數檔 /// 更新Label樣板參數檔
/// </summary> /// </summary>
/// <param name="LabelTemplateDetail"></param> /// <param name="LabelTemplateDetail"></param>
/// <returns></returns> /// <returns></returns>
@ -78,7 +85,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 新增更新Label參數檔 /// 新增Label樣板參數檔
/// </summary> /// </summary>
/// <param name="LabelTemplateDetail"></param> /// <param name="LabelTemplateDetail"></param>
/// <returns></returns> /// <returns></returns>
@ -103,7 +110,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result; return result;
} }
// DELETE: api/LabelTemplateDetail/5 /// <summary>
/// 刪除Label樣板參數檔
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")] [HttpDelete("{id}")]
public async Task<ResultModel<LabelTemplateDetail>> DeleteLabelTemplateDetail(int id) public async Task<ResultModel<LabelTemplateDetail>> DeleteLabelTemplateDetail(int id)
{ {

39
AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs
View File

@ -13,7 +13,7 @@ using AMESCoreStudio.WebApi.DTO.AMES;
namespace AMESCoreStudio.WebApi.Controllers.AMES namespace AMESCoreStudio.WebApi.Controllers.AMES
{ {
/// <summary> /// <summary>
/// /// Label樣板
/// </summary> /// </summary>
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
@ -26,14 +26,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
_context = context; _context = context;
} }
// GET: api/LabelTemplateMaster /// <summary>
/// 查詢Label樣板(全部)
/// </summary>
/// <returns></returns>
[HttpGet] [HttpGet]
public async Task<ActionResult<IEnumerable<LabelTemplateMaster>>> GetLabelTemplateMasters() public async Task<ActionResult<IEnumerable<LabelTemplateMaster>>> GetLabelTemplateMasters()
{ {
return await _context.LabelTemplateMaster.ToListAsync(); return await _context.LabelTemplateMaster.ToListAsync();
} }
// GET: api/LabelTemplateMaster/5 /// <summary>
/// 查詢Label樣板 by ID
/// </summary>
/// <param name="id">ID</param>
/// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<LabelTemplateMaster>> GetLabelTemplateMaster(int id) public async Task<ActionResult<LabelTemplateMaster>> GetLabelTemplateMaster(int id)
{ {
@ -49,7 +56,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 更新Label參數檔 /// 更新Label樣板
/// </summary> /// </summary>
/// <param name="LabelTemplateMaster"></param> /// <param name="LabelTemplateMaster"></param>
/// <returns></returns> /// <returns></returns>
@ -77,7 +84,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 新增更新Label參數檔 /// 新增Label樣板
/// </summary> /// </summary>
/// <param name="LabelTemplateMaster"></param> /// <param name="LabelTemplateMaster"></param>
/// <returns></returns> /// <returns></returns>
@ -113,7 +120,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result; return result;
} }
// DELETE: api/LabelTemplateMaster/5 /// <summary>
/// 刪除Label樣板
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")] [HttpDelete("{id}")]
public async Task<ActionResult<LabelTemplateMaster>> DeleteLabelTemplateMaster(int id) public async Task<ActionResult<LabelTemplateMaster>> DeleteLabelTemplateMaster(int id)
{ {
@ -132,9 +143,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 使用Label料號查詢 /// 使用Label料號查詢
/// </summary> /// </summary>
/// <param name="LabelMatnr"></param> /// <param name="LabelMatnr">Label料號</param>
/// <param name="page"></param> /// <param name="page">頁數</param>
/// <param name="limit"></param> /// <param name="limit">單頁筆數</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("byMatnr")] [HttpGet("byMatnr")]
public async Task<ResultModel<LabelTemplateMaster>> GetLabelTemplatebyMatnr(string LabelMatnr, int page = 0, int limit = 10) public async Task<ResultModel<LabelTemplateMaster>> GetLabelTemplatebyMatnr(string LabelMatnr, int page = 0, int limit = 10)
@ -175,11 +186,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 使用出貨料號查詢下階有上架之Label /// 使用出貨料號查詢下階有上架之Label
/// </summary> /// </summary>
/// <param name="ItemNO"></param> /// <param name="ItemNO">出貨料號</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("byItemNO")] [HttpGet("byItemNO")]
public async Task<ActionResult<IEnumerable<LabelTemplateMaster>>> GetLabelTemplatebyItemNO(string ItemNO) public async Task<ActionResult<IEnumerable<LabelTemplateMaster>>> GetLabelTemplatebyItemNO(string ItemNO)
{ {

23
AMESCoreStudio.WebApi/Controllers/AMES/NgInfoAlertBlobsController.cs
View File

@ -31,7 +31,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 获取全部巡檢類別資料 /// 获取全部異常警示圖片資料
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
// GET: api/NgInfoAlertBlobs // GET: api/NgInfoAlertBlobs
@ -48,11 +48,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 用ID获取该巡檢類別資料 /// 用ID获取该異常警示圖片資料
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">ID</param>
/// <returns></returns> /// <returns></returns>
// GET: api/NgInfoAlertBlobs/5
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<IEnumerable<NgInfoAlertBlob>>> GetNgInfoAlertBlobs(string id ) public async Task<ActionResult<IEnumerable<NgInfoAlertBlob>>> GetNgInfoAlertBlobs(string id )
{ {
@ -70,12 +69,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 获取该巡檢表單Blob By Query /// 获取该異常警示圖片 By Query
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">ID</param>
/// <param name="itemID"></param> /// <param name="itemID">表單ItemID</param>
/// <returns></returns> /// <returns></returns>
// GET: api/NgInfoAlertBlobs/Query/5
[HttpGet("Query/{id}/{itemID}")] [HttpGet("Query/{id}/{itemID}")]
public async Task<ActionResult<IEnumerable<NgInfoAlertBlob>>> GetNgInfoAlertBlobsByQuery(string id, int itemID) public async Task<ActionResult<IEnumerable<NgInfoAlertBlob>>> GetNgInfoAlertBlobsByQuery(string id, int itemID)
{ {
@ -96,14 +94,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 更新巡檢類別資料 /// 更新異常警示圖片資料
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="NgInfoAlertBlob"></param> /// <param name="NgInfoAlertBlob"></param>
/// <returns></returns> /// <returns></returns>
// PUT: api/NgInfoAlertBlobs/5
// To protect from overposting attacks, enable the specific properties you want to bind to, for
// more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
[HttpPut("{id}")] [HttpPut("{id}")]
public async Task<ResultModel<NgInfoAlertBlob>> PutNgInfoAlertBlobs(int id, [FromBody] NgInfoAlertBlob NgInfoAlertBlob) public async Task<ResultModel<NgInfoAlertBlob>> PutNgInfoAlertBlobs(int id, [FromBody] NgInfoAlertBlob NgInfoAlertBlob)
{ {
@ -134,7 +129,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// 新增 檢驗結果上傳圖檔資料表 /// 新增 異常警示圖片上傳圖檔資料表
/// </summary> /// </summary>
/// <param name="NgInfoAlertBlob"></param> /// <param name="NgInfoAlertBlob"></param>
/// <returns></returns> /// <returns></returns>
@ -164,7 +159,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 删除巡檢類別資料 /// 删除異常警示圖片資料
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>

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

@ -43,7 +43,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 異常Alert序號明細資料by CaseID /// 異常Alert序號明細資料by CaseID
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">ID</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<IEnumerable<NgInfoAlertDetail>>> GetNgInfoAlertDetails(string id) public async Task<ActionResult<IEnumerable<NgInfoAlertDetail>>> GetNgInfoAlertDetails(string id)

20
AMESCoreStudio.WebApi/Controllers/AMES/NgInfoAlertMasterController.cs
View File

@ -43,7 +43,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 異常Alert資料by CaseID /// 異常Alert資料by CaseID
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">ID</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<ActionResult<NgInfoAlertMaster>> GetNgInfoAlertMaster(string id) public async Task<ActionResult<NgInfoAlertMaster>> GetNgInfoAlertMaster(string id)
@ -161,10 +161,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result; return result;
} }
/// <summary> /// <summary>
/// 查詢工單站別在製條碼資料 /// 查詢異常警示資料
/// </summary> /// </summary>
/// <returns></returns> /// <param name="caseID">CaseID</param>
/// <param name="itemNoF">成品機種</param>
/// <param name="modelName">ModelName</param>
/// <param name="wipNoF">成品工單</param>
/// <param name="errorCode">ErrorCode</param>
/// <param name="statusNo">狀態</param>
/// <param name="dateStart">開始時間</param>
/// <param name="dateEnd">結束時間</param>
/// <param name="page">頁</param>
/// <param name="limit">單頁顯示筆數</param>
/// <returns></returns>
[Route("[action]")] [Route("[action]")]
[HttpGet] [HttpGet]
public async Task<ResultModel<dynamic>> GetNGINFOAlertMasterByQuery(string caseID,string itemNoF, string modelName, string wipNoF, string errorCode, string statusNo, string dateStart, string dateEnd, int page = 0, int limit = 10) public async Task<ResultModel<dynamic>> GetNGINFOAlertMasterByQuery(string caseID,string itemNoF, string modelName, string wipNoF, string errorCode, string statusNo, string dateStart, string dateEnd, int page = 0, int limit = 10)

32
AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
View File

@ -1642,7 +1642,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
/// <summary> /// <summary>
/// 安勤異常警示使用 /// 安勤異常警示使用
/// </summary> /// </summary>
/// <param name="barcodeNo"></param> /// <param name="barcodeNo">生產序號</param>
/// <returns></returns> /// <returns></returns>
[Route("[action]")] [Route("[action]")]
[HttpGet] [HttpGet]
@ -1698,9 +1698,9 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
} }
/// <summary> /// <summary>
/// 安勤異常警示使用 /// 安勤異常警示使用(抓昶亨資料)
/// </summary> /// </summary>
/// <param name="barcodeNo"></param> /// <param name="barcodeNo">生產序號</param>
/// <returns></returns> /// <returns></returns>
[Route("[action]")] [Route("[action]")]
[HttpGet] [HttpGet]
@ -1755,9 +1755,9 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
/// <summary> /// <summary>
/// /// 更新NGRepair
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">ID</param>
/// <param name="ngRepair"></param> /// <param name="ngRepair"></param>
/// <returns></returns> /// <returns></returns>
// PUT: api/NgRepairs/5 // PUT: api/NgRepairs/5
@ -1802,16 +1802,16 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
} }
/// <summary> /// <summary>
/// ///寄EMail
/// </summary> /// </summary>
/// <param name="mail_from"></param> /// <param name="mail_from">寄件者</param>
/// <param name="mail_to"></param> /// <param name="mail_to">放件者</param>
/// <param name="mail_subject"></param> /// <param name="mail_subject">主旨</param>
/// <param name="mail_body"></param> /// <param name="mail_body">內容</param>
/// <param name="mail_server"></param> /// <param name="mail_server">Mail Server</param>
/// <param name="mail_port"></param> /// <param name="mail_port">Mail Port</param>
/// <param name="mail_user"></param> /// <param name="mail_user">Mail User</param>
/// <param name="mail_password"></param> /// <param name="mail_password">Mail Pwd</param>
/// <returns></returns> /// <returns></returns>
[HttpPost("Mail")] [HttpPost("Mail")]
public async Task<ResultModel<dynamic>> PostMailTest(string mail_from, string mail_to, string mail_subject,string mail_body, string mail_server, int mail_port,string mail_user, string mail_password) public async Task<ResultModel<dynamic>> PostMailTest(string mail_from, string mail_to, string mail_subject,string mail_body, string mail_server, int mail_port,string mail_user, string mail_password)
@ -1846,7 +1846,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
} }
/// <summary> /// <summary>
/// /// 新增NGRepair
/// </summary> /// </summary>
/// <param name="ngRepair"></param> /// <param name="ngRepair"></param>
/// <returns></returns> /// <returns></returns>
@ -2184,7 +2184,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
} }
/// <summary> /// <summary>
/// /// 刪除NGRepair
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>

8
AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeOthersController.cs
View File

@ -68,7 +68,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <summary> /// <summary>
/// 抓工單出貨序號區間(多筆) /// 抓工單出貨序號區間(多筆)
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id">工單號碼</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("WipNos/{id}")] [HttpGet("WipNos/{id}")]
public async Task<ActionResult<IEnumerable<WipBarcodeOther>>> GetWipBarcodeOtherByWipNos(string id) public async Task<ActionResult<IEnumerable<WipBarcodeOther>>> GetWipBarcodeOtherByWipNos(string id)
@ -109,10 +109,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
} }
/// <summary> /// <summary>
/// /// 查詢出貨條碼區間設定檔
/// </summary> /// </summary>
/// <param name="WipNo"></param> /// <param name="WipNo">工單</param>
/// <param name="ItemNo"></param> /// <param name="ItemNo">料號</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("WipBarcodeOtherByItemNo")] [HttpGet("WipBarcodeOtherByItemNo")]
public async Task<ResultModel<WipBarcodeOtherDto>> GetWipBarcodeOtherByItemNo(string WipNo, string ItemNo) public async Task<ResultModel<WipBarcodeOtherDto>> GetWipBarcodeOtherByItemNo(string WipNo, string ItemNo)

Write Preview
Loading…
Cancel
Save