rongguo.jia
/
ScpBackend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增或缺失字段修改

master
yu.wu 3 years ago
parent
26cb52d3df
commit
fe3b3b8666
13 changed files with 360 additions and 322 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs
  2. 94
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs
  3. 94
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs
  4. 80
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs
  5. 90
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs
  6. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs
  7. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs
  8. 4
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs
  9. 50
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs
  10. 82
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs
  11. 90
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs
  12. 6
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Suppliers/Supplier.cs
  13. 40
      ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs

40
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs
View File

@ -41,17 +41,17 @@ namespace Win_in.Sfs.Scp.WebApi.POs
public decimal OrderQty { set; get; } public decimal OrderQty { set; get; }
/// <summary> ///// <summary>
/// 已关闭数量(Closed Qty) ///// 已关闭数量(Closed Qty)
/// </summary> ///// </summary>
[Display(Name = "已关闭数量(Closed Qty)")] //[Display(Name = "已关闭数量(Closed Qty)")]
public decimal ClosedQty { get; set; } //public decimal ClosedQty { get; set; }
/// <summary> ///// <summary>
/// 标包计量单位(Standard Pack Uom) ///// 标包计量单位(Standard Pack Uom)
/// </summary> ///// </summary>
[Display(Name = "标包计量单位(Standard Pack Uom)")] //[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; } //public string StdPackUom { set; get; }
/// <summary> /// <summary>
/// 标包数量(Standard Pack Qty) /// 标包数量(Standard Pack Qty)
@ -59,17 +59,17 @@ namespace Win_in.Sfs.Scp.WebApi.POs
[Display(Name = "标包数量(Standard Pack Qty)")] [Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; } public decimal StdPackQty { set; get; }
/// <summary> ///// <summary>
/// 供应商计量单位(SupplierPackUom) ///// 供应商计量单位(SupplierPackUom)
/// </summary> ///// </summary>
[Display(Name = "供应商计量单位(SupplierPackUom)")] //[Display(Name = "供应商计量单位(SupplierPackUom)")]
public string SupplierPackUom { set; get; } //public string SupplierPackUom { set; get; }
/// <summary> ///// <summary>
/// 供应商包装数量(SupplierPackQty) ///// 供应商包装数量(SupplierPackQty)
/// </summary> ///// </summary>
[Display(Name = "供应商包装数量(SupplierPackQty)")] //[Display(Name = "供应商包装数量(SupplierPackQty)")]
public decimal SupplierPackQty { set; get; } //public decimal SupplierPackQty { set; get; }
/// <summary> /// <summary>
/// 供应商包装转换率(SupplierPackConvertRate) /// 供应商包装转换率(SupplierPackConvertRate)

94
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs
View File

@ -86,53 +86,53 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
[Display(Name = "分组")] [Display(Name = "分组")]
public string Group { get; set; } public string Group { get; set; }
/// <summary> ///// <summary>
/// 颜色(Color) ///// 颜色(Color)
/// </summary> ///// </summary>
[Display(Name = "颜色")] //[Display(Name = "颜色")]
public string Color { get; set; } //public string Color { get; set; }
/// <summary> ///// <summary>
/// 配置(Configuration) ///// 配置(Configuration)
/// </summary> ///// </summary>
[Display(Name = "配置")] //[Display(Name = "配置")]
public string Configuration { get; set; } //public string Configuration { get; set; }
/// <summary> ///// <summary>
/// 项目(Project) ///// 项目(Project)
/// </summary> ///// </summary>
[Display(Name = "项目")] //[Display(Name = "项目")]
public string Project { get; set; } //public string Project { get; set; }
/// <summary> ///// <summary>
/// 工程变更通知单(Engineering change order) ///// 工程变更通知单(Engineering change order)
/// </summary> ///// </summary>
[Display(Name = "工程变更通知单")] //[Display(Name = "工程变更通知单")]
public string Eco { get; set; } //public string Eco { get; set; }
/// <summary> ///// <summary>
/// 标包计量单位(Standard Pack Uom) ///// 标包计量单位(Standard Pack Uom)
/// </summary> ///// </summary>
[Display(Name = "标包计量单位")] //[Display(Name = "标包计量单位")]
public string StdPackUom { get; set; } //public string StdPackUom { get; set; }
/// <summary> ///// <summary>
/// 标包数量(Standard Pack Qty) ///// 标包数量(Standard Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "标包数量")] //[Display(Name = "标包数量")]
public decimal StdPackQty { get; set; } //public decimal StdPackQty { get; set; }
/// <summary> ///// <summary>
/// 替代计量单位(Extra Pack UM) ///// 替代计量单位(Extra Pack UM)
/// </summary> ///// </summary>
[Display(Name = "替代计量单位")] //[Display(Name = "替代计量单位")]
public string ExtPackUom { get; set; } //public string ExtPackUom { get; set; }
/// <summary> ///// <summary>
/// 替代包装数量(Extra Pack Qty) ///// 替代包装数量(Extra Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "替代包装数量")] //[Display(Name = "替代包装数量")]
public decimal ExtPackQty { get; set; } //public decimal ExtPackQty { get; set; }
/// <summary> /// <summary>
/// 扩展属性(Extra Properties) /// 扩展属性(Extra Properties)

