应收账款报表增加备注功能

Bailun.DC.Models/dc_daily_receivable.cs

@@ -86,5 +86,10 @@ namespace Bailun.DC.Models
         /// </summary>
         public string lastupdateusername { get; set; }
 
+        /// <summary>
+        /// 备注信息
+        /// </summary>
+        public string note { get; set; }
+
     }
 }

Bailun.DC.Services/FinanceReportServices.cs

@@ -5658,7 +5658,7 @@ group by currency";
         /// <returns></returns>
         public List<dc_daily_receivable> ListReceivable(BtTableParameter parameter,string platform,DateTime start, DateTime end,int type,ref int total)
         {
-            var sql = $"select max(id) id,platform,sum(amount_sale_pay) as amount_sale_pay,sum(amount_shipping) amount_shipping,sum(amount_refund) amount_refund,sum(amount_sale_shipping) amount_sale_shipping,sum(amount_platformfee) amount_platformfee,sum(amount_incoming) amount_incoming,sum(amount_other) amount_other from dc_daily_receivable where day>='{start.ToString("yyyy-MM-dd")}' and day<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
+            var sql = $"select max(id) id,platform,sum(amount_sale_pay) as amount_sale_pay,sum(amount_shipping) amount_shipping,sum(amount_refund) amount_refund,sum(amount_sale_shipping) amount_sale_shipping,sum(amount_platformfee) amount_platformfee,sum(amount_incoming) amount_incoming,sum(amount_other) amount_other,max(note) note from dc_daily_receivable where day>='{start.ToString("yyyy-MM-dd")}' and day<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
             var sqlparam = new DynamicParameters();
 
             var sql_start = $"select * from dc_daily_receivable where day='{start.ToString("yyyy-MM-dd")}'";
@@ -5858,6 +5858,7 @@ group by currency";
                     obj.amount_end = obj.amount_start + obj.amount_sale_shipping - obj.amount_platformfee - obj.amount_incoming - obj.amount_refund + obj.amount_other;
                 }
                 
+
                 obj.lastupdatetime = DateTime.Now;
                 obj.lastupdateuserid = uid;
                 obj.lastupdateusername = username;
@@ -5876,6 +5877,42 @@ group by currency";
         }
 
         /// <summary>
+        /// 修改应收款备注
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="note">备注</param>
+        /// <returns></returns>
+        public string UpdateReceivableNote(int id, string note, int uid, string username)
+        {
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.QueryFirstOrDefault<dc_daily_receivable>("select * from dc_daily_receivable where id=" + id);
+
+                if (obj == null)
+                {
+                    return "找不到该记录。";
+                }
+                
+                obj.note = note;
+
+                obj.lastupdatetime = DateTime.Now;
+                obj.lastupdateuserid = uid;
+                obj.lastupdateusername = username;
+
+                var result = cn.Update(obj);
+                
+                return result > 0 ? "" : "更新失败，请重试！";
+            }
+        }
+
+
+
+        /// <summary>
         /// 更新应收账款期末金额
         /// </summary>
         /// <param name="m"></param>

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

@@ -8094,7 +8094,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 amount_sale_shipping = a.amount_sale_shipping.ToString("N2"),
                 amount_shipping = a.amount_shipping.ToString("N2"),
                 amount_start = a.amount_start.ToString("N2"),
-                lastupdatetime = a.lastupdatetime.ToString("yyyy-MM-dd HH:mm:ss")
+                lastupdatetime = a.lastupdatetime.ToString("yyyy-MM-dd HH:mm:ss"),
+                note = (a.note??"")
             });
 
             var objCount = _service.ListReceivableCount(platform, start, end,type);
@@ -8140,6 +8141,26 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             });
         }
 
+        /// <summary>
+        /// 更新平台应收款备注
+        /// </summary>
+        /// <param name="id">应收款id</param>
+        /// <param name="note">备注</param>
+        /// <returns></returns>
+        [HttpPost]
+        public JsonResult UpdatePlatformReceivableNote(int id, string note)
+        {
+            var user = HttpContextHelper.Current.User;
+
+            var result = new Services.FinanceReportServices().UpdateReceivableNote(id, note, (user != null ? user.GetUid() : 0), (user != null ? user.GetUserName() : ""));
+
+            return Json(new
+            {
+                success = string.IsNullOrEmpty(result),
+                msg = result
+            });
+        }
+
         #endregion
 
 

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

