修改提单管理

ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs

@@ -71,6 +71,7 @@ using AngleSharp.Html;
 using DS.WMS.Core.Op.Dtos.Enum;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 using iText.StyledXmlParser.Jsoup.Safety;
+using MathNet.Numerics.LinearAlgebra.Factorization;
 
 namespace DS.WMS.Core.Op.Method
 {
@@ -310,13 +311,15 @@ namespace DS.WMS.Core.Op.Method
                         currBl.MasterHBillName = data.order.BillType == "M" ? "主单" : "分单";
                         currBl.StlDate = data.order.StlDate;
                         currBl.StlName = data.order.StlName;
+                        currBl.ETD = data.order.ETD;
+                        currBl.ETA = data.order.ETA;
 
                         resultList.Add(currBl);
 
                         continue;
                     }
 
-                    resultList.Add(new BLIssueManageBaseDto
+                    var nModel = new BLIssueManageBaseDto
                     {
                         Id = start,
                         BookingId = data.order.Id,
@@ -347,7 +350,19 @@ namespace DS.WMS.Core.Op.Method
                         DocName = data.order.DocName,
                         MasterHBill = data.order.BillType,
                         MasterHBillName = data.order.BillType == "M" ? "主单" : "分单",
-                    });
+                        ETD = data.order.ETD,
+                        ETA = data.order.ETA,
+                    };
+
+                    if (data.order.ETD.HasValue && data.order.StlDate.HasValue)
+                    {
+                        TimeSpan ts = data.order.StlDate.Value.Subtract(data.order.ETD.Value);
+                        var timeDiff = (decimal)ts.TotalMinutes;
+
+                        nModel.AgreementDays = (Int16)Math.Ceiling(timeDiff / (24 * 60m));
+                    }
+
+                    resultList.Add(nModel);
 
                     start++;
                 }