From fe0ba1a46a1348ab23218a1f724946a81c40b1ea Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Mon, 27 Nov 2023 11:59:27 +0800 Subject: [PATCH] 1 --- .../Dto/PrdManage/PrdInstockRecordUpListOutPut.cs | 6 +++++- .../Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs index faf6e012..840d50a8 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs @@ -16,11 +16,15 @@ namespace Tnb.ProductionMgr.Entities.Dto public class PrdInstockRecordUpListChildOutPut { public string id { get; set; } - public string bill_code { get; set; } + public string code { get; set; } public string bill_type { get; set; } public string carry_code { get; set; } public string create_id { get; set; } public string bill_date { get; set; } + /// + /// 起始库位编号 + /// + public string location_code { get; set; } = string.Empty; } public class PrdInstockRecordUpListDownOutPut diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs index ba412c09..2f9af12a 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs @@ -99,9 +99,10 @@ namespace Tnb.ProductionMgr .Where(x=>x.mo_task_id==a.id).ToList((x,y,z)=>new PrdInstockRecordUpListChildOutPut() { id = x.id, - bill_code = x.code, + code = x.code, bill_type = z.FullName, carry_code = x.carry_code, + location_code = x.location_code, create_id = y.RealName, bill_date = x.bill_date==null ? "" : x.bill_date.ToString(DbTimeFormat.SS),