Browse Source

[fix]bug修复

master
贾荣国 3 years ago
parent
commit
26cb52d3df
  1. 2
      ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.Designer.cs
  2. 2
      ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.cs
  3. 2
      ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021081413_20211021002.Designer.cs
  4. 2
      ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/WebApiHttpApiHostMigrationsDbContextModelSnapshot.cs
  5. 18
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateOrUpdateDTOBase.cs
  6. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDTO.cs
  7. 14
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNUpdateDTO.cs
  8. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs
  9. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs
  10. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/ISupplierAppService.cs
  11. 8
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Win_in.Sfs.Scp.WebApi.Application.Contracts.xml
  12. 2
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs
  13. 12
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Win_in.Sfs.Scp.WebApi.Application.xml
  14. 40
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASN.cs
  15. 12
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASNDetail.cs
  16. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs
  17. 8
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs

2
ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.Designer.cs

@ -531,7 +531,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("WarehouseDock") b.Property<string>("Dock")
.IsRequired() .IsRequired()
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");

2
ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021072716_20211021001.cs

@ -98,7 +98,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
SupplierCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), SupplierCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
RcType = 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), Warehouse = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
WarehouseDock = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), Dock = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
TimeWindowBegin = table.Column<DateTime>(type: "datetime2", 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), ReceiveTime = table.Column<DateTime>(type: "datetime2", nullable: false),

2
ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/20211021081413_20211021002.Designer.cs

@ -514,7 +514,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("WarehouseDock") b.Property<string>("Dock")
.IsRequired() .IsRequired()
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");

2
ScpWebApiService/host/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Migrations/WebApiHttpApiHostMigrationsDbContextModelSnapshot.cs

@ -512,7 +512,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("WarehouseDock") b.Property<string>("Dock")
.IsRequired() .IsRequired()
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");

18
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNCreateOrUpdateDTOBase.cs

