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

@@ -39,15 +39,15 @@ public class PositionCodeDTO : SfsBaseDataDTOBase, IHasCode
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string BasicUom { get; set; }
     /// <summary>
-    /// 库位
+    /// 叫料库位代码
     /// </summary>
-    [Display(Name = "库位")]
+    [Display(Name = "叫料库位代码")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string LocationCode { get; set; }
     /// <summary>
-    /// 库位名称
+    /// 叫料库位名称
     /// </summary>
-    [Display(Name = "库位名称")]
+    [Display(Name = "叫料库位名称")]
     [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string LocationName { get; set; }
     /// <summary>

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

@@ -31,15 +31,15 @@ public class PositionCodeEditInput : SfsBaseDataCreateOrUpdateInputBase
     [Display(Name = "基本计量单位")]
     public string BasicUom { get; set; }
     /// <summary>
-    /// 库位
+    /// 叫料库位代码
     /// </summary>
-    [Display(Name = "库位")]
+    [Display(Name = "叫料库位代码")]
     [Required(ErrorMessage = "{0}是必填项")]
     public string LocationCode { get; set; }
     /// <summary>
-    /// 库位名称
+    /// 叫料库位名称
     /// </summary>
-    [Display(Name = "库位名称")]
+    [Display(Name = "叫料库位名称")]
     public string LocationName { get; set; }
     /// <summary>
     /// 标包数量

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

@@ -41,16 +41,16 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string BasicUom { get; set; }
     /// <summary>
-    /// 库位
+    /// 叫料库位代码
     /// </summary>
-    [Display(Name = "库位")]
+    [Display(Name = "叫料库位代码")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     [Required(ErrorMessage = "{0}是必填项")]
     public string LocationCode { get; set; }
     /// <summary>
-    /// 库位名称
+    /// 叫料库位名称
     /// </summary>
-    [Display(Name = "库位名称")]
+    [Display(Name = "叫料库位名称")]
     [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string LocationName { get; set; }
     /// <summary>

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

@@ -74,7 +74,7 @@ public class PositionCodeAppService
         }
         input.PartName = itemBasic.Name;
         input.PartDesc = itemBasic.Desc1;
-        input.BasicUom = itemBasic.BasicUom;
+        
 
         var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false);
         Check.NotNull(location, "库位代码", $"库位 {input.LocationCode} 不存在");
@@ -125,8 +125,7 @@ public class PositionCodeAppService
         }
         entity.PartName = itemBasic.Name;
         entity.PartDesc = itemBasic.Desc1;
-        entity.BasicUom = itemBasic.BasicUom;
+        
-        entity.StdPackQty = itemBasic.StdPackQty;
 
         var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false);
         Check.NotNull(location, "库位代码", $"库位 {input.LocationCode} 不存在");
@@ -159,8 +158,8 @@ public class PositionCodeAppService
             var itemBasic = await ItemBasicAppService.GetByCodeAsync(positionCode.PartCode).ConfigureAwait(false);
             positionCode.PartName = itemBasic.Name;
             positionCode.PartDesc = itemBasic.Desc1;
-            positionCode.BasicUom = itemBasic.BasicUom;
+            //positionCode.BasicUom = itemBasic.BasicUom;
-            positionCode.StdPackQty = itemBasic.StdPackQty;
+            //positionCode.StdPackQty = itemBasic.StdPackQty;
             positionCode.Code = positionCode.Type + positionCode.Code;
             positionCode.CreatorId= CurrentUser.Id;
             var location = await LocationAppService.GetByCodeAsync(positionCode.LocationCode).ConfigureAwait(false);

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

@@ -36,14 +36,14 @@ public class PositionCode : SfsBaseDataAggregateRootBase, IHasCode
     [Display(Name = "基本计量单位")]
     public string BasicUom { get; set; }
     /// <summary>
-    /// 库位
+    /// 叫料库位代码
     /// </summary>
-    [Display(Name = "库位")]
+    [Display(Name = "叫料库位代码")]
     public string LocationCode { get; set; }
     /// <summary>
-    /// 库位名称
+    /// 叫料库位名称
     /// </summary>
-    [Display(Name = "库位名称")]
+    [Display(Name = "叫料库位名称")]
     public string LocationName { get; set; }   
     /// <summary>
     /// 标包数量

be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs

@@ -164,7 +164,7 @@ public abstract class SfsCrudWithDetailsAppServiceBase<TEntity, TEntityDto, TReq
         var tt = typeof(TEntity).GetBaseClasses(typeof(SfsMasterAggregateRootBase<TDetail>));
         var hasDetails = tt.Length > 0 ? true : false;
 
-        return ExportImportService.Export(list,detailsProptyName: hasDetails ? nameof(TDetail) : null);
+        return ExportImportService.Export(list,detailsProptyName: hasDetails ? "Details" : null);
     }
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs

@@ -119,12 +119,6 @@ public class ProductRecycleRequestAppService :
                 {
                     detail.Status = balance.Status;
                 }
-               // detail.Status = EnumInventoryStatus.OK;
-
-                var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode)
-                    .ConfigureAwait(false);
-                CheckLocation(locationDto, detail.LocationCode);
-
                 await SetDetailPropertiesAsync(detail).ConfigureAwait(false);
             }
         }
@@ -132,6 +126,7 @@ public class ProductRecycleRequestAppService :
         return dictionary;
     }
 
+
     #region 校验
     private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
     {
@@ -148,6 +143,20 @@ public class ProductRecycleRequestAppService :
             throw new UserFriendlyException($"库位代码为【{locationCode}】不存在");
         }
     }
+    private void CheckRawLocation(LocationDTO rawlocationDto, string locationCode)
+    {
+        if (rawlocationDto == null)
+        {
+            throw new UserFriendlyException($"库位代码为【{locationCode}】不存在");
+        }
+        else 
+        {
+            if (rawlocationDto.Type != EnumLocationType.WIP)
+            {
+                throw new UserFriendlyException($"库位代码为【{locationCode}】不存在");
+            }
+        }
+    }
     #endregion
 
     private async Task SetRequestAutoPropertiesAsync(ProductRecycleRequest entity)
@@ -177,7 +186,7 @@ public class ProductRecycleRequestAppService :
             detail.Qty = detail.Qty;
         }
 
-        var location = await LocationAclService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
+        var location = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
         CheckLocation(location, detail.LocationCode);
         if (location != null)
         {
@@ -187,8 +196,8 @@ public class ProductRecycleRequestAppService :
             detail.LocationArea = location.AreaCode;
         }
 
-        var rawLocation = await LocationAclService.GetByCodeAsync(detail.RawLocationCode).ConfigureAwait(false);
+        var rawLocation = await _locationAppService.GetByCodeAsync(detail.RawLocationCode).ConfigureAwait(false);
-        CheckLocation(rawLocation, detail.RawLocationCode);
+        CheckRawLocation(rawLocation, detail.RawLocationCode);
         if (rawLocation != null)
         {
             detail.RawLocationErpCode = rawLocation.ErpLocationCode;