fix

AutoTurnOver.DB/ApiUtility.cs

@@ -85,7 +85,7 @@ namespace AutoTurnOver.DB
             {
                 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);
+            string resultStr = HttpHelper.Request(url + parameters, RequestType.GET, "", timeout: 1000 * 60 * 60 * 24);
             var result = resultStr.ToObj<LmsResultDto<List<LmsShipLogisticsDto>>>();
             if (result == null)
             {
@@ -575,7 +575,7 @@ where t2.isdeleted=0 and t2.stateid not in (5,11,12) and t9.transport_type in (1
 and t1.deliverycount > t1.storagecount
 and t2.isexception = 0
 and t3.hq_type in ('fba仓','第三方仓库') and t2.expectarrivaltime >='1991-01-01' and t1.sku=@bailun_sku and t2.targetwareno=@warehouse_code ", parameters).ToList();
-            if(orders!=null && orders.Count >= 1)
+            if (orders != null && orders.Count >= 1)
             {
                 transDatas.AddRange(orders);
             }
@@ -618,16 +618,57 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
                 transDatas.AddRange(plan_orders);
             }
             datas[0].order_count = transDatas.Select(s => s.main_code).Distinct().Count();
-            datas[0].product_count = transDatas.Sum(s=>s.count);
-            datas[0].order_count_1 = transDatas.Where(s=>s.transport_type_str=="铁路运输").Select(s => s.main_code).Distinct().Count();
-            datas[0].product_count_1 = transDatas.Where(s=>s.transport_type_str== "铁路运输").Sum(s => s.count);
-            datas[0].order_count_2 = transDatas.Where(s=>s.transport_type_str=="海运").Select(s => s.main_code).Distinct().Count();
-            datas[0].product_count_2 = transDatas.Where(s=>s.transport_type_str== "海运").Sum(s => s.count);
-            datas[0].order_count_2 = transDatas.Where(s=>s.transport_type_str=="空运").Select(s => s.main_code).Distinct().Count();
-            datas[0].product_count_2 = transDatas.Where(s=>s.transport_type_str== "空运").Sum(s => s.count);
+            datas[0].product_count = transDatas.Sum(s => s.count);
+            datas[0].order_count_1 = transDatas.Where(s => s.transport_type_str == "铁路运输").Select(s => s.main_code).Distinct().Count();
+            datas[0].product_count_1 = transDatas.Where(s => s.transport_type_str == "铁路运输").Sum(s => s.count);
+            datas[0].order_count_2 = transDatas.Where(s => s.transport_type_str == "海运").Select(s => s.main_code).Distinct().Count();
+            datas[0].product_count_2 = transDatas.Where(s => s.transport_type_str == "海运").Sum(s => s.count);
+            datas[0].order_count_2 = transDatas.Where(s => s.transport_type_str == "空运").Select(s => s.main_code).Distinct().Count();
+            datas[0].product_count_2 = transDatas.Where(s => s.transport_type_str == "空运").Sum(s => s.count);
 
             // 在库库存分析
-            var logs = _connection.Query<order_transfer_status_log>(" select * from order_transfer_status_log where  t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and is_delete=0 ", parameters);
+            var stock = _connection.QueryFirstOrDefault<int?>(" select usable_stock from dc_base_stock as t1 where t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code  ", parameters)??0;
+            if (stock > 0)
+            {
+                var logs = _connection.Query<order_transfer_status_log>(" select * from order_transfer_status_log as t1 where  t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code and is_delete=0 ", parameters).ToList();
+                if (logs != null && logs.Count >= 1)
+                {
+                    // 按实际排降序取够库存
+                    var stock_orders = new List<dc_base_trans_expectarrivaltime_temp>();
+                    foreach (var item in logs.OrderByDescending(s => s.date))
+                    {
+                        
+                        if (stock > 0)
+                        {
+                            var use_stock = stock > item.count ? item.count : stock;
+                            if (use_stock > 0)
+                            {
+                                stock -= use_stock;
+                                // 查询相关调拨单
+                                var transport_type_str = _connection.QueryFirstOrDefault<string>(@"select
+(case when t9.transport_type=1 then '铁路运输' when t9.transport_type=2 then '海运' when t9.transport_type=3 then '空运' else '未知' end  ) as 'transport_type_str'
+from dc_base_transfer_info as t1
+left join dc_base_lms_channel as t9 on t1.channelname = t9.`name`
+where `code`=@code limit 1
+",new { code  = item.system_order_no});
+                                stock_orders.Add(new dc_base_trans_expectarrivaltime_temp { count = use_stock , main_code  = item.system_order_no,transport_type_str = transport_type_str });
+                            }
+                           
+                        }
+                       
+                    }
+
+                    datas[0].order_count += stock_orders.Select(s => s.main_code).Distinct().Count();
+                    datas[0].product_count += stock_orders.Sum(s => s.count);
+                    datas[0].order_count_1 += stock_orders.Where(s => s.transport_type_str == "铁路运输").Select(s => s.main_code).Distinct().Count();
+                    datas[0].product_count_1 += stock_orders.Where(s => s.transport_type_str == "铁路运输").Sum(s => s.count);
+                    datas[0].order_count_2 += stock_orders.Where(s => s.transport_type_str == "海运").Select(s => s.main_code).Distinct().Count();
+                    datas[0].product_count_2 += stock_orders.Where(s => s.transport_type_str == "海运").Sum(s => s.count);
+                    datas[0].order_count_2 += stock_orders.Where(s => s.transport_type_str == "空运").Select(s => s.main_code).Distinct().Count();
+                    datas[0].product_count_2 += stock_orders.Where(s => s.transport_type_str == "空运").Sum(s => s.count);
+                }
+            }
+            
 
             return datas;
         }
@@ -776,7 +817,7 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
             {
                 //查询采购建议明细 
                 string url = ConfigHelper.GetValue("prod-sys:order");
-                string resultStr = HttpHelper.Request(url+$"?page={data.page}&rows={data.rows}&btime={data.btime}&etime={data.etime}", RequestType.GET, "application/json", timeout: 1000 * 60 * 60 * 24);
+                string resultStr = HttpHelper.Request(url + $"?page={data.page}&rows={data.rows}&btime={data.btime}&etime={data.etime}", RequestType.GET, "application/json", timeout: 1000 * 60 * 60 * 24);
                 var result = resultStr.ToObj<api_prod_order_response_dto>();
                 if (result == null)
                 {
@@ -799,7 +840,7 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
         /// </summary>
         /// <param name="data"></param>
         /// <returns></returns>
-        public static List<api_order_transfer_current_node_dto.data_dto> GetLmsTransferOrderNode(int page ,int rows,DateTime btime,DateTime etime)
+        public static List<api_order_transfer_current_node_dto.data_dto> GetLmsTransferOrderNode(int page, int rows, DateTime btime, DateTime etime)
         {
             try
             {
@@ -829,7 +870,7 @@ and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
         public static List<api_order_transfer_status_log_dto.data_dto> GetOrderBailunTransferLog(DateTime btime, int type = 5)
         {
             var url = ConfigHelper.GetValue("Order:Bailun_TransferLog");
-            var response_json =  HttpHelper.Request(url, RequestType.POST, new
+            var response_json = HttpHelper.Request(url, RequestType.POST, new
             {
                 CreationTime = btime,
                 State = type

AutoTurnOver.DB/dc_base_transfer_freight_dao.cs

@@ -19,7 +19,7 @@ namespace AutoTurnOver.DB
         /// <param name="type">1 = 打包  2 = 交运 3 =确认交运 </param>
         public static void SynchroOrderBailunTransferLog(int type)
         {
-            var task_name = $"SynchroOrderBailunTransferLog_{type}_v1";
+            var task_name = $"SynchroOrderBailunTransferLog_{type}_v2";
             var conn = _connection;
             // 查询最后一次成功抓取的记录
             var last_task_synchro_log = conn.QuerySingleOrDefault<task_synchro_log>(" select  * from task_synchro_log where task_name=@task_name and status=1 order by end_time desc limit 1 ", new { task_name = task_name });