94
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs
View File

@ -90,53 +90,53 @@ namespace Win_in.Sfs.Scp.WebApi.Parts
[Display(Name = "分组")] [Display(Name = "分组")]
public string Group { get; set; } public string Group { get; set; }
/// <summary> ///// <summary>
/// 颜色(Color) ///// 颜色(Color)
/// </summary> ///// </summary>
[Display(Name = "颜色")] //[Display(Name = "颜色")]
public string Color { get; set; } //public string Color { get; set; }
/// <summary> ///// <summary>
/// 配置(Configuration) ///// 配置(Configuration)
/// </summary> ///// </summary>
[Display(Name = "配置")] //[Display(Name = "配置")]
public string Configuration { get; set; } //public string Configuration { get; set; }
/// <summary> ///// <summary>
/// 项目(Project) ///// 项目(Project)
/// </summary> ///// </summary>
[Display(Name = "项目")] //[Display(Name = "项目")]
public string Project { get; set; } //public string Project { get; set; }
/// <summary> ///// <summary>
/// 工程变更通知单(Engineering change order) ///// 工程变更通知单(Engineering change order)
/// </summary> ///// </summary>
[Display(Name = "工程变更通知单")] //[Display(Name = "工程变更通知单")]
public string Eco { get; set; } //public string Eco { get; set; }
/// <summary> ///// <summary>
/// 标包计量单位(Standard Pack Uom) ///// 标包计量单位(Standard Pack Uom)
/// </summary> ///// </summary>
[Display(Name = "标包计量单位")] //[Display(Name = "标包计量单位")]
public string StdPackUom { get; set; } //public string StdPackUom { get; set; }
/// <summary> ///// <summary>
/// 标包数量(Standard Pack Qty) ///// 标包数量(Standard Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "标包数量")] //[Display(Name = "标包数量")]
public decimal StdPackQty { get; set; } //public decimal StdPackQty { get; set; }
/// <summary> ///// <summary>
/// 替代计量单位(Extra Pack UM) ///// 替代计量单位(Extra Pack UM)
/// </summary> ///// </summary>
[Display(Name = "替代计量单位")] //[Display(Name = "替代计量单位")]
public string ExtPackUom { get; set; } //public string ExtPackUom { get; set; }
/// <summary> ///// <summary>
/// 替代包装数量(Extra Pack Qty) ///// 替代包装数量(Extra Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "替代包装数量")] //[Display(Name = "替代包装数量")]
public decimal ExtPackQty { get; set; } //public decimal ExtPackQty { get; set; }
/// <summary> /// <summary>
/// 地点(Site) /// 地点(Site)

80
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs
View File

