diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs index f8ac25b4b..8a81da4b8 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueNoteController.cs +++ b/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; - } + }); 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 043d22231..5431a0142 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 @@ -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; diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumRecommendType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumRecommendType.cs index 4b64c050b..08e1bc6a2 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumRecommendType.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumRecommendType.cs @@ -19,10 +19,10 @@ public enum EnumRecommendType W = 1, /// - /// 器具 + /// 半成品 /// - [Display(Name = "器具")] - Q = 2, + [Display(Name = "半成品")] + B = 2, /// /// kitting区 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs index 05fd60fef..3acfc1ae7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs @@ -218,22 +218,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase