fix

AutoTurnOver.DB/ApiUtility.cs

@@ -83,7 +83,7 @@ namespace AutoTurnOver.DB
             var parameters = $"";
             if (requstData != null)
             {
-                parameters = $"?RecordStatus={requstData.RecordStatus}&startPoint={requstData.startPoint}&platform={requstData.platform}&Line_Code={requstData.Line_Code}&country_code={requstData.country_code}&endCountries={requstData.endCountries}&character_skus={requstData.character_skus}&has_min_freight_unit_price={requstData.has_min_freight_unit_price}";
+                parameters = $"?has_history_order={requstData.has_history_order}&transport_type={requstData.transport_type}&RecordStatus={requstData.RecordStatus}&startPoint={requstData.startPoint}&platform={requstData.platform}&Line_Code={requstData.Line_Code}&country_code={requstData.country_code}&endCountries={requstData.endCountries}&character_skus={requstData.character_skus}&has_min_freight_unit_price={requstData.has_min_freight_unit_price}";
             }
             string resultStr = HttpHelper.Request(url+ parameters, RequestType.GET, "", timeout: 1000 * 60 * 60 * 24);
             var result = resultStr.ToObj<LmsResultDto<List<LmsShipLogisticsDto>>>();

AutoTurnOver.DB/purchase_advise.cs

@@ -62,7 +62,7 @@ namespace AutoTurnOver.DB
                     {
                         endCountries = item.country_code,
                         character_skus = item.bailun_sku,
-                        startPoint = "3"
+                        startPoint = "3",
                     });
 
                     if (logisticsDatas != null && logisticsDatas.Count >= 1)

AutoTurnOver.Models/ApiDto/LmsShipLogisticsDto.cs

@@ -43,8 +43,10 @@ namespace AutoTurnOver.Models.ApiDto
     {
         public string RecordStatus { get; set; } = ""; public string startPoint { get; set; } = ""; public string platform { get; set; } = ""; public string Line_Code { get; set; } = "";
         public string country_code { get; set; } = "";
+        public int transport_type { get; set; } = 0;
         public string endCountries { get; set; } = "";
         public string character_skus { get; set; } = "";
         public bool has_min_freight_unit_price { get; set; } = false;
+        public bool has_history_order { get; set; } = false;
     }
 }

AutoTurnOver.Models/transfer_profit_dto.cs

@@ -10,8 +10,10 @@ namespace AutoTurnOver.Models
         public string remarks { get; set; }
         public List<day_dto> days { get; set; }
        
+
         public class day_dto
         {
+            public bool has_int { get; set; }
             public DateTime date { get; set; }
             public string date_str { get {
                     return date.ToString("MM-dd"+$"({Sinicization(date.DayOfWeek)})");
@@ -19,7 +21,16 @@ namespace AutoTurnOver.Models
 
             public decimal? val { get; set; }
             public string val_str { get {
+                    if (val == null) return "-";
+                    if (has_int)
+                    {
+                        return (val ?? 0).ToString();
+                    }
+                    else
+                    {
                         return (val ?? 0).ToString("N");
+                    }
+                    
                 } }
         }
 

AutoTurnOver.Services/PurchaseAverageTargetServices.cs

@@ -448,7 +448,7 @@ where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and t1.isp
                             {
                                 endCountries = base_wa,
                                 character_skus = skuItem.bailun_sku,
-                                startPoint = "3"
+                                startPoint = "3",
                             });
                             if (logisticsDatas != null && logisticsDatas.Count >= 1)
                             {