Browse Source

[fix]BUG修复

master
贾荣国 3 years ago
parent
commit
3bc5c31278
  1. 10
      ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.Designer.cs
  2. 10
      ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.cs
  3. 10
      ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021081413_20211021002.Designer.cs
  4. 10
      ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/WebApiHttpApiHostMigrationsDbContextModelSnapshot.cs
  5. 43
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateDTO.cs
  6. 61
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateOrUpdateDTOBase.cs
  7. 31
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDTO.cs
  8. 30
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDetailsDTO.cs
  9. 12
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNUpdateDTO.cs
  10. 7
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/IASNAppService.cs
  11. 9
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/InputDTO.cs
  12. 0
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelCreateDTO.cs
  13. 0
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelCreateOrUpdateDTOBase.cs
  14. 0
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelDTO.cs
  15. 0
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelUpdateDTO.cs
  16. 0
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/IASNLabelAppService.cs
  17. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/IPOAppService.cs
  18. 28
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateDTO.cs
  19. 23
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs
  20. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs
  21. 19
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs
  22. 9
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POUpdateDTO.cs
  23. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/IPartAppService.cs
  24. 14
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateDTO.cs
  25. 46
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs
  26. 46
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs
  27. 11
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartUpdateDTO.cs
  28. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/IReceiptAppService.cs
  29. 68
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateDTO.cs
  30. 96
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs
  31. 51
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs
  32. 9
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptUpdateDTO.cs
  33. 12
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/RequestDTO.cs
  34. 12
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/ISampleAppService.cs
  35. 7
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/SampleDto.cs
  36. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/ISupplierPartAppService.cs
  37. 28
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateDTO.cs
  38. 11
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartCreateOrUpdateDTOBase.cs
  39. 15
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartDto.cs
  40. 9
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SupplierParts/SupplierPartUpdateDTO.cs
  41. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/ISupplierAppService.cs
  42. 15
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateDTO.cs
  43. 12
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs
  44. 3
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs
  45. 15
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierUpdateDTO.cs
  46. 0
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SwaggerGroupConsts.cs
  47. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.csproj
  48. 80
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.xml
  49. 96
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNAppService.cs
  50. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Labels/LabelAppService.cs
  51. 33
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/POs/POAppService.cs
  52. 35
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs
  53. 39
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs
  54. 31
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Samples/SampleAppService.cs
  55. 38
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/SupplierParts/SupplierPartAppService.cs
  56. 44
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs
  57. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Win_in.Sfs.Scp.WebApi.Application.csproj
  58. 22
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASN.cs
  59. 30
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNDetail.cs
  60. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/ILabelRepository.cs
  61. 16
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/Label.cs
  62. 15
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs
  63. 32
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs
  64. 42
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs
  65. 12
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/SupplierParts/SupplierPart.cs
  66. 58
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs
  67. 34
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi/Samples/SampleController.cs
  68. 30
      ScpWebApiService/test/Win_in.Sfs.Scp.WebApi.Application.Tests/Samples/SampleAppService_Tests.cs

