入库操作

This commit is contained in:
zgf committed 2023-08-28 23:30:38 +08:00
1 parent 8de4bc26cd
commit 2459d4664a
17 files changed
+159 -52

No files matched your search

@@ -35,10 +35,11 @@ namespace HHWMS.Web
protected override IEnumerable<IGridColumn<Inventory_View>> InitGridHeader()
{
if (SearcherMode == ListVMSearchModeEnum.MasterDetail)
if (SearcherMode != ListVMSearchModeEnum.MasterDetail)
{
return new List<GridColumn<Inventory_View>>{
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.LocationCode),
this.MakeGridHeader(x => x.MaterialCode),
@@ -47,17 +48,17 @@ namespace HHWMS.Web
this.MakeGridHeader(x => x.MaterialSpec),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.Lot),
this.MakeGridHeader(x => x.ManufactureDate),
this.MakeGridHeader(x => x.ExpirationDate),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
//this.MakeGridHeader(x => x.Lot),
//this.MakeGridHeader(x => x.ManufactureDate),
//this.MakeGridHeader(x => x.ExpirationDate),
//this.MakeGridHeader(x => x.CompanyCode),
//this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.TaskQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.SourceCode),
this.MakeGridHeader(x => x.ReceiptCode),
this.MakeGridHeader(x => x.ReceiptDetailId),
this.MakeGridHeader(x => x.Status),
//this.MakeGridHeader(x => x.SourceCode),
//this.MakeGridHeader(x => x.ReceiptCode),
//this.MakeGridHeader(x => x.ReceiptDetailId),
//this.MakeGridHeader(x => x.Status),
this.MakeGridHeader(x => x.TaskStatus),
this.MakeGridHeaderAction(width: 200)
};
@@ -65,16 +66,17 @@ namespace HHWMS.Web
else
{
return new List<GridColumn<Inventory_View>>{
this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.ContainerCode),
this.MakeGridHeader(x => x.LocationCode),
//this.MakeGridHeader(x => x.ZoneCode),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
//this.MakeGridHeader(x => x.ContainerCode),
//this.MakeGridHeader(x => x.LocationCode),
this.MakeGridHeader(x => x.MaterialCode),
this.MakeGridHeader(x => x.MaterialType),
this.MakeGridHeader(x => x.MaterialName),
this.MakeGridHeader(x => x.MaterialSpec),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.CompanyCode),
this.MakeGridHeader(x => x.SupplierCode),
this.MakeGridHeader(x => x.TaskQty),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.Status),
@@ -88,6 +90,7 @@ namespace HHWMS.Web
{
var query = DC.Set<Inventory>()
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
.CheckContain(Searcher.UniqueCode, x => x.UniqueCode)
.CheckContain(Searcher.LocationCode, x => x.LocationCode)
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
@@ -103,6 +106,7 @@ namespace HHWMS.Web
{
ID = x.ID,
ZoneCode = x.ZoneCode,
UniqueCode = x.UniqueCode,
ContainerCode = x.ContainerCode,
LocationCode = x.LocationCode,
MaterialCode = x.MaterialCode,
@@ -111,10 +115,10 @@ namespace HHWMS.Web
MaterialSpec = x.MaterialSpec,
MaterialUnit = x.MaterialUnit,
Batch = x.Batch,
Lot = x.Lot,
ManufactureDate = x.ManufactureDate,
ExpirationDate = x.ExpirationDate,
CompanyCode = x.CompanyCode,
//Lot = x.Lot,
//ManufactureDate = x.ManufactureDate,
//ExpirationDate = x.ExpirationDate,
//CompanyCode = x.CompanyCode,
SupplierCode = x.SupplierCode,
TaskQty = x.TaskQty,
Qty = x.Qty,
@@ -16,6 +16,8 @@ namespace HHWMS.Web
public String ZoneCode { get; set; }
[Display(Name = "Inventory.LocationCode")]
public String LocationCode { get; set; }
[Display(Name = "Inventory.UniqueCode")]
public String UniqueCode { get; set; }
[Display(Name = "Inventory.MaterialCode")]
public String MaterialCode { get; set; }
[Display(Name = "Inventory.MaterialType")]