From c595a7fe291b78753fb97ac64938b3ca995b5f2d Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 02 9月 2025 15:09:25 +0800 Subject: [PATCH] 122 --- wcs/yunneiWCS/yunneiWCS/ORM/System_TianYongEmptyBackLog.cs | 2 - wcs/yunneiWCS/yunneiWCS/ORM/taskRecord.cs | 1 wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs | 2 - wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj | 4 +- wcs/yunneiWCS/yunneiWCS/ORM/dbmodel.cs | 73 ++++++++++++++++++------------------ wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_Details_V2_Mes.cs | 7 +-- 6 files changed, 41 insertions(+), 48 deletions(-) diff --git a/wcs/yunneiWCS/yunneiWCS/ORM/System_TianYongEmptyBackLog.cs b/wcs/yunneiWCS/yunneiWCS/ORM/System_TianYongEmptyBackLog.cs index 343b2f8..1eab5a9 100644 --- a/wcs/yunneiWCS/yunneiWCS/ORM/System_TianYongEmptyBackLog.cs +++ b/wcs/yunneiWCS/yunneiWCS/ORM/System_TianYongEmptyBackLog.cs @@ -17,10 +17,8 @@ [StringLength(50)] public string isMoveEmptyByHand { get; set; } - [StringLength(2000)] public string dataList { get; set; } - [StringLength(2000)] public string jsonStr { get; set; } [StringLength(128)] diff --git a/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_Details_V2_Mes.cs b/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_Details_V2_Mes.cs index a740412..2fc2f06 100644 --- a/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_Details_V2_Mes.cs +++ b/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_Details_V2_Mes.cs @@ -6,7 +6,6 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Data.Entity.Spatial; - [Table("Wms_outInStockRecord_Details_V2_Mes")] public partial class Wms_outInStockRecord_Details_V2_Mes { [DatabaseGenerated(DatabaseGeneratedOption.None)] @@ -17,13 +16,13 @@ [StringLength(100)] public string containerCode { get; set; } - [StringLength(50)] + [StringLength(100)] public string productCode { get; set; } - [StringLength(50)] + [StringLength(100)] public string productName { get; set; } - [StringLength(50)] + [StringLength(100)] public string serialNumber { get; set; } [StringLength(128)] diff --git a/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs b/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs index ec1041e..bca15ab 100644 --- a/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs +++ b/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs @@ -27,11 +27,9 @@ [StringLength(128)] public string taskName { get; set; } - [StringLength(128)] public string sourcePlace { get; set; } - [StringLength(128)] public string toPlace { get; set; } diff --git a/wcs/yunneiWCS/yunneiWCS/ORM/dbmodel.cs b/wcs/yunneiWCS/yunneiWCS/ORM/dbmodel.cs index 735ac14..5935d54 100644 --- a/wcs/yunneiWCS/yunneiWCS/ORM/dbmodel.cs +++ b/wcs/yunneiWCS/yunneiWCS/ORM/dbmodel.cs @@ -1,10 +1,10 @@ -锘縩amespace yunneiWCS.ORM -{ - using System; - using System.Data.Entity; - using System.ComponentModel.DataAnnotations.Schema; - using System.Linq; +using System; +using System.ComponentModel.DataAnnotations.Schema; +using System.Data.Entity; +using System.Linq; +namespace yunneiWCS.ORM +{ public partial class dbmodel : DbContext { public dbmodel() @@ -33,45 +33,16 @@ public virtual DbSet<user> user { get; set; } public virtual DbSet<userVsRole> userVsRole { get; set; } public virtual DbSet<Wms_outInStockRecord> Wms_outInStockRecord { get; set; } + public virtual DbSet<Wms_outInStockRecord_Details_V2_Mes> Wms_outInStockRecord_Details_V2_Mes { get; set; } + public virtual DbSet<Wms_outInStockRecord_V2_Mes> Wms_outInStockRecord_V2_Mes { get; set; } public virtual DbSet<outInStockRecord> outInStockRecord { get; set; } public virtual DbSet<userAndRole> userAndRole { get; set; } public virtual DbSet<v_inStockOrder> v_inStockOrder { get; set; } public virtual DbSet<v_outStockList> v_outStockList { get; set; } public virtual DbSet<VproductStock> VproductStock { get; set; } - public virtual DbSet<Wms_outInStockRecord_V2_Mes> Wms_outInStockRecord_V2_Mes { get; set; } - - public virtual DbSet<Wms_outInStockRecord_Details_V2_Mes> Wms_outInStockRecord_Details_V2_Mes { get; set; } - protected override void OnModelCreating(DbModelBuilder modelBuilder) { - modelBuilder.Entity<Wms_outInStockRecord_Details_V2_Mes>() - .Property(e => e.productCode) - .IsUnicode(false); - - modelBuilder.Entity<Wms_outInStockRecord_Details_V2_Mes>() - .Property(e => e.Creator) - .IsUnicode(false); - - modelBuilder.Entity<Wms_outInStockRecord_Details_V2_Mes>() - .Property(e => e.LastModifier) - .IsUnicode(false); - - modelBuilder.Entity<Wms_outInStockRecord_V2_Mes>() - .Property(e => e.outInFlagName) - .IsUnicode(false); - - modelBuilder.Entity<Wms_outInStockRecord_V2_Mes>() - .Property(e => e.materialCode) - .IsUnicode(false); - - modelBuilder.Entity<Wms_outInStockRecord_V2_Mes>() - .Property(e => e.Creator) - .IsUnicode(false); - - modelBuilder.Entity<Wms_outInStockRecord_V2_Mes>() - .Property(e => e.LastModifier) - .IsUnicode(false); modelBuilder.Entity<BasicDataSet>() .Property(e => e.BasicDataType) .IsFixedLength() @@ -353,6 +324,34 @@ .Property(e => e.LastModifier) .IsUnicode(false); + modelBuilder.Entity<Wms_outInStockRecord_Details_V2_Mes>() + .Property(e => e.productCode) + .IsUnicode(false); + + modelBuilder.Entity<Wms_outInStockRecord_Details_V2_Mes>() + .Property(e => e.Creator) + .IsUnicode(false); + + modelBuilder.Entity<Wms_outInStockRecord_Details_V2_Mes>() + .Property(e => e.LastModifier) + .IsUnicode(false); + + modelBuilder.Entity<Wms_outInStockRecord_V2_Mes>() + .Property(e => e.outInFlagName) + .IsUnicode(false); + + modelBuilder.Entity<Wms_outInStockRecord_V2_Mes>() + .Property(e => e.materialCode) + .IsUnicode(false); + + modelBuilder.Entity<Wms_outInStockRecord_V2_Mes>() + .Property(e => e.Creator) + .IsUnicode(false); + + modelBuilder.Entity<Wms_outInStockRecord_V2_Mes>() + .Property(e => e.LastModifier) + .IsUnicode(false); + modelBuilder.Entity<outInStockRecord>() .Property(e => e.taskName) .IsUnicode(false); diff --git a/wcs/yunneiWCS/yunneiWCS/ORM/taskRecord.cs b/wcs/yunneiWCS/yunneiWCS/ORM/taskRecord.cs index c562bce..8485053 100644 --- a/wcs/yunneiWCS/yunneiWCS/ORM/taskRecord.cs +++ b/wcs/yunneiWCS/yunneiWCS/ORM/taskRecord.cs @@ -25,7 +25,6 @@ public DateTime? createTime { get; set; } - [StringLength(100)] public string PlcTaskNo { get; set; } diff --git a/wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj b/wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj index 260fb7c..79c8606 100644 --- a/wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj +++ b/wcs/yunneiWCS/yunneiWCS/yunneiWCS.csproj @@ -118,8 +118,6 @@ <Compile Include="ORM\BasicDataSet.cs" /> <Compile Include="ORM\dbmodel.cs" /> <Compile Include="ORM\inStockOrder.cs" /> - <Compile Include="ORM\Wms_outInStockRecord_V2_Mes.cs" /> - <Compile Include="ORM\Wms_outInStockRecord_Details_V2_Mes.cs" /> <Compile Include="ORM\inStockOrderList.cs" /> <Compile Include="ORM\material.cs" /> <Compile Include="ORM\module.cs" /> @@ -144,6 +142,8 @@ <Compile Include="ORM\v_inStockOrder.cs" /> <Compile Include="ORM\v_outStockList.cs" /> <Compile Include="ORM\Wms_outInStockRecord.cs" /> + <Compile Include="ORM\Wms_outInStockRecord_Details_V2_Mes.cs" /> + <Compile Include="ORM\Wms_outInStockRecord_V2_Mes.cs" /> <Compile Include="PLC\Srm\srmEnum\srmTaskExcute.cs" /> <Compile Include="PLC\Srm\srmEnum\srmStatus.cs" /> <Compile Include="PLC\Trans\convDBS.cs" /> -- Gitblit v1.9.3