diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs index 742fd92d5..51ecc07e4 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs @@ -40,8 +40,6 @@ public class ItemStoreRelationImportInput : SfsBaseDataImportInputBase /// 是否可用 /// [Display(Name = "是否可用")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool Enabled { get; set; } = true; @@ -82,8 +80,6 @@ public class ItemStoreRelationImportInput : SfsBaseDataImportInputBase /// 是否定制位置 /// [Display(Name = "是否定制位置")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool IsFixed { get; set; } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationGroups/Inputs/LocationGroupImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationGroups/Inputs/LocationGroupImportInput.cs index 1252aae1b..0eb79c9dd 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationGroups/Inputs/LocationGroupImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationGroups/Inputs/LocationGroupImportInput.cs @@ -73,8 +73,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以混物品 /// [Display(Name = "可以混物品")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableMixItem { get; set; } = true; @@ -82,8 +80,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以混批次 /// [Display(Name = "可以混批次")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableMixLot { get; set; } = true; @@ -91,8 +87,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以混状态 /// [Display(Name = "可以混状态")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableMixStatus { get; set; } = true; @@ -100,8 +94,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以负库存 /// [Display(Name = "可以负库存")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableNegative { get; set; } = true; @@ -109,8 +101,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以保留零库存 /// [Display(Name = "可以保留零库存")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableKeepZero { get; set; } = true; @@ -118,8 +108,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以机会盘点 /// [Display(Name = "可以机会盘点")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableOpportunityCount { get; set; } = true; @@ -127,8 +115,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以领料 /// [Display(Name = "可以领料")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnablePick { get; set; } = true; @@ -136,8 +122,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以过量领料 /// [Display(Name = "可以过量领料")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableOverPick { get; set; } = true; @@ -145,8 +129,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以整包存储 /// [Display(Name = "可以整包存储")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableWholeStore { get; set; } = true; @@ -154,8 +136,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以散件存储 /// [Display(Name = "可以散件存储")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableBreakStore { get; set; } = true; @@ -163,8 +143,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以发出 /// [Display(Name = "可以发出")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableShip { get; set; } = true; @@ -172,8 +150,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以接收 /// [Display(Name = "可以接收")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableReceive { get; set; } = true; @@ -181,8 +157,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以退货给供应商 /// [Display(Name = "可以退货给供应商")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableReturnToSupplier { get; set; } = true; @@ -190,8 +164,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 可以接收客户退货 /// [Display(Name = "可以接收客户退货")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableReturnFromCustomer { get; set; } = true; @@ -199,8 +171,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 是否可以拆箱 /// [Display(Name = "是否可以拆箱")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableSplitBox { get; set; } = true; @@ -208,8 +178,6 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation /// 是否可以拆托 /// [Display(Name = "是否可以拆托")] - [ValueMapping("是", true)] - [ValueMapping("否", false)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableSplitPallet { get; set; } = true; diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationImportInput.cs index 3fc63d4a2..9e5b2d9a3 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationImportInput.cs @@ -117,128 +117,96 @@ public class LocationImportInput : SfsBaseDataImportInputBase, IHasLocationSwitc /// 可以混物品 /// [Display(Name = "可以混物品")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableMixItem { get; set; } = true; /// /// 可以混批次 /// [Display(Name = "可以混批次")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableMixLot { get; set; } = true; /// /// 可以混状态 /// [Display(Name = "可以混状态")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableMixStatus { get; set; } = true; /// /// 可以负库存 /// [Display(Name = "可以负库存")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableNegative { get; set; } = true; /// /// 可以保留零库存 /// [Display(Name = "可以保留零库存")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableKeepZero { get; set; } = true; /// /// 可以机会盘点 /// [Display(Name = "可以机会盘点")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableOpportunityCount { get; set; } = true; /// /// 可以领料 /// [Display(Name = "可以领料")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnablePick { get; set; } = true; /// /// 可以过量领料 /// [Display(Name = "可以过量领料")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableOverPick { get; set; } = true; /// /// 可以整包存储 /// [Display(Name = "可以整包存储")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableWholeStore { get; set; } = true; /// /// 可以散件存储 /// [Display(Name = "可以散件存储")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableBreakStore { get; set; } = true; /// /// 可以发出 /// [Display(Name = "可以发出")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableShip { get; set; } = true; /// /// 可以接收 /// [Display(Name = "可以接收")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableReceive { get; set; } = true; /// /// 可以退货给供应商 /// [Display(Name = "可以退货给供应商")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableReturnToSupplier { get; set; } = true; /// /// 可以接收客户退货 /// [Display(Name = "可以接收客户退货")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableReturnFromCustomer { get; set; } = true; /// /// 是否可以拆箱 /// [Display(Name = "是否可以拆箱")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableSplitBox { get; set; } = true; /// /// 是否可以拆托 /// [Display(Name = "是否可以拆托")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EnableSplitPallet { get; set; } = true; diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Shifts/Inputs/ShiftImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Shifts/Inputs/ShiftImportInput.cs index 9c1cc9f50..17f408fd5 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Shifts/Inputs/ShiftImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Shifts/Inputs/ShiftImportInput.cs @@ -46,8 +46,6 @@ public class ShiftImportInput : SfsBaseDataImportInputBase /// 结束到下一天 /// [Display(Name = "结束到下一天")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] [Required(ErrorMessage = "{0}是必填项")] public bool EndAtNextDay { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderImportInput.cs index 8a3d64f89..52b95495b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/Inputs/PurchaseOrderImportInput.cs @@ -36,8 +36,6 @@ public class PurchaseOrderImportInput : SfsStoreImportInputBase /// 订单状态 /// [Display(Name = "订单状态")] - [ValueMapping("禁用", 0)] - [ValueMapping("启用", 1)] [Required(ErrorMessage = "{0}是必填项")] public EnumOrderStatus OrderStatus { get; set; } = EnumOrderStatus.Open; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/SaleOrders/Inputs/SaleOrderImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/SaleOrders/Inputs/SaleOrderImportInput.cs index c11103262..5d857182a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/SaleOrders/Inputs/SaleOrderImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/SaleOrders/Inputs/SaleOrderImportInput.cs @@ -28,8 +28,7 @@ public class SaleOrderImportInput : SfsStoreImportInputBase /// 订单状态 /// [Display(Name = "订单状态")] - [ValueMapping("禁用", 0)] - [ValueMapping("启用", 1)] + [Required(ErrorMessage = "{0}是必填项")] public EnumOrderStatus SoStatus { get; set; } = EnumOrderStatus.Open; /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs index 065bd6f10..b93a1b923 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferRequests/Inputs/TransferRequestImportInput.cs @@ -19,8 +19,6 @@ public class TransferRequestImportInput : SfsStoreImportInputBase /// [Display(Name = "使用中间库")] [Required(ErrorMessage = "{0}是必填项")] - [ValueMapping("否", false)] - [ValueMapping("是", true)] public bool UseOnTheWayLocation { get; set; } ///