wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pda 任务单列表凌晨看不到bug

Browse Source
This commit is contained in:
周科达
2024-09-29 01:45:01 +08:00
parent 3997e71cf6
commit 36268bf1da
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -101,6 +101,11 @@ namespace Tnb.ProductionMgr
// .FirstAsync(); // .FirstAsync();
string nowTime = DateTime.Now.ToString("HH:mm"); 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<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DAYNIGHTWORKTIME); BasFactoryConfig config = await db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DAYNIGHTWORKTIME);
Dictionary<string,string> dayNightWorkTime = JsonConvert.DeserializeObject<Dictionary<string, string>>(config.value); Dictionary<string,string> dayNightWorkTime = JsonConvert.DeserializeObject<Dictionary<string, string>>(config.value);
string dayStime = dayNightWorkTime["白班"].Split("-")[0]; string dayStime = dayNightWorkTime["白班"].Split("-")[0];

5
ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
View File

@@ -424,6 +424,11 @@ namespace Tnb.ProductionMgr
OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(_userManager.User.OrganizeId,DictConst.RegionCategoryWorklineCode); OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(_userManager.User.OrganizeId,DictConst.RegionCategoryWorklineCode);
string userWorklineId = workline?.Id ?? ""; string userWorklineId = workline?.Id ?? "";
string nowTime = DateTime.Now.ToString("HH:mm"); 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<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DAYNIGHTWORKTIME); BasFactoryConfig config = await _db.Queryable<BasFactoryConfig>().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DAYNIGHTWORKTIME);
Dictionary<string,string> dayNightWorkTime = JsonConvert.DeserializeObject<Dictionary<string, string>>(config.value); Dictionary<string,string> dayNightWorkTime = JsonConvert.DeserializeObject<Dictionary<string, string>>(config.value);
string dayStime = dayNightWorkTime["白班"].Split("-")[0]; string dayStime = dayNightWorkTime["白班"].Split("-")[0];