提交出库审核

Property.Model/Entity/Mall/RB_MiniProgram.cs

+using REBORN.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Property.Model.Entity.Mall
+{
+    /// <summary>
+    /// 小程序实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "MallConnection")]
+    public class RB_MiniProgram
+    {
+        /// <summary>
+        /// 小程序主键Id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int? TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商城名称
+        /// </summary>        
+        public string MallName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否永久有效(1-永久有效）
+        /// </summary>        
+        public int? IsEffective
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商城有效期
+        /// </summary>        
+        public DateTime? MallValidate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 状态(0-正常，1-禁用)
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 版权文字
+        /// </summary>
+        public string CopyRightWord { get; set; }
+
+        /// <summary>
+        /// 版权图片
+        /// </summary>
+        public string CopyRightImg { get; set; }
+
+        /// <summary>
+        /// 版权链接页面
+        /// </summary>
+        public string CopyRightLink { get; set; }
+
+        /// <summary>
+        /// 商城风格
+        /// </summary>
+        public int? MallShopStyle { get; set; }
+
+        /// <summary>
+        /// 顶部标题文件颜色类型(0-白色，1-黑色)
+        /// </summary>
+        public int TopNavWordType { get; set; }
+
+        /// <summary>
+        /// 顶部标题文字颜色
+        /// </summary>
+        public string TopNavWordColor { get; set; }
+
+        /// <summary>
+        /// 顶部导航栏背景颜色
+        /// </summary>
+        public string TopNavBgColor { get; set; }
+
+        /// <summary>
+        /// 底部导航栏背景颜色
+        /// </summary>
+        public string BottomNavBgColor { get; set; }
+
+        /// <summary>
+        /// 导航底部是否开启阴影效果(0-未开启，1-开启)
+        /// </summary>
+        public int BottomNavIsShadow { get; set; }
+
+        /// <summary>
+        /// 是否开启版权设置(0-开启,1-关闭)
+        /// </summary>
+        public int IsOpenCopyRight { get; set; }
+
+        /// <summary>
+        /// 小程序AppId
+        /// </summary>        
+        public string MiniAppId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序AppSecret
+        /// </summary>        
+        public string MiniAppSecret
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信支付商户号
+        /// </summary>        
+        public string WeChatPayMerchants
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信支付Api密钥
+        /// </summary>        
+        public string WeChatApiSecret
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信支付证书
+        /// </summary>        
+        public string WeChatPayCertificate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信支付私钥
+        /// </summary>        
+        public string WeChatPayPrivateKey
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 微信支付证书路径  Add By:W 2020.05.26
+        /// </summary>        
+        public string WeChatPayCertificateUrl
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 下单成功提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string OrderSuccessTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 订单取消提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string OrderCancelTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 订单发货提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string OrderDeliverGoodsTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 退款提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string RefundTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 活动状态提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string ActiveStateTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 审核结果提醒(类目:服装/鞋/箱包)
+        /// </summary>        
+        public string AuditResultTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 提现成功通知(类目: 服装/鞋/箱包 )
+        /// </summary>        
+        public string ReflectSuccessTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 提现失败通知(类目: 服装/鞋/箱包 )
+        /// </summary>        
+        public string ReflectFailTpl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 会员等级变更通知(类目: 服装/鞋/箱包 )
+        /// </summary>        
+        public string MembersLevelChangeTpl
+        {
+            get;
+            set;
+        }
+
+        #region 会员中心配置
+        /// <summary>
+        /// 会员中心默认背景
+        /// </summary>        
+        public string DefaultBgImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 会员中心普通用户背景
+        /// </summary>        
+        public string MemberBgImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 会员中心Vip背景
+        /// </summary>        
+        public string VipBgImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 会员中心头像样式类型(1-头像靠左，2-头像居中，3-头像内嵌)
+        /// </summary>        
+        public int? HeadStyle
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 会员中心头像样式字符串
+        /// </summary>        
+        public string HeadStyleStr
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否显示收藏夹(0-显示，1-不显示)
+        /// </summary>        
+        public int? IsShowFavorite
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否显示订单栏(0-显示，1-不显示)
+        /// </summary>        
+        public int? IsShowOrderNav
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否显示账户栏(0-显示，1-不显示)
+        /// </summary>        
+        public int? IsShowAccountNav
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否显示菜单栏(0-显示，1-不显示)
+        /// </summary>        
+        public int? IsShowMenuNav
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 菜单栏标题
+        /// </summary>        
+        public string MenuNavTitle
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 菜单栏样式(0-列表,1-九宫格)
+        /// </summary>        
+        public int? MenuNavStyle
+        {
+            get;
+            set;
+        }
+
+        #endregion
+
+        #region  获取可跳转小程序
+        /// <summary>
+        /// 获取可跳转小程序
+        /// </summary>
+        public string JumpAppId { get; set; }
+        #endregion
+
+        /// <summary>
+        ///小程序直播组件 0-否，1-是
+        /// </summary>
+        public int LivePlayerPlugin { get; set; }
+
+
+        /// <summary>
+        /// 发布时填写的版本号
+        /// </summary>
+        public string Version { get; set; }
+
+        /// <summary>
+        /// 小程序首页配置
+        /// </summary>
+        public string MallHomeData { get; set; }
+
+        /// <summary>
+        /// 是否开启授权(1-开启)
+        /// </summary>
+        public int IsOpenAuth { get; set; }
+
+        /// <summary>
+        /// 授权图片
+        /// </summary>
+        public string AuthUrl { get; set; }
+
+        /// <summary>
+        /// 授权数据
+        /// </summary>
+        public string AuthData { get; set; }
+
+        /// <summary>
+        /// 是否回收
+        /// </summary>
+        public int Is_Recycle { get; set; }
+    }
+}

Property.Model/Entity/Mall/RB_Tenant.cs

+using REBORN.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Property.Model.Entity.Mall
+{
+    /// <summary>
+    /// 商户信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "MallConnection")]
+    public class RB_Tenant
+    {
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 账号
+        /// </summary>        
+        public string Account
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 密码
+        /// </summary>        
+        public string Password
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 姓名/企业名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 手机号码
+        /// </summary>        
+        public string MobilePhone
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 微信号
+        /// </summary>        
+        public string WeChatNum
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 申请原因
+        /// </summary>        
+        public string ApplyReason
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 身份证正面图片
+        /// </summary>        
+        public string IDCardPositiveImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 身份证背面图片
+        /// </summary>        
+        public string IDCardReverseImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 营业执照图片
+        /// </summary>        
+        public string BusinessLicenseImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否永久有效(0-默认，1-永久有效)
+        /// </summary>        
+        public int? IsEffective
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 账号有效期
+        /// </summary>        
+        public DateTime? AccountValidate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 可创建小程序数量
+        /// </summary>        
+        public int? CreateMiniPrograme
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 账号状态(0-默认，1-提交申请，2-审核通过，3-审核拒绝）
+        /// </summary>        
+        public int? AccountStatus
+        {
+            get;
+            set;
+        }
+    }
+}

Property.Model/Entity/Mall/RB_WarehouseOut_Apply.cs

@@ -22,6 +22,12 @@ namespace Property.Model.Entity.Mall
             get;
             set;
         }
+
+
+        /// <summary>
+        /// 出库单号
+        /// </summary>
+        public string OutNo { get; set; }
         /// <summary>
         /// 删除状态0-否，1-是
         /// </summary>        
@@ -65,6 +71,12 @@ namespace Property.Model.Entity.Mall
             set;
         }
 
