修改供应商应付账户生成服务

Bailun.DC.HappenAmount/Program.cs

@@ -22,7 +22,7 @@ namespace Bailun.DC.HappenAmount
 
         //static void Main(string[] args)
         //{
-        //    var start = DateTime.Parse("2019-12-01");
+        //    //var start = DateTime.Parse("2019-12-17");
         //    //while (start.AddDays(3) < DateTime.Now)
         //    //{
         //    //    new Services().Init(start, start.AddDays(1));
@@ -30,7 +30,7 @@ namespace Bailun.DC.HappenAmount
         //    //    start = start.AddDays(1);
         //    //}
 
-        //    new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start,0,"admin",null);
+        //    //new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start, 0, "admin", null);
 
         //}
     }

Bailun.DC.MonthSalePutin/Services.cs

@@ -279,14 +279,14 @@ namespace Bailun.DC.MonthSalePutin
                     ) tb
                     where tb.count_usable_stock/((tb.avg_sevenday_sales+tb.avg_fourteenday_sales+tb.avg_thirtyday_sales)/3)>14 or tb.avg_thirtyday_sales=0";
 
-            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString + "Allow User Variables=True;"))
             {
                 if (cn.State == System.Data.ConnectionState.Closed)
                 {
                     cn.Open();
                 }
 
-                var list = cn.Query<dc_mid_month_sale_putin_report>(sql, null, null, true, 3 * 60).AsList();
+                var list = cn.Query<dc_mid_month_sale_putin_report>(sql, null, null, true, 10 * 60).AsList();
 
                 cn.Execute($@"delete t1 from dc_mid_month_sale_putin_report t1
                               join dc_mid_month_sale_putin t2 on t1.sale_putin_id=t2.id and t2.warehouse_type='国内仓' and t2.`month`='{month}'");
@@ -332,16 +332,20 @@ namespace Bailun.DC.MonthSalePutin
             sql = $@"select t1.id from dc_mid_month_sale_putin_report t1
                     join dc_mid_month_sale_putin t2 on t1.sale_putin_id = t2.id
                     join dc_base_sku t3 on t2.bailun_sku=t3.bailun_sku and t3.status=1
-                    where t2.`month`='{month}' and t3.create_time is null";
-            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+                    where t2.`month`='{month}' -- and t3.create_time is null";
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString + "Allow User Variables=True;"))
             {
                 if (cn.State == System.Data.ConnectionState.Closed)
                 {
                     cn.Open();
                 }
 
-                var list = cn.Query<int>(sql, null, null, true, 2 * 60).AsList();
-                cn.Execute("update dc_mid_month_sale_putin_report set is_clear=1 where id in (" + string.Join(",", list) + ")");
+                var list = cn.Query<int>(sql, null, null, true, 10 * 60).AsList();
+                if (list.Count > 0)
+                {
+                    cn.Execute("update dc_mid_month_sale_putin_report set is_clear=1 where id in (" + string.Join(",", list) + ")");
+                }
+                
             }
 
 
@@ -351,14 +355,14 @@ namespace Bailun.DC.MonthSalePutin
                     left join dc_base_sku t3 on t2.bailun_sku=t3.bailun_sku and t3.create_time>'{DateTime.Now.AddMonths(-2).ToString("yyyy-MM-dd HH:mm:ss")}'
                     where t2.month='{month}' and t3.create_time is not null";
 
-            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString + "Allow User Variables=True;"))
             {
                 if (cn.State == System.Data.ConnectionState.Closed)
                 {
                     cn.Open();
                 }
 
-                var list = cn.Query<int>(sql, null, null, true, 2 * 60).AsList();
+                var list = cn.Query<int>(sql, null, null, true, 10 * 60).AsList();
 
                 cn.Execute("update dc_mid_month_sale_putin_report set is_new=1 where id in (" + string.Join(",", list) + ")");
             }

Bailun.DC.Services/FinanceReportServices.cs

@@ -396,7 +396,8 @@ namespace Bailun.DC.Services
                         cn.Insert<dc_daily_lg_waitpay>(obj);
                     }
 
-                    UpdateLogisticsEndAmount(date, obj.amount_end);
+                    UpdateLogisticsWaitPay(date, 0, "admin", cn);
+                    //UpdateLogisticsEndAmount(date, obj.amount_end);
 
                 }