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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
贺立波
2023-11-27 14:09:15 +08:00
parent e70c91a754 3edcd99440
commit f245a134fa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockRecordUpListOutPut.cs
View File

@@ -16,11 +16,15 @@ namespace Tnb.ProductionMgr.Entities.Dto
public class PrdInstockRecordUpListChildOutPut public class PrdInstockRecordUpListChildOutPut
{ {
public string id { get; set; } public string id { get; set; }
public string bill_code { get; set; } public string code { get; set; }
public string bill_type { get; set; } public string bill_type { get; set; }
public string carry_code { get; set; } public string carry_code { get; set; }
public string create_id { get; set; } public string create_id { get; set; }
public string bill_date { get; set; } public string bill_date { get; set; }
/// <summary>
/// 起始库位编号
/// </summary>
public string location_code { get; set; } = string.Empty;
} }
public class PrdInstockRecordUpListDownOutPut public class PrdInstockRecordUpListDownOutPut

3
ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs
View File

@@ -99,9 +99,10 @@ namespace Tnb.ProductionMgr
.Where(x=>x.mo_task_id==a.id).ToList((x,y,z)=>new PrdInstockRecordUpListChildOutPut() .Where(x=>x.mo_task_id==a.id).ToList((x,y,z)=>new PrdInstockRecordUpListChildOutPut()
{ {
id = x.id, id = x.id,
bill_code = x.code, code = x.code,
bill_type = z.FullName, bill_type = z.FullName,
carry_code = x.carry_code, carry_code = x.carry_code,
location_code = x.location_code,
create_id = y.RealName, create_id = y.RealName,
bill_date = x.bill_date==null ? "" : x.bill_date.ToString(DbTimeFormat.SS), bill_date = x.bill_date==null ? "" : x.bill_date.ToString(DbTimeFormat.SS),