+
+        /// <summary>
+        /// 出库状态  0-未出库，1-部分出库，2-全部出库
+        /// </summary>
+        public int OutStatus { get; set; }
+
         /// <summary>
         /// CreateDate
         /// </summary>        
@@ -75,7 +87,7 @@ namespace Property.Model.Entity.Mall
         }
 
         /// <summary>
-        /// CreateDate
+        /// erp操作人的id
         /// </summary>        
         public int? CreateBy
         {
@@ -83,15 +95,40 @@ namespace Property.Model.Entity.Mall
             set;
         }
 
-
         /// <summary>
-        /// CreateDate
+        /// 电商操作人id
+        /// </summary>        
+        public int? MallUserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// erp操作人的id
         /// </summary>        
         public int? UpdateBy
         {
             get;
             set;
         }
+
+
+        /// <summary>
+        /// 公司
+        /// </summary>        
+        public int? RB_Branch_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 集团
+        /// </summary>        
+        public int? RB_Group_Id
+        {
+            get;
+            set;
+        }
         /// <summary>
         /// UpdateDate
         /// </summary>        
@@ -103,8 +140,10 @@ namespace Property.Model.Entity.Mall
 
 
         /// <summary>
-        /// 财务单据
+        /// 审核理由
         /// </summary>
-        public int FinanceId { get; set; }
+        public string ExamineReason { get; set; }
+
+
     }
 }

