解决现金流量表支出和明细对不上的问题

Bailun.DC.DailyPayAndIncoming/Services.cs

@@ -384,7 +384,7 @@ namespace Bailun.DC.DailyPayAndIncoming
             var sqlparam = new DynamicParameters();
             var list = new List<Models.dc_base_finance_logistics>();
 
-            var sql = $"select if(manage_cost_type=1,amount_rmb,-amount_rmb) as  from dc_base_finance_logistics where pay_time>='{start.ToString("yyyy-MM-dd")}' and pay_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
+            var sql = $"select no,amount_rmb from dc_base_finance_logistics where pay_time>='{start.ToString("yyyy-MM-dd")}' and pay_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
             
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {

Bailun.DC.DailySemiPurchaseSellStock/Program.cs

@@ -22,7 +22,7 @@ namespace Bailun.DC.DailySemiPurchaseSellStock
         {
             var _services = new Services();
 
-            var start = DateTime.Parse("2020-05-25");
+            var start = DateTime.Parse("2020-05-26");
             _services.Init(start);
             //while (start.AddDays(1) < DateTime.Now)
             //{

Bailun.DC.Models/dc_mid_skudeliver_weighdiff.cs

@@ -46,5 +46,10 @@ namespace Bailun.DC.Models
         /// </summary>
         public DateTime createtime { get; set; }
 
+        /// <summary>
+        /// 发货仓库
+        /// </summary>
+        public string warehouse_name { get; set; }
+
     }
 }

Bailun.DC.Services/OrdersServices.cs

