Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/Property/RB_WarehouseOut_GoodsDetail.cs

+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Property
+{
+
+    /// <summary>
+    /// 商品出库记录实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_WarehouseOut_GoodsDetail
+    {
+        /// <summary>
+        /// 入库单id
+        /// </summary>
+        public int StockInId { get; set; }
+
+        /// <summary>
+        /// 物料id
+        /// </summary>
+        public int MaterialId { get; set; }
+        /// <summary>
+        /// 出库id
+        /// </summary>
+        public int StockOutId { get; set; }
+
+        /// <summary>
+        /// 仓库id
+        /// </summary>
+        public int WarehouseId { get; set; }
+
+
+        /// <summary>
+        /// 申请id
+        /// </summary>
+        public int ApplyId { get; set; }
+
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int ID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// OrderId
+        /// </summary>        
+        public int OrderId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int GoodsId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 删除状态0-否，1-是
+        /// </summary>        
+        public int Status
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 订单商品id
+        /// </summary>        
+        public int OrderGoodsId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>        
+        public string GoodsName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 规格
+        /// </summary>        
+        public string Specification
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 规格key
+        /// </summary>
+        public string SpecificationSort { get; set; }
+
+        /// <summary>
+        /// 货号
+        /// </summary>        
+        public string ProductCode
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 成本价
+        /// </summary>
+        public decimal? CostMoney { get; set; }
+    }
+}

Mall.Model/Entity/TradePavilion/RB_Collect.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Common.Enum.TradePavilion;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 收藏实体表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Collect
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 类型  1载体  2品牌
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 来源id
+        /// </summary>
+        public int SourceId { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+    }
+}

Mall.Model/Extend/Property/RB_WarehouseOut_GoodsDetail_Extend.cs

+using VT.FW.DB;
+using Mall.Model.Entity.Property;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.Property
+{
+
+
+    /// <summary>
+    /// 商品出库记录扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_WarehouseOut_GoodsDetail_Extend : RB_WarehouseOut_GoodsDetail
+    {
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+
+        /// <summary>
+        /// 财务单据id
+        /// </summary>
+        public int FinanceId { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string WarehouseName { get; set; }
+
+        /// <summary>
+        /// 出库数量
+        /// </summary>
+        public int Number { get; set; }
+
+        /// <summary>
+        /// 出库时间
+        /// </summary>
+        public DateTime? StockOutDate { get; set; }
+
+        /// <summary>
+        /// 重新入库数量
+        /// </summary>
+        public int InventoryNum { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

@@ -14,5 +14,7 @@ namespace Mall.Model.Extend.TradePavilion
 
 
         public List<string> BannerList { get; set; }
+
+        public string ProjectName { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Carrier_Extend.cs

 using System;
 using System.Collections.Generic;
 using System.Text;
+using Mall.Common.Plugin;
 using Mall.Model.Entity.TradePavilion;
 
 namespace Mall.Model.Extend.TradePavilion
@@ -17,7 +18,10 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public List<string> BannerList { get; set; }
 
-
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int OrderBy { get; set; }
 
         /// <summary>
         /// 开业时间

Mall.Model/Extend/TradePavilion/RB_Collect_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+using Mall.Model.Entity.TradePavilion;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    public class RB_Collect_Extend : RB_Collect
+    {
+        
+    }
+}

Mall.Module.Property/PropertyModule.cs

@@ -50,6 +50,10 @@ namespace Mall.Module.Property
         /// </summary>
         private readonly RB_SupplierRepository supplierRepository = new RB_SupplierRepository();
         /// <summary>
+        /// 订单
+        /// </summary>
+        private readonly RB_Goods_OrderRepository goods_OrderRepository = new RB_Goods_OrderRepository();
+        /// <summary>
         /// 商品分类
         /// </summary>
         private readonly RB_Goods_CategoryRepository goods_CategoryRepository = new RB_Goods_CategoryRepository();
@@ -128,6 +132,11 @@ namespace Mall.Module.Property
         /// </summary>
         private readonly RB_FinanceFlowConnectRepository financeFlowConnectRepository = new RB_FinanceFlowConnectRepository();
 
+        /// <summary>
+        /// 出库明细
+        /// </summary>
+        private readonly RB_WarehouseOut_GoodsDetailRepository warehouseOut_GoodsDetailRepository = new RB_WarehouseOut_GoodsDetailRepository();
+
 
         #region 获取采购单
 
@@ -1051,6 +1060,44 @@ namespace Mall.Module.Property
             });
         }
 
+        #endregion
+
+        #region 重新入库
+
+        /// <summary>
+        /// 获取出库明细分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_GoodsDetail_Extend> GetGoodsOutDetailPageList(int pageIndex, int pageSize, out long count, RB_WarehouseOut_GoodsDetail_Extend demodel)
+        {
+            if (!string.IsNullOrEmpty(demodel.OrderNo)) {
+                var olist = goods_OrderRepository.GetOrderList(new RB_Goods_Order_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderNo = demodel.OrderNo });
+                if (olist.Any()) {
+                    demodel.OrderId = olist.FirstOrDefault()?.OrderId ?? 0;   
+                }
+                demodel.OrderNo = "";
+            }
+            var list = warehouseOut_GoodsDetailRepository.GetPageList_V2(pageIndex, pageSize, out count, demodel);
+            if (list.Any()) {
+                //查询订单号
+                string OrderIds = string.Join(",", list.Where(x => x.OrderId > 0).Select(x => x.OrderId).Distinct());
+                List<RB_Goods_Order_Extend> orderList = new List<RB_Goods_Order_Extend>();
+                if (!string.IsNullOrEmpty(OrderIds)) {
+                    orderList = goods_OrderRepository.GetOrderList(new RB_Goods_Order_Extend() { OrderIds = OrderIds });
+                }
+                foreach (var item in list)
+                {
+                    item.OrderNo = orderList.Where(x => x.OrderId == item.OrderId).FirstOrDefault()?.OrderNo ?? "";
+                }
+            }
+            return list;
+        }
+
+
         #endregion
 
         #region 获取资产物料列表

