Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

.gitignore

@@ -190,3 +190,31 @@ MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.assets.c
 MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.csproj.AssemblyReference.cache
 MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.GeneratedMSBuildEditorConfig.editorconfig
 MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.GlobalUsings.g.cs
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Bussiness.Model.deps.json
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Bussiness.Model.dll
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Bussiness.Model.pdb
+MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.csproj.CoreCompileInputs.cache
+MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.csproj.FileListAbsolute.txt
+MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.dll
+MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.pdb
+MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/ref/Bussiness.Model.dll
+MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/refint/Bussiness.Model.dll
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Business.Core.dll
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Business.Core.pdb
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Business.Domain.dll
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Business.Domain.pdb
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Business.EntityFrameworkCore.dll
+MicroServices/Business/Bussiness.Model/bin/Debug/net6.0/Business.EntityFrameworkCore.pdb
+MicroServices/Business/Bussiness.Model/obj/Debug/net6.0/Bussiness.Model.csproj.CopyComplete
+MicroServices/Business/Business.Common.Utility/obj/Business.Common.Utility.csproj.nuget.dgspec.json
+MicroServices/Business/Business.Common.Utility/obj/Business.Common.Utility.csproj.nuget.g.props
+MicroServices/Business/Business.Common.Utility/obj/Business.Common.Utility.csproj.nuget.g.targets
+MicroServices/Business/Business.Common.Utility/obj/project.assets.json
+MicroServices/Business/Business.Common.Utility/obj/project.nuget.cache
+MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs
+MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/Business.Common.Utility.AssemblyInfo.cs
+MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/Business.Common.Utility.AssemblyInfoInputs.cache
+MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/Business.Common.Utility.assets.cache
+MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/Business.Common.Utility.csproj.AssemblyReference.cache
+MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/Business.Common.Utility.GeneratedMSBuildEditorConfig.editorconfig
+MicroServices/Business/Business.Common.Utility/obj/Debug/net6.0/Business.Common.Utility.GlobalUsings.g.cs

MicroServices/Business/Business.Common.Utility/Business.Common.Utility.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

MicroServices/Business/Business.Common.Utility/SnowFlake.cs

@@ -0,0 +1,176 @@
+using System.Reflection.PortableExecutable;
+
+namespace ApiDemo
+{
+    /// <summary>
+    /// 雪花算法生成id
+    /// </summary>
+    public class SnowFlake
+    {
+        /// <summary>
+        /// 机器id所占的位数
+        /// </summary>
+        private const int workerIdBits = 5;
+
+        /// <summary>
+        /// 数据表述id所占位数
+        /// </summary>
+        private const int datacenterIdBits = 5;
+
+        /// <summary>
+        /// 支持的最大机器id，结果是31
+        /// </summary>
+        private const long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+        /// <summary>
+        /// 支持的最大数据表示id，结果是31
+        /// </summary>
+        private const long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+
+        /// <summary>
+        /// 序列在id中所占的位数
+        /// </summary>
+        private const int sequenceBits = 12;
+
+        /// <summary>
+        /// 数据标识id向左移17位
+        /// </summary>
+        private const int datacenterIdShift = sequenceBits + workerIdBits;
+
+        /// <summary>
+        /// 机器ID向左移12位
+        /// </summary>
+        private const int workerIdShift = sequenceBits;
+
+        private const int timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+        /// <summary>
+        /// 生成序列的掩码
+        /// </summary>
+        private const long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+        /// <summary>
+        /// 数据中心ID(0-31)
+        /// </summary>
+        public long DatacenterId { get; private set; }
+
+        /// <summary>
+        /// 工作机器ID(0-31)
+        /// </summary>
+        public long WorkerId { get; private set; }
+
+        /// <summary>
+        /// 毫秒内序列(0-4095)
+        /// </summary>
+        public long Sequence { get; private set; }
+
+        /// <summary>
+        /// 上次生成ID的时间戳
+        /// </summary>
+        public long LastTimestamp { get; private set; }
+
+        /// <summary>
+        /// 开始时间戳。首次使用前设置，否则无效，默认2010-1-1
+        /// </summary>
+        public DateTime StartTimestamp { get; set; } = new DateTime(2010,1,1);
+
+        static object syncRoot = new object();
+        static readonly Lazy<SnowFlake> snowflake = new(() => new SnowFlake(0L,0L));
+
+        /// <summary>
+        /// 默认金泰实例，WorkerId = 0,DatacenterId = 0
+        /// </summary>
+        public static SnowFlake Instance { get; } = snowflake.Value;
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="workerId">工作机器ID</param>
+        /// <param name="datacenterId">数据中心ID</param>
+        /// <exception cref="ArgumentOutOfRangeException"></exception>
+        public SnowFlake(long workerId,long datacenterId)
+        {
+            if (workerId > maxWorkerId || workerId < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(workerId),$"不能大于{maxWorkerId}或小于0");
+            }
+            if (datacenterId > maxDatacenterId || datacenterId < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(datacenterId), $"不能大于{maxDatacenterId}或小于0");
+            }
+            WorkerId = workerId;
+            DatacenterId = datacenterId;
+            Sequence = 0L;
+            LastTimestamp = -1L;
+        }
+
+        /// <summary>
+        /// 获取下一个ID
+        /// </summary>
+        /// <returns></returns>
+        public long NextId()
+        {
+            lock (syncRoot)
+            {
+                //获取当前时间戳
+                long timestamp = GetCurrentTimestamp();
+                if (timestamp > LastTimestamp)//时间戳改变，毫秒内序列重置
+                {
+                    Sequence = 0L;
+                }
+                else if (timestamp == LastTimestamp)//如果是同一时间生成的，则进行毫秒内序列
+                {
+                    Sequence = (Sequence + 1) & sequenceMask;
+                    if (Sequence == 0)//毫秒内序列溢出
+                    {
+                        timestamp = GetNextTimestamp(LastTimestamp);//阻塞到下一个毫秒，获取新的时间戳
+                    }
+                }
+                else//当前时间小于上一次ID生成的时间戳，证明系统时钟被回拨，此时需要做回拨处理
+                {
+                    Sequence = (Sequence + 1) & sequenceMask;
+                    if (Sequence > 0)
+                    {
+                        timestamp = LastTimestamp;//停留再最后一次时间戳上，等待系统时间追上后即完全度过了时钟回拨问题
+                    }
+                    else {
+                        timestamp = LastTimestamp + 1;//直接进位到下一个毫秒
+                    }
+                }
+                LastTimestamp = timestamp;//上次生成ID的时间戳
+
+                //移动并通过或运算拼到一起组成64位的ID
+                var id = (timestamp << timestampLeftShift)
+                        | (DatacenterId << datacenterIdShift)
+                        | (WorkerId << workerIdShift)
+                        | Sequence;
+                return id;
+            }
+        }
+
+        /// <summary>
+        /// 阻塞到下一个毫秒，直到获得新的时间戳
+        /// </summary>
+        /// <param name="lastTimestamp"></param>
+        /// <returns></returns>
+        private long GetNextTimestamp(long lastTimestamp)
+        {
+            //获取当前时间戳
+            long timestamp = GetCurrentTimestamp();
+            while (timestamp <= lastTimestamp)
+            { 
+                timestamp = GetCurrentTimestamp();
+            }
+            return timestamp;
+        }
+
+        /// <summary>
+        /// 获取当前时间戳
+        /// </summary>
+        /// <returns></returns>
+        private long GetCurrentTimestamp()
+        {
+            return (long)(DateTime.Now - StartTimestamp).TotalMilliseconds;
+        }
+    }
+}

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContext.cs

