入库
供应商,物料接口
This commit is contained in:
1 parent
8702a24e20
commit
cfbddf7e9e
19 files changed
+242
-28
No files matched your search
@@ -32,16 +32,10 @@ namespace HHWMS.Web
|
||||
protected override IEnumerable<IGridColumn<Material2_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<Material2_View>>{
|
||||
this.MakeGridHeader(x => x.Code),
|
||||
this.MakeGridHeader(x => x.Code).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Type),
|
||||
this.MakeGridHeader(x => x.Name),
|
||||
this.MakeGridHeader(x => x.Name).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.MasterUnit),
|
||||
this.MakeGridHeader(x => x.AssistUnit),
|
||||
this.MakeGridHeader(x => x.WarehouseId),
|
||||
this.MakeGridHeader(x => x.WarehouseCode),
|
||||
this.MakeGridHeader(x => x.CompanyId),
|
||||
this.MakeGridHeader(x => x.CompanyCode),
|
||||
this.MakeGridHeader(x => x.Barcode),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,8 +16,11 @@ namespace HHWMS.Web
|
||||
public String WarehouseCode { get; set; }
|
||||
public Int32? CompanyId { get; set; }
|
||||
public String CompanyCode { get; set; }
|
||||
[Display(Name = "Material2.Code")]
|
||||
public String Code { get; set; }
|
||||
[Display(Name = "Material2.Type")]
|
||||
public String Type { get; set; }
|
||||
[Display(Name = "Material2.Name")]
|
||||
public String Name { get; set; }
|
||||
public String Barcode { get; set; }
|
||||
public String Barcode2 { get; set; }
|
||||
|
||||
@@ -54,11 +54,7 @@ namespace HHWMS.Web
|
||||
}),
|
||||
|
||||
this.MakeGridHeader(x => x.Unit),
|
||||
this.MakeGridHeader(x => x.QtyCompleted)
|
||||
.SetFormat((a,b) =>
|
||||
{
|
||||
return a.QtyCompleted.ToString().TrimEnd('0').TrimEnd('.');
|
||||
}),
|
||||
this.MakeGridHeader(x => x.Project).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Status),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
|
||||
@@ -47,9 +47,9 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
return rv;
|
||||
}).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Type),
|
||||
this.MakeGridHeader(x => x.SourceCode).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.SourceCode),
|
||||
this.MakeGridHeader(x => x.SupplierCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.SupplierName).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.SupplierName),
|
||||
this.MakeGridHeader(x => x.TotalQty)
|
||||
.SetFormat((a,b) =>
|
||||
{
|
||||
@@ -57,16 +57,17 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
}),
|
||||
this.MakeGridHeader(x => x.TotalLines),
|
||||
this.MakeGridHeader(x => x.Remark).SetHide(),
|
||||
this.MakeGridHeader(x => x.UploadStatus),
|
||||
this.MakeGridHeader(x => x.Uploadremark),
|
||||
this.MakeGridHeader(x => x.UploadStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.Uploadremark).SetHide(),
|
||||
this.MakeGridHeader(x => x.UploadTime).SetHide(),
|
||||
this.MakeGridHeader(x => x.AppointmentTime).SetHide(),
|
||||
this.MakeGridHeader(x => x.FirstStatus),
|
||||
this.MakeGridHeader(x => x.LastStatus),
|
||||
this.MakeGridHeader(x => x.FirstStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.LastStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef1).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef2).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef3).SetHide(),
|
||||
this.MakeGridHeader(x => x.Station),
|
||||
this.MakeGridHeader(x => x.UserDef5).SetHide(),
|
||||
this.MakeGridHeader(x => x.Station).SetHide(),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
@@ -79,6 +80,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
.CheckContain(Searcher.Type, x => x.Type)
|
||||
.CheckContain(Searcher.SourceCode, x => x.SourceCode)
|
||||
.CheckContain(Searcher.SupplierName, x => x.SupplierName)
|
||||
.CheckContain(Searcher.UserDef5, x => x.UserDef5)
|
||||
.Select(x => new ReceiptHeader2_View
|
||||
{
|
||||
ID = x.ID,
|
||||
|
||||
@@ -14,14 +14,18 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
{
|
||||
public Int32? WarehouseId { get; set; }
|
||||
public String WarehouseCode { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.ReceiptCode")]
|
||||
public String Code { get; set; }
|
||||
public Int32? CompanyId { get; set; }
|
||||
public String CompanyCode { get; set; }
|
||||
[Display(Name = "ReceiptHeader2.Type")]
|
||||
public String Type { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.SourceCode")]
|
||||
public String SourceCode { get; set; }
|
||||
public String SourcePlatform { get; set; }
|
||||
public Int32? SupplierId { get; set; }
|
||||
public String SupplierCode { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.SupplierName")]
|
||||
public String SupplierName { get; set; }
|
||||
public Decimal? TotalQty { get; set; }
|
||||
public Int32? TotalLines { get; set; }
|
||||
@@ -41,6 +45,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
public String UserDef3 { get; set; }
|
||||
public String Station { get; set; }
|
||||
public String UserDef4 { get; set; }
|
||||
[Display(Name = "ReceiptHeader2.UserDef5")]
|
||||
public String UserDef5 { get; set; }
|
||||
protected override void InitVM()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user