payne
2024-04-24 0609ad2318e9d20dfa1d1eebe3c24242717cd112
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsWarehouse/WmsWarehouseService.cs
@@ -16,7 +16,7 @@
namespace Admin.NET.Application
{
    /// <summary>
    /// 仓库表服务
    /// 仓库信息服务
    /// </summary>
    [ApiDescriptionSettings("WmsBase", Name = "WmsWarehouse", Order = 100)]
    [Route("api")]
@@ -42,7 +42,7 @@
        }
        /// <summary>
        /// 分页查询仓库表
        /// 分页查询仓库信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
@@ -72,10 +72,10 @@
        }
        /// <summary>
        /// 不分页查询仓库表列表
        /// 不分页查询仓库信息列表
        /// </summary>
        /// <param name="input">仓库表查询参数</param>
        /// <returns>(仓库表)实例列表</returns>
        /// <param name="input">仓库信息查询参数</param>
        /// <returns>(仓库信息)实例列表</returns>
        [HttpGet("WmsWarehouse/listNonPage")]
        public async Task<List<WmsWarehouseOutput>> ListNonPageAsync([FromQuery] WmsWarehouseSearchNonPage input)
        {
@@ -117,7 +117,7 @@
        }
         /// <summary>
        /// 获取仓库表
        /// 获取仓库信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
@@ -128,7 +128,7 @@
        }
        /// <summary>
        /// 获取仓库表列表
        /// 获取仓库信息列表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
@@ -141,7 +141,7 @@
        #region 增、删、改
        /// <summary>
        /// 增加仓库表
        /// 增加仓库信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
@@ -159,7 +159,7 @@
        }
        /// <summary>
        /// 删除仓库表
        /// 删除仓库信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
@@ -172,7 +172,7 @@
        }
        /// <summary>
        /// 更新仓库表
        /// 更新仓库信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
@@ -197,7 +197,7 @@
        #region 导入
        /// <summary>
        /// Excel模板导入仓库表功能
        /// Excel模板导入仓库信息功能
        /// </summary>
        /// <param name="file">Excel模板文件</param>
        /// <returns>导入的记录数</returns>
@@ -302,6 +302,12 @@
                          {
                                addItem.Address = (string)_Address;
                           }
                          if (string.IsNullOrEmpty(_FactoryCode))
                          {
                            throw Oops.Oh($"第{index}行[工厂编号]{_FactoryCode}不能为空!");
                          }
                          if(!string.IsNullOrEmpty(_FactoryCode))
                          {
                                addItem.FactoryCode = (string)_FactoryCode;
@@ -362,12 +368,6 @@
                          {
                                addItem.Position = (string)_Position;
                           }
                          if (string.IsNullOrEmpty(_IsDisabled))
                          {
                            throw Oops.Oh($"第{index}行[是否禁用]{_IsDisabled}不能为空!");
                          }
                          if(!string.IsNullOrEmpty(_IsDisabled))
                          {
                            if(!_IsDisabled.Equals("是") && !_IsDisabled.Equals("否"))
@@ -414,7 +414,7 @@
        }
        /// <summary>
        /// 根据版本下载仓库表的Excel导入模板
        /// 根据版本下载仓库信息的Excel导入模板
        /// </summary>
        /// <param name="version">模板版本</param>
        /// <returns>下载的模板文件</returns>
@@ -422,7 +422,7 @@
        public IActionResult DownloadExcelTemplate([FromQuery] string version)
        {
            string _path = TemplateConst.EXCEL_TEMPLATEFILE_导入模版路径 + $"\\WmsWarehouse{TemplateConst.EXCEL_TEMPLATEFILE_导入模版名称后缀}.xlsx";
            var fileName = HttpUtility.UrlEncode($"导入模板(仓库表).xlsx", Encoding.GetEncoding("UTF-8"));
            var fileName = HttpUtility.UrlEncode($"导入模板(仓库信息).xlsx", Encoding.GetEncoding("UTF-8"));
            return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
        }