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

bug

Browse Source
This commit is contained in:
周科达
2023-11-08 09:59:10 +08:00
parent 14aa0b2ff4
commit 7f6bb604fd
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs
View File

@@ -63,7 +63,7 @@ public partial class PrdOutstockH : BaseEntity<string>
/// <summary> /// <summary>
/// 发料工位 /// 发料工位
/// </summary> /// </summary>
public string? workstation { get; set; } public string? workstation_id { get; set; }
/// <summary> /// <summary>
/// 所属产线 /// 所属产线

2
ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
View File

@@ -544,7 +544,7 @@ namespace Tnb.ProductionMgr
var queryable2 = db.Queryable<PrdOutstockH>() var queryable2 = db.Queryable<PrdOutstockH>()
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id) .LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.Where((a,b)=>a.workstation==input.stationId) .Where((a,b)=>a.workstation_id==input.stationId)
.Select((a, b) => new FeedingRecordListOutput() .Select((a, b) => new FeedingRecordListOutput()
{ {
id = a.id, id = a.id,

4
ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs
View File

@@ -206,7 +206,7 @@ namespace Tnb.ProductionMgr
org_id = _userManager.GetUserInfo().Result.organizeId, org_id = _userManager.GetUserInfo().Result.organizeId,
bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
create_time = DateTime.Now, create_time = DateTime.Now,
workstation = generalOutstockInput.workstation_id, workstation_id = generalOutstockInput.workstation_id,
workline = workline?.Id ?? "" workline = workline?.Id ?? ""
}; };
@@ -325,7 +325,7 @@ namespace Tnb.ProductionMgr
prdOutstockH.org_id = _userManager.GetUserInfo().Result.organizeId; prdOutstockH.org_id = _userManager.GetUserInfo().Result.organizeId;
prdOutstockH.bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); prdOutstockH.bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
prdOutstockH.create_time = DateTime.Now; prdOutstockH.create_time = DateTime.Now;
prdOutstockH.workstation = materialOutstockInput.workstation_id; prdOutstockH.workstation_id = materialOutstockInput.workstation_id;
prdOutstockH.workline = workline?.Id ?? ""; prdOutstockH.workline = workline?.Id ?? "";
List<PrdOutstockD> prdOutstockDs = new List<PrdOutstockD>(); List<PrdOutstockD> prdOutstockDs = new List<PrdOutstockD>();