10
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<string>("Batch")
b.Property<string>("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<DateTime>("ProduceDate")
b.Property<DateTime>("ProductionDate")
.HasColumnType("datetime2");
b.Property<string>("RcNumber")
@ -494,7 +494,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("SupplierBatch")
b.Property<string>("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<DateTime>("TimeWIndowEnd")
b.Property<DateTime>("TimeWindowEnd")
.HasColumnType("datetime2");
b.Property<DateTime>("TimeWindowBegin")
@ -531,7 +531,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("WarehouseDoor")
b.Property<string>("WarehouseDock")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");

10
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<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
RcType = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
Warehouse = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
WarehouseDoor = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
WarehouseDock = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
TimeWindowBegin = table.Column<DateTime>(type: "datetime2", nullable: false),
TimeWIndowEnd = table.Column<DateTime>(type: "datetime2", nullable: false),
TimeWindowEnd = table.Column<DateTime>(type: "datetime2", nullable: false),
ReceiveTime = table.Column<DateTime>(type: "datetime2", nullable: false),
Site = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
Company = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
PoLine = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
PartCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
Batch = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
SupplierBatch = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
ProduceDate = table.Column<DateTime>(type: "datetime2", nullable: false),
Lot = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
SupplierLot = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
ProductionDate = table.Column<DateTime>(type: "datetime2", nullable: false),
Uom = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
DeliverQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
ReceiveQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),

10
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<string>("Batch")
b.Property<string>("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<DateTime>("ProduceDate")
b.Property<DateTime>("ProductionDate")
.HasColumnType("datetime2");
b.Property<string>("RcNumber")
@ -473,7 +473,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("SupplierBatch")
b.Property<string>("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<DateTime>("TimeWIndowEnd")
b.Property<DateTime>("TimeWindowEnd")
.HasColumnType("datetime2");
b.Property<DateTime>("TimeWindowBegin")
@ -514,7 +514,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("WarehouseDoor")
b.Property<string>("WarehouseDock")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");

10
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<string>("Batch")
b.Property<string>("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<DateTime>("ProduceDate")
b.Property<DateTime>("ProductionDate")
.HasColumnType("datetime2");
b.Property<string>("RcNumber")
@ -471,7 +471,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("SupplierBatch")
b.Property<string>("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<DateTime>("TimeWIndowEnd")
b.Property<DateTime>("TimeWindowEnd")
.HasColumnType("datetime2");
b.Property<DateTime>("TimeWindowBegin")
@ -512,7 +512,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("WarehouseDoor")
b.Property<string>("WarehouseDock")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");

43
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
{
/// <summary>
/// 发货单新增DTO(ASN Create DTO)
/// </summary>
public class ASNCreateDTO : ASNCreateOrUpdateDTOBase
{
/// <summary>
/// 发货单号(ASN Number)
/// </summary>
[Display(Name = "发货单号(AsnNumber)")]
public string AsnNumber { set; get; }
/// <summary>
/// 要货计划单号(Request Plan Number)
/// </summary>
[Display(Name = "要货计划单号(RpNumber)")]
public string RpNumber { set; get; }
/// <summary>
/// 订单号(Purchase order number)
/// </summary>
[Display(Name = "订单号(PoNumber)")]
public string PoNumber { set; get; }
/// <summary>
/// 供应商代码(Supplier code)
/// </summary>
[Display(Name = "供应商代码(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点(Site)")]
public string Site { set; get; }
/// <summary>
/// 公司(IAC company code)
/// </summary>
[Display(Name = "公司(Company)")]
public string Company { set; get; }
}
}

61
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
{
/// <summary>
/// 发货单创建更新基础Dto
/// </summary>
public abstract class ASNCreateOrUpdateDTOBase : EntityDto<Guid>
public abstract class ASNCreateOrUpdateDTOBase : EntityDto<Guid>,IHasExtraProperties
{
/// <summary>
/// 发货单号(ASN Number)
/// </summary>
[Display(Name = "发货单号(AsnNumber)")]
public string AsnNumber { set; get; }
/// <summary>
/// 要货计划单号(Request Plan Number)
/// </summary>
[Display(Name = "要货计划单号(RpNumber)")]
public string RpNumber { set; get; }
/// <summary>
/// 订单号(Purchase order number)
/// </summary>
[Display(Name = "订单号(PoNumber)")]
public string PoNumber { set; get; }
/// <summary>
/// 供应商代码(Supplier code)
/// </summary>
[Display(Name = "供应商代码(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 状态(Status)
@ -71,28 +49,16 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
public string WarehouseDock { set; get; }
/// <summary>
/// 时间窗口开始(Time window Begin)
/// 时间窗口开始(Time Window Begin)
/// </summary>
[Display(Name = "时间窗口开始(TimeWindowBegin)")]
public DateTime TimeWindowBegin { set; get; }
/// <summary>
/// 时间窗口结束(Time window End)
/// 时间窗口结束(Time Window End)
/// </summary>
[Display(Name = "时间窗口结束(TimeWIndowEnd)")]
public DateTime TimeWIndowEnd { set; get; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点(Site)")]
public string Site { set; get; }
/// <summary>
/// 公司(IAC company code)
/// </summary>
[Display(Name = "公司(Comapnay)")]
public string Comapnay { set; get; }
[Display(Name = "时间窗口结束(TimeWindowEnd)")]
public DateTime TimeWindowEnd { set; get; }
/// <summary>
/// 备注(Remark)
@ -101,12 +67,19 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
public string Remark { set; get; }
/// <summary>
/// 是否已读(IsrRead)
/// 是否已读(IsRead)
/// </summary>
[Display(Name = "是否已读(IsrRead)")]
public bool IsrRead { set; get; }
[Display(Name = "是否已读(IsRead)")]
public bool IsRead { set; get; }
public virtual ICollection<ASNDetailsDTO> Details { get; set; }
/// <summary>
/// 扩展属性(Extra Properties)
/// </summary>
[Display(Name = "扩展属性(Extra Properties)")]
public ExtraPropertyDictionary ExtraProperties { get; set; }
public virtual ICollection<ASNDetailsDTO> ASNDetails { get; set; }
}
}

31
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
{
/// <summary>
/// 发货单主表DTO
/// 发货单DTO(ASN DTO)
/// </summary>
public class ASNDTO : AuditedEntityDto<Guid>
public class ASNDTO : AuditedEntityDto<Guid>,IHasExtraProperties
{
/// <summary>
/// 发货单号(ASN Number)
@ -71,16 +72,16 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
public string WarehouseDock { set; get; }
/// <summary>
/// 时间窗口开始(Time window Begin)
/// 时间窗口开始(Time Window Begin)
/// </summary>
[Display(Name = "时间窗口开始(TimeWindowBegin)")]
public DateTime TimeWindowBegin { set; get; }
/// <summary>
/// 时间窗口结束(Time window End)
/// 时间窗口结束(Time Window End)
/// </summary>
[Display(Name = "时间窗口结束(TimeWIndowEnd)")]
public DateTime TimeWIndowEnd { set; get; }
[Display(Name = "时间窗口结束(TimeWindowEnd)")]
public DateTime TimeWindowEnd { set; get; }
/// <summary>
/// 地点(Site)
@ -91,8 +92,8 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
/// <summary>
/// 公司(IAC company code)
/// </summary>
[Display(Name = "公司(Comapnay)")]
public string Comapnay { set; get; }
[Display(Name = "公司(Company)")]
public string Company { set; get; }
/// <summary>
/// 备注(Remark)
@ -101,12 +102,18 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
public string Remark { set; get; }
/// <summary>
/// 是否已读(IsrRead)
/// 是否已读(IsRead)
/// </summary>
[Display(Name = "是否已读(IsrRead)")]
public bool IsrRead { set; get; }
[Display(Name = "是否已读(IsRead)")]
public bool IsRead { set; get; }
public virtual ICollection<ASNDetailsDTO> ASNDetails { get; set; }
public virtual ICollection<ASNDetailsDTO> Details { get; set; }
/// <summary>
/// 扩展属性(Extra Properties)
/// </summary>
[Display(Name = "扩展属性(Extra Properties)")]
public ExtraPropertyDictionary ExtraProperties { get; set; }
}
}

30
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
{
/// <summary>
/// 发货单明细表DTO
/// 发货单明细DTO(ASN Detail DTO)
/// </summary>
public class ASNDetailsDTO : AuditedEntityDto<Guid>
public class ASNDetailsDTO : AuditedEntityDto<Guid>, IHasExtraProperties
{
/// <summary>
/// 发货单号(ASN Number)
@ -43,14 +44,14 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
/// <summary>
/// 供应商批次(Supplier Lot)
/// </summary>
[Display(Name = "供应商批次(Supplierlot)")]
public string Supplierlot { set; get; }
[Display(Name = "供应商批次(SupplierLot)")]
public string SupplierLot { set; get; }
/// <summary>
/// 生产日期(Produce Date)
/// </summary>
[Display(Name = "生产日期(ProduceDate)")]
public DateTime ProduceDate { set; get; }
[Display(Name = "生产日期(ProductionDate)")]
public DateTime ProductionDate { set; get; }
/// <summary>
/// 计量单位(Unit of measure)
@ -67,13 +68,13 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
/// <summary>
/// 标包计量单位(standard package um)
/// </summary>
[Display(Name = "标包计量单位(StdPackUom)")]
[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; }
/// <summary>
/// 标包数量(standard package quantiy)
/// 标包数量(standard package quantity)
/// </summary>
[Display(Name = "标包数量(StdPackQty)")]
[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; }
/// <summary>
@ -107,9 +108,14 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
public string BarCode { set; get; }
/// <summary>
/// 托标签号(PalletLabelnumber)
/// 托标签号(PalletLabelCode)
/// </summary>
[Display(Name = "托标签号(PalletLabelnumber)")]
public string PalletLabelnumber { set; get; }
[Display(Name = "托标签号(PalletLabelCode)")]
public string PalletLabelCode { set; get; }
/// <summary>
/// 扩展属性(Extra Properties)
/// </summary>
[Display(Name = "扩展属性(Extra Properties)")]
public ExtraPropertyDictionary ExtraProperties { get; set; }
}
}

12
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
{
/// <summary>
/// 发货单更新DTO(ASN update DTO)
/// </summary>
public class ASNUpdateDTO : ASNCreateOrUpdateDTOBase
{
/// <summary>
/// 并发时间戳(Concurrency Stamp)
/// </summary>
[Display(Name = "并发时间戳(Concurrency Stamp)")]
public string ConcurrencyStamp { get; set; }
}
}

7
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<ASNDTO,Guid,InputDTO,ASNCreateDTO, ASNUpdateDTO>
public interface IASNAppService:ICrudAppService<ASNDTO,Guid,RequestDTO,ASNCreateDTO, ASNUpdateDTO>
{
Task<PagedResultDto<ASNDTO>> GetDataAsync(bool isRead);
Task<ASNDTO> UpdateISReadAsync(Guid id,bool isRead);
Task<ListResultDto<ASNDTO>> GetUnreadListAsync();
Task<ASNDTO> ReadAsync(Guid id);
Task<ASNDTO> UnreadAsync(Guid id);
}
}

9
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/InputDTO.cs

@ -1,9 +0,0 @@
using Volo.Abp.Application.Dtos;
namespace Win_in.Sfs.Scp.WebApi
{
public class InputDTO:EntityDto
{
}
}

0
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelCreateDTO.cs → ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelCreateDTO.cs

0
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelCreateOrUpdateDTOBase.cs → ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelCreateOrUpdateDTOBase.cs

0
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelDTO.cs → ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelDTO.cs

0
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNLabelUpdateDTO.cs → ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/ASNLabelUpdateDTO.cs

0
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/IASNLabelAppService.cs → ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Labels/IASNLabelAppService.cs

2
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/IPOAppService.cs

@ -9,7 +9,7 @@ namespace Win_in.Sfs.Scp.WebApi.POs
/// <summary>
/// PO接口
/// </summary>
public interface IPOAppService : ICrudAppService<PODTO, Guid, InputDTO, POCreateDTO, POUpdateDTO>
public interface IPOAppService : ICrudAppService<PODTO, Guid, RequestDTO, POCreateDTO, POUpdateDTO>
{
}

28
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
{
/// <summary>
/// 采购订单创建Dto
/// 采购订单新增DTO(Purchase order create DTO)
/// </summary>
public class POCreateDTO : POCreateOrUpdateDTOBase
{
/// <summary>
/// 订单号(PoNumber)
/// </summary>
[Display(Name = "订单号(PoNumber)")]
public string PoNumber { set; get; }
/// <summary>
/// 供应商代码(SupplierCode)
/// </summary>
[Display(Name = "供应商代码(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点(Site)")]
public string Site { set; get; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司(Company)")]
public string Company { set; get; }
}
}

23
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs

@ -11,17 +11,6 @@ namespace Win_in.Sfs.Scp.WebApi.POs
/// </summary>
public abstract class POCreateOrUpdateDTOBase : EntityDtoBase<Guid>
{
/// <summary>
/// 订单号(PoNumber)
/// </summary>
[Display(Name = "订单号(PoNumber)")]
public string PoNumber { set; get; }
/// <summary>
/// 供应商代码(SupplierCode)
/// </summary>
[Display(Name = "供应商代码(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 订单类型(PoType)
@ -59,18 +48,6 @@ namespace Win_in.Sfs.Scp.WebApi.POs
[Display(Name = "税率(TaxRate)")]
public decimal TaxRate { set; get; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点(Site)")]
public string Site { set; get; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司(Company)")]
public string Company { set; get; }
/// <summary>
/// 联系人(ContactName)
/// </summary>

2
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
{
/// <summary>
/// 采购订单主表Dto
/// 采购订单DTO(Purchase order DTO)
/// </summary>
public class PODTO : EntityDtoBase<Guid>
{

19
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
{
/// <summary>
/// 采购订单明细表Dto
/// 采购订单明细DTO(Purchase order detail DTO)
/// </summary>
public class PODetailDTO : EntityDetailBase<Guid>
{
@ -35,21 +35,28 @@ namespace Win_in.Sfs.Scp.WebApi.POs
public string Uom { set; get; }
/// <summary>
/// 订单数量(OrderQty)
/// 订单数量(Order Qty)
/// </summary>
[Display(Name = "订单数量(OrderQty)")]
public decimal OrderQty { set; get; }
/// <summary>
/// 已关闭数量(Closed Qty)
/// </summary>
[Display(Name = "已关闭数量(Closed Qty)")]
public decimal ClosedQty { get; set; }
/// <summary>
/// 标包计量单位(StdPackUom)
/// 标包计量单位(Standard Pack Uom)
/// </summary>
[Display(Name = "标包计量单位(StdPackUom)")]
[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; }
/// <summary>
/// 标包数量(StdPackQty)
/// 标包数量(Standard Pack Qty)
/// </summary>
[Display(Name = "标包数量(StdPackQty)")]
[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; }
/// <summary>

9
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
{
/// <summary>
/// 采购订单更新Dto
/// 采购订单更新DTO(Purchase order update DTO)
/// </summary>
public class POUpdateDTO : POCreateOrUpdateDTOBase
{
/// <summary>
/// 并发时间戳(Concurrency Stamp)
/// </summary>
[Display(Name = "并发时间戳(Concurrency Stamp)")]
public string ConcurrencyStamp { get; set; }
}
}

2
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/IPartAppService.cs

@ -9,7 +9,7 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
/// <summary>
/// Part接口
/// </summary>
public interface IPartAppService : ICrudAppService<PartDTO, Guid, InputDTO, PartCreateDTO, PartUpdateDTO>
public interface IPartAppService : ICrudAppService<PartDTO, Guid, RequestDTO, PartCreateDTO, PartUpdateDTO>
{

14
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateDTO.cs

@ -3,7 +3,7 @@
namespace Win_in.Sfs.Scp.WebApi.Parts
{
/// <summary>
/// 零件创建Dto
/// 零件新增DTO(Part create DTO)
/// </summary>
public class PartCreateDTO : PartCreateOrUpdateDTOBase
{
@ -12,5 +12,17 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
/// </summary>
[Display(Name = "代码")]
public string Code { get; set; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点")]
public string Site { get; set; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司")]
public string Company { get; set; }
}
}

46
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
/// <summary>
/// 零件创建更新基础Dto
/// </summary>
public abstract class PartCreateOrUpdateDTOBase : EntityDtoBase<Guid>
public abstract class PartCreateOrUpdateDTOBase : EntityDtoBase<Guid>,IHasExtraProperties
{
@ -38,16 +39,16 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
public string Status { get; set; }
/// <summary>
/// 制造件(IsMakePart)
/// 制造件(Can make)
/// </summary>
[Display(Name = "制造件")]
public bool IsMakePart { get; set; }
public bool CanMake { get; set; }
/// <summary>
/// 采购件(IsBuyPart)
/// 采购件(Can buy)
/// </summary>
[Display(Name = "采购件")]
public bool IsBuyPart { get; set; }
public bool CanBuy { get; set; }
/// <summary>
/// 计量单位(Uom)
@ -59,13 +60,13 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
/// ABC类(abcClass)
/// </summary>
[Display(Name = "ABC类")]
public string abcClass { get; set; }
public string AbcClass { get; set; }
/// <summary>
/// 产品类(productline)
/// 产品类(Product line)
/// </summary>
[Display(Name = "产品类")]
public string productline { get; set; }
public string ProductLine { get; set; }
/// <summary>
/// 类型(Type)
@ -74,10 +75,10 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
public string Type { get; set; }
/// <summary>
/// 种类(catalog)
/// 种类(Catalog)
/// </summary>
[Display(Name = "代码")]
public string catalog { get; set; }
[Display(Name = "种类")]
public string Catalog { get; set; }
/// <summary>
/// 分组(Group)
@ -104,45 +105,40 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
public string Project { get; set; }
/// <summary>
/// 工程变革(Eco)
/// 工程变更通知单(Engineering change order)
/// </summary>
[Display(Name = "工程变")]
[Display(Name = "工程变更通知单")]
public string Eco { get; set; }
/// <summary>
/// 标包计量单位(StdPackUom)
/// 标包计量单位(Standard Pack Uom)
/// </summary>
[Display(Name = "标包计量单位")]
public string StdPackUom { get; set; }
/// <summary>
/// 标包数量(StdPackQty)
/// 标包数量(Standard Pack Qty)
/// </summary>
[Display(Name = "标包数量")]
public decimal StdPackQty { get; set; }
/// <summary>
/// 替代计量单位(ExtPackUom)
/// 替代计量单位(Extra Pack UM)
/// </summary>
[Display(Name = "替代计量单位")]
public string ExtPackUom { get; set; }
/// <summary>
/// 替代包装数量(ExtPackQty)
/// 替代包装数量(Extra Pack Qty)
/// </summary>
[Display(Name = "替代包装数量")]
public decimal ExtPackQty { get; set; }
/// <summary>
/// 地点(Site)
/// 扩展属性(Extra Properties)
/// </summary>
[Display(Name = "地点")]
public string Site { get; set; }
[Display(Name = "扩展属性(Extra Properties)")]
public ExtraPropertyDictionary ExtraProperties { get; set; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司")]
public string Company { get; set; }
}
}

46
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
{
/// <summary>
/// 零件Dto
/// 零件DTO(Part DTO)
/// </summary>
public class PartDTO : EntityDtoBase<Guid>
public class PartDTO : EntityDtoBase<Guid>,IHasExtraProperties
{
/// <summary>
@ -42,16 +43,16 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
public string Status { get; set; }
/// <summary>
/// 制造件(IsMakePart)
/// 制造件(Can make)
/// </summary>
[Display(Name = "制造件")]
public bool IsMakePart { get; set; }
public bool CanMake { get; set; }
/// <summary>
/// 采购件(IsBuyPart)
/// 采购件(Can buy)
/// </summary>
[Display(Name = "采购件")]
public bool IsBuyPart { get; set; }
public bool CanBuy { get; set; }
/// <summary>
/// 计量单位(Uom)
@ -60,16 +61,16 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
public string Uom { get; set; }
/// <summary>
/// ABC类(abcClass)
/// ABC类(ABC Class)
/// </summary>
[Display(Name = "ABC类")]
public string abcClass { get; set; }
public string AbcClass { get; set; }
/// <summary>
/// 产品类(productline)
/// 产品类(Product Line)
/// </summary>
[Display(Name = "产品类")]
public string productline { get; set; }
public string ProductLine { get; set; }
/// <summary>
/// 类型(Type)
@ -78,10 +79,10 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
public string Type { get; set; }
/// <summary>
/// 种类(catalog)
/// 种类(Catalog)
/// </summary>
[Display(Name = "代码")]
public string catalog { get; set; }
[Display(Name = "种类")]
public string Catalog { get; set; }
/// <summary>
/// 分组(Group)
@ -108,31 +109,31 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
public string Project { get; set; }
/// <summary>
/// 工程变革(Eco)
/// 工程变更通知单(Engineering change order)
/// </summary>
[Display(Name = "工程变")]
[Display(Name = "工程变更通知单")]
public string Eco { get; set; }
/// <summary>
/// 标包计量单位(StdPackUom)
/// 标包计量单位(Standard Pack Uom)
/// </summary>
[Display(Name = "标包计量单位")]
public string StdPackUom { get; set; }
/// <summary>
/// 标包数量(StdPackQty)
/// 标包数量(Standard Pack Qty)
/// </summary>
[Display(Name = "标包数量")]
public decimal StdPackQty { get; set; }
/// <summary>
/// 替代计量单位(ExtPackUom)
/// 替代计量单位(Extra Pack UM)
/// </summary>
[Display(Name = "替代计量单位")]
public string ExtPackUom { get; set; }
/// <summary>
/// 替代包装数量(ExtPackQty)
/// 替代包装数量(Extra Pack Qty)
/// </summary>
[Display(Name = "替代包装数量")]
public decimal ExtPackQty { get; set; }
@ -148,5 +149,12 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
/// </summary>
[Display(Name = "公司")]
public string Company { get; set; }
/// <summary>
/// 扩展属性(Extra Properties)
/// </summary>
[Display(Name = "扩展属性(Extra Properties)")]
public ExtraPropertyDictionary ExtraProperties { get; set; }
}
}

11
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
{
/// <summary>
/// 零件更新Dto
/// 零件更新DTO(Part update DTO)
/// </summary>
public class PartUpdateDTO : PartCreateOrUpdateDTOBase
{
/// <summary>
/// 并发时间戳(Concurrency Stamp)
/// </summary>
[Display(Name = "并发时间戳(Concurrency Stamp)")]
public string ConcurrencyStamp { get; set; }
}
}

2
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<ReceiptDTO,Guid,InputDTO,ReceiptCreateDTO, ReceiptUpdateDTO>
public interface IReceiptAppService : ICrudAppService<ReceiptDTO,Guid,RequestDTO,ReceiptCreateDTO, ReceiptUpdateDTO>
{
}

68
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
{
/// <summary>
/// 澗새데劤藤DTO(Receipt create DTO)
/// </summary>
public class ReceiptCreateDTO : ReceiptCreateOrUpdateDTOBase
{
/// <summary>
/// 澗새데뵀(RcNumber)
/// </summary>
[Display(Name = "澗새데뵀(RcNumber)")]
public string RcNumber { set; get; }
/// <summary>
/// 랙새데뵀(AsnNumber)
/// </summary>
[Display(Name = "랙새데뵀(AsnNumber)")]
public string AsnNumber { set; get; }
/// <summary>
/// 狼새셕뺍데뵀(RpNumber)
/// </summary>
[Display(Name = "狼새셕뺍데뵀(RpNumber)")]
public string RpNumber { set; get; }
/// <summary>
/// 땐데뵀(PoNumber)
/// </summary>
[Display(Name = "땐데뵀(PoNumber)")]
public string PoNumber { set; get; }
/// <summary>
/// 묩壇�덜쯤(PoNumber)
/// </summary>
[Display(Name = "묩壇�덜쯤(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 澗새데잚謹(RcType)
/// "" :澗새데(Receipts)
/// "R":藁새데(Return Document)
/// </summary>
[Display(Name = "澗새데잚謹(RcType)")]
public string RcType { set; get; }
/// <summary>
/// 뒈듐(Site)
/// </summary>
[Display(Name = "뒈듐(Site)")]
public string Site { set; get; }
/// <summary>
/// 무鱇(Company)
/// </summary>
[Display(Name = "무鱇(Company)")]
public string Company { set; get; }
/// <summary>
/// 땐데契(PoLine)
/// </summary>
[Display(Name = "땐데契(PoLine)")]
public string PoLine { set; get; }
/// <summary>
/// 쥐숭뵀(PartCode)
/// </summary>
[Display(Name = "쥐숭뵀(PartCode)")]
public string PartCode { set; get; }
}
}

96
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<Guid>
{
/// <summary>
/// 发货单号(RcNumber)
/// </summary>
[Display(Name = "发货单号(RcNumber)")]
public string RcNumber { set; get; }
/// <summary>
/// 发货单号(AsnNumber)
/// </summary>
[Display(Name = "发货单号(AsnNumber)")]
public string AsnNumber { set; get; }
/// <summary>
/// 要货计划单号(RpNumber)
/// </summary>
[Display(Name = "要货计划单号(RpNumber)")]
public string RpNumber { set; get; }
/// <summary>
/// 订单号(PoNumber)
/// </summary>
[Display(Name = "订单号(PoNumber)")]
public string PoNumber { set; get; }
/// <summary>
/// 供应商代码(PoNumber)
/// </summary>
[Display(Name = "供应商代码(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 收货单类型(RcType)
/// </summary>
[Display(Name = "收货单类型(RcType)")]
public string RcType { set; get; }
/// <summary>
/// 仓库(Warehouse)
@ -50,10 +16,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public string Warehouse { set; get; }
/// <summary>
/// 收货口(WarehouseDoor)
/// 收货口(WarehouseDock)
/// </summary>
[Display(Name = "收货口(WarehouseDoor)")]
public string WarehouseDoor { set; get; }
[Display(Name = "收货口(WarehouseDock)")]
public string WarehouseDock { set; get; }
/// <summary>
/// 时间窗口开始(TimeWindowBegin)
@ -62,10 +28,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public DateTime TimeWindowBegin { set; get; }
/// <summary>
/// 时间窗口结束(TimeWIndowEnd)
/// 时间窗口结束(TimeWindowEnd)
/// </summary>
[Display(Name = "时间窗口结束(TimeWIndowEnd)")]
public DateTime TimeWIndowEnd { set; get; }
[Display(Name = "时间窗口结束(TimeWindowEnd)")]
public DateTime TimeWindowEnd { set; get; }
/// <summary>
/// 收货时间(ReceiveTime)
@ -74,46 +40,22 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public DateTime ReceiveTime { set; get; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点(Site)")]
public string Site { set; get; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司(Company)")]
public string Company { set; get; }
/// <summary>
/// 订单行(PoLine)
/// </summary>
[Display(Name = "订单行(PoLine)")]
public string PoLine { set; get; }
/// <summary>
/// 零件号(PartCode)
/// </summary>
[Display(Name = "零件号(PartCode)")]
public string PartCode { set; get; }
/// <summary>
/// 批次(Batch)
/// 批次(Lot)
/// </summary>
[Display(Name = "批次(Batch)")]
public string Batch { set; get; }
[Display(Name = "批次(Lot)")]
public string Lot { set; get; }
/// <summary>
/// 供应商批次(SupplierBatch)
/// 供应商批次(SupplierLot)
/// </summary>
[Display(Name = "供应商批次(SupplierBatch)")]
public string SupplierBatch { set; get; }
[Display(Name = "供应商批次(SupplierLot)")]
public string SupplierLot { set; get; }
/// <summary>
/// 生产日期(ProduceDate)
/// 生产日期(ProductionDate)
/// </summary>
[Display(Name = "生产日期(ProduceDate)")]
public DateTime ProduceDate { set; get; }
[Display(Name = "生产日期(ProductionDate)")]
public DateTime ProductionDate { set; get; }
/// <summary>
/// 计量单位(Uom)
@ -134,15 +76,15 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public decimal ReceiveQty { set; get; }
/// <summary>
/// 标包计量单位(StdPackUom)
/// 标包计量单位(Standard Pack Uom)
/// </summary>
[Display(Name = "标包计量单位(StdPackUom)")]
[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; }
/// <summary>
/// 标包数量(StdPackQty)
/// 标包数量(Standard Pack Qty)
/// </summary>
[Display(Name = "标包数量(StdPackQty)")]
[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; }
/// <summary>

51
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
{
/// <summary>
/// 收货单DTO(Receipt DTO)
/// </summary>
public class ReceiptDTO : EntityDtoBase<Guid>
{
/// <summary>
/// 货单号(RcNumber)
/// 货单号(RcNumber)
/// </summary>
[Display(Name = "货单号(RcNumber)")]
[Display(Name = "货单号(RcNumber)")]
public string RcNumber { set; get; }
/// <summary>
@ -37,12 +40,6 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
[Display(Name = "供应商代码(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 收货单类型(RcType)
/// </summary>
[Display(Name = "收货单类型(RcType)")]
public string RcType { set; get; }
/// <summary>
/// 仓库(Warehouse)
/// </summary>
@ -50,10 +47,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public string Warehouse { set; get; }
/// <summary>
/// 收货口(WarehouseDoor)
/// 收货口(WarehouseDock)
/// </summary>
[Display(Name = "收货口(WarehouseDoor)")]
public string WarehouseDoor { set; get; }
[Display(Name = "收货口(WarehouseDock)")]
public string WarehouseDock { set; get; }
/// <summary>
/// 时间窗口开始(TimeWindowBegin)
@ -62,10 +59,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public DateTime TimeWindowBegin { set; get; }
/// <summary>
/// 时间窗口结束(TimeWIndowEnd)
/// 时间窗口结束(TimeWindowEnd)
/// </summary>
[Display(Name = "时间窗口结束(TimeWIndowEnd)")]
public DateTime TimeWIndowEnd { set; get; }
[Display(Name = "时间窗口结束(TimeWindowEnd)")]
public DateTime TimeWindowEnd { set; get; }
/// <summary>
/// 收货时间(ReceiveTime)
@ -98,22 +95,22 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public string PartCode { set; get; }
/// <summary>
/// 批次(Batch)
/// 批次(Lot)
/// </summary>
[Display(Name = "批次(Batch)")]
public string Batch { set; get; }
[Display(Name = "批次(Lot)")]
public string Lot { set; get; }
/// <summary>
/// 供应商批次(SupplierBatch)
/// 供应商批次(SupplierLot)
/// </summary>
[Display(Name = "供应商批次(SupplierBatch)")]
public string SupplierBatch { set; get; }
[Display(Name = "供应商批次(SupplierLot)")]
public string SupplierLot { set; get; }
/// <summary>
/// 生产日期(ProduceDate)
/// 生产日期(ProductionDate)
/// </summary>
[Display(Name = "生产日期(ProduceDate)")]
public DateTime ProduceDate { set; get; }
[Display(Name = "生产日期(ProductionDate)")]
public DateTime ProductionDate { set; get; }
/// <summary>
/// 计量单位(Uom)
@ -134,15 +131,15 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public decimal ReceiveQty { set; get; }
/// <summary>
/// 标包计量单位(StdPackUom)
/// 标包计量单位(Standard Pack Uom)
/// </summary>
[Display(Name = "标包计量单位(StdPackUom)")]
[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; }
/// <summary>
/// 标包数量(StdPackQty)
/// 标包数量(Standard Pack Qty)
/// </summary>
[Display(Name = "标包数量(StdPackQty)")]
[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; }
/// <summary>

9
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
{
/// <summary>
/// 收货单更新DTO(Receipt update DTO)
/// </summary>
public class ReceiptUpdateDTO : ReceiptCreateOrUpdateDTOBase
{
/// <summary>
/// 并发时间戳(Concurrency Stamp)
/// </summary>
[Display(Name = "并发时间戳(Concurrency Stamp)")]
public string ConcurrencyStamp { get; set; }
}
}

12
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
{
/// <summary>
/// 请求条件DTO(Request DTO)
/// </summary>
public class RequestDTO:PagedAndSortedResultRequestDto
{
}
}

12
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/ISampleAppService.cs

@ -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<SampleDto> GetAsync();
Task<SampleDto> GetAuthorizedAsync();
}
}

7
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Samples/SampleDto.cs

@ -1,7 +0,0 @@
namespace Win_in.Sfs.Scp.WebApi.Samples
{
public class SampleDto
{
public int Value { get; set; }
}
}

2
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<SupplierPartDTO,Guid,InputDTO,SupplierPartCreateDTO, SupplierPartUpdateDTO>
public interface ISupplierPartAppService : ICrudAppService<SupplierPartDTO,Guid,RequestDTO,SupplierPartCreateDTO, SupplierPartUpdateDTO>
{
}

28
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
{
/// <summary>
/// 供应商零件新增DTO(Supplier part create DTO)
/// </summary>
public class SupplierPartCreateDTO : SupplierPartCreateOrUpdateDTOBase
{
/// <summary>
/// 供应商代码(SupplierCode)
/// </summary>
[Display(Name = "供应商代码(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 零件号(PartCode)
/// </summary>
[Display(Name = "零件号(PartCode)")]
public string PartCode { set; get; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点")]
public string Site { get; set; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司")]
public string Company { get; set; }
}
}

11
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<Guid>
{
/// <summary>
/// 供应商代码(SupplierCode)
/// </summary>
[Display(Name = "供应商代码(SupplierCode)")]
public string SupplierCode { set; get; }
/// <summary>
/// 零件号(PartCode)
/// </summary>
[Display(Name = "零件号(PartCode)")]
public string PartCode { set; get; }
/// <summary>
/// 供应商零件号(SupplierPartCode)

15
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
{
/// <summary>
/// 供应商零件DTO(Supplier part DTO)
/// </summary>
public class SupplierPartDTO : EntityDtoBase<Guid>
{
/// <summary>
@ -42,5 +45,17 @@ namespace Win_in.Sfs.Scp.WebApi.SupplierParts
/// </summary>
[Display(Name = "±¸×¢(Remark)")]
public string Remark { get; set; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点(Site)")]
public string Site { get; set; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司(Company)")]
public string Company { get; set; }
}
}

9
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
{
/// <summary>
/// 供应商零件更新DTO(Supplier Part Update DTO)
/// </summary>
public class SupplierPartUpdateDTO : SupplierPartCreateOrUpdateDTOBase
{
/// <summary>
/// 并发时间戳(Concurrency Stamp)
/// </summary>
[Display(Name = "并发时间戳(Concurrency Stamp)")]
public string ConcurrencyStamp { get; set; }
}
}

2
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<SupplierDTO,Guid,InputDTO,SupplierCreateDTO, SupplierUpdateDTO>
public interface ISupplierAppService : ICrudAppService<SupplierDTO,Guid,RequestDTO,SupplierCreateDTO, SupplierUpdateDTO>
{
}

15
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
{
/// <summary>
/// 供应商新增DTO(Supplier create DTO)
/// </summary>
public class SupplierCreateDTO : SupplierCreateOrUpdateDTOBase
{
/// <summary>
/// 代码(Code)
/// </summary>
[Display(Name = "代码(Code)")]
public string Code { set; get; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司(Company)")]
public string Company { set; get; }
}
}

12
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<Guid>
{
/// <summary>
/// 代码(Code)
/// </summary>
[Display(Name = "代码(Code)")]
public string Code { set; get; }
/// <summary>
/// 简称(Name)
@ -85,12 +81,6 @@ namespace Win_in.Sfs.Scp.WebApi.Suppliers
[Display(Name = "是否激活(IsActive)")]
public bool IsActive { set; get; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司(Company)")]
public string Company { set; get; }
/// <summary>
/// 备注(Remark)
/// </summary>

3
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
{
/// <summary>
/// 供应商DTO(Supplier DTO)
/// </summary>
public class SupplierDTO : EntityDtoBase<Guid>
{
/// <summary>

15
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
/// <summary>
/// 供应商更新DTO(Supplier update DTO)
/// </summary>
public class SupplierUpdateDTO : SupplierCreateOrUpdateDTOBase, IHasConcurrencyStamp
{
/// <summary>
/// 并发时间戳(Concurrency Stamp)
/// </summary>
[Display(Name = "并发时间戳(Concurrency Stamp)")]
public string ConcurrencyStamp { get; set; }
}
}

0
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/AbpPractice.cs → ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/SwaggerGroupConsts.cs

6
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.csproj

@ -11,6 +11,12 @@
<DocumentationFile>..\..\host\Win_in.Sfs.Scp.WebApi.HttpApi.Host\bin\Debug\net5.0\Win_in.Sfs.Scp.WebApi.Application.Contracts.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Labels\**" />
<EmbeddedResource Remove="Labels\**" />
<None Remove="Labels\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.4.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.4.2" />

80
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.xml

@ -66,7 +66,7 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.productline">
<summary>
产品类(productline)
产品类(Product line)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.Type">
@ -76,7 +76,7 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.catalog">
<summary>
种类(catalog)
种类(Catalog)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.Group">
@ -106,27 +106,27 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.Eco">
<summary>
工程变革(Eco)
工程变更通知单(Engineering change order)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.StdPackUom">
<summary>
标包计量单位(StdPackUom)
标包计量单位(Standard Pack Uom)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.StdPackQty">
<summary>
标包数量(StdPackQty)
标包数量(Standard Pack Qty)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.ExtPackUom">
<summary>
替代计量单位(ExtPackUom)
替代计量单位(Extra Pack UM)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.ExtPackQty">
<summary>
替代包装数量(ExtPackQty)
替代包装数量(Extra Pack Qty)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartCreateOrUpdateDTOBase.Site">
@ -191,7 +191,7 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.productline">
<summary>
产品类(productline)
产品类(Product line)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.Type">
@ -201,7 +201,7 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.catalog">
<summary>
种类(catalog)
种类(Catalog)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.Group">
@ -231,27 +231,27 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.Eco">
<summary>
工程变革(Eco)
工程变更通知单(Engineering change order)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.StdPackUom">
<summary>
标包计量单位(StdPackUom)
标包计量单位(Standard Pack Uom)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.StdPackQty">
<summary>
标包数量(StdPackQty)
标包数量(Standard Pack Qty)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.ExtPackUom">
<summary>
替代计量单位(ExtPackUom)
替代计量单位(Extra Pack UM)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.ExtPackQty">
<summary>
替代包装数量(ExtPackQty)
替代包装数量(Extra Pack Qty)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Parts.PartDTO.Site">
@ -391,12 +391,12 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.POs.PODetailDTO.StdPackUom">
<summary>
标包计量单位(StdPackUom)
标包计量单位(Standard Pack Uom)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.POs.PODetailDTO.StdPackQty">
<summary>
标包数量(StdPackQty)
标包数量(Standard Pack Qty)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.POs.PODetailDTO.SupplierPackUom">
@ -549,9 +549,9 @@
仓库(Warehouse)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.WarehouseDoor">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.WarehouseDock">
<summary>
收货口(WarehouseDoor)
收货口(WarehouseDock)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.TimeWindowBegin">
@ -559,9 +559,9 @@
时间窗口开始(TimeWindowBegin)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.TimeWIndowEnd">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.TimeWindowEnd">
<summary>
时间窗口结束(TimeWIndowEnd)
时间窗口结束(TimeWindowEnd)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.ReceiveTime">
@ -589,19 +589,19 @@
零件号(PartCode)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.Batch">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.Lot">
<summary>
批次(Batch)
批次(Lot)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.SupplierBatch">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.SupplierLot">
<summary>
供应商批次(SupplierBatch)
供应商批次(SupplierLot)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.ProduceDate">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.ProductionDate">
<summary>
生产日期(ProduceDate)
生产日期(ProductionDate)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.Uom">
@ -621,12 +621,12 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.StdPackUom">
<summary>
标包计量单位(StdPackUom)
标包计量单位(Standard Pack Uom)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.StdPackQty">
<summary>
标包数量(StdPackQty)
标包数量(Standard Pack Qty)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.SupplierPackUom">
@ -684,9 +684,9 @@
仓库(Warehouse)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.WarehouseDoor">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.WarehouseDock">
<summary>
收货口(WarehouseDoor)
收货口(WarehouseDock)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.TimeWindowBegin">
@ -694,9 +694,9 @@
时间窗口开始(TimeWindowBegin)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.TimeWIndowEnd">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.TimeWindowEnd">
<summary>
时间窗口结束(TimeWIndowEnd)
时间窗口结束(TimeWindowEnd)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.ReceiveTime">
@ -724,19 +724,19 @@
零件号(PartCode)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.Batch">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.Lot">
<summary>
批次(Batch)
批次(Lot)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.SupplierBatch">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.SupplierLot">
<summary>
供应商批次(SupplierBatch)
供应商批次(SupplierLot)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.ProduceDate">
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.ProductionDate">
<summary>
生产日期(ProduceDate)
生产日期(ProductionDate)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.Uom">
@ -756,12 +756,12 @@
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.StdPackUom">
<summary>
标包计量单位(StdPackUom)
标包计量单位(Standard Pack Uom)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.StdPackQty">
<summary>
标包数量(StdPackQty)
标包数量(Standard Pack Qty)
</summary>
</member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.SupplierPackUom">

96
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
/// 发货单服务
/// </summary>
[AllowAnonymous]
[Route("api/SCP/ASN")]
[Route("api/scp/asn")]
[ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)]
public class ASNAppService:CrudAppService<ASN,ASNDTO,Guid,InputDTO,ASNCreateDTO,ASNUpdateDTO>, IASNAppService
public class ASNAppService:CrudAppService<ASN,ASNDTO,Guid,RequestDTO,ASNCreateDTO,ASNUpdateDTO>, IASNAppService
{
private readonly IASNRepository _asnRepository;
@ -24,9 +27,9 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
}
/// <summary>
///获取一条数据 (Get a piece of data)
/// 按ID获取发货单(Get ASN by ID)
/// </summary>
/// <param name="id"></param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@ -37,66 +40,103 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
/// <summary>
///获取数据列表 (Get data list)
/// 按条件获取发货单列表 (Get ASN list by request condition)
/// </summary>
/// <param name="input"></param>
/// <param name="requestDTO"></param>
/// <returns></returns>
[HttpGet]
[Route("")]
public override Task<PagedResultDto<ASNDTO>> GetListAsync(InputDTO input)
public override Task<PagedResultDto<ASNDTO>> GetListAsync(RequestDTO requestDTO)
{
return base.GetListAsync(input);
return base.GetListAsync(requestDTO);
}
/// <summary>
///获取数据列表 (Get data list)
/// 获取未读ASN列表 (Get unread ASN list)
/// </summary>
/// <param name="isRead"></param>
/// <returns></returns>
/// <returns>未读ASN列表 (Unread ASN list) </returns>
[HttpGet]
[Route("GetISReadListAsync")]
public Task<PagedResultDto<ASNDTO>> GetDataAsync(bool isRead)
[Route("UnreadList")]
public async Task<ListResultDto<ASNDTO>> GetUnreadListAsync()
{
return GetDataAsync(isRead);
var unreadList =await _asnRepository.Where(p => p.IsRead == false).ToDynamicListAsync<ASN>();
var dtoList = ObjectMapper.Map<List<ASN>, List<ASNDTO>>(unreadList);
return new ListResultDto<ASNDTO>(dtoList);
}
/// <summary>
/// 新增实体 (Create New entity
/// 新增发货单(Create New ASN
/// </summary>
/// <returns></returns>
[HttpPost]
[Route("")]
public override Task<ASNDTO> CreateAsync(ASNCreateDTO input)
public override Task<ASNDTO> CreateAsync(ASNCreateDTO asnCreateDTO)
{
return base.CreateAsync(input);
return base.CreateAsync(asnCreateDTO);
}
/// <summary>
/// 修改实体 (Modify entity)
/// 修改发货单 (Modify ASN)
/// </summary>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpPut]
[Route("{id}")]
public override Task<ASNDTO> UpdateAsync(Guid id, ASNUpdateDTO input)
public override Task<ASNDTO> UpdateAsync(Guid id, ASNUpdateDTO asnUpdateDTO)
{
return base.UpdateAsync(id, input);
return base.UpdateAsync(id, asnUpdateDTO);
}
/// <summary>
/// 修改实体已读状态 (Modify entity read status)
/// 修改ANS读取状态为已读 (Modify isRead status of ASN to true )
/// </summary>
/// <returns></returns>
[HttpPut]
[Route("UpdateISReadAsync")]
public Task<ASNDTO> UpdateISReadAsync(Guid id, bool isRead)
/// <param name="id">唯一ID(unique ID)</param>
/// <returns>ASN</returns>
[HttpPost]
[Route("Read")]
public async Task<ASNDTO> ReadAsync(Guid id)
{
var asn = await _asnRepository.GetAsync(id);
if (asn == null)
{
return UpdateISReadAsync(id, isRead);
return null;
}
var dto = await UpdateAsnIsReadAsync(asn,true);
return dto;
}
private async Task<ASNDTO> UpdateAsnIsReadAsync(ASN asn,bool isRead)
{
asn.IsRead = isRead;
var result = await _asnRepository.UpdateAsync(asn);
var dto = ObjectMapper.Map<ASN, ASNDTO>(result);
return dto;
}
/// <summary>
/// 删除实体 (Delete entity)
/// 修改ANS读取状态为未读 (Modify isRead status of ASN to false )
/// </summary>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns>ASN</returns>
[HttpPost]
[Route("Unread")]
public async Task<ASNDTO> UnreadAsync(Guid id)
{
var asn = await _asnRepository.GetAsync(id);
if (asn == null)
{
return null;
}
var dto = await UpdateAsnIsReadAsync(asn, false);
return dto;
}
/// <summary>
/// 删除发货单 (Delete ASN)
/// </summary>
/// <param name="id">ID</param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns>无</returns>
[HttpDelete]
[Route("{id}")]

2
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ASNs/ASNLabelAppService.cs → 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
{
/*
/// <summary>
///零件服务
/// </summary>
@ -85,4 +86,5 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
return base.DeleteAsync(id);
}
}
*/
}

33
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/POs/POAppService.cs

@ -12,9 +12,9 @@ namespace Win_in.Sfs.Scp.WebApi.POs
/// 采购订单服务
/// </summary>
[AllowAnonymous]
[Route("api/SCP/PO")]
[Route("api/scp/po")]
[ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)]
public class POAppService : CrudAppService<PO, PODTO, Guid,InputDTO, POCreateDTO, POUpdateDTO>, IPOAppService
public class POAppService : CrudAppService<PO, PODTO, Guid,RequestDTO, POCreateDTO, POUpdateDTO>, IPOAppService
{
private readonly IPORepository _partRepository;
@ -25,9 +25,9 @@ namespace Win_in.Sfs.Scp.WebApi.POs
/// <summary>
///获取一条数据 (Get a piece of data)
/// 按ID获取采购订单 (Get purchase order by ID)
/// </summary>
/// <param name="id"></param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@ -38,44 +38,45 @@ namespace Win_in.Sfs.Scp.WebApi.POs
/// <summary>
///获取数据列表 (Get data list)
/// 按条件获取采购订单列表 (Get purchase order list by request condition)
/// </summary>
/// <param name="input"></param>
/// <param name="requestDTO">请求条件DTO(Request condition DTO)</param>
/// <returns></returns>
[HttpGet]
[Route("")]
public override Task<PagedResultDto<PODTO>> GetListAsync(InputDTO input)
public override Task<PagedResultDto<PODTO>> GetListAsync(RequestDTO requestDTO)
{
return base.GetListAsync(input);
return base.GetListAsync(requestDTO);
}
/// <summary>
/// 新增实体 (Create New entity
/// 新增采购订单(Create New purchase order
/// </summary>
/// <returns></returns>
[HttpPost]
[Route("")]
public override Task<PODTO> CreateAsync(POCreateDTO input)
public override Task<PODTO> CreateAsync(POCreateDTO poCreateDTO)
{
return base.CreateAsync(input);
return base.CreateAsync(poCreateDTO);
}
/// <summary>
/// 修改实体 (Modify entity)
/// 按ID修改采购订单 (Modify purchase order by ID)
/// </summary>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpPut]
[Route("{id}")]
public override Task<PODTO> UpdateAsync(Guid id, POUpdateDTO input)
public override Task<PODTO> UpdateAsync(Guid id, POUpdateDTO poUpdateDTO)
{
return base.UpdateAsync(id, input);
return base.UpdateAsync(id, poUpdateDTO);
}
/// <summary>
/// 删除实体 (Delete entity)
/// 按ID删除采购订单 (Delete purchase order by ID)
/// </summary>
/// <param name="id">ID</param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns>无</returns>
[HttpDelete]
[Route("{id}")]

35
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
{
/// <summary>
///零件服务
/// 零件服务
/// </summary>
[AllowAnonymous]
[Route("api/SCP/Part")]
[Route("api/scp/Part")]
[ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)]
public class PartAppService : CrudAppService<Part, PartDTO, Guid,InputDTO, PartCreateDTO, PartUpdateDTO>, IPartAppService
public class PartAppService : CrudAppService<Part, PartDTO, Guid,RequestDTO, PartCreateDTO, PartUpdateDTO>, IPartAppService
{
private readonly IPartRepository _partRepository;
@ -27,9 +27,9 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
}
/// <summary>
///获取一条数据 (Get a piece of data)
/// 按ID获取零件 (Get part by ID)
/// </summary>
/// <param name="id"></param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@ -40,43 +40,44 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
/// <summary>
///获取数据列表 (Get data list)
/// 按条件获取零件列表 (Get part list by request condition)
/// </summary>
/// <param name="input"></param>
/// <param name="requestDTO">请求条件DTO(Request condition DTO)</param>
/// <returns></returns>
[HttpGet]
[Route("")]
public override Task<PagedResultDto<PartDTO>> GetListAsync(InputDTO input)
public override Task<PagedResultDto<PartDTO>> GetListAsync(RequestDTO requestDTO)
{
return base.GetListAsync(input);
return base.GetListAsync(requestDTO);
}
/// <summary>
/// 新增实体 (Create New entity
/// 新增零件(Create New part
/// </summary>
/// <returns></returns>
[HttpPost]
[Route("")]
public override Task<PartDTO> CreateAsync(PartCreateDTO input)
public override Task<PartDTO> CreateAsync(PartCreateDTO partCreateDTO)
{
return base.CreateAsync(input);
return base.CreateAsync(partCreateDTO);
}
/// <summary>
/// 修改实体 (Modify entity)
/// 按ID修改零件 (Modify part by ID)
/// </summary>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpPut]
[Route("{id}")]
public override Task<PartDTO> UpdateAsync(Guid id, PartUpdateDTO input)
public override Task<PartDTO> UpdateAsync(Guid id, PartUpdateDTO partUpdateDTO)
{
return base.UpdateAsync(id, input);
return base.UpdateAsync(id, partUpdateDTO);
}
/// <summary>
/// 删除实体 (Delete entity)
/// 按ID删除实体 (Delete part by ID)
/// </summary>
/// <param name="id">ID</param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns>无</returns>
[HttpDelete]
[Route("{id}")]

39
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
{
/// <summary>
///零件服务
/// 收货单服务
/// </summary>
[AllowAnonymous]
[Route("api/SCP/Receipt")]
[Route("api/scp/receipt")]
[ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)]
public class ReceiptAppService : CrudAppService<Receipt, ReceiptDTO, Guid,InputDTO, ReceiptCreateDTO, ReceiptUpdateDTO>, IReceiptAppService
public class ReceiptAppService : CrudAppService<Receipt, ReceiptDTO, Guid, RequestDTO, ReceiptCreateDTO, ReceiptUpdateDTO>, IReceiptAppService
{
private readonly IReceiptRepository _partRepository;
@ -25,9 +25,9 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
/// <summary>
///获取一条数据 (Get a piece of data)
/// 按ID获取收货单 (Get receipt by ID)
/// </summary>
/// <param name="id"></param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@ -38,45 +38,46 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
/// <summary>
///获取数据列表 (Get data list)
/// 按请求条件获取收货单列表(Get receipt list by request condition)
/// </summary>
/// <param name="input"></param>
/// <param name="requestDTO">请求条件DTO(Request condition DTO)</param>
/// <returns></returns>
[HttpGet]
[Route("")]
public override Task<PagedResultDto<ReceiptDTO>> GetListAsync(InputDTO input)
public override Task<PagedResultDto<ReceiptDTO>> GetListAsync(RequestDTO requestDTO)
{
return base.GetListAsync(input);
return base.GetListAsync(requestDTO);
}
/// <summary>
/// 新增实体 (Create New entity)
/// 新增收货单(Create receipt)
/// </summary>
/// <param name="receiptCreateDTO"></param>
/// <returns></returns>
[HttpPost]
[Route("")]
public override Task<ReceiptDTO> CreateAsync(ReceiptCreateDTO input)
public override Task<ReceiptDTO> CreateAsync(ReceiptCreateDTO receiptCreateDTO)
{
return base.CreateAsync(input);
return base.CreateAsync(receiptCreateDTO);
}
/// <summary>
/// 修改实体 (Modify entity)
/// 按ID修改收货单(Update receipt by ID)
/// </summary>
/// <param name="id">唯一ID(unique ID)</param>
/// <param name="receiptUpdateDTO"></param>
/// <returns></returns>
[HttpPut]
[Route("{id}")]
public override Task<ReceiptDTO> UpdateAsync(Guid id, ReceiptUpdateDTO input)
public override Task<ReceiptDTO> UpdateAsync(Guid id, ReceiptUpdateDTO receiptUpdateDTO)
{
return base.UpdateAsync(id, input);
return base.UpdateAsync(id, receiptUpdateDTO);
}
/// <summary>
/// 删除实体 (Delete entity)
/// 按ID删除收货单(Delete receipt by ID)
/// </summary>
/// <param name="id">ID</param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns>无</returns>
[HttpDelete]
[Route("{id}")]

31
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Samples/SampleAppService.cs

@ -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<SampleDto> GetAsync()
{
return Task.FromResult(
new SampleDto
{
Value = 42
}
);
}
[Authorize]
public Task<SampleDto> GetAuthorizedAsync()
{
return Task.FromResult(
new SampleDto
{
Value = 42
}
);
}
}
}

38
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
{
/// <summary>
///零件服务
/// 供应商零件服务
/// </summary>
[AllowAnonymous]
[Route("api/SCP/SupplierPart")]
[Route("api/scp/supplier-part")]
[ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)]
public class SupplierPartAppService : CrudAppService<SupplierPart, SupplierPartDTO, Guid,InputDTO, SupplierPartCreateDTO, SupplierPartUpdateDTO>, ISupplierPartAppService
public class SupplierPartAppService : CrudAppService<SupplierPart, SupplierPartDTO, Guid, RequestDTO, SupplierPartCreateDTO, SupplierPartUpdateDTO>, ISupplierPartAppService
{
private readonly ISupplierPartRepository _partRepository;
@ -25,9 +25,9 @@ namespace Win_in.Sfs.Scp.WebApi.SupplierParts
}
/// <summary>
///获取一条数据 (Get a piece of data)
/// 按ID获取供应商零件 (Get supplier part by Id)
/// </summary>
/// <param name="id"></param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@ -38,45 +38,47 @@ namespace Win_in.Sfs.Scp.WebApi.SupplierParts
/// <summary>
///获取数据列表 (Get data list)
/// 按请求条件获取供应商零件列表 (Get supplier part by request condition)
/// </summary>
/// <param name="input"></param>
/// <param name="requestDTO"></param>
/// <returns></returns>
[HttpGet]
[Route("")]
public override Task<PagedResultDto<SupplierPartDTO>> GetListAsync(InputDTO input)
public override Task<PagedResultDto<SupplierPartDTO>> GetListAsync(RequestDTO requestDTO)
{
return base.GetListAsync(input);
return base.GetListAsync(requestDTO);
}
/// <summary>
/// 新增实体 (Create New entity)
/// 新增供应商零件(Create supplier part)
/// </summary>
/// <param name="supplierPartCreateDTO"></param>
/// <returns></returns>
[HttpPost]
[Route("")]
public override Task<SupplierPartDTO> CreateAsync(SupplierPartCreateDTO input)
public override Task<SupplierPartDTO> CreateAsync(SupplierPartCreateDTO supplierPartCreateDTO)
{
return base.CreateAsync(input);
return base.CreateAsync(supplierPartCreateDTO);
}
/// <summary>
/// 修改实体 (Modify entity)
/// 按ID更新供应商零件(Update supplier part by ID)
/// </summary>
/// <param name="id">唯一ID(unique ID)</param>
/// <param name="supplierPartUpdateDTO"></param>
/// <returns></returns>
[HttpPut]
[Route("{id}")]
public override Task<SupplierPartDTO> UpdateAsync(Guid id, SupplierPartUpdateDTO input)
public override Task<SupplierPartDTO> UpdateAsync(Guid id, SupplierPartUpdateDTO supplierPartUpdateDTO)
{
return base.UpdateAsync(id, input);
return base.UpdateAsync(id, supplierPartUpdateDTO);
}
/// <summary>
/// 删除实体 (Delete entity)
/// 按ID删除供应商零件(Delete supplier part by ID)
/// </summary>
/// <param name="id">ID</param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns>无</returns>
[HttpDelete]
[Route("{id}")]

44
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
{
/// <summary>
///零件服务
/// 供应商服务
/// </summary>
[AllowAnonymous]
[Route("api/SCP/Supplier")]
[Route("api/scp/supplier")]
[ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)]
public class SuppliersAppService : CrudAppService<Supplier, SupplierDTO, Guid,InputDTO, SupplierCreateDTO, SupplierUpdateDTO>, ISupplierAppService
public class SuppliersAppService : CrudAppService<Supplier, SupplierDTO, Guid,RequestDTO, SupplierCreateDTO, SupplierUpdateDTO>, ISupplierAppService
{
private readonly ISupplierRepository _partRepository;
@ -26,9 +26,9 @@ namespace Win_in.Sfs.Scp.WebApi.Supplierss
/// <summary>
///获取一条数据 (Get a piece of data)
/// 按ID获取供应商 (Get supplier by Id)
/// </summary>
/// <param name="id"></param>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@ -39,46 +39,48 @@ namespace Win_in.Sfs.Scp.WebApi.Supplierss
/// <summary>
///获取数据列表 (Get data list)
/// 按条件获取供应商列表(Get Supplier list by request condition)
/// </summary>
/// <param name="input"></param>
/// <param name="requestDTO">请求条件DTO(Request condition DTO)</param>
/// <returns></returns>
[HttpGet]
[Route("")]
public override Task<PagedResultDto<SupplierDTO>> GetListAsync(InputDTO input)
public override Task<PagedResultDto<SupplierDTO>> GetListAsync(RequestDTO requestDTO)
{
return base.GetListAsync(input);
return base.GetListAsync(requestDTO);
}
/// <summary>
/// 新增实体 (Create New entity
/// 新增供应商 (Create New supplier
/// </summary>
/// <returns></returns>
/// <param name="supplierCreateDTO"></param>
/// <returns>供应商DTO(Supplier DTO)</returns>
[HttpPost]
[Route("")]
public override Task<SupplierDTO> CreateAsync(SupplierCreateDTO input)
public override Task<SupplierDTO> CreateAsync(SupplierCreateDTO supplierCreateDTO)
{
return base.CreateAsync(input);
return base.CreateAsync(supplierCreateDTO);
}
/// <summary>
/// 修改实体 (Modify entity)
/// 按ID修改供应商 (Modify supplier by id)
/// </summary>
/// <returns></returns>
/// <param name="id">唯一ID(unique ID)</param>
/// <param name="supplierUpdateDTO">新的供应商DTO(new supplier DTO)</param>
/// <returns>供应商DTO(Supplier DTO)</returns>
[HttpPut]
[Route("{id}")]
public override Task<SupplierDTO> UpdateAsync(Guid id, SupplierUpdateDTO input)
public override Task<SupplierDTO> UpdateAsync(Guid id, SupplierUpdateDTO supplierUpdateDTO)
{
return base.UpdateAsync(id, input);
return base.UpdateAsync(id, supplierUpdateDTO);
}
/// <summary>
/// 删除实体 (Delete entity)
/// 按ID删除供应商 (Delete supplier by id)
/// </summary>
/// <param name="id">ID</param>
/// <returns>无</returns>
/// <param name="id">唯一ID(unique ID)</param>
/// <returns>无(void)</returns>
[HttpDelete]
[Route("{id}")]
public override Task DeleteAsync(Guid id)

6
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Win_in.Sfs.Scp.WebApi.Application.csproj

@ -11,6 +11,12 @@
<DocumentationFile>..\..\host\Win_in.Sfs.Scp.WebApi.HttpApi.Host\bin\Debug\net5.0\Win_in.Sfs.Scp.WebApi.Application.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Labels\**" />
<EmbeddedResource Remove="Labels\**" />
<None Remove="Labels\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.4.2" />

22
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; }
/// <summary>
/// 时间窗口开始(Time window Begin)
/// 时间窗口开始(Time Window Begin)
/// </summary>
[Display(Name = "时间窗口开始(TimeWindowBegin)")]
public DateTime TimeWindowBegin { set; get; }
/// <summary>
/// 时间窗口结束(Time window End)
/// 时间窗口结束(Time Window End)
/// </summary>
[Display(Name = "时间窗口结束(TimeWIndowEnd)")]
public DateTime TimeWIndowEnd { set; get; }
[Display(Name = "时间窗口结束(TimeWindowEnd)")]
public DateTime TimeWindowEnd { set; get; }
/// <summary>
/// 地点(Site)
@ -95,8 +95,8 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary>
/// 公司(IAC company code)
/// </summary>
[Display(Name = "公司(Comapnay)")]
public string Comapnay { set; get; }
[Display(Name = "公司(Company)")]
public string Company { set; get; }
/// <summary>
/// 备注(Remark)
@ -105,10 +105,10 @@ namespace Win_in.Sfs.Scp.WebApi
public string Remark { set; get; }
/// <summary>
/// 是否已读(IsrRead)
/// 是否已读(IsRead)
/// </summary>
[Display(Name = "是否已读(IsrRead)")]
public bool IsrRead { set; get; }
[Display(Name = "是否已读(IsRead)")]
public bool IsRead { set; get; }
public virtual List<ASNDetail> 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));
}

30
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNDetail.cs

@ -43,14 +43,14 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary>
/// 供应商批次(Supplier Lot)
/// </summary>
[Display(Name = "供应商批次(Supplierlot)")]
public string Supplierlot { set; get; }
[Display(Name = "供应商批次(SupplierLot)")]
public string SupplierLot { set; get; }
/// <summary>
/// 生产日期(Produce Date)
/// </summary>
[Display(Name = "生产日期(ProduceDate)")]
public DateTime ProduceDate { set; get; }
[Display(Name = "生产日期(ProductionDate)")]
public DateTime ProductionDate { set; get; }
/// <summary>
/// 计量单位(Unit of measure)
@ -67,13 +67,13 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary>
/// 标包计量单位(standard package um)
/// </summary>
[Display(Name = "标包计量单位(StdPackUom)")]
[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; }
/// <summary>
/// 标包数量(standard package quantiy)
/// 标包数量(standard package quantity)
/// </summary>
[Display(Name = "标包数量(StdPackQty)")]
[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; }
/// <summary>
@ -107,25 +107,25 @@ namespace Win_in.Sfs.Scp.WebApi
public string BarCode { set; get; }
/// <summary>
/// 托标签号(PalletLabelnumber)
/// 托标签号(PalletLabelCode)
/// </summary>
[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;
}
}
}

2
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/IASNLabelRepository.cs → 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<ASNLabel, Guid>
public interface ILabelRepository : IRepository<Label, Guid>
{
}

16
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNLabel.cs → ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Labels/Label.cs

@ -8,7 +8,7 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary>
/// 标签表
/// </summary>
public class ASNLabel:EntityBase<Guid>
public class Label:EntityBase<Guid>
{
/// <summary>
/// 标签代码(Label code)
@ -17,7 +17,7 @@ namespace Win_in.Sfs.Scp.WebApi
public string LabelCode { get;set;}
/// <summary>
/// 完整条码数据(Barcode barcode)
/// 完整条码数据(Full Barcode string)
/// </summary>
[Display(Name = "完整条码数据(Barcode)")]
public string Barcode { get;set;}
@ -61,13 +61,13 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary>
/// 标包计量单位(Package UM)
/// </summary>
[Display(Name = "标包计量单位(StdPackUom)")]
[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { get;set;}
/// <summary>
/// 标包数量(Package quantity)
/// </summary>
[Display(Name = "标包数量(StdPackQty)")]
[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { get;set;}
/// <summary>
@ -115,14 +115,14 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary>
/// 生产日期(Produce Date)
/// </summary>
[Display(Name = "生产日期(ProduceDate)")]
public DateTime ProduceDate { get;set;}
[Display(Name = "生产日期(ProductionDate)")]
public DateTime ProductionDate { get;set;}
/// <summary>
/// 托标签号(Pallet label number)
/// </summary>
[Display(Name = "托标签号(PalletLabelnumber)")]
public decimal PalletLabelnumber { get;set;}
[Display(Name = "托标签号(PalletLabelCode)")]
public decimal PalletLabelCode { get;set;}
/// <summary>
/// 地点(site)

15
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; }
/// <summary>
/// 标包计量单位(StdPackUom)
/// 已关闭数量(Closed Qty)
/// </summary>
[Display(Name = "标包计量单位(StdPackUom)")]
[Display(Name = "已关闭数量(Closed Qty)")]
public decimal ClosedQty { get; set; }
/// <summary>
/// 标包计量单位(Standard Pack Uom)
/// </summary>
[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; }
/// <summary>
/// 标包数量(StdPackQty)
/// 标包数量(Standard Pack Qty)
/// </summary>
[Display(Name = "标包数量(StdPackQty)")]
[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal? StdPackQty { set; get; }
/// <summary>

32
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;}
/// <summary>
/// 制造件(IsMakePart)
/// 制造件(Can make)
/// </summary>
[Display(Name = "制造件")]
public bool IsMakePart {get;set;}
public bool CanMake {get;set;}
/// <summary>
/// 采购件(IsBuyPart)
/// 采购件(Can buy)
/// </summary>
[Display(Name = "采购件")]
public bool IsBuyPart {get;set;}
public bool CanBuy {get;set;}
/// <summary>
/// 计量单位(Uom)
@ -62,13 +62,13 @@ namespace Win_in.Sfs.Scp.WebApi
/// ABC类(abcClass)
/// </summary>
[Display(Name = "ABC类")]
public string abcClass {get;set;}
public string AbcClass {get;set;}
/// <summary>
/// 产品类(productline)
/// 产品类(Product line)
/// </summary>
[Display(Name = "产品类")]
public string productline {get;set;}
public string ProductLine {get;set;}
/// <summary>
/// 类型(Type)
@ -77,10 +77,10 @@ namespace Win_in.Sfs.Scp.WebApi
public string Type {get;set;}
/// <summary>
/// 种类(catalog)
/// 种类(Catalog)
/// </summary>
[Display(Name = "代码")]
public string catalog {get;set;}
[Display(Name = "种类")]
public string Catalog {get;set;}
/// <summary>
/// 分组(Group)
@ -113,31 +113,31 @@ namespace Win_in.Sfs.Scp.WebApi
//public string version {get;set;}
/// <summary>
/// 工程变革(Eco)
/// 工程变更通知单(Engineering change order)
/// </summary>
[Display(Name = "工程变")]
[Display(Name = "工程变更通知单")]
public string Eco {get;set;}
/// <summary>
/// 标包计量单位(StdPackUom)
/// 标包计量单位(Standard Pack Uom)
/// </summary>
[Display(Name = "标包计量单位")]
public string StdPackUom {get;set;}
/// <summary>
/// 标包数量(StdPackQty)
/// 标包数量(Standard Pack Qty)
/// </summary>
[Display(Name = "标包数量")]
public decimal StdPackQty {get;set;}
/// <summary>
/// 替代计量单位(ExtPackUom)
/// 替代计量单位(Extra Pack UM)
/// </summary>
[Display(Name = "替代计量单位")]
public string ExtPackUom {get;set;}
/// <summary>
/// 替代包装数量(ExtPackQty)
/// 替代包装数量(Extra Pack Qty)
/// </summary>
[Display(Name = "替代包装数量")]
public decimal ExtPackQty {get;set;}

42
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<Guid>
{
/// <summary>
/// 货单号(RcNumber)
/// 货单号(RcNumber)
/// </summary>
[Display(Name = "货单号(RcNumber)")]
[Display(Name = "货单号(RcNumber)")]
public string RcNumber { set; get; }
/// <summary>
@ -53,10 +53,10 @@ namespace Win_in.Sfs.Scp.WebApi
public string Warehouse { set; get; }
/// <summary>
/// 收货口(WarehouseDoor)
/// 收货口(WarehouseDock)
/// </summary>
[Display(Name = "收货口(WarehouseDoor)")]
public string WarehouseDoor { set; get; }
[Display(Name = "收货口(WarehouseDock)")]
public string WarehouseDock { set; get; }
/// <summary>
/// 时间窗口开始(TimeWindowBegin)
@ -65,10 +65,10 @@ namespace Win_in.Sfs.Scp.WebApi
public DateTime TimeWindowBegin { set; get; }
/// <summary>
/// 时间窗口结束(TimeWIndowEnd)
/// 时间窗口结束(TimeWindowEnd)
/// </summary>
[Display(Name = "时间窗口结束(TimeWIndowEnd)")]
public DateTime TimeWIndowEnd { set; get; }
[Display(Name = "时间窗口结束(TimeWindowEnd)")]
public DateTime TimeWindowEnd { set; get; }
/// <summary>
/// 收货时间(ReceiveTime)
@ -101,22 +101,22 @@ namespace Win_in.Sfs.Scp.WebApi
public string PartCode { set; get; }
/// <summary>
/// 批次(Batch)
/// 批次(Lot)
/// </summary>
[Display(Name = "批次(Batch)")]
public string Batch { set; get; }
[Display(Name = "批次(Lot)")]
public string Lot { set; get; }
/// <summary>
/// 供应商批次(SupplierBatch)
/// 供应商批次(SupplierLot)
/// </summary>
[Display(Name = "供应商批次(SupplierBatch)")]
public string SupplierBatch { set; get; }
[Display(Name = "供应商批次(SupplierLot)")]
public string SupplierLot { set; get; }
/// <summary>
/// 生产日期(ProduceDate)
/// 生产日期(ProductionDate)
/// </summary>
[Display(Name = "生产日期(ProduceDate)")]
public DateTime ProduceDate { set; get; }
[Display(Name = "生产日期(ProductionDate)")]
public DateTime ProductionDate { set; get; }
/// <summary>
/// 计量单位(Uom)
@ -137,15 +137,15 @@ namespace Win_in.Sfs.Scp.WebApi
public decimal ReceiveQty { set; get; }
/// <summary>
/// 标包计量单位(StdPackUom)
/// 标包计量单位(Standard Pack Uom)
/// </summary>
[Display(Name = "标包计量单位(StdPackUom)")]
[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; }
/// <summary>
/// 标包数量(StdPackQty)
/// 标包数量(Standard Pack Qty)
/// </summary>
[Display(Name = "标包数量(StdPackQty)")]
[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; }
/// <summary>

12
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/SupplierParts/SupplierPart.cs

@ -45,5 +45,17 @@ namespace Win_in.Sfs.Scp.WebApi
/// </summary>
[Display(Name = "备注(Remark)")]
public string Remark { get; set; }
/// <summary>
/// 地点(Site)
/// </summary>
[Display(Name = "地点")]
public string Site { get; set; }
/// <summary>
/// 公司(Company)
/// </summary>
[Display(Name = "公司")]
public string Company { get; set; }
}
}

58
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);
}
/// <summary>
@ -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
/// <summary>
/// 发货单标签表
/// </summary>
private static void ConfigASNLabel(this ModelBuilder builder, WebApiModelBuilderConfigurationOptions options)
private static void ConfigLabel(this ModelBuilder builder, WebApiModelBuilderConfigurationOptions options)
{
builder.Entity<ASNLabel>(b =>
builder.Entity<Label>(b =>
{
//Configure table & schema name
b.ToTable(options.TablePrefix + "_ASNLabel", options.Schema);
b.ToTable(options.TablePrefix + "_Label", options.Schema);
b.ConfigureByConvention();
@ -372,13 +372,13 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(q => q.AsnNumber).IsRequired().HasMaxLength(64);
b.Property(q => q.RpNumber).IsRequired().HasMaxLength(64);
b.Property(q => q.SupplierLot).HasMaxLength(64);
b.Property(q => q.ProduceDate).IsRequired();
b.Property(q => q.PalletLabelnumber).IsRequired().HasMaxLength(64);
b.Property(q => q.ProductionDate).IsRequired();
b.Property(q => q.PalletLabelCode).IsRequired().HasMaxLength(64);
b.Property(q => q.Site).IsRequired().HasMaxLength(64);
b.Property(q => q.Company).IsRequired().HasMaxLength(64);
b.Property(q => q.Remark).HasMaxLength(4096);
b.HasIndex(x => new { x.LabelCode }).IsUnique();
b.HasIndex(x => new { x.LabelCode,x.Company,x.Site }).IsUnique();
});
}

34
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi/Samples/SampleController.cs

@ -1,34 +0,0 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Volo.Abp;
namespace Win_in.Sfs.Scp.WebApi.Samples
{
[RemoteService]
[Route("api/WebApi/sample")]
[ApiExplorerSettings(GroupName = SwaggerGroupConsts.ScpWebApi)]
public class SampleController : WebApiController, ISampleAppService
{
private readonly ISampleAppService _sampleAppService;
public SampleController(ISampleAppService sampleAppService)
{
_sampleAppService = sampleAppService;
}
[HttpGet]
public async Task<SampleDto> GetAsync()
{
return await _sampleAppService.GetAsync();
}
[HttpGet]
[Route("authorized")]
[Authorize]
public async Task<SampleDto> GetAuthorizedAsync()
{
return await _sampleAppService.GetAsync();
}
}
}

30
ScpWebApiService/test/Win_in.Sfs.Scp.WebApi.Application.Tests/Samples/SampleAppService_Tests.cs

@ -1,30 +0,0 @@
using System.Threading.Tasks;
using Shouldly;
using Xunit;
namespace Win_in.Sfs.Scp.WebApi.Samples
{
public class SampleAppService_Tests : WebApiApplicationTestBase
{
private readonly ISampleAppService _sampleAppService;
public SampleAppService_Tests()
{
_sampleAppService = GetRequiredService<ISampleAppService>();
}
[Fact]
public async Task GetAsync()
{
var result = await _sampleAppService.GetAsync();
result.Value.ShouldBe(42);
}
[Fact]
public async Task GetAuthorizedAsync()
{
var result = await _sampleAppService.GetAuthorizedAsync();
result.Value.ShouldBe(42);
}
}
}
Loading…
Cancel
Save