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

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs

@@ -39,22 +39,7 @@ public class IssueNoteController : AbpController
         {
             p.ToLot = string.Empty;
             p.ToPackingCode = string.Empty;
-            if(p.PositionCode.Contains('W'))
+           
-            {
-                p.RecommendType = EnumRecommendType.W;
-            }
-            else if(p.PositionCode.Contains('Q'))
-            {
-                p.RecommendType = EnumRecommendType.Q;
-            }
-            else if (p.PositionCode.Contains('K'))
-            {
-                p.RecommendType = EnumRecommendType.K;
-            }
-            else
-            {
-                p.RecommendType = EnumRecommendType.None;
-            }
 
         });
 

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

@@ -68,9 +68,9 @@ public class PositionCodeAppService
         var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false);
         Check.NotNull(itemBasic, "物品代码", $"物品 {input.PartCode} 不存在");
         //如果类型选择为原料，校验物料号类型必须为原料，器具、KItting 的不用加校验
-        if (input.Type == EnumRecommendType.W && itemBasic.Type != "10C02")
+        if (input.Type == EnumRecommendType.W && itemBasic.CanBuy != true)
         {
-            throw new UserFriendlyException($"{input.PartCode} 物料号类型必须为原料");
+            throw new UserFriendlyException($"{input.PartCode} 物料号类型必须为采购件");
         }
         input.PartName = itemBasic.Name;
         input.PartDesc = itemBasic.Desc1;

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumRecommendType.cs

@@ -19,10 +19,10 @@ public enum EnumRecommendType
     W = 1,
 
     /// <summary>
-    /// 器具
+    /// 半成品
     /// </summary>
-    [Display(Name = "器具")]
+    [Display(Name = "半成品")]
-    Q = 2,
+    B = 2,
 
     /// <summary>
     /// kitting区

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs

@@ -218,22 +218,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
             var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
             CheckItemBasic(itemBasicDto, detailInput.ItemCode);
             detailInput.ItemDesc1 = itemBasicDto.Desc1;
-            if (detailInput.PositionCode.Contains('W'))
+            
-            {
-                detailInput.RecommendType = EnumRecommendType.W;
-            }
-            else if (detailInput.PositionCode.Contains('Q'))
-            {
-                detailInput.RecommendType = EnumRecommendType.Q;
-            }
-            else if (detailInput.PositionCode.Contains('K'))
-            {
-                detailInput.RecommendType = EnumRecommendType.K;
-            }
-            else
-            {
-                detailInput.RecommendType = EnumRecommendType.None;
-            }
 
             //var productionLineDto = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationDto.LocationGroupCode).ConfigureAwait(false);
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs

@@ -214,22 +214,7 @@ public class MaterialRequestAppService : SfsStoreRequestAppServiceBase<MaterialR
             var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
             CheckItemBasic(itemBasicDto, detailInput.ItemCode);
             detailInput.ItemDesc1 = itemBasicDto.Desc1;
-            if(detailInput.PositionCode.Contains('W'))
+            
-            {
-                detailInput.RecommendType = EnumRecommendType.W;
-            }
-            else if(detailInput.PositionCode.Contains('Q'))
-            {
-                detailInput.RecommendType = EnumRecommendType.Q;
-            }
-            else if(detailInput.PositionCode.Contains('K'))
-            {
-                detailInput.RecommendType = EnumRecommendType.K;
-            }
-            else
-            {
-                detailInput.RecommendType = EnumRecommendType.None;
-            }
 
             //var productionLineDto = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationDto.LocationGroupCode).ConfigureAwait(false);