diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs index 2502b1f7..4290dd50 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs @@ -101,6 +101,11 @@ namespace Tnb.ProductionMgr // .FirstAsync(); string nowTime = DateTime.Now.ToString("HH:mm"); + string nowHour = DateTime.Now.ToString("HH"); + if (int.Parse(nowHour) < 7) + { + nowTime = int.Parse(nowHour) + 24 +":"+ DateTime.Now.ToString("mm"); + } BasFactoryConfig config = await db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DAYNIGHTWORKTIME); Dictionary dayNightWorkTime = JsonConvert.DeserializeObject>(config.value); string dayStime = dayNightWorkTime["白班"].Split("-")[0]; diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs index 1279ce90..a8014a48 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs @@ -424,6 +424,11 @@ namespace Tnb.ProductionMgr OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(_userManager.User.OrganizeId,DictConst.RegionCategoryWorklineCode); string userWorklineId = workline?.Id ?? ""; string nowTime = DateTime.Now.ToString("HH:mm"); + string nowHour = DateTime.Now.ToString("HH"); + if (int.Parse(nowHour) < 7) + { + nowTime = int.Parse(nowHour) + 24 +":"+ DateTime.Now.ToString("mm"); + } BasFactoryConfig config = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DAYNIGHTWORKTIME); Dictionary dayNightWorkTime = JsonConvert.DeserializeObject>(config.value); string dayStime = dayNightWorkTime["白班"].Split("-")[0];