Qubot/EasyMES
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

放开物料限制

Browse Source
This commit is contained in:
12888491 2022-10-31 17:02:41 +08:00
parent e807222014
commit 64d7f1516d
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
WaterCloud.Service/MaterialManage/MaterialService.cs
View File

@ -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);

2
WaterCloud.Service/MaterialManage/OutStorageService.cs
View File

@ -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));

2
WaterCloud.Service/PlanManage/InStoragePlanService.cs
View File

@ -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)
{

2
WaterCloud.Service/PlanManage/OutStoragePlanService.cs
View File

@ -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)
{

2
WaterCloud.Web/Areas/MaterialManage/Views/InStorage/Form.cshtml
View File

@ -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",
});