From cf7e7d589fa0a7f7f5f179ebeba354aba2f0392d Mon Sep 17 00:00:00 2001 From: "vick_wang419@hotmail.com.tw" Date: Fri, 8 Dec 2023 00:05:50 +0800 Subject: [PATCH] =?UTF-8?q?PTD=E8=A6=8F=E6=A0=BC=E6=9B=B8-2023=E7=B3=BB?= =?UTF-8?q?=E7=B5=B1=E9=9C=80=E6=B1=82-=E5=96=AE=E9=A0=AD=E8=AA=AA?= =?UTF-8?q?=E6=98=8E=E7=B6=AD=E8=AD=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PTDController.cs | 7 +-- AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs | 13 ++++- .../Controllers/AMES/WipInfosController.cs | 55 ++++++++++++++++--- .../Models/AMES/PTD101AMESModel.cs | 2 +- 4 files changed, 61 insertions(+), 16 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/PTDController.cs b/AMESCoreStudio.Web/Controllers/PTDController.cs index fb403a10..a28905a6 100644 --- a/AMESCoreStudio.Web/Controllers/PTDController.cs +++ b/AMESCoreStudio.Web/Controllers/PTDController.cs @@ -289,8 +289,7 @@ namespace AMESCoreStudio.Web.Controllers [HttpPost] public async Task PTD002_Commit(string data) { - var result = data; - + var result = await _pcsApi.PostPostPTD002Commit(data); //将数据Json化并传到前台视图 return Json(new { data = result }); } @@ -368,7 +367,7 @@ namespace AMESCoreStudio.Web.Controllers } //修改页面 [HttpGet] - public async Task PTD004UAsync(int id) + public async Task PTD004UAsync(string id) { var result = await _pcsApi.GetRecordTypeInfo(id); @@ -379,7 +378,7 @@ namespace AMESCoreStudio.Web.Controllers } return View(result[0]); } - public async Task PTD004DAsync(int id) + public async Task PTD004DAsync(string id) { var result = await _pcsApi.DeleteRecordTypeInfo(id); return Json(new Result() { success = true, msg = "" }); diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs index 796b33ae..9de00dfd 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs @@ -1951,6 +1951,7 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/WipInfos/GetDNInfo4PTD001")] ITask> GetDNInfo4PTD001(string dnNo, string lineNo); + #region "PTD003 作業查詢" [WebApiClient.Attributes.HttpGet("api/WipInfos/GetRecordTypes")] ITask> GetRecordTypes(); @@ -1959,6 +1960,7 @@ namespace AMESCoreStudio.Web [WebApiClient.Attributes.HttpGet("api/WipInfos/GetCustomer/{recordNumber}")] ITask GetCustomer(string recordNumber); + #endregion #region "PTD004 單頭說明維護" @@ -1970,7 +1972,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/WipInfos/GetRecordTypeInfo/{id}")] - ITask> GetRecordTypeInfo(int id); + ITask> GetRecordTypeInfo(string id); /// /// 新增生產製程單位 @@ -1984,16 +1986,21 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpPut("api/WipInfos/PutRecordTypeInfo/{id}")] - ITask> PutRecordTypeInfo(int id, [FromBody, RawJsonContent] string model); + ITask> PutRecordTypeInfo(string id, [FromBody, RawJsonContent] string model); /// /// 刪除生產製程單位 /// /// [WebApiClient.Attributes.HttpDelete("api/WipInfos/DeleteRecordTypeInfo/{id}")] - ITask> DeleteRecordTypeInfo(int id); + ITask> DeleteRecordTypeInfo(string id); #endregion + #region "PTD002 PTD002 一段式入出庫作業" + [WebApiClient.Attributes.HttpPost("api/WipInfos/PostPTD002Commit")] + ITask> PostPostPTD002Commit([FromBody, RawJsonContent] string model); + + #endregion } } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index 0a20ccf0..d5cfaa41 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -2949,6 +2949,44 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); return result; } + #region "PTD002 PTD002 一段式入出庫作業" + [Route("[action]")] + [HttpPost] + public async Task> PostPTD002Commit(RecordTypeInfo RecordTypeInfo) + { + ResultModel result = new ResultModel(); + try + { + string strSQL = $@"INSERT INTO SFIS_PTD.dbo.RecordTypeInfo (ID, RBU, TypeName, TypeDesc, Source, PrefixCode, Length) + VALUES ({RecordTypeInfo.ID},'{RecordTypeInfo.RBU}', '{RecordTypeInfo.TypeName}', '{RecordTypeInfo.TypeDesc}', + '{RecordTypeInfo.Source}', '{RecordTypeInfo.PrefixCode}', {RecordTypeInfo.Length})"; + //安勤連線 + PTDContext _ptd_context = new PTDContext(); + DbConnection connPTD = _ptd_context.Database.GetDbConnection(); + if (connPTD.State != ConnectionState.Open) + { + await connPTD.OpenAsync(); + } + + using (var cmd = connPTD.CreateCommand()) + { + cmd.CommandText = strSQL; + cmd.ExecuteNonQuery(); + } + result.Success = true; + result.Msg = "OK"; + } + catch (Exception ex) + { + result.Success = false; + result.Msg = ex.InnerException.Message; + } + return result; + + } + #endregion + + #region "PTD003 作業查詢" [Route("[action]")] [HttpGet] public async Task> GetRecordTypes() @@ -3127,6 +3165,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); throw e; } } + #endregion #region "PTD004 單頭說明維護" [Route("[action]")] @@ -3163,7 +3202,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); RecordTypeInfo.Add(new RecordTypeInfo { RBU = Convert.ToString(row["RBU"]), - ID = Convert.ToInt32(row["ID"]), + ID = Convert.ToString(row["ID"]), TypeName = Convert.ToString(row["TypeName"]), TypeDesc = Convert.ToString(row["TypeDesc"]), Source = Convert.ToString(row["Source"]), @@ -3194,7 +3233,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); string strSQL = $@"select * from SFIS_PTD.dbo.RecordTypeInfo"; if (id != null && id != "") { - strSQL += $@" Where id ={id}"; + strSQL += $@" Where id ='{id}'"; } DataTable dtRecordTypeInfo = new DataTable(); @@ -3216,7 +3255,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); RecordTypeInfo.Add(new RecordTypeInfo { RBU = Convert.ToString(row["RBU"]), - ID = Convert.ToInt32(row["ID"]), + ID = Convert.ToString(row["ID"]), TypeName = Convert.ToString(row["TypeName"]), TypeDesc = Convert.ToString(row["TypeDesc"]), Source = Convert.ToString(row["Source"]), @@ -3240,7 +3279,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); try { string strSQL = $@"INSERT INTO SFIS_PTD.dbo.RecordTypeInfo (ID, RBU, TypeName, TypeDesc, Source, PrefixCode, Length) - VALUES ({RecordTypeInfo.ID},'{RecordTypeInfo.RBU}', '{RecordTypeInfo.TypeName}', '{RecordTypeInfo.TypeDesc}', + VALUES ('{RecordTypeInfo.ID}','{RecordTypeInfo.RBU}', '{RecordTypeInfo.TypeName}', '{RecordTypeInfo.TypeDesc}', '{RecordTypeInfo.Source}', '{RecordTypeInfo.PrefixCode}', {RecordTypeInfo.Length})"; //安勤連線 PTDContext _ptd_context = new PTDContext(); @@ -3268,7 +3307,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); } [HttpPut("PutRecordTypeInfo/{id}")] - public async Task> PutRecordTypeInfo(int id, [FromBody] RecordTypeInfo RecordTypeInfo) + public async Task> PutRecordTypeInfo(string id, [FromBody] RecordTypeInfo RecordTypeInfo) { ResultModel result = new ResultModel(); if (id != RecordTypeInfo.ID) @@ -3287,7 +3326,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); Source = '{RecordTypeInfo.Source}', PrefixCode = '{RecordTypeInfo.PrefixCode}', Length = {RecordTypeInfo.Length} - WHERE ID = {id}"; + WHERE ID = '{id}'"; //安勤連線 PTDContext _ptd_context = new PTDContext(); DbConnection connPTD = _ptd_context.Database.GetDbConnection(); @@ -3321,7 +3360,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); try { string strSQL = $@"DELETE FROM SFIS_PTD.dbo.RecordTypeInfo - WHERE ID = {id}"; + WHERE ID = '{id}'"; //安勤連線 PTDContext _ptd_context = new PTDContext(); DbConnection connPTD = _ptd_context.Database.GetDbConnection(); @@ -3393,7 +3432,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); RecordTypeInfo.Add(new RecordTypeInfo { RBU = Convert.ToString(row["RBU"]), - ID = Convert.ToInt32(row["ID"]), + ID = Convert.ToString(row["ID"]), TypeName = Convert.ToString(row["TypeName"]), TypeDesc = Convert.ToString(row["TypeDesc"]), Source = Convert.ToString(row["Source"]), diff --git a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs index 28cbff06..b976e69c 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs @@ -65,7 +65,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES { public int Mode { get; set; } = 0; public string RBU { get; set; } - public int ID { get; set; } + public string ID { get; set; } public string TypeName { get; set; } public string TypeDesc { get; set; } public string Source { get; set; }