Modify LAB controller

AMESCoreStudio.Web/Controllers/LABController.cs

@@ -13,47 +13,23 @@ using static AMESCoreStudio.Web.ViewModels.LAB.LAB003ViewModel;
 using AMESCoreStudio.WebApi.Models.AMES;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using AMESCoreStudio.Web.Models;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Linq;
-using AMESCoreStudio.WebApi.Models;
-using System;
-using System.Data;
-using AMESCoreStudio.Web.ViewModels;
-using AMESCoreStudio.WebApi.Models.AMES;
-using AMESCoreStudio.WebApi.DTO.AMES;
 
 namespace AMESCoreStudio.Web.Controllers
 {
     public class LABController : Controller
     {
-        private readonly ILogger<LABController> _logger;
-        public readonly IREP _repApi;
-        public readonly IPPS _ppsApi;
-        public readonly IBAS _basApi;
-        public readonly IPCS _pcsApi;
         public readonly ISYS _sysApi;
-        public readonly IKCS _kcsApi;
-        public readonly IQRS _qrsApi;
         public readonly ILAB _labApi;
 
-        private readonly IWebHostEnvironment _env;
 
         public LABController(ILogger<LABController> logger, ILAB labApi, ISYS sysApi, IPCS pcsApi, IStringLocalizer<SharedResource> sharedLocalizer)
         {
 
             _sysApi = sysApi;
-            _kcsApi = kcsApi;
-            _qrsApi = qrsApi;
             _labApi = labApi;
 
-            _env = env;
         }
-        private void GetFlagList()
-        {
 
-            var FlagList = new List<SelectListItem>();
 
 
         public async Task<IActionResult> LAB003(string mat)
@@ -65,9 +41,6 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.UserName = name;
             return View();
         }
-            }
-            ViewBag.UserID = user_id;
-        }
 
         public async Task<IActionResult> LAB004()
         {
@@ -86,9 +59,6 @@ namespace AMESCoreStudio.Web.Controllers
             return View(model);
         }
 
-       
-
-        //修改页面
         [HttpGet]
         public async Task<IActionResult> GetLab004(string OrderNo, string ModelNo, DateTime? strdate, DateTime? enddate, string UserNo)
         {
@@ -98,7 +68,7 @@ namespace AMESCoreStudio.Web.Controllers
                 User = await _sysApi.GetUserInfoByUserNo(UserNo);
             var result = await _labApi.GetLabelItemMaster(OrderNo, ModelNo, strdate, enddate, User.UserID);
 
-            if (result!=null)
+            if (result != null)
             {
                 return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.Data.Count() });
             }
@@ -109,13 +79,12 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> LAB003P(string LabMat)
         {
             var result = await _labApi.GetLabelPicture(LabMat);
-            var x = "file://////"+result.Data.FirstOrDefault();
+            var x = "file://////" + result.Data.FirstOrDefault();
             ViewBag.Picture = x;
             return View(result.Data);
         }
 
 
-        //頁面提交，id=0 添加，id>0 修改
         [HttpPost]
         public async Task<IActionResult> SaveParamLAB003([FromBody] List<Labmodel> Lab)
         {
@@ -144,8 +113,8 @@ namespace AMESCoreStudio.Web.Controllers
         {
             int Sn = 1;
             ResultModel<dynamic> result = new ResultModel<dynamic>();
-            result = await _labApi.GetLabelItemMaster(OderNo, null,null, null, -1);
+            result = await _labApi.GetLabelItemMaster(OderNo, null, null, null, -1);
-            if(result.Data.Any())
+            if (result.Data.Any())
             {
                 var r2 = result.Data.Max(x => x.ordeR_NO).ToString();
                 Sn = int.Parse(r2.Substring(7)) + 1;
@@ -184,14 +153,10 @@ namespace AMESCoreStudio.Web.Controllers
                 {
                     user_id = int.Parse(userID.ToString());
                 }
-            return View("LAB001U", model);
             }
             return user_id;
         }
 
-            return Json(new Table() { count = 0, data = null });
-        }
-        #endregion