称重

lu

3 天以前 7113711bc89507350e328357808ae6d7cef1c461

称重

 DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs

@@ -46,14 +46,12 @@
            this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
            this.txtUser = new DevExpress.XtraEditors.TextEdit();
            this.txtPwd = new DevExpress.XtraEditors.TextEdit();
            this.ckWeight = new DevExpress.XtraEditors.CheckEdit();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.panelLog = new System.Windows.Forms.Panel();
            this.table1.SuspendLayout();
            this.panel1.SuspendLayout();
@@ -62,14 +60,12 @@
            ((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.ckWeight.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            this.SuspendLayout();
            // 
            // lbVersion
@@ -119,7 +115,6 @@
            this.lay1.Controls.Add(this.btnLogin);
            this.lay1.Controls.Add(this.txtUser);
            this.lay1.Controls.Add(this.txtPwd);
            this.lay1.Controls.Add(this.ckWeight);
            this.lay1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.lay1.Location = new System.Drawing.Point(0, 0);
            this.lay1.Name = "lay1";
@@ -142,7 +137,6 @@
            this.btnCancel.StyleController = this.lay1;
            this.btnCancel.TabIndex = 15;
            this.btnCancel.Text = "取消 (&C)";
           
            // 
            // ckRemember
            // 
@@ -171,7 +165,6 @@
            this.btnLogin.StyleController = this.lay1;
            this.btnLogin.TabIndex = 14;
            this.btnLogin.Text = "登录 (&L)";
           
            // 
            // txtUser
            // 
@@ -198,16 +191,6 @@
            this.txtPwd.StyleController = this.lay1;
            this.txtPwd.TabIndex = 22;
            // 
            // ckWeight
            // 
            this.ckWeight.Location = new System.Drawing.Point(189, 106);
            this.ckWeight.Name = "ckWeight";
            this.ckWeight.Properties.Caption = "仅称重模式";
            this.ckWeight.Properties.ContentAlignment = DevExpress.Utils.HorzAlignment.Far;
            this.ckWeight.Size = new System.Drawing.Size(174, 24);
            this.ckWeight.StyleController = this.lay1;
            this.ckWeight.TabIndex = 23;
            // 
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -217,8 +200,7 @@
            this.layoutControlItem2,
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem5,
            this.layoutControlItem6});
            this.layoutControlItem5});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -310,19 +292,6 @@
            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem5.TextVisible = false;
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
            this.layoutControlItem6.Control = this.ckWeight;
            this.layoutControlItem6.Location = new System.Drawing.Point(177, 94);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(178, 47);
            this.layoutControlItem6.Text = "称重模式";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem6.TextVisible = false;
            // 
            // panelLog
            // 
            this.panelLog.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
@@ -358,14 +327,12 @@
            ((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.ckWeight.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            this.ResumeLayout(false);

        }
@@ -387,7 +354,5 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private System.Windows.Forms.Panel panelLog;
        private DevExpress.XtraEditors.CheckEdit ckWeight;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
    }
}

 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs

@@ -74,7 +74,6 @@
                    Settings.Default.userName = ckRemember.Checked ? txtUser.Text.Trim() : "";
                    Settings.Default.userPwd = ckRemember.Checked ? txtPwd.Text.Trim() : "";
                    Settings.Default.remember = ckRemember.Checked;
                    Settings.Default.isWeight = ckWeight.Checked;
                    Settings.Default.Save();
                    LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
                    LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
@@ -103,7 +102,6 @@
                txtUser.Text = Settings.Default.userName;
                txtPwd.Text = Settings.Default.userPwd;
                ckRemember.Checked = Settings.Default.remember;
                ckWeight.Checked = Settings.Default.isWeight;
            }
            catch (Exception ex)
            {

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.resx

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -1101,12 +1101,6 @@
    <Compile Include="DevFrm\Work\Frm_Work01.Designer.cs">
      <DependentUpon>Frm_Work01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Work\Frm_Work09.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Work\Frm_Work09.Designer.cs">
      <DependentUpon>Frm_Work09.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Work\Frm_WorkProcesses.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1966,9 +1960,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx">
      <DependentUpon>Frm_Work01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Work\Frm_Work09.resx">
      <DependentUpon>Frm_Work09.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Work\Frm_WorkProcesses.resx">
      <DependentUpon>Frm_WorkProcesses.cs</DependentUpon>

 DevApp/Gs.DevApp/Program.cs

@@ -53,18 +53,7 @@
                {
                    //Application.Run(new DevFrm.User.SysMenu());
                    //return;
                    bool IsWeight = false;
                    try
                    {
                        IsWeight = Settings.Default.isWeight;
                    }
                    catch (Exception)
                    {
                    }
                    if (IsWeight == true)
                        Application.Run(new Frm_Work09(QcSeason.产线称重.ToString()));
                    else
                        Application.Run(new FrmMain());
                    Application.Run(new FrmMain());
                }
            }
            else