Skip to content

D
DataCenter_Core2.1_20190520
Commit a68509ea by guanzhenshan
Options

修改报表搜索分类，改为百伦简单分类

parent 35a2894b
Showing with 341 additions and 25 deletions
Bailun.DC.Models/dc_base_sku_simple_category.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models
{
public class dc_base_sku_simple_category
{
public int id { get; set; }
/// <summary>
/// 父类id
/// </summary>
public int parent_id { get; set; }
/// <summary>
/// 简单分类短名称
/// </summary>
public string name { get; set; }
/// <summary>
/// 简单分类全名称
/// </summary>
public string full_name { get; set; }
/// <summary>
/// 级别
/// </summary>
public int level { get; set; }
/// <summary>
/// 简单分类Id
/// </summary>
public int skums_id { get; set; }
/// <summary>
/// 数据中心创建时间
/// </summary>
public DateTime bj_create { get; set; }
/// <summary>
/// 数据中心更新时间
/// </summary>
public DateTime bj_modified { get; set; }
}
}
Bailun.DC.Services/SkuInfoServices.cs
......@@ -4,6 +4,7 @@ using System.Text;
using Bailun.DC.Models;
using Dapper;
using MySql.Data.MySqlClient;
using System.Linq;
namespace Bailun.DC.Services
{
......@@ -146,6 +147,46 @@ namespace Bailun.DC.Services
}
}
/// <summary>
/// 获取百伦简单分类一二级
/// </summary>
/// <returns></returns>
public List<Models.Api.mSkuCategoryTree> ListSimpleCategory12(int? companyid)
{
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == System.Data.ConnectionState.Closed)
{
cn.Open();
}
var sql = "select id,parent_id,name,full_name,level,skums_id from dc_base_sku_simple_category ";
var obj = cn.Query<dc_base_sku_simple_category>(sql).AsList();
var list = new List<Models.Api.mSkuCategoryTree>();
var onelevel = obj.Where(a => a.level == 1);
foreach (var item in onelevel)
{
var chidren = obj.Where(a => a.parent_id == item.skums_id);
var m = new Models.Api.mSkuCategoryTree {
id = item.skums_id,
name = item.full_name,
open = false,
children = chidren.Select(a=>new Models.Api.mSkuCategoryTree {
id = a.skums_id,
name = a.full_name,
open = false
}).ToList()
};
list.Add(m);
}
return list;
}
}
}
}
Bailun.DC.SkuProfitService/Program.cs
......@@ -7,23 +7,23 @@ namespace Bailun.DC.SkuProfitService
{
class Program
{
static async Task Main(string[] args)
{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<Services>();
});
await builder.RunConsoleAsync();
}
//static void Main(string[] args)
//static async Task Main(string[] args)
//{
// Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// {
// services.AddHostedService<Services>();
// });
// var _service = new Services();
// _service.Save();
// await builder.RunConsoleAsync();
//}
static void Main(string[] args)
{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var _service = new Services();
_service.Save();
}
}
}
Bailun.DC.Web/Areas/Reports/Views/Orders/AmazonSaleStatistics.cshtml
......@@ -108,7 +108,8 @@
listWarehouse();
})
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -300,6 +301,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/EbaySaleStatistics.cshtml
......@@ -110,7 +110,9 @@
listwarehouse();
});
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -322,6 +324,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/FBAAbnormalOrder.cshtml
......@@ -86,7 +86,9 @@
listAccount();
listWebsite();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -189,6 +191,24 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/FBASaleStatistics.cshtml
......@@ -95,7 +95,9 @@
listWebsite();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -259,6 +261,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/ListOrder.cshtml
......@@ -93,7 +93,9 @@
listWebsite();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -232,6 +234,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/ListPlatformCost.cshtml
......@@ -110,7 +110,8 @@
$('#warehousetype').change(function () {
listwarehouse();
})
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -260,6 +261,24 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformFeeAbnormal.cshtml
......@@ -87,7 +87,8 @@
listAccount();
listWebsite();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -202,6 +203,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformProfitCount.cshtml
......@@ -148,7 +148,9 @@
listPlatform();
listcategory12();
//listcategory12();
listsimplecategory();
$('#platform').change(function () {
listwebsite();
......@@ -347,6 +349,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Orders/StatisticsByWebsite.cshtml
......@@ -111,7 +111,9 @@
listwarehouse();
})
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -315,6 +317,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/ListSkuProfit.cshtml
......@@ -77,7 +77,9 @@
listwarehouse();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -202,6 +204,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Areas/Reports/Views/Warehouse/ListWarehouseProfit.cshtml
......@@ -74,7 +74,9 @@
listwarehouse();
listcategory12();
//listcategory12();
listsimplecategory();
})
function list() {
......@@ -195,6 +197,23 @@
})
}
function listsimplecategory() {
$.submit({
url: '@Url.Content("~/Home/ListSimpleCategory")',
paramData: '',
type: 'POST',
func: function (result) {
var setting = {
check: {
chkStyle: 'checkbox',
enable: true
}
};
zTreeObj = $.fn.zTree.init($("#ztree"), setting, result);
}
})
}
function getChkNode() {
var s = '';
var o = $.fn.zTree.getZTreeObj("ztree");
......
Bailun.DC.Web/Controllers/HomeController.cs
......@@ -158,5 +158,24 @@ namespace Bailun.DC.Web.Controllers
}
/// <summary>
/// 获取简单百伦一二级分类
/// </summary>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
public JsonResult ListSimpleCategory()
{
var companyid = HttpContextHelper.Current.User.GetCompanyId().ToInt32();
if (companyid != 1)
{
return Json("{}");
}
var obj = new Services.SkuInfoServices().ListSimpleCategory12(companyid);
return Json(obj);
}
}
}
\ No newline at end of file
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