Browse Source

Modify LAB controller

PTD
Yui.Chen 1 year ago
parent
commit
ad5810f8e2
  1. BIN
      .vs/AMESCoreStudio/v16/.suo
  2. 35
      AMESCoreStudio.Web/Controllers/LABController.cs

BIN
.vs/AMESCoreStudio/v16/.suo

Binary file not shown.

35
AMESCoreStudio.Web/Controllers/LABController.cs

@ -13,47 +13,23 @@ using static AMESCoreStudio.Web.ViewModels.LAB.LAB003ViewModel;
using AMESCoreStudio.WebApi.Models.AMES; using AMESCoreStudio.WebApi.Models.AMES;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; 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 namespace AMESCoreStudio.Web.Controllers
{ {
public class LABController : Controller 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 ISYS _sysApi;
public readonly IKCS _kcsApi;
public readonly IQRS _qrsApi;
public readonly ILAB _labApi; public readonly ILAB _labApi;
private readonly IWebHostEnvironment _env;
public LABController(ILogger<LABController> logger, ILAB labApi, ISYS sysApi, IPCS pcsApi, IStringLocalizer<SharedResource> sharedLocalizer) public LABController(ILogger<LABController> logger, ILAB labApi, ISYS sysApi, IPCS pcsApi, IStringLocalizer<SharedResource> sharedLocalizer)
{ {
_sysApi = sysApi; _sysApi = sysApi;
_kcsApi = kcsApi;
_qrsApi = qrsApi;
_labApi = labApi; _labApi = labApi;
_env = env;
} }
private void GetFlagList()
{
var FlagList = new List<SelectListItem>();
public async Task<IActionResult> LAB003(string mat) public async Task<IActionResult> LAB003(string mat)
@ -65,9 +41,6 @@ namespace AMESCoreStudio.Web.Controllers
ViewBag.UserName = name; ViewBag.UserName = name;
return View(); return View();
} }
}
ViewBag.UserID = user_id;
}
public async Task<IActionResult> LAB004() public async Task<IActionResult> LAB004()
{ {
@ -86,9 +59,6 @@ namespace AMESCoreStudio.Web.Controllers
return View(model); return View(model);
} }
//修改页面
[HttpGet] [HttpGet]
public async Task<IActionResult> GetLab004(string OrderNo, string ModelNo, DateTime? strdate, DateTime? enddate, string UserNo) public async Task<IActionResult> GetLab004(string OrderNo, string ModelNo, DateTime? strdate, DateTime? enddate, string UserNo)
{ {
@ -115,7 +85,6 @@ namespace AMESCoreStudio.Web.Controllers
} }
//頁面提交,id=0 添加,id>0 修改
[HttpPost] [HttpPost]
public async Task<IActionResult> SaveParamLAB003([FromBody] List<Labmodel> Lab) public async Task<IActionResult> SaveParamLAB003([FromBody] List<Labmodel> Lab)
{ {
@ -184,14 +153,10 @@ namespace AMESCoreStudio.Web.Controllers
{ {
user_id = int.Parse(userID.ToString()); user_id = int.Parse(userID.ToString());
} }
return View("LAB001U", model);
} }
return user_id; return user_id;
} }
return Json(new Table() { count = 0, data = null });
}
#endregion

Loading…
Cancel
Save