From fe3b3b86662b1f4ebd8c34e0ff5a45b0961f0ae6 Mon Sep 17 00:00:00 2001 From: "yu.wu" Date: Mon, 1 Nov 2021 10:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=96=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../POs/PODetailDTO.cs | 40 ++++---- .../Parts/PartCreateOrUpdateDTOBase.cs | 94 +++++++++---------- .../Parts/PartDTO.cs | 94 +++++++++---------- .../Receipts/ReceiptCreateOrUpdateDTOBase.cs | 80 ++++++++-------- .../Receipts/ReceiptDTO.cs | 90 +++++++++--------- .../SupplierCreateOrUpdateDTOBase.cs | 6 ++ .../Suppliers/SupplierDTO.cs | 6 ++ .../Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs | 4 +- .../POs/PODetail.cs | 50 +++++----- .../Parts/Part.cs | 82 ++++++++-------- .../Receipts/Receipt.cs | 90 +++++++++--------- .../Suppliers/Supplier.cs | 6 ++ .../WebApiDbContextModelCreatingExtensions.cs | 40 ++++---- 13 files changed, 360 insertions(+), 322 deletions(-) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs index 443ef9d..917e3da 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs @@ -41,17 +41,17 @@ namespace Win_in.Sfs.Scp.WebApi.POs public decimal OrderQty { set; get; } - /// - /// 已关闭数量(Closed Qty) - /// - [Display(Name = "已关闭数量(Closed Qty)")] - public decimal ClosedQty { get; set; } + ///// + ///// 已关闭数量(Closed Qty) + ///// + //[Display(Name = "已关闭数量(Closed Qty)")] + //public decimal ClosedQty { get; set; } - /// - /// 标包计量单位(Standard Pack Uom) - /// - [Display(Name = "标包计量单位(Standard Pack Uom)")] - public string StdPackUom { set; get; } + ///// + ///// 标包计量单位(Standard Pack Uom) + ///// + //[Display(Name = "标包计量单位(Standard Pack Uom)")] + //public string StdPackUom { set; get; } /// /// 标包数量(Standard Pack Qty) @@ -59,17 +59,17 @@ namespace Win_in.Sfs.Scp.WebApi.POs [Display(Name = "标包数量(Standard Pack Qty)")] public decimal StdPackQty { set; get; } - /// - /// 供应商计量单位(SupplierPackUom) - /// - [Display(Name = "供应商计量单位(SupplierPackUom)")] - public string SupplierPackUom { set; get; } + ///// + ///// 供应商计量单位(SupplierPackUom) + ///// + //[Display(Name = "供应商计量单位(SupplierPackUom)")] + //public string SupplierPackUom { set; get; } - /// - /// 供应商包装数量(SupplierPackQty) - /// - [Display(Name = "供应商包装数量(SupplierPackQty)")] - public decimal SupplierPackQty { set; get; } + ///// + ///// 供应商包装数量(SupplierPackQty) + ///// + //[Display(Name = "供应商包装数量(SupplierPackQty)")] + //public decimal SupplierPackQty { set; get; } /// /// 供应商包装转换率(SupplierPackConvertRate) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs index 04833b0..cdef980 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs @@ -86,53 +86,53 @@ namespace Win_in.Sfs.Scp.WebApi.Parts [Display(Name = "分组")] public string Group { get; set; } - /// - /// 颜色(Color) - /// - [Display(Name = "颜色")] - public string Color { get; set; } - - /// - /// 配置(Configuration) - /// - [Display(Name = "配置")] - public string Configuration { get; set; } - - /// - /// 项目(Project) - /// - [Display(Name = "项目")] - public string Project { get; set; } - - /// - /// 工程变更通知单(Engineering change order) - /// - [Display(Name = "工程变更通知单")] - public string Eco { get; set; } - - /// - /// 标包计量单位(Standard Pack Uom) - /// - [Display(Name = "标包计量单位")] - public string StdPackUom { get; set; } - - /// - /// 标包数量(Standard Pack Qty) - /// - [Display(Name = "标包数量")] - public decimal StdPackQty { get; set; } - - /// - /// 替代计量单位(Extra Pack UM) - /// - [Display(Name = "替代计量单位")] - public string ExtPackUom { get; set; } - - /// - /// 替代包装数量(Extra Pack Qty) - /// - [Display(Name = "替代包装数量")] - public decimal ExtPackQty { get; set; } + ///// + ///// 颜色(Color) + ///// + //[Display(Name = "颜色")] + //public string Color { get; set; } + + ///// + ///// 配置(Configuration) + ///// + //[Display(Name = "配置")] + //public string Configuration { get; set; } + + ///// + ///// 项目(Project) + ///// + //[Display(Name = "项目")] + //public string Project { get; set; } + + ///// + ///// 工程变更通知单(Engineering change order) + ///// + //[Display(Name = "工程变更通知单")] + //public string Eco { get; set; } + + ///// + ///// 标包计量单位(Standard Pack Uom) + ///// + //[Display(Name = "标包计量单位")] + //public string StdPackUom { get; set; } + + ///// + ///// 标包数量(Standard Pack Qty) + ///// + //[Display(Name = "标包数量")] + //public decimal StdPackQty { get; set; } + + ///// + ///// 替代计量单位(Extra Pack UM) + ///// + //[Display(Name = "替代计量单位")] + //public string ExtPackUom { get; set; } + + ///// + ///// 替代包装数量(Extra Pack Qty) + ///// + //[Display(Name = "替代包装数量")] + //public decimal ExtPackQty { get; set; } /// /// 扩展属性(Extra Properties) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs index e8c1e1c..4a878da 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartDTO.cs @@ -90,53 +90,53 @@ namespace Win_in.Sfs.Scp.WebApi.Parts [Display(Name = "分组")] public string Group { get; set; } - /// - /// 颜色(Color) - /// - [Display(Name = "颜色")] - public string Color { get; set; } - - /// - /// 配置(Configuration) - /// - [Display(Name = "配置")] - public string Configuration { get; set; } - - /// - /// 项目(Project) - /// - [Display(Name = "项目")] - public string Project { get; set; } - - /// - /// 工程变更通知单(Engineering change order) - /// - [Display(Name = "工程变更通知单")] - public string Eco { get; set; } - - /// - /// 标包计量单位(Standard Pack Uom) - /// - [Display(Name = "标包计量单位")] - public string StdPackUom { get; set; } - - /// - /// 标包数量(Standard Pack Qty) - /// - [Display(Name = "标包数量")] - public decimal StdPackQty { get; set; } - - /// - /// 替代计量单位(Extra Pack UM) - /// - [Display(Name = "替代计量单位")] - public string ExtPackUom { get; set; } - - /// - /// 替代包装数量(Extra Pack Qty) - /// - [Display(Name = "替代包装数量")] - public decimal ExtPackQty { get; set; } + ///// + ///// 颜色(Color) + ///// + //[Display(Name = "颜色")] + //public string Color { get; set; } + + ///// + ///// 配置(Configuration) + ///// + //[Display(Name = "配置")] + //public string Configuration { get; set; } + + ///// + ///// 项目(Project) + ///// + //[Display(Name = "项目")] + //public string Project { get; set; } + + ///// + ///// 工程变更通知单(Engineering change order) + ///// + //[Display(Name = "工程变更通知单")] + //public string Eco { get; set; } + + ///// + ///// 标包计量单位(Standard Pack Uom) + ///// + //[Display(Name = "标包计量单位")] + //public string StdPackUom { get; set; } + + ///// + ///// 标包数量(Standard Pack Qty) + ///// + //[Display(Name = "标包数量")] + //public decimal StdPackQty { get; set; } + + ///// + ///// 替代计量单位(Extra Pack UM) + ///// + //[Display(Name = "替代计量单位")] + //public string ExtPackUom { get; set; } + + ///// + ///// 替代包装数量(Extra Pack Qty) + ///// + //[Display(Name = "替代包装数量")] + //public decimal ExtPackQty { get; set; } /// /// 地点(Site) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs index 1c6df20..5ae4c6a 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs @@ -21,18 +21,24 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts [Display(Name = "收货口(Dock)")] public string Dock { set; get; } - /// - /// 时间窗口开始(TimeWindowBegin) - /// - [Display(Name = "时间窗口开始(TimeWindowBegin)")] - public DateTime TimeWindowBegin { set; get; } + ///// + ///// 时间窗口开始(TimeWindowBegin) + ///// + //[Display(Name = "时间窗口开始(TimeWindowBegin)")] + //public DateTime TimeWindowBegin { set; get; } + + ///// + ///// 时间窗口结束(TimeWindowEnd) + ///// + //[Display(Name = "时间窗口结束(TimeWindowEnd)")] + //public DateTime TimeWindowEnd { set; get; } /// - /// 时间窗口结束(TimeWindowEnd) + /// 收货日期(ReceiveDate) /// - [Display(Name = "时间窗口结束(TimeWindowEnd)")] - public DateTime TimeWindowEnd { set; get; } - + [Display(Name = "收货日期(ReceiveDate)")] + public DateTime ReceiveDate { set; get; } + /// /// 收货时间(ReceiveTime) /// @@ -63,11 +69,11 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts [Display(Name = "计量单位(Uom)")] public string Uom { set; get; } - /// - /// 发货数量(DeliverQty) - /// - [Display(Name = "发货数量(DeliverQty)")] - public decimal DeliverQty { set; get; } + ///// + ///// 发货数量(DeliverQty) + ///// + //[Display(Name = "发货数量(DeliverQty)")] + //public decimal DeliverQty { set; get; } /// /// 收货数量(ReceiveQty) @@ -75,29 +81,29 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts [Display(Name = "收货数量(ReceiveQty)")] public decimal ReceiveQty { set; get; } - /// - /// 标包计量单位(Standard Pack Uom) - /// - [Display(Name = "标包计量单位(Standard Pack Uom)")] - public string StdPackUom { set; get; } - - /// - /// 标包数量(Standard Pack Qty) - /// - [Display(Name = "标包数量(Standard Pack Qty)")] - public decimal StdPackQty { set; get; } - - /// - /// 供应商计量单位(SupplierPackUom) - /// - [Display(Name = "供应商计量单位(SupplierPackUom)")] - public string SupplierPackUom { set; get; } - - /// - /// 供应商包装数量(SupplierPackQty) - /// - [Display(Name = "供应商包装数量(SupplierPackQty)")] - public decimal SupplierPackQty { set; get; } + ///// + ///// 标包计量单位(Standard Pack Uom) + ///// + //[Display(Name = "标包计量单位(Standard Pack Uom)")] + //public string StdPackUom { set; get; } + + ///// + ///// 标包数量(Standard Pack Qty) + ///// + //[Display(Name = "标包数量(Standard Pack Qty)")] + //public decimal StdPackQty { set; get; } + + ///// + ///// 供应商计量单位(SupplierPackUom) + ///// + //[Display(Name = "供应商计量单位(SupplierPackUom)")] + //public string SupplierPackUom { set; get; } + + ///// + ///// 供应商包装数量(SupplierPackQty) + ///// + //[Display(Name = "供应商包装数量(SupplierPackQty)")] + //public decimal SupplierPackQty { set; get; } /// /// 供应商包装转换率(SupplierPackConvertRate) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs index 25c8c6e..b3f47db 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptDTO.cs @@ -22,11 +22,11 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts [Display(Name = "发货单号(AsnNumber)")] public string AsnNumber { set; get; } - /// - /// 要货计划单号(RpNumber) - /// - [Display(Name = "要货计划单号(RpNumber)")] - public string RpNumber { set; get; } + ///// + ///// 要货计划单号(RpNumber) + ///// + //[Display(Name = "要货计划单号(RpNumber)")] + //public string RpNumber { set; get; } /// /// 订单号(PoNumber) @@ -52,18 +52,24 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts [Display(Name = "收货口(Dock)")] public string Dock { set; get; } - /// - /// 时间窗口开始(TimeWindowBegin) - /// - [Display(Name = "时间窗口开始(TimeWindowBegin)")] - public DateTime TimeWindowBegin { set; get; } + ///// + ///// 时间窗口开始(TimeWindowBegin) + ///// + //[Display(Name = "时间窗口开始(TimeWindowBegin)")] + //public DateTime TimeWindowBegin { set; get; } + + ///// + ///// 时间窗口结束(TimeWindowEnd) + ///// + //[Display(Name = "时间窗口结束(TimeWindowEnd)")] + //public DateTime TimeWindowEnd { set; get; } /// - /// 时间窗口结束(TimeWindowEnd) + /// 收货日期(ReceiveDate) /// - [Display(Name = "时间窗口结束(TimeWindowEnd)")] - public DateTime TimeWindowEnd { set; get; } - + [Display(Name = "收货日期(ReceiveDate)")] + public DateTime ReceiveDate { set; get; } + /// /// 收货时间(ReceiveTime) /// @@ -118,11 +124,11 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts [Display(Name = "计量单位(Uom)")] public string Uom { set; get; } - /// - /// 发货数量(DeliverQty) - /// - [Display(Name = "发货数量(DeliverQty)")] - public decimal DeliverQty { set; get; } + ///// + ///// 发货数量(DeliverQty) + ///// + //[Display(Name = "发货数量(DeliverQty)")] + //public decimal DeliverQty { set; get; } /// /// 收货数量(ReceiveQty) @@ -130,29 +136,29 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts [Display(Name = "收货数量(ReceiveQty)")] public decimal ReceiveQty { set; get; } - /// - /// 标包计量单位(Standard Pack Uom) - /// - [Display(Name = "标包计量单位(Standard Pack Uom)")] - public string StdPackUom { set; get; } - - /// - /// 标包数量(Standard Pack Qty) - /// - [Display(Name = "标包数量(Standard Pack Qty)")] - public decimal StdPackQty { set; get; } - - /// - /// 供应商计量单位(SupplierPackUom) - /// - [Display(Name = "供应商计量单位(SupplierPackUom)")] - public string SupplierPackUom { set; get; } - - /// - /// 供应商包装数量(SupplierPackQty) - /// - [Display(Name = "供应商包装数量(SupplierPackQty)")] - public decimal SupplierPackQty { set; get; } + ///// + ///// 标包计量单位(Standard Pack Uom) + ///// + //[Display(Name = "标包计量单位(Standard Pack Uom)")] + //public string StdPackUom { set; get; } + + ///// + ///// 标包数量(Standard Pack Qty) + ///// + //[Display(Name = "标包数量(Standard Pack Qty)")] + //public decimal StdPackQty { set; get; } + + ///// + ///// 供应商计量单位(SupplierPackUom) + ///// + //[Display(Name = "供应商计量单位(SupplierPackUom)")] + //public string SupplierPackUom { set; get; } + + ///// + ///// 供应商包装数量(SupplierPackQty) + ///// + //[Display(Name = "供应商包装数量(SupplierPackQty)")] + //public decimal SupplierPackQty { set; get; } /// /// 供应商包装转换率(SupplierPackConvertRate) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs index d2e9dc7..f2efcb2 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierCreateOrUpdateDTOBase.cs @@ -86,5 +86,11 @@ namespace Win_in.Sfs.Scp.WebApi.Suppliers /// [Display(Name = "备注(Remark)")] public string Remark { set; get; } + + /// + /// 银行(Bank) + /// + [Display(Name = "银行(Bank)")] + public string Bank { set; get; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs index fa07498..bd8d6df 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Suppliers/SupplierDTO.cs @@ -99,5 +99,11 @@ namespace Win_in.Sfs.Scp.WebApi.Suppliers /// [Display(Name = "备注(Remark)")] public string Remark { set; get; } + + /// + /// 银行(Bank) + /// + [Display(Name = "银行(Bank)")] + public string Bank { set; get; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs index ea1f14a..3825139 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PO.cs @@ -107,8 +107,8 @@ namespace Win_in.Sfs.Scp.WebApi 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, - detail.SupplierPackUom, detail.SupplierPackQty, detail.SupplierPackConvertRate, detail.IsConsignment, detail.LineStatus, detail.Remark)); + PODetails.Add(new PODetail(guidGenerator.Create(),detail.PoNumber, detail.PoLine, detail.PartCode, detail.Uom, detail.OrderQty, detail.StdPackQty, + detail.SupplierPackConvertRate, detail.IsConsignment, detail.LineStatus, detail.Remark)); } public virtual void AddDetails(IGuidGenerator guidGenerator, IEnumerable details) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs index a10f552..0fd82a2 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/POs/PODetail.cs @@ -40,18 +40,18 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "订单数量(OrderQty)")] public decimal? OrderQty { set; get; } - /// - /// 已关闭数量(Closed Qty) - /// - [Display(Name = "已关闭数量(Closed Qty)")] - public decimal ClosedQty { get; set; } + ///// + ///// 已关闭数量(Closed Qty) + ///// + //[Display(Name = "已关闭数量(Closed Qty)")] + //public decimal ClosedQty { get; set; } - /// - /// 标包计量单位(Standard Pack Uom) - /// - [Display(Name = "标包计量单位(Standard Pack Uom)")] - public string StdPackUom { set; get; } + ///// + ///// 标包计量单位(Standard Pack Uom) + ///// + //[Display(Name = "标包计量单位(Standard Pack Uom)")] + //public string StdPackUom { set; get; } /// /// 标包数量(Standard Pack Qty) @@ -59,17 +59,17 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "标包数量(Standard Pack Qty)")] public decimal? StdPackQty { set; get; } - /// - /// 供应商计量单位(SupplierPackUom) - /// - [Display(Name = "供应商计量单位(SupplierPackUom)")] - public string SupplierPackUom { set; get; } + ///// + ///// 供应商计量单位(SupplierPackUom) + ///// + //[Display(Name = "供应商计量单位(SupplierPackUom)")] + //public string SupplierPackUom { set; get; } - /// - /// 供应商包装数量(SupplierPackQty) - /// - [Display(Name = "供应商包装数量(SupplierPackQty)")] - public decimal? SupplierPackQty { set; get; } + ///// + ///// 供应商包装数量(SupplierPackQty) + ///// + //[Display(Name = "供应商包装数量(SupplierPackQty)")] + //public decimal? SupplierPackQty { set; get; } /// /// 供应商包装转换率(SupplierPackConvertRate) @@ -99,18 +99,18 @@ namespace Win_in.Sfs.Scp.WebApi public PODetail() { } public PODetail( - Guid id , string poNumber, string poLine,string partCode, string uom, decimal? orderQty, string stdPackUom, decimal? stdPackQty, - string supplierPackUom, decimal? supplierPackQty, decimal? supplierPackConvertRate, bool isConsignment,int lineStatus,string remark) :base(id) + Guid id , string poNumber, string poLine,string partCode, string uom, decimal? orderQty, decimal? stdPackQty, + decimal? supplierPackConvertRate, bool isConsignment,int lineStatus,string remark) :base(id) { PoNumber = poNumber; PoLine = poLine; PartCode = partCode; Uom = uom; OrderQty = orderQty; - StdPackUom = stdPackUom; + //StdPackUom = stdPackUom; StdPackQty = stdPackQty; - SupplierPackUom = supplierPackUom; - SupplierPackQty = supplierPackQty; + //SupplierPackUom = supplierPackUom; + //SupplierPackQty = supplierPackQty; SupplierPackConvertRate = supplierPackConvertRate; IsConsignment = isConsignment; LineStatus = lineStatus; diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs index 9c76bd7..7394d9a 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Parts/Part.cs @@ -88,23 +88,23 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "分组")] public string Group {get;set;} - /// - /// 颜色(Color) - /// - [Display(Name = "颜色")] - public string Color {get;set;} + ///// + ///// 颜色(Color) + ///// + //[Display(Name = "颜色")] + //public string Color {get;set;} - /// - /// 配置(Configuration) - /// - [Display(Name = "配置")] - public string Configuration {get;set;} + ///// + ///// 配置(Configuration) + ///// + //[Display(Name = "配置")] + //public string Configuration {get;set;} - /// - /// 项目(Project) - /// - [Display(Name = "项目")] - public string Project {get;set;} + ///// + ///// 项目(Project) + ///// + //[Display(Name = "项目")] + //public string Project {get;set;} /// /// 版本(version) @@ -115,32 +115,32 @@ namespace Win_in.Sfs.Scp.WebApi /// /// 工程变更通知单(Engineering change order) /// - [Display(Name = "工程变更通知单")] - public string Eco {get;set;} - - /// - /// 标包计量单位(Standard Pack Uom) - /// - [Display(Name = "标包计量单位")] - public string StdPackUom {get;set;} - - /// - /// 标包数量(Standard Pack Qty) - /// - [Display(Name = "标包数量")] - public decimal StdPackQty {get;set;} - - /// - /// 替代计量单位(Extra Pack UM) - /// - [Display(Name = "替代计量单位")] - public string ExtPackUom {get;set;} - - /// - /// 替代包装数量(Extra Pack Qty) - /// - [Display(Name = "替代包装数量")] - public decimal ExtPackQty {get;set;} + //[Display(Name = "工程变更通知单")] + //public string Eco {get;set;} + + ///// + ///// 标包计量单位(Standard Pack Uom) + ///// + //[Display(Name = "标包计量单位")] + //public string StdPackUom {get;set;} + + ///// + ///// 标包数量(Standard Pack Qty) + ///// + //[Display(Name = "标包数量")] + //public decimal StdPackQty {get;set;} + + ///// + ///// 替代计量单位(Extra Pack UM) + ///// + //[Display(Name = "替代计量单位")] + //public string ExtPackUom {get;set;} + + ///// + ///// 替代包装数量(Extra Pack Qty) + ///// + //[Display(Name = "替代包装数量")] + //public decimal ExtPackQty {get;set;} /// /// 地点(Site) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs index c264d8c..f4ee7ce 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Receipts/Receipt.cs @@ -22,11 +22,11 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "发货单号(AsnNumber)")] public string AsnNumber { set; get; } - /// - /// 要货计划单号(RpNumber) - /// - [Display(Name = "要货计划单号(RpNumber)")] - public string RpNumber { set; get; } + ///// + ///// 要货计划单号(RpNumber) + ///// + //[Display(Name = "要货计划单号(RpNumber)")] + //public string RpNumber { set; get; } /// /// 订单号(PoNumber) @@ -58,18 +58,24 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "收货口(Dock)")] public string Dock { set; get; } - /// - /// 时间窗口开始(TimeWindowBegin) - /// - [Display(Name = "时间窗口开始(TimeWindowBegin)")] - public DateTime TimeWindowBegin { set; get; } + ///// + ///// 时间窗口开始(TimeWindowBegin) + ///// + //[Display(Name = "时间窗口开始(TimeWindowBegin)")] + //public DateTime TimeWindowBegin { set; get; } + + ///// + ///// 时间窗口结束(TimeWindowEnd) + ///// + //[Display(Name = "时间窗口结束(TimeWindowEnd)")] + //public DateTime TimeWindowEnd { set; get; } /// - /// 时间窗口结束(TimeWindowEnd) + /// 收货日期(ReceiveDate) /// - [Display(Name = "时间窗口结束(TimeWindowEnd)")] - public DateTime TimeWindowEnd { set; get; } - + [Display(Name = "收货日期(ReceiveDate)")] + public DateTime ReceiveDate { set; get; } + /// /// 收货时间(ReceiveTime) /// @@ -124,11 +130,11 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "计量单位(Uom)")] public string Uom { set; get; } - /// - /// 发货数量(DeliverQty) - /// - [Display(Name = "发货数量(DeliverQty)")] - public decimal DeliverQty { set; get; } + ///// + ///// 发货数量(DeliverQty) + ///// + //[Display(Name = "发货数量(DeliverQty)")] + //public decimal DeliverQty { set; get; } /// /// 收货数量(ReceiveQty) @@ -136,29 +142,29 @@ namespace Win_in.Sfs.Scp.WebApi [Display(Name = "收货数量(ReceiveQty)")] public decimal ReceiveQty { set; get; } - /// - /// 标包计量单位(Standard Pack Uom) - /// - [Display(Name = "标包计量单位(Standard Pack Uom)")] - public string StdPackUom { set; get; } - - /// - /// 标包数量(Standard Pack Qty) - /// - [Display(Name = "标包数量(Standard Pack Qty)")] - public decimal StdPackQty { set; get; } - - /// - /// 供应商计量单位(SupplierPackUom) - /// - [Display(Name = "供应商计量单位(SupplierPackUom)")] - public string SupplierPackUom { set; get; } - - /// - /// 供应商包装数量(SupplierPackQty) - /// - [Display(Name = "供应商包装数量(SupplierPackQty)")] - public decimal SupplierPackQty { set; get; } + ///// + ///// 标包计量单位(Standard Pack Uom) + ///// + //[Display(Name = "标包计量单位(Standard Pack Uom)")] + //public string StdPackUom { set; get; } + + ///// + ///// 标包数量(Standard Pack Qty) + ///// + //[Display(Name = "标包数量(Standard Pack Qty)")] + //public decimal StdPackQty { set; get; } + + ///// + ///// 供应商计量单位(SupplierPackUom) + ///// + //[Display(Name = "供应商计量单位(SupplierPackUom)")] + //public string SupplierPackUom { set; get; } + + ///// + ///// 供应商包装数量(SupplierPackQty) + ///// + //[Display(Name = "供应商包装数量(SupplierPackQty)")] + //public decimal SupplierPackQty { set; get; } /// /// 供应商包装转换率(SupplierPackConvertRate) diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Suppliers/Supplier.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Suppliers/Supplier.cs index 9c0f955..934fdf7 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Suppliers/Supplier.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/Suppliers/Supplier.cs @@ -99,5 +99,11 @@ namespace Win_in.Sfs.Scp.WebApi /// [Display(Name = "备注(Remark)")] public string Remark { set; get; } + + /// + /// 银行(Bank) + /// + [Display(Name = "银行(Bank)")] + public string Bank { set; get; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs index 576d48b..0718736 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/EntityFrameworkCore/WebApiDbContextModelCreatingExtensions.cs @@ -79,16 +79,16 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(x => x.Type).HasMaxLength(64); b.Property(x => x.Catalog).HasMaxLength(64); b.Property(x => x.Group).HasMaxLength(64); - b.Property(x => x.Color).HasMaxLength(64); - b.Property(x => x.Configuration).HasMaxLength(64); - b.Property(x => x.Project).HasMaxLength(64); + //b.Property(x => x.Color).HasMaxLength(64); + //b.Property(x => x.Configuration).HasMaxLength(64); + //b.Property(x => x.Project).HasMaxLength(64); b.Property(x => x.Version).HasMaxLength(64); b.Property(x => x.SequenceNumber).HasMaxLength(64); - b.Property(x => x.Eco).HasMaxLength(64); - b.Property(x => x.StdPackUom).IsRequired().HasMaxLength(64); - b.Property(x => x.StdPackQty).IsRequired(); - b.Property(x => x.ExtPackUom).HasMaxLength(64); - b.Property(x => x.ExtPackQty); + //b.Property(x => x.Eco).HasMaxLength(64); + //b.Property(x => x.StdPackUom).IsRequired().HasMaxLength(64); + //b.Property(x => x.StdPackQty).IsRequired(); + //b.Property(x => x.ExtPackUom).HasMaxLength(64); + //b.Property(x => x.ExtPackQty); b.Property(x => x.Site).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.Company).HasMaxLength(64); 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.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.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.SupplierCode).IsRequired().HasMaxLength(64); b.Property(q => q.RcType).IsRequired().HasMaxLength(64); b.Property(q => q.Warehouse).IsRequired().HasMaxLength(64); b.Property(q => q.Dock).IsRequired().HasMaxLength(64); - b.Property(q => q.TimeWindowBegin).IsRequired(); - b.Property(q => q.TimeWindowEnd).IsRequired(); + //b.Property(q => q.TimeWindowBegin).IsRequired(); + //b.Property(q => q.TimeWindowEnd).IsRequired(); + b.Property(q => q.ReceiveDate).IsRequired(); b.Property(q => q.ReceiveTime).IsRequired(); b.Property(q => q.Site).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.ProductionDate).IsRequired(); 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.StdPackUom).IsRequired().HasMaxLength(64); - b.Property(q => q.StdPackQty).IsRequired(); - b.Property(q => q.SupplierPackUom).IsRequired().HasMaxLength(64); - b.Property(q => q.SupplierPackQty).IsRequired(); + //b.Property(q => q.StdPackUom).IsRequired().HasMaxLength(64); + //b.Property(q => q.StdPackQty).IsRequired(); + //b.Property(q => q.SupplierPackUom).IsRequired().HasMaxLength(64); + //b.Property(q => q.SupplierPackQty).IsRequired(); b.Property(q => q.SupplierPackConvertRate).IsRequired(); b.Property(q => q.Remark).HasMaxLength(4096); b.Property(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.Uom).IsRequired().HasMaxLength(64); 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.SupplierPackUom).HasMaxLength(64); - b.Property(q => q.SupplierPackQty); + //b.Property(q => q.SupplierPackUom).HasMaxLength(64); + //b.Property(q => q.SupplierPackQty); b.Property(q => q.SupplierPackConvertRate); b.Property(q => q.IsConsignment).IsRequired(); b.Property(q => q.LineStatus).IsRequired();