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 b397cc8..4b0a8df 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 @@ -100,6 +100,12 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs [Display(Name = "备注(Remark)")] public string Remark { set; get; } + /// + /// 是否已读(IsrRead) + /// + [Display(Name = "是否已读(IsrRead)")] + public bool IsrRead { set; get; } + public virtual ICollection ASNDetails { get; set; } } 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 9c09280..c806dee 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 @@ -100,6 +100,12 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs [Display(Name = "备注(Remark)")] public string Remark { set; get; } + /// + /// 是否已读(IsrRead) + /// + [Display(Name = "是否已读(IsrRead)")] + public bool IsrRead { set; get; } + public virtual ICollection ASNDetails { get; set; } } 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 4478d8f..b59544e 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 @@ -95,9 +95,21 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs public decimal SupplierPackConvertRate { set; get; } /// - /// 备注(Remark) + /// 标签代码(LabelCode) /// - [Display(Name = "备注(Remark)")] - public string Remark { set; get; } + [Display(Name = "标签代码(LabelCode)")] + public string LabelCode { set; get; } + + /// + /// 完整条码数据(BarCode) + /// + [Display(Name = "完整条码数据(BarCode)")] + public string BarCode { set; get; } + + /// + /// 托标签号(PalletLabelnumber) + /// + [Display(Name = "托标签号(PalletLabelnumber)")] + public string PalletLabelnumber { set; get; } } } \ 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 e13bd46..2f79a4e 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 @@ -1,10 +1,13 @@ using System; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; namespace Win_in.Sfs.Scp.WebApi.ASNs { public interface IASNAppService:ICrudAppService { - + Task> GetDataAsync(bool isRead); + Task UpdateISReadAsync(Guid id,bool isRead); } } \ 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 1e6c3f5..6f8f25e 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 @@ -53,12 +53,6 @@ namespace Win_in.Sfs.Scp.WebApi.POs [Display(Name = "截止日期(DueDate)")] public DateTime DueDate { set; get; } - /// - /// 版本(Version) - /// - [Display(Name = "版本(Version)")] - public string Version { set; get; } - /// /// 税率(TaxRate) /// 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 5dbbecd..ddee34f 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 @@ -54,12 +54,6 @@ namespace Win_in.Sfs.Scp.WebApi.POs [Display(Name = "截止日期(DueDate)")] public DateTime DueDate { set; get; } - /// - /// 版本(Version) - /// - [Display(Name = "版本(Version)")] - public string Version { set; get; } - /// /// 税率(TaxRate) /// 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 f5b9bdd..15d35e7 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 @@ -39,7 +39,7 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs /// ///获取数据列表 (Get data list) /// - /// + /// /// [HttpGet] [Route("")] @@ -48,6 +48,17 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs return base.GetListAsync(input); } + /// + ///获取数据列表 (Get data list) + /// + /// + /// + [HttpGet] + [Route("GetISReadListAsync")] + public Task> GetDataAsync(bool isRead) + { + return GetDataAsync(isRead); + } /// /// 新增实体 （Create New entity） @@ -71,6 +82,17 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs return base.UpdateAsync(id, input); } + /// + /// 修改实体已读状态 (Modify entity read status) + /// + /// + [HttpPut] + [Route("UpdateISReadAsync")] + public Task UpdateISReadAsync(Guid id, bool isRead) + { + return UpdateISReadAsync(id, isRead); + } + /// /// 删除实体 (Delete entity) /// diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNLabelAppService.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNLabelAppService.cs index ae080ff..6ad2db9 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNLabelAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNLabelAppService.cs @@ -15,7 +15,7 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs /// [AllowAnonymous] [Route("api/SCP/ASNLabel")] - [ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)] + [ApiExplorerSettings(GroupName = SwaggerGroupConsts.Default)] public class ASNLabelAppService : CrudAppService, IASNLabelAppService { @@ -42,7 +42,7 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs /// ///获取数据列表 (Get data list) /// - /// + /// /// [HttpGet] [Route("")] 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 d1fc2d9..cc50a39 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 @@ -40,7 +40,7 @@ namespace Win_in.Sfs.Scp.WebApi.POs /// ///获取数据列表 (Get data list) /// - /// + /// /// [HttpGet] [Route("")] 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 75f0355..94ba31f 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 @@ -42,7 +42,7 @@ namespace Win_in.Sfs.Scp.WebApi.Parts /// ///获取数据列表 (Get data list) /// - /// + /// /// [HttpGet] [Route("")] 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 ce73e65..97175b9 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 @@ -40,7 +40,7 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts /// ///获取数据列表 (Get data list) /// - /// + /// /// [HttpGet] [Route("")] 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 index bd09f69..b74196f 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Samples/SampleAppService.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Samples/SampleAppService.cs @@ -1,8 +1,10 @@ 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() 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 a3d5463..85e9faf 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 @@ -40,7 +40,7 @@ namespace Win_in.Sfs.Scp.WebApi.SupplierParts /// ///获取数据列表 (Get data list) /// - /// + /// /// [HttpGet] [Route("")] 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 0ce1fe2..1edfd5a 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 @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Scp.WebApi.Supplierss /// ///获取数据列表 (Get data list) /// - /// + /// /// [HttpGet] [Route("")] 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 05b0cb0..3cb4855 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 @@ -104,6 +104,12 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "备注(Remark)")] public string Remark { set; get; } + /// + /// 是否已读(IsrRead) + /// + [Display(Name = "是否已读(IsrRead)")] + public bool IsrRead { set; get; } + public virtual List ASNDetails { get; set; } @@ -120,7 +126,7 @@ namespace Win_in.Sfs.Scp.WebApi } 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.Remark)); + detail.Uom, detail.DeliverQty, detail.StdPackUom, detail.StdPackQty, detail.SupplierPackUom,detail.SupplierPackQty,detail.SupplierPackConvertRate, detail.LabelCode,detail.BarCode,detail.PalletLabelnumber)); } 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 5e93369..8b381cd 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 @@ -95,17 +95,29 @@ namespace Win_in.Sfs.Scp.WebApi public decimal SupplierPackConvertRate { set; get; } /// - /// 备注(Remark) + /// 标签代码(LabelCode) /// - [Display(Name = "备注(Remark)")] - public string Remark { set; get; } + [Display(Name = "标签代码(LabelCode)")] + public string LabelCode { set; get; } + + /// + /// 完整条码数据(BarCode) + /// + [Display(Name = "完整条码数据(BarCode)")] + public string BarCode { set; get; } + + /// + /// 托标签号(PalletLabelnumber) + /// + [Display(Name = "托标签号(PalletLabelnumber)")] + public string PalletLabelnumber { 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 remark) : base(id) + 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) { AsnNumber = asnNumber; PoNumber = poNumber; @@ -121,7 +133,9 @@ namespace Win_in.Sfs.Scp.WebApi SupplierPackUom = supplierPackUom; SupplierPackQty = supplierPackQty; SupplierPackConvertRate = supplierPackConvertRate; - Remark = remark; + LabelCode = labelCode; + BarCode = barCode; + PalletLabelnumber = palletLabelnumber; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs index d3bc4b6..ea1f14a 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs @@ -56,12 +56,6 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "截止日期(DueDate)")] public DateTime DueDate { set; get; } - /// - /// 版本(Version) - /// - [Display(Name = "版本(Version)")] - public string Version { set; get; } - /// /// 税率(TaxRate) /// 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 64b6a96..97d5e55 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 @@ -299,6 +299,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore 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.HasMany(u => u.ASNDetails).WithOne().HasForeignKey(rd => rd.Id).OnDelete(DeleteBehavior.NoAction).IsRequired(); @@ -333,7 +334,9 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(q => q.SupplierPackUom).IsRequired().HasMaxLength(64); b.Property(q => q.SupplierPackQty).IsRequired(); b.Property(q => q.SupplierPackConvertRate).IsRequired(); - b.Property(q => q.Remark).HasMaxLength(4096); + b.Property(q => q.LabelCode).HasMaxLength(64); + b.Property(q => q.BarCode).HasMaxLength(4096); + b.Property(q => q.PalletLabelnumber).HasMaxLength(64); b.Property(x => x.Version).HasMaxLength(64); b.HasIndex(x => new { x.AsnNumber, x.PartCode }).IsUnique();