From abf3ceabdd98abd0d955b03732e581a43c4e9fb0 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 13 一月 2025 15:01:31 +0800
Subject: [PATCH] 解决冲突
---
Yw.Application.Unit.Core/03-value/SysUnitValue_Controller.cs | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/Yw.Application.Unit.Core/03-value/SysUnitValue_Controller.cs b/Yw.Application.Unit.Core/03-value/SysUnitValue_Controller.cs
index ad50f28..d4b7a7b 100644
--- a/Yw.Application.Unit.Core/03-value/SysUnitValue_Controller.cs
+++ b/Yw.Application.Unit.Core/03-value/SysUnitValue_Controller.cs
@@ -4,7 +4,7 @@
/// UnitValue
/// </summary>
[Route("Unit/Value")]
- [ApiDescriptionSettings("Unit", Name = "鍗曚綅鍊�", Order = 8000)]
+ [ApiDescriptionSettings("Unit", Name = "鍗曚綅鍊�", Order = 80000)]
public class SysUnitValue_Controller : IDynamicApiController
{
private readonly Service.SysUnitValue _service = new();
@@ -59,10 +59,6 @@
return vm_list;
}
-
-
-
-
#endregion
#region Insert
@@ -77,11 +73,11 @@
var type = new Service.SysUnitType().GetByID(input.TypeID);
if (type == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"TypeID:{input.TypeID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"TypeID:{input.TypeID} 鏁版嵁涓嶅瓨鍦�");
}
if (_service.IsExistCode(input.TypeID, input.Code))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code} 缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} 缂栫爜宸插瓨鍦�");
}
var model = input.Adapt<AddSysUnitValueInput, Model.SysUnitValue>();
model.SortCode = _service.GetMaxSortCode(input.TypeID) + 1;
@@ -104,11 +100,11 @@
var model = _service.GetByID(input.ID);
if (model == null)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
if (_service.IsExistCodeExceptID(model.TypeID, input.Code, input.ID))
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.V001, $"Code:{input.Code} 缂栫爜宸插瓨鍦�");
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} 缂栫爜宸插瓨鍦�");
}
var rhs = new Model.SysUnitValue(model);
input.Adapt(rhs);
@@ -136,6 +132,26 @@
{
var list = inputList.Select(x => x.Adapt<Model.Sorter>()).ToList();
var bol = _service.UpdateSorter(list);
+ return bol;
+ }
+
+ /// <summary>
+ /// 鏇存柊缂栫爜
+ /// </summary>
+ [Route("UpdateCode@V1.0")]
+ [HttpPut]
+ public bool UpdateCode([Required] UpdateCodeInput input)
+ {
+ var model = _service.GetByID(input.ID);
+ if (model == null)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ }
+ if (_service.IsExistCodeExceptID(model.TypeID, input.Code, input.ID))
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"Code:{input.Code} 缂栫爜宸插瓨鍦�");
+ }
+ var bol = _service.UpdateCode(input.ID, input.Code);
return bol;
}
@@ -180,7 +196,7 @@
var bol = _service.DeleteByID(input.ID, out string msg);
if (!bol)
{
- throw YOops.Oh(eResultCode.Alert, ErrorCodes.D999, msg);
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg);
}
return bol;
}
--
Gitblit v1.9.3