物料查询所有

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -880,7 +880,7 @@ namespace Property.Module.FixedAssets
                 //查询仓库
                 var wlist= supplies_WareHouseRepository.GetList(new RB_Supplies_WareHouse_Extend() { RB_Group_Id = demodel.RB_Group_Id, WareHouseIdStr = wstr });
                 //查询耗材
-                var mlist = supplies_MaterialRepository.GetList(new RB_Supplies_Material_Extend() { RB_Group_Id = demodel.RB_Group_Id, SuppliesIdStr = sstr });
+                var mlist = supplies_MaterialRepository.GetList(new RB_Supplies_Material_Extend() { RB_Group_Id = demodel.RB_Group_Id, SuppliesIdStr = sstr }, true);
 
                 foreach (var item in list) {
                     item.WModel = wlist.Where(x => x.Id == item.WarehouseId).FirstOrDefault();

Property.Repository/Supplies/RB_Supplies_MaterialRepository.cs

@@ -57,10 +57,13 @@ left join rb_property_category pc on sm.CategoryId=pc.Id
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Supplies_Material_Extend> GetList(RB_Supplies_Material_Extend dmodel)
+        public List<RB_Supplies_Material_Extend> GetList(RB_Supplies_Material_Extend dmodel,bool IsSeelctDel = false )
         {
             string where = " where 1=1 ";
-            where += string.Format(" AND sm.{0}={1}", nameof(RB_Supplies_Material_Extend.Status), 0);
+            if (IsSeelctDel == false)
+            {
+                where += string.Format(" AND sm.{0}={1}", nameof(RB_Supplies_Material_Extend.Status), 0);
+            }
             where += $@" and sm.RB_Group_Id={dmodel.RB_Group_Id}";
             if (!string.IsNullOrWhiteSpace(dmodel.Name))
             {