Property.Model/Entity/Mall/RB_WarehouseOut_Goods.cs

@@ -55,7 +55,10 @@ namespace Property.Model.Entity.Mall
         }
 
 
-
+        /// <summary>
+        /// 出库状态  0-未出库，1-已出库
+        /// </summary>
+        public int IsOut { get; set; }
 
         /// <summary>
         /// 订单商品id

Property.Model/Extend/Mall/RB_WarehouseOut_Apply_Extend.cs

+using Property.Model.Entity.Mall;
+using REBORN.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Property.Model.Extend.Mall
+{
+    /// <summary>
+    /// 商品出库申请实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_WarehouseOut_Apply_Extend : RB_WarehouseOut_Apply
+    {
+        /// <summary>
+        /// 商品出库列表
+        /// </summary>
+        public List<RB_WarehouseOut_Goods_Extend> WarehouseOutGoodsList { get; set; }
+
+        /// <summary>
+        /// 已出库
+        /// </summary>
+        public int Delivered { get; set; }
+
+        /// <summary>
+        /// 未出库数量
+        /// </summary>
+        public int NotOutStock { get; set; }
+
+
+        /// <summary>
+        /// 小程序名称
+        /// </summary>
+        public string MallBaseName { get; set; }
+        /// <summary>
+        /// 商户名称
+        /// </summary>
+
+        public string TenantName { get; set; }
+
+
+        public string CreateByName { get; set; }
+
+    }
+}

Property.Model/Extend/Mall/RB_WarehouseOut_Goods_Extend.cs

+using Property.Model.Entity.Mall;
+using REBORN.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Property.Model.Extend.Mall
+{
+    /// <summary>
+    /// 商品出库申请扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_WarehouseOut_Goods_Extend : RB_WarehouseOut_Goods
+    {
+        /// <summary>
+        /// 订单商品id
+        /// </summary>
+        public string OrderGoodsIds { get; set; }
+    }
+}

Property.Module.Mall/WarehouseOutModule.cs