@ -21,18 +21,24 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
[Display(Name = "收货口(Dock)")] [Display(Name = "收货口(Dock)")]
public string Dock { set; get; } public string Dock { set; get; }
/// <summary> ///// <summary>
/// 时间窗口开始(TimeWindowBegin) ///// 时间窗口开始(TimeWindowBegin)
/// </summary> ///// </summary>
[Display(Name = "时间窗口开始(TimeWindowBegin)")] //[Display(Name = "时间窗口开始(TimeWindowBegin)")]
public DateTime TimeWindowBegin { set; get; } //public DateTime TimeWindowBegin { set; get; }
///// <summary>
///// 时间窗口结束(TimeWindowEnd)
///// </summary>
//[Display(Name = "时间窗口结束(TimeWindowEnd)")]
//public DateTime TimeWindowEnd { set; get; }
/// <summary> /// <summary>
/// 时间窗口结束(TimeWindowEnd) /// 收货日期(ReceiveDate)
/// </summary> /// </summary>
[Display(Name = "时间窗口结束(TimeWindowEnd)")] [Display(Name = "收货日期(ReceiveDate)")]
public DateTime TimeWindowEnd { set; get; } public DateTime ReceiveDate { set; get; }
/// <summary> /// <summary>
/// 收货时间(ReceiveTime) /// 收货时间(ReceiveTime)
/// </summary> /// </summary>
@ -63,11 +69,11 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
[Display(Name = "计量单位(Uom)")] [Display(Name = "计量单位(Uom)")]
public string Uom { set; get; } public string Uom { set; get; }
/// <summary> ///// <summary>
/// 发货数量(DeliverQty) ///// 发货数量(DeliverQty)
/// </summary> ///// </summary>
[Display(Name = "发货数量(DeliverQty)")] //[Display(Name = "发货数量(DeliverQty)")]
public decimal DeliverQty { set; get; } //public decimal DeliverQty { set; get; }
/// <summary> /// <summary>
/// 收货数量(ReceiveQty) /// 收货数量(ReceiveQty)
@ -75,29 +81,29 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
[Display(Name = "收货数量(ReceiveQty)")] [Display(Name = "收货数量(ReceiveQty)")]
public decimal ReceiveQty { set; get; } public decimal ReceiveQty { set; get; }
/// <summary> ///// <summary>
/// 标包计量单位(Standard Pack Uom) ///// 标包计量单位(Standard Pack Uom)
/// </summary> ///// </summary>
[Display(Name = "标包计量单位(Standard Pack Uom)")] //[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; } //public string StdPackUom { set; get; }
/// <summary> ///// <summary>
/// 标包数量(Standard Pack Qty) ///// 标包数量(Standard Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "标包数量(Standard Pack Qty)")] //[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; } //public decimal StdPackQty { set; get; }
/// <summary> ///// <summary>
/// 供应商计量单位(SupplierPackUom) ///// 供应商计量单位(SupplierPackUom)
/// </summary> ///// </summary>
[Display(Name = "供应商计量单位(SupplierPackUom)")] //[Display(Name = "供应商计量单位(SupplierPackUom)")]
public string SupplierPackUom { set; get; } //public string SupplierPackUom { set; get; }
/// <summary> ///// <summary>
/// 供应商包装数量(SupplierPackQty) ///// 供应商包装数量(SupplierPackQty)
/// </summary> ///// </summary>
[Display(Name = "供应商包装数量(SupplierPackQty)")] //[Display(Name = "供应商包装数量(SupplierPackQty)")]
public decimal SupplierPackQty { set; get; } //public decimal SupplierPackQty { set; get; }
/// <summary> /// <summary>
/// 供应商包装转换率(SupplierPackConvertRate) /// 供应商包装转换率(SupplierPackConvertRate)

90
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs
View File

