提交出库申请

Property.Model/Entity/Mall/RB_WarehouseOut_Apply.cs

+using REBORN.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Property.Model.Entity.Mall
+{
+
+    /// <summary>
+    /// 商品出库申请实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_WarehouseOut_Apply
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int ID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态0-否，1-是
+        /// </summary>        
+        public int Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 申请状态1-审核中,2-通过，3-拒绝
+        /// </summary>        
+        public int ApplyStatus
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 供应商id
+        /// </summary>
+        public int SupplierId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 财务单据
+        /// </summary>
+        public int FinanceId { get; set; }
+    }
+}

Property.Model/Entity/Mall/RB_WarehouseOut_Goods.cs

+using REBORN.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Property.Model.Entity.Mall
+{
+    /// <summary>
+    /// 商品出库实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_WarehouseOut_Goods
+    {
+
+        /// <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 OrderNo
+        {
+            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? Number
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 供应商id
+        /// </summary>
+        public int SupplierId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 成本价
+        /// </summary>
+        public decimal? CostMoney { get; set; }
+    }
+}

Property.Model/Extend/Mall/RB_ERP_Authorize_Extend.cs

@@ -23,5 +23,18 @@ namespace Property.Model.Extend.Mall
         /// 电商员工信息
         /// </summary>
         public string MallUserName { get; set; }
+
+
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public string TenantName { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public string MallBaseName { get; set; }
+
     }
 }

Property.Repository/Mall/RB_ERP_AuthorizeRepository.cs

@@ -24,7 +24,11 @@ namespace Property.Repository.Mall
         public List<RB_ERP_Authorize_Extend> GetAuthorizePageList(int pageIndex, int pageSize, out long rowCount, RB_ERP_Authorize_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT a.*,b.EmpName,c.EmpName as MallUserName FROM {TableName} as a LEFT JOIN rb_employee as b on a.CreateBy=b.EmpId  LEFT JOIN rb_employee as c on a.MallUserId=c.EmpId  WHERE  1=1");
+            builder.Append(@$" SELECT a.*,b.EmpName,c.EmpName as MallUserName,d.MallName as MallBaseName ,e.`Name` as TenantName FROM {TableName} as a
+ LEFT JOIN rb_employee as b on a.CreateBy = b.EmpId
+ LEFT JOIN rb_employee as c on a.MallUserId = c.EmpId
+LEFT JOIN rb_miniprogram as d on a.MallBaseId = d.MallBaseId
+LEFT JOIN rb_tenant as e on e.TenantId = a.TenantId where 1=1");
             if (query != null)
             {
                 if (query.ID > 0)
@@ -64,7 +68,11 @@ namespace Property.Repository.Mall
         public List<RB_ERP_Authorize_Extend> GetAuthorizeList(RB_ERP_Authorize_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT a.*,b.EmpName FROM {TableName} as a LEFT JOIN rb_employee as b on a.CreateBy=b.EmpId  WHERE  1=1");
+            builder.Append(@$" SELECT a.*,b.EmpName,c.EmpName as MallUserName,d.MallName as MallBaseName ,e.`Name` as TenantName FROM {TableName} as a
+ LEFT JOIN rb_employee as b on a.CreateBy = b.EmpId
+ LEFT JOIN rb_employee as c on a.MallUserId = c.EmpId
+LEFT JOIN rb_miniprogram as d on a.MallBaseId = d.MallBaseId
+LEFT JOIN rb_tenant as e on e.TenantId = a.TenantId where 1=1");
             if (query != null)
             {
                 if (query.ID > 0)

Property.WebApi/Controllers/Mall/AuthorizeController.cs

@@ -13,8 +13,7 @@ using REBORN.Common.API;
 
 namespace Property.WebApi.Controllers.Mall
 {
-    [Route("api/[controller]")]
-    [ApiController]
+  
     public class AuthorizeController : PApiController
     {
         private readonly AuthorizeModule authorizeModule = new AuthorizeModule();
@@ -46,6 +45,8 @@ namespace Property.WebApi.Controllers.Mall
                 x.DomainName,
                 x.Account,
                 x.MallUserName,
+                x.MallBaseName,
+                x.TenantName,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : "",
                 UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd") : ""
             });