+using Property.Model.Entity.Mall;
+using Property.Model.Extend.Mall;
+using Property.Repository;
+using Property.Repository.Mall;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Property.Module.Mall
+{
+    public class WarehouseOutModule
+    {
+
+        /// <summary>
+        /// 商品出库申请仓储层
+        /// </summary>
+        private readonly RB_WarehouseOut_GoodsRepository warehouseOutRepository = new RB_WarehouseOut_GoodsRepository();
+
+        /// <summary>
+        /// 出库申请仓储层
+        /// </summary>
+        private readonly RB_WarehouseOut_ApplyRepository warehouseOutApplyRepository = new RB_WarehouseOut_ApplyRepository();
+
+
+        /// <summary>
+        /// 小程序仓储
+        /// </summary>
+        private readonly RB_MiniProgramRepository miniProgramRepository = new RB_MiniProgramRepository();
+
+        /// <summary>
+        /// 商户仓储
+        /// </summary>
+        private readonly RB_TenantRepository tenantRepository = new RB_TenantRepository();
+        private readonly Rb_employeeRepository employeeRepository = new Rb_employeeRepository();
+
+
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Goods_Extend> GetWarehouseOutPageList(int pageIndex, int pageSize, out long rowCount, RB_WarehouseOut_Goods_Extend query)
+        {
+            return warehouseOutRepository.GetWarehouseOutPageList(pageIndex, pageSize, out rowCount, query);
+        }
+
+
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Goods_Extend> GetWarehouseOutList(RB_WarehouseOut_Goods_Extend query)
+        {
+            return warehouseOutRepository.GetWarehouseOutList(query);
+        }
+
+
+
+
+        /// <summary>
+        /// 获取已出库的商品列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Goods_Extend> GetWarehouseOutListByIds(RB_WarehouseOut_Goods_Extend query)
+        {
+            return warehouseOutRepository.GetWarehouseOutListByIds(query);
+        }
+
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Apply_Extend> GetApplyPageList(int pageIndex, int pageSize, out long rowCount, RB_WarehouseOut_Apply_Extend query)
+        {
+            var list = warehouseOutApplyRepository.GetApplyPageList(pageIndex, pageSize, out rowCount, query);
+            if (list != null && list.Any())
+            {
+                string mallBaseIds = string.Join(",", list.Where(x => x.MallBaseId > 0).Select(x => x.MallBaseId));
+                string tenantIds = string.Join(",", list.Where(x => x.TenantId > 0).Select(x => x.TenantId));
+                string createBys = string.Join(",", list.Where(x => x.CreateBy > 0).Select(x => x.CreateBy));
+                if (!string.IsNullOrWhiteSpace(mallBaseIds))
+                {
+                    var mallBaseList = miniProgramRepository.GetMiniProgramListIds(mallBaseIds);
+                    if (mallBaseList != null && mallBaseList.Any())
+                    {
+                        list.ForEach(x => x.MallBaseName = mallBaseList.Where(u => u.MallBaseId == x.MallBaseId).FirstOrDefault()?.MallName);
+                    }
+                }
+                if (!string.IsNullOrWhiteSpace(tenantIds))
+                {
+                    var tenantList = tenantRepository.GetTenantListByIds(tenantIds);
+                    if (tenantList != null && tenantList.Any())
+                    {
+                        list.ForEach(x => x.TenantName = tenantList.Where(u => u.TenantId == x.TenantId).FirstOrDefault()?.Name);
+                    }
+                }
+
+                if (!string.IsNullOrWhiteSpace(createBys))
+                {
+                    var tenantList = employeeRepository.GetList(new Model.Extend.RB_Employee_Extend { EmployeeIds = createBys });
+                    if (tenantList != null && tenantList.Any())
+                    {
+                        list.ForEach(x => x.CreateByName = tenantList.Where(u => u.EmployeeId == x.CreateBy).FirstOrDefault()?.EmName);
+                    }
+                }
+
+            }
+            return list;
+        }
+
+
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Apply_Extend> GetWarehouseOutList(RB_WarehouseOut_Apply_Extend query)
+        {
+            return warehouseOutApplyRepository.GetApplyList(query);
+        }
+
+
+        /// <summary>
+        /// 审核权限
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateWarehouseOutApply(RB_WarehouseOut_Apply model)
+        {
+            if (model.ID > 0)
+            {
+                Dictionary<string, object> files = new Dictionary<string, object>() {
+                        { nameof(RB_WarehouseOut_Apply.ApplyStatus),model.ApplyStatus},
+                        { nameof(RB_WarehouseOut_Apply.UpdateBy),model.UpdateBy},
+                       { nameof(RB_WarehouseOut_Apply.UpdateDate),model.UpdateDate},
+                       { nameof(RB_WarehouseOut_Apply.ExamineReason),model.ExamineReason}
+            };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_WarehouseOut_Apply.ID),
+                              FiledValue=model.ID,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+                return warehouseOutApplyRepository.Update(files, wheres);
+            }
+            return false;
+        }
+
+    }
+}

Property.Repository/Mall/RB_MiniProgramRepository.cs

