diff --git a/InjectionPC/FrmLogin.cs b/InjectionPC/FrmLogin.cs index 5100926..5cc3b96 100644 --- a/InjectionPC/FrmLogin.cs +++ b/InjectionPC/FrmLogin.cs @@ -241,13 +241,13 @@ namespace InjectionPC 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); + //} } } diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs index e455b87..a591dfd 100644 --- a/InjectionPC/FrmMain2408.cs +++ b/InjectionPC/FrmMain2408.cs @@ -57,7 +57,7 @@ namespace InjectionPC private bool _isPrintPackage = true; private BarCodeBLL _barCodeBLL = new BarCodeBLL(); private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL(); - private DataTable tb_Plastic = new DataTable(); + //private DataTable tb_Plastic = new DataTable(); private string _currentStationID = string.Empty; private const string _leftType = "0"; //模具1 private const string _rightType = "1";//模具2 @@ -96,7 +96,7 @@ namespace InjectionPC try { _currentStationID = getStationID(Program.station); - tb_Plastic = GetPlastic(); + //tb_Plastic = GetPlastic(); Control.CheckForIllegalCrossThreadCalls = false; //this.WindowState = FormWindowState.Maximized; Thread t = new Thread(new ThreadStart(TimeGo)); @@ -174,7 +174,7 @@ namespace InjectionPC initPlan(); - InitPackageInfo(); + InitPackageInfo(true); #endregion @@ -258,6 +258,7 @@ namespace InjectionPC finally { _isLoad = true; + _isShowHintL = true; comBoxSizeL.SelectedValueChanged += comBoxSizeL_SelectedValueChanged; comBoxSizeR.SelectedValueChanged += comBoxSizeR_SelectedValueChanged; @@ -318,7 +319,7 @@ namespace InjectionPC { if (_lastParts.Contains(partNo[i].ToString().Trim()) == false) { - InitComboBoxSize(partNo[i].ToString().Trim(), i); + InitComboBoxSize(partNo[i].ToString().Trim(), i,""); //string currentSize = string.Empty; //List list = GetProductBoxSize(partNo[i].ToString().Trim(), ref currentSize); @@ -377,11 +378,14 @@ namespace InjectionPC LogErrBLL.AddInfo(ex.ToString(),MethodBase.GetCurrentMethod()); } } - void InitComboBoxSize(string partCode,int mould) + void InitComboBoxSize(string partCode,int mould,string fixedSize) { string currentSize = string.Empty; List list = GetProductBoxSize(partCode, ref currentSize); - + if (!string.IsNullOrEmpty(fixedSize)) + { + currentSize = fixedSize; + } if (mould == 0) { _isShowHintL = false; @@ -2663,10 +2667,8 @@ namespace InjectionPC string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(','); for (int i = 0; i < partNo.Length; i++) { - InitComboBoxSize(partNo[i], i); + InitComboBoxSize(partNo[i], i, ""); } - - } else { @@ -3319,20 +3321,45 @@ namespace InjectionPC return saveRst; } - - void InitPackageInfo() + /// + /// 初始加载箱码 + /// + /// 初始加载箱码后,是否需要加载 + void InitPackageInfo(bool needInitComboxSize = false) { DataTable dt0 = _injectionBoxBLL.SearchUnBox(Program.station, "0"); if (dt0.Rows.Count > 0) { lbPackageCodeL.Text = dt0.Rows[0]["BoxNo"].ToString(); lbCurrentlQtyL.Text = dt0.Rows[0]["BoxCount"].ToString(); + + if(needInitComboxSize == true && !string.IsNullOrEmpty(lbPackageCodeL.Text)) + { + string[] array = lbPackageCodeL.Text.Split('.'); + if (array.Length >0) + { + string standardQty = dt0.Rows[0]["StandardQty"].ToString(); + InitComboBoxSize(array[0].Trim(), 0, standardQty); + } + + } + } DataTable dt1 = _injectionBoxBLL.SearchUnBox(Program.station, "1"); if (dt1.Rows.Count > 0) { lbPackageCodeR.Text = dt1.Rows[0]["BoxNo"].ToString(); lbCurrentlQtyR.Text = dt1.Rows[0]["BoxCount"].ToString(); + + if (needInitComboxSize == true && !string.IsNullOrEmpty(lbPackageCodeR.Text)) + { + string[] array = lbPackageCodeR.Text.Split('.'); + if (array.Length > 0) + { + string standardQty = dt1.Rows[0]["StandardQty"].ToString(); + InitComboBoxSize(array[0].Trim(), 1, standardQty); + } + } } } diff --git a/InjectionPC/FrmMain2411.cs b/InjectionPC/FrmMain2411.cs index ae07c75..7f5ac2e 100644 --- a/InjectionPC/FrmMain2411.cs +++ b/InjectionPC/FrmMain2411.cs @@ -59,7 +59,7 @@ namespace InjectionPC private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL(); private PLCMouldBLL _PLCbll = new PLCMouldBLL(); private PLCBreakBLL _bbll = new PLCBreakBLL(); - private DataTable tb_Plastic = new DataTable(); + //private DataTable tb_Plastic = new DataTable(); private string _currentStationID = string.Empty; private const string _leftType = "0"; //模具1 private const string _rightType = "1";//模具2 @@ -95,7 +95,7 @@ namespace InjectionPC _currentStationID = getStationID(Program.station); - tb_Plastic = GetPlastic(); + //tb_Plastic = GetPlastic(); Control.CheckForIllegalCrossThreadCalls = false; //this.WindowState = FormWindowState.Maximized; Thread t = new Thread(new ThreadStart(TimeGo)); diff --git a/MESClassLibrary/EFModel/BBMPT.Context.cs b/MESClassLibrary/EFModel/BBMPT.Context.cs index 68eac0e..a9bd629 100644 --- a/MESClassLibrary/EFModel/BBMPT.Context.cs +++ b/MESClassLibrary/EFModel/BBMPT.Context.cs @@ -185,14 +185,5 @@ 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 f34fb80..48c0d23 100644 --- a/MESClassLibrary/EFModel/BBMPT.edmx +++ b/MESClassLibrary/EFModel/BBMPT.edmx @@ -142,145 +142,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2453,77 +2316,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2561,12 +2353,6 @@ - - - - - - @@ -2677,7 +2463,6 @@ - SELECT [T_Sys_RoleLinkPower].[RoleID] AS [RoleID], @@ -2685,13 +2470,6 @@ [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 @@ -3277,56 +3055,6 @@ [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 @@ -3512,16 +3240,7 @@ - - - - - - - - - - + @@ -5778,218 +5497,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8389,224 +7896,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/MESClassLibrary/EFModel/BBMPT.edmx.diagram b/MESClassLibrary/EFModel/BBMPT.edmx.diagram index d069cca..347100d 100644 --- a/MESClassLibrary/EFModel/BBMPT.edmx.diagram +++ b/MESClassLibrary/EFModel/BBMPT.edmx.diagram @@ -4,7 +4,7 @@ - + @@ -12,166 +12,174 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6431,6 +6439,44 @@ + >>>>>>> .r85 + + + + >>>>>>> .r85 + + + + >>>>>>> .r85 + + + + >>>>>>> .r85 + + + + >>>>>>> .r85 + + + + >>>>>>> .r85 + + + + >>>>>>> .r85 + + + + >>>>>>> .r85 + + + + >>>>>>> .r85 + + + + + diff --git a/MESClassLibrary/MESClassLibrary.csproj b/MESClassLibrary/MESClassLibrary.csproj index 10b5bde..01edff5 100644 --- a/MESClassLibrary/MESClassLibrary.csproj +++ b/MESClassLibrary/MESClassLibrary.csproj @@ -254,12 +254,6 @@ True BBMPT.edmx - - BBMPT.tt - - - BBMPT.tt - BBMPT.tt @@ -737,42 +731,9 @@ 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/Manage/Index.aspx b/MESWebSite/Manage/Index.aspx index 2d73a02..140c004 100644 --- a/MESWebSite/Manage/Index.aspx +++ b/MESWebSite/Manage/Index.aspx @@ -404,9 +404,9 @@
-
+
-
+