| DevApp/Gs.DevApp/App.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/Gs.DevApp.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/packages.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/App.config
@@ -22,6 +22,11 @@ <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /> </startup> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <probing privatePath="x86"/> </assemblyBinding> </runtime> <appSettings> <add key="WebApiUrl" value="http://localhost:5263/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -299,6 +299,7 @@ Memo = txt_memo.Text.Trim(), ItemNo = txt_itemNo.Text.Trim(), Isenabled = txt_isenabled.Checked, Ftype= "1", list = lst }; try DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -288,8 +288,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> @@ -413,8 +415,9 @@ /// </summary> /// <param name="curPage">第几页</param> /// <param name="pageSize">每页几条</param> private void getPageList(int curPage, int pageSize) private async void getPageList(int curPage, int pageSize) { UcLoading _loading = new UcLoading(); var _sbSqlWhere = new StringBuilder(); foreach (var itm in _filterList) _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + @@ -424,7 +427,7 @@ var json = JsonConvert.SerializeObject(pgq); try { var strReturn = UtilityHelper.HttpPost("", var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json); var dd = UtilityHelper.ReturnToTablePage(strReturn); var dt = dd.rtnData.list; @@ -442,9 +445,10 @@ { MsgHelper.Warning("提示：" + ex.Message); } _loading.Stop(); } private void getModel(string strGuid, bool isEdit, int tabIdx) private async void getModel(string strGuid, bool isEdit, int tabIdx) { if (string.IsNullOrEmpty(strGuid)) { @@ -453,13 +457,14 @@ } UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); UcLoading _loading = new UcLoading(); var _obj = new { guid = strGuid //主建 }; try { var strJson = UtilityHelper.HttpPost("", var strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); @@ -498,6 +503,7 @@ { MsgHelper.Warning("提示：" + ex.Message); } _loading.Stop(); } /// <summary> DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1,4 +1,7 @@ <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" /> <Import Project="..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" /> <Import Project="..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> @@ -58,6 +61,15 @@ <ItemGroup> <Reference Include="AutoUpdater.NET, Version=1.9.2.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL"> <HintPath>..\packages\Autoupdater.NET.Official.1.9.2\lib\net462\AutoUpdater.NET.dll</HintPath> </Reference> <Reference Include="CefSharp, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.dll</HintPath> </Reference> <Reference Include="CefSharp.Core, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.Core.dll</HintPath> </Reference> <Reference Include="CefSharp.WinForms, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> <HintPath>..\packages\CefSharp.WinForms.129.0.110\lib\net462\CefSharp.WinForms.dll</HintPath> </Reference> <Reference Include="DevExpress.BonusSkins.v22.2" /> <Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> @@ -853,7 +865,12 @@ <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText> </PropertyGroup> <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets'))" /> <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props'))" /> <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props'))" /> <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props'))" /> <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets'))" /> </Target> <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> DevApp/Gs.DevApp/packages.config
@@ -1,29 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="Autoupdater.NET.Official" version="1.9.2" targetFramework="net48"/> <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48"/> <package id="Microsoft.Web.WebView2" version="1.0.2592.51" targetFramework="net48"/> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48"/> <package id="Oracle.ManagedDataAccess" version="23.6.0" targetFramework="net48"/> <package id="System.Buffers" version="4.5.1" targetFramework="net48"/> <package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net48"/> <package id="System.Diagnostics.DiagnosticSource" version="6.0.1" targetFramework="net48"/> <package id="System.Formats.Asn1" version="8.0.1" targetFramework="net48"/> <package id="System.Memory" version="4.5.5" targetFramework="net48"/> <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48"/> <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48"/> <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48"/> <package id="System.Text.Json" version="8.0.4" targetFramework="net48"/> <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48"/> <package id="System.ValueTuple" version="4.5.0" targetFramework="net48"/> <package id="Autoupdater.NET.Official" version="1.9.2" targetFramework="net48" /> <package id="CefSharp.Common" version="129.0.110" targetFramework="net48" /> <package id="CefSharp.WinForms" version="129.0.110" targetFramework="net48" /> <package id="chromiumembeddedframework.runtime.win-x64" version="129.0.11" targetFramework="net48" /> <package id="chromiumembeddedframework.runtime.win-x86" version="129.0.11" targetFramework="net48" /> <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" /> <package id="Microsoft.Web.WebView2" version="1.0.2592.51" targetFramework="net48" /> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" /> <package id="Oracle.ManagedDataAccess" version="23.6.0" targetFramework="net48" /> <package id="System.Buffers" version="4.5.1" targetFramework="net48" /> <package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net48" /> <package id="System.Diagnostics.DiagnosticSource" version="6.0.1" targetFramework="net48" /> <package id="System.Formats.Asn1" version="8.0.1" targetFramework="net48" /> <package id="System.Memory" version="4.5.5" targetFramework="net48" /> <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" /> <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" /> <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" /> <package id="System.Text.Json" version="8.0.4" targetFramework="net48" /> <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" /> <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" /> </packages>
