盘点明细

Property.Common/Enum/Property/SuppliesCheckStatusEnum.cs

+using REBORN.Common.Plugin;
+
+namespace REBORN.Common.Enum
+{
+    /// <summary>
+    /// 数据状态
+    /// </summary>
+    public enum SuppliesCheckStatusEnum
+    {
+        /// <summary>
+        /// 盘点中
+        /// </summary>
+        [EnumField("盘点中")]
+        InTheInventory = 1,
+        /// <summary>
+        /// 已完成
+        /// </summary>
+        [EnumField("已完成")]
+        Completed = 2,
+        /// <summary>
+        /// 已取消
+        /// </summary>
+        [EnumField("已取消")]
+        Cancel = 3
+    }
+}

Property.Model/Entity/Supplies/RB_Supplies_Check.cs

 using System;
 using REBORN.Common.AOP;
+using REBORN.Common.Enum;
 using REBORN.Common.Plugin;
 
 namespace Property.Model.Entity
@@ -72,7 +73,7 @@ namespace Property.Model.Entity
         /// <summary>
         /// 盘点期数状态
         /// </summary>        
-        public int? CheckState
+        public SuppliesCheckStatusEnum? CheckState
         {
             get;
             set;

Property.Model/Entity/Supplies/RB_Supplies_CheckDetail.cs

@@ -55,14 +55,6 @@ namespace Property.Model.Entity
             set;
         }
         /// <summary>
-        /// 审核状态
-        /// </summary>        
-        public int? AuditStatus
-        {
-            get;
-            set;
-        }
-        /// <summary>
         /// 盘点状态
         /// </summary>        
         public PropertyCheckStatusEnum? CheckStatus
@@ -87,22 +79,6 @@ namespace Property.Model.Entity
             set;
         }
         /// <summary>
-        /// 审核人
-        /// </summary>        
-        public int? AuditEmpId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 审核时间
-        /// </summary>        
-        public DateTime? AuditDate
-        {
-            get;
-            set;
-        }
-        /// <summary>
         /// 盘点图片列表  json格式
         /// </summary>        
         public string Images

Property.Model/Extend/Supplies/RB_Supplies_CheckDetail_Extend.cs

@@ -29,10 +29,18 @@ namespace Property.Model.Extend
         /// 耗材的规格
         /// </summary>
         public List<string> SpecificationList { get; set; }
+        /// <summary>
+        /// 图片列表
+        /// </summary>
+        public List<string> ImageList { get; set; }
 
         /// <summary>
         /// 查询盘亏盘盈  1是
         /// </summary>
         public int? IsSelectCheckLoss { get; set; }
+        /// <summary>
+        /// 只看有库存的
+        /// </summary>
+        public int? IsSelectHaveInventory { get; set; }
     }
 }
\ No newline at end of file

Property.Model/Extend/Supplies/RB_Supplies_Check_Extend.cs

@@ -12,14 +12,9 @@ namespace Property.Model.Extend
     [DB(ConnectionName = "PropertyConnection")]
     public class RB_Supplies_Check_Extend : RB_Supplies_Check
     {
-
-        /// <summary>
-        /// 仓库
-        /// </summary>
-        public RB_Supplies_WareHouse_Extend WModel { get; set; }
         /// <summary>
-        /// 耗材
+        /// 仓库名称
         /// </summary>
-        public RB_Supplies_Material_Extend SModel { get; set; }
+        public string WarehouseName { get; set; }
     }
 }
\ No newline at end of file

Property.Repository/Supplies/RB_Property_CheckDetailRepository.cs → Property.Repository/Supplies/RB_Supplies_CheckDetailRepository.cs

@@ -37,10 +37,6 @@ namespace Property.Repository
             {
                 where += " and pi." + nameof(RB_Supplies_Material.Name) + " like '%" + dmodel.SuppliesName + "%'";
             }
