Skip to content

D
DataCenter_Core2.1_20190520
Commit 23b503f7 by jianshuqin
Options

修改功能:调整接口

parent 39cb30ce
Showing with 80 additions and 47 deletions
Bailun.DC.Services/FinanceReportServices.cs
...@@ -456,7 +456,7 @@ namespace Bailun.DC.Services ...@@ -456,7 +456,7 @@ namespace Bailun.DC.Services
/// <returns></returns> /// <returns></returns>
public string UpdateLogisticsEndAmount(DateTime day,decimal amount) public string UpdateLogisticsEndAmount(DateTime day,decimal amount)
{ {
var url = "http://api.dcjava.bailuntec.com/updateSheetLogisticsSupplier?date=" + day.ToString("yyyy-MM-dd")+"&logisticsPayableSum="+amount; var url = "http://finance-balance-sheet.data-center-job:8080/updateSheetLogisticsSupplier?date=" + day.ToString("yyyy-MM-dd")+"&logisticsPayableSum="+amount;
var result = Common.HttpHelper.NetHelper.Request(url); var result = Common.HttpHelper.NetHelper.Request(url);
...@@ -480,7 +480,7 @@ namespace Bailun.DC.Services ...@@ -480,7 +480,7 @@ namespace Bailun.DC.Services
/// <returns></returns> /// <returns></returns>
public string UpdateLogisticsEndAmount(DateTime day, decimal amount,string paramname) public string UpdateLogisticsEndAmount(DateTime day, decimal amount,string paramname)
{ {
var url = "http://api.dcjava.bailuntec.com/updateSheetLogisticsSupplier?date=" + day.ToString("yyyy-MM-dd") + "&"+ paramname+"=" + amount; var url = "http://finance-balance-sheet.data-center-job:8080/updateSheetLogisticsSupplier?date=" + day.ToString("yyyy-MM-dd") + "&"+ paramname+"=" + amount;
var result = Common.HttpHelper.NetHelper.Request(url); var result = Common.HttpHelper.NetHelper.Request(url);
......
Bailun.DC.Web/Areas/Reports/Views/Finance/BalanceSheetNew.cshtml
...@@ -906,7 +906,7 @@ ...@@ -906,7 +906,7 @@
var day = $('#' + c).attr('dd'); var day = $('#' + c).attr('dd');
$.submit({ $.submit({
url: 'http://api.dcjava.bailuntec.com/balanceSheetModify/record', url: 'http://finance-balance-sheet.data-center-job:8080/balanceSheetModify/record',
paramData: '{"statistical_time":"' + day + '","' + c + '":' + val + ',"company_value":0,"company_name":"百伦供应链"}', paramData: '{"statistical_time":"' + day + '","' + c + '":' + val + ',"company_value":0,"company_name":"百伦供应链"}',
contenttype: 'application/json', contenttype: 'application/json',
type: 'POST', type: 'POST',
......
Bailun.DC.Web/Areas/Reports/Views/Finance/BalanceSheetNew_210128.cshtml
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
obj[col] = val; obj[col] = val;
$.submit({ $.submit({
url: 'http://api.dcjava.bailuntec.com/balanceSheetModify/record', url: 'http://finance-balance-sheet.data-center-job:8080/balanceSheetModify/record',
paramData: '{"statistical_time":"' + mon.split('T')[0] + '","' + col + '":' + val +',"company_value":0,"company_name":"百伦供应链"}', paramData: '{"statistical_time":"' + mon.split('T')[0] + '","' + col + '":' + val +',"company_value":0,"company_name":"百伦供应链"}',
contenttype:'application/json', contenttype:'application/json',
type:'POST', type:'POST',
......
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
...@@ -28,13 +28,14 @@ ...@@ -28,13 +28,14 @@
<select id="sel_paycompany" class="form-control" style="width:200px;"> <select id="sel_paycompany" class="form-control" style="width:200px;">
<option value="0">百伦供应链</option> <option value="0">百伦供应链</option>
@*<option value="1">广州百伦科技有限公司</option> @*<option value="1">广州百伦科技有限公司</option>
<option value="2" selected>香港百伦科技有限公司</option>*@ <option value="2" selected>香港百伦科技有限公司</option>*@
</select> </select>
<button type="button" class="btn btn-sm btn-primary" onclick="GetData();"><i class="fa fa-search"></i>&nbsp;查询</button> <button type="button" class="btn btn-sm btn-primary" onclick="GetData();"><i class="fa fa-search"></i>&nbsp;查询</button>
<button id="btnexport" style="display:none;" type="button" class="btn btn-sm btn-success" onclick="ExportXsl();">导出</button> <button id="btnexport" style="display:none;" type="button" class="btn btn-sm btn-success" onclick="ExportXsl();">导出</button>
<button type="button" class="btn btn-sm btn-warning" onclick="showchart();">环比报表</button> <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-primary" onclick="showtask();">任务运行情况</button>
<button type="button" class="btn btn-sm btn-success" onclick="resync();">重新同步数据</button>
</div> </div>
</div> </div>
</form> </form>
...@@ -362,18 +363,18 @@ ...@@ -362,18 +363,18 @@
<div style="width:8%;"></div> <div style="width:8%;"></div>
</div> </div>
@*<div class="item-row fa fa1" style="width:100%;"> @*<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">3.存货FBA仓在途</div> <div style="width:11.5%;color:#bbb;">3.存货FBA仓在途</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div> <div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div> <div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div> <div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div> <div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div> <div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_amount">0</div> <div style="width:11.5%;" class="fba_transfer_amount">0</div>
<div style="width:11.5%;"> <div style="width:11.5%;">
<input id="fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" /><span id="ncl_bonds_payable_1"></span> <input id="fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" /><span id="ncl_bonds_payable_1"></span>
</div> </div>
<div style="width:8%;"></div> <div style="width:8%;"></div>
</div>*@ </div>*@
<div class="item-row fa fa1" style="width:100%;"> <div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;" title="3.存货FBA仓在途(不包括调拨计划)">3.存货FBA仓在途(不包括调拨计划)</div> <div style="width:11.5%;color:#bbb;background-color:#b1dae4;" title="3.存货FBA仓在途(不包括调拨计划)">3.存货FBA仓在途(不包括调拨计划)</div>
<div style="width:11.5%;" class="fba_transfer_allot_amount">0</div> <div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
...@@ -403,18 +404,18 @@ ...@@ -403,18 +404,18 @@
<div style="width:8%;"></div> <div style="width:8%;"></div>
</div> </div>
@*<div class="item-row fa fa1" style="width:100%;"> @*<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">4.存货非FBA仓在途</div> <div style="width:11.5%;color:#bbb;">4.存货非FBA仓在途</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div> <div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div> <div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div> <div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div> <div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div> <div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_amount">0</div> <div style="width:11.5%;" class="not_fba_transfer_amount">0</div>
<div style="width:11.5%;"> <div style="width:11.5%;">
<input id="not_fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" /><span id="ncl_bonds_payable_1"></span> <input id="not_fba_transfer_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" /><span id="ncl_bonds_payable_1"></span>
</div> </div>
<div style="width:8%;"></div> <div style="width:8%;"></div>
</div>*@ </div>*@
<div class="item-row fa fa1" style="width:100%;"> <div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;" title="5.存货非FBA仓在途(不包括调拨计划)">5.存货非FBA仓在途(不包括调拨计划)</div> <div style="width:11.5%;color:#bbb;background-color:#b1dae4;" title="5.存货非FBA仓在途(不包括调拨计划)">5.存货非FBA仓在途(不包括调拨计划)</div>
<div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div> <div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
...@@ -1428,23 +1429,34 @@ ...@@ -1428,23 +1429,34 @@
text-align: center; text-align: center;
} }
.item-row{border-bottom:solid 1px #eee;border-right:solid 1px #eee;} .item-row {
.item-row:hover{background-color:#eee;} border-bottom: solid 1px #eee;
.item-row div{cursor:pointer;} border-right: solid 1px #eee;
.item-col, .item-row div { }
/*margin: -1px;
.item-row:hover {
background-color: #eee;
}
.item-row div {
cursor: pointer;
}
.item-col, .item-row div {
/*margin: -1px;
border: solid 1px #eee; border: solid 1px #eee;
border-right-width: 0px;*/ border-right-width: 0px;*/
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
border-right:solid 1px #eee; border-right: solid 1px #eee;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
white-space: nowrap; .second-row div {
overflow: hidden; border-left-width: 0px;
text-overflow: ellipsis;
} }
.second-row div{border-left-width:0px;}
</style> </style>
} }
...@@ -1522,7 +1534,7 @@ ...@@ -1522,7 +1534,7 @@
_head = _head.substring(0, _head.length - 1); _head = _head.substring(0, _head.length - 1);
_val = _val.substring(0, _val.length - 1); _val = _val.substring(0, _val.length - 1);
} }
layer_show(_html, '@Url.Content("~/Reports/Finance/Index2TrendChart?colname=")' + _html + '&head=' + _head + '&vals=' + _val,'90%','90%'); layer_show(_html, '@Url.Content("~/Reports/Finance/Index2TrendChart?colname=")' + _html + '&head=' + _head + '&vals=' + _val,'90%','90%');
}) })
} }
...@@ -1558,7 +1570,7 @@ ...@@ -1558,7 +1570,7 @@
func: function (result) { func: function (result) {
if (result.success) { if (result.success) {
var list = result.data; var list = result.data;
_data = []; _data = [];
var obj = list[list.length - 1]; var obj = list[list.length - 1];
...@@ -1584,7 +1596,7 @@ ...@@ -1584,7 +1596,7 @@
$('#' + key).parent().removeClass(key); $('#' + key).parent().removeClass(key);
} }
//$('#' + key).val(obj[key]); //$('#' + key).val(obj[key]);
} }
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
...@@ -1594,7 +1606,7 @@ ...@@ -1594,7 +1606,7 @@
var day = obj.statistical_time.replace('T', ' ').replace('00:00:00', ''); var day = obj.statistical_time.replace('T', ' ').replace('00:00:00', '');
$('#c' + (i)).html(day); $('#c' + (i)).html(day);
for (var key in obj) { for (var key in obj) {
$('.' + key).each(function (j) { $('.' + key).each(function (j) {
if (j == i) { if (j == i) {
$(this).attr('title', day); $(this).attr('title', day);
...@@ -1602,7 +1614,7 @@ ...@@ -1602,7 +1614,7 @@
if (i < list.length - 1) { if (i < list.length - 1) {
$(this).html(numFormat(obj[key])); $(this).html(numFormat(obj[key]));
} }
if (obj["ismark"] == 1) { if (obj["ismark"] == 1) {
$(this).css('background', '#00A45F'); $(this).css('background', '#00A45F');
$(this).css('color', '#fff'); $(this).css('color', '#fff');
...@@ -1823,6 +1835,27 @@ ...@@ -1823,6 +1835,27 @@
layer_show('任务运行情况', '@Url.Content("~/Reports/Finance/BalanceSheetTask")', '90%', '90%'); layer_show('任务运行情况', '@Url.Content("~/Reports/Finance/BalanceSheetTask")', '90%', '90%');
} }
function resync() {
var day = $('#day').val();
if (day == '') {
alert('请选择日期');
return false;
}
debugger;
$.ajax({
url: 'http://finance-balance-sheet.data-center-job:8080/reload?localDate',
type: "POST",
data: { localDate:day},
success: function (result) {
debugger;
alert('重新同步成功！');
},
error: function () {
debugger;
alert(err.statusText);
}
});
}
</script> </script>
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment