From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001 From: zhaowc <526854230@qq.com> Date: 星期三, 18 九月 2024 16:37:13 +0800 Subject: [PATCH] 增加对申请入库时对平库库位的校验 --- Wms/Wms/Controllers/WeatherForecastController.cs | 85 +++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 46 deletions(-) diff --git a/Wms/Wms/Controllers/WeatherForecastController.cs b/Wms/Wms/Controllers/WeatherForecastController.cs index 145995d..a46ab50 100644 --- a/Wms/Wms/Controllers/WeatherForecastController.cs +++ b/Wms/Wms/Controllers/WeatherForecastController.cs @@ -1,24 +1,18 @@ 锘縰sing Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using System; using System.Collections.Generic; -using System.Linq; -using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; using Model.ModelVm; -using Newtonsoft.Json; -using Utility.Tools; using WMS.Entity.Context; using WMS.IBLL.ISysServer; using Wms.Tools; using Utility; - namespace Wms.Controllers { [Route("api/[controller]/[action]")] [ApiController] + [ServiceFilter(typeof(ApiResponseActionFilter))] public class WeatherForecastController : ControllerBase { private static readonly string[] Summaries = new[] @@ -37,21 +31,21 @@ _userMan = userMan; } - [HttpGet] - public IEnumerable<WeatherForecast> Get() - { - var rng = new Random(); - var data = Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = DateTime.Now.AddDays(index), - TemperatureC = rng.Next(-20, 55), - Summary = Summaries[rng.Next(Summaries.Length)] - }) - .ToArray(); - var list = JsonConvert.SerializeObject(data); - _logger.LogWarning("鎺ユ敹鐗╂枡杞Щ浠诲姟锛�(" + list + "),"); - return data; - } + //[HttpGet] + //public IEnumerable<WeatherForecast> Get() + //{ + // var rng = new Random(); + // var data = Enumerable.Range(1, 5).Select(index => new WeatherForecast + // { + // Date = DateTime.Now.AddDays(index), + // TemperatureC = rng.Next(-20, 55), + // Summary = Summaries[rng.Next(Summaries.Length)] + // }) + // .ToArray(); + // var list = JsonConvert.SerializeObject(data); + // _logger.LogWarning("鎺ユ敹鐗╂枡杞Щ浠诲姟锛�(" + list + "),"); + // return data; + //} /// <summary> /// 鐧诲綍 @@ -59,7 +53,6 @@ /// <param name="model">鐧诲綍鍚�</param> /// <returns></returns> [HttpPost] - [ServiceFilter(typeof(ApiResponseActionFilter))] public async Task<string> Login(LoginVm model) { if (ModelState.IsValid) @@ -98,30 +91,30 @@ /// 鐧诲綍 /// </summary> /// <returns></returns> - [HttpPost] - public IActionResult ceshi() - { - //if (ModelState.IsValid) - //{ - try - { - //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D - var claimsIdentity = this.User.Identity as ClaimsIdentity; - var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value; - var bolls = _userMan.CeShi(); + //[HttpPost] + //public IActionResult ceshi() + //{ + // //if (ModelState.IsValid) + // //{ + // try + // { + // //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D + // var claimsIdentity = this.User.Identity as ClaimsIdentity; + // var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value; + // var bolls = _userMan.CeShi(); - return Ok(new { code = 200, data = bolls }); + // return Ok(new { code = 200, data = bolls }); - } - catch (Exception e) - { - return Ok(new { code = 400, ErrorMsg = "璇疯仈绯荤鐞嗗憳/" + e.Message }); - } - //} - //else //鏁版嵁鏍煎紡閿欒 - //{ - // return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" }); - //} - } + // } + // catch (Exception e) + // { + // return Ok(new { code = 400, ErrorMsg = "璇疯仈绯荤鐞嗗憳/" + e.Message }); + // } + // //} + // //else //鏁版嵁鏍煎紡閿欒 + // //{ + // // return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" }); + // //} + //} } } -- Gitblit v1.8.0