@ -12,11 +12,6 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
public abstract class ASNCreateOrUpdateDTOBase : EntityDto<Guid>,IHasExtraProperties public abstract class ASNCreateOrUpdateDTOBase : EntityDto<Guid>,IHasExtraProperties
{ {
/// <summary>
/// 状态(Status)
/// </summary>
[Display(Name = "状态(Status)")]
public int Status { set; get; }
/// <summary> /// <summary>
/// 联系人(Contact person) /// 联系人(Contact person)
@ -40,13 +35,13 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
/// 仓库(Warehouse code) /// 仓库(Warehouse code)
/// </summary> /// </summary>
[Display(Name = "仓库(Warehouse)")] [Display(Name = "仓库(Warehouse)")]
public decimal Warehouse { set; get; } public string Warehouse { set; get; }
/// <summary> /// <summary>
/// 收货口(Warehouse Dock) /// 收货口(Warehouse Dock)
/// </summary> /// </summary>
[Display(Name = "收货口(WarehouseDock)")] [Display(Name = "收货口(Dock)")]
public string WarehouseDock { set; get; } public string Dock { set; get; }
/// <summary> /// <summary>
/// 时间窗口开始(Time Window Begin) /// 时间窗口开始(Time Window Begin)
@ -66,13 +61,6 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
[Display(Name = "备注(Remark)")] [Display(Name = "备注(Remark)")]
public string Remark { set; get; } public string Remark { set; get; }
/// <summary>
/// 是否已读(IsRead)
/// </summary>
[Display(Name = "是否已读(IsRead)")]
public bool IsRead { set; get; }
public virtual ICollection<ASNDetailsDTO> Details { get; set; } public virtual ICollection<ASNDetailsDTO> Details { get; set; }
/// <summary> /// <summary>

6
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNDTO.cs

@ -63,13 +63,13 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
/// 仓库(Warehouse code) /// 仓库(Warehouse code)
/// </summary> /// </summary>
[Display(Name = "仓库(Warehouse)")] [Display(Name = "仓库(Warehouse)")]
public decimal Warehouse { set; get; } public string Warehouse { set; get; }
/// <summary> /// <summary>
/// 收货口(Warehouse Dock) /// 收货口(Warehouse Dock)
/// </summary> /// </summary>
[Display(Name = "收货口(WarehouseDock)")] [Display(Name = "收货口(Dock)")]
public string WarehouseDock { set; get; } public string Dock { set; get; }
/// <summary> /// <summary>
/// 时间窗口开始(Time Window Begin) /// 时间窗口开始(Time Window Begin)

14
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/ASNs/ASNUpdateDTO.cs

@ -7,6 +7,20 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
/// </summary> /// </summary>
public class ASNUpdateDTO : ASNCreateOrUpdateDTOBase public class ASNUpdateDTO : ASNCreateOrUpdateDTOBase
{ {
/// <summary>
/// 状态(Status)
/// </summary>
[Display(Name = "状态(Status)")]
public int Status { set; get; }
/// <summary>
/// 是否已读(IsRead)
/// </summary>
[Display(Name = "是否已读(IsRead)")]
public bool IsRead { set; get; }
/// <summary> /// <summary>
/// 并发时间戳(Concurrency Stamp) /// 并发时间戳(Concurrency Stamp)
/// </summary> /// </summary>

6
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs

@ -16,10 +16,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public string Warehouse { set; get; } public string Warehouse { set; get; }
/// <summary> /// <summary>
/// 收货口(WarehouseDock) /// 收货口(Dock)
/// </summary> /// </summary>
[Display(Name = "收货口(WarehouseDock)")] [Display(Name = "收货口(Dock)")]
public string WarehouseDock { set; get; } public string Dock { set; get; }
/// <summary> /// <summary>
/// 时间窗口开始(TimeWindowBegin) /// 时间窗口开始(TimeWindowBegin)

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

@ -47,10 +47,10 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
public string Warehouse { set; get; } public string Warehouse { set; get; }
/// <summary> /// <summary>
/// 收货口(WarehouseDock) /// 收货口(Dock)
/// </summary> /// </summary>
[Display(Name = "收货口(WarehouseDock)")] [Display(Name = "收货口(Dock)")]
public string WarehouseDock { set; get; } public string Dock { set; get; }
/// <summary> /// <summary>
/// 时间窗口开始(TimeWindowBegin) /// 时间窗口开始(TimeWindowBegin)

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

@ -4,7 +4,7 @@ using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Win_in.Sfs.Scp.WebApi.Suppliers; using Win_in.Sfs.Scp.WebApi.Suppliers;
namespace Win_in.Sfs.Scp.WebApi.Supplierss namespace Win_in.Sfs.Scp.WebApi.Suppliers
{ {
public interface ISupplierAppService : ICrudAppService<SupplierDTO,Guid,RequestDTO,SupplierCreateDTO, SupplierUpdateDTO> public interface ISupplierAppService : ICrudAppService<SupplierDTO,Guid,RequestDTO,SupplierCreateDTO, SupplierUpdateDTO>
{ {

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

@ -549,9 +549,9 @@
仓库(Warehouse) 仓库(Warehouse)
</summary> </summary>
</member> </member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.WarehouseDock"> <member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.Dock">
<summary> <summary>
收货口(WarehouseDock) 收货口(Dock)
</summary> </summary>
</member> </member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.TimeWindowBegin"> <member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptCreateOrUpdateDTOBase.TimeWindowBegin">
@ -684,9 +684,9 @@
仓库(Warehouse) 仓库(Warehouse)
</summary> </summary>
</member> </member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.WarehouseDock"> <member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.Dock">
<summary> <summary>
收货口(WarehouseDock) 收货口(Dock)
</summary> </summary>
</member> </member>
<member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.TimeWindowBegin"> <member name="P:Win_in.Sfs.Scp.WebApi.Receipts.ReceiptDTO.TimeWindowBegin">

2
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs

@ -7,7 +7,7 @@ using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Win_in.Sfs.Scp.WebApi.Suppliers; using Win_in.Sfs.Scp.WebApi.Suppliers;
namespace Win_in.Sfs.Scp.WebApi.Supplierss namespace Win_in.Sfs.Scp.WebApi.Suppliers
{ {
/// <summary> /// <summary>
/// 供应商服务 /// 供应商服务

12
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Win_in.Sfs.Scp.WebApi.Application.xml

@ -163,38 +163,38 @@
<param name="id">ID</param> <param name="id">ID</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:Win_in.Sfs.Scp.WebApi.Supplierss.SuppliersAppService"> <member name="T:Win_in.Sfs.Scp.WebApi.Suppliers.SuppliersAppService">
<summary> <summary>
零件服务 零件服务
</summary> </summary>
</member> </member>
<member name="M:Win_in.Sfs.Scp.WebApi.Supplierss.SuppliersAppService.GetAsync(System.Guid)"> <member name="M:Win_in.Sfs.Scp.WebApi.Suppliers.SuppliersAppService.GetAsync(System.Guid)">
<summary> <summary>
获取一条数据 (Get a piece of data) 获取一条数据 (Get a piece of data)
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win_in.Sfs.Scp.WebApi.Supplierss.SuppliersAppService.GetListAsync(Win_in.Sfs.Scp.WebApi.InputDTO)"> <member name="M:Win_in.Sfs.Scp.WebApi.Suppliers.SuppliersAppService.GetListAsync(Win_in.Sfs.Scp.WebApi.InputDTO)">
<summary> <summary>
获取数据列表 (Get data list) 获取数据列表 (Get data list)
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win_in.Sfs.Scp.WebApi.Supplierss.SuppliersAppService.CreateAsync(Win_in.Sfs.Scp.WebApi.Suppliers.SupplierCreateDTO)"> <member name="M:Win_in.Sfs.Scp.WebApi.Suppliers.SuppliersAppService.CreateAsync(Win_in.Sfs.Scp.WebApi.Suppliers.SupplierCreateDTO)">
<summary> <summary>
新增实体 (Create New entity) 新增实体 (Create New entity)
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win_in.Sfs.Scp.WebApi.Supplierss.SuppliersAppService.UpdateAsync(System.Guid,Win_in.Sfs.Scp.WebApi.Suppliers.SupplierUpdateDTO)"> <member name="M:Win_in.Sfs.Scp.WebApi.Suppliers.SuppliersAppService.UpdateAsync(System.Guid,Win_in.Sfs.Scp.WebApi.Suppliers.SupplierUpdateDTO)">
<summary> <summary>
修改实体 (Modify entity) 修改实体 (Modify entity)
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win_in.Sfs.Scp.WebApi.Supplierss.SuppliersAppService.DeleteAsync(System.Guid)"> <member name="M:Win_in.Sfs.Scp.WebApi.Suppliers.SuppliersAppService.DeleteAsync(System.Guid)">
<summary> <summary>
删除实体 (Delete entity) 删除实体 (Delete entity)
</summary> </summary>

40
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/ASNs/ASN.cs

@ -66,13 +66,13 @@ namespace Win_in.Sfs.Scp.WebApi
/// 仓库(Warehouse code) /// 仓库(Warehouse code)
/// </summary> /// </summary>
[Display(Name = "仓库(Warehouse)")] [Display(Name = "仓库(Warehouse)")]
public decimal Warehouse { set; get; } public string Warehouse { set; get; }
/// <summary> /// <summary>
/// 收货口(Warehouse Dock) /// 收货口(Warehouse Dock)
/// </summary> /// </summary>
[Display(Name = "收货口(WarehouseDock)")] [Display(Name = "收货口(Dock)")]
public string WarehouseDock { set; get; } public string Dock { set; get; }
/// <summary> /// <summary>
/// 时间窗口开始(Time Window Begin) /// 时间窗口开始(Time Window Begin)
@ -111,9 +111,33 @@ namespace Win_in.Sfs.Scp.WebApi
public bool IsRead { set; get; } public bool IsRead { set; get; }
public virtual List<ASNDetail> ASNDetails { get; set; } public virtual List<ASNDetail> Details { get; set; }
protected ASN() { }
public ASN(string asnNumber,string rpNumber,string poNumber,string supplierCode, string site,
string company, string warehouse, string dock,DateTime timeWindowBegin,DateTime timeWindowEnd,
string contactName, string contactPhone, string carNumber, string remark)
{
AsnNumber = asnNumber;
RpNumber = rpNumber;
PoNumber = poNumber;
SupplierCode = supplierCode;
Site = site;
Company = company;
Warehouse = warehouse;
Dock = dock;
TimeWindowBegin = timeWindowBegin;
TimeWindowEnd = timeWindowEnd;
ContactName = contactName;
ContactPhone = contactPhone;
CarNumber = carNumber;
Remark = remark;
Status = 0;//TODO 改成枚举
IsRead = false;
Details = new List<ASNDetail>();
}
#region details handler #region details handler
public virtual void AddDetail(IGuidGenerator guidGenerator, ASNDetail detail) public virtual void AddDetail(IGuidGenerator guidGenerator, ASNDetail detail)
@ -125,7 +149,7 @@ namespace Win_in.Sfs.Scp.WebApi
throw new Exception(detail.PoNumber + detail.PoLine + "已经在明细中存在!"); 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.ProductionDate, Details.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)); detail.Uom, detail.DeliverQty, detail.StdPackUom, detail.StdPackQty, detail.SupplierPackUom,detail.SupplierPackQty,detail.SupplierPackConvertRate, detail.LabelCode,detail.BarCode,detail.PalletLabelCode));
} }
@ -143,12 +167,12 @@ namespace Win_in.Sfs.Scp.WebApi
public virtual bool IsInDetails(string ponumber, string poline) public virtual bool IsInDetails(string ponumber, string poline)
{ {
return ASNDetails.Any(di => di.PoNumber == ponumber && di.PoLine == poline); return Details.Any(di => di.PoNumber == ponumber && di.PoLine == poline);
} }
public virtual bool IsInDetails(Guid itemId) public virtual bool IsInDetails(Guid itemId)
{ {
return ASNDetails.Any(di => di.Id == itemId); return Details.Any(di => di.Id == itemId);
} }
public virtual bool UpdateDetail(IGuidGenerator guidGenerator, ASNDetail detail) public virtual bool UpdateDetail(IGuidGenerator guidGenerator, ASNDetail detail)
@ -173,7 +197,7 @@ namespace Win_in.Sfs.Scp.WebApi
public virtual ASNDetail FindDetail(Guid itemId) public virtual ASNDetail FindDetail(Guid itemId)
{ {
var item = ASNDetails.FirstOrDefault(p => p.Id == itemId); var item = Details.FirstOrDefault(p => p.Id == itemId);
return item; return item;
} }

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

@ -113,19 +113,19 @@ namespace Win_in.Sfs.Scp.WebApi
public string PalletLabelCode { set; get; } public string PalletLabelCode { set; get; }
public ASNDetail() { } protected ASNDetail() { }
public ASNDetail( public ASNDetail(
Guid id, string asnNumber,string poNumber, string poLine, string partCode, string lot, string SupplierLot, DateTime ProductionDate, string uom,decimal deliverQty, 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) string stdPackUom, decimal stdPackQty, string supplierPackUom, decimal supplierPackQty, decimal supplierPackConvertRate,string labelCode,string barCode,string palletLabelCode) : base(id)
{ {
AsnNumber = asnNumber; AsnNumber = asnNumber;
PoNumber = poNumber; PoNumber = poNumber;
PoLine = poLine; PoLine = poLine;
PartCode = partCode; PartCode = partCode;
Lot = lot; Lot = lot;
SupplierLot = SupplierLot; SupplierLot = supplierLot;
ProductionDate = ProductionDate; ProductionDate = productionDate;
Uom = uom; Uom = uom;
DeliverQty = deliverQty; DeliverQty = deliverQty;
StdPackUom = stdPackUom; StdPackUom = stdPackUom;
@ -135,7 +135,7 @@ namespace Win_in.Sfs.Scp.WebApi
SupplierPackConvertRate = supplierPackConvertRate; SupplierPackConvertRate = supplierPackConvertRate;
LabelCode = labelCode; LabelCode = labelCode;
BarCode = barCode; BarCode = barCode;
PalletLabelCode = PalletLabelCode; PalletLabelCode = palletLabelCode;
} }
} }
} }