@@ -1,5 +1,7 @@
 using Business.Models;
 using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Reflection;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 
@@ -21,6 +23,18 @@ namespace Business.EntityFrameworkCore
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            modelBuilder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
+            foreach (var entityType in modelBuilder.Model.GetEntityTypes())
+            {
+                var type = entityType.ClrType;
+                var props = type.GetProperties().Where(c => c.IsDefined(typeof(DecimalPrecisionAttribute),true)).ToArray();
+                foreach (var p in props)
+                {
+                    //ͨ¹ý×Ô¶¨ÒådecimalAttributeÉèÖÃdecimal¾«¶È
+                    var precis = p.GetCustomAttribute<DecimalPrecisionAttribute>();
+                    modelBuilder.Entity(type).Property(p.Name).HasColumnType($"decimal({precis.Precision},{precis.Scale})");
+                }
+            }
             base.OnModelCreating(modelBuilder);
             modelBuilder.ConfigureBusiness();
         }

MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/DecimalPrecisionAttribute.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Business.EntityFrameworkCore
+{
+    /// <summary>
+    /// 自定义Decimal类型的精确度属性
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property,Inherited =false,AllowMultiple =false)]
+    public class DecimalPrecisionAttribute: Attribute
+    {
+        #region Field
+        private byte _precision = 18;
+        public byte _scale = 5;
+        #endregion
+
+        #region Construct
+        /// <summary>
+        /// <para>自定义Decimal类型的精确度属性</para>
+        /// </summary>
+        /// <param name="precision">precision
+        /// <para>精度（默认18）</para></param>
+        /// <param name="scale">scale
+        /// <para>小数位数（默认5）</para></param>
+        public DecimalPrecisionAttribute(byte precision = 18, byte scale = 5)
+        {
+            Precision = precision;
+            Scale = scale;
+        }
+        #endregion
+
+        #region Property
+        /// <summary>
+        /// 精确度（默认18）
+        /// </summary>
+        public byte Precision
+        {
+            get { return this._precision; }
+            set { this._precision = value; }
+        }
+
+        /// <summary>
+        /// 保留位数（默认5）
+        /// </summary>
+        public byte Scale
+        {
+            get { return this._scale; }
+            set { this._scale = value; }
+        }
+        #endregion
+
+    }
+}

MicroServices/Business/Business.sln

