heteng преди 3 години
родител
ревизия
579719035d

+ 9 - 0
.gitignore

@@ -190,3 +190,12 @@ 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

+ 24 - 7
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>

+ 1 - 5
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,10 +6,6 @@
     <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" />

+ 59 - 0
MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs

@@ -0,0 +1,59 @@
+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>
+        [Required]
+        public long tech_id { get; set; }
+
+        /// <summary>
+        /// 工艺路径名称
+        /// </summary>
+        [Required]
+        public string tech_name { get; set; }
+
+        /// <summary>
+        /// 效率计算类型 1-节拍时间;2-UPH
+        /// </summary>
+        public int type { get; set; }
+
+        /// <summary>
+        /// UPH
+        /// </summary>
+        public decimal uph { get; set; }
+
+        /// <summary>
+        /// 效率计算层级
+        /// </summary>
+        public int level { get; set; }
+
+        /// <summary>
+        /// 产品
+        /// </summary>
+        public string bom { get; set; }
+
+        /// <summary>
+        /// 产品版本
+        /// </summary>
+        public string bomver { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string desc { get; set; }
+    }
+}