Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-06-26 9173f6e5b34a12c01804676d76842031e9ec6724

Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

# Conflicts:
#	CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs

 CoreCms.Net.Repository/Good/CoreCmsProductsRepository.cs

@@ -112,9 +112,10 @@
            List<CoreCmsProducts> page;
            if (blUseNoLock)
            {
                page = await DbClient.Queryable<CoreCmsGoods, CoreCmsProducts>((good, product) => new JoinQueryInfos(
                         JoinType.Inner, good.id == product.goodsId))
                    .Select((good, product) => new CoreCmsProducts
                page = await DbClient.Queryable<CoreCmsGoods, CoreCmsProducts, CoreCmsGoodsCategory>((good, product, Category) => new JoinQueryInfos(
                         JoinType.Inner, good.id == product.goodsId,
                         JoinType.Inner, good.goodsCategoryId == Category.id))
                    .Select((good, product, Category) => new CoreCmsProducts
                    {
                        id = product.id,
                        goodsId = product.goodsId,
@@ -136,7 +137,8 @@
                        name = good.name,
                        bn = good.bn,
                        isMarketable = good.isMarketable,
                        unit = good.unit
                        unit = good.unit,
                        CategoryID = Category.id
                    }).With(SqlWith.NoLock)
                    .MergeTable()
                    .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
@@ -145,9 +147,10 @@
            }
            else
            {
                page = await DbClient.Queryable<CoreCmsGoods, CoreCmsProducts>((good, product) => new JoinQueryInfos(
                        JoinType.Inner, good.id == product.goodsId))
                    .Select((good, product) => new CoreCmsProducts
                page = await DbClient.Queryable<CoreCmsGoods, CoreCmsProducts, CoreCmsGoodsCategory>((good, product, Category) => new JoinQueryInfos(
                        JoinType.Inner, good.id == product.goodsId,
                         JoinType.Inner, good.goodsCategoryId == Category.id))
                    .Select((good, product, Category) => new CoreCmsProducts
                    {
                        id = product.id,
                        goodsId = product.goodsId,
@@ -169,7 +172,8 @@
                        name = good.name,
                        bn = good.bn,
                        isMarketable = good.isMarketable,
                        unit = good.unit
                        unit = good.unit,
                        CategoryID = Category.id
                    })
                    .MergeTable()
                    .OrderByIF(orderByExpression != null, orderByExpression, orderByType)

 CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsProductsController.cs

@@ -30,6 +30,7 @@
using Microsoft.AspNetCore.Mvc;
using NPOI.HSSF.UserModel;
using SqlSugar;
using CoreCms.Net.Services;

namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -45,16 +46,19 @@
    {
        private readonly IWebHostEnvironment _webHostEnvironment;
        private readonly ICoreCmsProductsServices _coreCmsProductsServices;
        private readonly ICoreCmsGoodsCategoryServices _coreCmsGoodsCategoryServices;

        /// <summary>
        /// 构造函数
        ///</summary>
        public CoreCmsProductsController(IWebHostEnvironment webHostEnvironment
            , ICoreCmsProductsServices coreCmsProductsServices
            , ICoreCmsGoodsCategoryServices coreCmsGoodsCategoryServices
            )
        {
            _webHostEnvironment = webHostEnvironment;
            _coreCmsProductsServices = coreCmsProductsServices;
            _coreCmsGoodsCategoryServices = coreCmsGoodsCategoryServices;
        }

        #region 获取列表============================================================
@@ -132,7 +136,12 @@
            {
                where = where.And(p => p.name.Contains(name));
            }

            //商品分类 decimal
            var Category = Request.Form["categoryId"].FirstOrDefault().ToInt32OrDefault();
            if (Category > 0)
            {
                where = where.And(p => p.CategoryID == Category);
            }
            //获取数据
            var list = await _coreCmsProductsServices.QueryDetailPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
            //返回数据
@@ -152,10 +161,13 @@
        /// <returns></returns>
        [HttpPost]
        [Description("首页数据")]
        public AdminUiCallBack GetIndex()
        public async Task<AdminUiCallBack> GetIndexAsync()
        {
            //返回数据
            var jm = new AdminUiCallBack { code = 0 };
            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);
            var categoriesTree = GoodsHelper.GetTree(categories, false);
            jm.data= categoriesTree;
            return jm;
        }
        #endregion

 CoreCms.Net.Web.Admin/Controllers/Stock/CoreCmsStockController.cs

@@ -56,13 +56,15 @@
        private readonly ICoreCmsDistributionServices _coreCmsDistributionServices;
        private readonly ICoreCmsAreaServices _coreCmsAreaServices;

        private readonly ICoreCmsGoodsCategoryServices _coreCmsGoodsCategoryServices;
        /// <summary>
        /// 构造函数
        ///</summary>
        public CoreCmsStockController(IWebHostEnvironment webHostEnvironment
            , ICoreCmsStockServices stockServices, ICoreCmsProductsServices productsServices, IHttpContextUser user, ICoreCmsStockLogServices stockLogServices, ISysUserServices sysUserServices
            , ICoreCmsDistributionServices coreCmsDistributionServices
            , ICoreCmsAreaServices coreCmsAreaServices)
            , ICoreCmsAreaServices coreCmsAreaServices
            , ICoreCmsGoodsCategoryServices coreCmsGoodsCategoryServices)
        {
            _webHostEnvironment = webHostEnvironment;
            _stockServices = stockServices;
@@ -72,6 +74,7 @@
            _sysUserServices = sysUserServices;
            _coreCmsDistributionServices = coreCmsDistributionServices;
            _coreCmsAreaServices = coreCmsAreaServices;
            _coreCmsGoodsCategoryServices = coreCmsGoodsCategoryServices;
        }

        #region 获取列表============================================================
@@ -176,16 +179,20 @@
        /// <returns></returns>
        [HttpPost]
        [Description("首页数据")]
        public AdminUiCallBack GetIndex()
        public async Task<AdminUiCallBack> GetIndex()
        {
            //返回数据
            var jm = new AdminUiCallBack { code = 0 };

            var stockType = EnumHelper.EnumToList<GlobalEnumVars.StockType>();
            stockType = stockType.Where(p => p.value < 3).ToList();

            var categories = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.isShow, p => p.sort, OrderByType.Asc, true, true);
            var categoriesTree = GoodsHelper.GetTree(categories, false);
            jm.data = new
            {
                stockType,
                stockType
                
            };
            return jm;
        }

 CoreCms.Net.Web.Admin/wwwroot/views/content/stock/products/index.html

@@ -18,6 +18,12 @@
    <div class="layui-form coreshop-toolbar-search-form">
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label" for="category">商品分类</label>
                <div class="layui-input-inline" style="width: 200px;">                   
                    <div id="sel_category_stortPrducts" class="ew-xmselect-tree"  lay-reqText="请选择商品分类"></div>
                </div>
            </div>
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input type="text" name="name" placeholder="请输入商品名称" class="layui-input">
                </div>
@@ -64,9 +70,9 @@
    layui.data.done = function (d) {
        //开启调试情况下获取接口赋值数据
        if (debug) { console.log(d); }

        indexData = d.data;
        layui.use(['index', 'table', 'laydate', 'util', 'coredropdown', 'coreHelper'],
     
        indexData = d.data.data;
        layui.use(['index', 'table', 'laydate', 'util', 'coredropdown', 'coreHelper','xmSelect'],
            function () {
                var $ = layui.$
                    , admin = layui.admin
@@ -76,6 +82,7 @@
                    , setter = layui.setter
                    , coreHelper = layui.coreHelper
                    , util = layui.util
                    ,xmSelect = layui.xmSelect
                    , view = layui.view;

                //重载form
@@ -158,7 +165,26 @@
                            doDetails(obj);
                        }
                    });

                    xmSelect.render({
                    el: '#sel_category_stortPrducts',
                    height: '250px',
                    data: indexData,
                    //initValue: mData ? [mData.parentId] : [],
                    //model: { label: { type: 'text' } },
                    name: 'categoryId',
                    prop: {
                        name: 'title',
                        value: 'id'
                    },                
                    radio: true,
                    clickClose: true,
                    tree: {
                        show: true,
                        indent: 15,
                        strict: false,
                        expandedKeys: true
                    }
                });

                //监听单元格编辑
                table.on('edit(LAY-app-CoreCmsProducts-tableBox)', function (obj) {