新增功能:重新生成资产负债表

Bailun.DC.Common/GlobalConfig.cs

@@ -23,6 +23,11 @@ namespace Bailun.DC.Common
         /// sku分类url
         /// </summary>
         public static string SkumsCategory = "http://api.sku.bailuntec.com/api/BailunCateData/GetAllCategoryList";
+
+        /// <summary>
+        /// DcjavaUrl
+        /// </summary>
+        public static string DcJavaUrl = "http://api.dcjava.bailuntec.com";
 #else
         public static string ConnectionString = "server=10.0.8.113;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;SslMode=none;";
         //public static string ConnectionString_read = "server=10.0.8.21;port=3306;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;";
@@ -31,6 +36,11 @@ namespace Bailun.DC.Common
         /// sku分类url
         /// </summary>
         public static string SkumsCategory = "http://10.0.6.13:8001/api/BailunCateData/GetAllCategoryList";
+
+        /// <summary>
+        /// DcjavaUrl
+        /// </summary>
+        public static string DcJavaUrl = "http://finance-balance-sheet.data-center-job:8080";
 #endif
         public static string OAUrl = "http://www.bailuntec.com";
 

Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml

@@ -35,6 +35,7 @@
 
                         <button type="button" class="btn btn-sm btn-warning" onclick="showchart();">环比报表</button>
                         <button type="button" class="btn btn-sm btn-primary" onclick="showtask();">任务运行情况</button>
+                        <button type="button" class="btn btn-sm btn-success" onclick="resync();">重新生成资产负债表</button>
                     </div>
                 </div>
             </form>
@@ -1561,7 +1562,8 @@
                 return false;
             }
 
-
+            //0代表加载的风格，支持0-2
+            var lindex = layer.load(1, { shade: false });
             $.submit({
                 url: '@Url.Content("~/Reports/Finance/IndexJson")',
                 type: "POST",
@@ -1639,6 +1641,7 @@
                     else {
                         alert(result.msg);
                     }
+                    layer.close(lindex);
                 }
             })
         }
@@ -1657,7 +1660,7 @@
         }
 
         $.ajax({
-            url: '@Url.Content("~/FinanceReport/FHome/BalanceSheet")',
+            url: '@Url.Content("~/Report/Finance/BalanceSheetResync")',
             type: "POST",
             data: 'id=' + id + '&c=' + c + '&val=' + val,
             success: function (result) {
@@ -1840,18 +1843,19 @@
                 alert('请选择日期');
                 return false;
             }
-            debugger;
+            var lindex = layer.load(1, { shade: false });
             $.ajax({
-                url: 'http://api.dcjava.bailuntec.com/reload',
+                url: '@Url.Content("~/Reports/Finance/BalanceSheetResync")',
                 type: "POST",
-                data: {localDate : day},
+                data: { day : day},
                 success: function (result) {
-                    debugger;
-                    alert('重新同步成功！');
+                    layer.msg(result.message, {icon: result.success ? 1 : 2,time: 1500  });
                 },
                 error: function (err) {
-                    debugger;
-                    alert(err.statusText);
+                    layer.msg(err.statusText, { icon: 2, time: 1500 });
+                },
+                complete: function () {
+                    layer.close(lindex);
                 }
             });
         }