[add]独立的CreateDTO

WebApiService/Win_in.Sfs.Scp.WebApi.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.29020.237
+VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win_in.Sfs.Scp.WebApi.Domain", "src\Win_in.Sfs.Scp.WebApi.Domain\Win_in.Sfs.Scp.WebApi.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}"
 EndProject
@@ -35,6 +35,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win_in.Sfs.Scp.WebApi.DbMig
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win_in.Sfs.Scp.WebApi.HttpApi.Host", "src\Win_in.Sfs.Scp.WebApi.HttpApi.Host\Win_in.Sfs.Scp.WebApi.HttpApi.Host.csproj", "{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Win_in.Sfs.Scp.v1.Domain", "src\Win_in.Sfs.Scp.v1.Domain\Win_in.Sfs.Scp.v1.Domain.csproj", "{3EE98133-3E7A-4B14-A515-12CB039A9EED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Win_in.Sfs.Scp.v1.EntityFrameworkCore", "src\Win_in.Sfs.Scp.v1.EntityFrameworkCore\Win_in.Sfs.Scp.v1.EntityFrameworkCore.csproj", "{77D1D3F8-A04C-4688-AC67-C8372BD268A2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +101,14 @@ Global
 		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EE98133-3E7A-4B14-A515-12CB039A9EED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EE98133-3E7A-4B14-A515-12CB039A9EED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EE98133-3E7A-4B14-A515-12CB039A9EED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EE98133-3E7A-4B14-A515-12CB039A9EED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77D1D3F8-A04C-4688-AC67-C8372BD268A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77D1D3F8-A04C-4688-AC67-C8372BD268A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77D1D3F8-A04C-4688-AC67-C8372BD268A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77D1D3F8-A04C-4688-AC67-C8372BD268A2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -116,6 +128,8 @@ Global
 		{EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
 		{AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{3EE98133-3E7A-4B14-A515-12CB039A9EED} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{77D1D3F8-A04C-4688-AC67-C8372BD268A2} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

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

@@ -11,7 +11,7 @@ namespace Win_in.Sfs.Scp.WebApi
     /// </summary>
     public interface IPartAppService : IReadOnlyAppService<PartDTO,Guid,RequestDTO>
     {
-        Task<PartDTO> CreateAsync(PartDTO partCreateDTO);
+        Task<PartDTO> CreateAsync(PartCreateDto partCreateDTO);
 
     }
 

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateDto.cs

@@ -0,0 +1,103 @@
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Scp.WebApi;
+
+public class PartCreateDto : EntityDto
+{
+    /// <summary>
+    /// 代码(Code)
+    /// </summary>
+    [Display(Name = "代码")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 名称(Name)
+    /// </summary>
+    [Display(Name = "名称")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 描述(Desc1)
+    /// </summary>
+    [Display(Name = "描述")]
+    public string Desc1 { get; set; }
+
+    /// <summary>
+    /// 描述2(Desc2)
+    /// </summary>
+    [Display(Name = "描述2")]
+    public string Desc2 { get; set; }
+
+    /// <summary>
+    /// 状态(Status)
+    /// </summary>
+    [Display(Name = "状态")]
+    public string Status { get; set; }
+
+    /// <summary>
+    /// 制造件(Can make)
+    /// </summary>
+    [Display(Name = "制造件")]
+    public bool IsMakePart { get; set; }
+
+    /// <summary>
+    /// 采购件(Can buy)
+    /// </summary>
+    [Display(Name = "采购件")]
+    public bool IsBuyPart { get; set; }
+
+    /// <summary>
+    /// 计量单位(Uom)
+    /// </summary>
+    [Display(Name = "计量单位")]
+    public string Uom { get; set; }
+
+    /// <summary>
+    /// ABC类(ABC Class)
+    /// </summary>
+    [Display(Name = "ABC类")]
+    public string AbcClass { get; set; }
+
+    /// <summary>
+    /// 产品类(Product Line)
+    /// </summary>
+    [Display(Name = "产品类")]
+    public string ProductLine { get; set; }
+
+    /// <summary>
+    /// 类型(Type)
+    /// </summary>
+    [Display(Name = "类型")]
+    public string Type { get; set; }
+
+    /// <summary>
+    /// 种类(Catalog)
+    /// </summary>
+    [Display(Name = "种类")]
+    public string Catalog { get; set; }
+
+    /// <summary>
+    /// 分组(Group)
+    /// </summary>
+    [Display(Name = "分组")]
+    public string Group { get; set; }
+
+    /// <summary>
+    /// 版本(version)
+    /// </summary>
+    [Display(Name = "版本")]
+    public string Version { get; set; }
+
+    /// <summary>
+    /// 地点(Site)
+    /// </summary>
+    [Display(Name = "地点")]
+    public string Site { get; set; }
+
+    /// <summary>
+    /// 公司(Company)
+    /// </summary>
+    [Display(Name = "公司")]
+    public string Company { get; set; }
+}

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/CreatePartDtoValidator.cs → WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateDtoValidator.cs

@@ -2,9 +2,9 @@
 
 namespace Win_in.Sfs.Scp.WebApi;
 
-public class CreatePartDtoValidator : AbstractValidator<PartDTO>
+public class PartCreateDtoValidator : AbstractValidator<PartCreateDto>
 {
-    public CreatePartDtoValidator()
+    public PartCreateDtoValidator()
     {
         RuleFor(x => x.Code).MaximumLength(64).NotEmpty();
         RuleFor(x => x.Name).MaximumLength(64).NotEmpty();

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Data;
 using Win_in.Sfs.Scp.WebApi.Domain.Shared;
 

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Permissions/WebApiPermissions.cs

@@ -3,7 +3,9 @@
     public static class WebApiPermissions
     {
         public const string GroupName = "WebApi";
-
+        public const string CreateName = "Create";
+        public const string UpdateName = "Update";
+        public const string DeleteName = "Delete";
         //Add your own permission names. Example:
         //public const string MyPermission1 = GroupName + ".MyPermission1";
 

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/PurchaseOrders/IPurchaseOrderAppService.cs

@@ -11,7 +11,7 @@ namespace Win_in.Sfs.Scp.WebApi
     /// </summary>
     public interface IPurchaseOrderAppService : IReadOnlyAppService<PurchaseOrderDTO, Guid, RequestDTO>
     {
-        Task<PurchaseOrderDTO> CreateAsync(PurchaseOrderDTO poCreateDTO);
+        Task<PurchaseOrderDTO> CreateAsync(PurchaseOrderCreateDTO poCreateDTO);
     }
 
 

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/PurchaseOrders/PurchaseOrderCreateDTO.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Scp.WebApi;
+
+/// <summary>
+/// 采购订单DTO(Purchase order DTO)
+/// </summary>
+
+public class PurchaseOrderCreateDTO : EntityDto
+{
+
+    /// <summary>
+    /// 订单号(PoNumber)
+    /// </summary>
+    [Display(Name = "订单号(PoNumber)")]
+    public string PoNumber { set; get; }
+
+    /// <summary>
+    /// 供应商代码(SupplierCode)
+    /// </summary>
+    [Display(Name = "供应商代码(SupplierCode)")]
+    public string SupplierCode { set; get; }
+
+    /// <summary>
+    /// 订单类型(PoType)
+    /// </summary>
+    [Display(Name = "订单类型(PoType)")]
+    public string PoType { set; get; }
+
+    /// <summary>
+    /// 订单状态(Status)
+    /// </summary>
+    [Display(Name = "订单状态(Status)")]
+    public int Status { set; get; }
+
+    /// <summary>
+    /// 是否寄存订单(IsConsignment)
+    /// </summary>
+    [Display(Name = "是否寄存订单(IsConsignment)")]
+    public bool IsConsignment { set; get; }
+
+    /// <summary>
+    /// 订单日期(OrderDate)
+    /// </summary>
+    [Display(Name = "订单日期(OrderDate)")]
+    public DateTime OrderDate { set; get; }
+
+    /// <summary>
+    /// 截止日期(DueDate)
+    /// </summary>
+    [Display(Name = "截止日期(DueDate)")]
+    public DateTime DueDate { set; get; }
+
+    /// <summary>
+    /// 税率(TaxRate)
+    /// </summary>
+    [Display(Name = "税率(TaxRate)")]
+    public decimal TaxRate { set; get; }
+
+    /// <summary>
+    /// 版本(version)
+    /// </summary>
+    [Display(Name = "版本")]
+    public string Version { get; set; }
+
+    /// <summary>
+    /// 联系人(ContactName)
+    /// </summary>
+    [Display(Name = "联系人(ContactName)")]
+    public string ContactName { set; get; }
+
+    /// <summary>
+    /// 联系电话(ContactPhone)
+    /// </summary>
+    [Display(Name = "联系电话(ContactPhone)")]
+    public string ContactPhone { set; get; }
+
+    /// <summary>
+    /// 备注(Remark)
+    /// </summary>
+    [Display(Name = "备注(Remark)")]
+    public string Remark { set; get; }
+
+    /// <summary>
+    /// 地点(Site)
+    /// </summary>
+    [Display(Name = "地点(Site)")]
+    public string Site { set; get; }
+
+    /// <summary>
+    /// 公司(Company)
+    /// </summary>
+    [Display(Name = "公司(Company)")]
+    public string Company { set; get; }
+
+
+    public virtual ICollection<PurchaseOrderDetailDTO> Details { get; set; }
+}

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/PurchaseOrders/CreatePurchaseOrderValidator.cs → WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/PurchaseOrders/PurchaseOrderCreateDtoValidator.cs

@@ -2,9 +2,9 @@ using FluentValidation;
 
 namespace Win_in.Sfs.Scp.WebApi;
 
-public class CreatePurchaseOrderValidator : AbstractValidator<PurchaseOrderDTO>
+public class PurchaseOrderCreateDtoValidator : AbstractValidator<PurchaseOrderCreateDTO>
 {
-    public CreatePurchaseOrderValidator()
+    public PurchaseOrderCreateDtoValidator()
     {
         RuleFor(q => q.PoNumber).MaximumLength(64);
         RuleFor(q => q.SupplierCode).NotEmpty().MaximumLength(64);

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/PurchaseOrders/PurchaseOrderDTO.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Scp.WebApi.Domain.Shared;
 
 namespace Win_in.Sfs.Scp.WebApi

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/IReceiptAppService.cs

@@ -7,6 +7,6 @@ namespace Win_in.Sfs.Scp.WebApi
 {
     public interface IReceiptAppService : IReadOnlyAppService<ReceiptDTO,Guid,RequestDTO>
     {
-
+        Task<ReceiptDTO> CreateAsync(ReceiptCreateDTO receiptCreateDTO);
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateDTO.cs

@@ -0,0 +1,126 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Scp.WebApi;
+
+/// <summary>
+/// 收货单DTO(Receipt DTO)
+/// </summary>
+public class ReceiptCreateDTO : EntityDto
+{
+    /// <summary>
+    /// 收货单号(RcNumber)
+    /// </summary>
+    [Display(Name = "收货单号(RcNumber)")]
+    public string RcNumber { set; get; }
+
+    /// <summary>
+    /// 发货单号(AsnNumber)
+    /// </summary>
+    [Display(Name = "发货单号(AsnNumber)")]
+    public string AsnNumber { 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)
+    /// </summary>
+    [Display(Name = "仓库(Warehouse)")]
+    public string Warehouse { set; get; }
+
+    /// <summary>
+    /// 收货口(Dock)
+    /// </summary>
+    [Display(Name = "收货口(Dock)")]
+    public string Dock { set; get; }
+
+    /// <summary>
+    /// 收货日期(ReceiveDate)
+    /// </summary>
+    [Display(Name = "收货日期(ReceiveDate)")]
+    public DateTime ReceiveDate { set; get; }
+
+    /// <summary>
+    /// 收货时间(ReceiveTime)
+    /// </summary>
+    [Display(Name = "收货时间(ReceiveTime)")]
+    public DateTime ReceiveTime { 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>
+    /// 批次(Lot)
+    /// </summary>
+    [Display(Name = "批次(Lot)")]
+    public string Lot { set; get; }
+
+    /// <summary>
+    /// 供应商批次(SupplierLot)
+    /// </summary>
+    [Display(Name = "供应商批次(SupplierLot)")]
+    public string SupplierLot { set; get; }
+
+    /// <summary>
+    /// 计量单位(Uom)
+    /// </summary>
+    [Display(Name = "计量单位(Uom)")]
+    public string Uom { set; get; }
+
+    /// <summary>
+    /// 收货数量(ReceiveQty)
+    /// </summary>
+    [Display(Name = "收货数量(ReceiveQty)")]
+    public decimal ReceiveQty { set; get; }
+
+    /// <summary>
+    /// 供应商包装转换率(SupplierPackConvertRate)
+    /// </summary>
+    [Display(Name = "供应商包装转换率(SupplierPackConvertRate)")]
+    public decimal SupplierPackConvertRate { set; get; }
+
+    /// <summary>
+    /// 备注(Remark)
+    /// </summary>
+    [Display(Name = "备注(Remark)")]
+    public string Remark { set; get; }
+
+    /// <summary>
+    /// 地点(Site)
+    /// </summary>
+    [Display(Name = "地点(Site)")]
+    public string Site { set; get; }
+
+    /// <summary>
+    /// 公司(Company)
+    /// </summary>
+    [Display(Name = "公司(Company)")]
+    public string Company { set; get; }
+}

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/CreateReceiptDtoValidator.cs → WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateDtoValidator.cs

@@ -2,9 +2,9 @@ using FluentValidation;
 
 namespace Win_in.Sfs.Scp.WebApi;
 
-public class CreateReceiptDtoValidator : AbstractValidator<ReceiptDTO>
+public class ReceiptCreateDtoValidator : AbstractValidator<ReceiptCreateDTO>
 {
-    public CreateReceiptDtoValidator()
+    public ReceiptCreateDtoValidator()
     {
         RuleFor(q => q.RcNumber).NotEmpty().MaximumLength(64);
         RuleFor(q => q.AsnNumber).NotEmpty().MaximumLength(64);

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Scp.WebApi.Domain.Shared;
 
 namespace Win_in.Sfs.Scp.WebApi

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/ISupplierAppService.cs

@@ -7,6 +7,6 @@ namespace Win_in.Sfs.Scp.WebApi
 {
     public interface ISupplierAppService : IReadOnlyAppService<SupplierDTO,Guid,RequestDTO>
     {
-
+        Task<SupplierDTO> CreateAsync(SupplierCreateDTO supplierCreateDTO);
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateDTO.cs

@@ -0,0 +1,108 @@
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Scp.WebApi;
+
+/// <summary>
+/// 供应商DTO(Supplier DTO)
+/// </summary>
+public class SupplierCreateDTO : EntityDto
+{
+    /// <summary>
+    /// 代码(Code)
+    /// </summary>
+    [Display(Name = "代码(Code)")]
+    public string Code { set; get; }
+
+    /// <summary>
+    /// 简称(Name)
+    /// </summary>
+    [Display(Name = "简称(Name)")]
+    public string Name { set; get; }
+
+    /// <summary>
+    /// 描述(Description)
+    /// </summary>
+    [Display(Name = "描述(Description)")]
+    public string Desc { set; get; }
+
+    /// <summary>
+    /// 级别(Rank)
+    /// </summary>
+    [Display(Name = "级别(Rank)")]
+    public string Rank { get; set; }
+
+    /// <summary>
+    /// 地址
+    /// </summary>
+    [Display(Name = "地址(Address)")]
+    public string Address { get; set; }
+
+    /// <summary>
+    /// 国家(Country)
+    /// </summary>
+    [Display(Name = "国家(Country)")]
+    public string Country { get; set; }
+
+    /// <summary>
+    /// 城市(City)
+    /// </summary>
+    [Display(Name = "城市(City)")]
+    public string City { get; set; }
+
+    /// <summary>
+    /// 电话(Phone)
+    /// </summary>
+    [Display(Name = "电话(Phone)")]
+    public string Phone { set; get; }
+
+    /// <summary>
+    /// 传真(Fax)
+    /// </summary>
+    [Display(Name = "传真(Fax)")]
+    public string Fax { set; get; }
+
+    /// <summary>
+    /// 邮编(PostId)
+    /// </summary>
+    [Display(Name = "邮编(PostId)")]
+    public string PostId { set; get; }
+
+    /// <summary>
+    /// 联系人(ContactName)
+    /// </summary>
+    [Display(Name = "联系人(ContactName)")]
+    public string ContactName { set; get; }
+
+    /// <summary>
+    /// 银行(Bank)
+    /// </summary>
+    [Display(Name = "银行(Bank)")]
+    public string Bank { set; get; }
+
+    /// <summary>
+    /// 货币(Currency)
+    /// </summary>
+    [Display(Name = "货币(Currency)")]
+    public string Currency { set; get; }
+
+    /// <summary>
+    /// 是否激活(IsActive)
+    /// </summary>
+    [Display(Name = "是否激活(IsActive)")]
+    public bool IsActive { set; get; }
+
+    /// <summary>
+    /// 公司(Company)
+    /// </summary>
+    [Display(Name = "公司(Company)")]
+    public string Company { set; get; }
+
+    /// <summary>
+    /// 备注(Remark)
+    /// </summary>
+    [Display(Name = "备注(Remark)")]
+    public string Remark { set; get; }
+
+
+}

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/CreateSupplierDtoValidator.cs → WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateDtoValidator.cs

@@ -2,9 +2,9 @@ using FluentValidation;
 
 namespace Win_in.Sfs.Scp.WebApi;
 
-public class CreateSupplierDtoValidator : AbstractValidator<SupplierDTO>
+public class SupplierCreateDtoValidator : AbstractValidator<SupplierCreateDTO>
 {
-    public CreateSupplierDtoValidator()
+    public SupplierCreateDtoValidator()
     {
 
         RuleFor(x => x.Code).MaximumLength(64).NotEmpty();

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Data;
 using Win_in.Sfs.Scp.WebApi.Domain.Shared;
 

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/IUnplannedReceiptAppService.cs

@@ -7,6 +7,6 @@ namespace Win_in.Sfs.Scp.WebApi
 {
     public interface IUnplannedReceiptAppService : IReadOnlyAppService<UnplannedReceiptDTO,Guid,RequestDTO>
     {
-
+        Task<UnplannedReceiptDTO> CreateAsync(UnplannedReceiptCreateDTO receiptCreateDTO);
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/UnplannedReceiptCreateDTO.cs

@@ -0,0 +1,98 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Application.Dtos;
+
+namespace Win_in.Sfs.Scp.WebApi;
+
+/// <summary>
+/// 计划外入库单DTO(Unplanned Receipt DTO)
+/// </summary>
+public class UnplannedReceiptCreateDTO : EntityDto
+{
+    /// <summary>
+    /// 单号(TrNbr)
+    /// </summary>
+    [Display(Name = "单号(TrNbr)")]
+    public long TrNbr { set; get; }
+
+    /// <summary>
+    /// 事务类型(TrType)
+    /// </summary>
+    [Display(Name = "事务类型(TrType)")]
+    public string TrType { set; get; }
+
+    /// <summary>
+    /// 订单号(Order)
+    /// </summary>
+    [Display(Name = "订单号(Order)")]
+    public string Order { set; get; }
+
+    /// <summary>
+    /// 零件号(PartCode)
+    /// </summary>
+    [Display(Name = "零件号(PartCode)")]
+    public string PartCode { set; get; }
+
+    /// <summary>
+    /// 批次(Lot)
+    /// </summary>
+    [Display(Name = "批次(Lot)")]
+    public string Lot { set; get; }
+
+
+    /// <summary>
+    /// 计量单位(Uom)
+    /// </summary>
+    [Display(Name = "计量单位(Uom)")]
+    public string Uom { set; get; }
+
+    /// <summary>
+    /// 数量(Qty)
+    /// </summary>
+    [Display(Name = "数量(Qty)")]
+    public decimal Qty { set; get; }
+
+    /// <summary>
+    /// 库位(Location)
+    /// </summary>
+    [Display(Name = "库位(Location)")]
+    public string Location { set; get; }
+
+    /// <summary>
+    /// 生效日期(EffectiveDate)
+    /// </summary>
+    [Display(Name = "生效日期(EffectiveDate)")]
+    public DateTime EffectiveDate { set; get; }
+
+    /// <summary>
+    /// 系统日期(SystemDate)
+    /// </summary>
+    [Display(Name = "系统日期(SystemDate)")]
+    public DateTime SystemDate { set; get; }
+
+    /// <summary>
+    /// 客户单(so job)
+    /// </summary>
+    [Display(Name = "客户单(so job)")]
+
+    public string SoJob { get; set; }
+
+
+    /// <summary>
+    /// 备注(Remark)
+    /// </summary>
+    [Display(Name = "备注(Remark)")]
+    public string Remark { set; get; }
+
+    /// <summary>
+    /// 地点(Site)
+    /// </summary>
+    [Display(Name = "地点(Site)")]
+    public string Site { set; get; }
+
+    /// <summary>
+    /// 公司(Company)
+    /// </summary>
+    [Display(Name = "公司(Company)")]
+    public string Company { set; get; }
+}

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/CreateReceiptDtoValidator.cs → WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/UnplannedReceiptCreateDtoValidator.cs

@@ -2,9 +2,9 @@ using FluentValidation;
 
 namespace Win_in.Sfs.Scp.WebApi;
 
-public class CreateUnplannedReceiptDtoValidator : AbstractValidator<UnplannedReceiptDTO>
+public class UnplannedReceiptCreateDtoValidator : AbstractValidator<UnplannedReceiptCreateDTO>
 {
-    public CreateUnplannedReceiptDtoValidator()
+    public UnplannedReceiptCreateDtoValidator()
     {
         RuleFor(q => q.TrNbr).NotEmpty();
         RuleFor(q => q.TrType).NotEmpty().MaximumLength(8);

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/UnplannedReceiptDTO.cs

@@ -1,12 +1,11 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Scp.WebApi.Domain.Shared;
 
 namespace Win_in.Sfs.Scp.WebApi
 {
     /// <summary>
-    /// 收货单DTO(Receipt DTO)
+    /// 计划外入库单DTO(Unplanned Receipt DTO)
     /// </summary>
     public class UnplannedReceiptDTO : EntityDtoBase<Guid>
     {

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs

@@ -58,9 +58,11 @@ namespace Win_in.Sfs.Scp.WebApi
         /// <returns></returns>
         [HttpPost]
         [Route("")]
-        public  async Task<PartDTO> CreateAsync(PartDTO partCreateDTO)
+        public  async Task<PartDTO> CreateAsync(PartCreateDto partCreateDTO)
         {
-            var entity = ObjectMapper.Map<PartDTO, Part>(partCreateDTO);
+            
+            var entity = ObjectMapper.Map<PartCreateDto, Part>(partCreateDTO);
+            entity.SetId(GuidGenerator.Create());
             var ret= await _partRepository.InsertAsync(entity);
             var dto = ObjectMapper.Map<Part, PartDTO>(ret);
             return dto;

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs

@@ -56,9 +56,14 @@ namespace Win_in.Sfs.Scp.WebApi
         /// <returns></returns>
         [HttpPost]
         [Route("")]
-        public async Task<PurchaseOrderDTO> CreateAsync(PurchaseOrderDTO poCreateDTO)
+        public async Task<PurchaseOrderDTO> CreateAsync(PurchaseOrderCreateDTO poCreateDTO)
         {
-            var entity = ObjectMapper.Map<PurchaseOrderDTO, PurchaseOrder>(poCreateDTO);
+            var entity = ObjectMapper.Map<PurchaseOrderCreateDTO, PurchaseOrder>(poCreateDTO);
+            entity.SetId(GuidGenerator.Create());
+            foreach (var detail in entity.Details)
+            {
+                detail.SetId(GuidGenerator.Create());
+            }
             var ret = await _purchaseOrderRepository.InsertAsync(entity);
             var dto = ObjectMapper.Map<PurchaseOrder, PurchaseOrderDTO>(ret);
             return dto;

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs

@@ -57,19 +57,15 @@ namespace Win_in.Sfs.Scp.WebApi
         /// <returns></returns>
         [HttpPost]
         [Route("")]
-        public async Task<ReceiptDTO> CreateAsync(ReceiptDTO receiptCreateDTO)
+        public async Task<ReceiptDTO> CreateAsync(ReceiptCreateDTO receiptCreateDTO)
         {
-            var entity = ObjectMapper.Map<ReceiptDTO, Receipt>(receiptCreateDTO);
+            var entity = ObjectMapper.Map<ReceiptCreateDTO, Receipt>(receiptCreateDTO);
+            entity.SetId(GuidGenerator.Create());
             var ret = await _receiptRepository.InsertAsync(entity);
             var dto = ObjectMapper.Map<Receipt, ReceiptDTO>(ret);
             return dto;
         }
-        /// <summary>
+       
-        /// 按ID修改收货单(Update receipt by ID)
-        /// </summary>
-        /// <param name="id">唯一ID(unique ID)</param>
-        /// <param name="receiptUpdateDTO"></param>
-        /// <returns></returns>
       
 
     }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs

@@ -58,9 +58,10 @@ namespace Win_in.Sfs.Scp.WebApi
         /// <returns>供应商DTO(Supplier DTO)</returns>
         [HttpPost]
         [Route("")]
-        public async Task<SupplierDTO> CreateAsync(SupplierDTO supplierCreateDTO)
+        public async Task<SupplierDTO> CreateAsync(SupplierCreateDTO supplierCreateDTO)
         {
-            var entity = ObjectMapper.Map<SupplierDTO, Supplier>(supplierCreateDTO);
+            var entity = ObjectMapper.Map<SupplierCreateDTO, Supplier>(supplierCreateDTO);
+            entity.SetId(GuidGenerator.Create());
             var ret = await _supplierRepository.InsertAsync(entity);
             var dto = ObjectMapper.Map<Supplier, SupplierDTO>(ret);
             return dto;

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/UnplannedReceipts/UnplannedReceiptAppService.cs

@@ -57,19 +57,14 @@ namespace Win_in.Sfs.Scp.WebApi
         /// <returns></returns>
         [HttpPost]
         [Route("")]
-        public async Task<UnplannedReceiptDTO> CreateAsync(UnplannedReceiptDTO receiptCreateDTO)
+        public async Task<UnplannedReceiptDTO> CreateAsync(UnplannedReceiptCreateDTO receiptCreateDTO)
         {
-            var entity = ObjectMapper.Map<UnplannedReceiptDTO, UnplannedReceipt>(receiptCreateDTO);
+            var entity = ObjectMapper.Map<UnplannedReceiptCreateDTO, UnplannedReceipt>(receiptCreateDTO);
+            entity.SetId(GuidGenerator.Create());
             var ret = await _unplannedReceiptRepository.InsertAsync(entity);
             var dto = ObjectMapper.Map<UnplannedReceipt, UnplannedReceiptDTO>(ret);
             return dto;
         }
-        /// <summary>
-        /// 按ID修改收货单(Update receipt by ID)
-        /// </summary>
-        /// <param name="id">唯一ID(unique ID)</param>
-        /// <param name="receiptUpdateDTO"></param>
-        /// <returns></returns>
        
 
     }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/WebApiApplicationAutoMapperProfile.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using Volo.Abp.AutoMapper;
 
 namespace Win_in.Sfs.Scp.WebApi
 {
@@ -25,6 +26,10 @@ namespace Win_in.Sfs.Scp.WebApi
 
         {
             CreateMap<Part, PartDTO>().ReverseMap();
+            CreateMap<PartCreateDto, Part>()
+                .Ignore(p=>p.Id)
+                .Ignore(p=>p.CreatorId)
+                .Ignore(p=>p.CreationTime);
         }
 
         /// <summary>
@@ -34,6 +39,10 @@ namespace Win_in.Sfs.Scp.WebApi
 
         {
             CreateMap<Supplier, SupplierDTO>().ReverseMap();
+            CreateMap<SupplierCreateDTO,Supplier>()
+                .Ignore(p => p.Id)
+                .Ignore(p => p.CreatorId)
+                .Ignore(p => p.CreationTime);
         }
 
 
@@ -44,6 +53,10 @@ namespace Win_in.Sfs.Scp.WebApi
 
         {
             CreateMap<Receipt, ReceiptDTO>().ReverseMap();
+            CreateMap<ReceiptCreateDTO, Receipt>()
+                .Ignore(p => p.Id)
+                .Ignore(p => p.CreatorId)
+                .Ignore(p => p.CreationTime);
         }
 
 
@@ -54,6 +67,10 @@ namespace Win_in.Sfs.Scp.WebApi
 
         {
             CreateMap<PurchaseOrder, PurchaseOrderDTO>().ReverseMap();
+            CreateMap<PurchaseOrderCreateDTO, PurchaseOrder>()
+                .Ignore(p => p.Id)
+                .Ignore(p => p.CreatorId)
+                .Ignore(p => p.CreationTime);
         }
 
         /// <summary>
@@ -68,6 +85,10 @@ namespace Win_in.Sfs.Scp.WebApi
         private void CreateMapUnplannedReceipt()
         {
             CreateMap<UnplannedReceipt, UnplannedReceiptDTO>().ReverseMap();
+            CreateMap<UnplannedReceiptCreateDTO, UnplannedReceipt>()
+                .Ignore(p => p.Id)
+                .Ignore(p => p.CreatorId)
+                .Ignore(p => p.CreationTime);
         }
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/EntityBase/EntityBase.cs

@@ -4,9 +4,13 @@ using Volo.Abp.Domain.Entities.Auditing;
 
 namespace Win_in.Sfs.Scp.WebApi.Domain.Shared
 {
-    public class EntityBase<TKey> : CreationAuditedAggregateRoot<TKey>
+    public class EntityBase<TKey> : CreationAuditedAggregateRoot<TKey>,ICanTrace
     {
+        public Guid TraceId { get; set; }
+    }
 
-
+    public interface ICanTrace
+    {
+        Guid TraceId { get; set; }
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/EntityBase/EntityDetailBase.cs

@@ -11,6 +11,5 @@ namespace Win_in.Sfs.Scp.WebApi.Domain.Shared
         public EntityDetailBase() { }
         public EntityDetailBase(TKey id) : base(id) { }
 
-
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/EntityBase/EntityDetailDtoBase.cs

@@ -8,6 +8,5 @@ namespace Win_in.Sfs.Scp.WebApi.Domain.Shared
     public class EntityDetailDtoBase<TKey> : CreationAuditedEntityDto<TKey>
     {
 
-
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/EntityBase/EntityDtoBase.cs

@@ -5,9 +5,8 @@ using Volo.Abp.Domain.Entities.Auditing;
 
 namespace Win_in.Sfs.Scp.WebApi.Domain.Shared
 {
-    public class EntityDtoBase<TKey> : CreationAuditedEntityDto<TKey>
+    public class EntityDtoBase<TKey> : CreationAuditedEntityDto<TKey>, ICanTrace
     {
-       
+        public Guid TraceId { get; set; }
-
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Guids;
 using Win_in.Sfs.Scp.WebApi.Domain.Shared;
 
 namespace Win_in.Sfs.Scp.WebApi
@@ -156,6 +157,12 @@ namespace Win_in.Sfs.Scp.WebApi
         /// </summary>
         [Display(Name = "公司")]
         public string Company {get;set;}
+
+
+        public void SetId(Guid id)
+        {
+            Id = id;
+        }
     }
 
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/PurchaseOrders/PurchaseOrder.cs

@@ -101,6 +101,10 @@ namespace Win_in.Sfs.Scp.WebApi
 
         public virtual List<PurchaseOrderDetail> Details { get; set; }
 
+        public void SetId(Guid id)
+        {
+            Id = id;
+        }
 
 
         #region details handler

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/PurchaseOrders/PurchaseOrderDetail.cs

@@ -95,5 +95,11 @@ namespace Win_in.Sfs.Scp.WebApi
             LineStatus = lineStatus;
             Remark = remark;
         }
+
+        public void SetId(Guid id)
+        {
+            Id = id;
+        }
+
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs

@@ -135,5 +135,10 @@ namespace Win_in.Sfs.Scp.WebApi
         /// </summary>
         [Display(Name = "公司(Company)")]
         public string Company { set; get; }
+        public void SetId(Guid id)
+        {
+            Id = id;
+        }
+
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/SCP/Class1.cs

@@ -0,0 +1,425 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Win_in.Sfs.Scp.WebApi.SCP;
+
+public class TA_PART
+{
+
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public long UID { get; set; }
+
+    [Key]
+    [Column(Order = 0)]
+    [StringLength(50)]
+    public string PartCode { get; set; }
+
+    [Required]
+    [StringLength(50)]
+    public string ErpPartCode { get; set; }
+
+    //        [Required]
+    public string PartDesc1 { get; set; }
+
+    //        [Required]
+    public string PartDesc2 { get; set; }
+
+    //        [Required]
+    [StringLength(50)]
+    public string ProjectId { get; set; }
+
+    [Required]
+    [StringLength(50)]
+    public string Unit { get; set; }
+
+    //        [Required]
+    [StringLength(50)]
+    public string PartGroup { get; set; }
+
+    [Required]
+    [StringLength(10)]
+    public string State { get; set; }
+
+    [StringLength(100)]
+    public string Configuration { get; set; }
+
+    public int ValidityDays { get; set; }
+
+    [StringLength(50)]
+    public string ReceivePort { get; set; }
+
+    [StringLength(50)]
+    public string PalletSize { get; set; }
+
+    [StringLength(500)]
+    public string Remark { get; set; }
+    [Key]
+    [Column(Order = 1)]
+    [StringLength(50)]
+    public string Site { get; set; }
+
+
+    public string Qlevel { get; set; }
+
+    public bool? Ischeck { get; set; }
+
+
+}
+
+public class TA_VENDER
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public int UID { get; set; }
+
+    [Key]
+    [Column(Order = 0)]
+    [StringLength(50)]
+    public string VendId { get; set; }
+
+    [Required]
+    [StringLength(50)]
+    public string VendName { get; set; }
+
+    [Required]
+    [StringLength(50)]
+    public string VendAbbCode { get; set; }
+
+    [StringLength(50)]
+    public string VendType { get; set; }
+
+    [StringLength(50)]
+    public string Country { get; set; }
+
+    [StringLength(50)]
+    public string City { get; set; }
+
+    [StringLength(50)]
+    public string Currency { get; set; }
+
+    [StringLength(200)]
+    public string Address { get; set; }
+
+    [StringLength(50)]
+    public string ZipCode { get; set; }
+
+    [StringLength(50)]
+    public string Contacter { get; set; }
+
+    [StringLength(50)]
+    public string Phone { get; set; }
+
+    [StringLength(50)]
+    public string Fax { get; set; }
+
+    [StringLength(50)]
+    public string Email { get; set; }
+
+    public int State { get; set; }
+
+    [StringLength(500)]
+    public string Remark { get; set; }
+
+
+    public decimal? Tax { get; set; }
+    [Key]
+    [Column(Order = 1)]
+    [StringLength(50)]
+    public string Site { get; set; }
+
+    public int? ReceiveTimeScope { set; get; }
+    public decimal? Quota { set; get; }
+   
+}
+
+public class TB_PO : RecordEntity
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public long UID { get; set; }
+    [Key]
+    [Column(Order = 0)]
+    [StringLength(50)]
+    public string PoBillNum { get; set; }
+    [StringLength(50)]
+    public string ErpBillNum { get; set; }
+    [StringLength(50)]
+    public string VendId { get; set; }
+    public int? ModType { get; set; }
+    [StringLength(50)]
+    public string Contacter { get; set; }
+    [Key]
+    [Column(Order = 1)]
+    [StringLength(50)]
+    public string Site { get; set; }
+    [StringLength(50)]
+    public string Buyer { get; set; }
+    [StringLength(50)]
+    public string BuyerPhone { get; set; }
+    public int State { get; set; }
+    [StringLength(200)]
+    public string Remark { get; set; }
+
+    public DateTime? BeginTime { get; set; }
+
+    public DateTime? EndTime { get; set; }
+
+
+    public string Extend1 { get; set; }
+    public string Extend2 { get; set; }
+    public string Extend3 { get; set; }
+    public string SubSite { get; set; }
+
+}
+
+public class TB_PO_DETAIL : RecordEntity
+{
+
+
+
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public long UID { get; set; }
+
+
+
+    [StringLength(50)]
+    public string PoBillNum { get; set; }
+    public int PoLine { get; set; }
+
+    public Nullable<DateTime> BeginTime { get; set; }
+    public Nullable<DateTime> EndTime { get; set; }
+
+    [Required]
+    [StringLength(50)]
+    public string PartCode { get; set; }
+
+    [Column(TypeName = "money")]
+    public decimal ShippedQty { get; set; }
+
+    [Column(TypeName = "money")]
+    public decimal ReceivedQty { get; set; }
+
+    public string RejectQty { get; set; }
+
+    [StringLength(50)]
+    public string PoUnit { get; set; }
+
+    [StringLength(50)]
+    public string LocUnit { get; set; }
+
+    [Column(TypeName = "money")]
+    public decimal Price { get; set; }
+
+    [StringLength(50)]
+    public string Currency { get; set; }
+
+    public decimal PlanQty { get; set; }
+    [Column(TypeName = "money")]
+    public decimal PackQty { get; set; }
+    [Column(TypeName = "money")]
+    public decimal? TempQty { get; set; }
+
+    public int State { get; set; }
+
+    [StringLength(200)]
+    public string Remark { get; set; }
+    public decimal UnConv { get; set; }
+    [StringLength(50)]
+    public string DockCode { get; set; }
+
+    public string Extend1 { get; set; }
+    public string Extend2 { get; set; }
+    public string Extend3 { get; set; }
+    public string SubSite { get; set; }
+
+    public string Site { get; set; }
+
+}
+
+public class TB_RECEIVE_QAD
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public long UID { get; set; }
+    [StringLength(50)]
+
+    public string RecvBillNum { get; set; }
+    [StringLength(50)]
+    public string PoBillNum { get; set; }
+    [StringLength(50)]
+    public string AsnBillNum { get; set; }
+
+    [Key]
+    [Column(Order = 1)]
+    [StringLength(50)]
+    public string Site { get; set; }
+    [StringLength(50)]
+    public string VendId { get; set; }
+    public DateTime ShipTime { get; set; }
+    public int State { get; set; }
+    [StringLength(50)]
+    public string Remark { get; set; }
+    public DateTime CreateTime { get; set; }
+    [StringLength(50)]
+    public string CreateUser { get; set; }
+    public bool IsDeleted { get; set; }
+    public Guid GUID { get; set; }
+    [StringLength(50)]
+    public string OperName { get; set; }
+    public int BillType { get; set; }
+    [Key]
+    [Column(Order = 0)]
+    public string ErpRecvBillNum { get; set; }
+
+
+    public string Tax { get; set; }
+    public string Extend1 { get; set; }
+    public string Extend2 { get; set; }
+    public string Extend3 { get; set; }
+
+    public string SubSite { get; set; }
+
+
+
+}
+
+public class TB_RECEIVE_DETAIL_QAD
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public long UID { get; set; }
+    [StringLength(50)]
+
+    public string RecvBillNum { get; set; }
+    //[Key]
+    //[Column(Order = 1)]
+    //[StringLength(50)]
+    public string PoBillNum { get; set; }
+    //[Key]
+    //[Column(Order = 2)]
+    public int PoLine { get; set; }
+    [Key]
+    [Column(Order = 3)]
+    [StringLength(50)]
+    public string PartCode { get; set; }
+    [StringLength(50)]
+    public string Batch { get; set; }
+    public decimal Qty { get; set; }
+    [StringLength(50)]
+    public string DockCode { get; set; }
+    public int State { get; set; }
+    [StringLength(500)]
+    public string Remark { get; set; }
+    public DateTime CreateTime { get; set; }
+    [StringLength(50)]
+    public string CreateUser { get; set; }
+    public bool IsDeleted { get; set; }
+
+    public Guid GUID { get; set; }
+
+    public int BillType { get; set; }
+    [StringLength(50)]
+    public string VendBatch { get; set; }
+    [StringLength(50)]
+    public string PoUnit { get; set; }
+    [StringLength(50)]
+    public string LocUnit { get; set; }
+    [Key]
+    [Column(Order = 0)]
+    public string ErpRecvBillNum { get; set; }
+
+    /// <summary>
+    /// 采购价
+    /// </summary>
+    public decimal? PurCost { get; set; }
+    /// <summary>
+    /// 成本价
+    /// </summary>
+    public decimal? StdCost { get; set; }
+    [Key]
+    [Column(Order = 4)]
+    public string Site { get; set; }
+
+    public decimal? Rate { get; set; }
+
+
+    public decimal? CurAmt { get; set; }
+
+    public string Tax { get; set; }
+    public string Extend1 { get; set; }
+    public string Extend2 { get; set; }
+    public string Extend3 { get; set; }
+
+    public string SubSite { get; set; }
+}
+
+public class TB_REJECT
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Key]
+    public long UID { get; set; }
+    [StringLength(50)]
+    public string RjctBillNum { get; set; }
+    [StringLength(50)]
+    public string PoBillNum { get; set; }
+    [StringLength(50)]
+    public string AsnBillNum { get; set; }
+    [StringLength(50)]
+    public string Site { get; set; }
+    [StringLength(50)]
+    public string VendId { get; set; }
+    public DateTime ShipTime { get; set; }
+    public int State { get; set; }
+    [StringLength(50)]
+    public string Remark { get; set; }
+    public DateTime CreateTime { get; set; }
+    [StringLength(50)]
+    public string CreateUser { get; set; }
+    public bool IsDeleted { get; set; }
+    public Guid GUID { get; set; }
+    [StringLength(50)]
+    public string OperName { get; set; }
+}
+
+public class TB_REJECT_DETAIL
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Key]
+    public long UID { get; set; }
+    [StringLength(50)]
+    public string RjctBillNum { get; set; }
+    [StringLength(50)]
+    public string PoBillNum { get; set; }
+    public int PoLine { get; set; }
+    [StringLength(50)]
+    public string PartCode { get; set; }
+    [StringLength(50)]
+    public string Batch { get; set; }
+    public decimal Qty { get; set; }
+    public int State { get; set; }
+    [StringLength(50)]
+    public string Remark { get; set; }
+    public DateTime CreateTime { get; set; }
+    [StringLength(50)]
+    public string CreateUser { get; set; }
+    public bool IsDeleted { get; set; }
+    public Guid GUID { get; set; }
+}
+
+[Serializable]
+public class RecordEntity
+{
+    public DateTime CreateTime { get; set; }
+
+    [StringLength(50)]
+    public string CreateUser { get; set; }
+    public DateTime? UpdateTime { get; set; }
+    [StringLength(50)]
+    public string UpdateUser { get; set; }
+    [StringLength(50)]
+    public string UpdateInfo { get; set; }
+    public bool IsDeleted { get; set; }
+    public Guid GUID { get; set; }
+  
+
+}

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Suppliers/Supplier.cs

@@ -105,5 +105,11 @@ namespace Win_in.Sfs.Scp.WebApi
         /// </summary>
         [Display(Name = "备注(Remark)")]
         public string Remark { set; get; }
+
+        public void SetId(Guid id)
+        {
+            Id = id;
+        }
+
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/UnplannedReceipts/UnplannedReceipt.cs

@@ -95,5 +95,11 @@ namespace Win_in.Sfs.Scp.WebApi
         /// </summary>
         [Display(Name = "公司(Company)")]
         public string Company { set; get; }
+
+        public void SetId(Guid id)
+        {
+            Id = id;
+        }
+
     }
 }

WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Win_in.Sfs.Scp.WebApi.Domain.csproj

@@ -24,4 +24,8 @@
     <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.4.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="SCP\" />
+  </ItemGroup>
+
 </Project>

WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Class1.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Win_in.Sfs.Scp.v1.Domain
+{
+    public class Class1
+    {
+    }
+}

WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Win_in.Sfs.Scp.v1.Domain.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>

WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Class1.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Win_in.Sfs.Scp.v1.EntityFrameworkCore
+{
+    public class Class1
+    {
+    }
+}

WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Win_in.Sfs.Scp.v1.EntityFrameworkCore.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>