-            if (dmodel.AuditStatus > 0)
-            {
-                where += " and cd." + nameof(RB_Supplies_CheckDetail_Extend.AuditStatus) + "=" + dmodel.AuditStatus;
-            }
             if (dmodel.CheckStatus > 0)
             {
                 where += " and cd." + nameof(RB_Supplies_CheckDetail_Extend.CheckStatus) + "=" + (int)dmodel.CheckStatus;
@@ -53,6 +49,9 @@ namespace Property.Repository
             {
                 where += " and cd." + nameof(RB_Supplies_CheckDetail_Extend.CheckStatus) + " in(3,4)";
             }
+            if (dmodel.IsSelectHaveInventory == 1) {
+                where += " and cd." + nameof(RB_Supplies_CheckDetail_Extend.InventoryNum) + ">0";
+            }
             string sql = $@" select cd.*,pi.Name as SuppliesName,pi.SuppliesNo,pi.SpecificationName from RB_Supplies_CheckDetail cd
 left join rb_supplies_material pi on cd.SuppliesId=pi.Id
 {where} order by cd.Id desc";
@@ -81,10 +80,6 @@ left join rb_supplies_material pi on cd.SuppliesId=pi.Id
             {
                 where += " and pi." + nameof(RB_Supplies_Material.Name) + " like '%" + dmodel.SuppliesName + "%'";
             }
-            if (dmodel.AuditStatus > 0)
-            {
-                where += " and cd." + nameof(RB_Supplies_CheckDetail_Extend.AuditStatus) + "=" + dmodel.AuditStatus;
-            }
             if (dmodel.CheckStatus > 0)
             {
                 where += " and cd." + nameof(RB_Supplies_CheckDetail_Extend.CheckStatus) + "=" + (int)dmodel.CheckStatus;

Property.Repository/Supplies/RB_Supplies_CheckRepository.cs

@@ -35,6 +35,9 @@ namespace Property.Repository
             if (dmodel.WarehouseId > 0) {
                 where += " and " + nameof(RB_Supplies_Check_Extend.WarehouseId) + "=" + dmodel.WarehouseId;
             }
+            if (dmodel.CheckState > 0) {
+                where += " and " + nameof(RB_Supplies_Check_Extend.CheckState) + "=" + (int)dmodel.CheckState;
+            }
             string sql = $@" select * from RB_Supplies_Check {where} order by Id desc";
             return GetPage<RB_Supplies_Check_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }

Property.Repository/Supplies/RB_Supplies_MaterialRepository.cs

@@ -96,5 +96,19 @@ left join rb_property_category pc on sm.CategoryId=pc.Id
             return Get<RB_Supplies_Material_Extend>(sql).ToList();
         }
 
+        /// <summary>
+        /// 获取仓库下所有的物料
+        /// </summary>
+        /// <param name="warehouseId"></param>
+        /// <param name="rB_Group_Id"></param>
+        /// <returns></returns>
+        public List<RB_Supplies_Material_Extend> GetSuppliesCheckMaterialList(int? warehouseId, int? rB_Group_Id)
+        {
+            string sql = $@" select sm.*,si.Number as InventoryNum from RB_Supplies_Material sm
+inner join rb_supplies_inventory si on sm.Id = si.SuppliesId
+where sm.Status=0 and si.WarehouseId = {warehouseId} and sm.RB_Group_Id = {rB_Group_Id} order by sm.Id desc";
+
+            return Get<RB_Supplies_Material_Extend>(sql).ToList();
+        }
     }
 }

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -16,6 +16,7 @@ namespace Property.WebApi.Controllers.User
     {
         readonly SuppliesModule suppliesModule = new SuppliesModule();
 
+        #region 基础配置
 
         /// <summary>
         /// 获取物料档案分页列表
@@ -1155,6 +1156,7 @@ namespace Property.WebApi.Controllers.User
             }
 
         }
+        #endregion
 
         #region 耗材申请日期
 
@@ -1575,5 +1577,190 @@ namespace Property.WebApi.Controllers.User
         }
 
         #endregion