@ -22,11 +22,11 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
[Display(Name = "发货单号(AsnNumber)")] [Display(Name = "发货单号(AsnNumber)")]
public string AsnNumber { set; get; } public string AsnNumber { set; get; }
/// <summary> ///// <summary>
/// 要货计划单号(RpNumber) ///// 要货计划单号(RpNumber)
/// </summary> ///// </summary>
[Display(Name = "要货计划单号(RpNumber)")] //[Display(Name = "要货计划单号(RpNumber)")]
public string RpNumber { set; get; } //public string RpNumber { set; get; }
/// <summary> /// <summary>
/// 订单号(PoNumber) /// 订单号(PoNumber)
@ -52,18 +52,24 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
[Display(Name = "收货口(Dock)")] [Display(Name = "收货口(Dock)")]
public string Dock { set; get; } public string Dock { set; get; }
/// <summary> ///// <summary>
/// 时间窗口开始(TimeWindowBegin) ///// 时间窗口开始(TimeWindowBegin)
/// </summary> ///// </summary>
[Display(Name = "时间窗口开始(TimeWindowBegin)")] //[Display(Name = "时间窗口开始(TimeWindowBegin)")]
public DateTime TimeWindowBegin { set; get; } //public DateTime TimeWindowBegin { set; get; }
///// <summary>
///// 时间窗口结束(TimeWindowEnd)
///// </summary>
//[Display(Name = "时间窗口结束(TimeWindowEnd)")]
//public DateTime TimeWindowEnd { set; get; }
/// <summary> /// <summary>
/// 时间窗口结束(TimeWindowEnd) /// 收货日期(ReceiveDate)
/// </summary> /// </summary>
[Display(Name = "时间窗口结束(TimeWindowEnd)")] [Display(Name = "收货日期(ReceiveDate)")]
public DateTime TimeWindowEnd { set; get; } public DateTime ReceiveDate { set; get; }
/// <summary> /// <summary>
/// 收货时间(ReceiveTime) /// 收货时间(ReceiveTime)
/// </summary> /// </summary>
@ -118,11 +124,11 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
[Display(Name = "计量单位(Uom)")] [Display(Name = "计量单位(Uom)")]
public string Uom { set; get; } public string Uom { set; get; }
/// <summary> ///// <summary>
/// 发货数量(DeliverQty) ///// 发货数量(DeliverQty)
/// </summary> ///// </summary>
[Display(Name = "发货数量(DeliverQty)")] //[Display(Name = "发货数量(DeliverQty)")]
public decimal DeliverQty { set; get; } //public decimal DeliverQty { set; get; }
/// <summary> /// <summary>
/// 收货数量(ReceiveQty) /// 收货数量(ReceiveQty)
@ -130,29 +136,29 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
[Display(Name = "收货数量(ReceiveQty)")] [Display(Name = "收货数量(ReceiveQty)")]
public decimal ReceiveQty { set; get; } public decimal ReceiveQty { set; get; }
/// <summary> ///// <summary>
/// 标包计量单位(Standard Pack Uom) ///// 标包计量单位(Standard Pack Uom)
/// </summary> ///// </summary>
[Display(Name = "标包计量单位(Standard Pack Uom)")] //[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; } //public string StdPackUom { set; get; }
/// <summary> ///// <summary>
/// 标包数量(Standard Pack Qty) ///// 标包数量(Standard Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "标包数量(Standard Pack Qty)")] //[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; } //public decimal StdPackQty { set; get; }
/// <summary> ///// <summary>
/// 供应商计量单位(SupplierPackUom) ///// 供应商计量单位(SupplierPackUom)
/// </summary> ///// </summary>
[Display(Name = "供应商计量单位(SupplierPackUom)")] //[Display(Name = "供应商计量单位(SupplierPackUom)")]
public string SupplierPackUom { set; get; } //public string SupplierPackUom { set; get; }
/// <summary> ///// <summary>
/// 供应商包装数量(SupplierPackQty) ///// 供应商包装数量(SupplierPackQty)
/// </summary> ///// </summary>
[Display(Name = "供应商包装数量(SupplierPackQty)")] //[Display(Name = "供应商包装数量(SupplierPackQty)")]
public decimal SupplierPackQty { set; get; } //public decimal SupplierPackQty { set; get; }
/// <summary> /// <summary>
/// 供应商包装转换率(SupplierPackConvertRate) /// 供应商包装转换率(SupplierPackConvertRate)

6
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs
View File

@ -86,5 +86,11 @@ namespace Win_in.Sfs.Scp.WebApi.Suppliers
/// </summary> /// </summary>
[Display(Name = "备注(Remark)")] [Display(Name = "备注(Remark)")]
public string Remark { set; get; } public string Remark { set; get; }
/// <summary>
/// 银行(Bank)
/// </summary>
[Display(Name = "银行(Bank)")]
public string Bank { set; get; }
} }
} }

6
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs
View File

@ -99,5 +99,11 @@ namespace Win_in.Sfs.Scp.WebApi.Suppliers
/// </summary> /// </summary>
[Display(Name = "备注(Remark)")] [Display(Name = "备注(Remark)")]
public string Remark { set; get; } public string Remark { set; get; }
/// <summary>
/// 银行(Bank)
/// </summary>
[Display(Name = "银行(Bank)")]
public string Bank { set; get; }
} }
} }

4
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs
View File

@ -107,8 +107,8 @@ namespace Win_in.Sfs.Scp.WebApi
throw new Exception(detail.PoNumber+ detail.PoLine + "已经在明细中存在！"); throw new Exception(detail.PoNumber+ detail.PoLine + "已经在明细中存在！");
} }
PODetails.Add(new PODetail(guidGenerator.Create(),detail.PoNumber, detail.PoLine, detail.PartCode, detail.Uom, detail.OrderQty, detail.StdPackUom,detail.StdPackQty, PODetails.Add(new PODetail(guidGenerator.Create(),detail.PoNumber, detail.PoLine, detail.PartCode, detail.Uom, detail.OrderQty, detail.StdPackQty,
detail.SupplierPackUom, detail.SupplierPackQty, detail.SupplierPackConvertRate, detail.IsConsignment, detail.LineStatus, detail.Remark)); detail.SupplierPackConvertRate, detail.IsConsignment, detail.LineStatus, detail.Remark));
} }
public virtual void AddDetails(IGuidGenerator guidGenerator, IEnumerable<PODetail> details) public virtual void AddDetails(IGuidGenerator guidGenerator, IEnumerable<PODetail> details)

50
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs
View File

