From 9f48ea7bf644984ba16461c29bc06ee4656aff98 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Fri, 19 Jul 2024 15:28:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=A0=81=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ItemGuideBooks/DTOs/ItemGuideBookDTO.cs | 6 +++---
.../PositionCodes/PositionCodeAppService.cs | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs
index d77f6c514..0c2e27a78 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemGuideBooks/DTOs/ItemGuideBookDTO.cs
@@ -16,18 +16,18 @@ public class ItemGuideBookDTO : SfsBaseDataDTOBase
/// 物品名称
///
[Display(Name = "物品名称")]
- public string ItemName { get; set; }
+ public string Name { get; set; }
///
/// 物品描述1
///
[Display(Name = "物品描述1")]
- public string ItemDesc1 { get; set; }
+ public string Desc1 { get; set; }
///
/// 物品描述2
///
[Display(Name = "物品描述2")]
- public string ItemDesc2 { get; set; }
+ public string Desc2 { get; set; }
///
/// 步骤
///
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs
index f6b6676e6..20054baf3 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs
@@ -96,7 +96,7 @@ public class PositionCodeAppService
throw new UserFriendlyException($"{id} 未找到位置码信息");
}
var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode && p.Code==input.Code).ConfigureAwait(false);
- if (itemEntity != null)
+ if (itemEntity != null&& itemEntity.Id!= id)
{
throw new UserFriendlyException($"位置码{input.Code}已存在物品{input.PartCode}的信息 ");
}