@@ -4556,10 +4556,8 @@ namespace Bailun.DC.Services
         public List<dc_mid_skudeliver_weighdiff> ListWeighDiff(BtTableParameter request, DateTime? start, DateTime? end, int? min, int? max, string sku, ref int total,string warehousetype,string warehousecode)
         {
             var sqlparam = new DynamicParameters();
-            var sql = @"select t1.* from dc_mid_skudeliver_weighdiff t1 ";
+            var sql = @"select t1.*,t3.warehouse_name from dc_mid_skudeliver_weighdiff t1 ";
 
-            if (!string.IsNullOrWhiteSpace(warehousetype) || !string.IsNullOrWhiteSpace(warehousecode))
-            {
             sql += " join dc_base_oms_pick t2 on t1.pick_order_id=t2.pick_order_id and t1.bailun_sku=t2.bailun_sku ";
             sql += " join dc_base_warehouse t3 on t2.warehouse_code=t3.warehouse_code ";
             
@@ -4571,10 +4569,9 @@ namespace Bailun.DC.Services
 
             if (!string.IsNullOrWhiteSpace(warehousecode))
             {
-                    sql += " t3.warehouse_code=@warehousecode";
+                sql += " and t3.warehouse_code=@warehousecode";
                 sqlparam.Add("warehousecode", warehousecode);
             }
-            }
             
             sql += " where t1.id>0 ";
 

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -6847,6 +6847,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                 var colNames = new List<string>() { "费用单号", "管理成本单类型", "部门名称", "付款主体名称", "父级分类", "金额", "付款时间" };
 
+                //管理成本 只取付款主体为广州百伦供应链科技有限公司、香港百伦科技有限公司、广州电子服装仓、阳山仓、深圳仓、广州哥戈尔生活科技有限公司、广州迪致美容科技有限公司的数据
+                list = list.Where(a => a.company_name.Contains("广州歌戈儿生活科技有限公司") || a.company_value == 5 || a.company_value == 1 || a.company_value == 3 || a.company_value == 8 || a.company_value == 2 || a.company_value == 7).ToList();
                 
                 var listval = new List<string>();
                 foreach (var item in list)
@@ -6879,7 +6881,6 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                 var colNames = new List<string>() { "借款公司", "借款帐号", "借款持卡人", "债权方", "本期归还利息", "实际还款时间" };
                 
-
                 var listval = new List<string>();
                 foreach (var item in listInterest)
                 {

Bailun.DC.Web/Areas/Reports/Controllers/SkuController.cs

@@ -107,7 +107,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 day = a.day.ToString("yyyy-MM-dd"),
                 a.diffweigh,
                 a.pick_order_id,
-                a.weight
+                a.weight,
+                a.warehouse_name
             });
 
             return JsonConvert.SerializeObject(new { total = total, rows = obj,

Bailun.DC.Web/Areas/Reports/Views/Sku/ListSkuDiffWeigh.cshtml

@@ -79,6 +79,9 @@
                     field: 'pick_order_id', title: '配货单号', width: '160'
                 },
                 {
+                    field:'warehouse_name',title:'发货仓库',width:'130'
+                },
+                {
                     field: 'bailun_sku', title: 'sku编码', width: '160'
                 },
                 { field: 'weight', title: 'sku重量g', width: '130', sortable: true },

Bailun.DC.Web/Controllers/HomeController.cs

@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
         public ActionResult Main()
         {
 #if DEBUG
-            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImU4YWFiMmNiMTVhNzc0NzQ4ZWM0NDdiZjZiMzc2ZDQwIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1ODk4NTcyMjQsImV4cCI6MTU4OTg5MzIyNCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTg5ODU3MjI0LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn1dIiwiRGVwYXJ0bWVudCI6IntcIkRlcGFydG1lbnRJZFwiOjI1OCxcIk5hbWVcIjpcIuaVsOaNruS4reW_g1wiLFwiQ29kZVwiOlwiXCJ9Iiwic2NvcGUiOlsib3BlbmlkIiwicHJvZmlsZSIsImJhaWx1bkFwaSJdLCJhbXIiOlsiY3VzdG9tIl19.nE58rZuHiR8by87DcydqoozNZV3ETXuN0_pZatazougdS48YZgyFBvChgS0xgflj6fYUqv-mbFbDC5WcNxwu6j3mfizFpTDu5CkBRWoEM0YUnXG3TcezkOSkd9sjbNLCKWDmiImt3CVwDxvOLgYQB72crrD0_NEhUb4fLno5zE1k_V6XRUReLz6VItM8jtmbL_kn5HSNb70S3--aMyUkIcqP3xUHLsaG-ckNc90w6r6FjqPXuZdEoj7joUpqIZS9NII8_msn45vLe3KQJzFLCvk-t-vv6qmiyUzxGqgqYY7k1roJmu3RPETh6yGgnV1ZDIKoGrS7FVNtMUiAV8ndUQ";
+            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjFhZTgzOGQ0NTY5NjFiMjlkZDA2M2VmZWZmNTEwZjMyIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTA1NTA0MDEsImV4cCI6MTU5MDU4NjQwMSwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkwNTUwNDAxLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.ytrkWeY4j3Mz8IQjllKqiTwjiWEZR8O8CummWBO3JxnLPsqcj66loS2rGqBbgDKbZpPRzH241oMrQbY10sH0mha-3ABPjn_tlbi8xEHBSIgUELkMruOY-HE0NmAZo-DnDZBtNwtBQAH00yIKusBc6b295y8fAD6eMXKl2c-KzTJnZCzkqr0oR3f8XDZjaDWnBt563rF0Y70SB4zj7UoMTcwzSODYNq74UUAjFQTEJebxnPRx12gBqeBUtaoMUUgRG8JTxDoZe9spsr4MSXUILo1-BdXMbGsIfiEPjy_USMCyjUIhLsMxe3ReNh6ItEk4MLZWQ-r1hXWG6531DTiZyg";
 #else
             //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
             var cookie = HttpContext.Request.Cookies["BailunToken"];

Bailun.DC.Web/Pages/Index.cshtml

@@ -29,8 +29,8 @@
 
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
     <script type="text/javascript">
-        //login_localhost();
-        login();
+        login_localhost();
+        //login();
         window.location = "@Url.Content("~/Home/Main")";
     </script>
 </body>

Bailun.DC.Web/appsettings.json

@@ -14,6 +14,6 @@
   "GetUser": "http://www.bailuntec.com/Login/GetUserByBLUserAcct",
   "AppSetting": {
     "SsoUrl": "http://sso.bailuntec.com", //֤url
-    "AuthType": "" //Ƿdebugģʽ
+    "AuthType": "debug" //Ƿdebugģʽ
   }
 }