Mall.Module.TradePavilion/CompanyModule.cs

@@ -116,7 +116,32 @@ namespace Mall.Module.TradePavilion
         /// <returns></returns>
         public RB_Company_Extend GetCompanyByUserIdModule(int userId)
         {
-            return companyRepository.GetCompanyRepository(new RB_Company_Extend() { CreateBy = userId });
+            var model =companyRepository.GetCompanyRepository(new RB_Company_Extend() { CreateBy = userId });
+            if (model != null && model.CompanyId > 0)
+            {
+                var metroList = brandRepository.GetBrandList(new RB_CompanyBrand_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
+                if (metroList != null && metroList.Any())
+                {
+                    model.BrandModel = new RB_CompanyBrand_Extend();
+                    model.BrandModel = metroList.FirstOrDefault();
+                    if (model.BrandModel != null && !string.IsNullOrWhiteSpace(model.BrandModel.CustomerType))
+                    {
+                        model.BrandModel.CustomerTypeInfo = new List<string>();
+                        foreach (var itemCustomerType in model.BrandModel.CustomerType.Split(","))
+                        {
+                            if (itemCustomerType != "5")
+                            {
+                                model.BrandModel.CustomerTypeInfo.Add(Common.Plugin.EnumHelper.GetEnumName(itemCustomerType));
+                            }
+                            else
+                            {
+                                model.BrandModel.CustomerTypeInfo.Add(model.BrandModel.CustomerOtherType);
+                            }
+                        }
+                    }
+                }
+            }
+            return model;
         }
 
         /// <summary>

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -208,6 +208,10 @@ where {where} group by o.OrderId asc";
             {
                 where += $@" and o.{nameof(RB_Goods_Order.OrderId)} in({dmodel.OrderIds})";
             }
+            if (!string.IsNullOrEmpty(dmodel.OrderNo))
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} ='{dmodel.OrderNo}'";
+            }
             if (!string.IsNullOrEmpty(dmodel.orderNos))
             {
                 where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} in({dmodel.orderNos})";

Mall.Repository/Property/RB_WarehouseOut_GoodsDetailRepository.cs

