diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiListVM.cs index 4cdc454..cdf70de 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiListVM.cs @@ -17,6 +17,7 @@ namespace HHWMS.Web protected override IEnumerable> InitGridHeader() { return new List>{ + this.MakeGridHeader(x => x.ID), this.MakeGridHeader(x => x.WareHouse), this.MakeGridHeader(x => x.MaterialCode), this.MakeGridHeader(x => x.FigureNo), @@ -29,8 +30,11 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.Remark), this.MakeGridHeader(x => x.LocationCode), this.MakeGridHeader(x => x.SourceCode), + this.MakeGridHeader(x => x.MoDetailId), this.MakeGridHeader(x => x.Qty), this.MakeGridHeader(x => x.Createtime), + this.MakeGridHeader(x => x.UpdateTime), + this.MakeGridHeader(x => x.UploadFlag), this.MakeGridHeaderAction(width: 200) }; } @@ -46,14 +50,17 @@ namespace HHWMS.Web .CheckContain(Searcher.BatchCode, x=>x.BatchCode) .CheckContain(Searcher.NextBatch, x=>x.Lot) .CheckContain(Searcher.SuFigureNo, x=>x.SupplierCode) + .CheckWhere(Searcher.UploadFlag,x => x.UploadErpFlag == Searcher.UploadFlag) .Select(x => new InventoryApi_View { + ID = x.ID, WareHouse = x.ZoneId == 1027 ? "xb" : x.ZoneId == 1028 ? "cp" : "mj" , MaterialCode = x.MaterialCode, FigureNo = x.MaterialType, MaterialName = x.MaterialName, MaterialSpec = x.MaterialSpec, SourceCode = x.SourceCode, + MoDetailId = x.ReceiptDetailId, Company = x.CompanyCode, Remark = x.Batch, BatchCode = x.BatchCode, @@ -61,15 +68,19 @@ namespace HHWMS.Web LocationCode = x.LocationCode, Qty = x.Qty, Createtime = x.CreateTime, - NextBatch = x.Lot + NextBatch = x.Lot, + UpdateTime = x.UpdateTime, + UploadFlag = x.UploadErpFlag }).OrderBy(x => x.MaterialCode); return query; } } - public class InventoryApi_View : TopBasePoco { + public class InventoryApi_View : BasePoco { + public new int ID { get; set; } public String WareHouse { get; set; } + public string MoDetailId { get; set; } public string MaterialCode { get; set; } public string MaterialName { get; set; } public string MaterialSpec { get; set; } @@ -83,5 +94,6 @@ namespace HHWMS.Web public string LocationCode { get; set; } public decimal? Qty { get; set; } public DateTime? Createtime { get; set; } + public int? UploadFlag { get; set; } } } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiSearcher.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiSearcher.cs index a758c3a..9c6eaf9 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiSearcher.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiSearcher.cs @@ -26,6 +26,7 @@ namespace HHWMS.Web [Display(Name = "Inventory.SupplierCode")] public String SuFigureNo { get; set; } public String WareHouse { get; set; } + public int UploadFlag { get; set; } public string NextBatch { get; set; } protected override void InitVM() diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs index 92582d3..c1c9e44 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs @@ -143,7 +143,7 @@ namespace HHWMS.Web } else { - inventory.UploadErpFlag = 0; + inventory.UploadErpFlag -= 1; return false; } } diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs index 118d302..5ab2d01 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs @@ -20,10 +20,13 @@ namespace HHWMS.Web { var _unitwork = new UnitWork(Wtm); - var inv = _unitwork.FindSingle(x => x.UploadErpFlag == 0 - && x.TaskStatus != InventoryTaskStatusEnum.Locked - // && !string.IsNullOrEmpty(x.ReceiptDetailId) - ); + var inv = _unitwork.Find(x => + x.UploadErpFlag != 1 + && x.TaskStatus != InventoryTaskStatusEnum.Locked + // && !string.IsNullOrEmpty(x.ReceiptDetailId) + ) + .OrderByDescending(x => x.UploadErpFlag) + .FirstOrDefault(); // 使用通用的ProcessErpFinishIn方法 var invVM = Wtm.CreateVM();