bug

lu

4 天以前 eeb7cf6accb95c32216edaf8a5cf14a1c64493b2

bug

 DevApp/Gs.DevApp/App.config

@@ -34,12 +34,7 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
      <connectionStrings>
    <!--新络V2数据库-->
    <add name="conn" connectionString="RGF0YSBTb3VyY2U9MTkyLjE2OC4xLjQ7SW5pdGlhbCBDYXRhbG9nPVNOTUVTO1VzZXIgSWQ9c2M7UGFzc3dvcmQ9bWVzQDEyMztQb29saW5nPUZhbHNlO1Bvb2xpbmc9dHJ1ZTtNaW4gUG9vbCBTaXplPTEwO01heCBQb29sIFNpemU9NTA7Q29ubmVjdCBUaW1lb3V0PTUwMA==" />
    <!--<add name="conn" connectionString="RGF0YSBTb3VyY2U9MTkyLjE2OC4xLjI7SW5pdGlhbCBDYXRhbG9nPVFYX1NOTUVTO1VzZXIgSWQ9c2M7UGFzc3dvcmQ9bWVzQDEyMztQb29saW5nPUZhbHNlO1Bvb2xpbmc9dHJ1ZTtNaW4gUG9vbCBTaXplPTEwO01heCBQb29sIFNpemU9NTA7Q29ubmVjdCBUaW1lb3V0PTUwMA=="/>-->
  </connectionStrings>
 
	
  <appSettings>
    <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
    <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
@@ -54,7 +49,6 @@
    <add key="AsyncSeconds" value="2" /><!--水检超时时间-->
    <add key="IsWater" value="0" /><!--是否要水检及工位码-->
    <add key="IqcGetWeight" value="3000" /><!--iqc读称重时-->
    <add key="TimingMailInterval" value="10000" /><!--iqc称重时刷新-->
  </appSettings>
  <userSettings>
    <Gs.DevApp.Properties.Settings>

 DevApp/Gs.DevApp/DevFrm/QC/WeightIqc.cs

@@ -74,7 +74,6 @@
            this.SizeChanged += new EventHandler(this.frmMain_SizeChanged);
            this.contextMenuStrip1.ItemClicked += new ToolStripItemClickedEventHandler(this.contextMenuStrip1_ItemClicked);
            this.Initialize();
 
        }

        private void Initialize()
@@ -94,8 +93,9 @@
            }
            catch (Exception ex)
            {
                int num = (int)MessageBox.Show(ex.Message);
                Application.Exit();
                //int num = (int)MessageBox.Show(ex.Message);
                //Application.Exit();
                MsgHelper.ShowError("Initialize:" + ex.Message);
            }
        }

@@ -193,7 +193,8 @@
            catch (Exception ex)
            {
                LoggerHelper.WriteErrorLog($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}:{ex.Message}");
                int num = (int)MessageBox.Show(ex.Message);
               // int num = (int)MessageBox.Show(ex.Message);
                MsgHelper.ShowError("UpdateTextBox:" + ex.Message);
            }
        }

@@ -281,19 +282,20 @@
            }
            catch (Exception ex)
            {
                int num = (int)MessageBox.Show(ex.Message);
                Application.Exit();
                //int num = (int)MessageBox.Show(ex.Message);
                //Application.Exit();
                MsgHelper.ShowError(ex.Message);
            }
        }

        private void timer1_Tick(object sender, EventArgs e)
        {
            if (!this.dicThread.Keys.Contains<string>("RefreshData"))
            {
                Thread thread = new Thread(new ThreadStart(this.RefreshData));
                thread.Start();
                this.dicThread.Add("RefreshData", thread);
            }
            //if (!this.dicThread.Keys.Contains<string>("RefreshData"))
            //{
            //    Thread thread = new Thread(new ThreadStart(this.RefreshData));
            //    thread.Start();
            //    this.dicThread.Add("RefreshData", thread);
            //}
            if (this.dicThread.Keys.Contains<string>("GetWeight"))
                return;
            Thread thread1 = new Thread(new ThreadStart(this.GetWeight));
@@ -331,8 +333,9 @@
            }
            catch (Exception ex)
            {
                int num = (int)MessageBox.Show(ex.Message);
                Application.Exit();
                //int num = (int)MessageBox.Show(ex.Message);
                //Application.Exit();
                MsgHelper.ShowError(ex.Message);
            }
        }


 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -1143,18 +1143,10 @@
    <Compile Include="DevFrm\WW\showWwZhongTai.Designer.cs">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </Compile>
    <Compile Include="test\LoggerHelper.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="test\SQLHelper.cs" />
    <Compile Include="test\MainForm.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="test\MainForm.Designer.cs">
      <DependentUpon>MainForm.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCk.cs">
      <SubType>Form</SubType>
@@ -1561,12 +1553,6 @@
    </Compile>
    <Compile Include="XtraForm1.Designer.cs">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </Compile>
    <Compile Include="XtraForm2.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="XtraForm2.Designer.cs">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </Compile>
    <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
      <DependentUpon>Frm_Customer.cs</DependentUpon>
@@ -2205,9 +2191,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="XtraForm1.resx">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="XtraForm2.resx">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </EmbeddedResource>
    <None Include="App.config" />
    <None Include="packages.config" />

 DevApp/Gs.DevApp/Program.cs

@@ -1,6 +1,7 @@
using CefSharp;
using CefSharp.WinForms;
using Gs.DevApp.DevFrm;
using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
@@ -41,7 +42,7 @@
        /// </summary>
        private static void _startLogin()
        {
            //Application.Run(new Gs.DevApp.test.MainForm());
            //Application.Run(new WeightIqc());
            //return;
            CefSettings settings = new CefSettings();
            settings.Locale = "zh-CN";

 DevApp/Gs.DevApp/XtraForm2.Designer.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/XtraForm2.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/XtraForm2.resx

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/test/LoggerHelper.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/test/MainForm.Designer.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/test/MainForm.cs

ÎļþÒÑɾ³ý

 DevApp/Gs.DevApp/test/SQLHelper.cs

ÎļþÒÑɾ³ý