1

Property.Repository/Supplies/RB_Supplies_CheckDetailRepository.cs

@@ -41,7 +41,7 @@ namespace Property.Repository
             {
                 where += " and cd." + nameof(RB_Supplies_CheckDetail_Extend.CheckStatus) + "=" + (int)dmodel.CheckStatus;
             }
-            if (dmodel.DealStatus >= 0)
+            if (dmodel.DealStatus > 0)
             {
                 where += " and cd." + nameof(RB_Supplies_CheckDetail_Extend.DealStatus) + "=" + dmodel.DealStatus;
             }
@@ -52,7 +52,7 @@ namespace Property.Repository
             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
+            string sql = $@" select cd.*,pi.Name as SuppliesName,pi.SuppliesNum as 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";
             return GetPage<RB_Supplies_CheckDetail_Extend>(pageIndex, pageSize, out count, sql).ToList();

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -1753,10 +1753,10 @@ namespace Property.WebApi.Controllers.User
                 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") : "",
+                CheckDate = x.CheckDate.HasValue ? x.CheckDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 DealStatus = x.DealStatus ?? 0,
-                UpdateBy = CacheManager.User.UserReidsCache.GetEmployee(x.UpdateBy)?.EmName ?? "",
-                UpdateDate = x.UpdateDate.Value.ToString("yyyy-MM-dd")
+                //UpdateBy = CacheManager.User.UserReidsCache.GetEmployee(x.UpdateBy)?.EmName ?? "",
+                //UpdateDate = x.UpdateDate.Value.ToString("yyyy-MM-dd")
             });
             return ApiResult.Success("", pagelist);
         }