+using Mall.Model.Entity.Property;
+using Mall.Model.Extend.Property;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Property
+{
+    /// <summary>
+    /// 出库明细id
+    /// </summary>
+    public class RB_WarehouseOut_GoodsDetailRepository : BaseRepository<RB_WarehouseOut_GoodsDetail>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_WarehouseOut_GoodsDetail); } }
+
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_GoodsDetail_Extend> GetOutGoodsDetailPageList(int pageIndex, int pageSize, out long rowCount, RB_WarehouseOut_GoodsDetail_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@$" select a.* from {TableName} as a where a.Status=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.OrderId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.OrderId)}={query.OrderId}");
+                }
+                if (!string.IsNullOrEmpty(query.GoodsName))
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.GoodsName)} like '%{query.GoodsName}%'");
+                }
+            }
+            return GetPage<RB_WarehouseOut_GoodsDetail_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_GoodsDetail> GetOutGoodsDetailList(RB_WarehouseOut_GoodsDetail query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" select * from {TableName} as a where a.Status=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ApplyId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_GoodsDetail.ApplyId)}={query.ApplyId}");
+                }
+            }
+            return Get<RB_WarehouseOut_GoodsDetail>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取出库记录分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_GoodsDetail_Extend> GetPageList_V2(int pageIndex, int pageSize, out long rowCount, RB_WarehouseOut_GoodsDetail_Extend query) 
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($@"SELECT a.*,i.InventoryNum FROM(
+SELECT gd.OrderId,gd.OrderGoodsId,gd.GoodsId,gd.StockOutId,gd.MaterialId,gd.GoodsName
+,gd.Specification,gd.CostMoney,gd.ProductCode,gd.WarehouseId,s.StockOutDate,w.`Name` as WarehouseName,COUNT(0) AS Number
+FROM rb_warehouseout_goodsdetail gd
+LEFT JOIN rb_supplies_stockout s on gd.StockOutId = s.Id and s.`Status`=0 and s.StockOutState =1
+LEFT JOIN rb_supplies_warehouse w on gd.WarehouseId =w.Id
+WHERE gd.`Status`=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND gd.{nameof(RB_WarehouseOut_GoodsDetail.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND gd.{nameof(RB_WarehouseOut_GoodsDetail.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND gd.{nameof(RB_WarehouseOut_GoodsDetail.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.OrderId > 0)
+                {
+                    builder.Append($" AND gd.{nameof(RB_WarehouseOut_GoodsDetail.OrderId)}={query.OrderId}");
+                }
+                if (!string.IsNullOrEmpty(query.GoodsName))
+                {
+                    builder.Append($" AND gd.{nameof(RB_WarehouseOut_GoodsDetail.GoodsName)} like '%{query.GoodsName}%'");
+                }
+            }
+            builder.Append($@" GROUP BY gd.OrderId,gd.OrderGoodsId,gd.GoodsId,gd.StockOutId,gd.MaterialId) a
+LEFT JOIN rb_warehouseout_inventory i on a.StockOutId = i.StockOutId and a.MaterialId = i.MaterialId and a.OrderId = i.OrderId and a.OrderGoodsId = i.OrderGoodsId");
+            builder.Append(" ORDER BY a.StockOutDate DESC");
+            return GetPage<RB_WarehouseOut_GoodsDetail_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_CarrierRepository.cs

@@ -73,6 +73,14 @@ namespace Mall.Repository.TradePavilion
                     }
                     builder.Append(" )");
                 }
+
+                if (query.OrderBy == 1)
+                {
+                    builder.Append($" order by {nameof(RB_Carrier_Extend.CreateDate)} desc");
+                }
+                else if (query.OrderBy == 2) {
+                    builder.Append($" order by {nameof(RB_Carrier_Extend.OpenTime)} desc");
+                }
             }
             return GetPage<RB_Carrier_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }

Mall.Repository/TradePavilion/RB_CollectRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 收藏仓储层
+    /// </summary>
+    public class RB_CollectRepository : BaseRepository<RB_Collect>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Collect); } }
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Collect_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Collect_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Collect_Extend.Status)}=0 ");
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.Type > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.Type)}={query.Type}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.UserId)}={query.UserId}");
+                }
+                if (query.SourceId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.SourceId)}={query.SourceId}");
+                }
+            }
+            builder.Append($" order by Id desc");
+            return GetPage<RB_Collect_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 收藏列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Collect_Extend> GetList(RB_Collect_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Collect_Extend.Status)}=0 ");
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.Type > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.Type)}={query.Type}");
+                }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.UserId)}={query.UserId}");
+                }
+                if (query.SourceId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Collect_Extend.SourceId)}={query.SourceId}");
+                }
+            }
+            builder.Append($" order by Id desc");
+            return Get<RB_Collect_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/Property/PropertyController.cs

