diff --git a/MESClassLibrary/EFModel/BBMPT.Context.cs b/MESClassLibrary/EFModel/BBMPT.Context.cs index a9bd629..68eac0e 100644 --- a/MESClassLibrary/EFModel/BBMPT.Context.cs +++ b/MESClassLibrary/EFModel/BBMPT.Context.cs @@ -185,5 +185,14 @@ namespace MESClassLibrary.EFModel public virtual DbSet test1 { get; set; } public virtual DbSet View_1 { get; set; } public virtual DbSet tb_ForeignColorMap { get; set; } + public virtual DbSet t_XD_BarCode { get; set; } + public virtual DbSet t_XD_BarCodeState { get; set; } + public virtual DbSet t_XD_CarModel { get; set; } + public virtual DbSet t_XD_Color { get; set; } + public virtual DbSet t_XD_Product { get; set; } + public virtual DbSet t_XD_User { get; set; } + public virtual DbSet W_XD_ProductCustomer { get; set; } + public virtual DbSet t_XD_ProductType { get; set; } + public virtual DbSet W_XD_Product_del { get; set; } } } diff --git a/MESClassLibrary/EFModel/BBMPT.edmx b/MESClassLibrary/EFModel/BBMPT.edmx index dfdefba..f34fb80 100644 --- a/MESClassLibrary/EFModel/BBMPT.edmx +++ b/MESClassLibrary/EFModel/BBMPT.edmx @@ -142,6 +142,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1059,6 +1198,8 @@ + + @@ -2311,6 +2452,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2347,6 +2561,12 @@ + + + + + + @@ -2457,6 +2677,7 @@ + SELECT [T_Sys_RoleLinkPower].[RoleID] AS [RoleID], @@ -2464,6 +2685,13 @@ [T_Sys_RoleLinkPower].[OpTime] AS [OpTime], [T_Sys_RoleLinkPower].[OpName] AS [OpName] FROM [dbo].[T_Sys_RoleLinkPower] AS [T_Sys_RoleLinkPower] + + + SELECT + [t_XD_ProductType].[ID] AS [ID], + [t_XD_ProductType].[Code] AS [Code], + [t_XD_ProductType].[Name] AS [Name] + FROM [dbo].[t_XD_ProductType] AS [t_XD_ProductType] SELECT @@ -3049,6 +3277,56 @@ [test1].[ProductDate] AS [ProductDate], [test1].[ClassName] AS [ClassName] FROM [dbo].[test1] AS [test1] + + + SELECT + [W_XD_Product_del].[ID] AS [ID], + [W_XD_Product_del].[Code] AS [Code], + [W_XD_Product_del].[Name] AS [Name], + [W_XD_Product_del].[TypeCode] AS [TypeCode], + [W_XD_Product_del].[Model] AS [Model], + [W_XD_Product_del].[UnitCode] AS [UnitCode], + [W_XD_Product_del].[CarModelCode] AS [CarModelCode], + [W_XD_Product_del].[ColorCode] AS [ColorCode], + [W_XD_Product_del].[PullQty] AS [PullQty], + [W_XD_Product_del].[MinQty] AS [MinQty], + [W_XD_Product_del].[MaxQty] AS [MaxQty], + [W_XD_Product_del].[SafeQty] AS [SafeQty], + [W_XD_Product_del].[StockQty] AS [StockQty], + [W_XD_Product_del].[StockAreaCode] AS [StockAreaCode], + [W_XD_Product_del].[IsPackage] AS [IsPackage], + [W_XD_Product_del].[IsMix] AS [IsMix], + [W_XD_Product_del].[IsMixType] AS [IsMixType], + [W_XD_Product_del].[ProjectNumber] AS [ProjectNumber], + [W_XD_Product_del].[ProjectName] AS [ProjectName], + [W_XD_Product_del].[PCode] AS [PCode], + [W_XD_Product_del].[Layer1] AS [Layer1], + [W_XD_Product_del].[Layer2] AS [Layer2], + [W_XD_Product_del].[ShelfCode1] AS [ShelfCode1], + [W_XD_Product_del].[ShelfCode2] AS [ShelfCode2], + [W_XD_Product_del].[QState] AS [QState], + [W_XD_Product_del].[SjCode] AS [SjCode], + [W_XD_Product_del].[LU1] AS [LU1], + [W_XD_Product_del].[LU2] AS [LU2], + [W_XD_Product_del].[LU3] AS [LU3], + [W_XD_Product_del].[LU4] AS [LU4], + [W_XD_Product_del].[LU5] AS [LU5], + [W_XD_Product_del].[LU6] AS [LU6], + [W_XD_Product_del].[LU7] AS [LU7], + [W_XD_Product_del].[LU8] AS [LU8], + [W_XD_Product_del].[LU9] AS [LU9], + [W_XD_Product_del].[LU10] AS [LU10], + [W_XD_Product_del].[ShipType] AS [ShipType], + [W_XD_Product_del].[PackageQty] AS [PackageQty], + [W_XD_Product_del].[PackageQtyTray] AS [PackageQtyTray], + [W_XD_Product_del].[StandardWeight1] AS [StandardWeight1], + [W_XD_Product_del].[StandardWeight2] AS [StandardWeight2], + [W_XD_Product_del].[Userdefined1] AS [Userdefined1], + [W_XD_Product_del].[Userdefined2] AS [Userdefined2], + [W_XD_Product_del].[Userdefined3] AS [Userdefined3], + [W_XD_Product_del].[Userdefined4] AS [Userdefined4], + [W_XD_Product_del].[Userdefined5] AS [Userdefined5] + FROM [dbo].[W_XD_Product_del] AS [W_XD_Product_del] SELECT @@ -3234,6 +3512,15 @@ + + + + + + + + + @@ -3917,6 +4204,8 @@ + + @@ -5489,6 +5778,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6210,6 +6711,8 @@ + + @@ -7886,6 +8389,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MESClassLibrary/EFModel/tb_InspectResult.cs b/MESClassLibrary/EFModel/tb_InspectResult.cs index 38789a2..c74eafa 100644 --- a/MESClassLibrary/EFModel/tb_InspectResult.cs +++ b/MESClassLibrary/EFModel/tb_InspectResult.cs @@ -32,5 +32,7 @@ namespace MESClassLibrary.EFModel public string remark2 { get; set; } public string remark3 { get; set; } public string CarType { get; set; } + public string AddMan { get; set; } + public string ForeignPartCode { get; set; } } } diff --git a/MESClassLibrary/MESClassLibrary.csproj b/MESClassLibrary/MESClassLibrary.csproj index 01edff5..10b5bde 100644 --- a/MESClassLibrary/MESClassLibrary.csproj +++ b/MESClassLibrary/MESClassLibrary.csproj @@ -254,6 +254,12 @@ True BBMPT.edmx + + BBMPT.tt + + + BBMPT.tt + BBMPT.tt @@ -731,9 +737,42 @@ BBMPT.tt + + BBMPT.tt + + + BBMPT.tt + + + BBMPT.tt + + + BBMPT.tt + + + BBMPT.tt + + + BBMPT.tt + + + BBMPT.tt + BBMPT.tt + + BBMPT.tt + + + BBMPT.tt + + + BBMPT.tt + + + BBMPT.tt + diff --git a/MESWebSite/MESWebSite.csproj b/MESWebSite/MESWebSite.csproj index ce9e35d..d4d2010 100644 --- a/MESWebSite/MESWebSite.csproj +++ b/MESWebSite/MESWebSite.csproj @@ -105,6 +105,9 @@ + + PreserveNewest + PreserveNewest diff --git a/MESWebSite/images/北汽模塑.gif b/MESWebSite/images/北汽模塑.gif new file mode 100644 index 0000000..e9692a1 Binary files /dev/null and b/MESWebSite/images/北汽模塑.gif differ diff --git a/MESWebSite/images/北汽模塑.png b/MESWebSite/images/北汽模塑.png index 4b40e6e..54e3304 100644 Binary files a/MESWebSite/images/北汽模塑.png and b/MESWebSite/images/北汽模塑.png differ diff --git a/PaintingPC/FrmLogin.cs b/PaintingPC/FrmLogin.cs index aff9324..422f2a3 100644 --- a/PaintingPC/FrmLogin.cs +++ b/PaintingPC/FrmLogin.cs @@ -182,13 +182,13 @@ namespace PaintingPC private void FrmLogin_Load(object sender, EventArgs e) { - var serverUrl = "http://10.60.101.59:8013/"; - var updateXmlFileName = "InjectionUpdate.xml"; - var updater = new AutoUpdater(); - if (updater.CheckUpdateLoad(serverUrl, updateXmlFileName)) - { - Environment.Exit(0); - } + //var serverUrl = "http://10.60.101.59:8013/"; + //var updateXmlFileName = "InjectionUpdate.xml"; + //var updater = new AutoUpdater(); + //if (updater.CheckUpdateLoad(serverUrl, updateXmlFileName)) + //{ + // Environment.Exit(0); + //} } }