Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs

@@ -26,6 +26,12 @@ public class PositionCodeDTO : SfsBaseDataDTOBase, IHasCode
     [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string PartName { get; set; }
     /// <summary>
+    /// 物料描述
+    /// </summary>
+    [Display(Name = "物料描述")]
+    [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string PartDesc { get; set; }
+    /// <summary>
     /// 库位
     /// </summary>
     [Display(Name = "库位")]

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs

@@ -19,6 +19,11 @@ public class PositionCodeEditInput : SfsBaseDataCreateOrUpdateInputBase
     [Display(Name = "物料名称")]
     public string PartName { get; set; }
     /// <summary>
+    /// 物料描述
+    /// </summary>
+    [Display(Name = "物料描述")]
+    public string PartDesc { get; set; }
+    /// <summary>
     /// 库位
     /// </summary>
     [Display(Name = "库位")]

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs

@@ -26,6 +26,12 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase
     [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string PartName { get; set; }
     /// <summary>
+    /// 物料描述
+    /// </summary>
+    [Display(Name = "物料描述")]
+    [StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string PartDesc { get; set; }
+    /// <summary>
     /// 库位
     /// </summary>
     [Display(Name = "库位")]

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCode/PositionCodeAppService.cs

@@ -40,7 +40,8 @@ public class PositionCodeAppService
 
         var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false);
         Check.NotNull(itemBasic, "物品代码", $"物品 {input.PartCode} 不存在");
-        input.PartName = itemBasic.Desc1;
+        input.PartName = itemBasic.Name;
+        input.PartDesc = itemBasic.Desc1;
 
         var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false);
         Check.NotNull(location, "库位代码", $"库位 {input.LocationCode} 不存在");

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCode/PositionCode.cs

@@ -26,6 +26,11 @@ public class PositionCode : SfsBaseDataAggregateRootBase, IHasCode
     [Display(Name = "物料名称")]
     public string PartName { get; set; }
     /// <summary>
+    /// 物料描述
+    /// </summary>
+    [Display(Name = "物料描述")]
+    public string PartDesc { get; set; }
+    /// <summary>
     /// 库位
     /// </summary>
     [Display(Name = "库位")]