@@ -375,6 +375,86 @@ namespace Mall.WebApi.Controllers.MallBase
         }
         #endregion
 
+        #region 重新入库
+
+        /// <summary>
+        /// 获取出库记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetGoodsOutDetailPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_WarehouseOut_GoodsDetail_Extend demodel = JsonConvert.DeserializeObject<RB_WarehouseOut_GoodsDetail_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = propertyModule.GetGoodsOutDetailPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.OrderId,
+                x.OrderGoodsId,
+                x.GoodsId,
+                x.StockOutId,
+                x.MaterialId,
+                x.GoodsName,
+                x.Specification,
+                x.OrderNo,
+                x.CostMoney,
+                x.ProductCode,
+                x.WarehouseId,
+                x.WarehouseName,
+                x.Number,
+                StockOutDate = x.StockOutDate.HasValue ? x.StockOutDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.InventoryNum
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 重新入库
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetGoodsAgainInventory()
+        {
+            var parms = RequestParm;
+            List<RB_WarehouseOut_GoodsDetail_Extend> demodel = JsonConvert.DeserializeObject<List<RB_WarehouseOut_GoodsDetail_Extend>>(parms.msg.ToString());
+            if (parms.ERPEmpId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递参数");
+            }
+            if (demodel == null || demodel.Count() == 0) {
+                return ApiResult.ParamIsNull("请传递数据");
+            }
+            foreach (var item in demodel)
+            {
+                if (item.OrderId <= 0){
+                    return ApiResult.ParamIsNull("请传递订单id");
+                }
+                if (item.OrderGoodsId <= 0) {
+                    return ApiResult.ParamIsNull("请传递订单明细id");
+                }
+                if (item.StockOutId <= 0) {
+                    return ApiResult.ParamIsNull("请传递出库单id");
+                }
+                if (item.MaterialId <= 0) {
+                    return ApiResult.ParamIsNull("请传递物料id");
+                }
+                if (item.InventoryNum <= 0) {
+                    return ApiResult.ParamIsNull("请传递入库数量");
+                }
+            }
+
+
+            return ApiResult.Success();
+        }
+
+        #endregion
+
+
         #region 同步商品
         /// <summary>
         /// 获取物料档案分页列表

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -77,6 +77,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 新增修改公司信息
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult SetCompany()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -131,6 +132,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取当前用户的公司信息实体
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult GetUserCompany()
         {
             var userInfo = AppletUserInfo;
@@ -551,12 +553,110 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
         #endregion
 
+        #region 载体管理
 
-        #region 品牌
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetCarrierPageList()
+        {
+            var userInfo = AppletUserInfo;
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Carrier_Extend()
+            {
+                MetroName = parms.GetStringValue("MetroName"),
+                CarrierName = parms.GetStringValue("CarrierName"),
+                MetroNum = parms.GetInt("MetroNum", 0),
+                Developers = parms.GetStringValue("Developers"),
+                StartOpenTime = parms.GetStringValue("StartOpenTime"),
+                EndOpenTime = parms.GetStringValue("EndOpenTime"),
+                ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0),
+                OrderBy = parms.GetInt("OrderBy", 0)
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = userInfo?.TenantId ?? 0;
+
+            var list = carrierModule.GetCarrierPageList(pageModel.pageIndex, pageModel.pageSize, out long count, query);
+            pageModel.count = Convert.ToInt32(count);
+            pageModel.pageData = list.Select(x => new
+            {
+                x.ID,
+                x.CarrierName,
+                x.Logo,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+                x.Address,
+                x.LatAndLon,
+                x.Developers,
+                OpenTime = x.OpenTime.HasValue ? x.OpenTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                x.ProjectType,
+                ProjectTypeName = x.ProjectType.GetEnumName(),
+                x.CarrierSize,
+                x.LayersNum,
+                x.CarNum,
+                x.CarrierPlan,
+                x.CarrierTarget,
+                x.Location,
+                x.Crowd,
+                x.VideoUrl,
+                x.CarrierMetroList
+            });
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 获取载体实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetCarrierDetails()
+        {
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Carrier_Extend()
+            {
+                ID = parms.GetInt("ID", 0),
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = userInfo?.TenantId ?? 0;
+            var extModel = carrierModule.GetCarrierModel(query);
+            return ApiResult.Success(data: new
+            {
+                extModel.ID,
+                extModel.CarrierName,
+                extModel.Logo,
+                CreateDate = extModel.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+                extModel.Address,
+                extModel.LatAndLon,
+                extModel.Developers,
+                OpenTime = extModel.OpenTime.HasValue ? extModel.OpenTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
+                extModel.ProjectType,
+                ProjectTypeName = extModel.ProjectType.GetEnumName(),
+                extModel.CarrierSize,
+                extModel.LayersNum,
+                extModel.CarNum,
+                extModel.CarrierPlan,
+                extModel.CarrierTarget,
+                extModel.Location,
+                extModel.Crowd,
+                extModel.VideoUrl,
+                extModel.CarrierMetroList,
+                extModel.BannerList
+            });
+        }
+
+        #endregion
+
+        #region 公司品牌
         /// <summary>
         /// 新增修改品牌信息
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult SetBrand()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -609,6 +709,20 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
 
 
+        /// <summary>
+        /// 获取当前用户的公司品牌信息实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserCompanyBrand()
+        {
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CompanyId = parms.GetInt("CompanyId", 0);
+            var model = carrierModule.GetBrandRepository(new RB_CompanyBrand_Extend { TenantId= userInfo .TenantId,MallBaseId= userInfo .MallBaseId,CompanyId= CompanyId });
+            return ApiResult.Success(data: model);
+        }
+
 
         /// <summary>
         /// 获取客户群体枚举
@@ -643,5 +757,102 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
 
         #endregion
+
+
+        #region 品牌
+        /// <summary>
+        /// 获取品牌分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetBrandPageList()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Brand_Extend()
+            {
+                BrandName = parms.GetStringValue("BrandName"),
+                ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0),
+                BrandClassId = parms.GetInt("BrandClassId", 0),
+                RanQi = parms.GetInt("RanQi", -1),
+                KongTiao = parms.GetInt("KongTiao", -1),
+                XinFeng = parms.GetInt("XinFeng", -1),
+                Plumbing = parms.GetInt("Plumbing", -1),
+                Caliber = parms.GetInt("Caliber", -1),
+                Sewage = parms.GetInt("Sewage", -1),
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (!string.IsNullOrWhiteSpace(item.Banner))
+                {
+                    item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
+                }
+                else
+                {
+                    item.BannerList = new List<string>();
+                }
+            }
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+
+        /// <summary>
+        /// 获取品牌实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetBrandDetails()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Brand_Extend()
+            {
+                ID = parms.GetInt("ID", 0),
+
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var extModel = carrierModule.GetBrand(query);
+
+            if (!string.IsNullOrWhiteSpace(extModel.Banner))
+            {
+                extModel.BannerList = JsonConvert.DeserializeObject<List<string>>(extModel.Banner);
+            }
+            else
+            {
+                extModel.BannerList = new List<string>();
+            }
+
+            extModel.ProjectName = (extModel.ProjectType.HasValue && extModel.ProjectType.Value > 0) ? EnumHelper.GetEnumName(extModel.ProjectType):"";
+
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 获取品牌分类分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetBrandClassList()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_BrandClass_Extend();
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = carrierModule.GetBrandClassList(query);
+            return ApiResult.Success(data: list);
+        }
+        #endregion
     }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -840,6 +840,25 @@ namespace Mall.WebApi.Controllers.TradePavilion
 
 
         #region 品牌管理
+
+
+        /// <summary>
+        /// 获取商品性质枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetProjectTypeEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.ProjectTypeEnum));
+            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
+
         /// <summary>
         /// 获取品牌分类分页列表
         /// </summary>
@@ -863,6 +882,21 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
+        /// <summary>
+        /// 获取品牌分类分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        public ApiResult GetBrandClassList()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_BrandClass_Extend() ;
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = carrierModule.GetBrandClassList( query);
+            return ApiResult.Success(data: list);
+        }
 
         /// <summary>
         /// 获取品牌分类实体
@@ -1058,6 +1092,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var flag = carrierModule.RemoveBrandModule(CarrierId);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+
+
+
         #endregion
     }
 }