diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs index 61778c15..4788b423 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdReportCrInput.cs @@ -108,5 +108,9 @@ /// public string location_code { get; set; } + /// + /// 称重重量 + /// + public decimal weight { get; set; } } } diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ReportRecordListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ReportRecordListOutput.cs index fafb4e0d..9deb95d3 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ReportRecordListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ReportRecordListOutput.cs @@ -31,5 +31,10 @@ namespace Tnb.ProductionMgr.Entities.Dto public string? create_time { get; set; } = string.Empty; public string? batch { get; set; } = string.Empty; + public string material_box_code { get; set; } + /// + /// 称重重量 + /// + public decimal weight { get; set; } } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs index 779063b1..e33b085e 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs @@ -144,5 +144,10 @@ public partial class PrdReport : BaseEntity /// 入库仓库 /// public string warehouse_id { get; set; } + + /// + /// 称重重量 + /// + public decimal weight { get; set; } } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index dc240aea..2dce7b7f 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1672,6 +1672,7 @@ namespace Tnb.ProductionMgr report = input.Adapt(); report.id = SnowflakeIdHelper.NextId(); report.reported_qty = input.reported_qty; + report.weight = input.weight; report.material_box_code = input.material_box_code; if (prdMoTask.schedule_type == 2) { diff --git a/ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs b/ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs index 5a81dfe0..770a91cc 100644 --- a/ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs @@ -118,7 +118,9 @@ namespace Tnb.ProductionMgr create_id = y.RealName, create_id_id = x.create_id, create_time = x.create_time == null ? "" : x.create_time.Value.ToString(DbTimeFormat.MM), - batch = x.barcode + batch = x.batch, + material_box_code = x.material_box_code, + weight = x.weight }) }).ToPagedListAsync(input.currentPage, input.pageSize); return PageResult.SqlSugarPageResult(result);