From b57f4eca1133a7ecad85abf3cff87fe88c366ec2 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:10:54 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm | 56 +++++++++++++++++++-------------------------------------
1 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
index a42d87e..e4b01f4 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
@@ -19,7 +19,7 @@
/// @(@Model.BusName)鏈嶅姟
/// </summary>
[ApiDescriptionSettings("@Model.ModuleName", Name = "@Model.ClassName", Order = 100)]
- [Route("api/[Controller]")]
+ [Route("api")]
public class @(@Model.ClassName)Service : I@(@Model.ClassName)Service, IDynamicApiController, ITransient
{
private readonly IRepository<@(@Model.ClassName),@(@Model.DatabaseName)> _@(@Model.CamelizeClassName)Rep;
@@ -73,8 +73,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/page")]
- [HttpGet("page")]
+ [HttpGet("@Model.ClassName/page")]
public async Task<PageResult<@(@Model.ClassName)Output>> Page([FromQuery] @(@Model.ClassName)Search input)
{
var @(@Model.CamelizeClassName)s = await _@(@Model.CamelizeClassName)Rep.DetachedEntities
@@ -126,8 +125,7 @@
/// </summary>
/// <param name="input">@(@Model.BusName)鏌ヨ鍙傛暟</param>
/// <returns>(@Model.BusName)瀹炰緥鍒楄〃</returns>
- [Description("@Model.ClassName/listNonPage")]
- [HttpGet("listNonPage")]
+ [HttpGet("@Model.ClassName/listNonPage")]
public async Task<List<@(@Model.ClassName)Output>> ListNonPageAsync([FromQuery] @(@Model.ClassName)SearchNonPage input)
{
@foreach (var column in Model.TableField)
@@ -192,23 +190,14 @@
}
/// <summary>
- /// 鑾峰彇@(@Model.BusName)
+ /// 鑾峰彇鍗曚釜@(@Model.BusName)
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/detail")]
- [HttpGet("detail")]
+ [HttpGet("@Model.ClassName/detail")]
public async Task<@(@Model.ClassName)Output> Get([FromQuery] Querye@(@Model.ClassName)Input input)
{
-@foreach (var column in Model.TableField){
-if (@column.ColumnKey == "True"){
- @:return (await _@(@Model.CamelizeClassName)Rep.DetachedEntities.FirstOrDefaultAsync(u => u.@(@column.ColumnName) == input.@(@column.ColumnName))).Adapt<@(@Model.ClassName)Output>();
-}else{
- if (@Model.IsOnlyQuery == true){
- @:return null;
- }
-}
-}
+ return (await _@(@Model.CamelizeClassName)Rep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<@(@Model.ClassName)Output>();
}
/// <summary>
@@ -216,8 +205,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/list")]
- [HttpGet("list")]
+ [HttpGet("@Model.ClassName/list")]
public async Task<List<@(@Model.ClassName)Output>> List([FromQuery] @(@Model.ClassName)Input input)
{
return await _@(@Model.CamelizeClassName)Rep.DetachedEntities.ProjectToType<@(@Model.ClassName)Output>().ToListAsync();
@@ -245,8 +233,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/add")]
- [HttpPost("add")]
+ [HttpPost("@Model.ClassName/add")]
public async Task Add(Add@(@Model.ClassName)Input input)
{
var @(@Model.CamelizeClassName) = input.Adapt<@(@Model.ClassName)>();
@@ -264,8 +251,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/delete")]
- [HttpPost("delete")]
+ [HttpPost("@Model.ClassName/delete")]
public async Task Delete(Delete@(@Model.ClassName)Input input)
{
@foreach (var column in Model.TableField){
@@ -282,8 +268,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [Description("@Model.ClassName/edit")]
- [HttpPost("edit")]
+ [HttpPost("@Model.ClassName/edit")]
public async Task Update(Update@(@Model.ClassName)Input input)
{
var isExist = await _@(@Model.CamelizeClassName)Rep.AnyAsync(u => u.Id == input.Id, false);
@@ -308,8 +293,7 @@
/// </summary>
/// <param name="file">Excel妯℃澘鏂囦欢</param>
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
- [Description("@Model.ClassName/importExcel")]
- [HttpPost("importExcel")]
+ [HttpPost("@Model.ClassName/importExcel")]
public async Task<int> ImportExcelAsync(IFormFile file)
{
int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
@@ -358,8 +342,7 @@
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [Description("@Model.ClassName/downloadExcelTemplate")]
- [HttpGet("downloadExcelTemplate")]
+ [HttpGet("@Model.ClassName/downloadExcelTemplate")]
public IActionResult DownloadExcelTemplate([FromQuery] string version)
{
string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\@Model.ClassName{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
@@ -379,14 +362,17 @@
/// <returns></returns>
private async Task CheckExisit( @(@Model.ClassName) input,bool isEdit=false)
{
-
-
@{
var columnIndex = 0;
+ string my_message = string.Empty;
}
@foreach (var column in Model.TableField)
{
+ if (@column.WhetherUnionKey == "Y")
+ {
+ my_message += "," + @column.ColumnComment + "[{input." + @column.ColumnName + "}]";
+ }
if (@column.WhetherUnionKey == "Y")
{
columnIndex++;
@@ -440,11 +426,9 @@
@:,false);
@:}
}
-
-
@if(columnIndex>0){
- @:if (isExist) throw Oops.Oh(ErrorCode.E0001);
+ @:if (isExist) throw Oops.Oh($"楠岃瘉澶辫触@(@my_message)宸插瓨鍦�");
}else{
@://娌℃湁閰嶇疆鑱斿悎涓婚敭锛屼笉闇�瑕侀獙閲�
}
@@ -528,7 +512,6 @@
@:}).FirstOrDefault();
@:if (existExcelItem != null)
@:{
- @:var @(@Model.CamelizeClassName) = existExcelItem.Adapt<@(@Model.ClassName)>();
@:var item= existExcelItem.Adapt<@(@Model.ClassName)>();
@:throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑@(@message)宸插瓨鍦�");
@:}
@@ -569,8 +552,7 @@
@: ));
@: if (existDBItem != null)
@:{
- @:var @(@Model.CamelizeClassName) = existExcelItem.Adapt<@(@Model.ClassName)>();
- @:var item= existExcelItem.Adapt<@(@Model.ClassName)>();
+ @:var item= existDBItem.Adapt<@(@Model.ClassName)>();
@:throw Oops.Oh($"绯荤粺涓瑻(@message)宸插瓨鍦�");
@:}
}
--
Gitblit v1.9.3