6
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs

@ -53,10 +53,10 @@ namespace Win_in.Sfs.Scp.WebApi
public string Warehouse { set; get; } public string Warehouse { set; get; }
/// <summary> /// <summary>
/// 收货口(WarehouseDock) /// 收货口(Dock)
/// </summary> /// </summary>
[Display(Name = "收货口(WarehouseDock)")] [Display(Name = "收货口(Dock)")]
public string WarehouseDock { set; get; } public string Dock { set; get; }
/// <summary> /// <summary>
/// 时间窗口开始(TimeWindowBegin) /// 时间窗口开始(TimeWindowBegin)

8
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs

@ -175,7 +175,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(q => q.SupplierCode).IsRequired().HasMaxLength(64); b.Property(q => q.SupplierCode).IsRequired().HasMaxLength(64);
b.Property(q => q.RcType).IsRequired().HasMaxLength(64); b.Property(q => q.RcType).IsRequired().HasMaxLength(64);
b.Property(q => q.Warehouse).IsRequired().HasMaxLength(64); b.Property(q => q.Warehouse).IsRequired().HasMaxLength(64);
b.Property(q => q.WarehouseDock).IsRequired().HasMaxLength(64); b.Property(q => q.Dock).IsRequired().HasMaxLength(64);
b.Property(q => q.TimeWindowBegin).IsRequired(); 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.ReceiveTime).IsRequired();
@ -290,8 +290,8 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(q => q.ContactName).HasMaxLength(64); b.Property(q => q.ContactName).HasMaxLength(64);
b.Property(q => q.ContactPhone).HasMaxLength(64); b.Property(q => q.ContactPhone).HasMaxLength(64);
b.Property(q => q.CarNumber).HasMaxLength(64); b.Property(q => q.CarNumber).HasMaxLength(64);
b.Property(q => q.Warehouse).IsRequired(); b.Property(q => q.Warehouse).IsRequired().HasMaxLength(64);
b.Property(q => q.WarehouseDock).IsRequired().HasMaxLength(64); b.Property(q => q.Dock).IsRequired().HasMaxLength(64);
b.Property(q => q.TimeWindowBegin).IsRequired(); 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.Site).IsRequired().HasMaxLength(64);
@ -301,7 +301,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(x => x.SequenceNumber).HasMaxLength(64); b.Property(x => x.SequenceNumber).HasMaxLength(64);
b.Property(x => x.IsRead).IsRequired(); ; b.Property(x => x.IsRead).IsRequired(); ;
b.HasMany(u => u.ASNDetails).WithOne().HasForeignKey(rd => rd.Id).OnDelete(DeleteBehavior.NoAction).IsRequired(); b.HasMany(u => u.Details).WithOne().HasForeignKey(rd => rd.Id).OnDelete(DeleteBehavior.NoAction).IsRequired();
b.HasIndex(x => new { x.AsnNumber,x.Company,x.Site }).IsUnique(); b.HasIndex(x => new { x.AsnNumber,x.Company,x.Site }).IsUnique();

Loading…
Cancel
Save