+
+        #region 耗材盘点
+
+        /// <summary>
+        /// 获取盘点单分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSuppliesCheckPageList()
+        {
+            var requestParm = GetRequestParm();
+            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
+            RB_Supplies_Check_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_Check_Extend>(requestParm.msg.ToString());
+
+            demodel.RB_Group_Id = userInfo.RB_Group_id;
+            var list = suppliesModule.GetSuppliesCheckPageList(pagelist.pageIndex, pagelist.pageSize, demodel, out long count);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.Periods,
+                x.WarehouseName,
+                x.WarehouseId,
+                StartDate = x.StartDate.HasValue ? x.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                EndDate = x.EndDate.HasValue ? x.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.CheckState,
+                CheckStateName = x.CheckState.GetEnumName(),
+                x.Remark,
+                UpdateBy = CacheManager.User.UserReidsCache.GetEmployee(x.UpdateBy)?.EmName ?? "",
+                UpdateDate = x.UpdateDate.Value.ToString("yyyy-MM-dd")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 新增修改盘点单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetSuppliesCheck()
+        {
+            var requestParm = GetRequestParm();
+            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
+            RB_Supplies_Check_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_Check_Extend>(requestParm.msg.ToString());
+
+            if ((demodel.WarehouseId ?? 0) <= 0) {
+                return ApiResult.Failed("请选择仓库");
+            }
+            if (!demodel.StartDate.HasValue) {
+                return ApiResult.ParamIsNull("请选择开始时间");
+            }
+            if (!demodel.EndDate.HasValue) {
+                return ApiResult.ParamIsNull("请选择结束时间");
+            }
+
+            demodel.Status = 0;
+            demodel.CheckState = REBORN.Common.Enum.SuppliesCheckStatusEnum.InTheInventory;
+            demodel.RB_Branch_Id = userInfo.RB_Branch_id;
+            demodel.RB_Group_Id = userInfo.RB_Group_id;
+            demodel.CreateBy = userInfo.EmployeeId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateBy = userInfo.EmployeeId;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag = suppliesModule.SetSuppliesCheck(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 取消盘点
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult CancelSuppliesCheck()
+        {
+            RequestParm requestParm = GetRequestParm();
+            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
+            JObject parms = JObject.Parse(requestParm.msg.ToString());
+            int CheckId = parms.GetInt("CheckId", 0);
+            if (CheckId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递参数id");
+            }
+
+            var cmodel = suppliesModule.GetSuppliesCheck(CheckId);
+            if (cmodel == null) {
+                return ApiResult.Failed("盘点单不存在");
+            }
+            if (cmodel.CheckState != REBORN.Common.Enum.SuppliesCheckStatusEnum.InTheInventory) {
+                return ApiResult.Failed("盘点单无法取消");
+            }
+
+            bool flag = suppliesModule.CancelSuppliesCheck(CheckId, userInfo);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 盘点单复盘
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RepeatSuppliesCheck()
+        {
+            RequestParm requestParm = GetRequestParm();
+            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
+            JObject parms = JObject.Parse(requestParm.msg.ToString());
+            int CheckId = parms.GetInt("CheckId", 0);
+            if (CheckId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递参数id");
+            }
+
+            var cmodel = suppliesModule.GetSuppliesCheck(CheckId);
+            if (cmodel == null)
+            {
+                return ApiResult.Failed("盘点单不存在");
+            }
+            if (cmodel.CheckState != REBORN.Common.Enum.SuppliesCheckStatusEnum.Completed)
+            {
+                return ApiResult.Failed("盘点单无法复盘");
+            }
+
+            bool flag = suppliesModule.RepeatSuppliesCheck(CheckId, userInfo);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 获取盘点明细列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSuppliesCheckDetailPageList() {
+            var requestParm = GetRequestParm();
+            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
+            RB_Supplies_CheckDetail_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_CheckDetail_Extend>(requestParm.msg.ToString());
+
+            demodel.RB_Group_Id = userInfo.RB_Group_id;
+            var list = suppliesModule.GetSuppliesCheckDetailPageList(pagelist.pageIndex, pagelist.pageSize, demodel, out long count);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.CheckStatus,
+                CheckStatusName = x.CheckStatus.GetEnumName(),
+                x.Remark,
+                x.SuppliesNo,
+                x.SuppliesId,
+                x.SuppliesName,
+                x.SpecificationList,
+                x.InventoryNum,
+                x.RealityNum,
+                x.ImageList,
+                x.CheckEmpId,
+                CheckEmpName = x.CheckEmpId.HasValue && x.CheckEmpId > 0 ? CacheManager.User.UserReidsCache.GetEmployee(x.CheckEmpId)?.EmName : "",
+                CheckDate = x.CheckDate.HasValue ? x.CheckDate.Value.ToString("yyyy-MM-dd") : "",
+                DealStatus = x.DealStatus ?? 0,
+                UpdateBy = CacheManager.User.UserReidsCache.GetEmployee(x.UpdateBy)?.EmName ?? "",
+                UpdateDate = x.UpdateDate.Value.ToString("yyyy-MM-dd")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        #endregion
     }
 }