@@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Core", "Business.C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bussiness.Model", "Bussiness.Model\Bussiness.Model.csproj", "{D9A37E35-A3BD-4A11-A3D8-571586EB2007}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.Common.Utility", "Business.Common.Utility\Business.Common.Utility.csproj", "{2E2BFBC4-49A8-4F15-8FDB-38235FF82FE4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,6 +65,10 @@ Global
 		{D9A37E35-A3BD-4A11-A3D8-571586EB2007}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9A37E35-A3BD-4A11-A3D8-571586EB2007}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9A37E35-A3BD-4A11-A3D8-571586EB2007}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E2BFBC4-49A8-4F15-8FDB-38235FF82FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E2BFBC4-49A8-4F15-8FDB-38235FF82FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E2BFBC4-49A8-4F15-8FDB-38235FF82FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E2BFBC4-49A8-4F15-8FDB-38235FF82FE4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

@@ -13,31 +13,48 @@ namespace Business.Models
         /// <summary>
         /// 创建人
         /// </summary>
-        public virtual long create_By { get; set; }
+        public virtual long create_by { get; set; }
+
         /// <summary>
         /// 创建人名称
         /// </summary>
-        public virtual string create_by_Name { get; set; }
+        public virtual string create_by_name { get; set; }
+
         /// <summary>
         /// 创建时间
         /// </summary>
-        public virtual DateTime create_Time { get; set; }
+        public virtual DateTime create_time { get; set; }
+
         /// <summary>
         /// 修改人
         /// </summary>
-        public virtual long update_By { get; set; }
+        public virtual long update_by { get; set; }
+
         /// <summary>
         /// 修改人名称
         /// </summary>
-        public virtual string update_by_Name { get; set; }
+        public virtual string update_by_name { get; set; }
+
         /// <summary>
         /// 修改时间
         /// </summary>
-        public virtual DateTime update_Time { get; set; }
+        public virtual DateTime update_time { get; set; }
+
         /// <summary>
         /// 企业ID
         /// </summary>
-        public virtual long tenant_Id { get; set; }
+        public virtual long tenant_id { get; set; }
+
+        /// <summary>
+        /// 工厂ID
+        /// </summary>
+        public virtual long factory_id { get; set; }
+
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public virtual long org_id { get; set; }
+
         /// <summary>
         /// 删除标识
         /// </summary>

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

@@ -15,12 +15,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="Tech\" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.2" />
+    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
+    <ProjectReference Include="..\Business.EntityFrameworkCore\Business.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
 </Project>

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 fmodel { 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,93 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Production
+{
+    /// <summary>
+    /// 工单损失时间表
+    /// </summary>
+    public class mes_morder_loss_time :BaseEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public long id { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 生产工单编号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 生产工单行号
+        /// </summary>
+        public int morder_no_row { get; set; }
+        /// <summary>
+        /// 损失开始时间
+        /// </summary>
+        public DateTime start_time { get; set; }
+        /// <summary>
+        /// 损失结束时间
+        /// </summary>
+        public DateTime end_time { get; set; }
+        /// <summary>
+        /// 记录人id
+        /// </summary>
+        public long recorder_id { get; set; }
+        /// <summary>
+        /// 记录人名称
+        /// </summary>
+        public string recorder_name { get; set; }
+        /// <summary>
+        /// 人员数量
+        /// </summary>
+        public decimal staff_qty { get; set; }
+        /// <summary>
+        /// 损失时间（用户输入）
+        /// </summary>
+        public decimal loss_work_hours { get; set; }
+        /// <summary>
+        /// 系统计算损失时间
+        /// </summary>
+        public decimal sys_loss_time { get; set; }
+        /// <summary>
+        /// 工作中心id
+        /// </summary>
+        public long workc_id { get; set; }
+        /// <summary>
+        /// 工作中心名称
+        /// </summary>
+        public string workc_name { get; set; }
+        /// <summary>
+        /// 责任单位id
+        /// </summary>
+        public long dept_id { get; set; }
+        /// <summary>
+        /// 责任单位名称
+        /// </summary>
+        public string dept_name { get; set; }
+        /// <summary>
+        /// 损失时间原因
+        /// </summary>
+        public string reason { get; set; }
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string description { get; set; }
+        /// <summary>
+        /// 是否停产（0未停产，1停产）
+        /// </summary>
+        public int is_stop_production { get; set; }
+        /// <summary>
+        /// 用工卡号
+        /// </summary>
+        public string card_no { get; set; }
+        
+    }
+}

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; } 
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_loss_time_record.cs

