新增生产计划实体类

MicroServices/Business/Bussiness.Model/Bussiness - Backup.Model.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
+  </ItemGroup>
+
+</Project>

MicroServices/Business/Bussiness.Model/Bussiness.Model.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Folder Include="Tech\" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />

MicroServices/Business/Bussiness.Model/Production/mes_moentry.cs

@@ -0,0 +1,60 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Production
+{
+    /// <summary>
+    /// 生成工单子表
+    /// </summary>
+    public class mes_moentry : BaseEntity
+    {
+        /// <summary>
+        /// 生产工单子表id
+        /// </summary>
+        [Key]
+        public long moentry_id { get; set; }
+        /// <summary>
+        /// 工单主表id
+        /// </summary>
+        public long moentry_moid { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string moentry_mono { get; set; }
+        /// <summary>
+        /// 订单行id
+        /// </summary>
+        public long soentry_id { get; set; }
+        /// <summary>
+        /// 订单行号
+        /// </summary>
+        public long fentry_id { get; set; }
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        public string fbill_no { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string unit { get; set; }
+        /// <summary>
+        /// 工单生产数量(计划数量)
+        /// </summary>
+        public decimal? morder_production_number { get; set; }
+        /// <summary>
+        /// 需求数量
+        /// </summary>
+        //[DecimalPrecision(20, 8)]
+        public decimal? need_number { get; set; }
+        /// <summary>
+        /// 剩余可用数量
+        /// </summary>
+        public decimal? remaining_number { get; set; }
+
+    }
+}

MicroServices/Business/Bussiness.Model/Production/mes_mooccupy.cs

@@ -0,0 +1,103 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Production
+{
+    /// <summary>
+    /// 在制工单占用记录表
+    /// </summary>
+    public class mes_mooccupy :BaseEntity
+    {
+        /// <summary>
+        /// 工单占用ID
+        /// </summary>
+        [Key]
+        public long moo_id { get; set; }
+
+        /// <summary>
+        /// 类型--原始,分配
+        /// </summary>
+        public string moo_id_type { get; set; }
+
+        /// <summary>
+        /// 订单id
+        /// </summary>
+        public long moo_id_billid { get; set; }
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string fbill_no { get; set; }
+
+        /// <summary>
+        /// 行号
+        /// </summary>
+        public long fentry_id { get; set; }
+
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string fitem_number { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string fitem_name { get; set; }
+
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string fmodel { get; set; }
+
+        /// <summary>
+        /// 工单id
+        /// </summary>
+        public long moo_moid { get; set; }
+
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        public string moo_mo { get; set; }
+
+        /// <summary>
+        /// 占用量
+        /// </summary>
+        public decimal? moo_qty { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime moo_stime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime moo_etime { get; set; }
+
+        /// <summary>
+        /// 占用状态-1占用  默认0
+        /// </summary>
+        public int moo_state { get; set; }
+
+        /// <summary>
+        /// 变更人
+        /// </summary>
+        public string moo_cbr { get; set; }
+
+        /// <summary>
+        /// 变更时间
+        /// </summary>
+        public DateTime moo_ctime { get; set; }
+
+        /// <summary>
+        /// 变更原因
+        /// </summary>
+        public string moo_creason { get; set; }
+
+    }
+}

MicroServices/Business/Bussiness.Model/Production/mes_morder.cs

@@ -0,0 +1,231 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp;
+
+namespace Bussiness.Model.Production
+{
+    /// <summary>
+    /// 工单主表
+    /// </summary>
+    public abstract class mes_morder : BaseEntity
+    {
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        [Key]
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 上级工单id
+        /// </summary>
+        public long parent_id { get; set; }
+        /// <summary>
+        /// 关联工单id
+        /// </summary>
+        public long relation_moid { get; set; }
+        /// <summary>
+        /// 关联编号
+        /// </summary>
+        public string relation_mono { get; set; }
+        /// <summary>
+        /// 生产工单编号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 生产工单类型(类型：计划工单、销售工单、委外工单、预测工单)
+        /// </summary>
+        public string morder_type { get; set; }
+        /// <summary>
+        /// 工单所属物料类型
+        /// </summary>
+        public string morder_icitem_type { get; set; }
+        /// <summary>
+        /// 工单类型(类型：发货工单、试产工单、备库工单、常规工单、返工工单)
+        /// </summary>
+        public string work_order_type { get; set; }
+        /// <summary>
+        /// 生产工单日期
+        /// </summary>
+        public  DateTime? morder_date { get; set; }
+        /// <summary>
+        /// 生产工单状态(订单状态:初始，下达，暂停、完成)
+        /// </summary>
+        public string morder_state { get; set; }
+        /// <summary>
+        /// 生产组织id
+        /// </summary>
+        public long moentry_prd { get; set; }
+        /// <summary>
+        /// 生产组织名称
+        /// </summary>
+        public string moentry_prdname { get; set; }
+        /// <summary>
+        /// 工作中心id
+        /// </summary>
+        public long moentry_wrkc { get; set; }
+        /// <summary>
+        /// 工作中心名称
+        /// </summary>
+        public string moentry_wrkcname { get; set; }
+        /// <summary>
+        /// 计划员工号
+        /// </summary>
+        public string planner_num { get; set; }
+        /// <summary>
+        /// 计划员名称
+        /// </summary>
+        public string planner_name { get; set; }
+        /// <summary>
+        /// 生产工单开始日期
+        /// </summary>
+        public DateTime? moentry_stime { get; set; }
+        /// <summary>
+        /// 生产工单结束日期
+        /// </summary>
+        public DateTime? moentry_etime { get; set; }
+        /// <summary>
+        /// 系统建议开工时间
+        /// </summary>
+        public DateTime? moentry_sys_stime { get; set; }
+        /// <summary>
+        /// 系统建议完工时间
+        /// </summary>
+        public DateTime? moentry_sys_etime { get; set; }
+        /// <summary>
+        /// 实际开始时间
+        /// </summary>
+        public DateTime? reality_start_time { get; set; }
+        /// <summary>
+        /// 实际结束时间
+        /// </summary>
+        public DateTime? reality_end_time { get; set; }
+        /// <summary>
+        /// 计划员设定开始时间
+        /// </summary>
+        public DateTime? planner_start_date { get; set; }
+        /// <summary>
+        /// 计划员设定结束时间
+        /// </summary>
+        public DateTime? planner_end_date { get; set; }
+        /// <summary>
+        /// 基于物料开始时间
+        /// </summary>
+        public DateTime? mat_start_date { get; set; }
+        /// <summary>
+        /// 基于物料结束时间
+        /// </summary>
+        public DateTime? mat_end_date { get; set; }
+        /// <summary>
+        /// 产品代码
+        /// </summary>
+        public string product_code { get; set; }
+        /// <summary>
+        /// 产品名称
+        /// </summary>
+        public string product_name { get; set; }
+        /// <summary>
+        /// fms旧料号
+        /// </summary>
+        public string fms_number { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string specification_model { get; set; }
+        /// <summary>
+        /// bom编码
+        /// </summary>
+        public string bom_number { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+       // public string unit { get; set; }
+        /// <summary>
+        /// 工单进度
+        /// </summary>
+        public string morder_progress { get; set; }
+        /// <summary>
+        /// 工单所需工时
+        /// </summary>
+        public decimal? morder_need_time { get; set; }
+        /// <summary>
+        /// 工单生产数量(计划数量)
+        /// </summary>
+       // public decimal? morder_production_number { get; set; }
+        /// <summary>
+        /// 需求数量
+        /// </summary>
+      //  public decimal? need_number { get; set; }
+        /// <summary>
+        /// 剩余可用数量
+        /// </summary>
+      //  public decimal? remaining_number { get; set; }
+        /// <summary>
+        /// 报工数量
+        /// </summary>
+        public decimal? work_number { get; set; }
+        /// <summary>
+        /// 报检数量
+        /// </summary>
+        public decimal? inspection_number { get; set; }
+        /// <summary>
+        /// 合格数量
+        /// </summary>
+        public decimal? qualified_number { get; set; }
+        /// <summary>
+        /// 入库数量
+        /// </summary>
+        public decimal? inventory_number { get; set; }
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string ext { get; set; }
+        /// <summary>
+        /// 已开入库通知单数量
+        /// </summary>
+        public decimal? notice_qty { get; set; }
+        /// <summary>
+        /// 启动状态
+        /// </summary>
+        public int moentry_startup_status { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime? start_time { get; set; }
+        /// <summary>
+        /// 最近暂停时间
+        /// </summary>
+        public DateTime? pause_time { get; set; }
+        /// <summary>
+        /// 最近重启时间
+        /// </summary>
+        public DateTime? restart_time { get; set; }
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string project_name { get; set; }
+        /// <summary>
+        /// 逾期原因备注
+        /// </summary>
+        public string overdue_Remark { get; set; }
+        /// <summary>
+        /// 已领料数量
+        /// </summary>
+        public decimal? picking_qty { get; set; }
+        /// <summary>
+        /// 前状态--计划、下达、完成、关闭
+        /// </summary>
+        public string morder_fstate { get; set; }
+        /// <summary>
+        /// 工单批号--(批号管理的物料出入库要使用)
+        /// </summary>
+        public string morder_batchno { get; set; }
+        /// <summary>
+        /// 下达日期
+        /// </summary>
+        public DateTime? convey_date { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Production/mes_morder_loss_time.cs

@@ -0,0 +1,13 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Production
+{
+    public class mes_morder_loss_time :BaseEntity
+    {
+    }
+}

MicroServices/Business/Bussiness.Model/Production/mes_oorder.cs

@@ -0,0 +1,171 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Production
+{
+    /// <summary>
+    /// 委外订单表
+    /// </summary>
+    public class mes_oorder : BaseEntity
+    {
+        /// <summary>
+        /// 委外订单id
+        /// </summary>
+        [Key]
+        public long oorder_id { get; set; }
+        /// <summary>
+        /// 生产工单编号
+        /// </summary>
+        public string oorder_no { get; set; }
+        /// <summary>
+        /// 生产工单类型
+        /// </summary>
+        public string oorder_type { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime? oorder_date { get; set; }
+        /// <summary>
+        /// 订单状态
+        /// </summary>
+        public string oorder_state { get; set; }
+        /// <summary>
+        /// 生产组织
+        /// </summary>
+        public long ooentry_prd { get; set; }
+        /// <summary>
+        /// 生产组织名称
+        /// </summary>
+        public string ooentry_prdname { get; set; }
+        /// <summary>
+        /// 工作中心
+        /// </summary>
+        public long ooentry_wrkc { get; set; }
+        /// <summary>
+        /// 工作中心名称
+        /// </summary>
+        public string ooentry_wrkcname { get; set; }
+        /// <summary>
+        /// 计划员工号
+        /// </summary>
+        public string planner_num { get; set; }
+        /// <summary>
+        /// 计划员名称
+        /// </summary>
+        public string planner_name { get; set; }
+        /// <summary>
+        /// 计划开工日期
+        /// </summary>
+        public DateTime? ooentry_stime { get; set; }
+        /// <summary>
+        /// 计划完工日期
+        /// </summary>
+        public DateTime? ooentry_etime { get; set; }
+        /// <summary>
+        /// 产品代码
+        /// </summary>
+        public string product_code { get; set; }
+        /// <summary>
+        /// fms旧料号
+        /// </summary>
+        public string ffms_number { get; set; }
+        /// <summary>
+        /// 产品名称
+        /// </summary>
+        public string product_name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string specification_model { get; set; }
+        /// <summary>
+        /// bom编码
+        /// </summary>
+        public string bom_number { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string unit { get; set; }
+        /// <summary>
+        /// 工单进度
+        /// </summary>
+        public string morder_progress { get; set; }
+        /// <summary>
+        /// 工单生产数量(计划数量)
+        /// </summary>
+        public decimal morder_production_number { get; set; }
+        /// <summary>
+        /// 需求数量
+        /// </summary>
+        public decimal need_number { get; set; }
+        /// <summary>
+        /// 剩余可用数量
+        /// </summary>
+        public decimal remaining_number { get; set; }
+        /// <summary>
+        /// 报工数量
+        /// </summary>
+        public decimal work_number { get; set; }
+        /// <summary>
+        /// 报检数量
+        /// </summary>
+        public decimal inspection_number { get; set; }
+        /// <summary>
+        /// 合格数量
+        /// </summary>
+        public decimal qualified_number { get; set; }
+        /// <summary>
+        /// 入库数量
+        /// </summary>
+        public decimal inventory_number { get; set; }
+        /// <summary>
+        /// 已开通知单数量
+        /// </summary>
+        public decimal notice_qty { get; set; }
+        /// <summary>
+        /// 启动状态
+        /// </summary>
+        public int moentry_on { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime? start_time { get; set; }
+        /// <summary>
+        /// 最近暂停时间
+        /// </summary>
+        public DateTime? pause_time { get; set; }
+        /// <summary>
+        /// 最近重启时间
+        /// </summary>
+        public DateTime? restart_time { get; set; }
+        /// <summary>
+        /// 扩展
+        /// </summary>
+        public string ext { get; set; }
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string project_name { get; set; }
+        /// <summary>
+        /// 发料状态 1-待发料  2-已发料
+        /// </summary>
+        public int sent_status { get; set; }
+        /// <summary>
+        /// 加工单位
+        /// </summary>
+        public string production_unit { get; set; }
+        /// <summary>
+        /// 加工单位编码
+        /// </summary>
+        public string production_unit_code { get; set; }
+        /// <summary>
+        /// 所需物料是否充足  1-充足 0-缺料
+        /// </summary>
+        public int need_icitem_status { get; set; }
+
+    }
+}

MicroServices/Business/Bussiness.Model/Production/mes_schedule_occupy.cs

@@ -0,0 +1,54 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Production
+{
+    /// <summary>
+    /// 排程时间占用记录表
+    /// </summary>
+    public class mes_schedule_occupy : BaseEntity
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime start_time { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime end_time { get; set; }
+        /// <summary>
+        /// 工作时长(h)
+        /// </summary>
+        public decimal working_minute { get; set; }
+        /// <summary>
+        /// 状态 0-待使用，1-已使用
+        /// </summary>
+        public int status { get; set; }
+        /// <summary>
+        /// 是否锁定 0-正常，1-锁定
+        /// </summary>
+        public int is_Locked { get; set; }
+        /// <summary>
+        /// 生产组织id
+        /// </summary>
+        public long prd_org_id { get; set; }
+        /// <summary>
+        /// 工作中心id
+        /// </summary>
+        public long work_center_id { get; set; }
+        /// <summary>
+        /// 工作日历id
+        /// </summary>
+        public long work_calendar_id { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Production/mes_stockoccupy.cs

@@ -0,0 +1,90 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Production
+{
+    /// <summary>
+    /// 成品库存占用表
+    /// </summary>
+    public class mes_stockoccupy : BaseEntity
+    {
+        /// <summary>
+        /// 成品库存占用id
+        /// </summary>
+        [Key]
+        public long soccupy_id { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public long soccupy_type { get; set; }
+        /// <summary>
+        /// 订单行id
+        /// </summary>
+        public long soentry_id { get; set; }
+        /// <summary>
+        /// 订单行号
+        /// </summary>
+        public long fentry_id { get; set; }
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        public string fbill_no { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string fitem_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string fitem_name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string fmodel { get; set; }
+        /// <summary>
+        /// 仓库id
+        /// </summary>
+        public long warehouse_id { get; set; }
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string warehouse_name { get; set; }
+        /// <summary>
+        /// 仓库类型
+        /// </summary>
+        public string warehouse_type { get; set; }
+        /// <summary>
+        /// 占用量
+        /// </summary>
+        public decimal? occupyqty { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime soccupy_stime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime soccupy_etime { get; set; }
+        /// <summary>
+        /// 占用状态
+        /// </summary>
+        public string soccupy_state { get; set; }
+        /// <summary>
+        /// 变更人
+        /// </summary>
+        public string soccupy_cby { get; set; }
+        /// <summary>
+        /// 变更时间
+        /// </summary>
+        public DateTime soccupy_ctime { get; set; }
+        /// <summary>
+        /// 变更原因
+        /// </summary>
+        public string soccupy_creason { get; set; } 
+    }
+}