diff --git a/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.Designer.cs b/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.Designer.cs index be08c48..600ae1d 100644 --- a/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.Designer.cs +++ b/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.Designer.cs @@ -386,7 +386,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Batch") + b.Property("Lot") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -453,7 +453,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("ProduceDate") + b.Property("ProductionDate") .HasColumnType("datetime2"); b.Property("RcNumber") @@ -494,7 +494,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("SupplierBatch") + b.Property("SupplierLot") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -515,7 +515,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("TimeWIndowEnd") + b.Property("TimeWindowEnd") .HasColumnType("datetime2"); b.Property("TimeWindowBegin") @@ -531,7 +531,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("WarehouseDoor") + b.Property("WarehouseDock") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); diff --git a/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.cs b/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.cs index d1e8513..e860bfb 100644 --- a/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.cs +++ b/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.cs @@ -98,17 +98,17 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations SupplierCode = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), RcType = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), Warehouse = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), - WarehouseDoor = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), + WarehouseDock = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), TimeWindowBegin = table.Column(type: "datetime2", nullable: false), - TimeWIndowEnd = table.Column(type: "datetime2", nullable: false), + TimeWindowEnd = table.Column(type: "datetime2", nullable: false), ReceiveTime = table.Column(type: "datetime2", nullable: false), Site = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), Company = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), PoLine = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), PartCode = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), - Batch = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), - SupplierBatch = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), - ProduceDate = table.Column(type: "datetime2", nullable: false), + Lot = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), + SupplierLot = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), + ProductionDate = table.Column(type: "datetime2", nullable: false), Uom = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), DeliverQty = table.Column(type: "decimal(18,2)", nullable: false), ReceiveQty = table.Column(type: "decimal(18,2)", nullable: false), diff --git a/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021081413_20211021002.Designer.cs b/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021081413_20211021002.Designer.cs index 34a17b9..c2aa824 100644 --- a/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021081413_20211021002.Designer.cs +++ b/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021081413_20211021002.Designer.cs @@ -375,7 +375,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Batch") + b.Property("Lot") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -428,7 +428,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("ProduceDate") + b.Property("ProductionDate") .HasColumnType("datetime2"); b.Property("RcNumber") @@ -473,7 +473,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("SupplierBatch") + b.Property("SupplierLot") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -494,7 +494,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("TimeWIndowEnd") + b.Property("TimeWindowEnd") .HasColumnType("datetime2"); b.Property("TimeWindowBegin") @@ -514,7 +514,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("WarehouseDoor") + b.Property("WarehouseDock") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); diff --git a/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/WebApiHttpApiHostMigrationsDbContextModelSnapshot.cs b/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/WebApiHttpApiHostMigrationsDbContextModelSnapshot.cs index 2ab4ec8..b42669e 100644 --- a/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/WebApiHttpApiHostMigrationsDbContextModelSnapshot.cs +++ b/ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/WebApiHttpApiHostMigrationsDbContextModelSnapshot.cs @@ -373,7 +373,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Batch") + b.Property("Lot") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -426,7 +426,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("ProduceDate") + b.Property("ProductionDate") .HasColumnType("datetime2"); b.Property("RcNumber") @@ -471,7 +471,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("SupplierBatch") + b.Property("SupplierLot") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -492,7 +492,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("TimeWIndowEnd") + b.Property("TimeWindowEnd") .HasColumnType("datetime2"); b.Property("TimeWindowBegin") @@ -512,7 +512,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("WarehouseDoor") + b.Property("WarehouseDock") .IsRequired() .HasMaxLength(64) .HasColumnType("nvarchar(64)"); diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateDTO.cs index 05689ee..25b6f7c 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateDTO.cs @@ -1,7 +1,48 @@ -namespace Win_in.Sfs.Scp.WebApi.ASNs +using System.ComponentModel.DataAnnotations; + +namespace Win_in.Sfs.Scp.WebApi.ASNs { + /// + /// 发货单新增DTO(ASN Create DTO) + /// public class ASNCreateDTO : ASNCreateOrUpdateDTOBase { + /// + /// 发货单号(ASN Number) + /// + [Display(Name = "发货单号(AsnNumber)")] + public string AsnNumber { set; get; } + + /// + /// 要货计划单号(Request Plan Number) + /// + [Display(Name = "要货计划单号(RpNumber)")] + public string RpNumber { set; get; } + + /// + /// 订单号(Purchase order number) + /// + [Display(Name = "订单号(PoNumber)")] + public string PoNumber { set; get; } + + /// + /// 供应商代码(Supplier code) + /// + [Display(Name = "供应商代码(SupplierCode)")] + public string SupplierCode { set; get; } + + /// + /// 地点(Site) + /// + [Display(Name = "地点(Site)")] + public string Site { set; get; } + + /// + /// 公司(IAC company code) + /// + [Display(Name = "公司(Company)")] + public string Company { set; get; } + } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateOrUpdateDTOBase.cs index 4b0a8df..700d671 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateOrUpdateDTOBase.cs @@ -2,37 +2,15 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; +using Volo.Abp.Data; namespace Win_in.Sfs.Scp.WebApi.ASNs { /// /// 发货单创建更新基础Dto /// - public abstract class ASNCreateOrUpdateDTOBase : EntityDto + public abstract class ASNCreateOrUpdateDTOBase : EntityDto,IHasExtraProperties { - /// - /// 发货单号(ASN Number) - /// - [Display(Name = "发货单号(AsnNumber)")] - public string AsnNumber { set; get; } - - /// - /// 要货计划单号(Request Plan Number) - /// - [Display(Name = "要货计划单号(RpNumber)")] - public string RpNumber { set; get; } - - /// - /// 订单号(Purchase order number) - /// - [Display(Name = "订单号(PoNumber)")] - public string PoNumber { set; get; } - - /// - /// 供应商代码(Supplier code) - /// - [Display(Name = "供应商代码(SupplierCode)")] - public string SupplierCode { set; get; } /// /// 状态(Status) @@ -71,28 +49,16 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs public string WarehouseDock { set; get; } /// - /// 时间窗口开始(Time window Begin) + /// 时间窗口开始(Time Window Begin) /// [Display(Name = "时间窗口开始(TimeWindowBegin)")] public DateTime TimeWindowBegin { set; get; } /// - /// 时间窗口结束(Time window End) + /// 时间窗口结束(Time Window End) /// - [Display(Name = "时间窗口结束(TimeWIndowEnd)")] - public DateTime TimeWIndowEnd { set; get; } - - /// - /// 地点(Site) - /// - [Display(Name = "地点(Site)")] - public string Site { set; get; } - - /// - /// 公司(IAC company code) - /// - [Display(Name = "公司(Comapnay)")] - public string Comapnay { set; get; } + [Display(Name = "时间窗口结束(TimeWindowEnd)")] + public DateTime TimeWindowEnd { set; get; } /// /// 备注(Remark) @@ -101,12 +67,19 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs public string Remark { set; get; } /// - /// 是否已读(IsrRead) + /// 是否已读(IsRead) /// - [Display(Name = "是否已读(IsrRead)")] - public bool IsrRead { set; get; } + [Display(Name = "是否已读(IsRead)")] + public bool IsRead { set; get; } + + + public virtual ICollection Details { get; set; } + /// + /// 扩展属性(Extra Properties) + /// + [Display(Name = "扩展属性(Extra Properties)")] + public ExtraPropertyDictionary ExtraProperties { get; set; } - public virtual ICollection ASNDetails { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDTO.cs index c806dee..b8d4923 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDTO.cs @@ -2,13 +2,14 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; +using Volo.Abp.Data; namespace Win_in.Sfs.Scp.WebApi.ASNs { /// - /// 发货单主表DTO + /// 发货单DTO(ASN DTO) /// - public class ASNDTO : AuditedEntityDto + public class ASNDTO : AuditedEntityDto,IHasExtraProperties { /// /// 发货单号(ASN Number) @@ -71,16 +72,16 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs public string WarehouseDock { set; get; } /// - /// 时间窗口开始(Time window Begin) + /// 时间窗口开始(Time Window Begin) /// [Display(Name = "时间窗口开始(TimeWindowBegin)")] public DateTime TimeWindowBegin { set; get; } /// - /// 时间窗口结束(Time window End) + /// 时间窗口结束(Time Window End) /// - [Display(Name = "时间窗口结束(TimeWIndowEnd)")] - public DateTime TimeWIndowEnd { set; get; } + [Display(Name = "时间窗口结束(TimeWindowEnd)")] + public DateTime TimeWindowEnd { set; get; } /// /// 地点(Site) @@ -91,8 +92,8 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs /// /// 公司(IAC company code) /// - [Display(Name = "公司(Comapnay)")] - public string Comapnay { set; get; } + [Display(Name = "公司(Company)")] + public string Company { set; get; } /// /// 备注(Remark) @@ -101,12 +102,18 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs public string Remark { set; get; } /// - /// 是否已读(IsrRead) + /// 是否已读(IsRead) /// - [Display(Name = "是否已读(IsrRead)")] - public bool IsrRead { set; get; } + [Display(Name = "是否已读(IsRead)")] + public bool IsRead { set; get; } - public virtual ICollection ASNDetails { get; set; } + public virtual ICollection Details { get; set; } + + /// + /// 扩展属性(Extra Properties) + /// + [Display(Name = "扩展属性(Extra Properties)")] + public ExtraPropertyDictionary ExtraProperties { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDetailsDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDetailsDTO.cs index b59544e..174d0e8 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDetailsDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDetailsDTO.cs @@ -2,13 +2,14 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; +using Volo.Abp.Data; namespace Win_in.Sfs.Scp.WebApi.ASNs { /// - /// 发货单明细表DTO + /// 发货单明细DTO(ASN Detail DTO) /// - public class ASNDetailsDTO : AuditedEntityDto + public class ASNDetailsDTO : AuditedEntityDto, IHasExtraProperties { /// /// 发货单号(ASN Number) @@ -43,14 +44,14 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs /// /// 供应商批次(Supplier Lot) /// - [Display(Name = "供应商批次(Supplierlot)")] - public string Supplierlot { set; get; } + [Display(Name = "供应商批次(SupplierLot)")] + public string SupplierLot { set; get; } /// /// 生产日期(Produce Date) /// - [Display(Name = "生产日期(ProduceDate)")] - public DateTime ProduceDate { set; get; } + [Display(Name = "生产日期(ProductionDate)")] + public DateTime ProductionDate { set; get; } /// /// 计量单位(Unit of measure) @@ -67,13 +68,13 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs /// /// 标包计量单位(standard package um) /// - [Display(Name = "标包计量单位(StdPackUom)")] + [Display(Name = "标包计量单位(Standard Pack Uom)")] public string StdPackUom { set; get; } /// - /// 标包数量(standard package quantiy) + /// 标包数量(standard package quantity) /// - [Display(Name = "标包数量(StdPackQty)")] + [Display(Name = "标包数量(Standard Pack Qty)")] public decimal StdPackQty { set; get; } /// @@ -107,9 +108,14 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs public string BarCode { set; get; } /// - /// 托标签号(PalletLabelnumber) + /// 托标签号(PalletLabelCode) /// - [Display(Name = "托标签号(PalletLabelnumber)")] - public string PalletLabelnumber { set; get; } + [Display(Name = "托标签号(PalletLabelCode)")] + public string PalletLabelCode { set; get; } + /// + /// 扩展属性(Extra Properties) + /// + [Display(Name = "扩展属性(Extra Properties)")] + public ExtraPropertyDictionary ExtraProperties { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNUpdateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNUpdateDTO.cs index b1dfcbf..b77abae 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNUpdateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNUpdateDTO.cs @@ -1,7 +1,17 @@ -namespace Win_in.Sfs.Scp.WebApi.ASNs +using System.ComponentModel.DataAnnotations; + +namespace Win_in.Sfs.Scp.WebApi.ASNs { + /// + /// 发货单更新DTO(ASN update DTO) + /// public class ASNUpdateDTO : ASNCreateOrUpdateDTOBase { + /// + /// 并发时间戳(Concurrency Stamp) + /// + [Display(Name = "并发时间戳(Concurrency Stamp)")] + public string ConcurrencyStamp { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/IASNAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/IASNAppService.cs index 2f79a4e..350e097 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/IASNAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/IASNAppService.cs @@ -5,9 +5,10 @@ using Volo.Abp.Application.Services; namespace Win_in.Sfs.Scp.WebApi.ASNs { - public interface IASNAppService:ICrudAppService + public interface IASNAppService:ICrudAppService { - Task> GetDataAsync(bool isRead); - Task UpdateISReadAsync(Guid id,bool isRead); + Task> GetUnreadListAsync(); + Task ReadAsync(Guid id); + Task UnreadAsync(Guid id); } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/InputDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/InputDTO.cs deleted file mode 100644 index a71acc1..0000000 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/InputDTO.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Volo.Abp.Application.Dtos; - -namespace Win_in.Sfs.Scp.WebApi -{ - public class InputDTO:EntityDto - { - - } -} \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelCreateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelCreateDTO.cs similarity index 100% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelCreateDTO.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelCreateDTO.cs diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelCreateOrUpdateDTOBase.cs similarity index 100% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelCreateOrUpdateDTOBase.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelCreateOrUpdateDTOBase.cs diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelDTO.cs similarity index 100% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelDTO.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelDTO.cs diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelUpdateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelUpdateDTO.cs similarity index 100% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelUpdateDTO.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelUpdateDTO.cs diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/IASNLabelAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/IASNLabelAppService.cs similarity index 100% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/IASNLabelAppService.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/IASNLabelAppService.cs diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/IPOAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/IPOAppService.cs index d22bb45..769ac33 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/IPOAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/IPOAppService.cs @@ -9,7 +9,7 @@ namespace Win_in.Sfs.Scp.WebApi.POs /// /// PO接口 /// - public interface IPOAppService : ICrudAppService + public interface IPOAppService : ICrudAppService { } diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateDTO.cs index 631aaf4..ddb1a05 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateDTO.cs @@ -1,10 +1,36 @@ +using System.ComponentModel.DataAnnotations; + namespace Win_in.Sfs.Scp.WebApi.POs { /// - /// 采购订单创建Dto + /// 采购订单新增DTO(Purchase order create DTO) /// public class POCreateDTO : POCreateOrUpdateDTOBase { + /// + /// 订单号(PoNumber) + /// + [Display(Name = "订单号(PoNumber)")] + public string PoNumber { set; get; } + + /// + /// 供应商代码(SupplierCode) + /// + [Display(Name = "供应商代码(SupplierCode)")] + public string SupplierCode { set; get; } + + /// + /// 地点(Site) + /// + [Display(Name = "地点(Site)")] + public string Site { set; get; } + + /// + /// 公司(Company) + /// + [Display(Name = "公司(Company)")] + public string Company { set; get; } + } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs index 6f8f25e..b9cb407 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs @@ -11,17 +11,6 @@ namespace Win_in.Sfs.Scp.WebApi.POs /// public abstract class POCreateOrUpdateDTOBase : EntityDtoBase { - /// - /// 订单号(PoNumber) - /// - [Display(Name = "订单号(PoNumber)")] - public string PoNumber { set; get; } - - /// - /// 供应商代码(SupplierCode) - /// - [Display(Name = "供应商代码(SupplierCode)")] - public string SupplierCode { set; get; } /// /// 订单类型(PoType) @@ -59,18 +48,6 @@ namespace Win_in.Sfs.Scp.WebApi.POs [Display(Name = "税率(TaxRate)")] public decimal TaxRate { set; get; } - /// - /// 地点(Site) - /// - [Display(Name = "地点(Site)")] - public string Site { set; get; } - - /// - /// 公司(Company) - /// - [Display(Name = "公司(Company)")] - public string Company { set; get; } - /// /// 联系人(ContactName) /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs index ddee34f..5c5d3c2 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs @@ -7,7 +7,7 @@ using Win_in.Sfs.Scp.WebApi.Domain.Shared; namespace Win_in.Sfs.Scp.WebApi.POs { /// - /// 采购订单主表Dto + /// 采购订单DTO(Purchase order DTO) /// public class PODTO : EntityDtoBase { diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs index c8338f6..443ef9d 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Scp.WebApi.Domain.Shared; namespace Win_in.Sfs.Scp.WebApi.POs { /// - /// 采购订单明细表Dto + /// 采购订单明细DTO(Purchase order detail DTO) /// public class PODetailDTO : EntityDetailBase { @@ -35,21 +35,28 @@ namespace Win_in.Sfs.Scp.WebApi.POs public string Uom { set; get; } /// - /// 订单数量(OrderQty) + /// 订单数量(Order Qty) /// [Display(Name = "订单数量(OrderQty)")] public decimal OrderQty { set; get; } + + /// + /// 已关闭数量(Closed Qty) + /// + [Display(Name = "已关闭数量(Closed Qty)")] + public decimal ClosedQty { get; set; } + /// - /// 标包计量单位(StdPackUom) + /// 标包计量单位(Standard Pack Uom) /// - [Display(Name = "标包计量单位(StdPackUom)")] + [Display(Name = "标包计量单位(Standard Pack Uom)")] public string StdPackUom { set; get; } /// - /// 标包数量(StdPackQty) + /// 标包数量(Standard Pack Qty) /// - [Display(Name = "标包数量(StdPackQty)")] + [Display(Name = "标包数量(Standard Pack Qty)")] public decimal StdPackQty { set; get; } /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POUpdateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POUpdateDTO.cs index 73f06da..b647199 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POUpdateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POUpdateDTO.cs @@ -1,10 +1,17 @@ +using System.ComponentModel.DataAnnotations; + namespace Win_in.Sfs.Scp.WebApi.POs { /// - /// 采购订单更新Dto + /// 采购订单更新DTO(Purchase order update DTO) /// public class POUpdateDTO : POCreateOrUpdateDTOBase { + /// + /// 并发时间戳(Concurrency Stamp) + /// + [Display(Name = "并发时间戳(Concurrency Stamp)")] + public string ConcurrencyStamp { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/IPartAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/IPartAppService.cs index cc46762..845b478 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/IPartAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/IPartAppService.cs @@ -9,7 +9,7 @@ namespace Win_in.Sfs.Scp.WebApi.Parts /// /// Part接口 /// - public interface IPartAppService : ICrudAppService + public interface IPartAppService : ICrudAppService { diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateDTO.cs index 24274aa..0402b9e 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateDTO.cs @@ -3,7 +3,7 @@ namespace Win_in.Sfs.Scp.WebApi.Parts { /// - /// 零件创建Dto + /// 零件新增DTO(Part create DTO) /// public class PartCreateDTO : PartCreateOrUpdateDTOBase { @@ -12,5 +12,17 @@ namespace Win_in.Sfs.Scp.WebApi.Parts /// [Display(Name = "代码")] public string Code { get; set; } + + /// + /// 地点(Site) + /// + [Display(Name = "地点")] + public string Site { get; set; } + + /// + /// 公司(Company) + /// + [Display(Name = "公司")] + public string Company { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs index f8bbe6e..04833b0 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; +using Volo.Abp.Data; using Win_in.Sfs.Scp.WebApi.Domain.Shared; namespace Win_in.Sfs.Scp.WebApi.Parts @@ -8,7 +9,7 @@ namespace Win_in.Sfs.Scp.WebApi.Parts /// /// 零件创建更新基础Dto /// - public abstract class PartCreateOrUpdateDTOBase : EntityDtoBase + public abstract class PartCreateOrUpdateDTOBase : EntityDtoBase,IHasExtraProperties { @@ -38,16 +39,16 @@ namespace Win_in.Sfs.Scp.WebApi.Parts public string Status { get; set; } /// - /// 制造件(IsMakePart) + /// 制造件(Can make) /// [Display(Name = "制造件")] - public bool IsMakePart { get; set; } + public bool CanMake { get; set; } /// - /// 采购件(IsBuyPart) + /// 采购件(Can buy) /// [Display(Name = "采购件")] - public bool IsBuyPart { get; set; } + public bool CanBuy { get; set; } /// /// 计量单位(Uom) @@ -59,13 +60,13 @@ namespace Win_in.Sfs.Scp.WebApi.Parts /// ABC类(abcClass) /// [Display(Name = "ABC类")] - public string abcClass { get; set; } + public string AbcClass { get; set; } /// - /// 产品类(productline) + /// 产品类(Product line) /// [Display(Name = "产品类")] - public string productline { get; set; } + public string ProductLine { get; set; } /// /// 类型(Type) @@ -74,10 +75,10 @@ namespace Win_in.Sfs.Scp.WebApi.Parts public string Type { get; set; } /// - /// 种类(catalog) + /// 种类(Catalog) /// - [Display(Name = "代码")] - public string catalog { get; set; } + [Display(Name = "种类")] + public string Catalog { get; set; } /// /// 分组(Group) @@ -104,45 +105,40 @@ namespace Win_in.Sfs.Scp.WebApi.Parts public string Project { get; set; } /// - /// 工程变革(Eco) + /// 工程变更通知单(Engineering change order) /// - [Display(Name = "工程变革")] + [Display(Name = "工程变更通知单")] public string Eco { get; set; } /// - /// 标包计量单位(StdPackUom) + /// 标包计量单位(Standard Pack Uom) /// [Display(Name = "标包计量单位")] public string StdPackUom { get; set; } /// - /// 标包数量(StdPackQty) + /// 标包数量(Standard Pack Qty) /// [Display(Name = "标包数量")] public decimal StdPackQty { get; set; } /// - /// 替代计量单位(ExtPackUom) + /// 替代计量单位(Extra Pack UM) /// [Display(Name = "替代计量单位")] public string ExtPackUom { get; set; } /// - /// 替代包装数量(ExtPackQty) + /// 替代包装数量(Extra Pack Qty) /// [Display(Name = "替代包装数量")] public decimal ExtPackQty { get; set; } /// - /// 地点(Site) + /// 扩展属性(Extra Properties) /// - [Display(Name = "地点")] - public string Site { get; set; } + [Display(Name = "扩展属性(Extra Properties)")] + public ExtraPropertyDictionary ExtraProperties { get; set; } - /// - /// 公司(Company) - /// - [Display(Name = "公司")] - public string Company { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs index a497aaa..e8c1e1c 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs @@ -1,14 +1,15 @@ using System; using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; +using Volo.Abp.Data; using Win_in.Sfs.Scp.WebApi.Domain.Shared; namespace Win_in.Sfs.Scp.WebApi.Parts { /// - /// 零件Dto + /// 零件DTO(Part DTO) /// - public class PartDTO : EntityDtoBase + public class PartDTO : EntityDtoBase,IHasExtraProperties { /// @@ -42,16 +43,16 @@ namespace Win_in.Sfs.Scp.WebApi.Parts public string Status { get; set; } /// - /// 制造件(IsMakePart) + /// 制造件(Can make) /// [Display(Name = "制造件")] - public bool IsMakePart { get; set; } + public bool CanMake { get; set; } /// - /// 采购件(IsBuyPart) + /// 采购件(Can buy) /// [Display(Name = "采购件")] - public bool IsBuyPart { get; set; } + public bool CanBuy { get; set; } /// /// 计量单位(Uom) @@ -60,16 +61,16 @@ namespace Win_in.Sfs.Scp.WebApi.Parts public string Uom { get; set; } /// - /// ABC类(abcClass) + /// ABC类(ABC Class) /// [Display(Name = "ABC类")] - public string abcClass { get; set; } + public string AbcClass { get; set; } /// - /// 产品类(productline) + /// 产品类(Product Line) /// [Display(Name = "产品类")] - public string productline { get; set; } + public string ProductLine { get; set; } /// /// 类型(Type) @@ -78,10 +79,10 @@ namespace Win_in.Sfs.Scp.WebApi.Parts public string Type { get; set; } /// - /// 种类(catalog) + /// 种类(Catalog) /// - [Display(Name = "代码")] - public string catalog { get; set; } + [Display(Name = "种类")] + public string Catalog { get; set; } /// /// 分组(Group) @@ -108,31 +109,31 @@ namespace Win_in.Sfs.Scp.WebApi.Parts public string Project { get; set; } /// - /// 工程变革(Eco) + /// 工程变更通知单(Engineering change order) /// - [Display(Name = "工程变革")] + [Display(Name = "工程变更通知单")] public string Eco { get; set; } /// - /// 标包计量单位(StdPackUom) + /// 标包计量单位(Standard Pack Uom) /// [Display(Name = "标包计量单位")] public string StdPackUom { get; set; } /// - /// 标包数量(StdPackQty) + /// 标包数量(Standard Pack Qty) /// [Display(Name = "标包数量")] public decimal StdPackQty { get; set; } /// - /// 替代计量单位(ExtPackUom) + /// 替代计量单位(Extra Pack UM) /// [Display(Name = "替代计量单位")] public string ExtPackUom { get; set; } /// - /// 替代包装数量(ExtPackQty) + /// 替代包装数量(Extra Pack Qty) /// [Display(Name = "替代包装数量")] public decimal ExtPackQty { get; set; } @@ -148,5 +149,12 @@ namespace Win_in.Sfs.Scp.WebApi.Parts /// [Display(Name = "公司")] public string Company { get; set; } + + /// + /// 扩展属性(Extra Properties) + /// + [Display(Name = "扩展属性(Extra Properties)")] + public ExtraPropertyDictionary ExtraProperties { get; set; } + } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartUpdateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartUpdateDTO.cs index 9b7c73c..da1407e 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartUpdateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartUpdateDTO.cs @@ -1,10 +1,17 @@ -namespace Win_in.Sfs.Scp.WebApi.Parts +using System.ComponentModel.DataAnnotations; + +namespace Win_in.Sfs.Scp.WebApi.Parts { /// - /// 零件更新Dto + /// 零件更新DTO(Part update DTO) /// public class PartUpdateDTO : PartCreateOrUpdateDTOBase { + /// + /// 并发时间戳(Concurrency Stamp) + /// + [Display(Name = "并发时间戳(Concurrency Stamp)")] + public string ConcurrencyStamp { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/IReceiptAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/IReceiptAppService.cs index 49b0d3e..b8d34d3 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/IReceiptAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/IReceiptAppService.cs @@ -5,7 +5,7 @@ using Volo.Abp.Application.Services; namespace Win_in.Sfs.Scp.WebApi.Receipts { - public interface IReceiptAppService : ICrudAppService + public interface IReceiptAppService : ICrudAppService { } diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateDTO.cs index 2bf7bc4..122b52c 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateDTO.cs @@ -1,7 +1,75 @@ +using System.ComponentModel.DataAnnotations; + namespace Win_in.Sfs.Scp.WebApi.Receipts { + /// + /// ջDTO(Receipt create DTO) + /// public class ReceiptCreateDTO : ReceiptCreateOrUpdateDTOBase { - + /// + /// ջ(RcNumber) + /// + [Display(Name = "ջ(RcNumber)")] + public string RcNumber { set; get; } + + /// + /// (AsnNumber) + /// + [Display(Name = "(AsnNumber)")] + public string AsnNumber { set; get; } + + /// + /// Ҫƻ(RpNumber) + /// + [Display(Name = "Ҫƻ(RpNumber)")] + public string RpNumber { set; get; } + + /// + /// (PoNumber) + /// + [Display(Name = "(PoNumber)")] + public string PoNumber { set; get; } + + /// + /// Ӧ̴(PoNumber) + /// + [Display(Name = "Ӧ̴(SupplierCode)")] + public string SupplierCode { set; get; } + + /// + /// ջ(RcType) + /// "" :ջ(Receipts) + /// "R":˻(Return Document) + /// + [Display(Name = "ջ(RcType)")] + public string RcType { set; get; } + + + /// + /// ص(Site) + /// + [Display(Name = "ص(Site)")] + public string Site { set; get; } + + /// + /// ˾(Company) + /// + [Display(Name = "˾(Company)")] + public string Company { set; get; } + + /// + /// (PoLine) + /// + [Display(Name = "(PoLine)")] + public string PoLine { set; get; } + + /// + /// (PartCode) + /// + [Display(Name = "(PartCode)")] + public string PartCode { set; get; } + + } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs index 6c594cc..5917787 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs @@ -7,41 +7,7 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts { public abstract class ReceiptCreateOrUpdateDTOBase : EntityDtoBase { - /// - /// 发货单号(RcNumber) - /// - [Display(Name = "发货单号(RcNumber)")] - public string RcNumber { set; get; } - - /// - /// 发货单号(AsnNumber) - /// - [Display(Name = "发货单号(AsnNumber)")] - public string AsnNumber { set; get; } - - /// - /// 要货计划单号(RpNumber) - /// - [Display(Name = "要货计划单号(RpNumber)")] - public string RpNumber { set; get; } - - /// - /// 订单号(PoNumber) - /// - [Display(Name = "订单号(PoNumber)")] - public string PoNumber { set; get; } - - /// - /// 供应商代码(PoNumber) - /// - [Display(Name = "供应商代码(SupplierCode)")] - public string SupplierCode { set; get; } - /// - /// 收货单类型(RcType) - /// - [Display(Name = "收货单类型(RcType)")] - public string RcType { set; get; } /// /// 仓库(Warehouse) @@ -50,10 +16,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts public string Warehouse { set; get; } /// - /// 收货口(WarehouseDoor) + /// 收货口(WarehouseDock) /// - [Display(Name = "收货口(WarehouseDoor)")] - public string WarehouseDoor { set; get; } + [Display(Name = "收货口(WarehouseDock)")] + public string WarehouseDock { set; get; } /// /// 时间窗口开始(TimeWindowBegin) @@ -62,10 +28,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts public DateTime TimeWindowBegin { set; get; } /// - /// 时间窗口结束(TimeWIndowEnd) + /// 时间窗口结束(TimeWindowEnd) /// - [Display(Name = "时间窗口结束(TimeWIndowEnd)")] - public DateTime TimeWIndowEnd { set; get; } + [Display(Name = "时间窗口结束(TimeWindowEnd)")] + public DateTime TimeWindowEnd { set; get; } /// /// 收货时间(ReceiveTime) @@ -74,46 +40,22 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts public DateTime ReceiveTime { set; get; } /// - /// 地点(Site) - /// - [Display(Name = "地点(Site)")] - public string Site { set; get; } - - /// - /// 公司(Company) - /// - [Display(Name = "公司(Company)")] - public string Company { set; get; } - - /// - /// 订单行(PoLine) - /// - [Display(Name = "订单行(PoLine)")] - public string PoLine { set; get; } - - /// - /// 零件号(PartCode) - /// - [Display(Name = "零件号(PartCode)")] - public string PartCode { set; get; } - - /// - /// 批次(Batch) + /// 批次(Lot) /// - [Display(Name = "批次(Batch)")] - public string Batch { set; get; } + [Display(Name = "批次(Lot)")] + public string Lot { set; get; } /// - /// 供应商批次(SupplierBatch) + /// 供应商批次(SupplierLot) /// - [Display(Name = "供应商批次(SupplierBatch)")] - public string SupplierBatch { set; get; } + [Display(Name = "供应商批次(SupplierLot)")] + public string SupplierLot { set; get; } /// - /// 生产日期(ProduceDate) + /// 生产日期(ProductionDate) /// - [Display(Name = "生产日期(ProduceDate)")] - public DateTime ProduceDate { set; get; } + [Display(Name = "生产日期(ProductionDate)")] + public DateTime ProductionDate { set; get; } /// /// 计量单位(Uom) @@ -134,15 +76,15 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts public decimal ReceiveQty { set; get; } /// - /// 标包计量单位(StdPackUom) + /// 标包计量单位(Standard Pack Uom) /// - [Display(Name = "标包计量单位(StdPackUom)")] + [Display(Name = "标包计量单位(Standard Pack Uom)")] public string StdPackUom { set; get; } /// - /// 标包数量(StdPackQty) + /// 标包数量(Standard Pack Qty) /// - [Display(Name = "标包数量(StdPackQty)")] + [Display(Name = "标包数量(Standard Pack Qty)")] public decimal StdPackQty { set; get; } /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs index ab861d3..44164cc 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs @@ -5,12 +5,15 @@ using Win_in.Sfs.Scp.WebApi.Domain.Shared; namespace Win_in.Sfs.Scp.WebApi.Receipts { + /// + /// 收货单DTO(Receipt DTO) + /// public class ReceiptDTO : EntityDtoBase { /// - /// 发货单号(RcNumber) + /// 收货单号(RcNumber) /// - [Display(Name = "发货单号(RcNumber)")] + [Display(Name = "收货单号(RcNumber)")] public string RcNumber { set; get; } /// @@ -37,12 +40,6 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts [Display(Name = "供应商代码(SupplierCode)")] public string SupplierCode { set; get; } - /// - /// 收货单类型(RcType) - /// - [Display(Name = "收货单类型(RcType)")] - public string RcType { set; get; } - /// /// 仓库(Warehouse) /// @@ -50,10 +47,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts public string Warehouse { set; get; } /// - /// 收货口(WarehouseDoor) + /// 收货口(WarehouseDock) /// - [Display(Name = "收货口(WarehouseDoor)")] - public string WarehouseDoor { set; get; } + [Display(Name = "收货口(WarehouseDock)")] + public string WarehouseDock { set; get; } /// /// 时间窗口开始(TimeWindowBegin) @@ -62,10 +59,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts public DateTime TimeWindowBegin { set; get; } /// - /// 时间窗口结束(TimeWIndowEnd) + /// 时间窗口结束(TimeWindowEnd) /// - [Display(Name = "时间窗口结束(TimeWIndowEnd)")] - public DateTime TimeWIndowEnd { set; get; } + [Display(Name = "时间窗口结束(TimeWindowEnd)")] + public DateTime TimeWindowEnd { set; get; } /// /// 收货时间(ReceiveTime) @@ -98,22 +95,22 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts public string PartCode { set; get; } /// - /// 批次(Batch) + /// 批次(Lot) /// - [Display(Name = "批次(Batch)")] - public string Batch { set; get; } + [Display(Name = "批次(Lot)")] + public string Lot { set; get; } /// - /// 供应商批次(SupplierBatch) + /// 供应商批次(SupplierLot) /// - [Display(Name = "供应商批次(SupplierBatch)")] - public string SupplierBatch { set; get; } + [Display(Name = "供应商批次(SupplierLot)")] + public string SupplierLot { set; get; } /// - /// 生产日期(ProduceDate) + /// 生产日期(ProductionDate) /// - [Display(Name = "生产日期(ProduceDate)")] - public DateTime ProduceDate { set; get; } + [Display(Name = "生产日期(ProductionDate)")] + public DateTime ProductionDate { set; get; } /// /// 计量单位(Uom) @@ -134,15 +131,15 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts public decimal ReceiveQty { set; get; } /// - /// 标包计量单位(StdPackUom) + /// 标包计量单位(Standard Pack Uom) /// - [Display(Name = "标包计量单位(StdPackUom)")] + [Display(Name = "标包计量单位(Standard Pack Uom)")] public string StdPackUom { set; get; } /// - /// 标包数量(StdPackQty) + /// 标包数量(Standard Pack Qty) /// - [Display(Name = "标包数量(StdPackQty)")] + [Display(Name = "标包数量(Standard Pack Qty)")] public decimal StdPackQty { set; get; } /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptUpdateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptUpdateDTO.cs index a60d82d..264800b 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptUpdateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptUpdateDTO.cs @@ -1,9 +1,18 @@ +using System.ComponentModel.DataAnnotations; using Win_in.Sfs.Scp.WebApi.Receipts; namespace Win_in.Sfs.Scp.WebApi.Receipts { + /// + /// ջDTO(Receipt update DTO) + /// public class ReceiptUpdateDTO : ReceiptCreateOrUpdateDTOBase { - + /// + /// ʱ(Concurrency Stamp) + /// + [Display(Name = "ʱ(Concurrency Stamp)")] + public string ConcurrencyStamp { get; set; } + } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/RequestDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/RequestDTO.cs new file mode 100644 index 0000000..c6e6014 --- /dev/null +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/RequestDTO.cs @@ -0,0 +1,12 @@ +using Volo.Abp.Application.Dtos; + +namespace Win_in.Sfs.Scp.WebApi +{ + /// + /// 请求条件DTO(Request DTO) + /// + public class RequestDTO:PagedAndSortedResultRequestDto + { + + } +} \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/ISampleAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/ISampleAppService.cs deleted file mode 100644 index 6b75c79..0000000 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/ISampleAppService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Win_in.Sfs.Scp.WebApi.Samples -{ - public interface ISampleAppService : IApplicationService - { - Task GetAsync(); - - Task GetAuthorizedAsync(); - } -} diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/SampleDto.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/SampleDto.cs deleted file mode 100644 index 33b3e6b..0000000 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/SampleDto.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Win_in.Sfs.Scp.WebApi.Samples -{ - public class SampleDto - { - public int Value { get; set; } - } -} \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/ISupplierPartAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/ISupplierPartAppService.cs index 77ef295..e9b84ca 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/ISupplierPartAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/ISupplierPartAppService.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Scp.WebApi.SupplierParts; namespace Win_in.Sfs.Scp.WebApi.Application.Contracts.SupplierParts { - public interface ISupplierPartAppService : ICrudAppService + public interface ISupplierPartAppService : ICrudAppService { } diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateDTO.cs index feacc4f..3185327 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateDTO.cs @@ -1,7 +1,35 @@ +using System.ComponentModel.DataAnnotations; + namespace Win_in.Sfs.Scp.WebApi.SupplierParts { + /// + /// ӦDTO(Supplier part create DTO) + /// public class SupplierPartCreateDTO : SupplierPartCreateOrUpdateDTOBase { - + /// + /// Ӧ̴(SupplierCode) + /// + [Display(Name = "Ӧ̴(SupplierCode)")] + public string SupplierCode { set; get; } + + /// + /// (PartCode) + /// + [Display(Name = "(PartCode)")] + public string PartCode { set; get; } + + /// + /// ص(Site) + /// + [Display(Name = "ص")] + public string Site { get; set; } + + /// + /// ˾(Company) + /// + [Display(Name = "˾")] + public string Company { get; set; } + } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateOrUpdateDTOBase.cs index 635b8ea..b2f04f2 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateOrUpdateDTOBase.cs @@ -7,17 +7,6 @@ namespace Win_in.Sfs.Scp.WebApi.SupplierParts { public abstract class SupplierPartCreateOrUpdateDTOBase : EntityDtoBase { - /// - /// 供应商代码(SupplierCode) - /// - [Display(Name = "供应商代码(SupplierCode)")] - public string SupplierCode { set; get; } - - /// - /// 零件号(PartCode) - /// - [Display(Name = "零件号(PartCode)")] - public string PartCode { set; get; } /// /// 供应商零件号(SupplierPartCode) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartDto.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartDto.cs index 01f51c2..1f0438f 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartDto.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartDto.cs @@ -5,6 +5,9 @@ using Win_in.Sfs.Scp.WebApi.Domain.Shared; namespace Win_in.Sfs.Scp.WebApi.SupplierParts { + /// + /// ӦDTO(Supplier part DTO) + /// public class SupplierPartDTO : EntityDtoBase { /// @@ -42,5 +45,17 @@ namespace Win_in.Sfs.Scp.WebApi.SupplierParts /// [Display(Name = "ע(Remark)")] public string Remark { get; set; } + + /// + /// ص(Site) + /// + [Display(Name = "ص(Site)")] + public string Site { get; set; } + + /// + /// ˾(Company) + /// + [Display(Name = "˾(Company)")] + public string Company { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartUpdateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartUpdateDTO.cs index 3409697..8776f33 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartUpdateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartUpdateDTO.cs @@ -1,9 +1,18 @@ +using System.ComponentModel.DataAnnotations; using Win_in.Sfs.Scp.WebApi.SupplierParts; namespace Win_in.Sfs.Scp.WebApi.SupplierParts { + /// + /// ӦDTO(Supplier Part Update DTO) + /// public class SupplierPartUpdateDTO : SupplierPartCreateOrUpdateDTOBase { - + /// + /// ʱ(Concurrency Stamp) + /// + [Display(Name = "ʱ(Concurrency Stamp)")] + public string ConcurrencyStamp { get; set; } + } } diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/ISupplierAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/ISupplierAppService.cs index bb2bb35..5ce00d8 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/ISupplierAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/ISupplierAppService.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Scp.WebApi.Suppliers; namespace Win_in.Sfs.Scp.WebApi.Supplierss { - public interface ISupplierAppService : ICrudAppService + public interface ISupplierAppService : ICrudAppService { } diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateDTO.cs index f9a6c13..791ed60 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateDTO.cs @@ -1,7 +1,22 @@ +using System.ComponentModel.DataAnnotations; + namespace Win_in.Sfs.Scp.WebApi.Suppliers { + /// + /// ӦDTO(Supplier create DTO) + /// public class SupplierCreateDTO : SupplierCreateOrUpdateDTOBase { - + /// + /// (Code) + /// + [Display(Name = "(Code)")] + public string Code { set; get; } + + /// + /// ˾(Company) + /// + [Display(Name = "˾(Company)")] + public string Company { set; get; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs index 9a25433..d2e9dc7 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs @@ -7,11 +7,7 @@ namespace Win_in.Sfs.Scp.WebApi.Suppliers { public abstract class SupplierCreateOrUpdateDTOBase : EntityDtoBase { - /// - /// 代码(Code) - /// - [Display(Name = "代码(Code)")] - public string Code { set; get; } + /// /// 简称(Name) @@ -85,12 +81,6 @@ namespace Win_in.Sfs.Scp.WebApi.Suppliers [Display(Name = "是否激活(IsActive)")] public bool IsActive { set; get; } - /// - /// 公司(Company) - /// - [Display(Name = "公司(Company)")] - public string Company { set; get; } - /// /// 备注(Remark) /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs index 967f82a..fa07498 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs @@ -5,6 +5,9 @@ using Win_in.Sfs.Scp.WebApi.Domain.Shared; namespace Win_in.Sfs.Scp.WebApi.Suppliers { + /// + /// 供应商DTO(Supplier DTO) + /// public class SupplierDTO : EntityDtoBase { /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierUpdateDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierUpdateDTO.cs index 3a7cccb..515ae1f 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierUpdateDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierUpdateDTO.cs @@ -1,7 +1,18 @@ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities; + namespace Win_in.Sfs.Scp.WebApi.Suppliers { - public class SupplierUpdateDTO : SupplierCreateOrUpdateDTOBase + /// + /// Ӧ̸DTO(Supplier update DTO) + /// + public class SupplierUpdateDTO : SupplierCreateOrUpdateDTOBase, IHasConcurrencyStamp { - + /// + /// ʱ(Concurrency Stamp) + /// + [Display(Name = "ʱ(Concurrency Stamp)")] + public string ConcurrencyStamp { get; set; } } } diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/AbpPractice.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SwaggerGroupConsts.cs similarity index 100% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/AbpPractice.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SwaggerGroupConsts.cs diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.csproj b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.csproj index f28c42f..fb4d60a 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.csproj +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.csproj @@ -11,6 +11,12 @@ ..\..\host\Win_in.Sfs.Scp.WebApi.HttpApi.Host\bin\Debug\net5.0\Win_in.Sfs.Scp.WebApi.Application.Contracts.xml + + + + + + diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.xml b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.xml index 23771eb..95d274c 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.xml +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.xml @@ -66,7 +66,7 @@ - 产品类(productline) + 产品类(Product line) @@ -76,7 +76,7 @@ - 种类(catalog) + 种类(Catalog) @@ -106,27 +106,27 @@ - 工程变革(Eco) + 工程变更通知单(Engineering change order) - 标包计量单位(StdPackUom) + 标包计量单位(Standard Pack Uom) - 标包数量(StdPackQty) + 标包数量(Standard Pack Qty) - 替代计量单位(ExtPackUom) + 替代计量单位(Extra Pack UM) - 替代包装数量(ExtPackQty) + 替代包装数量(Extra Pack Qty) @@ -191,7 +191,7 @@ - 产品类(productline) + 产品类(Product line) @@ -201,7 +201,7 @@ - 种类(catalog) + 种类(Catalog) @@ -231,27 +231,27 @@ - 工程变革(Eco) + 工程变更通知单(Engineering change order) - 标包计量单位(StdPackUom) + 标包计量单位(Standard Pack Uom) - 标包数量(StdPackQty) + 标包数量(Standard Pack Qty) - 替代计量单位(ExtPackUom) + 替代计量单位(Extra Pack UM) - 替代包装数量(ExtPackQty) + 替代包装数量(Extra Pack Qty) @@ -391,12 +391,12 @@ - 标包计量单位(StdPackUom) + 标包计量单位(Standard Pack Uom) - 标包数量(StdPackQty) + 标包数量(Standard Pack Qty) @@ -549,9 +549,9 @@ 仓库(Warehouse) - + - 收货口(WarehouseDoor) + 收货口(WarehouseDock) @@ -559,9 +559,9 @@ 时间窗口开始(TimeWindowBegin) - + - 时间窗口结束(TimeWIndowEnd) + 时间窗口结束(TimeWindowEnd) @@ -589,19 +589,19 @@ 零件号(PartCode) - + - 批次(Batch) + 批次(Lot) - + - 供应商批次(SupplierBatch) + 供应商批次(SupplierLot) - + - 生产日期(ProduceDate) + 生产日期(ProductionDate) @@ -621,12 +621,12 @@ - 标包计量单位(StdPackUom) + 标包计量单位(Standard Pack Uom) - 标包数量(StdPackQty) + 标包数量(Standard Pack Qty) @@ -684,9 +684,9 @@ 仓库(Warehouse) - + - 收货口(WarehouseDoor) + 收货口(WarehouseDock) @@ -694,9 +694,9 @@ 时间窗口开始(TimeWindowBegin) - + - 时间窗口结束(TimeWIndowEnd) + 时间窗口结束(TimeWindowEnd) @@ -724,19 +724,19 @@ 零件号(PartCode) - + - 批次(Batch) + 批次(Lot) - + - 供应商批次(SupplierBatch) + 供应商批次(SupplierLot) - + - 生产日期(ProduceDate) + 生产日期(ProductionDate) @@ -756,12 +756,12 @@ - 标包计量单位(StdPackUom) + 标包计量单位(Standard Pack Uom) - 标包数量(StdPackQty) + 标包数量(Standard Pack Qty) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNAppService.cs index 15d35e7..bc4a612 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNAppService.cs @@ -1,6 +1,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Dynamic.Core; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; @@ -12,9 +15,9 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs /// 发货单服务 /// [AllowAnonymous] - [Route("api/SCP/ASN")] + [Route("api/scp/asn")] [ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)] - public class ASNAppService:CrudAppService, IASNAppService + public class ASNAppService:CrudAppService, IASNAppService { private readonly IASNRepository _asnRepository; @@ -24,9 +27,9 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs } /// - ///获取一条数据 (Get a piece of data) + /// 按ID获取发货单(Get ASN by ID) /// - /// + /// 唯一ID(unique ID) /// [HttpGet] [Route("{id}")] @@ -37,66 +40,103 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs /// - ///获取数据列表 (Get data list) + /// 按条件获取发货单列表 (Get ASN list by request condition) /// - /// + /// /// [HttpGet] [Route("")] - public override Task> GetListAsync(InputDTO input) + public override Task> GetListAsync(RequestDTO requestDTO) { - return base.GetListAsync(input); + return base.GetListAsync(requestDTO); } /// - ///获取数据列表 (Get data list) + /// 获取未读ASN列表 (Get unread ASN list) /// - /// - /// + /// 未读ASN列表 (Unread ASN list) [HttpGet] - [Route("GetISReadListAsync")] - public Task> GetDataAsync(bool isRead) + [Route("UnreadList")] + public async Task> GetUnreadListAsync() { - return GetDataAsync(isRead); + var unreadList =await _asnRepository.Where(p => p.IsRead == false).ToDynamicListAsync(); + var dtoList = ObjectMapper.Map, List>(unreadList); + return new ListResultDto(dtoList); } /// - /// 新增实体 （Create New entity） + /// 新增发货单（Create New ASN） /// /// [HttpPost] [Route("")] - public override Task CreateAsync(ASNCreateDTO input) + public override Task CreateAsync(ASNCreateDTO asnCreateDTO) { - return base.CreateAsync(input); + return base.CreateAsync(asnCreateDTO); } /// - /// 修改实体 (Modify entity) + /// 修改发货单 (Modify ASN) /// + /// 唯一ID(unique ID) /// [HttpPut] [Route("{id}")] - public override Task UpdateAsync(Guid id, ASNUpdateDTO input) + public override Task UpdateAsync(Guid id, ASNUpdateDTO asnUpdateDTO) { - return base.UpdateAsync(id, input); + return base.UpdateAsync(id, asnUpdateDTO); } /// - /// 修改实体已读状态 (Modify entity read status) + /// 修改ANS读取状态为已读 (Modify isRead status of ASN to true ) /// - /// - [HttpPut] - [Route("UpdateISReadAsync")] - public Task UpdateISReadAsync(Guid id, bool isRead) + /// 唯一ID(unique ID) + /// ASN + [HttpPost] + [Route("Read")] + public async Task ReadAsync(Guid id) { - return UpdateISReadAsync(id, isRead); + var asn = await _asnRepository.GetAsync(id); + if (asn == null) + { + return null; + } + var dto = await UpdateAsnIsReadAsync(asn,true); + return dto; + } + + private async Task UpdateAsnIsReadAsync(ASN asn,bool isRead) + { + + asn.IsRead = isRead; + var result = await _asnRepository.UpdateAsync(asn); + var dto = ObjectMapper.Map(result); + return dto; } /// - /// 删除实体 (Delete entity) + /// 修改ANS读取状态为未读 (Modify isRead status of ASN to false ) + /// + /// 唯一ID(unique ID) + /// ASN + [HttpPost] + [Route("Unread")] + public async Task UnreadAsync(Guid id) + { + var asn = await _asnRepository.GetAsync(id); + if (asn == null) + { + return null; + } + var dto = await UpdateAsnIsReadAsync(asn, false); + return dto; + } + + + /// + /// 删除发货单 (Delete ASN) /// - /// ID + /// 唯一ID(unique ID) /// 无 [HttpDelete] [Route("{id}")] diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNLabelAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Labels/LabelAppService.cs similarity index 99% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNLabelAppService.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Labels/LabelAppService.cs index 6ad2db9..73ebb31 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNLabelAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Labels/LabelAppService.cs @@ -10,6 +10,7 @@ using Win_in.Sfs.Scp.WebApi.ASNs; namespace Win_in.Sfs.Scp.WebApi.ASNs { + /* /// ///零件服务 /// @@ -85,4 +86,5 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs return base.DeleteAsync(id); } } +*/ } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/POs/POAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/POs/POAppService.cs index cc50a39..e895123 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/POs/POAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/POs/POAppService.cs @@ -12,9 +12,9 @@ namespace Win_in.Sfs.Scp.WebApi.POs /// 采购订单服务 /// [AllowAnonymous] - [Route("api/SCP/PO")] + [Route("api/scp/po")] [ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)] - public class POAppService : CrudAppService, IPOAppService + public class POAppService : CrudAppService, IPOAppService { private readonly IPORepository _partRepository; @@ -25,9 +25,9 @@ namespace Win_in.Sfs.Scp.WebApi.POs /// - ///获取一条数据 (Get a piece of data) + /// 按ID获取采购订单 (Get purchase order by ID) /// - /// + /// 唯一ID(unique ID) /// [HttpGet] [Route("{id}")] @@ -38,44 +38,45 @@ namespace Win_in.Sfs.Scp.WebApi.POs /// - ///获取数据列表 (Get data list) + /// 按条件获取采购订单列表 (Get purchase order list by request condition) /// - /// + /// 请求条件DTO(Request condition DTO) /// [HttpGet] [Route("")] - public override Task> GetListAsync(InputDTO input) + public override Task> GetListAsync(RequestDTO requestDTO) { - return base.GetListAsync(input); + return base.GetListAsync(requestDTO); } /// - /// 新增实体 （Create New entity） + /// 新增采购订单（Create New purchase order） /// /// [HttpPost] [Route("")] - public override Task CreateAsync(POCreateDTO input) + public override Task CreateAsync(POCreateDTO poCreateDTO) { - return base.CreateAsync(input); + return base.CreateAsync(poCreateDTO); } /// - /// 修改实体 (Modify entity) + /// 按ID修改采购订单 (Modify purchase order by ID) /// + /// 唯一ID(unique ID) /// [HttpPut] [Route("{id}")] - public override Task UpdateAsync(Guid id, POUpdateDTO input) + public override Task UpdateAsync(Guid id, POUpdateDTO poUpdateDTO) { - return base.UpdateAsync(id, input); + return base.UpdateAsync(id, poUpdateDTO); } /// - /// 删除实体 (Delete entity) + /// 按ID删除采购订单 (Delete purchase order by ID) /// - /// ID + /// 唯一ID(unique ID) /// 无 [HttpDelete] [Route("{id}")] diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs index 94ba31f..aa5f18c 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs @@ -11,13 +11,13 @@ using Win_in.Sfs.Scp.WebApi.ASNs; namespace Win_in.Sfs.Scp.WebApi.Parts { /// - ///零件服务 + /// 零件服务 /// [AllowAnonymous] - [Route("api/SCP/Part")] + [Route("api/scp/Part")] [ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)] - public class PartAppService : CrudAppService, IPartAppService + public class PartAppService : CrudAppService, IPartAppService { private readonly IPartRepository _partRepository; @@ -27,9 +27,9 @@ namespace Win_in.Sfs.Scp.WebApi.Parts } /// - ///获取一条数据 (Get a piece of data) + /// 按ID获取零件 (Get part by ID) /// - /// + /// 唯一ID(unique ID) /// [HttpGet] [Route("{id}")] @@ -40,43 +40,44 @@ namespace Win_in.Sfs.Scp.WebApi.Parts /// - ///获取数据列表 (Get data list) + /// 按条件获取零件列表 (Get part list by request condition) /// - /// + /// 请求条件DTO(Request condition DTO) /// [HttpGet] [Route("")] - public override Task> GetListAsync(InputDTO input) + public override Task> GetListAsync(RequestDTO requestDTO) { - return base.GetListAsync(input); + return base.GetListAsync(requestDTO); } /// - /// 新增实体 （Create New entity） + /// 新增零件（Create New part） /// /// [HttpPost] [Route("")] - public override Task CreateAsync(PartCreateDTO input) + public override Task CreateAsync(PartCreateDTO partCreateDTO) { - return base.CreateAsync(input); + return base.CreateAsync(partCreateDTO); } /// - /// 修改实体 (Modify entity) + /// 按ID修改零件 (Modify part by ID) /// + /// 唯一ID(unique ID) /// [HttpPut] [Route("{id}")] - public override Task UpdateAsync(Guid id, PartUpdateDTO input) + public override Task UpdateAsync(Guid id, PartUpdateDTO partUpdateDTO) { - return base.UpdateAsync(id, input); + return base.UpdateAsync(id, partUpdateDTO); } /// - /// 删除实体 (Delete entity) + /// 按ID删除实体 (Delete part by ID) /// - /// ID + /// 唯一ID(unique ID) /// 无 [HttpDelete] [Route("{id}")] diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs index 97175b9..1036960 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs @@ -9,12 +9,12 @@ using Volo.Abp.Application.Services; namespace Win_in.Sfs.Scp.WebApi.Receipts { /// - ///零件服务 + /// 收货单服务 /// [AllowAnonymous] - [Route("api/SCP/Receipt")] + [Route("api/scp/receipt")] [ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)] - public class ReceiptAppService : CrudAppService, IReceiptAppService + public class ReceiptAppService : CrudAppService, IReceiptAppService { private readonly IReceiptRepository _partRepository; @@ -25,9 +25,9 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts /// - ///获取一条数据 (Get a piece of data) + /// 按ID获取收货单 (Get receipt by ID) /// - /// + /// 唯一ID(unique ID) /// [HttpGet] [Route("{id}")] @@ -38,45 +38,46 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts /// - ///获取数据列表 (Get data list) + /// 按请求条件获取收货单列表(Get receipt list by request condition) /// - /// + /// 请求条件DTO(Request condition DTO) /// [HttpGet] [Route("")] - public override Task> GetListAsync(InputDTO input) + public override Task> GetListAsync(RequestDTO requestDTO) { - return base.GetListAsync(input); + return base.GetListAsync(requestDTO); } /// - /// 新增实体 （Create New entity） + /// 新增收货单(Create receipt) /// + /// /// [HttpPost] [Route("")] - public override Task CreateAsync(ReceiptCreateDTO input) + public override Task CreateAsync(ReceiptCreateDTO receiptCreateDTO) { - return base.CreateAsync(input); + return base.CreateAsync(receiptCreateDTO); } - /// - /// 修改实体 (Modify entity) + /// 按ID修改收货单(Update receipt by ID) /// + /// 唯一ID(unique ID) + /// /// - [HttpPut] [Route("{id}")] - public override Task UpdateAsync(Guid id, ReceiptUpdateDTO input) + public override Task UpdateAsync(Guid id, ReceiptUpdateDTO receiptUpdateDTO) { - return base.UpdateAsync(id, input); + return base.UpdateAsync(id, receiptUpdateDTO); } /// - /// 删除实体 (Delete entity) + /// 按ID删除收货单(Delete receipt by ID) /// - /// ID + /// 唯一ID(unique ID) /// 无 [HttpDelete] [Route("{id}")] diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Samples/SampleAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Samples/SampleAppService.cs deleted file mode 100644 index b74196f..0000000 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Samples/SampleAppService.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Win_in.Sfs.Scp.WebApi.Samples -{ - [ApiExplorerSettings(GroupName = SwaggerGroupConsts.Default)] - public class SampleAppService : WebApiAppService, ISampleAppService - { - public Task GetAsync() - { - return Task.FromResult( - new SampleDto - { - Value = 42 - } - ); - } - - [Authorize] - public Task GetAuthorizedAsync() - { - return Task.FromResult( - new SampleDto - { - Value = 42 - } - ); - } - } -} \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/SupplierParts/SupplierPartAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/SupplierParts/SupplierPartAppService.cs index 85e9faf..3c3cbdb 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/SupplierParts/SupplierPartAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/SupplierParts/SupplierPartAppService.cs @@ -10,12 +10,12 @@ using Win_in.Sfs.Scp.WebApi.Application.Contracts.SupplierParts; namespace Win_in.Sfs.Scp.WebApi.SupplierParts { /// - ///零件服务 + /// 供应商零件服务 /// [AllowAnonymous] - [Route("api/SCP/SupplierPart")] + [Route("api/scp/supplier-part")] [ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)] - public class SupplierPartAppService : CrudAppService, ISupplierPartAppService + public class SupplierPartAppService : CrudAppService, ISupplierPartAppService { private readonly ISupplierPartRepository _partRepository; @@ -25,9 +25,9 @@ namespace Win_in.Sfs.Scp.WebApi.SupplierParts } /// - ///获取一条数据 (Get a piece of data) + /// 按ID获取供应商零件 (Get supplier part by Id) /// - /// + /// 唯一ID(unique ID) /// [HttpGet] [Route("{id}")] @@ -38,45 +38,47 @@ namespace Win_in.Sfs.Scp.WebApi.SupplierParts /// - ///获取数据列表 (Get data list) + /// 按请求条件获取供应商零件列表 (Get supplier part by request condition) /// - /// + /// /// [HttpGet] [Route("")] - public override Task> GetListAsync(InputDTO input) + public override Task> GetListAsync(RequestDTO requestDTO) { - return base.GetListAsync(input); + return base.GetListAsync(requestDTO); } /// - /// 新增实体 （Create New entity） + /// 新增供应商零件(Create supplier part) /// + /// /// [HttpPost] [Route("")] - public override Task CreateAsync(SupplierPartCreateDTO input) + public override Task CreateAsync(SupplierPartCreateDTO supplierPartCreateDTO) { - return base.CreateAsync(input); + return base.CreateAsync(supplierPartCreateDTO); } /// - /// 修改实体 (Modify entity) + /// 按ID更新供应商零件(Update supplier part by ID) /// + /// 唯一ID(unique ID) + /// /// - [HttpPut] [Route("{id}")] - public override Task UpdateAsync(Guid id, SupplierPartUpdateDTO input) + public override Task UpdateAsync(Guid id, SupplierPartUpdateDTO supplierPartUpdateDTO) { - return base.UpdateAsync(id, input); + return base.UpdateAsync(id, supplierPartUpdateDTO); } /// - /// 删除实体 (Delete entity) + /// 按ID删除供应商零件(Delete supplier part by ID) /// - /// ID + /// 唯一ID(unique ID) /// 无 [HttpDelete] [Route("{id}")] diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs index 1edfd5a..0818388 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs @@ -10,12 +10,12 @@ using Win_in.Sfs.Scp.WebApi.Suppliers; namespace Win_in.Sfs.Scp.WebApi.Supplierss { /// - ///零件服务 + /// 供应商服务 /// [AllowAnonymous] - [Route("api/SCP/Supplier")] + [Route("api/scp/supplier")] [ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)] - public class SuppliersAppService : CrudAppService, ISupplierAppService + public class SuppliersAppService : CrudAppService, ISupplierAppService { private readonly ISupplierRepository _partRepository; @@ -26,9 +26,9 @@ namespace Win_in.Sfs.Scp.WebApi.Supplierss /// - ///获取一条数据 (Get a piece of data) + /// 按ID获取供应商 (Get supplier by Id) /// - /// + /// 唯一ID(unique ID) /// [HttpGet] [Route("{id}")] @@ -39,46 +39,48 @@ namespace Win_in.Sfs.Scp.WebApi.Supplierss /// - ///获取数据列表 (Get data list) + /// 按条件获取供应商列表(Get Supplier list by request condition) /// - /// + /// 请求条件DTO(Request condition DTO) /// [HttpGet] [Route("")] - public override Task> GetListAsync(InputDTO input) + public override Task> GetListAsync(RequestDTO requestDTO) { - return base.GetListAsync(input); + return base.GetListAsync(requestDTO); } /// - /// 新增实体 （Create New entity） + /// 新增供应商 （Create New supplier） /// - /// + /// + /// 供应商DTO(Supplier DTO) [HttpPost] [Route("")] - public override Task CreateAsync(SupplierCreateDTO input) + public override Task CreateAsync(SupplierCreateDTO supplierCreateDTO) { - return base.CreateAsync(input); + return base.CreateAsync(supplierCreateDTO); } /// - /// 修改实体 (Modify entity) + /// 按ID修改供应商 (Modify supplier by id) /// - /// - + /// 唯一ID(unique ID) + /// 新的供应商DTO(new supplier DTO) + /// 供应商DTO(Supplier DTO) [HttpPut] [Route("{id}")] - public override Task UpdateAsync(Guid id, SupplierUpdateDTO input) + public override Task UpdateAsync(Guid id, SupplierUpdateDTO supplierUpdateDTO) { - return base.UpdateAsync(id, input); + return base.UpdateAsync(id, supplierUpdateDTO); } /// - /// 删除实体 (Delete entity) + /// 按ID删除供应商 (Delete supplier by id) /// - /// ID - /// 无 + /// 唯一ID(unique ID) + /// 无(void) [HttpDelete] [Route("{id}")] public override Task DeleteAsync(Guid id) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Win_in.Sfs.Scp.WebApi.Application.csproj b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Win_in.Sfs.Scp.WebApi.Application.csproj index 0c12590..badfc2f 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Win_in.Sfs.Scp.WebApi.Application.csproj +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Win_in.Sfs.Scp.WebApi.Application.csproj @@ -11,6 +11,12 @@ ..\..\host\Win_in.Sfs.Scp.WebApi.HttpApi.Host\bin\Debug\net5.0\Win_in.Sfs.Scp.WebApi.Application.xml + + + + + + diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASN.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASN.cs index 3cb4855..7f6e0c3 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASN.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASN.cs @@ -75,16 +75,16 @@ namespace Win_in.Sfs.Scp.WebApi public string WarehouseDock { set; get; } /// - /// 时间窗口开始(Time window Begin) + /// 时间窗口开始(Time Window Begin) /// [Display(Name = "时间窗口开始(TimeWindowBegin)")] public DateTime TimeWindowBegin { set; get; } /// - /// 时间窗口结束(Time window End) + /// 时间窗口结束(Time Window End) /// - [Display(Name = "时间窗口结束(TimeWIndowEnd)")] - public DateTime TimeWIndowEnd { set; get; } + [Display(Name = "时间窗口结束(TimeWindowEnd)")] + public DateTime TimeWindowEnd { set; get; } /// /// 地点(Site) @@ -95,8 +95,8 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 公司(IAC company code) /// - [Display(Name = "公司(Comapnay)")] - public string Comapnay { set; get; } + [Display(Name = "公司(Company)")] + public string Company { set; get; } /// /// 备注(Remark) @@ -105,10 +105,10 @@ namespace Win_in.Sfs.Scp.WebApi public string Remark { set; get; } /// - /// 是否已读(IsrRead) + /// 是否已读(IsRead) /// - [Display(Name = "是否已读(IsrRead)")] - public bool IsrRead { set; get; } + [Display(Name = "是否已读(IsRead)")] + public bool IsRead { set; get; } public virtual List ASNDetails { get; set; } @@ -125,8 +125,8 @@ namespace Win_in.Sfs.Scp.WebApi throw new Exception(detail.PoNumber + detail.PoLine + "已经在明细中存在！"); } - ASNDetails.Add(new ASNDetail(guidGenerator.Create(), detail.AsnNumber, detail.PoNumber, detail.PoLine, detail.PartCode, detail.Lot, detail.Supplierlot, detail.ProduceDate, - detail.Uom, detail.DeliverQty, detail.StdPackUom, detail.StdPackQty, detail.SupplierPackUom,detail.SupplierPackQty,detail.SupplierPackConvertRate, detail.LabelCode,detail.BarCode,detail.PalletLabelnumber)); + ASNDetails.Add(new ASNDetail(guidGenerator.Create(), detail.AsnNumber, detail.PoNumber, detail.PoLine, detail.PartCode, detail.Lot, detail.SupplierLot, detail.ProductionDate, + detail.Uom, detail.DeliverQty, detail.StdPackUom, detail.StdPackQty, detail.SupplierPackUom,detail.SupplierPackQty,detail.SupplierPackConvertRate, detail.LabelCode,detail.BarCode,detail.PalletLabelCode)); } diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNDetail.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNDetail.cs index 8b381cd..4e17d5f 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNDetail.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNDetail.cs @@ -43,14 +43,14 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 供应商批次(Supplier Lot) /// - [Display(Name = "供应商批次(Supplierlot)")] - public string Supplierlot { set; get; } + [Display(Name = "供应商批次(SupplierLot)")] + public string SupplierLot { set; get; } /// /// 生产日期(Produce Date) /// - [Display(Name = "生产日期(ProduceDate)")] - public DateTime ProduceDate { set; get; } + [Display(Name = "生产日期(ProductionDate)")] + public DateTime ProductionDate { set; get; } /// /// 计量单位(Unit of measure) @@ -67,13 +67,13 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 标包计量单位(standard package um) /// - [Display(Name = "标包计量单位(StdPackUom)")] + [Display(Name = "标包计量单位(Standard Pack Uom)")] public string StdPackUom { set; get; } /// - /// 标包数量(standard package quantiy) + /// 标包数量(standard package quantity) /// - [Display(Name = "标包数量(StdPackQty)")] + [Display(Name = "标包数量(Standard Pack Qty)")] public decimal StdPackQty { set; get; } /// @@ -107,25 +107,25 @@ namespace Win_in.Sfs.Scp.WebApi public string BarCode { set; get; } /// - /// 托标签号(PalletLabelnumber) + /// 托标签号(PalletLabelCode) /// - [Display(Name = "托标签号(PalletLabelnumber)")] - public string PalletLabelnumber { set; get; } + [Display(Name = "托标签号(PalletLabelCode)")] + public string PalletLabelCode { set; get; } public ASNDetail() { } public ASNDetail( - Guid id, string asnNumber,string poNumber, string poLine, string partCode, string lot, string supplierlot, DateTime produceDate, string uom,decimal deliverQty, - string stdPackUom, decimal stdPackQty, string supplierPackUom, decimal supplierPackQty, decimal supplierPackConvertRate,string labelCode,string barCode,string palletLabelnumber) : base(id) + Guid id, string asnNumber,string poNumber, string poLine, string partCode, string lot, string SupplierLot, DateTime ProductionDate, string uom,decimal deliverQty, + string stdPackUom, decimal stdPackQty, string supplierPackUom, decimal supplierPackQty, decimal supplierPackConvertRate,string labelCode,string barCode,string PalletLabelCode) : base(id) { AsnNumber = asnNumber; PoNumber = poNumber; PoLine = poLine; PartCode = partCode; Lot = lot; - Supplierlot = supplierlot; - ProduceDate = produceDate; + SupplierLot = SupplierLot; + ProductionDate = ProductionDate; Uom = uom; DeliverQty = deliverQty; StdPackUom = stdPackUom; @@ -135,7 +135,7 @@ namespace Win_in.Sfs.Scp.WebApi SupplierPackConvertRate = supplierPackConvertRate; LabelCode = labelCode; BarCode = barCode; - PalletLabelnumber = palletLabelnumber; + PalletLabelCode = PalletLabelCode; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/IASNLabelRepository.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/ILabelRepository.cs similarity index 58% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/IASNLabelRepository.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/ILabelRepository.cs index 58d8ed3..95ed166 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/IASNLabelRepository.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/ILabelRepository.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Repositories; namespace Win_in.Sfs.Scp.WebApi { - public interface IASNLabelRepository : IRepository + public interface ILabelRepository : IRepository { } diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNLabel.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/Label.cs similarity index 89% rename from ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNLabel.cs rename to ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/Label.cs index fbe5b73..433ba60 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNLabel.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/Label.cs @@ -8,7 +8,7 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 标签表 /// - public class ASNLabel:EntityBase + public class Label:EntityBase { /// /// 标签代码(Label code) @@ -17,7 +17,7 @@ namespace Win_in.Sfs.Scp.WebApi public string LabelCode { get;set;} /// - /// 完整条码数据(Barcode barcode) + /// 完整条码数据(Full Barcode string) /// [Display(Name = "完整条码数据(Barcode)")] public string Barcode { get;set;} @@ -61,13 +61,13 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 标包计量单位(Package UM) /// - [Display(Name = "标包计量单位(StdPackUom)")] + [Display(Name = "标包计量单位(Standard Pack Uom)")] public string StdPackUom { get;set;} /// /// 标包数量(Package quantity) /// - [Display(Name = "标包数量(StdPackQty)")] + [Display(Name = "标包数量(Standard Pack Qty)")] public decimal StdPackQty { get;set;} /// @@ -115,14 +115,14 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 生产日期(Produce Date) /// - [Display(Name = "生产日期(ProduceDate)")] - public DateTime ProduceDate { get;set;} + [Display(Name = "生产日期(ProductionDate)")] + public DateTime ProductionDate { get;set;} /// /// 托标签号(Pallet label number) /// - [Display(Name = "托标签号(PalletLabelnumber)")] - public decimal PalletLabelnumber { get;set;} + [Display(Name = "托标签号(PalletLabelCode)")] + public decimal PalletLabelCode { get;set;} /// /// 地点(site) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs index 4a49739..a10f552 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs @@ -41,15 +41,22 @@ namespace Win_in.Sfs.Scp.WebApi public decimal? OrderQty { set; get; } /// - /// 标包计量单位(StdPackUom) + /// 已关闭数量(Closed Qty) /// - [Display(Name = "标包计量单位(StdPackUom)")] + [Display(Name = "已关闭数量(Closed Qty)")] + public decimal ClosedQty { get; set; } + + + /// + /// 标包计量单位(Standard Pack Uom) + /// + [Display(Name = "标包计量单位(Standard Pack Uom)")] public string StdPackUom { set; get; } /// - /// 标包数量(StdPackQty) + /// 标包数量(Standard Pack Qty) /// - [Display(Name = "标包数量(StdPackQty)")] + [Display(Name = "标包数量(Standard Pack Qty)")] public decimal? StdPackQty { set; get; } /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs index bfbb7a1..9c76bd7 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs @@ -41,16 +41,16 @@ namespace Win_in.Sfs.Scp.WebApi public string Status {get;set;} /// - /// 制造件(IsMakePart) + /// 制造件(Can make) /// [Display(Name = "制造件")] - public bool IsMakePart {get;set;} + public bool CanMake {get;set;} /// - /// 采购件(IsBuyPart) + /// 采购件(Can buy) /// [Display(Name = "采购件")] - public bool IsBuyPart {get;set;} + public bool CanBuy {get;set;} /// /// 计量单位(Uom) @@ -62,13 +62,13 @@ namespace Win_in.Sfs.Scp.WebApi /// ABC类(abcClass) /// [Display(Name = "ABC类")] - public string abcClass {get;set;} + public string AbcClass {get;set;} /// - /// 产品类(productline) + /// 产品类(Product line) /// [Display(Name = "产品类")] - public string productline {get;set;} + public string ProductLine {get;set;} /// /// 类型(Type) @@ -77,10 +77,10 @@ namespace Win_in.Sfs.Scp.WebApi public string Type {get;set;} /// - /// 种类(catalog) + /// 种类(Catalog) /// - [Display(Name = "代码")] - public string catalog {get;set;} + [Display(Name = "种类")] + public string Catalog {get;set;} /// /// 分组(Group) @@ -113,31 +113,31 @@ namespace Win_in.Sfs.Scp.WebApi //public string version {get;set;} /// - /// 工程变革(Eco) + /// 工程变更通知单(Engineering change order) /// - [Display(Name = "工程变革")] + [Display(Name = "工程变更通知单")] public string Eco {get;set;} /// - /// 标包计量单位(StdPackUom) + /// 标包计量单位(Standard Pack Uom) /// [Display(Name = "标包计量单位")] public string StdPackUom {get;set;} /// - /// 标包数量(StdPackQty) + /// 标包数量(Standard Pack Qty) /// [Display(Name = "标包数量")] public decimal StdPackQty {get;set;} /// - /// 替代计量单位(ExtPackUom) + /// 替代计量单位(Extra Pack UM) /// [Display(Name = "替代计量单位")] public string ExtPackUom {get;set;} /// - /// 替代包装数量(ExtPackQty) + /// 替代包装数量(Extra Pack Qty) /// [Display(Name = "替代包装数量")] public decimal ExtPackQty {get;set;} diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs index 73527ee..d471ec6 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs @@ -11,9 +11,9 @@ namespace Win_in.Sfs.Scp.WebApi public class Receipt: EntityBase { /// - /// 发货单号(RcNumber) + /// 收货单号(RcNumber) /// - [Display(Name = "发货单号(RcNumber)")] + [Display(Name = "收货单号(RcNumber)")] public string RcNumber { set; get; } /// @@ -53,10 +53,10 @@ namespace Win_in.Sfs.Scp.WebApi public string Warehouse { set; get; } /// - /// 收货口(WarehouseDoor) + /// 收货口(WarehouseDock) /// - [Display(Name = "收货口(WarehouseDoor)")] - public string WarehouseDoor { set; get; } + [Display(Name = "收货口(WarehouseDock)")] + public string WarehouseDock { set; get; } /// /// 时间窗口开始(TimeWindowBegin) @@ -65,10 +65,10 @@ namespace Win_in.Sfs.Scp.WebApi public DateTime TimeWindowBegin { set; get; } /// - /// 时间窗口结束(TimeWIndowEnd) + /// 时间窗口结束(TimeWindowEnd) /// - [Display(Name = "时间窗口结束(TimeWIndowEnd)")] - public DateTime TimeWIndowEnd { set; get; } + [Display(Name = "时间窗口结束(TimeWindowEnd)")] + public DateTime TimeWindowEnd { set; get; } /// /// 收货时间(ReceiveTime) @@ -101,22 +101,22 @@ namespace Win_in.Sfs.Scp.WebApi public string PartCode { set; get; } /// - /// 批次(Batch) + /// 批次(Lot) /// - [Display(Name = "批次(Batch)")] - public string Batch { set; get; } + [Display(Name = "批次(Lot)")] + public string Lot { set; get; } /// - /// 供应商批次(SupplierBatch) + /// 供应商批次(SupplierLot) /// - [Display(Name = "供应商批次(SupplierBatch)")] - public string SupplierBatch { set; get; } + [Display(Name = "供应商批次(SupplierLot)")] + public string SupplierLot { set; get; } /// - /// 生产日期(ProduceDate) + /// 生产日期(ProductionDate) /// - [Display(Name = "生产日期(ProduceDate)")] - public DateTime ProduceDate { set; get; } + [Display(Name = "生产日期(ProductionDate)")] + public DateTime ProductionDate { set; get; } /// /// 计量单位(Uom) @@ -137,15 +137,15 @@ namespace Win_in.Sfs.Scp.WebApi public decimal ReceiveQty { set; get; } /// - /// 标包计量单位(StdPackUom) + /// 标包计量单位(Standard Pack Uom) /// - [Display(Name = "标包计量单位(StdPackUom)")] + [Display(Name = "标包计量单位(Standard Pack Uom)")] public string StdPackUom { set; get; } /// - /// 标包数量(StdPackQty) + /// 标包数量(Standard Pack Qty) /// - [Display(Name = "标包数量(StdPackQty)")] + [Display(Name = "标包数量(Standard Pack Qty)")] public decimal StdPackQty { set; get; } /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/SupplierParts/SupplierPart.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/SupplierParts/SupplierPart.cs index 8441f63..d550ae2 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/SupplierParts/SupplierPart.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/SupplierParts/SupplierPart.cs @@ -45,5 +45,17 @@ namespace Win_in.Sfs.Scp.WebApi /// [Display(Name = "备注(Remark)")] public string Remark { get; set; } + + /// + /// 地点(Site) + /// + [Display(Name = "地点")] + public string Site { get; set; } + + /// + /// 公司(Company) + /// + [Display(Name = "公司")] + public string Company { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs index 97d5e55..ef32df7 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs @@ -49,7 +49,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore builder.ConfigPODetail(options); builder.ConfigASN(options); builder.ConfigASNDetail(options); - builder.ConfigASNLabel(options); + builder.ConfigLabel(options); } /// @@ -71,13 +71,13 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(x => x.Desc1).HasMaxLength(1024); b.Property(x => x.Desc2).HasMaxLength(1024); b.Property(x => x.Status).IsRequired().HasMaxLength(64); - b.Property(x => x.IsMakePart).IsRequired(); - b.Property(x => x.IsBuyPart).IsRequired(); + b.Property(x => x.CanMake).IsRequired(); + b.Property(x => x.CanBuy).IsRequired(); b.Property(x => x.Uom).IsRequired().HasMaxLength(64); - b.Property(x => x.abcClass).IsRequired().HasMaxLength(64); - b.Property(x => x.productline).HasMaxLength(64); + b.Property(x => x.AbcClass).IsRequired().HasMaxLength(64); + b.Property(x => x.ProductLine).HasMaxLength(64); b.Property(x => x.Type).HasMaxLength(64); - b.Property(x => x.catalog).HasMaxLength(64); + b.Property(x => x.Catalog).HasMaxLength(64); b.Property(x => x.Group).HasMaxLength(64); b.Property(x => x.Color).HasMaxLength(64); b.Property(x => x.Configuration).HasMaxLength(64); @@ -92,7 +92,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(x => x.Site).IsRequired().HasMaxLength(64); b.Property(x => x.Company).IsRequired().HasMaxLength(64); - b.HasIndex(x => new { x.Code }).IsUnique(); + b.HasIndex(x => new { x.Code,x.Company,x.Site }).IsUnique(); }); } @@ -127,7 +127,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(x => x.Version).HasMaxLength(64); b.Property(x => x.SequenceNumber).HasMaxLength(64); - b.HasIndex(q => q.CreationTime); + b.HasIndex(q => new {q.Code, q.Company}).IsUnique(); }); } @@ -152,7 +152,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(x => x.Version).HasMaxLength(64); b.Property(x => x.SequenceNumber).HasMaxLength(64); - b.HasIndex(x => new { x.SupplierCode,x.PartCode }).IsUnique(); + b.HasIndex(x => new { x.SupplierCode,x.PartCode,x.Company,x.Site }).IsUnique(); }); } @@ -175,17 +175,17 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(q => q.SupplierCode).IsRequired().HasMaxLength(64); b.Property(q => q.RcType).IsRequired().HasMaxLength(64); b.Property(q => q.Warehouse).IsRequired().HasMaxLength(64); - b.Property(q => q.WarehouseDoor).IsRequired().HasMaxLength(64); + b.Property(q => q.WarehouseDock).IsRequired().HasMaxLength(64); b.Property(q => q.TimeWindowBegin).IsRequired(); - b.Property(q => q.TimeWIndowEnd).IsRequired(); + b.Property(q => q.TimeWindowEnd).IsRequired(); b.Property(q => q.ReceiveTime).IsRequired(); b.Property(q => q.Site).IsRequired().HasMaxLength(64); b.Property(q => q.Company).IsRequired().HasMaxLength(64); b.Property(q => q.PoLine).IsRequired().HasMaxLength(64); b.Property(q => q.PartCode).IsRequired().HasMaxLength(64); - b.Property(q => q.Batch).IsRequired().HasMaxLength(64); - b.Property(q => q.SupplierBatch).IsRequired().HasMaxLength(64); - b.Property(q => q.ProduceDate).IsRequired(); + b.Property(q => q.Lot).IsRequired().HasMaxLength(64); + b.Property(q => q.SupplierLot).IsRequired().HasMaxLength(64); + b.Property(q => q.ProductionDate).IsRequired(); b.Property(q => q.Uom).IsRequired().HasMaxLength(64); b.Property(q => q.DeliverQty).IsRequired(); b.Property(q => q.ReceiveQty).IsRequired(); @@ -198,7 +198,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(x => x.Version).HasMaxLength(64); b.Property(x => x.SequenceNumber).HasMaxLength(64); - b.HasIndex(x => new { x.RcNumber,x.PoLine,x.PartCode }).IsUnique(); + b.HasIndex(x => new { x.RcNumber,x.PoLine,x.PartCode,x.Company,x.Site }).IsUnique(); }); } @@ -234,7 +234,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.HasMany(u => u.PODetails).WithOne().HasForeignKey(rd => rd.Id).OnDelete(DeleteBehavior.NoAction).IsRequired(); - b.HasIndex(x => new { x.PoNumber }).IsUnique(); + b.HasIndex(x => new { x.PoNumber,x.Company,x.Site }).IsUnique(); }); } @@ -293,18 +293,18 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(q => q.Warehouse).IsRequired(); b.Property(q => q.WarehouseDock).IsRequired().HasMaxLength(64); b.Property(q => q.TimeWindowBegin).IsRequired(); - b.Property(q => q.TimeWIndowEnd).IsRequired(); + b.Property(q => q.TimeWindowEnd).IsRequired(); b.Property(q => q.Site).IsRequired().HasMaxLength(64); - b.Property(q => q.Comapnay).IsRequired().HasMaxLength(64); + b.Property(q => q.Company).IsRequired().HasMaxLength(64); b.Property(q => q.Remark).HasMaxLength(4096); b.Property(x => x.Version).HasMaxLength(64); b.Property(x => x.SequenceNumber).HasMaxLength(64); - b.Property(x => x.IsrRead).IsRequired(); ; + b.Property(x => x.IsRead).IsRequired(); ; b.HasMany(u => u.ASNDetails).WithOne().HasForeignKey(rd => rd.Id).OnDelete(DeleteBehavior.NoAction).IsRequired(); - b.HasIndex(x => new { x.AsnNumber }).IsUnique(); + b.HasIndex(x => new { x.AsnNumber,x.Company,x.Site }).IsUnique(); }); } @@ -325,8 +325,8 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(q => q.PoLine).HasMaxLength(64); b.Property(q => q.PartCode).IsRequired().HasMaxLength(64); b.Property(q => q.Lot).IsRequired().HasMaxLength(64); - b.Property(q => q.Supplierlot).IsRequired().HasMaxLength(64); - b.Property(q => q.ProduceDate).IsRequired(); + b.Property(q => q.SupplierLot).IsRequired().HasMaxLength(64); + b.Property(q => q.ProductionDate).IsRequired(); b.Property(q => q.Uom).IsRequired().HasMaxLength(64); b.Property(q => q.DeliverQty).IsRequired(); b.Property(q => q.StdPackUom).IsRequired().HasMaxLength(64); @@ -336,7 +336,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(q => q.SupplierPackConvertRate).IsRequired(); b.Property(q => q.LabelCode).HasMaxLength(64); b.Property(q => q.BarCode).HasMaxLength(4096); - b.Property(q => q.PalletLabelnumber).HasMaxLength(64); + b.Property(q => q.PalletLabelCode).HasMaxLength(64); b.Property(x => x.Version).HasMaxLength(64); b.HasIndex(x => new { x.AsnNumber, x.PartCode }).IsUnique(); @@ -346,12 +346,12 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore /// /// 发货单标签表 /// - private static void ConfigASNLabel(this ModelBuilder builder, WebApiModelBuilderConfigurationOptions options) + private static void ConfigLabel(this ModelBuilder builder, WebApiModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity