调整了部分页面的查询条件

入库明细状态增加校验,
前端增加loading,禁用按钮,空提交检测
This commit is contained in:
zhougf committed 2024-05-29 00:19:43 +08:00
1 parent 40a6810713
commit 6897508f8d
26 files changed
+227 -106

No files matched your search

@@ -57,30 +57,31 @@ namespace HHWMS.Web
}),
this.MakeGridHeader(x => x.UniqueCode).SetWidth(230),
this.MakeGridHeader(x => x.ContainerCode).SetHide(),
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.LocationCode,150),
this.MakeGridHeader(x => x.MaterialCode,120),
this.MakeGridHeader(x => x.MaterialType,120),
this.MakeGridHeader(x => x.MaterialName,120),
this.MakeGridHeader(x => x.MaterialSpec,120),
this.MakeGridHeader(x => x.MaterialUnit),
this.MakeGridHeader(x => x.Batch),
this.MakeGridHeader(x => x.Lot),
this.MakeGridHeader(x => x.Batch,120),
this.MakeGridHeader(x => x.Lot,80),
//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).SetHide(),
this.MakeGridHeader(x => x.Qty),
this.MakeGridHeader(x => x.Qty,80),
//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.MakeGridHeader(x => x.TaskStatus,120)
.SetFormat((a, b) =>
{
var data = InventoryTaskStatus.FirstOrDefault(x => x.Value.ToString() == a.TaskStatus);
return data?.Text ?? a.TaskStatus;
}),
this.MakeGridHeader(x => x.CreateTime,220),
this.MakeGridHeaderAction(width: 200)
};
}
@@ -122,7 +123,7 @@ namespace HHWMS.Web
.CheckContain(Searcher.Lot, x => x.Lot)
.CheckContain(Searcher.SourceCode, x => x.SourceCode)
.CheckContain(Searcher.ReceiptCode, x => x.ReceiptCode)
.CheckContain(Searcher.Status, x => x.Status)
.CheckContain(Searcher.TaskStatus, x => x.Status)
.Select(x => new Inventory_View
{
ID = x.ID,
@@ -148,6 +149,7 @@ namespace HHWMS.Web
ReceiptDetailId = x.ReceiptDetailId,
Status = x.Status,
TaskStatus = x.TaskStatus,
CreateTime = x.CreateTime,
})
.OrderBy(x => x.ID);
return query;
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web;
using HHWMS.Web.Models;
namespace HHWMS.Web
@@ -14,8 +15,10 @@ namespace HHWMS.Web
{
[Display(Name = "Task.ZoneCode")]
public String ZoneCode { get; set; }
[Display(Name = "Inventory.LocationCode")]
[Display(Name = "Container.LocationCode")]
public String LocationCode { get; set; }
[Display(Name = "Inventory.TaskStatus", Description = "任务状态")]
public string TaskStatus { get; set; }
[Display(Name = "Inventory.UniqueCode")]
public String UniqueCode { get; set; }
[Display(Name = "Inventory.MaterialCode")]