对接ERP2.7
部分页面修改
This commit is contained in:
1 parent
22bfe9d015
commit
59f2af943b
17 files changed
+770
-887
No files matched your search
+49
-17
@@ -8,6 +8,23 @@ namespace HHWMS.Web
|
||||
{
|
||||
public partial class InventoryTransactionListVM : BasePagedListVM<InventoryTransaction_View, InventoryTransactionSearcher>
|
||||
{
|
||||
public List<ComboSelectListItem> ZoneCodeList { get; set; }
|
||||
public List<ComboSelectListItem> BillTypeList { get; set; }
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
ZoneCodeList = new List<ComboSelectListItem>
|
||||
{
|
||||
new ComboSelectListItem { Text = "成品", Value = "1028" },
|
||||
new ComboSelectListItem { Text = "线边", Value = "1027" },
|
||||
new ComboSelectListItem { Text = "模具", Value = "1025" }
|
||||
};
|
||||
BillTypeList = new List<ComboSelectListItem>
|
||||
{
|
||||
new ComboSelectListItem { Text = "入库", Value = "in" },
|
||||
new ComboSelectListItem { Text = "出库", Value = "out" }
|
||||
};
|
||||
}
|
||||
protected override List<GridAction> InitGridAction()
|
||||
{
|
||||
return new List<GridAction>
|
||||
@@ -25,28 +42,41 @@ namespace HHWMS.Web
|
||||
|
||||
protected override IEnumerable<IGridColumn<InventoryTransaction_View>> InitGridHeader()
|
||||
{
|
||||
InitVM();
|
||||
return new List<GridColumn<InventoryTransaction_View>>{
|
||||
this.MakeGridHeader(x => x.ZoneCode),
|
||||
this.MakeGridHeader(x => x.Type),
|
||||
this.MakeGridHeader(x => x.ZoneCode)
|
||||
.SetFormat((a, b) =>
|
||||
{
|
||||
var data = ZoneCodeList.FirstOrDefault(x => x.Value.ToString() == a.ZoneCode);
|
||||
return data?.Text ?? a.ZoneCode;
|
||||
}),
|
||||
this.MakeGridHeader(x => x.Type)
|
||||
.SetFormat((a, b) =>
|
||||
{
|
||||
var data = BillTypeList.FirstOrDefault(x => x.Value.ToString() == a.Type);
|
||||
return data?.Text ?? a.Type;
|
||||
}),
|
||||
this.MakeGridHeader(x => x.MaterialCode),
|
||||
this.MakeGridHeader(x => x.MaterialType).SetWidth(100),
|
||||
this.MakeGridHeader(x => x.MaterialName),
|
||||
this.MakeGridHeader(x => x.Qty)
|
||||
.SetFormat((a, b) => { return (int?)a.Qty ?? 0; }),
|
||||
this.MakeGridHeader(x => x.CreateTime),
|
||||
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.MaterialSpec).SetHide(),
|
||||
this.MakeGridHeader(x => x.MaterialUnit).SetHide(),
|
||||
this.MakeGridHeader(x => x.Batch),
|
||||
this.MakeGridHeader(x => x.Lot),
|
||||
this.MakeGridHeader(x => x.ManufactureDate),
|
||||
this.MakeGridHeader(x => x.ExpirationDate),
|
||||
this.MakeGridHeader(x => x.ManufactureDate).SetHide(),
|
||||
this.MakeGridHeader(x => x.ExpirationDate).SetHide(),
|
||||
this.MakeGridHeader(x => x.CompanyCode),
|
||||
this.MakeGridHeader(x => x.SupplierCode),
|
||||
this.MakeGridHeader(x => x.Qty),
|
||||
this.MakeGridHeader(x => x.BillType),
|
||||
this.MakeGridHeader(x => x.SourceCode),
|
||||
this.MakeGridHeader(x => x.BillCode),
|
||||
this.MakeGridHeader(x => x.BillDetailId),
|
||||
this.MakeGridHeader(x => x.Status),
|
||||
this.MakeGridHeader(x => x.BillType).SetHide(),
|
||||
this.MakeGridHeader(x => x.SourceCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.BillCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.BillDetailId).SetHide(),
|
||||
this.MakeGridHeader(x => x.Status).SetHide(),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
@@ -56,11 +86,11 @@ namespace HHWMS.Web
|
||||
var query = DC.Set<InventoryTransaction>()
|
||||
.CheckContain(Searcher.ZoneCode, x => x.ZoneCode)
|
||||
.CheckContain(Searcher.Type, x => x.Type)
|
||||
.CheckContain(Searcher.ContainerCode, x => x.ContainerCode)
|
||||
.CheckContain(Searcher.LocationCode, x => x.LocationCode)
|
||||
.CheckContain(Searcher.MaterialCode, x => x.MaterialCode)
|
||||
.CheckContain(Searcher.MaterialType, x => x.MaterialType)
|
||||
.CheckContain(Searcher.MaterialName, x => x.MaterialName)
|
||||
.CheckContain(Searcher.ContainerCode, x => x.ContainerCode)
|
||||
.CheckContain(Searcher.LocationCode, x => x.LocationCode)
|
||||
.CheckContain(Searcher.MaterialSpec, x => x.MaterialSpec)
|
||||
.CheckContain(Searcher.MaterialUnit, x => x.MaterialUnit)
|
||||
.CheckContain(Searcher.Batch, x => x.Batch)
|
||||
@@ -69,6 +99,7 @@ namespace HHWMS.Web
|
||||
.CheckContain(Searcher.SourceCode, x => x.SourceCode)
|
||||
.CheckContain(Searcher.BillCode, x => x.BillCode)
|
||||
.CheckContain(Searcher.Status, x => x.Status)
|
||||
.CheckBetween(Searcher.CreateTime?.GetStartTime(), Searcher.CreateTime?.GetEndTime(), x => x.CreateTime, includeMax: false)
|
||||
.Select(x => new InventoryTransaction_View
|
||||
{
|
||||
ID = x.ID,
|
||||
@@ -93,6 +124,7 @@ namespace HHWMS.Web
|
||||
BillCode = x.BillCode,
|
||||
BillDetailId = x.BillDetailId,
|
||||
Status = x.Status,
|
||||
CreateTime = x.CreateTime,
|
||||
})
|
||||
.OrderBy(x => x.ID);
|
||||
return query;
|
||||
|
||||
+3
@@ -42,6 +42,9 @@ namespace HHWMS.Web
|
||||
public String BillCode { get; set; }
|
||||
[Display(Name = "Inventory.Status")]
|
||||
public String Status { get; set; }
|
||||
|
||||
[Display(Name = "Inventory.CreateTime")]
|
||||
public DateRange CreateTime { get; set; }
|
||||
|
||||
protected override void InitVM()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user