diff --git a/src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs b/src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs
new file mode 100644
index 0000000..e2e0ab1
--- /dev/null
+++ b/src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Khd.Core.Domain.Models
+{
+ [Table("mes_base_unit_info")]
+ public class MesBaseUnitInfo
+ {
+ ///
+ /// 主键标识
+ ///
+ [Key]
+ [Column("unit_id")]
+ public long UnitId { get; set; }
+
+ ///
+ /// 供应商编号;对应FNumber
+ ///
+ [Column("unit_code")]
+ public string UnitCode { get; set; }
+
+ ///
+ /// 供应商名称;对应FName
+ ///
+ [Column("unit_name")]
+ public string UnitName { get; set; }
+
+ ///
+ /// erp的主键;对应FUnitId
+ ///
+ [Column("erp_id")]
+ public long? ErpId { get; set; }
+
+ ///
+ /// 单位状态：1-启用；0-停用
+ ///
+ [Column("unit_status")]
+ public string UnitStatus { get; set; } = "1";
+
+ ///
+ /// 备注
+ ///
+ [Column("remark")]
+ public string Remark { get; set; }
+
+ ///
+ /// 创建人
+ ///
+ [Column("create_by")]
+ public string CreateBy { get; set; }
+
+ ///
+ /// 创建时间;对应FCreateDate
+ ///
+ [Column("create_time")]
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 更新人
+ ///
+ [Column("update_by")]
+ public string UpdateBy { get; set; }
+
+ ///
+ /// 更新时间
+ ///
+ [Column("update_time")]
+ public DateTime? UpdateTime { get; set; }
+
+ ///
+ /// 审核日期;对应FAuditDate
+ ///
+ [Column("audit_date")]
+ public DateTime? AuditDate { get; set; }
+
+ ///
+ /// erp最后更新时间;对应FModifyDate
+ ///
+ [Column("erp_modify_date")]
+ public DateTime? ErpModifyDate { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Khd.Core.EntityFramework/DefaultDbContext.cs b/src/Khd.Core.EntityFramework/DefaultDbContext.cs
index 8414db6..fd1ec7a 100644
--- a/src/Khd.Core.EntityFramework/DefaultDbContext.cs
+++ b/src/Khd.Core.EntityFramework/DefaultDbContext.cs
@@ -31,7 +31,7 @@ namespace Khd.Core.EntityFramework
public DbSet BasePlcpoint { get; set; }
public DbSet BasePlc { get; set; }
-
+
public DbSet MesBasePalletInfo { get; set; }
public DbSet MesSaleOrderRelate { get; set; }
@@ -95,5 +95,7 @@ namespace Khd.Core.EntityFramework
public DbSet DmsRecordAlarmInfo { get; set; }
public DbSet DmsRecordAlarmTime { get; set; }
+
+ public DbSet MesBaseUnitInfo { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 59b145d..a43a03a 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Khd.Core.Wpf.myConverter"
xmlns:pg="clr-namespace:Khd.Core.Wpf.CSS"
- mc:Ignorable="d"
+ mc:Ignorable="d"
WindowStyle="None"
Closing="Window_Closing"
WindowStartupLocation="CenterOwner"
@@ -14,26 +14,21 @@
Title="FormBoardT"
Loaded="FormBoard_Loaded"
Width="1920"
- Height="1080"
- >
+ Height="1080">
-
-
-
-
+
-
-
-
-
+
+
+
-
+
@@ -88,8 +82,8 @@
-
-
+
+
@@ -109,24 +103,24 @@
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-