@@ -105,7 +105,7 @@
                 { field: 'amount_refund', title: '退款(未发货)', width: '100', iscount: true },
                 {
                     field: 'amount_other', title: '其他金额', width: '110', iscount: true, formatter: function (idx, data) {
-                        return '<span>' + data.amount_other + '</span><a style="margin-left:3px;" href="javascript:;" onclick="showmodel(' + data.id + ',\'' + data.day + '\',\'' + data.platform + '\',\'' + data.amount_other + '\');">编辑</a>';
+                        return '<span>' + data.amount_other + '</span><a style="margin-left:3px;" href="javascript:;" onclick="showmodel(' + data.id + ',\'' + data.day + '\',\'' + data.platform + '\',\'' + data.amount_other + '\');">编辑</a><a style="margin-left:3px;" href="javascript:;" onclick="shownotemodel(' + data.id + ',\'' + data.day + '\',\'' + data.platform + '\',\'' + data.note +'\');">备注</a>';
                     }
                 },
                 { field: 'amount_end', title: '预收账款', width: '130', iscount: true }
@@ -132,7 +132,7 @@
                     { field: 'amount_refund', title: '退款(已发货)', width: '130', iscount: true },
                     {
                         field: 'amount_other', title: '其他金额', width: '110', iscount: true, formatter: function (idx, data) {
-                            return '<span>' + data.amount_other + '</span><a style="margin-left:3px;" href="javascript:;" onclick="showmodel(' + data.id + ',\'' + data.day + '\',\'' + data.platform + '\',\'' + data.amount_other+'\');">编辑</a>';
+                            return '<span>' + data.amount_other + '</span><a style="margin-left:3px;" href="javascript:;" onclick="showmodel(' + data.id + ',\'' + data.day + '\',\'' + data.platform + '\',\'' + data.amount_other + '\');">编辑</a><a style="margin-left:3px;" href="javascript:;" onclick="shownotemodel(' + data.id + ',\'' + data.day + '\',\'' + data.platform + '\',\'' + data.note +'\');">备注</a>';
                         }
                     },
                     { field: 'amount_end', title: '期末应收账款', width: '130', iscount: true }
@@ -229,6 +229,7 @@
         var _platform;
         var _amount;
         var _t = 1;
+        var _note;
 
         function showmodel(i,d, p, m,t) {
             _day = d;
@@ -266,6 +267,37 @@
             })
         }
 
+        function shownotemodel(i, d, p, n) {
+            _day = d;
+            _platform = p;
+            _note = n;
+
+            layer.prompt({ title: p + " " + d + " 的备注", value: n }, function (text, index) {
+                layer.close(index);
+                SaveNote(i, text);
+            });
+        }
+
+        function SaveNote(id,val) {
+
+            $.submit({
+                url: '@Url.Content("~/Reports/Finance/UpdatePlatformReceivableNote")',
+                type:'POST',
+                paramData: 'id=' + id +'&note='+val,
+                func: function (result) {
+                    if (result.success) {
+                        layer.msg('提交成功！');
+                        setTimeout(function () {
+                            list();
+                        }, 2 * 1000);
+                    }
+                    else {
+                        layer.msg(result.msg);
+                    }
+                }
+            })
+        }
+
 
     </script>
 }

Bailun.DC.Web/Controllers/HomeController.cs

@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
         public ActionResult Main()
         {
 #if DEBUG
-            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTQ3OTQzMDIsImV4cCI6MTU5NDgzMDMwMiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk0Nzk0MzAyLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.OCXAt2m8ia04T5dwrrhtGTG7KSnf1NmagQbxxls-GZVOBDSYcX1SwTozVThAdeI38Mv5nw7u-U_JUF1VA_qGbMTUo8XNMj5aygEbHEYSOAPo329HCvmJwlXIVoxKuzkwvj4rthk-e9PGdRKdnK9_cXzJWSbi7SCo_cz9lERdRItot1MooM-YBlKTvLsH4ZZe-a-Bv9pn6EOxLmOmAztDC2x0Lpm5hdD2lM7t9v-4VaMX1ZlXxSbL0G3xmpILbXqZGAziNKGlwN8W-OCFZFEg5xnDJQ6SwCRY1k0dXgY7XKoAnTpYZCEalXyU_3Ni3CVVL_Mc_V7AYsrPgbIZafJdgA";
+            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTQ5NTQ4NzYsImV4cCI6MTU5NDk5MDg3NiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk0OTU0ODc2LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.yU3RZJ2qy5l_DE_kjY6I1d3-vIRyvfpsBfAEKMimkAOx26aQhXeqpd-UwVy8Q5I0d1sgB4THkXJBrDJ2PCvRJ_tsrfDW6wL3TDHS7tkV2z4nU0HhZme6veu7SzpK7njQpn7Qb5nlJrdbiGpPeBof0n13KoQs_fi2HdQtgklGjG6ZL-tiULAAI4VgB820qSnWw6Cq3Bc-RgeeCNyKLlxbtCQEitYcqTK1wNUDkaojgAYrCktG2JbSOX2iI5w_1WwiD87m22y1sGEd5es1D-JAxOQzNVOdIxDkoZ840rnH9RztMwQwR9VyO7N9mXUdnhel44fhps1Ax7UyWd8KldFtow";
 #else
             //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
             var cookie = HttpContext.Request.Cookies["BailunToken"];