+using Property.Model.Entity.Mall;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Property.Repository.Mall
+{
+    /// <summary>
+    /// 小程序仓储层
+    /// </summary>
+    public class RB_MiniProgramRepository : RepositoryBase<RB_MiniProgram>
+    {
+       
+        /// <summary>
+        /// 根据查询条件获取小程序列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram> GetMiniProgramListIds(string MallBaseIds)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram WHERE 1=1 ");
+            if (!string.IsNullOrWhiteSpace(MallBaseIds))
+            {
+                builder.AppendFormat(" AND MallBaseId in ({0}) ", MallBaseIds);
+            }
+            return Get<RB_MiniProgram>(builder.ToString()).ToList();
+        }
+
+
+      
+    }
+}

Property.Repository/Mall/RB_TenantRepository.cs

+using Property.Model.Entity.Mall;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Property.Repository.Mall
+{
+
+    /// <summary>
+    /// 商户表仓储层
+    /// </summary>
+    public class RB_TenantRepository : RepositoryBase<RB_Tenant>
+    {
+        /// <summary>
+        /// 根据查询条件获取商户列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Tenant> GetTenantListByIds(string TenantIds)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_Tenant WHERE 1=1 ");
+            if (!string.IsNullOrWhiteSpace(TenantIds))
+            {
+                builder.AppendFormat(" AND TenantId in ({0}) ", TenantIds);
+            }
+            return Get<RB_Tenant>(builder.ToString()).ToList();
+        }
+
+       
+    }
+}

Property.Repository/Mall/RB_WarehouseOut_ApplyRepository.cs

+using Property.Model.Entity.Mall;
+using Property.Model.Extend.Mall;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Property.Repository.Mall
+{
+    public class RB_WarehouseOut_ApplyRepository : RepositoryBase<RB_WarehouseOut_Apply>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_WarehouseOut_Apply); } }
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Apply_Extend> GetApplyPageList(int pageIndex, int pageSize, out long rowCount, RB_WarehouseOut_Apply_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@$" select a.*,b.NotOutStock,c.Delivered from {TableName} as a
+LEFT JOIN (SELECT ApplyId,COUNT(*) as NotOutStock from rb_warehouseout_goods where `IsOut`=0 and Status=0 GROUP BY ApplyId) as b on a.ID=b.ApplyId
+LEFT JOIN (SELECT ApplyId,COUNT(*) as Delivered from rb_warehouseout_goods where `IsOut`=1 and Status=0 GROUP BY ApplyId) as c on a.ID=c.ApplyId
+ where a.Status=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.RB_Group_Id > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.RB_Group_Id)}={query.RB_Group_Id}");
+                }
+                if (query.RB_Branch_Id > -1)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.RB_Branch_Id)}={query.RB_Branch_Id}");
+                }
+                if (query.ApplyStatus > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.ApplyStatus)}={query.ApplyStatus}");
+                }
+                if (query.OutStatus > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.OutStatus)}={query.OutStatus}");
+                }
+                if (query.SupplierId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.SupplierId)}={query.SupplierId}");
+                }
+            }
+            return GetPage<RB_WarehouseOut_Apply_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Apply_Extend> GetApplyList(RB_WarehouseOut_Apply_Extend 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_Apply_Extend.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.OutStatus > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.OutStatus)}={query.OutStatus}");
+                }
+                if (query.ApplyStatus > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.ApplyStatus)}={query.ApplyStatus}");
+                }
+                if (query.SupplierId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.SupplierId)}={query.SupplierId}");
+                }
+            }
+            return Get<RB_WarehouseOut_Apply_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Property.Repository/Mall/RB_WarehouseOut_GoodsRepository.cs

