Merge branch 'master' of http://61.216.68.18:4000/JHSYS/AMES

AMESCoreStudio.Web/Controllers/LABController.cs

@@ -13,6 +13,8 @@ using static AMESCoreStudio.Web.ViewModels.LAB.LAB003ViewModel;
 using AMESCoreStudio.WebApi.Models.AMES;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using AMESCoreStudio.WebApi.DTO.AMES;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -30,7 +32,265 @@ namespace AMESCoreStudio.Web.Controllers
 
         }
 
+        private void GetFlagList()
+        {
+
+            var FlagList = new List<SelectListItem>();
+
 
+            FlagList.Add(new SelectListItem("Y", "Y"));
+            FlagList.Add(new SelectListItem("N", "N"));
+
+            ViewBag.FlagList = FlagList;
+        }
+        public void GetUserID()
+        {
+            var userID = "";
+            HttpContext.Request.Cookies.TryGetValue("UserID", out userID);
+            int user_id = 0;
+            if (userID != null)
+            {
+                if (int.Parse(userID.ToString()) >= 0)
+                {
+                    user_id = int.Parse(userID.ToString());
+                }
+            }
+            ViewBag.UserID = user_id;
+        }
+
+
+        #region LAB001工作群組維護相關
+
+        public IActionResult LAB001()
+        {
+            return View();
+        }
+
+        //新增頁面
+        public IActionResult LAB001C()
+        {
+            GetUserID();
+            GetFlagList();
+            return View();
+        }
+
+
+
+        //修改页面
+        [HttpGet]
+        public async Task<IActionResult> LAB001U(int id)
+        {
+            GetUserID();
+            GetFlagList();
+            var result = await _labApi.GetLabelParam(id);
+
+            if (result.LABEL_FIELD_ID == 0)
+            {
+                return View();
+            }
+            return View(result);
+        }
+
+
+        //頁面提交，id=0 添加，id>0 修改
+        [HttpPost]
+        public async Task<IActionResult> LAB001CSaveAsync(LabelParam model)
+        {
+            if (ModelState.IsValid)
+            {
+                IResultModel result;
+
+                result = await _labApi.PostLabelParam(JsonConvert.SerializeObject(model));
+
+
+                if (result.Success) //yiru modify 2022-09-27
+                {
+                    var _msg = "添加成功！";
+                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                }
+                else
+                {
+                    
+                        ModelState.AddModelError("error", result.Msg);
+                   
+                }
+            }
+            return View("LAB001C", model);
+        }
+
+        public async Task<IActionResult> LAB001USaveAsync(LabelParam model)
+        {
+            if (ModelState.IsValid)
+            {
+                IResultModel result;
+
+                result = await _labApi.PutLabelParam(model.LABEL_FIELD_ID, JsonConvert.SerializeObject(model));
+
+                if (result.Success)
+                {
+                    var _msg = "修改成功！";
+                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                }
+                else
+                {
+                    if (result.Errors.Count > 0)
+                    {
+                        ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                    }
+                    else
+                    {
+                        ModelState.AddModelError("error", result.Msg);
+                    }
+                }
+            }
+            return View("LAB001U", model);
+        }
+
+
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetLabParamsAsync(int page = 0, int limit = 10)
+        {
+            var result = await _labApi.GetLabParamsByLabelID(page, limit);
+
+            if (result.Data.Count() > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+        #endregion
+
+
+
+        #region LAB002 標籤樣板維護
+
+        public IActionResult LAB002()
+        {
+            return View();
+        }
+
+        //新增頁面
+        public IActionResult LAB002C()
+        {
+            GetUserID();
+            return View();
+        }
+
+        //修改页面
+        [HttpGet]
+        public async Task<IActionResult> LAB002UAsync(int id)
+        {
+            // var resultMaster = await _labApi.GetLabelTemplateMaster(id);
+            // var resultDetail = await _labApi.GetLabelTemplateDetail(id);
+
+            //  var result = new LabelTemplateDto();
+
+            //  result.labelTemplateMaster = resultMaster;
+            //  result.labelTemplateDetails = resultDetail;
+            // var result 
+
+            GetUserID();
+
+
+            return View();
+        }
+
+        //頁面提交，id=0 添加，id>0 修改
+        [HttpPost]
+        public async Task<IActionResult> LAB002CSaveAsync(LabelTemplateDto model)
+        {
+            GetUserID();
+            if (ModelState.IsValid)
+            {
+                IResultModel result;
+
+                result = await _labApi.PostLabelTemplateMaster(JsonConvert.SerializeObject(model));
+
+
+                if (result.Success)
+                {
+                    var _msg = "添加成功！";
+                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                }
+                else
+                {
+                    ModelState.AddModelError("error", result.Msg);
+                    return View("LAB002C", model);
+
+                }
+            }
+            else
+            {
+
+                ModelState.AddModelError("error", "缺少必填資料");
+                return View("LAB002C", model);
+            }
+        }
+
+        public async Task<IActionResult> LAB002USaveAsync(LabelTemplateDto model)
+        {
+            if (ModelState.IsValid)
+            {
+                IResultModel result;
+
+                //result = await _labApi.PutLabeTemplateMaster(model.labelTemplateMaster.TemplateID, JsonConvert.SerializeObject(model.labelTemplateMaster));
+                //foreach (var item in model.labelTemplateDetails)
+                //{
+                //    result = await _labApi.PutLabeTemplateDetail(item.TemplateDetailID, JsonConvert.SerializeObject(item));
+                //}
+
+                //if (result.Success)
+                //{
+                //    var _msg = "修改成功！";
+                //    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                //}
+                //else
+                //{
+                //    GetUserID();
+                //    ModelState.AddModelError("error", result.Msg);
+                //    return View("LAB002C", model);
+
+                //}
+                return View("LAB002U", model);
+            }
+            else
+            {
+                GetUserID();
+                ModelState.AddModelError("error", "缺少必填資料");
+                return View("LAB002U", model);
+            }
+        }
+
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetLabelTemplateDtoAsync(string LabelMatnr, string Status, int page = 0, int limit = 10)
+        {
+            var result = await _labApi.GetLabelTemplateDto(LabelMatnr, Status, page, limit);
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
+        public async Task<IActionResult> GetLabelTemplatebyMatnrAsync(int id)
+        {
+            var result = await _labApi.GetLabelTemplatebyMatnr(id);
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
+        #endregion
+        #region Lab003
 
         public async Task<IActionResult> LAB003(string mat)
         {
@@ -190,7 +450,7 @@ namespace AMESCoreStudio.Web.Controllers
             return user_id;
         }
 
-
+        #endregion
 
 
 

AMESCoreStudio.Web/HttpApis/AMES/ILAB.cs

@@ -51,6 +51,112 @@ namespace AMESCoreStudio.Web
 
         [WebApiClient.Attributes.HttpGet("api/LabelItem/LabelApplyNotify")]
         ITask<ResultModel<dynamic>> LabelApplyNotify(string OrderNo);
+        #endregion
+
+
+        #region LAB001 LAB002
+
+        /// <summary>
+        /// Label 參數查詢by ID
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/LabelParam/{id}")]
+        ITask<LabelParam> GetLabelParam(int id);
+
+
+        /// <summary>
+        /// Label 參數儲存
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/LabelParam")]
+        ITask<ResultModel<LabelParam>> PostLabelParam([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// Label 參數修改
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/LabelParam")]
+        ITask<ResultModel<LabelParam>> PutLabelParam(int id, [FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 獲取Label 全部參數資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/LabelParam")]
+        ITask<List<LabelParam>> GetLabParams();
+
+        /// <summary>
+        /// 獲取Label 全部參數資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/LabelParam/byLabelID/{id}")]
+        ITask<ResultModel<LabelParam>> GetLabParamsByLabelID(int page = 0, int limit = 10);
+
+        /// <summary>
+        /// Label 參數儲存
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/LabelTemplateMaster")]
+        ITask<ResultModel<LabelTemplateMaster>> PostLabelTemplateMaster([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// Label 參數修改
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/LabelTemplateMaster")]
+        ITask<ResultModel<LabelTemplateMaster>> PutLabeTemplateMaster(int id, [FromBody, RawJsonContent] string model);
+
+
+        /// <summary>
+        /// Label 參數儲存
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/LabelTemplatDetail")]
+        ITask<ResultModel<LabelTemplateDetail>> PostLabelTemplateDetail([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// Label 參數修改
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPut("api/LabelTemplateDetail")]
+        ITask<ResultModel<LabelTemplateDetail>> PutLabeTemplateDetail(int id, [FromBody, RawJsonContent] string model);
+
+
+
+
+
+        /// <summary>
+        /// Label 參數查詢by ID
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/LabelTemplateMaster/{id}")]
+        ITask<LabelTemplateMaster> GetLabelTemplateMaster(int id);
+
+        /// <summary>
+        /// Label 參數查詢by ID
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/LabelTemplateDetail/{id}")]
+        ITask<List<LabelTemplateDetail>> GetLabelTemplateDetail(int id);
+
+        /// <summary>
+        /// 獲取Label 全部參數資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/LabelTemplateMaster/LabelTemplatebyMatnr/{LabelMatnr}/{Status}")]
+        ITask<List<LabelTemplateMaster>> GetLabelTemplateDto(string LabelMatnr, string Status, int page, int limit);
+
+
+        /// <summary>
+        /// 獲取Label 全部參數資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/LabelTemplateDetail/byTemplateIDMulti/{id}")]
+        ITask<List<dynamic>> GetLabelTemplatebyMatnr(int id);
+
+
+
+
         #endregion
     }
 }

AMESCoreStudio.Web/Views/LAB/LAB001.cshtml

@@ -24,23 +24,23 @@
         });
         var tableCols = [[
             {
-                field: 'labelFieldID',
+                field: 'labeL_FIELD_ID',
                 width: 200,
                 title: '#'
             },
             {
-                field: 'labelFieldName',
+                field: 'labeL_FIELD_NAME',
                 title: '標籤欄位名稱'
             },
             {
-                field: 'paramName',
+                field: 'paraM_NAME',
                 title: '標籤變數名稱'
             },
             {
-                field: 'statusNo',
+                field: 'statuS_No',
                 title: '狀態',
                 templet: function (d) {
-                    return d.statusNo === 'Y' ? '啟用' : '停用';
+                    return d.statuS_NO === 'Y' ? '啟用' : '停用';
                 }
             },
             {
@@ -56,41 +56,18 @@
 
         //通过行tool编辑，lay-event="edit"
         function edit(obj) {
-            if (obj.data.labelFieldID) {
+            if (obj.data.labeL_FIELD_ID) {
-                hg.open('修改參數名稱', '/LAB/LAB001U/' + obj.data.labelFieldID, 640,320);
+                hg.open('修改參數名稱', '/LAB/LAB001U/' + obj.data.labeL_FIELD_ID, 640,320);
             }
         }
 
-        //通过行tool删除，lay-event="del"
+       
-        function del(obj) {
-            if (obj.data.groupID) {
-                hg.confirm("工作群組：" + obj.data.groupName + "，确定要删除吗？", function () {
-                    $.ajax({
-                        url: '/WHS/WHS001D',
-                        data: { id: obj.data.groupID },
-                        type: 'POST',
-                        success: function (data) {
-                            if (data.success) {
-                                obj.del(); //只删本地数据
-                                hg.msghide("删除成功！");
-                            }
-                            else {
-                                hg.msg(data.msg);
-                            }
-                        },
-                        error: function () {
-                            hg.msg("网络请求失败！");
-                        }
-                    });
-                });
-            }
-        }
         var toolbar = [{
             text: '新增',
             layuiicon: '',
             class: 'layui-btn-normal',
             handler: function () {
-                hg.open('新增工作群組', '/LAB/LAB001C', 640, 320);
+                hg.open('新增參數', '/LAB/LAB001C', 640, 320);
 
             }
         }

AMESCoreStudio.Web/Views/LAB/LAB001C.cshtml

@@ -1,7 +1,7 @@
 @model AMESCoreStudio.WebApi.Models.AMES.LabelParam
 
 
-@{ ViewData["Title"] = "WHS001C";
+@{ ViewData["Title"] = "新增Label參數";
     Layout = "~/Views/Shared/_FormLayout.cshtml"; }
 
 
@@ -15,25 +15,29 @@
     <div class="col-sm-12">
         <form enctype="multipart/form-data" method="post" asp-action="LAB001CSave">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <input type="hidden" asp-for="CREATE_USERID" value="@ViewBag.UserID" />
+            <input type="hidden" asp-for="UPDATE_USERID" value="@ViewBag.UserID" />
+            <input type="hidden" asp-for="CREATE_DATE" value="@System.DateTime.Now" />
+            <input type="hidden" asp-for="UPDATE_DATE" value="@System.DateTime.Now" />
 
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="LabelFieldName" class="control-label col-sm-3"></label>
+                <label asp-for="LABEL_FIELD_NAME" class="control-label col-sm-3"></label>
-                <input asp-for="LabelFieldName" class="form-control col-sm-9" placeholder="請輸入欄位名稱" />
+                <input asp-for="LABEL_FIELD_NAME" class="form-control col-sm-9" placeholder="請輸入欄位名稱" />
-                <span asp-validation-for="LabelFieldName" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="LABEL_FIELD_NAME" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="ParamName" class="control-label col-sm-3"></label>
+                <label asp-for="PARAM_NAME" class="control-label col-sm-3"></label>
-                <input asp-for="ParamName" class="form-control col-sm-9" placeholder="請輸入變數名稱" />
+                <input asp-for="PARAM_NAME" class="form-control col-sm-9" placeholder="請輸入變數名稱" />
-                <span asp-validation-for="ParamName" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="PARAM_NAME" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="StatusNo" class="control-label col-sm-3"></label>
+                <label asp-for="STATUS_NO" class="control-label col-sm-3"></label>
                 <label class="layui-form-label" style="margin-right: 10px;">
-                    <input type="radio" asp-for="StatusNo" value="Y" checked>
+                    <input type="radio" asp-for="STATUS_NO" value="Y" checked>
                     啟用
                 </label>
                 <label class="layui-form-label">
-                    <input type="radio" asp-for="StatusNo" value="N">
+                    <input type="radio" asp-for="STATUS_NO" value="N">
                     停用
                 </label>
             </div>

AMESCoreStudio.Web/Views/LAB/LAB001U.cshtml

@@ -15,26 +15,30 @@
     <div class="col-sm-12">
         <form enctype="multipart/form-data" method="post" asp-action="LAB001USave">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="LabelFieldID" />
+            <input type="hidden" asp-for="LABEL_FIELD_ID" />
+            <input type="hidden" asp-for="CREATE_USERID"  />
+            <input type="hidden" asp-for="UPDATE_USERID" value="@ViewBag.UserID" />
+            <input type="hidden" asp-for="CREATE_DATE" />
+            <input type="hidden" asp-for="UPDATE_DATE" value="@System.DateTime.Now" />
 
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="LabelFieldName" class="control-label col-sm-3"></label>
+                <label asp-for="LABEL_FIELD_NAME" class="control-label col-sm-3"></label>
-                <input asp-for="LabelFieldName" class="form-control col-sm-9" readonly="readonly" />
+                <input asp-for="LABEL_FIELD_NAME" class="form-control col-sm-9" readonly="readonly" />
-                <span asp-validation-for="LabelFieldName" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="LABEL_FIELD_NAME" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="ParamName" class="control-label col-sm-3"></label>
+                <label asp-for="PARAM_NAME" class="control-label col-sm-3"></label>
-                <input asp-for="ParamName" class="form-control col-sm-9" readonly="readonly" />
+                <input asp-for="PARAM_NAME" class="form-control col-sm-9" readonly="readonly" />
-                <span asp-validation-for="ParamName" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="PARAM_NAME" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="StatusNo" class="control-label col-sm-3"></label>
+                <label asp-for="STATUS_NO" class="control-label col-sm-3"></label>
                 <label class="layui-form-label" style="margin-right: 10px;">
-                    <input type="radio" asp-for="StatusNo" value="Y">
+                    <input type="radio" asp-for="STATUS_NO" value="Y">
                     啟用
                 </label>
                 <label class="layui-form-label">
-                    <input type="radio" asp-for="StatusNo" value="N">
+                    <input type="radio" asp-for="STATUS_NO" value="N">
                     停用
                 </label>
             </div>

AMESCoreStudio.WebApi/Controllers/AMES/LabelParamController.cs

@@ -29,7 +29,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet]
         public async Task<ActionResult<IEnumerable<LabelParam>>> GetLabelParams()
         {
-            return await _context.LabelParams.ToListAsync();
+            return await _context.LabelParam.ToListAsync();
         }
 
 
@@ -37,7 +37,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet("{id}")]
         public async Task<ActionResult<LabelParam>> GetLabelParam(int id)
         {
-            var LabelParam = await _context.LabelParams.FindAsync(id);
+            var LabelParam = await _context.LabelParam.FindAsync(id);
 
             if (LabelParam == null)
             {
@@ -48,21 +48,46 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
 
+        // GET: api/LabelParam/5
+        [HttpGet("byLabelID/{id}")]
+        public async Task<ResultModel<LabelParam>> GetLabelParambyLabelID(int id, int page = 0, int limit = 10)
+        {
+            ResultModel<LabelParam> result = new ResultModel<LabelParam>();
+            IQueryable<LabelParam> q = _context.LabelParam;
+            if (id > 0)
+            {
+                q = q.Where(p => p.LABEL_FIELD_ID.Equals(id));
+            }
+
+            result.DataTotal = q.Count();
+
+            // Table 頁數
+            if (page > 0)
+            {
+                q = q.Skip((page - 1) * limit).Take(limit);
+            }
+           
+            result.Data = await q.ToListAsync();
+
+            return result;
+        }
+
+
         /// <summary>
         /// 更新Label參數檔
         /// </summary>
         /// <param name="labelParam"></param>
         /// <returns></returns>
         [HttpPut]
-        public async Task<ResultModel<LabelParam>> PutBarcodeOutfit(LabelParam labelParam)
+        public async Task<ResultModel<LabelParam>> PutLabelParam(int id,LabelParam labelParam)
         {
             ResultModel<LabelParam> result = new ResultModel<LabelParam>();
             _context.Entry(labelParam).State = EntityState.Modified;
             //設置容器空間某一個模型的某一個欄位 不提交到資料庫
-            _context.Entry<LabelParam>(labelParam).Property("CreateDate").IsModified = false;
+            _context.Entry<LabelParam>(labelParam).Property("CREATE_DATE").IsModified = false;
-            _context.Entry<LabelParam>(labelParam).Property("CreateUserID").IsModified = false;
+            _context.Entry<LabelParam>(labelParam).Property("CREATE_USERID").IsModified = false;
-            labelParam.UpdateDate = DateTime.Now;
+            labelParam.UPDATE_DATE = DateTime.Now;
-            labelParam.UpdateUserID = 0;
+            labelParam.UPDATE_USERID = 0;
 
             try
             {
@@ -84,15 +109,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="labelParam"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<ResultModel<LabelParam>> PostBarcodeOutfit(LabelParam labelParam)
+        public async Task<ResultModel<LabelParam>> PostLabelParam(LabelParam labelParam)
         {
             ResultModel<LabelParam> result = new ResultModel<LabelParam>();
 
             try
             {
                 Helper helper = new Helper(_context);
-                labelParam.LabelFieldID = helper.GetIDKey("LABEL_FIELD_ID").Result;
+                labelParam.LABEL_FIELD_ID = helper.GetIDKey("LABEL_FIELD_ID").Result;
-                _context.LabelParams.Add(labelParam);
+                _context.LabelParam.Add(labelParam);
                 await _context.SaveChangesAsync();
                 result.Success = true;
                 result.Msg = "OK";
@@ -109,13 +134,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpDelete("{id}")]
         public async Task<ActionResult<LabelParam>> DeleteLabelParam(int id)
         {
-            var LabelParam = await _context.LabelParams.FindAsync(id);
+            var LabelParam = await _context.LabelParam.FindAsync(id);
             if (LabelParam == null)
             {
                 return NotFound();
             }
 
-            _context.LabelParams.Remove(LabelParam);
+            _context.LabelParam.Remove(LabelParam);
             await _context.SaveChangesAsync();
 
             return LabelParam;
@@ -123,7 +148,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
         private bool LabelParamExists(int id)
         {
-            return _context.LabelParams.Any(e => e.LabelFieldID == id);
+            return _context.LabelParam.Any(e => e.LABEL_FIELD_ID == id);
         }
     }
 }

AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateDetailController.cs

@@ -29,41 +29,41 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet]
         public async Task<ActionResult<IEnumerable<LabelTemplateDetail>>> GetLabelTemplateDetails()
         {
-            return await _context.LabelTemplateDetails.ToListAsync();
+            return await _context.LabelTemplateDetail.ToListAsync();
         }
 
         // GET: api/LabelTemplateDetail/5
         [HttpGet("{id}")]
         public async Task<ActionResult<IEnumerable<LabelTemplateDetail>>> GetLabelTemplateDetail(int id)
         {
-            var labelTemplateDetail = await _context.LabelTemplateDetails.Where(w=>w.TemplateID == id).ToListAsync();
+            var labelTemplateDetail = await _context.LabelTemplateDetail.Where(w=>w.TEMPLATE_ID == id).ToListAsync();
 
             return labelTemplateDetail;
         }
 
-        // GET: api/LabelTemplateDetail/5
+        //// GET: api/LabelTemplateDetail/5
-        [HttpGet("byTemplateIDMulti/{id}")]
+        //[HttpGet("byTemplateIDMulti/{id}")]
-        public async Task<ActionResult<IEnumerable<dynamic>>> GetLabelTemplateDetailbyTemplateIDMulti(int id)
+        //public async Task<ActionResult<IEnumerable<dynamic>>> GetLabelTemplateDetailbyTemplateIDMulti(int id)
-        {
+        //{
-            var q = from p in _context.LabelParams
+        //    var q = from p in _context.LabelParam
-                        join d in _context.LabelTemplateDetails
+        //                join d in _context.LabelTemplateDetail
-                        on new { p.LabelFieldID, TemplateID = id } equals new { d.LabelFieldID, d.TemplateID } into d1
+        //                on new { p.LABEL_FIELD_ID, TemplateID = id } equals new { d.LABEL_FIELD_ID, d.TEMPLATE_ID } into d1
-                        from subd in d1.DefaultIfEmpty()
+        //                from subd in d1.DefaultIfEmpty()
-                        where p.StatusNo == "Y"
+        //                where p.StatusNo == "Y"
-                        select new 
+        //                select new 
-                        {
+        //                {
-                            LabelFieldID = p.LabelFieldID,
+        //                    LabelFieldID = p.LabelFieldID,
-                            LabelFieldName = p.LabelFieldName,
+        //                    LabelFieldName = p.LabelFieldName,
-                            ParamName = p.ParamName,
+        //                    ParamName = p.ParamName,
-                            TemplateID = subd != null ? 1 : 0 //有此欄位則顯示為1 沒有就為0
+        //                    TemplateID = subd != null ? 1 : 0 //有此欄位則顯示為1 沒有就為0
-                        };
+        //                };
 
 
 
-            var query = await q.ToListAsync();
+        //    var query = await q.ToListAsync();
 
-            return query;
+        //    return query;
-        }
+        //}
 
 
         /// <summary>
@@ -79,8 +79,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             //設置容器空間某一個模型的某一個欄位 不提交到資料庫
             _context.Entry<LabelTemplateDetail>(LabelTemplateDetail).Property("CreateDate").IsModified = false;
             _context.Entry<LabelTemplateDetail>(LabelTemplateDetail).Property("CreateUserID").IsModified = false;
-            LabelTemplateDetail.UpdateDate = DateTime.Now;
+            LabelTemplateDetail.UPDATE_DATE = DateTime.Now;
-            LabelTemplateDetail.UpdateUserID = 0;
+            LabelTemplateDetail.UPDATE_USERID = 0;
 
             try
             {
@@ -109,8 +109,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             try
             {
                 Helper helper = new Helper(_context);
-                LabelTemplateDetail.TemplateID = helper.GetIDKey("TEMPLATE_ID").Result;
+                LabelTemplateDetail.TEMPLATE_ID = helper.GetIDKey("TEMPLATE_ID").Result;
-                _context.LabelTemplateDetails.Add(LabelTemplateDetail);
+                _context.LabelTemplateDetail.Add(LabelTemplateDetail);
                 await _context.SaveChangesAsync();
                 result.Success = true;
                 result.Msg = "OK";
@@ -127,13 +127,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpDelete("{id}")]
         public async Task<ActionResult<LabelTemplateDetail>> DeleteLabelTemplateDetail(int id)
         {
-            var LabelTemplateDetail = await _context.LabelTemplateDetails.FindAsync(id);
+            var LabelTemplateDetail = await _context.LabelTemplateDetail.FindAsync(id);
             if (LabelTemplateDetail == null)
             {
                 return NotFound();
             }
 
-            _context.LabelTemplateDetails.Remove(LabelTemplateDetail);
+            _context.LabelTemplateDetail.Remove(LabelTemplateDetail);
             await _context.SaveChangesAsync();
 
             return LabelTemplateDetail;
@@ -141,7 +141,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
         private bool LabelTemplateDetailExists(int id)
         {
-            return _context.LabelTemplateDetails.Any(e => e.TemplateID == id);
+            return _context.LabelTemplateDetail.Any(e => e.TEMPLATE_ID == id);
         }
     }
 }

AMESCoreStudio.WebApi/Controllers/AMES/LabelTemplateMasterController.cs

@@ -30,14 +30,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet]
         public async Task<ActionResult<IEnumerable<LabelTemplateMaster>>> GetLabelTemplateMasters()
         {
-            return await _context.LabelTemplateMasters.ToListAsync();
+            return await _context.LabelTemplateMaster.ToListAsync();
         }
 
         // GET: api/LabelTemplateMaster/5
         [HttpGet("{id}")]
         public async Task<ActionResult<LabelTemplateMaster>> GetLabelTemplateMaster(int id)
         {
-            var LabelTemplateMaster = await _context.LabelTemplateMasters.FindAsync(id);
+            var LabelTemplateMaster = await _context.LabelTemplateMaster.FindAsync(id);
 
             if (LabelTemplateMaster == null)
             {
@@ -61,8 +61,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             //設置容器空間某一個模型的某一個欄位 不提交到資料庫
             _context.Entry<LabelTemplateMaster>(LabelTemplateMaster).Property("CreateDate").IsModified = false;
             _context.Entry<LabelTemplateMaster>(LabelTemplateMaster).Property("CreateUserID").IsModified = false;
-            LabelTemplateMaster.UpdateDate = DateTime.Now;
+            LabelTemplateMaster.UPDATE_DATE = DateTime.Now;
-            LabelTemplateMaster.UpdateUserID = 0;
+            LabelTemplateMaster.UPDATE_USERID = 0;
 
             try
             {
@@ -91,8 +91,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             try
             {
                 Helper helper = new Helper(_context);
-                LabelTemplateMaster.TemplateID = helper.GetIDKey("TEMPLATE_ID").Result;
+                LabelTemplateMaster.TEMPLATE_ID = helper.GetIDKey("TEMPLATE_ID").Result;
-                _context.LabelTemplateMasters.Add(LabelTemplateMaster);
+                _context.LabelTemplateMaster.Add(LabelTemplateMaster);
                 await _context.SaveChangesAsync();
                 result.Success = true;
                 result.Msg = "OK";
@@ -109,13 +109,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpDelete("{id}")]
         public async Task<ActionResult<LabelTemplateMaster>> DeleteLabelTemplateMaster(int id)
         {
-            var LabelTemplateMaster = await _context.LabelTemplateMasters.FindAsync(id);
+            var LabelTemplateMaster = await _context.LabelTemplateMaster.FindAsync(id);
             if (LabelTemplateMaster == null)
             {
                 return NotFound();
             }
 
-            _context.LabelTemplateMasters.Remove(LabelTemplateMaster);
+            _context.LabelTemplateMaster.Remove(LabelTemplateMaster);
             await _context.SaveChangesAsync();
 
             return LabelTemplateMaster;
@@ -126,26 +126,26 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         public async Task<ActionResult<IEnumerable<LabelTemplateMaster>>> GetLabelTemplatebyMatnr(string LabelMatnr, string Status, int page = 0, int limit = 10)
         {
           
-            IQueryable<LabelTemplateMaster> q =  _context.LabelTemplateMasters;
+            IQueryable<LabelTemplateMaster> q =  _context.LabelTemplateMaster;
           
             if (!string.IsNullOrEmpty(LabelMatnr) && LabelMatnr != "*")
             {
-                q.Where(w => w.LabelMatnr.Equals(LabelMatnr));
+                q.Where(w => w.LABEL_MATNR.Equals(LabelMatnr));
                
             }
 
             if (!string.IsNullOrEmpty(Status) && Status != "*")
             {
-                q.Where(w => w.StatusNo.Equals(Status) );
+                q.Where(w => w.STATUS_NO.Equals(Status) );
             }
 
             if (page > 0)
             {
-                q = q.OrderBy(p => p.LabelMatnr).Skip((page - 1) * limit).Take(limit);
+                q = q.OrderBy(p => p.LABEL_MATNR).Skip((page - 1) * limit).Take(limit);
             }
             else
             {
-                q = q.OrderBy(p => p.LabelMatnr);
+                q = q.OrderBy(p => p.LABEL_MATNR);
             }
 
             var labelTemplateMasters = await q.ToListAsync();
@@ -156,10 +156,61 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
         }
 
+        //// GET: api/LabelTemplateMaster/5
+        //[HttpGet("LabelTemplateMulti/{LabelMatnr}/{Status}")]
+        //public async Task<ActionResult<IEnumerable<LabelTemplateDto>>> GetLabelTemplateDto(string LabelMatnr, string Status, int page = 0, int limit = 10)
+        //{
+        //    List<LabelTemplateDto> TemplateDtoList = new List<LabelTemplateDto>();
+        //    var LabelTemplateMaster = await _context.LabelTemplateMaster.Where(w => w.LabelMatnr == LabelMatnr).ToListAsync();
+        //    foreach (var item in LabelTemplateMaster)
+        //    {
+        //        var LabelTemplateDetail = await _context.LabelTemplateDetails.Where(w => w.TemplateID == item.TemplateID).ToListAsync();
+
+        //        var TemplateDto= new LabelTemplateDto
+        //        {
+        //           TemplateID = item.TemplateID,
+        //           LabelMatnr = item.LabelMatnr,
+        //           LabelFile = item.LabelFile,
+        //           ImageName = item.ImageName,
+        //           Remark = item.Remark,
+        //           CreateDate = item.CreateDate,
+        //           CreateUserID = item.CreateUserID,
+        //           UpdateDate = item.UpdateDate,
+        //           UpdateUserID = item.UpdateUserID
+
+        //        };
+
+        //        foreach (var item1 in LabelTemplateDetail)
+        //        {
+        //            TemplateDto.labelTemplateDetails.Add(new Models.AMES.LabelTemplateDetail
+        //            {
+        //                TemplateID = item1.TemplateID,
+        //                LabelFieldID = item1.LabelFieldID,
+        //                CreateDate = item1.CreateDate,
+        //                CreateUserID = item1.CreateUserID,
+        //                UpdateDate = item1.UpdateDate,
+        //                UpdateUserID = item1.UpdateUserID
+        //            });
+
+        //        }
+
+        //        TemplateDtoList.Add(TemplateDto);
+
+
+        //    }
+
+        //    if (LabelTemplateMaster == null)
+        //    {
+        //        return NotFound();
+        //    }
+
+        //    return TemplateDtoList;
+
+        //}
 
         private bool LabelTemplateMasterExists(int id)
         {
-            return _context.LabelTemplateMasters.Any(e => e.TemplateID == id);
+            return _context.LabelTemplateMaster.Any(e => e.TEMPLATE_ID == id);
         }
     }
 }

AMESCoreStudio.WebApi/DTO/AMES/LabelTemplateDto.cs

@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+using System.Runtime.Serialization;
+using AMESCoreStudio.WebApi.Models.AMES;
+
+#nullable disable
+
+namespace AMESCoreStudio.WebApi.DTO.AMES
+{
+    /// <summary>
+    /// 入庫單資料檔 Dto
+    /// </summary>
+    public partial class LabelTemplateDto
+    {
+        public LabelTemplateDto()
+        {
+            labelTemplateDetails = new List<LabelTemplateDetail>();
+
+        }
+
+        /// <summary>
+        /// 標籤欄位ID
+        /// </summary>
+        [DataMember]
+        [Display(Name = "標籤欄位ID")]
+        public int TemplateID { get; set; }
+
+        /// <summary>
+        /// 標籤料號
+        /// </summary>
+        [DataMember]
+        [Display(Name = "Label料號")]
+        public string LabelMatnr { get; set; }
+
+        /// <summary>
+        /// 標籤檔案
+        /// </summary>
+        [DataMember]
+        [Display(Name = "標籤檔名")]
+        public string LabelFile { get; set; }
+
+        /// <summary>
+        /// 狀態 Y:啟用 N:停用
+        /// </summary>
+        [DataMember]
+        [Display(Name = "狀態")]
+        public string StatusNo { get; set; }
+
+        /// <summary>
+        /// 圖檔
+        /// </summary>
+        [DataMember]
+        [Display(Name = "檢視圖檔")]
+        public string ImageName { get; set; }
+
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+        [DataMember]
+        [Display(Name = "建立UserID")]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [DataMember]
+        [Display(Name = "建立日期")]
+        public DateTime CreateDate { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 更新UserID
+        /// </summary>
+        [DataMember]
+        [Display(Name = "更新UserID")]
+        public int UpdateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 更新日期
+        /// </summary>
+        [DataMember]
+        [Display(Name = "更新日期")]
+        public DateTime? UpdateDate { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 備註
+        /// </summary>
+        [DataMember]
+        [Display(Name = "備註說明")]
+        public string Remark { get; set; }
+        ///// <summary>
+        ///// 標籤樣版detail ID
+        ///// </summary>
+        //[DataMember]
+        //[Display(Name = "標籤樣版detail ID")]
+        //public int TemplateDetailID { get; set; }
+
+        ///// <summary>
+        ///// 標籤欄位名稱
+        ///// </summary>
+        //[DataMember]
+        //[Display(Name = "標籤欄位名稱")]
+        //public int LabelFieldID { get; set; }
+
+
+        /// <summary>
+        /// Detail
+        /// </summary>
+        public List<LabelTemplateDetail> labelTemplateDetails { get; set; }
+
+
+    }
+}

AMESCoreStudio.WebApi/Models/AMES/LabelParam.cs

@@ -55,14 +55,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("CREATE_DATE")]
         [DataMember]
-        public string CREATE_DATE { get; set; }
+        public DateTime CREATE_DATE { get; set; }
 
         /// <summary>
         /// 建立人
         /// </summary>
         [Column("CREATE_USERID")]
         [DataMember]
-        public string CREATE_USERID { get; set; }
+        public int CREATE_USERID { get; set; }
 
         /// <summary>
         /// 更新日