刷新调拨数据

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -871,17 +871,18 @@ where t1.gmt_create>=@btime and t1.gmt_create<=@etime ";
                 while (true)
                 {
                     var now = DateTime.Now;
-                    var sql = @" select t1.*,t2.create_time as 'complete_time',ifnull(t3.cost_first,0) as 'cost_first',t4.logisticscode from 
-dc_base_transfer_delivery as t1 
-left join dc_base_transfer_complete as t2 on t1.bailun_sku = t2.bailun_sku and t1.transfer_order_id = t2.transfer_order_id
-left join dc_mid_cost_first_order as t3 on t1.bailun_sku = t3.bailun_sku and t1.transfer_order_id = t3.transfer_order_id
-left join dc_base_transfer_info as t4 on  t1.transfer_order_id = t4.`code`
-where t1.create_time>=@btime and t1.create_time<=@etime ";
+                    var sql = @"select * from (
+select t2.creationtime,t2.logisticscode,t2.isdeleted,t1.transfer_order_id,t1.box_id,t1.bailun_sku,t1.warehouse_code,cost_first from dc_base_cost_first as t1 
+left join dc_base_transfer_info as t2 on t1.transfer_order_id = t2.`code`
+where t2.creationtime>=@btime and t2.creationtime<=@etime
+group by t1.transfer_order_id,t1.box_id
+) as t1
+ ";
                     DynamicParameters parameters = new DynamicParameters();
                     parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00"));
                     parameters.Add("etime", etime.ToString("yyyy-MM-dd 23:59:59"));
-                    sql += $" order by t1.create_time desc limit {(page - 1) * rows},{rows} ";
-                    var order_list = conn.Query<dc_base_transfer_delivery_dto>(sql, parameters, commandTimeout: 0).AsList();
+                    sql += $" order by t1.creationtime desc limit {(page - 1) * rows},{rows} ";
+                    var order_list = conn.Query<transfer_box_dto>(sql, parameters, commandTimeout: 0).AsList();
                     if (order_list == null || order_list.Count <= 0)
                     {
                         break;
@@ -891,7 +892,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                     {
                         try
                         {
-                            var occur_time = order_item.create_time;
+                            var occur_time = order_item.creationtime;
                             var platforms = GetPlatformShare(occur_time, conn, inventoryConfigs, order_item.warehouse_code, order_item.bailun_sku);
                             if (platforms != null && platforms.Count >= 1)
                             {
@@ -911,7 +912,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                                     {
                                         bailun_sku = order_item.bailun_sku,
                                         data_type = (int)dc_report_cash_flow_log_data_type_enum.新增头程费用,
-                                        is_delete = (order_item.deleted == 1) ? 1 : 0,
+                                        is_delete = (order_item.isdeleted == 1) ? 1 : 0,
                                         item = order_item.transfer_order_id,
                                         update_time = now,
                                         no = order_item.transfer_order_id,
@@ -955,7 +956,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                                 {
                                     bailun_sku = order_item.bailun_sku,
                                     data_type = (int)dc_report_cash_flow_log_data_type_enum.新增头程费用_首单,
-                                    is_delete = (order_item.deleted == 1) ? 1 : 0,
+                                    is_delete = (order_item.isdeleted == 1) ? 1 : 0,
                                     item = order_item.transfer_order_id,
                                     update_time = now,
                                     no = order_item.transfer_order_id,
@@ -963,7 +964,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                                     web_site = "",
                                     remarks = "",
                                     val = 0 - Math.Abs(order_item.cost_first),
-                                    occur_time = order_item.create_time,
+                                    occur_time = order_item.creationtime,
                                     warehouse_code = order_item.warehouse_code,
                                     pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
                                     item_no = order_item.transfer_order_id

AutoTurnOver.Models/Report/dc_base_transfer_verify.cs

@@ -107,6 +107,19 @@ namespace AutoTurnOver.Models.Report
 
     }
 
+    public class transfer_box_dto
+    {
+        public DateTime creationtime { get; set; }
+        public string logisticscode { get; set; }
+        public int isdeleted { get; set; }
+        public string box_id { get; set; }
+        public string bailun_sku { get; set; }
+        public string transfer_order_id { get; set; }
+        public string warehouse_code { get; set; }
+        public decimal cost_first { get; set; }
+
+    }
+
     public class dc_base_transfer_delivery
     {
         /// <summary>