From 64d7f1516d497ebff05ad45c1a1e3e40f4285995 Mon Sep 17 00:00:00 2001
From: 12888491 <295228902@qq.com>
Date: Mon, 31 Oct 2022 17:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E7=89=A9=E6=96=99=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WaterCloud.Service/MaterialManage/MaterialService.cs  | 11 ++---------
 .../MaterialManage/OutStorageService.cs               |  2 +-
 WaterCloud.Service/PlanManage/InStoragePlanService.cs |  2 +-
 .../PlanManage/OutStoragePlanService.cs               |  2 +-
 .../Areas/MaterialManage/Views/InStorage/Form.cshtml  |  2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/WaterCloud.Service/MaterialManage/MaterialService.cs b/WaterCloud.Service/MaterialManage/MaterialService.cs
index d9dd381..6a2c6db 100644
--- a/WaterCloud.Service/MaterialManage/MaterialService.cs
+++ b/WaterCloud.Service/MaterialManage/MaterialService.cs
@@ -95,15 +95,8 @@ namespace WaterCloud.Service.MaterialManage
             }
             if (type!=null)
             {
-                if (type==-1)
-                {
-                    query = query.Where(u => u.F_MaterialType > 0);
-                }
-                else
-                {
-                    query = query.Where(u => u.F_MaterialType == type);
-                }
-            }
+				query = query.Where(u => u.F_MaterialType == type);
+			}
             if(!string.IsNullOrEmpty(id))
             {
                 query= query.Where(u=>u.F_Id==id);
diff --git a/WaterCloud.Service/MaterialManage/OutStorageService.cs b/WaterCloud.Service/MaterialManage/OutStorageService.cs
index 643ab52..172e513 100644
--- a/WaterCloud.Service/MaterialManage/OutStorageService.cs
+++ b/WaterCloud.Service/MaterialManage/OutStorageService.cs
@@ -254,7 +254,7 @@ namespace WaterCloud.Service.MaterialManage
         public async Task<List<MaterialEntity>> GetMaterialList(SoulPage<MaterialEntity> pagination, string keyword, string id)
         {
             //获取数据权限
-            var list = uniwork.IQueryable<MaterialEntity>(a => a.F_DeleteMark == false && a.F_MaterialType>=1);
+            var list = uniwork.IQueryable<MaterialEntity>(a => a.F_DeleteMark == false);
             if (!string.IsNullOrEmpty(keyword))
             {
                 list = list.Where(t => t.F_MaterialCode.Contains(keyword) || t.F_MaterialName.Contains(keyword));
diff --git a/WaterCloud.Service/PlanManage/InStoragePlanService.cs b/WaterCloud.Service/PlanManage/InStoragePlanService.cs
index d9ade1c..c634a1f 100644
--- a/WaterCloud.Service/PlanManage/InStoragePlanService.cs
+++ b/WaterCloud.Service/PlanManage/InStoragePlanService.cs
@@ -42,7 +42,7 @@ namespace WaterCloud.Service.PlanManage
             }
             DateTime endTime = startTime.AddDays(CountDay);
             var datas = repository.IQueryable().Where(a => a.F_PlanTime >= startTime && a.F_PlanTime < endTime).ToList();
-            var datat = uniwork.IQueryable<MaterialEntity>(t => t.F_MaterialType == 0 && t.F_EnabledMark == true && t.F_DeleteMark == false ).OrderBy(t => t.F_MaterialCode).ToList();
+            var datat = uniwork.IQueryable<MaterialEntity>(t => t.F_MaterialType < 2 && t.F_EnabledMark == true && t.F_DeleteMark == false ).OrderBy(t => t.F_MaterialCode).ToList();
             var data = new List<Object>();
             foreach (var item in datat)
             {
diff --git a/WaterCloud.Service/PlanManage/OutStoragePlanService.cs b/WaterCloud.Service/PlanManage/OutStoragePlanService.cs
index 944fb77..cb8ede9 100644
--- a/WaterCloud.Service/PlanManage/OutStoragePlanService.cs
+++ b/WaterCloud.Service/PlanManage/OutStoragePlanService.cs
@@ -43,7 +43,7 @@ namespace WaterCloud.Service.PlanManage
             }
             DateTime endTime = startTime.AddDays(CountDay);
             var datas = repository.IQueryable().Where(a => a.F_PlanTime >= startTime && a.F_PlanTime < endTime).ToList();
-            var datat = uniwork.IQueryable<MaterialEntity>(t => t.F_MaterialType == 2 && t.F_EnabledMark == true && t.F_DeleteMark == false ).OrderBy(t => t.F_MaterialCode).ToList();
+            var datat = uniwork.IQueryable<MaterialEntity>(t => t.F_MaterialType > 0 && t.F_EnabledMark == true && t.F_DeleteMark == false ).OrderBy(t => t.F_MaterialCode).ToList();
             var data = new List<Object>();
             foreach (var item in datat)
             {
diff --git a/WaterCloud.Web/Areas/MaterialManage/Views/InStorage/Form.cshtml b/WaterCloud.Web/Areas/MaterialManage/Views/InStorage/Form.cshtml
index fc2eb0b..0bd2734 100644
--- a/WaterCloud.Web/Areas/MaterialManage/Views/InStorage/Form.cshtml
+++ b/WaterCloud.Web/Areas/MaterialManage/Views/InStorage/Form.cshtml
@@ -156,7 +156,7 @@
             var parentform = window.name;
             common.modalOpen({
                 title: "选择物料",
-                url: "/MaterialManage/Material/AddForm?parentform=" + parentform + "&name=" + "F_MaterialName" + "&value=" + "F_MaterialId" + "&type=0"+ "&ids=" + $('#F_MaterialId').val(),
+                url: "/MaterialManage/Material/AddForm?parentform=" + parentform + "&name=" + "F_MaterialName" + "&value=" + "F_MaterialId" + "&ids=" + $('#F_MaterialId').val(),
                 width: "650px",
                 height: "600px",
             });