+using Property.Model.Entity.Mall;
+using Property.Model.Extend.Mall;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Property.Repository.Mall
+{
+    public class RB_WarehouseOut_GoodsRepository : RepositoryBase<RB_WarehouseOut_Goods>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_WarehouseOut_Goods); } }
+
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableNameApply { get { return nameof(RB_WarehouseOut_Apply); } }
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Goods_Extend> GetWarehouseOutPageList(int pageIndex, int pageSize, out long rowCount, RB_WarehouseOut_Goods_Extend 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_Goods_Extend.ID)}={query.ID}");
+                }
+
+                if (query.ApplyId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.ApplyId)}={query.ApplyId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.GoodsName))
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.GoodsName)} like '%{query.GoodsName}%'");
+                }
+                if (query.SupplierId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.SupplierId)}={query.SupplierId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.OrderGoodsIds))
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.OrderGoodsId)} in ({query.OrderGoodsIds})");
+                }
+            }
+            return GetPage<RB_WarehouseOut_Goods_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 出库申请列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Goods_Extend> GetWarehouseOutList(RB_WarehouseOut_Goods_Extend 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_Goods_Extend.ID)}={query.ID}");
+                }
+                if (query.ApplyId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.ApplyId)}={query.ApplyId}");
+                }
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.GoodsName))
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.GoodsName)} like '%{query.GoodsName}%'");
+                }
+                if (query.SupplierId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.SupplierId)}={query.SupplierId}");
+                }
+            }
+            return Get<RB_WarehouseOut_Goods_Extend>(builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取已出库的商品列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_Goods_Extend> GetWarehouseOutListByIds(RB_WarehouseOut_Goods_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" select * from {TableName} as a LEFT JOIN {TableNameApply} as b on a.ApplyId=b.ID where a.Status=0  and b.`Status`=0 and b.ApplyStatus in(1,2) ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.ID)}={query.ID}");
+                }
+                if (query.ApplyId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.ApplyId)}={query.ApplyId}");
+
+                }
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.TenantId)}={query.TenantId}");
+                    builder.Append($" AND b.{nameof(RB_WarehouseOut_Apply.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.MallBaseId)}={query.MallBaseId}");
+                    builder.Append($" AND b.{nameof(RB_WarehouseOut_Apply.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.GoodsName))
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.GoodsName)} like '%{query.GoodsName}%'");
+                }
+                if (query.SupplierId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_WarehouseOut_Goods_Extend.SupplierId)}={query.SupplierId}");
+                }
+            }
+            return Get<RB_WarehouseOut_Goods_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Property.WebApi/Controllers/Mall/WarehouseOutController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Property.Model.Extend.Mall;
+using Property.Module.Mall;
+using REBORN.Common;
+using REBORN.Common.API;
+
+namespace Property.WebApi.Controllers.Mall
+{
+    public class WarehouseOutController : PApiController
+    {
+        private readonly WarehouseOutModule warehouseOutModule = new WarehouseOutModule();
+
+
+        /// <summary>
+        /// 获取出库申请列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetApplyPageList()
+        {
+            var parms = GetRequestParm();
+            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(parms.uid);
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_WarehouseOut_Apply_Extend demodel = JsonConvert.DeserializeObject<RB_WarehouseOut_Apply_Extend>(parms.msg.ToString());
+            demodel.RB_Group_Id = userInfo.RB_Group_id;
+            demodel.RB_Branch_Id = -1;
+            var list = warehouseOutModule.GetApplyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.ApplyStatus,
+                x.CreateBy,
+                x.ExamineReason,
+                x.ID,
+                x.MallBaseId,
+                x.MallBaseName,
+                x.TenantId,
+                x.TenantName,
+                x.OutNo,
+                x.Delivered,
+                x.NotOutStock,
+                x.CreateByName,
+                CreateDateStr = x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+
+        /// <summary>
+        /// 新增授权信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult UpdateAuthorize()
+        {
+            var requestParm = GetRequestParm();
+            RB_WarehouseOut_Apply_Extend demodel = JsonConvert.DeserializeObject<RB_WarehouseOut_Apply_Extend>(requestParm.msg.ToString());
+            demodel.UpdateDate = System.DateTime.Now;
+            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
+            demodel.UpdateBy = userInfo.EmployeeId;
+            bool result = warehouseOutModule.UpdateWarehouseOutApply(demodel);
+
+            if (result)
+            {
+                return ApiResult.Success("操作成功");
+            }
+            else
+            {
+                return ApiResult.Failed("操作失败");
+
+            }
+        }
+
+    }
+}
\ No newline at end of file

Property.WebApi/Property.WebApi.csproj.user

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Controller_SelectedScaffolderID>ApiControllerWithActionsScaffolder</Controller_SelectedScaffolderID>
+    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
     <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
     <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>