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

# Conflicts:
#	MicroServices/Business/Bussiness.Model/Bussiness.Model.csproj

.gitignore

@@ -199,3 +199,10 @@ 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.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/Bussiness.Model/Bussiness.Model.csproj

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

@@ -12,30 +12,21 @@ namespace Bussiness.Model.Tech
     /// <summary>
     /// 工艺路径表
     /// </summary>
-    public class mes_technique:BaseEntity   
+    public class mes_technique : BaseEntity
     {
         /// <summary>
         /// 工艺路径主键
         /// </summary>
-        [Required]
+        [Key]
         public long tech_id { get; set; }
 
         /// <summary>
         /// 工艺路径名称
         /// </summary>
         [Required]
+        [StringLength(100)]
         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>
@@ -44,16 +35,19 @@ namespace Bussiness.Model.Tech
         /// <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; }
+    }
+}