From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001 From: yl <ykxkd@outlook.com> Date: 星期五, 29 三月 2024 10:57:35 +0800 Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联 --- VueWebApi/bin/VueWebApi.dll.config | 301 ++++++++++++++++++++++++++++--------------------- 1 files changed, 171 insertions(+), 130 deletions(-) diff --git a/VueWebApi/bin/VueWebApi.dll.config b/VueWebApi/bin/VueWebApi.dll.config index bc0b1a5..c303c1b 100644 --- a/VueWebApi/bin/VueWebApi.dll.config +++ b/VueWebApi/bin/VueWebApi.dll.config @@ -4,134 +4,175 @@ https://go.microsoft.com/fwlink/?LinkId=301879 --> <configuration> - <configSections> - <!--閰嶇疆log4net--> - <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" /> - <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --> - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> - </configSections> - <appSettings> - <!--鏁版嵁搴撻摼鎺ラ厤缃�--> - <!--鏈湴鐜--> - <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />--> - <!--鏈嶅姟鍣ㄧ幆澧�--> - <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes;User ID=sa;Password=xkd@20220602;pooling=false" /> - <!--redis鏁版嵁搴撻摼鎺ラ厤缃甶p--> - <add key="RedisConnIp" value="127.0.0.1" /> - <!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿--> - <add key="RedisConnPort" value="6379" /> - <!--key澶辨晥鏃堕棿30绉�--> - <add key="RedisKeyTimeCont" value="120" /> - <!--Excel瀵煎嚭妯℃澘閰嶇疆IP--> - <add key="FileIP" value="http://121.196.36.24:8001/" /> - <add key="webpages:Version" value="3.0.0.0" /> - <add key="webpages:Enabled" value="false" /> - <add key="ClientValidationEnabled" value="true" /> - <add key="UnobtrusiveJavaScriptEnabled" value="true" /> - </appSettings> - <system.web> - <compilation debug="true" targetFramework="4.6.1" /> - <customErrors mode="Off" /> - <httpRuntime targetFramework="4.6.1" /> - <!--session澶辨晥鏃堕棿--> - <sessionState mode="InProc" timeout="240"> - <!--<sessionState mode="Off">--> - </sessionState> - </system.web> - <system.webServer> - <security> - <requestFiltering> - <!--涓昏鏄痬axAllowedContentLength灞炴��--> - <requestLimits maxAllowedContentLength="2147483647" maxQueryString="102400" /> - </requestFiltering> - </security> - <httpProtocol> - <customHeaders> - <add name="Access-Control-Allow-Origin" value="*" /> - <add name="Access-Control-Allow-Headers" value="Content-Type" /> - <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" /> - </customHeaders> - </httpProtocol> - <modules runAllManagedModulesForAllRequests="true" /> - <validation validateIntegratedModeConfiguration="false" /> - <staticContent> - <remove fileExtension=".woff" /> - <remove fileExtension=".woff2" /> - <remove fileExtension=".json" /> - <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" /> - <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" /> - <mimeMap fileExtension=".json" mimeType="application/json" /> - <!--娣诲姞鎵撳嵃鏂囦欢MIME绫诲瀷--> - <!--<mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>--> - </staticContent> - - <handlers> - <remove name="ExtensionlessUrlHandler-Integrated-4.0" /> - <remove name="OPTIONSVerbHandler" /> - <remove name="TRACEVerbHandler" /> - <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /> - </handlers> - </system.webServer> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" /> - <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> - <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> - <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> - <system.codedom> - <compilers> - <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" /> - <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+" /> - </compilers> - </system.codedom> + <configSections> + <!--閰嶇疆log4net--> + <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" /> + + + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> + </configSections> + <log4net configSource="log4net.config" /> + <appSettings> + <!--鏁版嵁搴撻摼鎺ラ厤缃�--> + <!--鏈湴鐜--> + <!--<add key="DBServer" value="Data Source=.;Initial Catalog=vmes;Integrated Security=True" />--> + <!--鏈嶅姟鍣ㄧ幆澧�--> + <add key="DBServer" value="Data Source=121.196.36.24,1533;Initial Catalog=vmes_zqh;User ID=sa;Password=xkd@20230101;pooling=false" /> + <!--澶у矝鏈嶅姟鍣ㄧ幆澧�--> + <!--<add key="DBServer" value="Data Source=192.168.2.138;Initial Catalog=vmes;User ID=sa;Password=Dd@20220727;pooling=false" />--> + <!--redis浼佷笟閰嶇疆--> + <add key="Enterprise" value="MES" /> + <!--redis鏁版嵁搴撻摼鎺ラ厤缃甶p--> + <add key="RedisConnIp" value="127.0.0.1" /> + <!--redis鏁版嵁搴撻摼鎺ラ厤缃鍙ｅ彿--> + <add key="RedisConnPort" value="6379" /> + <!--key澶辨晥鏃堕棿30绉�--> + <add key="RedisKeyTimeCont" value="7200" /> + <!--Excel瀵煎嚭妯℃澘閰嶇疆IP--> + <add key="FileIP" value="http://121.196.36.24:8001/" /> + <add key="webpages:Version" value="3.0.0.0" /> + <add key="webpages:Enabled" value="false" /> + <add key="ClientValidationEnabled" value="true" /> + <add key="UnobtrusiveJavaScriptEnabled" value="true" /> + <!--鎻愪氦json瀛楃涓茶繃闀块棶棰�--> + <add key="aspnet:MaxJsonDeserializerMembers" value="150000000" /> + <add key="log4net.Internal.Debug" value="true" /> + </appSettings> + <system.diagnostics> + <trace autoflush="true"> + <listeners> + <add name="textWriterTraceListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="D:\log4net.txt" /> + </listeners> + </trace> + </system.diagnostics> + <system.web> + <compilation debug="true" targetFramework="4.6.1" /> + <customErrors mode="Off" /> + <!--鏈�澶ц姹傞暱搴�,鍗曚綅涓簁b--> + <httpRuntime targetFramework="4.6.1" maxRequestLength="2147483647" maxQueryStringLength="2097151" /> + <!--session澶辨晥鏃堕棿--> + <sessionState mode="InProc" timeout="240"> + <!--<sessionState mode="Off">--> + </sessionState> + </system.web> + <system.webServer> + <security> + <requestFiltering> + <!--涓昏鏄痬axAllowedContentLength灞炴��--> + <requestLimits maxAllowedContentLength="2147483647" maxQueryString="102400" /> + </requestFiltering> + </security> + <httpProtocol> + <customHeaders> + <add name="Access-Control-Allow-Origin" value="*" /> + <add name="Access-Control-Allow-Headers" value="Content-Type" /> + <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" /> + </customHeaders> + </httpProtocol> + <modules runAllManagedModulesForAllRequests="true" /> + <validation validateIntegratedModeConfiguration="false" /> + <staticContent> + <remove fileExtension=".woff" /> + <remove fileExtension=".woff2" /> + <remove fileExtension=".json" /> + <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" /> + <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" /> + <mimeMap fileExtension=".json" mimeType="application/json" /> + <!--娣诲姞鎵撳嵃鏂囦欢MIME绫诲瀷--> + <!--<mimeMap fileExtension=".grf" mimeType="grf/gridreport"/>--> + </staticContent> + <handlers> + <remove name="ExtensionlessUrlHandler-Integrated-4.0" /> + <remove name="OPTIONSVerbHandler" /> + <remove name="TRACEVerbHandler" /> + <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /> + </handlers> + </system.webServer> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" /> + <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> + <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> + <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> + <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> + <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> + <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> + <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" /> + </dependentAssembly> + </assemblyBinding> + </runtime> + <system.codedom> + <compilers> + <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" /> + <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\"Web\" /optionInfer+" /> + </compilers> + </system.codedom> + <entityFramework> + <providers> + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> + </providers> + </entityFramework> </configuration> \ No newline at end of file -- Gitblit v1.9.3