fix

AutoTurnOver.DB/db_config.cs

@@ -573,16 +573,16 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
         /// <returns></returns>
         public static string BatchMonitorStatus(string ids, int monitor_status, UserData user)
         {
-
+            var conn = _connection;
             if (monitor_status != 1 && monitor_status != 0)
             {
                 throw new Exception("状态异常");
             }
-            var datas = _connection.Query<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id in @ids ", new { ids = ids.Split(',') }).AsList();
+            var datas = conn.Query<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id in @ids ", new { ids = ids.Split(',') }).AsList();
             foreach (AutoTurnOver.Models.dc_auto_turnover turnover_item in datas)
             {
                 // 先检查当前状态
-                var oldData = _connection.QueryFirstOrDefault<dc_auto_config_sku_warehouse>($"select * from dc_auto_config_sku_warehouse where bailun_sku=@bailun_sku and  warehouse_code=@warehouse_code ", new { turnover_item.bailun_sku, turnover_item.warehouse_code });
+                var oldData = conn.QueryFirstOrDefault<dc_auto_config_sku_warehouse>($"select * from dc_auto_config_sku_warehouse where bailun_sku=@bailun_sku and  warehouse_code=@warehouse_code ", new { turnover_item.bailun_sku, turnover_item.warehouse_code });
                 if (oldData == null || oldData.status == 0)
                 {
                     if (monitor_status == 0)
@@ -617,11 +617,11 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
                         gmt_modified = now
 
                     };
-                    _connection.Insert<dc_auto_config_sku_warehouse>(newData);
+                    conn.Insert<dc_auto_config_sku_warehouse>(newData);
                 }
                 else
                 {
-                    _connection.Execute(" update  dc_auto_config_sku_warehouse set status=@monitor_status,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName });
+                    conn.Execute(" update  dc_auto_config_sku_warehouse set status=@monitor_status,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName });
                 }
             }
 

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -891,9 +891,9 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                                         item_no = $"{order_item.transfer_order_id}-{platformItem.platform_type}-{platformItem.web_stie}"
                                     };
                                     var remarks = "";
+                                    item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
                                     item.occur_time_year_month_no = $"{item.occur_time.Year}-{item.occur_time.Month}-{item.data_type}-{item.platform_type}-{item.web_site}";
                                     item.pay_time_year_month_no = $"{item.pay_time.Year}-{item.pay_time.Month}-{item.data_type}-{item.platform_type}-{item.web_site}";
-                                    item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
                                     item.remarks += remarks;
                                     item.id = conn.QuerySingleOrDefault<int?>(" select id from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
                                     {
@@ -935,9 +935,10 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                                     item_no = order_item.transfer_order_id
                                 };
                                 var remarks = "";
+                                item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
                                 item.occur_time_year_month_no = $"{item.occur_time.Year}-{item.occur_time.Month}-{item.data_type}-{item.platform_type}-{item.web_site}";
                                 item.pay_time_year_month_no = $"{item.pay_time.Year}-{item.pay_time.Month}-{item.data_type}-{item.platform_type}-{item.web_site}";
-                                item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
+                                
                                 item.remarks = remarks;
                                 item.id = conn.QuerySingleOrDefault<int?>(" select id from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
                                 {