提交代码

Mall.Model/Entity/User/RB_Supplier.cs

@@ -80,5 +80,16 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public int SupplierStatus { get; set; }
 
+
+        /// <summary>
+        /// 供应商关联人
+        /// </summary>
+        public int Introducer { get; set; }
+
+
+        /// <summary>
+        /// 供应商关联人返佣比例
+        /// </summary>
+        public decimal CommissionRate { get; set; }
     }
 }

Mall.Repository/Property/RB_Supplies_CheckRepository.cs

@@ -70,11 +70,9 @@ namespace Mall.Repository.Property
             }
             if (dmodel.EndDate.HasValue)
             {
-                where += $" and  {nameof(RB_Supplies_Check_Extend.StartDate)} >='{dmodel.EndDate}' ";
+                where += $" and  {nameof(RB_Supplies_Check_Extend.EndDate)} >='{dmodel.EndDate}' ";
             }
 
-      
-
             if (!string.IsNullOrWhiteSpace(dmodel.Periods))
             {
                 where += " and " + nameof(RB_Supplies_Check_Extend.Periods) + " like '%" + dmodel.Periods + "%'";

Mall.WebApi/Controllers/Property/PropertyController.cs

@@ -294,7 +294,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
 
             //判断当前仓库是否在盘点中2020-07-28 Add By:W
-            var suppliesCheckList = propertyModule.GetSuppliesCheckList(new RB_Supplies_Check_Extend { RB_Group_Id = requestParm.ERPGroupId,StartDate=System.DateTime.Now,EndDate=System.DateTime.Now, WarehouseId = demodel.WareHouseId ?? 0, CheckState = Common.Enum.Property.SuppliesCheckStatusEnum.InTheInventory });
+            var suppliesCheckList = propertyModule.GetSuppliesCheckList(new RB_Supplies_Check_Extend { RB_Group_Id = requestParm.ERPGroupId, StartDate = System.DateTime.Now, EndDate = System.DateTime.Now, WarehouseId = demodel.WareHouseId ?? 0, CheckState = Common.Enum.Property.SuppliesCheckStatusEnum.InTheInventory });
             if (suppliesCheckList != null && suppliesCheckList.Any())
             {
                 return ApiResult.ParamIsNull("仓库盘点中，不能入库");
@@ -458,5 +458,17 @@ namespace Mall.WebApi.Controllers.MallBase
         }
 
         #endregion
+
+        #region 获取盘点中的仓库
+
+        public ApiResult GetSuppliesCheckList()
+        {
+            var requestParm = RequestParm;
+            //判断当前仓库是否在盘点中2020-07-28 Add By:W
+            var suppliesCheckList = propertyModule.GetSuppliesCheckList(new RB_Supplies_Check_Extend { RB_Group_Id = requestParm.ERPGroupId, StartDate = System.DateTime.Now, EndDate = System.DateTime.Now, CheckState = Common.Enum.Property.SuppliesCheckStatusEnum.InTheInventory });
+            return ApiResult.Success("", suppliesCheckList);
+        }
+
+        #endregion
     }
 }
\ No newline at end of file