修改 物流时刻看板

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 "提前";
                 }

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": {