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
///
/// 维修耗时
///
- public string? repair_take_time { get; set; }
+ public int? repair_take_time { get; set; }
///
/// 是否停机
@@ -32,7 +32,7 @@ namespace Tnb.EquipMgr.Entities.Dto
///
/// 停机时长
///
- public string? halt_take_time { get; set; }
+ public int? halt_take_time { get; set; }
///
/// 维修描述
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
///
/// 维修耗时
///
- public string? repair_take_time { get; set; }
+ public int? repair_take_time { get; set; }
///
/// 是否停机
@@ -132,7 +132,7 @@ public partial class EqpRepairApply : BaseEntity
///
/// 停机时长
///
- public string? halt_take_time { get; set; }
+ public int? halt_take_time { get; set; }
///
/// 维修描述
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
///
public int is_check { get; set; }
+ public string? station_id { get; set; }
+ public string? workline_id { get; set; }
+ public string? workshop_id { get; set; }
+
+
///
/// 子表明细
///
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
///
public string location_code { get; set; } = string.Empty;
+ ///
+ /// 工位id
+ ///
+ public string? station_id { get; set; }
+
+ ///
+ /// 产线id
+ ///
+ public string? workline_id { get; set; }
+
+ ///
+ /// 车间id
+ ///
+ public string? workshop_id { get; set; }
+
+
///
/// 检验(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,