调拨临时数据，新增运输方式

AutoTurnOver.DB/ApiUtility.cs

@@ -548,47 +548,64 @@ namespace AutoTurnOver.DB
         /// <returns></returns>
         public static List<api_transport_count_order_transfer_dto> GetLmsTransportCountList(api_transport_count_order_transfer_query_dto data)
         {
+            var _connection = MyMySqlConnection._connection;
+            List<api_transport_count_order_transfer_dto> datas = new List<api_transport_count_order_transfer_dto>() { new api_transport_count_order_transfer_dto { } };
+            List<dc_base_trans_expectarrivaltime_temp> transDatas = new List<dc_base_trans_expectarrivaltime_temp>();
+            // 查询真实的调拨在途
+            var orders = _connection.Query<dc_base_trans_expectarrivaltime_temp>(@"select 
+ifnull(t8.expectarrivaltime,t2.expectarrivaltime) as 'expectarrivaltime',
+t1.sku as 'bailun_sku',
+t2.targetwareno as 'warehouse_code',
+t1.deliverycount - t1.storagecount as 'count',
+ifnull(t2.`code`,'') as 'transfer_order_id',
+ifnull(t2.purchasecode,'') as 'purchase_id'
+from dc_base_transfer_info_skus as t1 
+left join dc_base_transfer_info as t2 on t1.dataid =t2.dataid
+left join dc_base_warehouse as t3 on t2.targetwareno = t3.warehouse_code
+left join ( select * from  dc_lms_order_transfer_current_node GROUP BY data_id,sku ) as t8 on t2.dataid = t8.data_id and t1.sku = t8.sku
+where t2.isdeleted=0 and t2.stateid not in (5,11,12)
+and t1.deliverycount > t1.storagecount
+and t2.isexception = 0
+and t3.hq_type in ('fba仓','第三方仓库') and t2.expectarrivaltime >='1991-01-01'").ToList();
+            if(orders!=null && orders.Count >= 1)
+            {
+                transDatas.AddRange(orders);
+            }
+            // 计算调拨临时数据
+            var temp_orders = _connection.Query<dc_base_trans_expectarrivaltime_temp>(@"select 
+t1.purchase_code as 'purchase_id', 
+t1.sku as 'bailun_sku',
+t1.target_ware_no as 'warehouse_code' ,
+(case when t1.create_state=0 then  t1.product_num else t1.temp_delivery_count end) as 'count',
+'' as 'transfer_order_id',
+'1991-01-01' as 'expectarrivaltime'
+from dc_base_trans_temp_schedule as t1 
+left join dc_base_warehouse as t2 on t1.target_ware_no = t2.warehouse_code
+where  t1.is_delete=0 and t1.is_temp_data=1 and t1.is_exception=0 and t2.hq_type in ('fba仓') and t1.create_state in (0,1)
+").ToList();
+            if (temp_orders != null && temp_orders.Count >= 1)
+            {
+                transDatas.AddRange(temp_orders);
+            }
+            // 查询计划单
+            var plan_orders = _connection.Query<dc_base_trans_expectarrivaltime_temp>(@"select 
+'' as 'purchase_id',
+t1.bailun_sku as 'bailun_sku',
+t1.warehouse_code as 'warehouse_code',
+t1.count as 'count',
+'' as 'transfer_order_id',
+'1991-01-01' as 'expectarrivaltime'
+from dc_base_transfer_plan as t1
+left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code
+where  t1.`status`=1 and t2.hq_type not IN ('国内仓','fba仓') and t1.deleted=0
+").ToList();
+            if (plan_orders != null && plan_orders.Count >= 1)
+            {
+                transDatas.AddRange(plan_orders);
+            }
 
-            return MyMySqlConnection._connection.Query<api_transport_count_order_transfer_dto>(@"select 
-t2.sku as 'bailun_sku',
-sum(t2.deliverycount) as 'product_count',
-count(DISTINCT t1.`code`) as 'order_count',
-sum(case when t3.transport_type=2 then t2.deliverycount else 0 end) as 'product_count_2',
-count(DISTINCT case when t3.transport_type=2 then t1.`code` else null end) as 'order_count_2',
-sum(case when t3.transport_type=3 then t2.deliverycount else 0 end) as 'product_count_3',
-count(DISTINCT case when t3.transport_type=3 then t1.`code` else null end) as 'order_count_3',
-sum(case when t3.transport_type=1 then t2.deliverycount else 0 end) as 'product_count_1',
-count(DISTINCT case when t3.transport_type=1 then t1.`code` else null end) as 'order_count_1'
-from dc_base_transfer_info as t1
-left join dc_base_transfer_info_skus as t2 on t1.dataid = t2.dataid
-inner join dc_base_lms_channel as t3 on t1.channelname = t3.`name`
-where t2.sku=@sku and t1.targetwareno=@targetwareno  and t3.transport_type in (1,2,3) and t1.creationtime>=@btime
-", new {
-                sku= data.bailun_sku,
-                targetwareno = data.targetwareno,
-                btime = DateTime.Now.AddDays(-90).ToDayHome()
-            }).ToList();
-            //try
-            //{
-            //    //查询采购建议明细 
-            //    string url = ConfigHelper.GetValue("api_lms_transport_count_transfer_list");
-            //    string resultStr = HttpHelper.Request(url, RequestType.POST, data.ToJson(), entype: "application/json; charset=utf-8", timeout: 1000 * 60 * 60 * 24);
-            //    var result = resultStr.ToObj<List<api_transport_count_order_transfer_dto>>();
-            //    if (result == null)
-            //    {
-            //        return new List<api_transport_count_order_transfer_dto>() { };
-            //    }
-            //    else
-            //    {
-            //        return result;
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-            //    return new List<api_transport_count_order_transfer_dto>();
-            //    //throw new Exception("lms 调拨单时效 接口异常： " + ex.Message);
-            //    //throw new Exception("lms 调拨单时效 接口异常： " + ex.StackTrace);
-            //}
+
+            return null;
         }
         /// <summary>
         /// 获取lms 的调拨单时效

AutoTurnOver.DB/dc_base_trans_temp_schedule_dao.cs

@@ -84,6 +84,7 @@ namespace AutoTurnOver.DB
                         var db_data = new dc_base_trans_temp_schedule()
                         {
                             code = item.code ?? "",
+                            transport_type_str = item.transportType ?? "",
                             creater_name = item.createrName,
                             data_id = item.purchaseCode + "-" + itemSku.sku,
                             create_time = item.createTime,

AutoTurnOver.Models/ApiDto/api_temp_schedule_response_dto.cs

@@ -16,6 +16,11 @@ namespace AutoTurnOver.Models.ApiDto
         public class item_dto
         {
             public string code { get; set; }
+
+            /// <summary>
+            /// 运输方式
+            /// </summary>
+            public string transportType { get; set; }
             public string purchaseCode { get; set; }
             public string sourceWareName { get; set; }
             public string sourceWareNo { get; set; }

AutoTurnOver.Models/dc_base_trans_temp_schedule.cs

@@ -8,6 +8,11 @@ namespace AutoTurnOver.Models
     {
         public int id { get; set; }
         public string code { get; set; }
+
+        /// <summary>
+        /// 运输方式
+        /// </summary>
+        public string transport_type_str { get; set; }
         public string purchase_code { get; set; }
         /// <summary>
         /// sku+仓库

AutoTurnOver.Purchase.AverageTarget/Program.cs

@@ -23,7 +23,7 @@ namespace AutoTurnOver.Purchase.AverageTarget
             Console.WriteLine("采购平均值计算任务启动...");
             try
             {
-                //report.ResetTransExpectArrivaltime();
+                report.ResetTransExpectArrivaltime();
                 //PurchaseAverageTargetServices.CalculationTransfer("942517901", days: (360 * 3));
                 //PurchaseAverageTargetServices.Calculation("942517901", days: (360 * 3));
             }

ResetOutofstock/Program.cs

@@ -20,7 +20,8 @@ namespace ResetOutofstock
                 //dc_auto_turnover.CopyForecast();
                 //report.GenerateWeekTagStockDatas();
                 //dc_base_transfer_extend_dao.SynchroLmsTransferOrder();
-                dc_base_supplier_dao.SynchroBailunLmsChannel();
+                //dc_base_supplier_dao.SynchroBailunLmsChannel();
+                //dc_base_trans_temp_schedule_dao.SynchroTransTempScheduleData(true);
             }
             catch (Exception ex)
             {