diff --git a/HHWMS.Web/Areas/Api/IDataController.cs b/HHWMS.Web/Areas/Api/IDataController.cs index bea234a..bfc3d83 100644 --- a/HHWMS.Web/Areas/Api/IDataController.cs +++ b/HHWMS.Web/Areas/Api/IDataController.cs @@ -248,7 +248,7 @@ namespace HHWMS.Web public IActionResult FindUnUpload(string warehousecode) { var data = _unitWork.Find(x => - x.ZoneId == (warehousecode == "xb" ? 1027 : 1025) + x.ZoneId == (warehousecode == "xb" ? 1027 : 1028) && x.UploadErpFlag != 1) .Select(x => new InventoryApi_View { diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs index 5ab2d01..ae08efb 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs @@ -23,6 +23,8 @@ namespace HHWMS.Web var inv = _unitwork.Find(x => x.UploadErpFlag != 1 && x.TaskStatus != InventoryTaskStatusEnum.Locked + && x.ZoneId != 1025 + && x.UploadErpFlag != null // && !string.IsNullOrEmpty(x.ReceiptDetailId) ) .OrderByDescending(x => x.UploadErpFlag)