fix

AutoTurnOver.DB/daily.cs

@@ -637,7 +637,7 @@ sum(t2.usable_stock) as 'usable_stock',
 sum(((t6.quantity_purchase+t6.quantity_transfer)*t3.unit_price)) as 'sum_mid_amount',
 sum(( t2.usable_stock*t3.unit_price)) as 'usable_stock_amount',
 sum(((t6.quantity_purchase+t6.quantity_transfer+t2.usable_stock)*t3.unit_price)) as 'sum_amount',
-sum(((t6.quantity_purchase+t6.quantity_transfer+t2.usable_stock)) as 'sum_stock')
+sum(((t6.quantity_purchase+t6.quantity_transfer+t2.usable_stock))) as 'sum_stock'
 from dc_config_fba_extend as t1
 left JOIN dc_base_stock as t2 on t1.bailun_sku_warehouse_code = t2.bailun_sku_warehouse_code
 left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku
@@ -667,7 +667,9 @@ t1.amount_sales_usd_1,t1.bailun_sku_quantity_ordered_1,t1.amount_sales_usd_7,t1.
 t3.buyer_name,t3.unit_price,t3.weight,
 t6.quantity_purchase,t6.quantity_transfer,t6.quantity_transfer_order,t6.quantity_transfer_temp_schedule,t6.quantity_transfer_temporary_storage,(t6.quantity_purchase+t6.quantity_transfer) as 'sum_mid',
 ts1.usable_stock as 'usable_stock_01',ts2.usable_stock as 'usable_stock_02', t2.usable_stock,
-((t6.quantity_purchase+t6.quantity_transfer)*t3.unit_price) as 'sum_mid_amount',( t2.usable_stock*t3.unit_price) as 'usable_stock_amount',((t6.quantity_purchase+t6.quantity_transfer+t2.usable_stock)*t3.unit_price) as 'sum_amount'
+((t6.quantity_purchase+t6.quantity_transfer)*t3.unit_price) as 'sum_mid_amount',( t2.usable_stock*t3.unit_price) as 'usable_stock_amount',
+((t6.quantity_purchase+t6.quantity_transfer+t2.usable_stock)*t3.unit_price) as 'sum_amount',
+((t6.quantity_purchase+t6.quantity_transfer+t2.usable_stock)) as 'sum_stock'
 from dc_config_fba_extend as t1
 left JOIN dc_base_stock as t2 on t1.bailun_sku_warehouse_code = t2.bailun_sku_warehouse_code
 left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku

AutoTurnOver.Models/dc_base_stock.cs

@@ -387,6 +387,7 @@ namespace AutoTurnOver.Models
     public class dc_base_stock_fba_dto
     {
         public string bailun_account { get; set; }
+        public decimal? sum_stock { get; set; }
         public string web_site { get; set; }
         public string asin { get; set; }
         public string bailun_sku { get; set; }
@@ -397,28 +398,28 @@ namespace AutoTurnOver.Models
         public string warehouse_code { get; set; }
         public string warehouse_name { get; set; }
         public string area_name { get; set; }
-        public decimal amount_sales_usd_1 { get; set; }
-        public decimal bailun_sku_quantity_ordered_1 { get; set; }
-        public decimal amount_sales_usd_7 { get; set; }
-        public decimal bailun_sku_quantity_ordered_7 { get; set; }
-        public decimal amount_sales_usd_30 { get; set; }
-        public decimal bailun_sku_quantity_ordered_30 { get; set; }
+        public decimal? amount_sales_usd_1 { get; set; }
+        public decimal? bailun_sku_quantity_ordered_1 { get; set; }
+        public decimal? amount_sales_usd_7 { get; set; }
+        public decimal? bailun_sku_quantity_ordered_7 { get; set; }
+        public decimal? amount_sales_usd_30 { get; set; }
+        public decimal? bailun_sku_quantity_ordered_30 { get; set; }
         public int monitor_status { get; set; }
         public string buyer_name { get; set; }
-        public decimal unit_price { get; set; }
-        public decimal weight { get; set; }
-        public decimal quantity_purchase { get; set; }
-        public decimal quantity_transfer { get; set; }
-        public decimal quantity_transfer_order { get; set; }
-        public decimal quantity_transfer_temp_schedule { get; set; }
-        public decimal quantity_transfer_temporary_storage { get; set; }
-        public decimal sum_mid { get; set; }
-        public decimal usable_stock_01 { get; set; }
-        public decimal usable_stock_02 { get; set; }
-        public decimal usable_stock { get; set; }
-        public decimal sum_mid_amount { get; set; }
-        public decimal usable_stock_amount { get; set; }
-        public decimal sum_amount { get; set; }
+        public decimal? unit_price { get; set; }
+        public decimal? weight { get; set; }
+        public decimal? quantity_purchase { get; set; }
+        public decimal? quantity_transfer { get; set; }
+        public decimal? quantity_transfer_order { get; set; }
+        public decimal? quantity_transfer_temp_schedule { get; set; }
+        public decimal? quantity_transfer_temporary_storage { get; set; }
+        public decimal? sum_mid { get; set; }
+        public decimal? usable_stock_01 { get; set; }
+        public decimal? usable_stock_02 { get; set; }
+        public decimal? usable_stock { get; set; }
+        public decimal? sum_mid_amount { get; set; }
+        public decimal? usable_stock_amount { get; set; }
+        public decimal? sum_amount { get; set; }
 
     }
 

AutoTurnOver.Services/DailyServices.cs

@@ -363,9 +363,9 @@ namespace AutoTurnOver.Services
                         row["广州01仓可用库存"] = itemData.usable_stock_01;
                         row["广州02仓可用库存"] = itemData.usable_stock_02;
                         row["FBA 可售库存"] = itemData.usable_stock;
-                        row["在途金额"] = itemData.sum_mid;
-                        row["可配库存金额"] = itemData.sum_mid_amount;
-                        row["在途+可配总库存"] = itemData.sum_amount;
+                        row["在途金额"] = itemData.sum_mid_amount;
+                        row["可配库存金额"] = itemData.usable_stock_amount;
+                        row["在途+可配总库存"] = itemData.sum_stock;
 
                        
                         table.Rows.Add(row);