From 7f6bb604fd1d577658a82005ded0d03cd5455e88 Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Wed, 8 Nov 2023 09:59:10 +0800
Subject: [PATCH] bug

---
 .../Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs         | 2 +-
 ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs          | 2 +-
 ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs
index 787a4198..5d31f9a8 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs
@@ -63,7 +63,7 @@ public partial class PrdOutstockH : BaseEntity<string>
     /// <summary>
     /// 发料工位
     /// </summary>
-    public string? workstation { get; set; }
+    public string? workstation_id { get; set; }
 
     /// <summary>
     /// 所属产线
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
index 08625689..9a675eb6 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
@@ -544,7 +544,7 @@ namespace Tnb.ProductionMgr
             
             var queryable2 = db.Queryable<PrdOutstockH>()
                 .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()
                 {
                     id = a.id,
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs
index 597ab613..afa9dd37 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs
@@ -206,7 +206,7 @@ namespace Tnb.ProductionMgr
                         org_id = _userManager.GetUserInfo().Result.organizeId,
                         bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                         create_time = DateTime.Now,
-                        workstation = generalOutstockInput.workstation_id,
+                        workstation_id = generalOutstockInput.workstation_id,
                         workline = workline?.Id ?? ""
                     };
 
@@ -325,7 +325,7 @@ namespace Tnb.ProductionMgr
                     prdOutstockH.org_id = _userManager.GetUserInfo().Result.organizeId;
                     prdOutstockH.bill_date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                     prdOutstockH.create_time = DateTime.Now;
-                    prdOutstockH.workstation = materialOutstockInput.workstation_id;
+                    prdOutstockH.workstation_id = materialOutstockInput.workstation_id;
                     prdOutstockH.workline = workline?.Id ?? "";
 
                     List<PrdOutstockD> prdOutstockDs = new List<PrdOutstockD>();