@ -40,18 +40,18 @@ namespace Win_in.Sfs.Scp.WebApi
[Display(Name = "订单数量(OrderQty)")] [Display(Name = "订单数量(OrderQty)")]
public decimal? OrderQty { set; get; } public decimal? OrderQty { set; get; }
/// <summary> ///// <summary>
/// 已关闭数量(Closed Qty) ///// 已关闭数量(Closed Qty)
/// </summary> ///// </summary>
[Display(Name = "已关闭数量(Closed Qty)")] //[Display(Name = "已关闭数量(Closed Qty)")]
public decimal ClosedQty { get; set; } //public decimal ClosedQty { get; set; }
/// <summary> ///// <summary>
/// 标包计量单位(Standard Pack Uom) ///// 标包计量单位(Standard Pack Uom)
/// </summary> ///// </summary>
[Display(Name = "标包计量单位(Standard Pack Uom)")] //[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; } //public string StdPackUom { set; get; }
/// <summary> /// <summary>
/// 标包数量(Standard Pack Qty) /// 标包数量(Standard Pack Qty)
@ -59,17 +59,17 @@ namespace Win_in.Sfs.Scp.WebApi
[Display(Name = "标包数量(Standard Pack Qty)")] [Display(Name = "标包数量(Standard Pack Qty)")]
public decimal? StdPackQty { set; get; } public decimal? StdPackQty { set; get; }
/// <summary> ///// <summary>
/// 供应商计量单位(SupplierPackUom) ///// 供应商计量单位(SupplierPackUom)
/// </summary> ///// </summary>
[Display(Name = "供应商计量单位(SupplierPackUom)")] //[Display(Name = "供应商计量单位(SupplierPackUom)")]
public string SupplierPackUom { set; get; } //public string SupplierPackUom { set; get; }
/// <summary> ///// <summary>
/// 供应商包装数量(SupplierPackQty) ///// 供应商包装数量(SupplierPackQty)
/// </summary> ///// </summary>
[Display(Name = "供应商包装数量(SupplierPackQty)")] //[Display(Name = "供应商包装数量(SupplierPackQty)")]
public decimal? SupplierPackQty { set; get; } //public decimal? SupplierPackQty { set; get; }
/// <summary> /// <summary>
/// 供应商包装转换率(SupplierPackConvertRate) /// 供应商包装转换率(SupplierPackConvertRate)
@ -99,18 +99,18 @@ namespace Win_in.Sfs.Scp.WebApi
public PODetail() { } public PODetail() { }
public PODetail( public PODetail(
Guid id , string poNumber, string poLine,string partCode, string uom, decimal? orderQty, string stdPackUom, decimal? stdPackQty, Guid id , string poNumber, string poLine,string partCode, string uom, decimal? orderQty, decimal? stdPackQty,
string supplierPackUom, decimal? supplierPackQty, decimal? supplierPackConvertRate, bool isConsignment,int lineStatus,string remark) :base(id) decimal? supplierPackConvertRate, bool isConsignment,int lineStatus,string remark) :base(id)
{ {
PoNumber = poNumber; PoNumber = poNumber;
PoLine = poLine; PoLine = poLine;
PartCode = partCode; PartCode = partCode;
Uom = uom; Uom = uom;
OrderQty = orderQty; OrderQty = orderQty;
StdPackUom = stdPackUom; //StdPackUom = stdPackUom;
StdPackQty = stdPackQty; StdPackQty = stdPackQty;
SupplierPackUom = supplierPackUom; //SupplierPackUom = supplierPackUom;
SupplierPackQty = supplierPackQty; //SupplierPackQty = supplierPackQty;
SupplierPackConvertRate = supplierPackConvertRate; SupplierPackConvertRate = supplierPackConvertRate;
IsConsignment = isConsignment; IsConsignment = isConsignment;
LineStatus = lineStatus; LineStatus = lineStatus;

82
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs
View File

@ -88,23 +88,23 @@ namespace Win_in.Sfs.Scp.WebApi
[Display(Name = "分组")] [Display(Name = "分组")]
public string Group {get;set;} public string Group {get;set;}
/// <summary> ///// <summary>
/// 颜色(Color) ///// 颜色(Color)
/// </summary> ///// </summary>
[Display(Name = "颜色")] //[Display(Name = "颜色")]
public string Color {get;set;} //public string Color {get;set;}
/// <summary> ///// <summary>
/// 配置(Configuration) ///// 配置(Configuration)
/// </summary> ///// </summary>
[Display(Name = "配置")] //[Display(Name = "配置")]
public string Configuration {get;set;} //public string Configuration {get;set;}
/// <summary> ///// <summary>
/// 项目(Project) ///// 项目(Project)
/// </summary> ///// </summary>
[Display(Name = "项目")] //[Display(Name = "项目")]
public string Project {get;set;} //public string Project {get;set;}
/// <summary> /// <summary>
/// 版本(version) /// 版本(version)
@ -115,32 +115,32 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary> /// <summary>
/// 工程变更通知单(Engineering change order) /// 工程变更通知单(Engineering change order)
/// </summary> /// </summary>
[Display(Name = "工程变更通知单")] //[Display(Name = "工程变更通知单")]
public string Eco {get;set;} //public string Eco {get;set;}
/// <summary> ///// <summary>
/// 标包计量单位(Standard Pack Uom) ///// 标包计量单位(Standard Pack Uom)
/// </summary> ///// </summary>
[Display(Name = "标包计量单位")] //[Display(Name = "标包计量单位")]
public string StdPackUom {get;set;} //public string StdPackUom {get;set;}
/// <summary> ///// <summary>
/// 标包数量(Standard Pack Qty) ///// 标包数量(Standard Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "标包数量")] //[Display(Name = "标包数量")]
public decimal StdPackQty {get;set;} //public decimal StdPackQty {get;set;}
/// <summary> ///// <summary>
/// 替代计量单位(Extra Pack UM) ///// 替代计量单位(Extra Pack UM)
/// </summary> ///// </summary>
[Display(Name = "替代计量单位")] //[Display(Name = "替代计量单位")]
public string ExtPackUom {get;set;} //public string ExtPackUom {get;set;}
/// <summary> ///// <summary>
/// 替代包装数量(Extra Pack Qty) ///// 替代包装数量(Extra Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "替代包装数量")] //[Display(Name = "替代包装数量")]
public decimal ExtPackQty {get;set;} //public decimal ExtPackQty {get;set;}
/// <summary> /// <summary>
/// 地点(Site) /// 地点(Site)

90
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs
View File

@ -22,11 +22,11 @@ namespace Win_in.Sfs.Scp.WebApi
[Display(Name = "发货单号(AsnNumber)")] [Display(Name = "发货单号(AsnNumber)")]
public string AsnNumber { set; get; } public string AsnNumber { set; get; }
/// <summary> ///// <summary>
/// 要货计划单号(RpNumber) ///// 要货计划单号(RpNumber)
/// </summary> ///// </summary>
[Display(Name = "要货计划单号(RpNumber)")] //[Display(Name = "要货计划单号(RpNumber)")]
public string RpNumber { set; get; } //public string RpNumber { set; get; }
/// <summary> /// <summary>
/// 订单号(PoNumber) /// 订单号(PoNumber)
@ -58,18 +58,24 @@ namespace Win_in.Sfs.Scp.WebApi
[Display(Name = "收货口(Dock)")] [Display(Name = "收货口(Dock)")]
public string Dock { set; get; } public string Dock { set; get; }
/// <summary> ///// <summary>
/// 时间窗口开始(TimeWindowBegin) ///// 时间窗口开始(TimeWindowBegin)
/// </summary> ///// </summary>
[Display(Name = "时间窗口开始(TimeWindowBegin)")] //[Display(Name = "时间窗口开始(TimeWindowBegin)")]
public DateTime TimeWindowBegin { set; get; } //public DateTime TimeWindowBegin { set; get; }
///// <summary>
///// 时间窗口结束(TimeWindowEnd)
///// </summary>
//[Display(Name = "时间窗口结束(TimeWindowEnd)")]
//public DateTime TimeWindowEnd { set; get; }
/// <summary> /// <summary>
/// 时间窗口结束(TimeWindowEnd) /// 收货日期(ReceiveDate)
/// </summary> /// </summary>
[Display(Name = "时间窗口结束(TimeWindowEnd)")] [Display(Name = "收货日期(ReceiveDate)")]
public DateTime TimeWindowEnd { set; get; } public DateTime ReceiveDate { set; get; }
/// <summary> /// <summary>
/// 收货时间(ReceiveTime) /// 收货时间(ReceiveTime)
/// </summary> /// </summary>
@ -124,11 +130,11 @@ namespace Win_in.Sfs.Scp.WebApi
[Display(Name = "计量单位(Uom)")] [Display(Name = "计量单位(Uom)")]
public string Uom { set; get; } public string Uom { set; get; }
/// <summary> ///// <summary>
/// 发货数量(DeliverQty) ///// 发货数量(DeliverQty)
/// </summary> ///// </summary>
[Display(Name = "发货数量(DeliverQty)")] //[Display(Name = "发货数量(DeliverQty)")]
public decimal DeliverQty { set; get; } //public decimal DeliverQty { set; get; }
/// <summary> /// <summary>
/// 收货数量(ReceiveQty) /// 收货数量(ReceiveQty)
@ -136,29 +142,29 @@ namespace Win_in.Sfs.Scp.WebApi
[Display(Name = "收货数量(ReceiveQty)")] [Display(Name = "收货数量(ReceiveQty)")]
public decimal ReceiveQty { set; get; } public decimal ReceiveQty { set; get; }
/// <summary> ///// <summary>
/// 标包计量单位(Standard Pack Uom) ///// 标包计量单位(Standard Pack Uom)
/// </summary> ///// </summary>
[Display(Name = "标包计量单位(Standard Pack Uom)")] //[Display(Name = "标包计量单位(Standard Pack Uom)")]
public string StdPackUom { set; get; } //public string StdPackUom { set; get; }
/// <summary> ///// <summary>
/// 标包数量(Standard Pack Qty) ///// 标包数量(Standard Pack Qty)
/// </summary> ///// </summary>
[Display(Name = "标包数量(Standard Pack Qty)")] //[Display(Name = "标包数量(Standard Pack Qty)")]
public decimal StdPackQty { set; get; } //public decimal StdPackQty { set; get; }
/// <summary> ///// <summary>
/// 供应商计量单位(SupplierPackUom) ///// 供应商计量单位(SupplierPackUom)
/// </summary> ///// </summary>
[Display(Name = "供应商计量单位(SupplierPackUom)")] //[Display(Name = "供应商计量单位(SupplierPackUom)")]
public string SupplierPackUom { set; get; } //public string SupplierPackUom { set; get; }
/// <summary> ///// <summary>
/// 供应商包装数量(SupplierPackQty) ///// 供应商包装数量(SupplierPackQty)
/// </summary> ///// </summary>
[Display(Name = "供应商包装数量(SupplierPackQty)")] //[Display(Name = "供应商包装数量(SupplierPackQty)")]
public decimal SupplierPackQty { set; get; } //public decimal SupplierPackQty { set; get; }
/// <summary> /// <summary>
/// 供应商包装转换率(SupplierPackConvertRate) /// 供应商包装转换率(SupplierPackConvertRate)

6
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Suppliers/Supplier.cs
View File

@ -99,5 +99,11 @@ namespace Win_in.Sfs.Scp.WebApi
/// </summary> /// </summary>
[Display(Name = "备注(Remark)")] [Display(Name = "备注(Remark)")]
public string Remark { set; get; } public string Remark { set; get; }
/// <summary>
/// 银行(Bank)
/// </summary>
[Display(Name = "银行(Bank)")]
public string Bank { set; get; }
} }
} }

