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

10
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -518,7 +518,7 @@ namespace Tnb.ProductionMgr
type = (a.mo_type == DictConst.PrdMoTypeZS || a.mo_type == DictConst.PrdMoTypeJC) ? 1 : 2,
material_code = b.code,
material_name = b.name,
material_standard = b.material_standard,
material_standard = b.material_specification,
act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS)
}).ToPagedListAsync(input.currentPage, input.pageSize);
@@ -560,7 +560,7 @@ namespace Tnb.ProductionMgr
material_id = a.material_id,
material_code = b.code,
material_name = b.name,
material_standard = b.material_standard,
material_standard = b.material_specification,
act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS),
workshop_name = e.FullName,
@@ -582,7 +582,7 @@ namespace Tnb.ProductionMgr
material_id = a.material_id,
material_code = b.code,
material_name = b.name,
material_standard = b.material_standard,
material_standard = b.material_specification,
act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS),
act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString(DbTimeFormat.SS),
workline_name = c.FullName,
@@ -994,7 +994,7 @@ namespace Tnb.ProductionMgr
.LeftJoin<PrdFeedingD>((a, b) => a.id == b.material_receipt_detail_id)
.Where((a, b) => a.barcode == barcode).SumAsync((a, b) => b.num);
output.list[0].material_name = basMaterial.name;
output.list[0].material_standard = basMaterial.material_standard;
output.list[0].material_standard = basMaterial.material_specification;
output.list[0].supplier_name = basSupplier?.supplier_name ?? "";
output.list[0].unit_name = unit?.FullName ?? "";
@@ -1031,7 +1031,7 @@ namespace Tnb.ProductionMgr
mo_code = b.mo_code,
material_code = c.code,
material_name = c.name,
material_standard = c.material_standard,
material_standard = c.material_specification,
children = SqlFunc.Subqueryable<PrdFeedingD>()
.LeftJoin<PrdFeedingH>((x, y) => x.feeding_id == y.id)
.LeftJoin<UserEntity>((x, y, z) => y.create_id == z.Id)