From 3aedad63dd01f1fc5154cb520af32edab967d6e0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 09:15:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs"
index 0002de3..8872c9b 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs"
@@ -1,4 +1,4 @@
-锘縰sing Ao.Lang;
+using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -23,15 +23,15 @@
[Route("api/v{version:apiVersion}/HIAWms/[controller]")]
public class WmsMaterialController : ControllerBase
{
- private readonly IWmsMaterialAppService _wmsmaterialsAppService;
+ private readonly IWmsMaterialAppService _wmsMaterialAppService;
/// <summary>
/// Initializes a new instance of the <see cref="WmsMaterialController"/> class.
/// </summary>
- /// <param name="wmsmaterialsAppService">The wmsmaterials application service.</param>
- public WmsMaterialController(IWmsMaterialAppService wmsmaterialsAppService)
+ /// <param name="wmsMaterialAppService">The wmsMaterial application service.</param>
+ public WmsMaterialController(IWmsMaterialAppService wmsMaterialAppService)
{
- _wmsmaterialsAppService = wmsmaterialsAppService;
+ _wmsMaterialAppService = wmsMaterialAppService;
}
/// <summary>
@@ -43,7 +43,7 @@
[Route("{id}")]
public virtual Task<WmsMaterialDto> GetAsync(Guid id)
{
- return _wmsmaterialsAppService.GetAsync(id);
+ return _wmsMaterialAppService.GetAsync(id);
}
/// <summary>
@@ -55,7 +55,7 @@
[Route("Page")]
public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input)
{
- return _wmsmaterialsAppService.GetListAsync(input);
+ return _wmsMaterialAppService.GetListAsync(input);
}
/// <summary>
@@ -67,7 +67,7 @@
[HttpPost]
public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
{
- return _wmsmaterialsAppService.CreateAsync(input);
+ return _wmsMaterialAppService.CreateAsync(input);
}
/// <summary>
@@ -81,7 +81,7 @@
[Route("{id}")]
public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
{
- return _wmsmaterialsAppService.UpdateAsync(id, input);
+ return _wmsMaterialAppService.UpdateAsync(id, input);
}
/// <summary>
@@ -94,7 +94,7 @@
[Route("Clone")]
public virtual Task<List<WmsMaterialDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
{
- return _wmsmaterialsAppService.CloneAsync(ids);
+ return _wmsMaterialAppService.CloneAsync(ids);
}
/// <summary>
@@ -107,7 +107,7 @@
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
{
- return _wmsmaterialsAppService.DeleteAsync(id);
+ return _wmsMaterialAppService.DeleteAsync(id);
}
/// <summary>
@@ -119,7 +119,7 @@
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
- return _wmsmaterialsAppService.DeleteManyAsync(ids);
+ return _wmsMaterialAppService.DeleteManyAsync(ids);
}
/// <summary>
@@ -131,7 +131,7 @@
[Route("{id}/AdjustSort/{sort}")]
public virtual Task AdjustSortAsync(Guid id, int sort)
{
- return _wmsmaterialsAppService.AdjustSortAsync(id, sort);
+ return _wmsMaterialAppService.AdjustSortAsync(id, sort);
}
/// <summary>
@@ -148,16 +148,16 @@
stream.Seek(0L, SeekOrigin.Begin);
var sheetNames = stream.GetSheetNames();
- var wmsmaterialsRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
+ var wmsMaterialRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
- if (!wmsmaterialsRows.Any())
+ if (!wmsMaterialRows.Any())
{
throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
}
- await _wmsmaterialsAppService.ImportAsync(new WmsMaterialsImportModel
+ await _wmsMaterialAppService.ImportAsync(new WmsMaterialsImportModel
{
- WmsMaterials = wmsmaterialsRows,
+ WmsMaterials = wmsMaterialRows,
});
return Ok();
@@ -172,7 +172,7 @@
public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input)
{
input.MaxResultCount = int.MaxValue;
- var exportData = await _wmsmaterialsAppService.ExportAsync(input);
+ var exportData = await _wmsMaterialAppService.ExportAsync(input);
var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsMaterial瀵煎嚭妯℃澘.xlsx");
if (!System.IO.File.Exists(templatePath))
{
--
Gitblit v1.9.3