资产负债表供应商应付账款页面

Bailun.DC.Services/FinanceReportServices.cs

@@ -227,7 +227,7 @@ namespace Bailun.DC.Services
         /// 更新物流供应商应付账款的数据
         /// </summary>
         /// <param name="id">应付账款id</param>
-        /// <param name="type">更改类型，1：修改发生调整额，2：修改付款调整额</param>
+        /// <param name="type">更改类型，1：修改发生调整额，2：修改付款调整额，3：修改发生额</param>
         /// <param name="amount">本次修改的金额</param>
         /// <param name="userid">当前用户id</param>
         /// <param name="username">当前用户名称</param>
@@ -255,10 +255,14 @@ namespace Bailun.DC.Services
                 {
                     obj.amount_happen_adjust = amount;
                 }
-                else
+                else if (type == 2)
                 {
                     obj.amount_payed_adjust = amount;
                 }
+                else if (type == 3)
+                {
+                    obj.amount_happen = amount;
+                }
 
                 obj.amount_end = obj.amount_start + obj.amount_happen + obj.amount_happen_adjust - obj.amount_payed - obj.amount_payed_adjust;
 
@@ -318,7 +322,8 @@ namespace Bailun.DC.Services
                             createtime = DateTime.Now,
                             lastupdatetime = DateTime.Now,
                             lastupdateuserid = 0,
-                            lastupdateusername = "admin"
+                            lastupdateusername = "admin",
+                            day = date
                         };
 
                         obj.amount_end = obj.amount_start + obj.amount_happen + obj.amount_happen_adjust - obj.amount_payed - obj.amount_payed_adjust;

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

@@ -441,9 +441,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <returns></returns>
         public ActionResult LogisticWaitPayDetail(DateTime date)
         {
-            var m = new dc_daily_lg_waitpay();
+            var m = new Services.FinanceReportServices().GetLogisticsWaitPay(date);
 
-            m = new Services.FinanceReportServices().GetLogisticsWaitPay(date);
+            if (m == null)
+            {
+                m = new dc_daily_lg_waitpay() {
+                    day = date,
+                };
+            }
 
             ViewBag.m = m;
 
@@ -454,7 +459,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// 更新供应商应付款
         /// </summary>
         /// <param name="id">供应商应付款id</param>
-        /// <param name="type">更改类型，1：修改发生调整额，2：修改付款调整额</param>
+        /// <param name="type">更改类型，1：修改发生调整额，2：修改付款调整额，3：修改发生额</param>
         /// <param name="amount">金额</param>
         /// <returns></returns>
         [BailunAuthentication(LoginMode.Enforce)]

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

@@ -1527,7 +1527,8 @@
                     showdetail(title + ' 半成品供应商应付款', '@Url.Content("~/Reports/Finance/CopeWith?finish=0&date=")' + title + '&paycompanyid=' + paycompany);
                     return false;
                 case 'logistics_accounts_payable':
-                    showdetail(title + ' 物流供应商应付款', '@Url.Content("~/Reports/Finance/CopeWithLogistics?date=")' + title + '&paycompanyid=' + paycompany);
+                    //showdetail(title + ' 物流供应商应付款', '@Url.Content("~/Reports/Finance/CopeWithLogistics?date=")' + title + '&paycompanyid=' + paycompany);
+                    showdetail(title + ' 物流供应商应付款', '@Url.Content("~/Reports/Finance/LogisticWaitPayDetail?date=")' + title + '&paycompanyid=' + paycompany);
                     return false;
                 case 'semi_transfer_amount':
                     showdetail(title + '半成品在途明细', '@Url.Content("~/Reports/Finance/SemiTransferStock?date=")' + title + '&paycompanyid=' + paycompany);

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

+
+@{
+    ViewData["Title"] = "LogisticWaitPayDetail";
+    Layout = "~/Pages/Shared/_MainLayout.cshtml";
+    ViewBag.Nav = new string[] { "财务报表", "资产负债表", "供应商应付账款" };
+}
+
+<div class="ibox-content m-b-sm border-bottom">
+    <table id="tb" class="table table-hover table-bordered" style="width:100%;">
+        <thead>
+            <tr>
+                <th>日期</th>
+                <th>期初余额</th>
+                <th>发生额</th>
+                <th>发生额调整额</th>
+                <th>付款额</th>
+                <th>付款调整额</th>
+                <th>期末余额</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>@(ViewBag.m.day.ToString("yyyy-MM-dd"))</td>
+                <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><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>
+        </tbody>
+    </table>
+</div>
+
+@section scripts{
+    <script>
+        function Save(id) {
+            var val = $('#' + id).val();
+            if (val == '') {
+                layer.msg('调整额不能为空！');
+                return;
+            }
+
+            var type = 0;
+            if (id == 'amount_happen_adjust') {
+                type = 1;
+            }
+            else if (id == 'amount_payed_adjust') {
+                type = 2;
+            }
+            else if (id == 'amount_happen') {
+                type = 3;
+            }
+
+            $.submit({
+                type:'POST',
+                url: '@Url.Content("~/Reports/Finance/UpdateLogisticWaitPay")',
+                paramData: 'id=@(ViewBag.m.id)&type=' + type +'&amount='+val,
+                func: function (result) {
+                    if (result.success) {
+                        layer.msg('提交成功！');
+
+                        setTimeout(function () {
+                            window.location = window.location;
+                        }, 1.5 * 1000);
+                    }
+                    else {
+                        layer.msg(result.msg);
+                    }
+                }
+            })
+
+        }
+
+        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%');
+        }
+    </script>
+}
+
+