@@ -0,0 +1,82 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 损失时间记录表
+    /// </summary>
+    public class mes_loss_time_record : BaseEntity
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        [Key]
+        public long loss_time_record_id { get; set; }
+        /// <summary>
+        /// 工单id
+        /// </summary>
+
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 损失开始时间
+        /// </summary>
+
+        public DateTime start_time { get; set; }
+        /// <summary>
+        /// 损失结束时间
+        /// </summary>
+
+        public DateTime end_time { get; set; }
+        /// <summary>
+        /// 生产车间
+        /// </summary>
+
+        public long product_org { get; set; }
+        /// <summary>
+        /// 生产产线
+        /// </summary>
+
+        public long product_line { get; set; }
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+
+        public DateTime record_time { get; set; }
+        /// <summary>
+        /// 记录人id
+        /// </summary>
+
+        public long record_id { get; set; }
+        /// <summary>
+        /// 记录人工号
+        /// </summary>
+
+        public string record_no { get; set; }
+        /// <summary>
+        /// 是否停线
+        /// </summary>
+
+        public int isstop { get; set; }
+        /// <summary>
+        /// 原因
+        /// </summary>
+
+        public string cause { get; set; }
+        /// <summary>
+        /// 问题描述
+        /// </summary>
+
+        public string desc { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_meaction.cs

@@ -0,0 +1,50 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 生产动作表
+    /// </summary>
+    public class mes_meaction : BaseEntity
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Key]
+        public long meaction_id { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime oprtime { get; set; }
+        /// <summary>
+        /// 操作类型
+        /// </summary>
+        public string oprtype { get; set; }
+        /// <summary>
+        /// 操作人id
+        /// </summary>
+        public long oprby { get; set; }
+        /// <summary>
+        /// 操作人名称
+        /// </summary>
+        public string oprbyname { get; set; }
+        /// <summary>
+        /// 操作人工号
+        /// </summary>
+        public string oprbyno { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mebycard.cs

@@ -0,0 +1,50 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 产线刷卡记录
+    /// </summary>
+    public class mes_mebycard : BaseEntity
+    {
+        /// <summary>
+        /// 刷卡id
+        /// </summary>
+        [Key]
+        public long mebycard_id { get; set; }
+        /// <summary>
+        /// 生产工单号id
+        /// </summary>
+        public long mebycard_moid { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string mebycard_mono { get; set; }
+        /// <summary>
+        /// 工序id
+        /// </summary>
+        public long mebycard_pid { get; set; }
+        /// <summary>
+        /// 工序编码
+        /// </summary>
+        public string mebycard_pno { get; set; }
+        /// <summary>
+        /// 工序名称
+        /// </summary>
+        public string mebycard_pname { get; set; }
+        /// <summary>
+        /// 刷卡人员卡号
+        /// </summary>
+        public string mebycard_byno { get; set; }
+        /// <summary>
+        /// 刷卡时间
+        /// </summary>
+        public DateTime mebycard_time { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_merecheck.cs

@@ -0,0 +1,42 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 生产报检记录表
+    /// </summary>
+    public class mes_merecheck : BaseEntity
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Key]
+        public long merecheck_id { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 报检数量
+        /// </summary>
+        public decimal qty { get; set; }
+        /// <summary>
+        /// 报检时间
+        /// </summary>
+        public DateTime oprtime { get; set; }
+        /// <summary>
+        /// 报检人id
+        /// </summary>
+        public long oprby { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mereport.cs

@@ -0,0 +1,51 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 生产报工记录表
+    /// </summary>
+    public class mes_mereport :BaseEntity
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        [Key]
+        public long mereport_id { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 报工数量
+        /// </summary>
+        public decimal qty { get; set; }
+        /// <summary>
+        /// 报工时间
+        /// </summary>
+        public DateTime report_time { get; set; }
+        /// <summary>
+        /// 报工人id
+        /// </summary>
+        public long report_by { get; set; }
+        /// <summary>
+        /// 报工人工号
+        /// </summary>
+        public string report_byno { get; set; }
+        /// <summary>
+        /// 已报数量
+        /// </summary>
+        public decimal instock_qty { get; set; }
+
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prd_sendmat.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    public class mes_prd_sendmat
+    {
+        /// <summary>
+        /// 发料单id
+        /// </summary>
+        [Key]
+        public long prdsm_id { get; set; }
+        /// <summary>
+        /// 单据类型 (发料、叫料、补料、退料)
+        /// </summary>
+        public string prdsm_type { get; set; }
+        /// <summary>
+        /// 单据编号
+        /// </summary>
+        public string prdsm_no { get; set; }
+        /// <summary>
+        /// 单据日期
+        /// </summary>
+        public DateTime prdsm_date { get; set; }
+        /// <summary>
+        /// 生产组织id
+        /// </summary>
+        public long prdsm_prdid { get; set; }
+        /// <summary>
+        /// 工作中心id
+        /// </summary>
+        public long prdsm_workcid { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long prdsm_moid { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string prdsm_mono { get; set; }
+        /// <summary>
+        /// 制单人
+        /// </summary>
+        public string prdsm_by { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string prdsm_note { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int prdsm_state { get; set; }
+        /// <summary>
+        /// 补料理由
+        /// </summary>
+        public string prdsm_reason { get; set; }
+        /// <summary>
+        /// 退料原因
+        /// </summary>
+        //public string prdsm_breason { get; set; }
+        /// <summary>
+        /// 叫料数量
+        /// </summary>
+        public decimal prdsm_qty { get; set; }
+        /// <summary>
+        /// 配送日期
+        /// </summary>
+        public DateTime prdsm_ddate { get; set; }
+        /// <summary>
+        /// 关联委外po单号
+        /// </summary>
+        public string prdsm_po_no { get; set; }
+        /// <summary>
+        /// 关联委外po行号
+        /// </summary>
+        public int prdsm_po_row { get; set; }
+        /// <summary>
+        /// 原单类型  0 生产工单  1 委外工单
+        /// </summary>
+        public int srcbill_type { get; set; }
+        /// <summary>
+        /// 源单状态  0 初始   1 下达 2 开始往金蝶推
+        /// </summary>
+        public int srcbill_state { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prd_sendmat_list.cs

@@ -0,0 +1,122 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 发料单详情
+    /// </summary>
+    public class mes_prd_sendmat_list :BaseEntity
+    {
+        /// <summary>
+        /// 发料单详情id
+        /// </summary>
+        [Key]
+        public long prdsml_id { get; set; }
+        /// <summary>
+        /// 发料单id
+        /// </summary>
+        public long prdsm_id { get; set; }
+        /// <summary>
+        /// 工序编码
+        /// </summary>
+        public string prdsml_procno { get; set; }
+        /// <summary>
+        /// 工序名称
+        /// </summary>
+        public string prdsml_procname { 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>
+        /// 单位数量
+        /// </summary>
+        public decimal prdsml_qtyper { get; set; }
+        /// <summary>
+        /// 确认单位数量
+        /// </summary>
+        public decimal prdsml_cqtyper { get; set; }
+        /// <summary>
+        /// 计量单位
+        /// </summary>
+        public string prdsml_unit { get; set; }
+        /// <summary>
+        /// 应发数量
+        /// </summary>
+        public decimal prdsml_qtyto { get; set; }
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+        public decimal prdsml_qtyplan { get; set; }
+        /// <summary>
+        /// 已发数量
+        /// </summary>
+        public decimal prdsml_qtyissued { get; set; }
+        /// <summary>
+        /// 发料仓库id
+        /// </summary>
+        public long prdsml_whid { get; set; }
+        /// <summary>
+        /// 发料仓库编码
+        /// </summary>
+        public string prdsml_whno { get; set; }
+        /// <summary>
+        /// 发料仓库名称
+        /// </summary>
+        public string prdsml_whname { get; set; }
+        /// <summary>
+        /// 退料原因
+        /// </summary>
+        public string prdsm_breason { get; set; }
+        /// <summary>
+        /// 是否倒冲 （0-否，1-是）
+        /// </summary>
+        public int fbackflush { get; set; }
+        /// <summary>
+        /// 行号
+        /// </summary>
+        public int prsml_row { get; set; }
+        /// <summary>
+        /// 子项属性
+        /// </summary>
+        public string fmateriel_type { get; set; }
+        /// <summary>
+        /// 关键件
+        /// </summary>
+        public string fisKey_item { get; set; }
+        /// <summary>
+        /// 计划发料日期
+        /// </summary>
+        public DateTime send_date { get; set; }
+        /// <summary>
+        /// 工位
+        /// </summary>
+        public string station { get; set; }
+        /// <summary>
+        /// 报废数量
+        /// </summary>
+        public decimal fdiscard_aux_qty { get; set; }
+        /// <summary>
+        /// 补料数量
+        /// </summary>
+        public decimal fqty_supply { get; set; }
+        /// <summary>
+        /// 退料数量
+        /// </summary>
+        public decimal fqty_send_back { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_prdlog.cs

@@ -0,0 +1,52 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 生产操作日志
+    /// </summary>
+    public class mes_prdlog :BaseEntity
+    {
+        /// <summary>
+        /// 生产操作日志id
+        /// </summary>
+        [Key]
+        public long prdlog_id { get; set; }
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        public string prdlog_type { get; set; }
+        /// <summary>
+        /// 关联单号
+        /// </summary>
+        public string prdlog_no { get; set; }
+        /// <summary>
+        /// 行号
+        /// </summary>
+        public int prdlog_entryid { get; set; }
+        /// <summary>
+        /// 执行时间
+        /// </summary>
+        public DateTime prdlog_time { get; set; }
+        /// <summary>
+        /// 执行人id
+        /// </summary>
+        public long prdlog_by_id { get; set; }
+        /// <summary>
+        /// 执行人姓名
+        /// </summary>
+        public string prdlog_by_name { get; set; }
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string prdlog_note { get; set; }
+     
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_product_work_time.cs

@@ -0,0 +1,42 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// mo的生产时间记录
+    /// </summary>
+    public class mes_product_work_time : BaseEntity
+    {
+        /// <summary>
+        /// 生产时间记录id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime work_date { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime start { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime stop { get; set; }
+        /// <summary>
+        /// 卡号
+        /// </summary>
+        public string card_no { get; set; }
+        /// <summary>
+        /// 产线
+        /// </summary>
+        public string product_line { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_enter.cs

@@ -0,0 +1,58 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 入库单
+    /// </summary>
+    public class mes_stock_enter : BaseEntity
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string fitem_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string fitem_name { get; set; }
+        /// <summary>
+        /// 全名
+        /// </summary>
+        public string ffull_name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string fmodel { get; set; }
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        public string order_no { get; set; }
+        /// <summary>
+        /// 入库日期
+        /// </summary>
+        public DateTime edate { get; set; }
+        /// <summary>
+        /// 入库数量
+        /// </summary>
+        public int eqty { get; set; }
+        /// <summary>
+        /// 入库人id
+        /// </summary>
+        public long eby { get; set; }
+        /// <summary>
+        /// 入库人姓名
+        /// </summary>
+        public string ebyname { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_out.cs

@@ -0,0 +1,83 @@
+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.ProductionProcess
+{
+    /// <summary>
+    /// 出库单
+    /// </summary>
+    public class mes_stock_out : BaseEntity
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+
+        /// <summary>
+        /// 出库单号
+        /// </summary>
+        public string out_no { get; set; }
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string stock_name { get; set; }
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string stock_no { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string fitem_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string fitem_name { get; set; }
+        /// <summary>
+        /// 全名
+        /// </summary>
+        public string ffull_name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string fmodel { get; set; }
+        /// <summary>
+        /// 销售订单号
+        /// </summary>
+        public string order_no { get; set; }
+        /// <summary>
+        /// 订单行号
+        /// </summary>
+        public int order_number { get; set; }
+        /// <summary>
+        /// 发运通知单号
+        /// </summary>
+        public string shipn_no { get; set; }
+        /// <summary>
+        /// 出库日期
+        /// </summary>
+        public DateTime edate { get; set; }
+        /// <summary>
+        /// 出库数量
+        /// </summary>
+        public int eqty { get; set; }
+        /// <summary>
+        /// 计量单位
+        /// </summary>
+        public string unit { get; set; }
+        /// <summary>
+        /// 出库人id
+        /// </summary>
+        public long eby { get; set; }
+        /// <summary>
+        /// 出库人姓名
+        /// </summary>
+        public string eby_name { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_swipe_card.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// mes打卡记录表
+    /// </summary>
+    public class mes_swipe_card
+    {
+        /// <summary>
+        /// mes打卡记录id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+        /// <summary>
+        /// 生产车间
+        /// </summary>
+
+        public string product_org { get; set; }
+        /// <summary>
+        /// 生产产线
+        /// </summary>
+
+        public string product_line { get; set; }
+        /// <summary>
+        /// 卡号
+        /// </summary>
+
+        public string card_no { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+
+        public string order_no { get; set; }
+        /// <summary>
+        /// 上线时间
+        /// </summary>
+
+        public DateTime up_line_time { get; set; }
+        /// <summary>
+        /// 下线时间
+        /// </summary>
+
+        public DateTime off_line_time { get; set; }
+        /// <summary>
+        /// 刷卡类型  1 白班 ，2 晚班
+        /// </summary>
+
+        public int type { get; set; }
+        /// <summary>
+        /// 刷卡日期
+        /// </summary>
+
+        public DateTime swipe_date { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_process.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Tech
+{
+    /// <summary>
+    /// 工序表
+    /// </summary>
+    public class mes_process
+    {
+        /// <summary>
+        /// 工序主键
+        /// </summary>
+        [Key]
+        public long proc_id { get; set; }
+
+        /// <summary>
+        /// 工序名称
+        /// </summary>
+        [StringLength(100)]
+        public string proc_name { get; set; }
+
+        /// <summary>
+        /// 是否需要排产
+        /// </summary>
+        public int is_schedule { get; set; }
+
+        /// <summary>
+        /// 简述
+        /// </summary>
+        [StringLength(500)]
+        public string short_desc { get; set; }
+
+        /// <summary>
+        /// 详细描述
+        /// </summary>
+        [StringLength(2000)]
+        public string long_desc { get; set; }
+
+        /// <summary>
+        /// 组合工序id
+        /// </summary>
+        [StringLength(2000)]
+        public string subids { get; set; }
+
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_accessory.cs

@@ -0,0 +1,44 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Tech
+{
+    /// <summary>
+    /// 治具表(工装表)
+    /// </summary>
+    public class mes_tech_proc_accessory : BaseEntity
+    {
+        /// <summary>
+        /// 治具主键
+        /// </summary>
+        [Key]
+        public long tech_proc_acc_id { get; set; }
+
+        /// <summary>
+        /// 工艺工序主键
+        /// </summary>
+        public long tech_proc_id { get; set; }
+
+        /// <summary>
+        /// 工装id
+        /// </summary>
+        public long equip_id { get; set; }
+
+        /// <summary>
+        /// 工装编号
+        /// </summary>
+        [StringLength(100)]
+        public string equip_no { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public int qty { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_document.cs

@@ -0,0 +1,38 @@
+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.Tech
+{
+    /// <summary>
+    /// 工序作业指导书表
+    /// </summary>
+    public class mes_tech_proc_document : BaseEntity
+    {
+        /// <summary>
+        /// 工序作业指导书主键
+        /// </summary>
+        [Key]
+        public long tech_proc_doc_id { get; set; }
+
+        /// <summary>
+        /// 工艺工序主键
+        /// </summary>
+        public long tech_proc_id { get; set; }
+
+        /// <summary>
+        /// 作业指导书主键
+        /// </summary>
+        public long upload_id { get; set; }
+
+        /// <summary>
+        /// 作业指导书名称
+        /// </summary>
+        [StringLength(100)]
+        public string name { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop.cs

@@ -0,0 +1,37 @@
+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.Tech
+{
+    /// <summary>
+    /// 工艺路径关联工位表
+    /// </summary>
+    public class mes_tech_proc_workshop : BaseEntity
+    {
+        /// <summary>
+        /// 工位表主键
+        /// </summary>
+        [Key]
+        public long tech_proc_workshop_id { get; set; }
+
+        /// <summary>
+        /// 工艺工序id
+        /// </summary>
+        public long tech_proc_id { get; set; }
+
+        /// <summary>
+        /// 工位id
+        /// </summary>
+        public long workshop_id { get; set; }
+
+        /// <summary>
+        /// 序列号
+        /// </summary>
+        public int serialno { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_equipment.cs

@@ -0,0 +1,43 @@
+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.Tech
+{
+    /// <summary>
+    /// 工艺工位关联设备表
+    /// </summary>
+    public class mes_tech_proc_workshop_equipment : BaseEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Key]
+        public long tech_proc_workshop_equip_id { get; set; }
+
+        /// <summary>
+        /// 设备id
+        /// </summary>
+        public long equip_id { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        [StringLength(100)]
+        public string equip_name { get; set; }
+
+        /// <summary>
+        /// 工艺工位id
+        /// </summary>
+        public long tech_proc_workshop_id { get; set; }
+
+        /// <summary>
+        /// 工作日历id
+        /// </summary>
+        public long work_calendar_id { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_icitem.cs

@@ -0,0 +1,37 @@
+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.Tech
+{
+    /// <summary>
+    /// 发料到工位表
+    /// </summary>
+    public class mes_tech_proc_workshop_icitem : BaseEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Key]
+        public long tech_proc_workshop_icitem_id { get; set; }
+
+        /// <summary>
+        /// 工序工位id
+        /// </summary>
+        public long tech_proc_workshop_id { get; set; }
+
+        /// <summary>
+        /// 物料id
+        /// </summary>
+        public long icitem_id { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public int qty { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_staff.cs

@@ -0,0 +1,38 @@
+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.Tech
+{
+    /// <summary>
+    /// 工序工位员工信息表
+    /// </summary>
+    public class mes_tech_proc_workshop_staff : BaseEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Key]
+        public long tech_proc_workshop_equip_id { get; set; }
+
+        /// <summary>
+        /// 工艺工位id
+        /// </summary>
+        public long tech_proc_workshop_id { get; set; }
+
+        /// <summary>
+        /// 员工id
+        /// </summary>
+        public long staff_id { get; set; }
+
+        /// <summary>
+        /// 员工姓名
+        /// </summary>
+        [StringLength(100)]
+        public string staff_name { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs

@@ -0,0 +1,89 @@
+using Business.EntityFrameworkCore;
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Security.AccessControl;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Tech
+{
+    /// <summary>
+    /// 工艺关联工序表
+    /// </summary>
+    public class mes_tech_process:BaseEntity
+    {
+        /// <summary>
+        /// 工艺工序主键
+        /// </summary>
+        [Key]
+        public long tech_proc_id { get; set; }
+
+        /// <summary>
+        /// 工艺主键
+        /// </summary>
+        [Required]
+        public long tech_id { get; set; }
+
+        /// <summary>
+        /// 工序主键
+        /// </summary>
+        [Required]
+        public long proc_id { get; set; }
+
+        /// <summary>
+        /// 组合层级
+        /// </summary>
+        public int level { get; set; }
+
+        /// <summary>
+        /// 前置准备时间
+        /// </summary>
+        [DecimalPrecision(20,8)]
+        public decimal readytime { get; set; }
+
+        /// <summary>
+        /// 效率计算类型 1-节拍时间；2-UPH
+        /// </summary>
+        public int type { get; set; }
+
+        /// <summary>
+        /// UPH
+        /// </summary>
+        [DecimalPrecision(20, 8)]
+        public decimal uph { get; set; }
+
+        /// <summary>
+        /// 节拍时间
+        /// </summary>
+        [DecimalPrecision(20, 8)]
+        public decimal ct { get; set; }
+
+        /// <summary>
+        /// 是否需要跟踪工序
+        /// </summary>
+        public int mototrack { get; set; }
+
+        /// <summary>
+        /// 下一工序id
+        /// </summary>
+        public long nextprocid { get; set; }
+
+        /// <summary>
+        /// 父级工序id
+        /// </summary>
+        public long parentprocid { get; set; }
+
+        /// <summary>
+        /// 是否需要质检
+        /// </summary>
+        public int needqc { get; set; }
+
+        /// <summary>
+        /// 最大并行工位数
+        /// </summary>
+        public int maxworkshop { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs

@@ -0,0 +1,53 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Tech
+{
+    /// <summary>
+    /// 工艺路径表
+    /// </summary>
+    public class mes_technique : BaseEntity
+    {
+        /// <summary>
+        /// 工艺路径主键
+        /// </summary>
+        [Key]
+        public long tech_id { get; set; }
+
+        /// <summary>
+        /// 工艺路径名称
+        /// </summary>
+        [Required]
+        [StringLength(100)]
+        public string tech_name { get; set; }
+
+        /// <summary>
+        /// 效率计算层级
+        /// </summary>
+        public int level { get; set; }
+
+        /// <summary>
+        /// 产品
+        /// </summary>
+        [StringLength(100)]
+        public string bom { get; set; }
+
+        /// <summary>
+        /// 产品版本
+        /// </summary>
+        [StringLength(100)]
+        public string bomver { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        [StringLength(100)]
+        public string desc { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_workshop.cs

@@ -0,0 +1,64 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Tech
+{
+    /// <summary>
+    /// 工位表(工作中心)
+    /// </summary>
+    public class mes_workshop : BaseEntity
+    {
+        /// <summary>
+        /// 工位表主键
+        /// </summary>
+        [Key]
+        public long workshop_id { get; set; }
+
+        /// <summary>
+        /// 工位名称
+        /// </summary>
+        [StringLength(100)]
+        public string name { get; set; }
+
+        /// <summary>
+        /// 组合工位ids
+        /// </summary>
+        [StringLength(2000)]
+        public string subids { get; set; }
+
+        /// <summary>
+        /// 坐标
+        /// </summary>
+        [StringLength(100)]
+        public string geoinfo { get; set; }
+
+        /// <summary>
+        /// 楼栋
+        /// </summary>
+        [StringLength(100)]
+        public string building { get; set; }
+
+        /// <summary>
+        /// 楼层
+        /// </summary>
+        [StringLength(100)]
+        public string floor { get; set; }
+
+        /// <summary>
+        /// 区域
+        /// </summary>
+        [StringLength(100)]
+        public string zone { get; set; }
+
+        /// <summary>
+        /// 工作日历id
+        /// </summary>
+        public long work_calendar_id { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/mes_workshop_shelf.cs

@@ -0,0 +1,44 @@
+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.Tech
+{
+    /// <summary>
+    /// 工位关联线边仓表
+    /// </summary>
+    public class mes_workshop_shelf : BaseEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Key]
+        public long workshop_shelf_id { get; set; }
+
+        /// <summary>
+        /// 工位id
+        /// </summary>
+        public long workshop_id { get; set; }
+
+        /// <summary>
+        /// 线边仓序列号
+        /// </summary>
+        public int serialno { get; set; }
+
+        /// <summary>
+        /// 仓库编号
+        /// </summary>
+        [StringLength(100)]
+        public string sheifno { get; set; }
+
+        /// <summary>
+        /// 坐标
+        /// </summary>
+        [StringLength(100)]
+        public string geoinfo { get; set; }
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/work_calendar.cs

@@ -0,0 +1,102 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.Tech
+{
+    /// <summary>
+    /// 工作日历
+    /// </summary>
+    public class work_calendar : BaseEntity
+    {
+        /// <summary>
+        /// 工作日历主键
+        /// </summary>
+        [Key]
+        public long work_calendar_id { get; set; }
+
+        /// <summary>
+        /// 工作日历编码
+        /// </summary>
+        [StringLength(100)]
+        public string work_calendar_no { get; set; }
+
+        /// <summary>
+        /// 工作日历名称
+        /// </summary>
+        [StringLength(100)]
+        public string work_calendar_name { get; set; }
+
+        /// <summary>
+        /// 班制id
+        /// </summary>
+        public long shift_id { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime start_time { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime end_time { get; set; }
+
+        /// <summary>
+        /// 标准周期
+        /// </summary>
+        public int standard_period { get; set; }
+
+        /// <summary>
+        /// 工作周期
+        /// </summary>
+        public int work_period { get; set; }
+
+        /// <summary>
+        /// 休息周期
+        /// </summary>
+        public int rest_period { get; set; }
+
+        /// <summary>
+        /// 周1
+        /// </summary>
+        public int calendar1 { get; set; }
+
+        /// <summary>
+        /// 周2
+        /// </summary>
+        public int calendar2 { get; set; }
+
+        /// <summary>
+        /// 周3
+        /// </summary>
+        public int calendar3 { get; set; }
+
+        /// <summary>
+        /// 周4
+        /// </summary>
+        public int calendar4 { get; set; }
+
+        /// <summary>
+        /// 周5
+        /// </summary>
+        public int calendar5 { get; set; }
+
+        /// <summary>
+        /// 周6
+        /// </summary>
+        public int calendar6 { get; set; }
+
+        /// <summary>
+        /// 周7
+        /// </summary>
+        public int calendar7 { get; set; }
+
+
+    }
+}

MicroServices/Business/Bussiness.Model/Tech/work_calendar_list.cs

@@ -0,0 +1,47 @@
+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.Tech
+{
+    /// <summary>
+    /// 工作日历明细表
+    /// </summary>
+    public class work_calendar_list : BaseEntity
+    {
+        /// <summary>
+        /// 工作日历明细主键
+        /// </summary>
+        [Key]
+        public long work_cal_list_id { get; set; }
+
+        /// <summary>
+        /// 工作日历id
+        /// </summary>
+        public long work_calendar_id { get; set; }
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime work_cal_list_date { get; set; }
+
+        /// <summary>
+        /// 类型:1-工作日;0-休息日
+        /// </summary>
+        public int work_cal_list_type { get; set; }
+
+        /// <summary>
+        /// 工作时长(分钟)
+        /// </summary>
+        public int work_cal_list_times { get; set; }
+
+        /// <summary>
+        /// 班次数
+        /// </summary>
+        public int work_cal_list_num { get; set; }
+    }
+}