Commit 77c5e8a5 by guanzhenshan

物流供应商已付款增加更新功能

parent 74a67203
......@@ -352,6 +352,33 @@ namespace Bailun.DC.Services
}
/// <summary>
/// 更新物流供应商的付款金额
/// </summary>
/// <param name="day">日期</param>
/// <returns></returns>
public string UpdateLogisticPayed(DateTime day)
{
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == ConnectionState.Closed)
{
cn.Open();
}
//已付款
var sqlpay = $"select sum(if (cashier_type = 2,-cashier_paymoneyrmb,cashier_paymoneyrmb)) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type in (1, 2) and cashier_status = 1 and sourcecode in ('newCost', 'oldbuy') and type_name = '销售费用/物流费' and cashier_time>='{day.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{day.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'";
var hl_amount_pay = cn.QueryFirstOrDefault<decimal?>(sqlpay, null, null, 2 * 60) ?? 0;
//更新每日发生额 头程物流和尾程物流的付款额
cn.Execute("update dc_daily_happen_amount set hl_amount_pay="+hl_amount_pay+ ",tl_amount_pay="+hl_amount_pay+ " where day='"+day.ToString("yyyy-MM-dd")+"';");
var result = AddLogisticsWaitPay(day, hl_amount_pay);
return result;
}
}
/// <summary>
/// 增加物流供应商应付账款记录
/// </summary>
/// <param name="date">日期</param>
......
......@@ -542,7 +542,32 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
success = string.IsNullOrEmpty(result),
msg = result
});
}
}
/// <summary>
/// 更新物流供应商的付款额
/// </summary>
/// <param name="day">日期</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
public JsonResult UpdateLogisticPayed(DateTime day)
{
var _service = new Services.FinanceReportServices();
var result = "";
while (day.AddDays(1) < DateTime.Now)
{
result+=_service.UpdateLogisticPayed(day);
day = day.AddDays(1);
}
return Json(new {
success = string.IsNullOrEmpty(result),
msg = result
});
}
/// <summary>
/// 管理成本报表页面
......
......@@ -24,7 +24,7 @@
<td>@(ViewBag.m.amount_start)</td>
<td><input id="amount_happen" type="number" style="width:110px;height:24px;line-height:24px;" value="@(ViewBag.m.amount_happen)" /><button class="btn btn-success btn-xs" style="margin-left:3px" onclick="Save('amount_happen');">保存</button></td>
<td><input id="amount_happen_adjust" type="number" style="width:110px;height:24px;line-height:24px;" value="@(ViewBag.m.amount_happen_adjust)" /><button class="btn btn-success btn-xs" style="margin-left:3px" onclick="Save('amount_happen_adjust');">保存</button></td>
<td><a href="javascript:;" onclick="paydetail()">@(ViewBag.m.amount_payed)</a></td>
<td><a href="javascript:;" onclick="paydetail()">@(ViewBag.m.amount_payed)</a><button class="btn btn-warning btn-xs" style="margin-left:5px" onclick="updatePayed();">更新</button></td>
<td><input id="amount_payed_adjust" type="number" style="width:110px;height:24px;line-height:24px;" value="@(ViewBag.m.amount_payed_adjust)" /><button class="btn btn-success btn-xs" style="margin-left:3px" onclick="Save('amount_payed_adjust');">保存</button></td>
<td>@(ViewBag.m.amount_end)</td>
</tr>
......@@ -75,6 +75,27 @@
function paydetail() {
layer_show('@(ViewBag.m.day.ToString("yyyy-MM-dd")) 应付账款明细', '@Url.Content("~/Reports/Finance/ListHeadLogistic?start="+ ViewBag.m.day.ToString("yyyy-MM-dd"))' + '&end=@(ViewBag.m.day.ToString("yyyy-MM-dd"))', '95%', '95%');
}
function updatePayed() {
$.submit({
type:'POST',
url: '@Url.Content("~/Reports/Finance/UpdateLogisticPayed")',
paramData: 'day=@(ViewBag.m.day.ToString("yyyy-MM-dd"))',
func: function (result) {
if (result.success) {
layer.msg('提交成功!');
setTimeout(function () {
window.location = window.location;
}, 1.5 * 1000);
}
else {
layer.msg(result.msg);
}
}
})
}
</script>
}
......
......@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
public ActionResult Main()
{
#if DEBUG
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjgwODExM2E5YjNkOWFjNTg3ZjUyYjUzMWRhY2E3M2FjIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTEzNDAzMzEsImV4cCI6MTU5MTM3NjMzMSwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkxMzQwMzMxLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.pSjqtDDCC3usyPkLD_nG5UT8NBd5_rP92OSyeZCVDuL2E_1ev3NHPoY_5Lwt3FqF8dP1_Ow_vnm-knLH4daXnJyBQexfbQw3JKQGMe1aOC-GavOei96t9eKwFBp1CyQV7prG8xN89OLB-49Q39zhaB7Fgo7zTUrWVs6PVDKvJJU0h1-14xDlnpom6MU8WtqQYdCRQ_lwPVeTJVjS3Vr1GpLb0_RE9_8QxDGleYVCbt7mf3kp3CiWQ4K_PqxU0MvpSa7bCNv6eyNEbLpiCcj4X0ZEFKMDn8FuwYdHXcLv0bk-Y3RCjwBpqsJ1i5BO0Drv6SdD0yZECqD-ZiEmNzU0qA";
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjgwODExM2E5YjNkOWFjNTg3ZjUyYjUzMWRhY2E3M2FjIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTE0MTE1NTIsImV4cCI6MTU5MTQ0NzU1MiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkxNDExNTUyLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.q50r-9_dhbLH09jPAZ6kG2ReK_u4zlXAfs2wrq4ET3b1yQZ9YwWfHlW5mNUs24qKS4LWqUbGd6bX-YcQVPTdO2bc189PyhRB_gohLMNiK93KsuNqE1qs8eyQpza_cIvnJWSlk6mWEmNhFviak44o_2nWj2RhxkkOeJ0DUhDGEXWyRu4Zw96xDK5IX8OpYbw7Kh5povVNyAecam4svWWJne6o0CpAm-z6fB1wbp7AtdIwX-JE3S_8LH79heMtU-HKyxlP0KrXfY3aq7Pfkame4nG10K5q3E9woPWE4AKwV8yQ4STMhwOf6jq-Ys1bPoR95dEuhOO_FMkiNvZpBmYHGg";
#else
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var cookie = HttpContext.Request.Cookies["BailunToken"];
......
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