wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料规格型号改成material_specification字段

Browse Source
This commit is contained in:
周科达
2024-06-13 17:18:38 +08:00
parent c368e24d9e
commit c5a7e672b6
7 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BasicData/Tnb.BasicData/BasMaterialService.cs
View File

@@ -207,8 +207,8 @@ namespace Tnb.BasicData
.Where(x => x.state == "1")
.WhereIF(queryJson != null && queryJson.ContainsKey("name"), x => x.name.Contains(queryJson!["name"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("code"), x => x.code.Contains(queryJson!["code"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("material_standard"),
x => x.material_standard!.Contains(queryJson!["material_standard"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("material_specification"),
x => x.material_specification!.Contains(queryJson!["material_specification"]))
.Select(x => x);
List<ISugarQueryable<BasMaterial>> list = new();

2
BasicData/Tnb.BasicData/BasMbomService.cs
View File

@@ -227,7 +227,7 @@ namespace Tnb.BasicData
material_id = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.id),
material_code = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.code),
material_name = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.name),
material_standard = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.material_standard),
material_standard = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.material_specification),
num = e.num,
ordinal = d.ordinal,
})