40
ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs
View File

@ -79,16 +79,16 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(x => x.Type).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.Group).HasMaxLength(64);
b.Property(x => x.Color).HasMaxLength(64); //b.Property(x => x.Color).HasMaxLength(64);
b.Property(x => x.Configuration).HasMaxLength(64); //b.Property(x => x.Configuration).HasMaxLength(64);
b.Property(x => x.Project).HasMaxLength(64); //b.Property(x => x.Project).HasMaxLength(64);
b.Property(x => x.Version).HasMaxLength(64); b.Property(x => x.Version).HasMaxLength(64);
b.Property(x => x.SequenceNumber).HasMaxLength(64); b.Property(x => x.SequenceNumber).HasMaxLength(64);
b.Property(x => x.Eco).HasMaxLength(64); //b.Property(x => x.Eco).HasMaxLength(64);
b.Property(x => x.StdPackUom).IsRequired().HasMaxLength(64); //b.Property(x => x.StdPackUom).IsRequired().HasMaxLength(64);
b.Property(x => x.StdPackQty).IsRequired(); //b.Property(x => x.StdPackQty).IsRequired();
b.Property(x => x.ExtPackUom).HasMaxLength(64); //b.Property(x => x.ExtPackUom).HasMaxLength(64);
b.Property(x => x.ExtPackQty); //b.Property(x => x.ExtPackQty);
b.Property(x => x.Site).IsRequired().HasMaxLength(64); b.Property(x => x.Site).IsRequired().HasMaxLength(64);
b.Property(x => x.Company).IsRequired().HasMaxLength(64); b.Property(x => x.Company).IsRequired().HasMaxLength(64);
@ -124,6 +124,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(q => q.IsActive).IsRequired(); b.Property(q => q.IsActive).IsRequired();
b.Property(q => q.Company).HasMaxLength(64); b.Property(q => q.Company).HasMaxLength(64);
b.Property(q => q.Remark).HasMaxLength(4096); b.Property(q => q.Remark).HasMaxLength(4096);
b.Property(x => x.Bank).HasMaxLength(64);
b.Property(x => x.Version).HasMaxLength(64); b.Property(x => x.Version).HasMaxLength(64);
b.Property(x => x.SequenceNumber).HasMaxLength(64); b.Property(x => x.SequenceNumber).HasMaxLength(64);
@ -170,14 +171,15 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(q => q.RcNumber).IsRequired().HasMaxLength(64); b.Property(q => q.RcNumber).IsRequired().HasMaxLength(64);
b.Property(q => q.AsnNumber).IsRequired().HasMaxLength(64); b.Property(q => q.AsnNumber).IsRequired().HasMaxLength(64);
b.Property(q => q.RpNumber).IsRequired().HasMaxLength(64); //b.Property(q => q.RpNumber).IsRequired().HasMaxLength(64);
b.Property(q => q.PoNumber).HasMaxLength(64); b.Property(q => q.PoNumber).HasMaxLength(64);
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.Dock).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.ReceiveDate).IsRequired();
b.Property(q => q.ReceiveTime).IsRequired(); b.Property(q => q.ReceiveTime).IsRequired();
b.Property(q => q.Site).IsRequired().HasMaxLength(64); b.Property(q => q.Site).IsRequired().HasMaxLength(64);
b.Property(q => q.Company).IsRequired().HasMaxLength(64); b.Property(q => q.Company).IsRequired().HasMaxLength(64);
@ -187,12 +189,12 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(q => q.SupplierLot).IsRequired().HasMaxLength(64); b.Property(q => q.SupplierLot).IsRequired().HasMaxLength(64);
b.Property(q => q.ProductionDate).IsRequired(); b.Property(q => q.ProductionDate).IsRequired();
b.Property(q => q.Uom).IsRequired().HasMaxLength(64); b.Property(q => q.Uom).IsRequired().HasMaxLength(64);
b.Property(q => q.DeliverQty).IsRequired(); //b.Property(q => q.DeliverQty).IsRequired();
b.Property(q => q.ReceiveQty).IsRequired(); b.Property(q => q.ReceiveQty).IsRequired();
b.Property(q => q.StdPackUom).IsRequired().HasMaxLength(64); //b.Property(q => q.StdPackUom).IsRequired().HasMaxLength(64);
b.Property(q => q.StdPackQty).IsRequired(); //b.Property(q => q.StdPackQty).IsRequired();
b.Property(q => q.SupplierPackUom).IsRequired().HasMaxLength(64); //b.Property(q => q.SupplierPackUom).IsRequired().HasMaxLength(64);
b.Property(q => q.SupplierPackQty).IsRequired(); //b.Property(q => q.SupplierPackQty).IsRequired();
b.Property(q => q.SupplierPackConvertRate).IsRequired(); b.Property(q => q.SupplierPackConvertRate).IsRequired();
b.Property(q => q.Remark).HasMaxLength(4096); b.Property(q => q.Remark).HasMaxLength(4096);
b.Property(x => x.Version).HasMaxLength(64); b.Property(x => x.Version).HasMaxLength(64);
@ -255,10 +257,10 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore
b.Property(q => q.PartCode).IsRequired().HasMaxLength(64); b.Property(q => q.PartCode).IsRequired().HasMaxLength(64);
b.Property(q => q.Uom).IsRequired().HasMaxLength(64); b.Property(q => q.Uom).IsRequired().HasMaxLength(64);
b.Property(q => q.OrderQty).IsRequired(); b.Property(q => q.OrderQty).IsRequired();
b.Property(q => q.StdPackUom).IsRequired().HasMaxLength(64); //b.Property(q => q.StdPackUom).IsRequired().HasMaxLength(64);
b.Property(q => q.StdPackQty).IsRequired(); b.Property(q => q.StdPackQty).IsRequired();
b.Property(q => q.SupplierPackUom).HasMaxLength(64); //b.Property(q => q.SupplierPackUom).HasMaxLength(64);
b.Property(q => q.SupplierPackQty); //b.Property(q => q.SupplierPackQty);
b.Property(q => q.SupplierPackConvertRate); b.Property(q => q.SupplierPackConvertRate);
b.Property(q => q.IsConsignment).IsRequired(); b.Property(q => q.IsConsignment).IsRequired();
b.Property(q => q.LineStatus).IsRequired(); b.Property(q => q.LineStatus).IsRequired();

Write Preview
Loading…
Cancel
Save