From 5dd64cef9ef59126892683659389a32f33603cd9 Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Fri, 4 Aug 2023 17:17:54 +0800
Subject: [PATCH 1/2] 1

---
 .../Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.part.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.part.cs
index 296b48e7..57477412 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.part.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockD.part.cs
@@ -8,7 +8,7 @@ namespace Tnb.WarehouseMgr.Entities;
 /// 入库申请明细表
 /// </summary>
 
-public partial class WmsInstockD : BaseEntity<string>
+public partial class WmsInstockD
 {
 
     /// <summary>

From 440d4d9fc37398015ed98f604b23b28989201def Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Fri, 4 Aug 2023 17:39:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=81=9C=E6=9C=BA=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=97=B6=E9=95=BF=E5=AD=97=E6=AE=B5=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E6=94=B9=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/RepairApplyRegisterInput.cs              |  4 ++--
 .../Entity/EqpRepairApply.cs                     |  4 ++--
 .../Dto/PrdManage/PrdInstockInput.cs             |  5 +++++
 .../Entity/PrdInstockH.cs                        | 16 ++++++++++++++++
 .../Tnb.ProductionMgr/PrdInstockService.cs       |  3 +++
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs
index 2ade3738..38cabadf 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs
@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities.Dto
         /// <summary>
         /// 维修耗时
         /// </summary>
-        public string? repair_take_time { get; set; }
+        public int? repair_take_time { get; set; }
         
         /// <summary>
         /// 是否停机
@@ -32,7 +32,7 @@ namespace Tnb.EquipMgr.Entities.Dto
         /// <summary>
         /// 停机时长
         /// </summary>
-        public string? halt_take_time { get; set; }
+        public int? halt_take_time { get; set; }
         
         /// <summary>
         /// 维修描述
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
index a99595b4..727ee5a9 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
@@ -122,7 +122,7 @@ public partial class EqpRepairApply : BaseEntity<string>
     /// <summary>
     /// 维修耗时
     /// </summary>
-    public string? repair_take_time { get; set; }
+    public int? repair_take_time { get; set; }
 
     /// <summary>
     /// 是否停机
@@ -132,7 +132,7 @@ public partial class EqpRepairApply : BaseEntity<string>
     /// <summary>
     /// 停机时长
     /// </summary>
-    public string? halt_take_time { get; set; }
+    public int? halt_take_time { get; set; }
 
     /// <summary>
     /// 维修描述
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockInput.cs
index 485e4233..6ad6e514 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockInput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdInstockInput.cs
@@ -25,6 +25,11 @@ namespace Tnb.ProductionMgr.Entities.Dto
         /// </summary>
         public int is_check { get; set; }
         
+        public string? station_id { get; set; }
+        public string? workline_id { get; set; }
+        public string? workshop_id { get; set; }
+        
+        
         /// <summary>
         /// 子表明细
         /// </summary>
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdInstockH.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdInstockH.cs
index 90149625..2802f17e 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdInstockH.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdInstockH.cs
@@ -39,6 +39,22 @@ public partial class PrdInstockH : BaseEntity<string>
     /// </summary>
     public string location_code { get; set; } = string.Empty;
     
+    /// <summary>
+    /// 工位id
+    /// </summary>
+    public string? station_id { get; set; }
+
+    /// <summary>
+    /// 产线id
+    /// </summary>
+    public string? workline_id { get; set; }
+
+    /// <summary>
+    /// 车间id
+    /// </summary>
+    public string? workshop_id { get; set; }
+
+    
 
     /// <summary>
     /// 检验(0-未检 1-已检)
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs
index c56832e0..2e0b5b3c 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs
@@ -62,6 +62,9 @@ namespace Tnb.ProductionMgr
                     location_code = input.location_code,
                     carry_code = input.carry_code,
                     is_check = input.is_check,
+                    station_id = input.station_id,
+                    workline_id = input.workline_id,
+                    workshop_id = input.workshop_id,
                     org_id = _userManager.GetUserInfo().Result.organizeId,
                     warehouse_id = location?.wh_id,
                     status = 0,