JC24WMS.git - Gitblit

			@@ -20,6 +20,7 @@
			using System.Security.Cryptography;
			using Model.ModelDto;
			using Model.ModelDto.LogDto;
			using Newtonsoft.Json.Linq;

			namespace Wms.Controllers
			{
			@@ -42,7 +43,7 @@
			private readonly IExceptionServer _table; //异常处理
			private readonly IHeaderSettingsServer _headerSet;//表头设置

			private readonly IMaterialCategory _category;//物料类别
			private readonly IMaterialCategoryServer _category;//物料类别

			/// <summary>
			/// 构造函数
			@@ -58,7 +59,7 @@
			/// <param name="operation">操作日志</param>
			/// <param name="table">异常处理</param>
			/// <param name="category">物料类别</param>
			public SysController(IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet, IMaterialCategory category)
			public SysController(IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet, IMaterialCategoryServer category)
			{
			_wareHouseSvc = wareHouseSvc; //仓库
			_areaSvc = areaSvc; //区域
			@@ -1011,7 +1012,7 @@
			}
			}
			/// <summary>
			/// 添加储位信息
			/// 添加立体库储位信息
			/// </summary>
			/// <param name="model">模型</param>
			/// <returns></returns>
			@@ -1056,6 +1057,54 @@
			return Ok(new { code = 400, ErrorMsg = "数据格式错误" });
			}
			}

			/// <summary>
			/// 添加平库储位信息
			/// </summary>
			/// <param name="model">模型</param>
			/// <returns></returns>
			[AllowAnonymous]
			[HttpPost]
			public async Task<IActionResult> AddPkStorageLocat(AddLocateVm model)
			{
			if (ModelState.IsValid)
			{
			try
			{
			//获取当前登录的用户ID
			//var claimsIdentity = this.User.Identity as ClaimsIdentity;
			//if (claimsIdentity == null)
			//{
			// return Ok(new { code = 400, ErrorMsg = "为获取到当前操作人信息" });
			//}
			//var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
			//if (string.IsNullOrWhiteSpace(userId))
			//{
			// return Ok(new { code = 400, ErrorMsg = "为获取到当前操作人信息" });
			//}
			var bolls = await _locatSvc.AddPkStorageLocat(model, 1);
			if (bolls > 0)
			{
			await _operation.InsertOperation("仓库设置", "储位管理", model.RoadwayNo, "添加", "添加储位信息储位号：" + model.RoadwayNo, 1);
			return Ok(new { code = 200, ErrorMsg = "添加成功", data = bolls });
			}
			else
			{
			return Ok(new { code = 400, ErrorMsg = "添加失败", data = "" });
			}

			}
			catch (Exception e)
			{
			return Ok(new { code = 400, ErrorMsg = "请联系管理员/" + e.Message });
			}
			}
			else //数据格式错误
			{
			return Ok(new { code = 400, ErrorMsg = "数据格式错误" });
			}
			}

			/// <summary>
			/// 修改储位信息
			/// </summary>
			@@ -1620,8 +1669,100 @@
			{
			data = "",
			code = 0,
			msg = "获取物料类别信息异常"
			msg = ex.Message
			});
			}
			}

			/// <summary>
			/// 获取物料类别下拉菜单信息
			/// </summary>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			[HttpGet]
			public IActionResult GetMaterialCategories1()
			{
			try
			{
			var list = _category.GetMaterialCategories();
			return Ok(new
			{
			data = list,
			code = 1,
			msg = "获取物料类别信息成功"
			});
			}
			catch (Exception ex)
			{
			return Ok(new
			{
			data = "",
			code = 0,
			msg = ex.Message
			});
			}
			}


			/// <summary>
			/// 根据Id获取物料类别信息
			/// </summary>
			/// <param name="Id">Id</param>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			[HttpGet]
			public IActionResult GetMaterialCategoriesById(int Id)
			{
			try
			{
			var list = _category.GetMaterialCategoriesById(Id);
			return Ok(new
			{
			data = list,
			code = 1,
			msg = "根据Id获取物料类别信息成功"
			});
			}
			catch (Exception ex)
			{
			return Ok(new
			{
			data = "",
			code = 0,
			msg = ex.Message
			});
			}
			}

			/// <summary>
			/// 获取区域信息
			/// </summary>
			/// <returns></returns>
			[HttpGet]
			public IActionResult GetStorageAreaList()
			{
			try
			{
			var bolls = _category.GetStorageAreaList();

			List<XmSelectDto> list = new List<XmSelectDto>();

			foreach (var item in bolls)
			{
			XmSelectDto list1 = new XmSelectDto()
			{
			name = item.AreaName, //区域名称
			value = item.AreaNo, //区域号
			selected = false, //是否选中
			};
			list.Add(list1);
			}

			return Ok(new { code = 0, msg = "区域信息", data = bolls, list });
			}
			catch (Exception e)
			{
			return Ok(new { code = 1, msg = e.Message });
			}
			}

			@@ -1651,6 +1792,8 @@

			var list = _category.InsertMaterialCategories(category);

			_operation.InsertOperation("基础信息", "物料类别", category.CategoryNo, "添加", "添加类别信息类别号：" + category.CategoryNo, Convert.ToInt32(userId));

			return Ok(new
			{
			data = list,
			@@ -1666,7 +1809,7 @@
			{
			data = "",
			code = 0,
			msg = "新增物料类别信息异常"
			msg = ex.Message
			});
			}
			}
			@@ -1697,6 +1840,8 @@

			var list = _category.ExitMaterialCategories(category);

			_operation.InsertOperation("基础信息", "物料类别", category.CategoryNo, "编辑", "编辑类别信息类别号：" + category.CategoryNo, Convert.ToInt32(userId));

			return Ok(new
			{
			data = list,
			@@ -1712,7 +1857,7 @@
			{
			data = "",
			code = 0,
			msg = "编辑物料类别信息异常"
			msg = ex.Message
			});
			}
			}
			@@ -1724,7 +1869,7 @@
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			[HttpPost]
			public IActionResult DeleteMaterialCategories(SysMaterialCategory category)
			public IActionResult DeleteMaterialCategories(MaterialCategoryDto category)
			{
			try
			{
			@@ -1739,9 +1884,11 @@
			{
			return Ok(new { code = 1, msg = "为获取到当前操作人信息" });
			}
			category.UpdateUser = int.Parse(userId);
			category.UpdateUser = userId;

			var list = _category.DeleteMaterialCategories(category);

			_operation.InsertOperation("基础信息", "物料类别", category.CategoryNo, "删除", "删除类别信息类别号：" + category.CategoryNo, Convert.ToInt32(userId));

			return Ok(new
			{
			@@ -1758,7 +1905,7 @@
			{
			data = "",
			code = 0,
			msg = "删除物料类别信息异常"
			msg = ex.Message
			});
			}
			}