zhaoy
/
BPA.SAAS.Manage
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
基础服务api
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
252 Commits
6 Branches
63 MiB
 
 
Branch: kitchenmanage
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'kitchenmanage'
${ noResults }
BPA.SAAS.Manage/commit-395b6f0

554 lines
24 KiB
Raw Permalink Blame History 

  1. From 395b6f040824087ef4616402b301ef7ae19f825e Mon Sep 17 00:00:00 2001

  2. From: gwbvipvip <gwbvipvip@163.com>

  3. Date: Mon, 8 Jul 2024 17:27:56 +0800

  4. Subject: 重写商品导入，商品及分类验重

  5. MIME-Version: 1.0

  6. Content-Type: text/plain; charset=UTF-8

  7. Content-Transfer-Encoding: 8bit

  8. 

  9. 

  10. diff --git a/BPA.SAAS.Manage.Application/DataBase/Dtos/Goods/GoodsDto.cs b/BPA.SAAS.Manage.Application/DataBase/Dtos/Goods/GoodsDto.cs

  11. index 99d9933..d896ecd 100644

  12. --- a/BPA.SAAS.Manage.Application/DataBase/Dtos/Goods/GoodsDto.cs

  13. +++ b/BPA.SAAS.Manage.Application/DataBase/Dtos/Goods/GoodsDto.cs

  14. @@ -1,4 +1,5 @@

  15.  using BPA.SAAS.Manage.Comm.Enum;

  16. +using Npoi.Mapper.Attributes;

  17.  using System;

  18.  using System.Collections.Generic;

  19.  using System.Linq;

  20. @@ -24,4 +25,22 @@ namespace BPA.SAAS.Manage.Application.DataBase.Dtos.Goods

  21.          public string GoodsTypeId { get; set; }

  22.          public string Status { get; set; }

  23.      }

  24. +

  25. +    public class GoodsImportDto

  26. +    {

  27. +        [Column("商品名称")]

  28. +        public string Name { get;set; }

  29. +        [Column("商品分类")]

  30. +        public string Type { get; set; }

  31. +        [Column("商品单位")]

  32. +        public string Uint { get; set; }

  33. +        [Column("商品价格")]

  34. +        public decimal Price { get; set; }

  35. +        [Column("是否称重")]

  36. +        public string IsWeigh { get; set; }

  37. +        [Column("备注")]

  38. +        public string Descritption { get; set; }

  39. +        [Column("图片")]

  40. +        public object ImgUrl { get; set; }

  41. +    }

  42.  }

  43. diff --git a/BPA.SAAS.Manage.Application/DataBase/Dtos/Goods/GoodsTechnologyImportDto.cs b/BPA.SAAS.Manage.Application/DataBase/Dtos/Goods/GoodsTechnologyImportDto.cs

  44. index b9fec40..08978b6 100644

  45. --- a/BPA.SAAS.Manage.Application/DataBase/Dtos/Goods/GoodsTechnologyImportDto.cs

  46. +++ b/BPA.SAAS.Manage.Application/DataBase/Dtos/Goods/GoodsTechnologyImportDto.cs

  47. @@ -11,7 +11,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Dtos.Goods

  48.          /// <summary>

  49.          /// 文件

  50.          /// </summary>

  51. -        public IFormFile file { get; set; }

  52. +        public IFormFile File { get; set; }

  53.      }

  54.  

  55.      public class GoodsTechnologyExportDto

  56. @@ -29,4 +29,12 @@ namespace BPA.SAAS.Manage.Application.DataBase.Dtos.Goods

  57.          /// </summary>

  58.          public string FileName { get; set; }

  59.      }

  60. +

  61. +    public class GoodsInfoImportDto

  62. +    {

  63. +        /// <summary>

  64. +        /// 文件

  65. +        /// </summary>

  66. +        public IFormFile File { get; set; }

  67. +    }

  68.  }

  69. diff --git a/BPA.SAAS.Manage.Application/DataBase/GoodsServices.cs b/BPA.SAAS.Manage.Application/DataBase/GoodsServices.cs

  70. index c88368f..ce5fc0c 100644

  71. --- a/BPA.SAAS.Manage.Application/DataBase/GoodsServices.cs

  72. +++ b/BPA.SAAS.Manage.Application/DataBase/GoodsServices.cs

  73. @@ -205,13 +205,36 @@ namespace BPA.SAAS.Manage.Application.DataBase

  74.          }

  75.  

  76.          /// <summary>

  77. -        /// 商品工艺导出

  78. +        /// 商品工艺模版导出

  79.          /// </summary>

  80. +        /// <param name="exportDto"></param>

  81.          /// <returns></returns>

  82.          [HttpPost("/api/goods/goodsTechnologyExport"), NonUnify]

  83.          public async Task<string> GoodsTechnologyExport(GoodsTechnologyExportDto exportDto)

  84.          {

  85.              return await _goodsService.GoodsTechnologyExport(exportDto);

  86.          }

  87. +

  88. +        /// <summary>

  89. +        /// 商品导入

  90. +        /// </summary>

  91. +        /// <param name="importDto"></param>

  92. +        /// <returns></returns>

  93. +        [HttpPost("/api/goods/goodsImport"), NonUnify]

  94. +        public async Task<bool> GoodsImport([FromForm] GoodsInfoImportDto importDto)

  95. +        {

  96. +            return await _goodsService.GoodsImport(importDto);

  97. +        }

  98. +

  99. +        /// <summary>

  100. +        /// 商品工艺导出

  101. +        /// </summary>

  102. +        /// <param name="goodName"></param>

  103. +        /// <returns></returns>

  104. +        [HttpPost("/api/goods/goodsSimpleExport"), NonUnify]

  105. +        public async Task<string> GoodsSimpleExport(string goodName)

  106. +        {

  107. +            return await _goodsService.GoodsSimpleExport(goodName);

  108. +        }

  109.      }

  110.  }

  111. diff --git a/BPA.SAAS.Manage.Application/DataBase/Interface/IGoodsService.cs b/BPA.SAAS.Manage.Application/DataBase/Interface/IGoodsService.cs

  112. index 29f725a..c628ddb 100644

  113. --- a/BPA.SAAS.Manage.Application/DataBase/Interface/IGoodsService.cs

  114. +++ b/BPA.SAAS.Manage.Application/DataBase/Interface/IGoodsService.cs

  115. @@ -111,9 +111,23 @@ namespace BPA.SAAS.Manage.Application.DataBase.Interface

  116.          Task<bool> GoodsTechnologyImport([FromForm] GoodsTechnologyImportDto importDto);

  117.  

  118.          /// <summary>

  119. -        /// 商品工艺导出

  120. +        /// 商品工艺模版导出

  121.          /// </summary>

  122.          /// <returns></returns>

  123.          Task<string> GoodsTechnologyExport(GoodsTechnologyExportDto exportDto);

  124. +

  125. +        /// <summary>

  126. +        /// 商品导入

  127. +        /// </summary>

  128. +        /// <param name="importDto"></param>

  129. +        /// <returns></returns>

  130. +        Task<bool> GoodsImport([FromForm] GoodsInfoImportDto importDto);

  131. +

  132. +        /// <summary>

  133. +        /// 商品工艺导出

  134. +        /// </summary>

  135. +        /// <param name="goodName"></param>

  136. +        /// <returns></returns>

  137. +        Task<string> GoodsSimpleExport(string goodName);

  138.      }

  139.  }

  140. diff --git a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs

  141. index 63f13a1..08f787d 100644

  142. --- a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs

  143. +++ b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs

  144. @@ -1,5 +1,4 @@

  145. -using BPA.Franchisee.Application.FranchiseeCenter.GoodsServices;

  146. -using BPA.SAAS.Manage.Application.DataBase.Dtos;

  147. +using BPA.SAAS.Manage.Application.DataBase.Dtos;

  148.  using BPA.SAAS.Manage.Application.DataBase.Dtos.Batching;

  149.  using BPA.SAAS.Manage.Application.DataBase.Dtos.Bom;

  150.  using BPA.SAAS.Manage.Application.DataBase.Dtos.Goods;

  151. @@ -34,7 +33,6 @@ using System.Linq;

  152.  using System.Reflection;

  153.  using System.Text;

  154.  using System.Text.RegularExpressions;

  155. -using System.Threading.Tasks;

  156.  

  157.  namespace BPA.SAAS.Manage.Application.DataBase.Services

  158.  {

  159. @@ -44,14 +42,12 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  160.          IGoodsAttributeService _goodsAttributeService;

  161.          ISystemConfigService _SystemConfigService;

  162.          IAliyunOssService _aliyunOssService;

  163. -        IWebHostEnvironment _hostingEnvironment;

  164.          public GoodsService(ISqlSugarClient db, IGoodsAttributeService goodsAttributeService, ISystemConfigService SystemConfigService, IAliyunOssService aliyunOssService, IWebHostEnvironment webHostEnvironment)

  165.          {

  166.              _db=db;

  167.              _goodsAttributeService=goodsAttributeService;

  168.              _SystemConfigService = SystemConfigService;

  169.              _aliyunOssService = aliyunOssService;

  170. -            _hostingEnvironment = webHostEnvironment;

  171.          }

  172.          /// <summary>

  173.          /// 分页查询

  174. @@ -383,7 +379,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  175.              var productCode = _db.Queryable<BPA_GoodsUint>().Where(x =>x.Name == dto.Name).ToList();

  176.              if (productCode.Count() > 0)

  177.              {

  178. -                throw Oops.Oh("商品单位已存在");

  179. +                throw Oops.Oh($"{dto.Name}已存在，添加失败！");

  180.              }

  181.              try

  182.              {

  183. @@ -392,9 +388,9 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  184.                  var res = await _db.Insertable(bPA_Product).CallEntityMethod(m => m.Create()).ExecuteCommandAsync();

  185.                  return res > 0;

  186.              }

  187. -            catch (Exception ex)

  188. +            catch (Exception e)

  189.              {

  190. -                throw Oops.Oh("添加失败");

  191. +                throw Oops.Oh(e.Message);

  192.              }

  193.          }

  194.          /// <summary>

  195. @@ -1257,15 +1253,170 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  196.              return true;

  197.          }

  198.  

  199. +        /// <summary>

  200. +        /// 商品导入

  201. +        /// </summary>

  202. +        /// <param name="importDto"></param>

  203. +        /// <returns></returns>

  204. +        public async Task<bool> GoodsImport(GoodsInfoImportDto importDto)

  205. +        {

  206. +            var file = importDto.File;

  207. +            var aliyunHost = "https://bpa.oss-cn-chengdu.aliyuncs.com/";

  208. +            var userId = App.User?.FindFirst(ClaimConst.CLAINM_USERID)?.Value;

  209. +            if (string.IsNullOrEmpty(userId))

  210. +            {

  211. +                userId = "";

  212. +            }

  213. +            var goodsInfo = await _db.Queryable<BPA_GoodsInfo>().ToListAsync();

  214. +            var goodsType = await _db.Queryable<BPA_GoodsType>().ToListAsync();

  215. +            var goodsUint = await _db.Queryable<BPA_GoodsUint>().ToListAsync();

  216. +            try

  217. +            {

  218. +                _db.Ado.BeginTran();

  219. +                var source = file.OpenReadStream();

  220. +                var mapper = new Mapper(source);

  221. +                var excelDto = new ReadExcel<GoodsImportDto>();

  222. +                var dataList = excelDto.ExcelToList(source, mapper);

  223. +                dataList.RemoveAll(t => t.Name == null);

  224. +                UpdateGoodsImportDto(dataList);

  225. +                var imageList = await GetImagesWithExcel(file.OpenReadStream(), Path.GetExtension(file.FileName));

  226. +                var newUnitList = new List<BPA_GoodsUint>();

  227. +                var i = 0;

  228. +                foreach (var data in dataList)

  229. +                {

  230. +                    if (data.Type == null)

  231. +                        throw Oops.Oh($"商品分类不能为空！");

  232. +                    if (data.Name == null)

  233. +                        throw Oops.Oh($"商品名称不能为空！");

  234. +                    if (data.Uint == null)

  235. +                        throw Oops.Oh($"商品单位不能为空！");

  236. +                    var type = goodsType.FirstOrDefault(t => t.Name == data.Type);

  237. +                    if (type == null)

  238. +                        throw Oops.Oh($"{data.Name} 不存在分类：{data.Type}！");

  239. +                    var old = goodsInfo.FirstOrDefault(t => t.Name == data.Name && t.GoodsTypeId == type.Id);

  240. +                    if (old != null)

  241. +                        throw Oops.Oh($"{data.Name} 已存在该商品！");

  242. +                    var uintId = "";

  243. +                    var uintData = goodsUint.FirstOrDefault(t => t.Name == data.Uint);

  244. +                    var newUnitData = newUnitList.FirstOrDefault(t => t.Name == data.Uint);

  245. +                    if (uintData != null || newUnitData != null)

  246. +                        uintId = uintData != null ? uintData.Id : newUnitData.Id;

  247. +                    else

  248. +                    {

  249. +                        uintId = Guid.NewGuid().ToString();

  250. +                        var newUint = new BPA_GoodsUint

  251. +                        {

  252. +                            Id = uintId,

  253. +                            Name = data.Uint,

  254. +                            CreateBy = userId

  255. +                        };

  256. +                        newUnitList.Add(newUint);

  257. +                        await _db.Insertable(newUint).ExecuteCommandAsync();

  258. +                    }

  259. +                    var imgUrl = data.ImgUrl != null ? data.ImgUrl.ToString() : "";

  260. +                    if (!imgUrl.Contains("=DISPIMG"))

  261. +                        imgUrl = null;

  262. +                    else

  263. +                    {

  264. +                        imgUrl = aliyunHost + imageList[i];

  265. +                        i++;

  266. +                    }

  267. +                    var newValue = new BPA_GoodsInfo

  268. +                    {

  269. +                        Id = Guid.NewGuid().ToString(),

  270. +                        Name = data.Name,

  271. +                        GoodsTypeId = type.Id,

  272. +                        Descritption = data.Descritption,

  273. +                        ImgUrl = imgUrl,

  274. +                        Code = GetNumber2(8),

  275. +                        Price = data.Price,

  276. +                        CreateBy = userId,

  277. +                        GoodsUintId = uintId,

  278. +                        IsWeigh = data.IsWeigh == "是",

  279. +                        IsAttrubute = true

  280. +                    };

  281. +                    await _db.Insertable(newValue).ExecuteCommandAsync();

  282. +                }

  283. +                _db.Ado.CommitTran();

  284. +            }

  285. +            catch (Exception e)

  286. +            {

  287. +                _db.Ado.RollbackTran();

  288. +                throw Oops.Oh($"Excel导入错误，" + e.Message);

  289. +            }

  290. +            return true;

  291. +        }

  292. +

  293. +        public List<GoodsImportDto> UpdateGoodsImportDto(List<GoodsImportDto> list)

  294. +        {

  295. +            foreach (var item in list)

  296. +            {

  297. +                item.Name = item.Name?.Trim();

  298. +                item.Type = item.Type?.Trim();

  299. +                item.Uint = item.Uint?.Trim();

  300. +                item.IsWeigh = item.IsWeigh?.Trim();

  301. +                item.Descritption = item.Descritption?.Trim();

  302. +            }

  303. +            return list;

  304. +        }

  305. +

  306. +        public async Task<List<string>> GetImagesWithExcel(Stream stream, string fileType)

  307. +        {

  308. +            try

  309. +            {

  310. +                var result = new List<string>();

  311. +                IWorkbook workbook;

  312. +                if (fileType == ".xlsx")

  313. +                {

  314. +                    workbook = new XSSFWorkbook(stream);

  315. +                    var pictures = workbook.GetAllPictures();

  316. +                    foreach (XSSFPictureData pic in pictures)

  317. +                    {

  318. +                        using (var ms = new MemoryStream(pic.Data))

  319. +                        {

  320. +                            var suffix = pic.SuggestFileExtension();

  321. +                            var fileName = Guid.NewGuid().ToString();

  322. +                            IFormFile formFile = new FormFile(ms, 0, ms.Length, "name", $"{fileName}.{suffix}");

  323. +                            result.Add(await _aliyunOssService.UpFileAsync(formFile));

  324. +                        }

  325. +                    }

  326. +                }

  327. +                else if (fileType == ".xls")

  328. +                {

  329. +                    workbook = new HSSFWorkbook(stream);

  330. +                    var pictures = workbook.GetAllPictures();

  331. +                    foreach (HSSFPictureData pic in pictures)

  332. +                    {

  333. +                        using (var ms = new MemoryStream(pic.Data))

  334. +                        {

  335. +                            var suffix = pic.SuggestFileExtension();

  336. +                            var fileName = Guid.NewGuid().ToString();

  337. +                            IFormFile formFile = new FormFile(ms, 0, ms.Length, "name", $"{fileName}.{suffix}");

  338. +                            result.Add(await _aliyunOssService.UpFileAsync(formFile));

  339. +                        }

  340. +                    }

  341. +                }

  342. +                else

  343. +                {

  344. +                    throw new Exception("传入的不是Excel文件！");

  345. +                }

  346. +                return result;

  347. +            }

  348. +            catch (Exception ex)

  349. +            {

  350. +                throw new Exception(ex.Message);

  351. +            }

  352. +        }

  353. +

  354.          /// <summary>

  355.          /// 商品工艺导入

  356.          /// </summary>

  357.          /// <param name="importDto"></param>

  358.          /// <returns></returns>

  359.          public async Task<bool> GoodsTechnologyImport(GoodsTechnologyImportDto importDto)

  360. -        {

  361. +            {

  362.              string pattern = @"(?<part1>[^,(]+),(?<part2>\([^)]+\)),(?<part3>[^,]+)";

  363. -            var file = importDto.file;

  364. +            var file = importDto.File;

  365.              var userId = App.User?.FindFirst(ClaimConst.CLAINM_USERID)?.Value;

  366.              if (string.IsNullOrEmpty(userId))

  367.              {

  368. @@ -1480,7 +1631,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  369.          }

  370.  

  371.          /// <summary>

  372. -        /// 商品工艺导出

  373. +        /// 商品工艺模版导出

  374.          /// </summary>

  375.          /// <param name="exportDto"></param>

  376.          /// <returns></returns>

  377. @@ -1576,7 +1727,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  378.                  sheet.AddMergedRegion(new CellRangeAddress(1, 2, 4, 4));

  379.                  #endregion

  380.              }

  381. -            var tempFolder = Path.Combine(_hostingEnvironment.ContentRootPath, "TechnologyTemplate");

  382. +            var tempFolder = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "TechnologyTemplate");

  383.              if (!Directory.Exists(tempFolder))

  384.                  Directory.CreateDirectory(tempFolder);

  385.              var time = DateTime.Now.ToString("yyyy年MM月dd日HH时mm分ss秒");

  386. @@ -1589,6 +1740,70 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  387.              return fileBase64;

  388.          }

  389.  

  390. +        /// <summary>

  391. +        /// 商品工艺导出

  392. +        /// </summary>

  393. +        /// <param name="goodName"></param>

  394. +        /// <returns></returns>

  395. +        public async Task<string> GoodsSimpleExport(string goodName)

  396. +        {

  397. +            var goodsAttributeList = await _db.Queryable<BPA_GoodsAttribute>().ToListAsync();

  398. +            var goodsAttributeValueList = await _db.Queryable<BPA_GoodsAttributeValue>().Where(t => goodsAttributeList.Select(a => a.Id).Contains(t.GoodsAttributeId)).OrderBy(a => a.Sort).ToListAsync();

  399. +            var goodsType = await _db.Queryable<BPA_GoodsType>().ToListAsync();

  400. +            var goodsInfo = await _db.Queryable<BPA_GoodsInfo>().FirstAsync(t => t.Name == goodName);

  401. +            if (goodsInfo == null)

  402. +                throw Oops.Oh("商品不存在！");

  403. +            var actionList = await _db.Queryable<BPA_GoodsTechnologyAction>().Where(t => t.GoodsId == goodsInfo.Id).OrderBy(a => a.GoodsAttributeId).OrderBy(a => a.Order).ToListAsync();

  404. +            IWorkbook workbook = new XSSFWorkbook();

  405. +            string[] charsToReplace = new string[] { "\\", "/", "?", "*", "[", "]" };

  406. +            foreach (string c in charsToReplace)

  407. +            {

  408. +                goodName = goodName.Replace(c, " ");

  409. +            }

  410. +            ISheet sheet = workbook.CreateSheet(goodName);

  411. +            IRow headerRow = sheet.CreateRow(0);

  412. +            headerRow.CreateCell(0).SetCellValue("商品名称");

  413. +            headerRow.CreateCell(1).SetCellValue("属性组合");

  414. +            headerRow.CreateCell(2).SetCellValue("工序");

  415. +            headerRow.CreateCell(3).SetCellValue("工序参数");

  416. +            headerRow.CreateCell(4).SetCellValue("参数值");

  417. +            var k = 1;

  418. +            for (int i = 0; i < actionList.Count; i++)

  419. +            {

  420. +                var stepName = actionList[i].StepName;

  421. +                var attributeNames = "";

  422. +                var attributeNameList = new List<string>();

  423. +                var goodsAttributeIdList = actionList[i].GoodsAttributeId.Split(',');

  424. +                foreach (var goodsAttributeId in goodsAttributeIdList)

  425. +                {

  426. +                    attributeNameList.Add(goodsAttributeValueList.FirstOrDefault(t => t.Id == goodsAttributeId)?.AttributeValue);

  427. +                }

  428. +                attributeNames = string.Join("-", attributeNameList);

  429. +                var actionJsonList = JsonConvert.DeserializeObject<List<ActionJsonModel>>(actionList[i].ActionJson);

  430. +                for (int j = 0; j < actionJsonList.Count; j++)

  431. +                {

  432. +                    IRow dataRow = sheet.CreateRow(k);

  433. +                    dataRow.CreateCell(0).SetCellValue(goodName);

  434. +                    dataRow.CreateCell(1).SetCellValue(attributeNames);

  435. +                    dataRow.CreateCell(2).SetCellValue(stepName);

  436. +                    dataRow.CreateCell(3).SetCellValue(actionJsonList[j].actionName);

  437. +                    dataRow.CreateCell(4).SetCellValue(actionJsonList[j].actionValue);

  438. +                    k++;

  439. +                }

  440. +            }

  441. +            var tempFolder = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "GoodsTechnologyData");

  442. +            if (!Directory.Exists(tempFolder))

  443. +                Directory.CreateDirectory(tempFolder);

  444. +            var time = DateTime.Now.ToString("yyyy年MM月dd日HH时mm分ss秒");

  445. +            var filePath = Path.Combine(tempFolder, $"{goodName}导出-{time}.xlsx");

  446. +            using (var stream = new FileStream(filePath, FileMode.Create, FileAccess.Write))

  447. +            {

  448. +                workbook.Write(stream);

  449. +            }

  450. +            var fileBase64 = Convert.ToBase64String(File.ReadAllBytes(filePath));

  451. +            return fileBase64;

  452. +        }

  453. +

  454.          public static List<string> GenerateCombinations(Dictionary<string, List<string>> values, bool isId, BPA_GoodsInfo goodInfo, BPA_DeviceInfo deviceInfo)

  455.          {

  456.              var attributes = values.Keys.ToList();

  457. @@ -1858,5 +2073,6 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  458.              var str = string.Format("{0}", ram.ToString().Substring(0, Length));

  459.              return str;

  460.          }

  461. +

  462.      }

  463.  }

  464. diff --git a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTypeService.cs b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTypeService.cs

  465. index 44e08c6..42500c8 100644

  466. --- a/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTypeService.cs

  467. +++ b/BPA.SAAS.Manage.Application/DataBase/Services/GoodsTypeService.cs

  468. @@ -93,6 +93,9 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  469.          {

  470.              try

  471.              {

  472. +                var old = await _db.Queryable<BPA_GoodsType>().FirstAsync(t => t.Name == dto.Name);

  473. +                if (old != null)

  474. +                    throw Oops.Oh($"已存在{dto.Name}，添加失败！");

  475.                  var res = 0;

  476.                  if (string.IsNullOrWhiteSpace(dto.Id))

  477.                  {

  478. @@ -132,10 +135,10 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services

  479.                      return res > 0;

  480.                  }

  481.              }

  482. -            catch (Exception)

  483. +            catch (Exception e)

  484.              {

  485.                  _db.Ado.RollbackTran();

  486. -                throw Oops.Oh("添加失败！");

  487. +                throw Oops.Oh(e.Message);

  488.              }

  489.          }

  490.          public async Task<int> HandleGoodsAttribute(BPA_GoodsType typeEntity, List<AttributeDto> AttributeList)

  491. diff --git a/BPA.SAAS.Manage.Application/System/AliyunOssServices.cs b/BPA.SAAS.Manage.Application/System/AliyunOssServices.cs

  492. index 5cb3938..613d2dc 100644

  493. --- a/BPA.SAAS.Manage.Application/System/AliyunOssServices.cs

  494. +++ b/BPA.SAAS.Manage.Application/System/AliyunOssServices.cs

  495. @@ -23,5 +23,11 @@ namespace BPA.SAAS.Manage.Application.System

  496.          {

  497.              return await _aliyunOssService.GeneratePostPolicyAsync(request);

  498.          }

  499. +

  500. +        [HttpPost("/api/systemconfig/UpFileAsync"), ApiDescriptionSettings(SplitCamelCase = false), AllowAnonymous, NonUnify]

  501. +        public async Task<string> UpFileAsync(IFormFile formFile)

  502. +        {

  503. +            return await _aliyunOssService.UpFileAsync(formFile);

  504. +        }

  505.      }

  506.  }

  507. diff --git a/BPA.SAAS.Manage.Application/System/Interface/IAliyunOssService.cs b/BPA.SAAS.Manage.Application/System/Interface/IAliyunOssService.cs

  508. index e619ed5..3730776 100644

  509. --- a/BPA.SAAS.Manage.Application/System/Interface/IAliyunOssService.cs

  510. +++ b/BPA.SAAS.Manage.Application/System/Interface/IAliyunOssService.cs

  511. @@ -11,5 +11,6 @@ namespace BPA.SAAS.Manage.Application.System.Interface

  512.      public interface IAliyunOssService

  513.      {

  514.          Task<AliyunOssPostPolicyResponse> GeneratePostPolicyAsync(Aliyun0ssGeneratePostPolicyRequest request);

  515. +        Task<string> UpFileAsync(IFormFile formFile);

  516.      }

  517.  }

  518. diff --git a/BPA.SAAS.Manage.Application/System/Services/AliyunOssService.cs b/BPA.SAAS.Manage.Application/System/Services/AliyunOssService.cs

  519. index 69afe6f..fa3c4c9 100644

  520. --- a/BPA.SAAS.Manage.Application/System/Services/AliyunOssService.cs

  521. +++ b/BPA.SAAS.Manage.Application/System/Services/AliyunOssService.cs

  522. @@ -1,4 +1,5 @@

  523. -using BPA.Aliyun.OSS;

  524. +using Aliyun.OSS.Util;

  525. +using BPA.Aliyun.OSS;

  526.  using BPA.Aliyun.OSS.Options;

  527.  using BPA.SAAS.Manage.Application.System.Dtos;

  528.  using BPA.SAAS.Manage.Application.System.Interface;

  529. @@ -27,5 +28,11 @@ namespace BPA.SAAS.Manage.Application.System.Services

  530.              var data = await _aliyunOssClient.GeneratePostPolicyAsync(dir);

  531.              return data;

  532.          }

  533. +        

  534. +        public async Task<string> UpFileAsync(IFormFile formFile)

  535. +        {

  536. +            var data = await _aliyunOssClient.UpFileAsync(formFile);

  537. +            return data;

  538. +        }

  539.      }

  540.  }

  541. diff --git a/BPA.SAAS.Manage.Web.Entry/appsettings.json b/BPA.SAAS.Manage.Web.Entry/appsettings.json

  542. index fd1d125..6488e7d 100644

  543. --- a/BPA.SAAS.Manage.Web.Entry/appsettings.json

  544. +++ b/BPA.SAAS.Manage.Web.Entry/appsettings.json

  545. @@ -41,7 +41,7 @@

  546.          "PresignedUriExpirationMinutes": 1440,

  547.          "PolicyExpirationMinutes": 1440,

  548.          "ProjectName": "hkerp",

  549. -        "ServiceName": "test"

  550. +        "ServiceName": "test/goods"

  551.        }

  552.      }

  553.    },