Merge branch 'master' of https://e.coding.net/ccwin-in/sfs/ScpService

# Conflicts:
#	ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODetailDTO.cs
#	ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Parts/PartCreateOrUpdateDTOBase.cs
#	ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/Receipts/ReceiptCreateOrUpdateDTOBase.cs

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

@@ -65,6 +65,9 @@ namespace Win_in.Sfs.Scp.WebApi.ASNs
         [Display(Name = "备注(Remark)")]
         public string Remark { set; get; }
 
+        /// <summary>
+        /// 明细列表(Detail list)
+        /// </summary>
         [Required]
         public virtual ICollection<ASNDetailsDTO> Details { get; set; }
 

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

@@ -49,7 +49,6 @@ namespace Win_in.Sfs.Scp.WebApi.POs
         /// <summary>
         /// 已关闭数量(Closed Qty)
         /// </summary>
-        [Required]
         [Display(Name = "已关闭数量(Closed Qty)")]
         public decimal ClosedQty { get; set; }
 
@@ -63,6 +62,7 @@ namespace Win_in.Sfs.Scp.WebApi.POs
         /// <summary>
         /// 标包数量(Standard Pack Qty)
         /// </summary>
+
         [Required]
         [Display(Name = "标包数量(Standard Pack Qty)")]
         public decimal StdPackQty { set; get; }
@@ -82,6 +82,7 @@ namespace Win_in.Sfs.Scp.WebApi.POs
         /// <summary>
         /// 供应商包装转换率(SupplierPackConvertRate)
         /// </summary>
+        [Required]
         [Display(Name = "供应商包装转换率(SupplierPackConvertRate)")]
         public decimal SupplierPackConvertRate { set; get; }
 

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

@@ -26,17 +26,22 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
         /// <summary>
         /// 时间窗口开始(TimeWindowBegin)
         /// </summary>
-        [Required]
         [Display(Name = "时间窗口开始(TimeWindowBegin)")]
         public DateTime TimeWindowBegin { set; get; }
 
         /// <summary>
         /// 时间窗口结束(TimeWindowEnd)
         /// </summary>
-        [Required]
         [Display(Name = "时间窗口结束(TimeWindowEnd)")]
         public DateTime TimeWindowEnd { set; get; }
 
+        /// <summary>
+        /// 收货日期(ReceiveDate)
+        /// </summary>
+        [Required]
+        [Display(Name = "收货日期(ReceiveDate)")]
+        public DateTime ReceiveDate { set; get; }
+
         /// <summary>
         /// 收货时间(ReceiveTime)
         /// </summary>
@@ -54,14 +59,12 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
         /// <summary>
         /// 供应商批次(SupplierLot)
         /// </summary>
-        [Required]
         [Display(Name = "供应商批次(SupplierLot)")]
         public string SupplierLot { set; get; }
 
         /// <summary>
         /// 生产日期(ProductionDate)
         /// </summary>
-        [Required]
         [Display(Name = "生产日期(ProductionDate)")]
         public DateTime ProductionDate { set; get; }
 
@@ -89,14 +92,12 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
         /// <summary>
         /// 标包计量单位(Standard Pack Uom)
         /// </summary>
-        [Required]
         [Display(Name = "标包计量单位(Standard Pack Uom)")]
         public string StdPackUom { set; get; }
 
         /// <summary>
         /// 标包数量(Standard Pack Qty)
         /// </summary>
-        [Required]
         [Display(Name = "标包数量(Standard Pack Qty)")]
         public decimal StdPackQty { set; get; }
 
@@ -115,6 +116,7 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
         /// <summary>
         /// 供应商包装转换率(SupplierPackConvertRate)
         /// </summary>
+        [Required]
         [Display(Name = "供应商包装转换率(SupplierPackConvertRate)")]
         public decimal SupplierPackConvertRate { set; get; }
 

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

@@ -64,6 +64,12 @@ namespace Win_in.Sfs.Scp.WebApi.Receipts
         [Display(Name = "时间窗口结束(TimeWindowEnd)")]
         public DateTime TimeWindowEnd { set; get; }
 
+        /// <summary>
+        /// 收货日期(ReceiveDate)
+        /// </summary>
+        [Display(Name = "收货日期(ReceiveDate)")]
+        public DateTime ReceiveDate { set; get; }
+
         /// <summary>
         /// 收货时间(ReceiveTime)
         /// </summary>

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

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

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

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

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<PODetail> details)

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

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

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

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

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

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();