From e2364ce7cf1ad215d2df6498402d2a5939c8a742 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Thu, 13 Mar 2025 14:15:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E6=97=B6=E5=88=BB=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/AsnTimeWindowDashboardDto.cs | 9 +++++---- .../publish/conf/settings/appsettings.Development.json | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/AsnTimeWindowDashboardDto.cs b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/AsnTimeWindowDashboardDto.cs index 6637b9745..22c1155a5 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/AsnTimeWindowDashboardDto.cs +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Models/AsnTimeWindowDashboardDto.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; +using Win_in.Sfs.Basedata.Domain.Shared; namespace Win_in.Sfs.Wms.Dashboard.Host.Models; @@ -51,16 +52,16 @@ public class AsnTimeWindowDashboardDto else { var timeSpan = ReceiptTime - PlanArriveDate; - - if (timeSpan.Minutes < DashboardConst.AsnReceiptTimeDifferenceMinutes || timeSpan.Minutes > -(DashboardConst.AsnReceiptTimeDifferenceMinutes)) + var timeSpanCha =Math.Abs(timeSpan.TotalMinutes.TryToDecimal().Value); + if (timeSpanCha <= DashboardConst.AsnReceiptTimeDifferenceMinutes&&timeSpanCha>0) { return "准时"; } - else if (timeSpan.Minutes > DashboardConst.AsnReceiptTimeDifferenceMinutes) + else if (timeSpan.TotalMinutes.TryToDecimal() > DashboardConst.AsnReceiptTimeDifferenceMinutes) { return "延后"; } - else if (timeSpan.Minutes < -(DashboardConst.AsnReceiptTimeDifferenceMinutes)) + else if (timeSpan.TotalMinutes.TryToDecimal() < -(DashboardConst.AsnReceiptTimeDifferenceMinutes)) { return "提前"; } diff --git a/build/src/docker/publish/conf/settings/appsettings.Development.json b/build/src/docker/publish/conf/settings/appsettings.Development.json index c4eba03a8..6a525de3b 100644 --- a/build/src/docker/publish/conf/settings/appsettings.Development.json +++ b/build/src/docker/publish/conf/settings/appsettings.Development.json @@ -145,10 +145,10 @@ //"BaseUrl": "http://localhost:59092/" }, "Inventory": { - "BaseUrl": "http://localhost:59095/" + "BaseUrl": "http://dev.ccwin-in.com:60085/" }, "Job": { - "BaseUrl": "http://localhost:59095/" + "BaseUrl": "http://dev.ccwin-in.com:60085/" }, "Label": { "BaseUrl": "http://dev.ccwin-in.com:60082/" @@ -159,7 +159,7 @@ //"BaseUrl": "http://localhost:59092/" }, "Store": { - "BaseUrl": "http://localhost:59095/" + "BaseUrl": "http://dev.ccwin-in.com:60085/" } }, "Serilog": {