diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasStandardTime.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasStandardTime.cs
new file mode 100644
index 00000000..e52075d7
--- /dev/null
+++ b/BasicData/Tnb.BasicData.Entities/Entity/BasStandardTime.cs
@@ -0,0 +1,112 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.BasicData.Entities;
+
+///
+/// 标准工时
+///
+[SugarTable("bas_standard_time")]
+public partial class BasStandardTime : BaseEntity
+{
+ public BasStandardTime()
+ {
+ id = SnowflakeIdHelper.NextId();
+ }
+ ///
+ /// 生产BOMid
+ ///
+ public string? mbom_id { get; set; }
+
+ ///
+ /// 工艺路线id
+ ///
+ public string? routing_id { get; set; }
+
+ ///
+ /// 工序id
+ ///
+ public string? process_id { get; set; }
+
+ ///
+ /// 工位id
+ ///
+ public string? station_id { get; set; }
+
+ ///
+ /// 类型
+ ///
+ public string? type { get; set; }
+
+ ///
+ /// 标准工时
+ ///
+ public string? standard_time { get; set; }
+
+ ///
+ /// 标准工时单位
+ ///
+ public string? standard_time_unit { get; set; }
+
+ ///
+ /// 标准产能
+ ///
+ public string? standard_capacity { get; set; }
+
+ ///
+ /// 标准产能单位
+ ///
+ public string? standard_capacity_unit { get; set; }
+
+ ///
+ /// 创建用户
+ ///
+ public string? create_id { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime? create_time { get; set; }
+
+ ///
+ /// 修改用户
+ ///
+ public string? modify_id { get; set; }
+
+ ///
+ /// 修改时间
+ ///
+ public DateTime? modify_time { get; set; }
+
+ ///
+ /// 所属组织
+ ///
+ public string? org_id { get; set; }
+
+ ///
+ /// 编号
+ ///
+ public string? code { get; set; }
+
+ ///
+ /// 流程任务Id
+ ///
+ public string? f_flowtaskid { get; set; }
+
+ ///
+ /// 流程引擎Id
+ ///
+ public string? f_flowid { get; set; }
+
+ ///
+ /// 是否启用
+ ///
+ public int? enabled { get; set; }
+
+ ///
+ /// 工序来源选择
+ ///
+ public string? process_source { get; set; }
+
+}
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/CountEstimatedEndTimeInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/CountEstimatedEndTimeInput.cs
new file mode 100644
index 00000000..4f74f496
--- /dev/null
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/CountEstimatedEndTimeInput.cs
@@ -0,0 +1,25 @@
+namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
+{
+ ///
+ /// 排产用于计算预计结束时间
+ ///
+ public class CountEstimatedEndTimeInput
+ {
+ public DateTime estimated_start_date { get; set; }
+
+ public int scheduled_qty { get; set; }
+
+ public string? equip_id { get; set; }
+
+ public string? molds_id { get; set; }
+
+ public string? material_id { get; set; }
+
+ public string? mbom_id { get; set; }
+
+ ///
+ /// 1 注塑挤出排产 2 组装包装排产
+ ///
+ public int type { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/FeedingRecordTreeOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/FeedingRecordTreeOutput.cs
new file mode 100644
index 00000000..f8cae0d2
--- /dev/null
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/FeedingRecordTreeOutput.cs
@@ -0,0 +1,26 @@
+namespace Tnb.ProductionMgr.Entities.Dto
+{
+ public class FeedingRecordTreeOutput
+ {
+ public string id { get; set; }
+ public string mo_task_code { get; set; }
+ public List children { get; set; } = new List();
+ }
+
+ public class FeedingRecordChildren
+ {
+ public string id { get; set; }
+ public string code { get; set; }
+
+ public string mo_task_id { get; set; }
+
+ public List children { get; set; } = new List();
+ }
+
+ public class FeedingRecordMaterialChildren
+ {
+ public string material_code { get; set; }
+
+ public string material_name { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj b/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
index 6316cd83..6aa07278 100644
--- a/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
+++ b/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
@@ -12,6 +12,7 @@
+