From cd7a1182c004bfcc705f28b0a306a9855f3af059 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 22 五月 2025 21:04:24 +0800
Subject: [PATCH] 复制老的插进，然后进行 过站数量优化，和上到工序优化
---
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/Config/SQLAPI.config | 8
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/镭雕Debug.zip | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt | 18
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.cs | 669 +++++++++++
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.resx | 123 ++
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.cs | 608 ++++++++++
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.CoreCompileInputs.cache | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/组装Debug.zip | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.Designer.cs | 190 +++
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest | 2
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.GenerateResource.cache | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt | 40
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.ReadCSV_New.resources | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.CoreCompileInputs.cache | 2
WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj | 18
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application | 2
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.Designer.cs | 223 +++
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs | 2
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.resx | 123 ++
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs | 135 +-
/dev/null | 0
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.ReadyDataForm_New.resources | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest | 2
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs | 124 +
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache | 0
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 196 +-
WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/config/applicationhost.config | 1015 +++++++++++++++++
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache | 0
43 files changed, 3,267 insertions(+), 237 deletions(-)
diff --git a/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/config/applicationhost.config b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/config/applicationhost.config
new file mode 100644
index 0000000..98fc570
--- /dev/null
+++ b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/config/applicationhost.config
@@ -0,0 +1,1015 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ IIS configuration sections.
+
+ For schema documentation, see
+ %IIS_BIN%\config\schema\IIS_schema.xml.
+
+ Please make a backup of this file before making any changes to it.
+
+ NOTE: The following environment variables are available to be used
+ within this file and are understood by the IIS Express.
+
+ %IIS_USER_HOME% - The IIS Express home directory for the user
+ %IIS_SITES_HOME% - The default home directory for sites
+ %IIS_BIN% - The location of the IIS Express binaries
+ %SYSTEMDRIVE% - The drive letter of %IIS_BIN%
+
+-->
+<configuration>
+
+ <!--
+
+ The <configSections> section controls the registration of sections.
+ Section is the basic unit of deployment, locking, searching and
+ containment for configuration settings.
+
+ Every section belongs to one section group.
+ A section group is a container of logically-related sections.
+
+ Sections cannot be nested.
+ Section groups may be nested.
+
+ <section
+ name="" [Required, Collection Key] [XML name of the section]
+ allowDefinition="Everywhere" [MachineOnly|MachineToApplication|AppHostOnly|Everywhere] [Level where it can be set]
+ overrideModeDefault="Allow" [Allow|Deny] [Default delegation mode]
+ allowLocation="true" [true|false] [Allowed in location tags]
+ />
+
+ The recommended way to unlock sections is by using a location tag:
+ <location path="Default Web Site" overrideMode="Allow">
+ <system.webServer>
+ <asp />
+ </system.webServer>
+ </location>
+
+ -->
+ <configSections>
+ <sectionGroup name="system.applicationHost">
+ <section name="applicationPools" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="configHistory" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="customMetadata" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="listenerAdapters" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="log" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="serviceAutoStartProviders" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="sites" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="webLimits" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ </sectionGroup>
+
+ <sectionGroup name="system.webServer">
+ <section name="asp" overrideModeDefault="Deny" />
+ <section name="caching" overrideModeDefault="Allow" />
+ <section name="cgi" overrideModeDefault="Deny" />
+ <section name="defaultDocument" overrideModeDefault="Allow" />
+ <section name="directoryBrowse" overrideModeDefault="Allow" />
+ <section name="fastCgi" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="globalModules" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="handlers" overrideModeDefault="Deny" />
+ <section name="httpCompression" overrideModeDefault="Allow" allowDefinition="Everywhere" />
+ <section name="httpErrors" overrideModeDefault="Allow" />
+ <section name="httpLogging" overrideModeDefault="Deny" />
+ <section name="httpProtocol" overrideModeDefault="Allow" />
+ <section name="httpRedirect" overrideModeDefault="Allow" />
+ <section name="httpTracing" overrideModeDefault="Deny" />
+ <section name="isapiFilters" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
+ <section name="modules" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
+ <section name="applicationInitialization" allowDefinition="MachineToApplication" overrideModeDefault="Allow" />
+ <section name="odbcLogging" overrideModeDefault="Deny" />
+ <sectionGroup name="security">
+ <section name="access" overrideModeDefault="Deny" />
+ <section name="applicationDependencies" overrideModeDefault="Deny" />
+ <sectionGroup name="authentication">
+ <section name="anonymousAuthentication" overrideModeDefault="Deny" />
+ <section name="basicAuthentication" overrideModeDefault="Deny" />
+ <section name="clientCertificateMappingAuthentication" overrideModeDefault="Deny" />
+ <section name="digestAuthentication" overrideModeDefault="Deny" />
+ <section name="iisClientCertificateMappingAuthentication" overrideModeDefault="Deny" />
+ <section name="windowsAuthentication" overrideModeDefault="Deny" />
+ </sectionGroup>
+ <section name="authorization" overrideModeDefault="Allow" />
+ <section name="ipSecurity" overrideModeDefault="Deny" />
+ <section name="dynamicIpSecurity" overrideModeDefault="Deny" />
+ <section name="isapiCgiRestriction" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+ <section name="requestFiltering" overrideModeDefault="Allow" />
+ </sectionGroup>
+ <section name="serverRuntime" overrideModeDefault="Deny" />
+ <section name="serverSideInclude" overrideModeDefault="Deny" />
+ <section name="staticContent" overrideModeDefault="Allow" />
+ <sectionGroup name="tracing">
+ <section name="traceFailedRequests" overrideModeDefault="Allow" />
+ <section name="traceProviderDefinitions" overrideModeDefault="Deny" />
+ </sectionGroup>
+ <section name="urlCompression" overrideModeDefault="Allow" />
+ <section name="validation" overrideModeDefault="Allow" />
+ <sectionGroup name="webdav">
+ <section name="globalSettings" overrideModeDefault="Deny" />
+ <section name="authoring" overrideModeDefault="Deny" />
+ <section name="authoringRules" overrideModeDefault="Deny" />
+ </sectionGroup>
+ <sectionGroup name="rewrite">
+ <section name="allowedServerVariables" overrideModeDefault="Deny" />
+ <section name="rules" overrideModeDefault="Allow" />
+ <section name="outboundRules" overrideModeDefault="Allow" />
+ <section name="globalRules" overrideModeDefault="Deny" allowDefinition="AppHostOnly" />
+ <section name="providers" overrideModeDefault="Allow" />
+ <section name="rewriteMaps" overrideModeDefault="Allow" />
+ </sectionGroup>
+ <section name="webSocket" overrideModeDefault="Deny" />
+ <section name="aspNetCore" overrideModeDefault="Allow" /></sectionGroup>
+ </configSections>
+
+ <configProtectedData>
+ <providers>
+ <add name="IISWASOnlyRsaProvider" type="" description="Uses RsaCryptoServiceProvider to encrypt and decrypt" keyContainerName="iisWasKey" cspProviderName="" useMachineContainer="true" useOAEP="false" />
+ <add name="AesProvider" type="Microsoft.ApplicationHost.AesProtectedConfigurationProvider" description="Uses an AES session key to encrypt and decrypt" keyContainerName="iisConfigurationKey" cspProviderName="" useOAEP="false" useMachineContainer="true" sessionKey="AQIAAA5mAAAApAAA/HKxkz6alrlAPez0IUgujj/6k3WxCDriHp6jvpv3yEZmo7h6SMzGLxo4mTrIQVHSkB7tmElHKfUFTzE2BWF7nFWHY6Z6qmGBauFzwJMwESjril7Gjz69RBFH259HQ6aRDq9Xfx7U7H4HtdmnKNqGjgl/hwPQBGeIlWiDh+sYv3vKB0QU971tjX6H2B+9armlnC8UOuA6JYMDMI/VLLL16sng0fWAy5JYe0YVABVjiAWDW264RZW9Tr1Oax4qHZKg+SdjULxeOc2YmpX+d0yeITo1HkPF1hN1gHpIPIUDo05ilHUNfR3OkjVCIQK4cFKCq1s8NH+y+13MxUC4Fn1AlQ==" />
+ <add name="IISWASOnlyAesProvider" type="Microsoft.ApplicationHost.AesProtectedConfigurationProvider" description="Uses an AES session key to encrypt and decrypt" keyContainerName="iisWasKey" cspProviderName="" useOAEP="false" useMachineContainer="true" sessionKey="AQIAAA5mAAAApAAALmU8lTC+v2qtfQiiiquvvLpUQqKLEXs+jSKoWCM/uPhyB++k4dwug19mGidNK5FYiWK2KYE1yhjVJcbp12E98Q0R2nT7eBiCMY2JairxQ591rqABK7keGaIjwH7PwGzSpILl3RJ4YFvJ/7ZXEJxeDZIjW8ZxWVXx+/VyHs9U3WguLEkgMUX3jrxJi8LouxaIVPJAv/YQ1ZCWs8zImitxX/C/7o7yaIxznfsN5nGQzQfpUDPeby99aw2zPVTtZI2LaWIBON8guABvZ6JtJVDWmfdK6sodbnwdZkr6/Z2rfvamT1dC1SpQrGG7ulR/f9/GXvCaW10ZVKxekBF/CYlNMg==" />
+ </providers>
+ </configProtectedData>
+
+ <system.applicationHost>
+
+ <applicationPools>
+ <add name="Clr4IntegratedAppPool" managedRuntimeVersion="v4.0" managedPipelineMode="Integrated" CLRConfigFile="%IIS_USER_HOME%\config\aspnet.config" autoStart="true" />
+ <add name="Clr4ClassicAppPool" managedRuntimeVersion="v4.0" managedPipelineMode="Classic" CLRConfigFile="%IIS_USER_HOME%\config\aspnet.config" autoStart="true" />
+ <add name="Clr2IntegratedAppPool" managedRuntimeVersion="v2.0" managedPipelineMode="Integrated" CLRConfigFile="%IIS_USER_HOME%\config\aspnet.config" autoStart="true" />
+ <add name="Clr2ClassicAppPool" managedRuntimeVersion="v2.0" managedPipelineMode="Classic" CLRConfigFile="%IIS_USER_HOME%\config\aspnet.config" autoStart="true" />
+ <add name="UnmanagedClassicAppPool" managedRuntimeVersion="" managedPipelineMode="Classic" autoStart="true" />
+ <applicationPoolDefaults managedRuntimeVersion="v4.0">
+ <processModel loadUserProfile="true" setProfileEnvironment="false" />
+ </applicationPoolDefaults>
+ </applicationPools>
+
+ <!--
+
+ The <listenerAdapters> section defines the protocols with which the
+ Windows Process Activation Service (WAS) binds.
+
+ -->
+ <listenerAdapters>
+ <add name="http" />
+ </listenerAdapters>
+
+ <sites>
+ <site name="WebSite1" id="1" serverAutoStart="true">
+ <application path="/">
+ <virtualDirectory path="/" physicalPath="%IIS_SITES_HOME%\WebSite1" />
+ </application>
+ <bindings>
+ <binding protocol="http" bindingInformation=":8080:localhost" />
+ </bindings>
+ </site>
+ <siteDefaults>
+ <!-- To enable logging, please change the below attribute "enabled" to "true" -->
+ <logFile logFormat="W3C" directory="%AppData%\Microsoft\IISExpressLogs" enabled="false" />
+ <traceFailedRequestsLogging directory="%AppData%\Microsoft" enabled="false" maxLogFileSizeKB="1024" />
+ </siteDefaults>
+ <applicationDefaults applicationPool="Clr4IntegratedAppPool" />
+ <virtualDirectoryDefaults allowSubDirConfig="true" />
+ </sites>
+
+ <webLimits />
+
+ </system.applicationHost>
+
+ <system.webServer>
+
+ <serverRuntime />
+
+ <asp scriptErrorSentToBrowser="true">
+ <cache diskTemplateCacheDirectory="%TEMP%\iisexpress\ASP Compiled Templates" />
+ <limits />
+ </asp>
+
+ <caching enabled="true" enableKernelCache="true">
+ </caching>
+
+ <cgi />
+
+ <defaultDocument enabled="true">
+ <files>
+ <add value="Default.htm" />
+ <add value="Default.asp" />
+ <add value="index.htm" />
+ <add value="index.html" />
+ <add value="iisstart.htm" />
+ <add value="default.aspx" />
+ </files>
+ </defaultDocument>
+
+ <directoryBrowse enabled="false" />
+
+ <fastCgi />
+
+ <!--
+
+ The <globalModules> section defines all native-code modules.
+ To enable a module, specify it in the <modules> section.
+
+ -->
+ <globalModules>
+ <add name="HttpLoggingModule" image="%IIS_BIN%\loghttp.dll" />
+ <add name="UriCacheModule" image="%IIS_BIN%\cachuri.dll" />
+ <add name="TokenCacheModule" image="%IIS_BIN%\cachtokn.dll" />
+ <add name="DynamicCompressionModule" image="%IIS_BIN%\compdyn.dll" />
+ <add name="StaticCompressionModule" image="%IIS_BIN%\compstat.dll" />
+ <add name="DefaultDocumentModule" image="%IIS_BIN%\defdoc.dll" />
+ <add name="DirectoryListingModule" image="%IIS_BIN%\dirlist.dll" />
+ <add name="ProtocolSupportModule" image="%IIS_BIN%\protsup.dll" />
+ <add name="HttpRedirectionModule" image="%IIS_BIN%\redirect.dll" />
+ <add name="ServerSideIncludeModule" image="%IIS_BIN%\iis_ssi.dll" />
+ <add name="StaticFileModule" image="%IIS_BIN%\static.dll" />
+ <add name="AnonymousAuthenticationModule" image="%IIS_BIN%\authanon.dll" />
+ <add name="CertificateMappingAuthenticationModule" image="%IIS_BIN%\authcert.dll" />
+ <add name="UrlAuthorizationModule" image="%IIS_BIN%\urlauthz.dll" />
+ <add name="BasicAuthenticationModule" image="%IIS_BIN%\authbas.dll" />
+ <add name="WindowsAuthenticationModule" image="%IIS_BIN%\authsspi.dll" />
+ <add name="IISCertificateMappingAuthenticationModule" image="%IIS_BIN%\authmap.dll" />
+ <add name="IpRestrictionModule" image="%IIS_BIN%\iprestr.dll" />
+ <add name="DynamicIpRestrictionModule" image="%IIS_BIN%\diprestr.dll" />
+ <add name="RequestFilteringModule" image="%IIS_BIN%\modrqflt.dll" />
+ <add name="CustomLoggingModule" image="%IIS_BIN%\logcust.dll" />
+ <add name="CustomErrorModule" image="%IIS_BIN%\custerr.dll" />
+ <add name="FailedRequestsTracingModule" image="%IIS_BIN%\iisfreb.dll" />
+ <add name="RequestMonitorModule" image="%IIS_BIN%\iisreqs.dll" />
+ <add name="IsapiModule" image="%IIS_BIN%\isapi.dll" />
+ <add name="IsapiFilterModule" image="%IIS_BIN%\filter.dll" />
+ <add name="CgiModule" image="%IIS_BIN%\cgi.dll" />
+ <add name="FastCgiModule" image="%IIS_BIN%\iisfcgi.dll" />
+<!-- <add name="WebDAVModule" image="%IIS_BIN%\webdav.dll" /> -->
+ <add name="RewriteModule" image="%IIS_BIN%\rewrite.dll" />
+ <add name="ConfigurationValidationModule" image="%IIS_BIN%\validcfg.dll" />
+ <add name="WebSocketModule" image="%IIS_BIN%\iiswsock.dll" />
+ <add name="WebMatrixSupportModule" image="%IIS_BIN%\webmatrixsup.dll" />
+ <add name="ManagedEngine" image="%windir%\Microsoft.NET\Framework\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness32" />
+ <add name="ManagedEngine64" image="%windir%\Microsoft.NET\Framework64\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness64" />
+ <add name="ManagedEngineV4.0_32bit" image="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness32" />
+ <add name="ManagedEngineV4.0_64bit" image="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness64" />
+ <add name="ApplicationInitializationModule" image="%IIS_BIN%\warmup.dll" />
+ <add name="AspNetCoreModule" image="%IIS_BIN%\aspnetcore.dll" />
+ <add name="AspNetCoreModuleV2" image="%IIS_BIN%\Asp.Net Core Module\V2\aspnetcorev2.dll" />
+ </globalModules>
+
+ <httpCompression directory="%TEMP%">
+ <scheme name="gzip" dll="%IIS_BIN%\gzip.dll" />
+ <dynamicTypes>
+ <add mimeType="text/*" enabled="true" />
+ <add mimeType="message/*" enabled="true" />
+ <add mimeType="application/x-javascript" enabled="true" />
+ <add mimeType="application/javascript" enabled="true" />
+ <add mimeType="*/*" enabled="false" />
+ </dynamicTypes>
+ <staticTypes>
+ <add mimeType="text/*" enabled="true" />
+ <add mimeType="message/*" enabled="true" />
+ <add mimeType="application/javascript" enabled="true" />
+ <add mimeType="application/atom+xml" enabled="true" />
+ <add mimeType="application/xaml+xml" enabled="true" />
+ <add mimeType="image/svg+xml" enabled="true" />
+ <add mimeType="*/*" enabled="false" />
+ </staticTypes>
+ </httpCompression>
+
+ <httpErrors lockAttributes="allowAbsolutePathsWhenDelegated,defaultPath">
+ <error statusCode="401" prefixLanguageFilePath="%IIS_BIN%\custerr" path="401.htm" />
+ <error statusCode="403" prefixLanguageFilePath="%IIS_BIN%\custerr" path="403.htm" />
+ <error statusCode="404" prefixLanguageFilePath="%IIS_BIN%\custerr" path="404.htm" />
+ <error statusCode="405" prefixLanguageFilePath="%IIS_BIN%\custerr" path="405.htm" />
+ <error statusCode="406" prefixLanguageFilePath="%IIS_BIN%\custerr" path="406.htm" />
+ <error statusCode="412" prefixLanguageFilePath="%IIS_BIN%\custerr" path="412.htm" />
+ <error statusCode="500" prefixLanguageFilePath="%IIS_BIN%\custerr" path="500.htm" />
+ <error statusCode="501" prefixLanguageFilePath="%IIS_BIN%\custerr" path="501.htm" />
+ <error statusCode="502" prefixLanguageFilePath="%IIS_BIN%\custerr" path="502.htm" />
+ </httpErrors>
+
+ <httpLogging dontLog="false" />
+
+ <httpProtocol>
+ <customHeaders>
+ <clear />
+ <add name="X-Powered-By" value="ASP.NET" />
+ </customHeaders>
+ <redirectHeaders>
+ <clear />
+ </redirectHeaders>
+ </httpProtocol>
+
+ <httpRedirect enabled="false" />
+
+ <httpTracing />
+
+ <isapiFilters>
+ <filter name="ASP.Net_2.0.50727-64" path="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="bitness64,runtimeVersionv2.0" />
+ <filter name="ASP.Net_2.0.50727.0" path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="bitness32,runtimeVersionv2.0" />
+ <filter name="ASP.Net_2.0_for_v1.1" path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="runtimeVersionv1.1" />
+ <filter name="ASP.Net_4.0_32bit" path="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_filter.dll" enableCache="true" preCondition="bitness32,runtimeVersionv4.0" />
+ <filter name="ASP.Net_4.0_64bit" path="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_filter.dll" enableCache="true" preCondition="bitness64,runtimeVersionv4.0" />
+ </isapiFilters>
+
+ <odbcLogging />
+
+ <security>
+
+ <access sslFlags="None" />
+
+ <applicationDependencies>
+ <application name="Active Server Pages" groupId="ASP" />
+ </applicationDependencies>
+
+ <authentication>
+
+ <anonymousAuthentication enabled="true" userName="" />
+
+ <basicAuthentication enabled="false" />
+
+ <clientCertificateMappingAuthentication enabled="false" />
+
+ <digestAuthentication enabled="false" />
+
+ <iisClientCertificateMappingAuthentication enabled="false">
+ </iisClientCertificateMappingAuthentication>
+
+ <windowsAuthentication enabled="false">
+ <providers>
+ <add value="Negotiate" />
+ <add value="NTLM" />
+ </providers>
+ </windowsAuthentication>
+
+ </authentication>
+
+ <authorization>
+ <add accessType="Allow" users="*" />
+ </authorization>
+
+ <ipSecurity allowUnlisted="true" />
+
+ <isapiCgiRestriction notListedIsapisAllowed="true" notListedCgisAllowed="true">
+ <add path="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" allowed="true" groupId="ASP.NET_v4.0" description="ASP.NET_v4.0" />
+ <add path="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" allowed="true" groupId="ASP.NET_v4.0" description="ASP.NET_v4.0" />
+ <add path="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" allowed="true" groupId="ASP.NET v2.0.50727" description="ASP.NET v2.0.50727" />
+ <add path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" allowed="true" groupId="ASP.NET v2.0.50727" description="ASP.NET v2.0.50727" />
+ </isapiCgiRestriction>
+
+ <requestFiltering>
+ <fileExtensions allowUnlisted="true" applyToWebDAV="true">
+ <add fileExtension=".asa" allowed="false" />
+ <add fileExtension=".asax" allowed="false" />
+ <add fileExtension=".ascx" allowed="false" />
+ <add fileExtension=".master" allowed="false" />
+ <add fileExtension=".skin" allowed="false" />
+ <add fileExtension=".browser" allowed="false" />
+ <add fileExtension=".sitemap" allowed="false" />
+ <add fileExtension=".config" allowed="false" />
+ <add fileExtension=".cs" allowed="false" />
+ <add fileExtension=".csproj" allowed="false" />
+ <add fileExtension=".vb" allowed="false" />
+ <add fileExtension=".vbproj" allowed="false" />
+ <add fileExtension=".webinfo" allowed="false" />
+ <add fileExtension=".licx" allowed="false" />
+ <add fileExtension=".resx" allowed="false" />
+ <add fileExtension=".resources" allowed="false" />
+ <add fileExtension=".mdb" allowed="false" />
+ <add fileExtension=".vjsproj" allowed="false" />
+ <add fileExtension=".java" allowed="false" />
+ <add fileExtension=".jsl" allowed="false" />
+ <add fileExtension=".ldb" allowed="false" />
+ <add fileExtension=".dsdgm" allowed="false" />
+ <add fileExtension=".ssdgm" allowed="false" />
+ <add fileExtension=".lsad" allowed="false" />
+ <add fileExtension=".ssmap" allowed="false" />
+ <add fileExtension=".cd" allowed="false" />
+ <add fileExtension=".dsprototype" allowed="false" />
+ <add fileExtension=".lsaprototype" allowed="false" />
+ <add fileExtension=".sdm" allowed="false" />
+ <add fileExtension=".sdmDocument" allowed="false" />
+ <add fileExtension=".mdf" allowed="false" />
+ <add fileExtension=".ldf" allowed="false" />
+ <add fileExtension=".ad" allowed="false" />
+ <add fileExtension=".dd" allowed="false" />
+ <add fileExtension=".ldd" allowed="false" />
+ <add fileExtension=".sd" allowed="false" />
+ <add fileExtension=".adprototype" allowed="false" />
+ <add fileExtension=".lddprototype" allowed="false" />
+ <add fileExtension=".exclude" allowed="false" />
+ <add fileExtension=".refresh" allowed="false" />
+ <add fileExtension=".compiled" allowed="false" />
+ <add fileExtension=".msgx" allowed="false" />
+ <add fileExtension=".vsdisco" allowed="false" />
+ <add fileExtension=".rules" allowed="false" />
+ </fileExtensions>
+ <verbs allowUnlisted="true" applyToWebDAV="true" />
+ <hiddenSegments applyToWebDAV="true">
+ <add segment="web.config" />
+ <add segment="bin" />
+ <add segment="App_code" />
+ <add segment="App_GlobalResources" />
+ <add segment="App_LocalResources" />
+ <add segment="App_WebReferences" />
+ <add segment="App_Data" />
+ <add segment="App_Browsers" />
+ </hiddenSegments>
+ </requestFiltering>
+
+ </security>
+
+ <serverSideInclude ssiExecDisable="false" />
+
+ <staticContent lockAttributes="isDocFooterFileName">
+ <mimeMap fileExtension=".323" mimeType="text/h323" />
+ <mimeMap fileExtension=".3g2" mimeType="video/3gpp2" />
+ <mimeMap fileExtension=".3gp2" mimeType="video/3gpp2" />
+ <mimeMap fileExtension=".3gp" mimeType="video/3gpp" />
+ <mimeMap fileExtension=".3gpp" mimeType="video/3gpp" />
+ <mimeMap fileExtension=".aac" mimeType="audio/aac" />
+ <mimeMap fileExtension=".aaf" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".aca" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".accdb" mimeType="application/msaccess" />
+ <mimeMap fileExtension=".accde" mimeType="application/msaccess" />
+ <mimeMap fileExtension=".accdt" mimeType="application/msaccess" />
+ <mimeMap fileExtension=".acx" mimeType="application/internet-property-stream" />
+ <mimeMap fileExtension=".adt" mimeType="audio/vnd.dlna.adts" />
+ <mimeMap fileExtension=".adts" mimeType="audio/vnd.dlna.adts" />
+ <mimeMap fileExtension=".afm" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".ai" mimeType="application/postscript" />
+ <mimeMap fileExtension=".aif" mimeType="audio/x-aiff" />
+ <mimeMap fileExtension=".aifc" mimeType="audio/aiff" />
+ <mimeMap fileExtension=".aiff" mimeType="audio/aiff" />
+ <mimeMap fileExtension=".appcache" mimeType="text/cache-manifest" />
+ <mimeMap fileExtension=".application" mimeType="application/x-ms-application" />
+ <mimeMap fileExtension=".art" mimeType="image/x-jg" />
+ <mimeMap fileExtension=".asd" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".asf" mimeType="video/x-ms-asf" />
+ <mimeMap fileExtension=".asi" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".asm" mimeType="text/plain" />
+ <mimeMap fileExtension=".asr" mimeType="video/x-ms-asf" />
+ <mimeMap fileExtension=".asx" mimeType="video/x-ms-asf" />
+ <mimeMap fileExtension=".atom" mimeType="application/atom+xml" />
+ <mimeMap fileExtension=".au" mimeType="audio/basic" />
+ <mimeMap fileExtension=".avi" mimeType="video/avi" />
+ <mimeMap fileExtension=".axs" mimeType="application/olescript" />
+ <mimeMap fileExtension=".bas" mimeType="text/plain" />
+ <mimeMap fileExtension=".bcpio" mimeType="application/x-bcpio" />
+ <mimeMap fileExtension=".bin" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".bmp" mimeType="image/bmp" />
+ <mimeMap fileExtension=".c" mimeType="text/plain" />
+ <mimeMap fileExtension=".cab" mimeType="application/vnd.ms-cab-compressed" />
+ <mimeMap fileExtension=".calx" mimeType="application/vnd.ms-office.calx" />
+ <mimeMap fileExtension=".cat" mimeType="application/vnd.ms-pki.seccat" />
+ <mimeMap fileExtension=".cdf" mimeType="application/x-cdf" />
+ <mimeMap fileExtension=".chm" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".class" mimeType="application/x-java-applet" />
+ <mimeMap fileExtension=".clp" mimeType="application/x-msclip" />
+ <mimeMap fileExtension=".cmx" mimeType="image/x-cmx" />
+ <mimeMap fileExtension=".cnf" mimeType="text/plain" />
+ <mimeMap fileExtension=".cod" mimeType="image/cis-cod" />
+ <mimeMap fileExtension=".cpio" mimeType="application/x-cpio" />
+ <mimeMap fileExtension=".cpp" mimeType="text/plain" />
+ <mimeMap fileExtension=".crd" mimeType="application/x-mscardfile" />
+ <mimeMap fileExtension=".crl" mimeType="application/pkix-crl" />
+ <mimeMap fileExtension=".crt" mimeType="application/x-x509-ca-cert" />
+ <mimeMap fileExtension=".csh" mimeType="application/x-csh" />
+ <mimeMap fileExtension=".css" mimeType="text/css" />
+ <mimeMap fileExtension=".csv" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".cur" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".dcr" mimeType="application/x-director" />
+ <mimeMap fileExtension=".deploy" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".der" mimeType="application/x-x509-ca-cert" />
+ <mimeMap fileExtension=".dib" mimeType="image/bmp" />
+ <mimeMap fileExtension=".dir" mimeType="application/x-director" />
+ <mimeMap fileExtension=".disco" mimeType="text/xml" />
+ <mimeMap fileExtension=".dll" mimeType="application/x-msdownload" />
+ <mimeMap fileExtension=".dll.config" mimeType="text/xml" />
+ <mimeMap fileExtension=".dlm" mimeType="text/dlm" />
+ <mimeMap fileExtension=".doc" mimeType="application/msword" />
+ <mimeMap fileExtension=".docm" mimeType="application/vnd.ms-word.document.macroEnabled.12" />
+ <mimeMap fileExtension=".docx" mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />
+ <mimeMap fileExtension=".dot" mimeType="application/msword" />
+ <mimeMap fileExtension=".dotm" mimeType="application/vnd.ms-word.template.macroEnabled.12" />
+ <mimeMap fileExtension=".dotx" mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.template" />
+ <mimeMap fileExtension=".dsp" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".dtd" mimeType="text/xml" />
+ <mimeMap fileExtension=".dvi" mimeType="application/x-dvi" />
+ <mimeMap fileExtension=".dvr-ms" mimeType="video/x-ms-dvr" />
+ <mimeMap fileExtension=".dwf" mimeType="drawing/x-dwf" />
+ <mimeMap fileExtension=".dwp" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".dxr" mimeType="application/x-director" />
+ <mimeMap fileExtension=".eml" mimeType="message/rfc822" />
+ <mimeMap fileExtension=".emz" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".eot" mimeType="application/vnd.ms-fontobject" />
+ <mimeMap fileExtension=".eps" mimeType="application/postscript" />
+ <mimeMap fileExtension=".esd" mimeType="application/vnd.ms-cab-compressed" />
+ <mimeMap fileExtension=".etx" mimeType="text/x-setext" />
+ <mimeMap fileExtension=".evy" mimeType="application/envoy" />
+ <mimeMap fileExtension=".exe" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".exe.config" mimeType="text/xml" />
+ <mimeMap fileExtension=".fdf" mimeType="application/vnd.fdf" />
+ <mimeMap fileExtension=".fif" mimeType="application/fractals" />
+ <mimeMap fileExtension=".fla" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".flr" mimeType="x-world/x-vrml" />
+ <mimeMap fileExtension=".flv" mimeType="video/x-flv" />
+ <mimeMap fileExtension=".gif" mimeType="image/gif" />
+ <mimeMap fileExtension=".glb" mimeType="model/gltf-binary" />
+ <mimeMap fileExtension=".gtar" mimeType="application/x-gtar" />
+ <mimeMap fileExtension=".gz" mimeType="application/x-gzip" />
+ <mimeMap fileExtension=".h" mimeType="text/plain" />
+ <mimeMap fileExtension=".hdf" mimeType="application/x-hdf" />
+ <mimeMap fileExtension=".hdml" mimeType="text/x-hdml" />
+ <mimeMap fileExtension=".hhc" mimeType="application/x-oleobject" />
+ <mimeMap fileExtension=".hhk" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".hhp" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".hlp" mimeType="application/winhlp" />
+ <mimeMap fileExtension=".hqx" mimeType="application/mac-binhex40" />
+ <mimeMap fileExtension=".hta" mimeType="application/hta" />
+ <mimeMap fileExtension=".htc" mimeType="text/x-component" />
+ <mimeMap fileExtension=".htm" mimeType="text/html" />
+ <mimeMap fileExtension=".html" mimeType="text/html" />
+ <mimeMap fileExtension=".htt" mimeType="text/webviewhtml" />
+ <mimeMap fileExtension=".hxt" mimeType="text/html" />
+ <mimeMap fileExtension=".ico" mimeType="image/x-icon" />
+ <mimeMap fileExtension=".ics" mimeType="text/calendar" />
+ <mimeMap fileExtension=".ief" mimeType="image/ief" />
+ <mimeMap fileExtension=".iii" mimeType="application/x-iphone" />
+ <mimeMap fileExtension=".inf" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".ins" mimeType="application/x-internet-signup" />
+ <mimeMap fileExtension=".isp" mimeType="application/x-internet-signup" />
+ <mimeMap fileExtension=".IVF" mimeType="video/x-ivf" />
+ <mimeMap fileExtension=".jar" mimeType="application/java-archive" />
+ <mimeMap fileExtension=".java" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".jck" mimeType="application/liquidmotion" />
+ <mimeMap fileExtension=".jcz" mimeType="application/liquidmotion" />
+ <mimeMap fileExtension=".jfif" mimeType="image/pjpeg" />
+ <mimeMap fileExtension=".jpb" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".jpe" mimeType="image/jpeg" />
+ <mimeMap fileExtension=".jpeg" mimeType="image/jpeg" />
+ <mimeMap fileExtension=".jpg" mimeType="image/jpeg" />
+ <mimeMap fileExtension=".js" mimeType="application/javascript" />
+ <mimeMap fileExtension=".json" mimeType="application/json" />
+ <mimeMap fileExtension=".jsonld" mimeType="application/ld+json" />
+ <mimeMap fileExtension=".jsx" mimeType="text/jscript" />
+ <mimeMap fileExtension=".latex" mimeType="application/x-latex" />
+ <mimeMap fileExtension=".less" mimeType="text/css" />
+ <mimeMap fileExtension=".lit" mimeType="application/x-ms-reader" />
+ <mimeMap fileExtension=".lpk" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".lsf" mimeType="video/x-la-asf" />
+ <mimeMap fileExtension=".lsx" mimeType="video/x-la-asf" />
+ <mimeMap fileExtension=".lzh" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".m13" mimeType="application/x-msmediaview" />
+ <mimeMap fileExtension=".m14" mimeType="application/x-msmediaview" />
+ <mimeMap fileExtension=".m1v" mimeType="video/mpeg" />
+ <mimeMap fileExtension=".m2ts" mimeType="video/vnd.dlna.mpeg-tts" />
+ <mimeMap fileExtension=".m3u" mimeType="audio/x-mpegurl" />
+ <mimeMap fileExtension=".m4a" mimeType="audio/mp4" />
+ <mimeMap fileExtension=".m4v" mimeType="video/mp4" />
+ <mimeMap fileExtension=".man" mimeType="application/x-troff-man" />
+ <mimeMap fileExtension=".manifest" mimeType="application/x-ms-manifest" />
+ <mimeMap fileExtension=".map" mimeType="text/plain" />
+ <mimeMap fileExtension=".mdb" mimeType="application/x-msaccess" />
+ <mimeMap fileExtension=".mdp" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".me" mimeType="application/x-troff-me" />
+ <mimeMap fileExtension=".mht" mimeType="message/rfc822" />
+ <mimeMap fileExtension=".mhtml" mimeType="message/rfc822" />
+ <mimeMap fileExtension=".mid" mimeType="audio/mid" />
+ <mimeMap fileExtension=".midi" mimeType="audio/mid" />
+ <mimeMap fileExtension=".mix" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".mmf" mimeType="application/x-smaf" />
+ <mimeMap fileExtension=".mno" mimeType="text/xml" />
+ <mimeMap fileExtension=".mny" mimeType="application/x-msmoney" />
+ <mimeMap fileExtension=".mov" mimeType="video/quicktime" />
+ <mimeMap fileExtension=".movie" mimeType="video/x-sgi-movie" />
+ <mimeMap fileExtension=".mp2" mimeType="video/mpeg" />
+ <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
+ <mimeMap fileExtension=".mp4" mimeType="video/mp4" />
+ <mimeMap fileExtension=".mp4v" mimeType="video/mp4" />
+ <mimeMap fileExtension=".mpa" mimeType="video/mpeg" />
+ <mimeMap fileExtension=".mpe" mimeType="video/mpeg" />
+ <mimeMap fileExtension=".mpeg" mimeType="video/mpeg" />
+ <mimeMap fileExtension=".mpg" mimeType="video/mpeg" />
+ <mimeMap fileExtension=".mpp" mimeType="application/vnd.ms-project" />
+ <mimeMap fileExtension=".mpv2" mimeType="video/mpeg" />
+ <mimeMap fileExtension=".ms" mimeType="application/x-troff-ms" />
+ <mimeMap fileExtension=".msi" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".mso" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".mvb" mimeType="application/x-msmediaview" />
+ <mimeMap fileExtension=".mvc" mimeType="application/x-miva-compiled" />
+ <mimeMap fileExtension=".nc" mimeType="application/x-netcdf" />
+ <mimeMap fileExtension=".nsc" mimeType="video/x-ms-asf" />
+ <mimeMap fileExtension=".nws" mimeType="message/rfc822" />
+ <mimeMap fileExtension=".ocx" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".oda" mimeType="application/oda" />
+ <mimeMap fileExtension=".odc" mimeType="text/x-ms-odc" />
+ <mimeMap fileExtension=".ods" mimeType="application/oleobject" />
+ <mimeMap fileExtension=".oga" mimeType="audio/ogg" />
+ <mimeMap fileExtension=".ogg" mimeType="video/ogg" />
+ <mimeMap fileExtension=".ogv" mimeType="video/ogg" />
+ <mimeMap fileExtension=".one" mimeType="application/onenote" />
+ <mimeMap fileExtension=".onea" mimeType="application/onenote" />
+ <mimeMap fileExtension=".onetoc" mimeType="application/onenote" />
+ <mimeMap fileExtension=".onetoc2" mimeType="application/onenote" />
+ <mimeMap fileExtension=".onetmp" mimeType="application/onenote" />
+ <mimeMap fileExtension=".onepkg" mimeType="application/onenote" />
+ <mimeMap fileExtension=".osdx" mimeType="application/opensearchdescription+xml" />
+ <mimeMap fileExtension=".otf" mimeType="font/otf" />
+ <mimeMap fileExtension=".p10" mimeType="application/pkcs10" />
+ <mimeMap fileExtension=".p12" mimeType="application/x-pkcs12" />
+ <mimeMap fileExtension=".p7b" mimeType="application/x-pkcs7-certificates" />
+ <mimeMap fileExtension=".p7c" mimeType="application/pkcs7-mime" />
+ <mimeMap fileExtension=".p7m" mimeType="application/pkcs7-mime" />
+ <mimeMap fileExtension=".p7r" mimeType="application/x-pkcs7-certreqresp" />
+ <mimeMap fileExtension=".p7s" mimeType="application/pkcs7-signature" />
+ <mimeMap fileExtension=".pbm" mimeType="image/x-portable-bitmap" />
+ <mimeMap fileExtension=".pcx" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".pcz" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".pdf" mimeType="application/pdf" />
+ <mimeMap fileExtension=".pfb" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".pfm" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".pfx" mimeType="application/x-pkcs12" />
+ <mimeMap fileExtension=".pgm" mimeType="image/x-portable-graymap" />
+ <mimeMap fileExtension=".pko" mimeType="application/vnd.ms-pki.pko" />
+ <mimeMap fileExtension=".pma" mimeType="application/x-perfmon" />
+ <mimeMap fileExtension=".pmc" mimeType="application/x-perfmon" />
+ <mimeMap fileExtension=".pml" mimeType="application/x-perfmon" />
+ <mimeMap fileExtension=".pmr" mimeType="application/x-perfmon" />
+ <mimeMap fileExtension=".pmw" mimeType="application/x-perfmon" />
+ <mimeMap fileExtension=".png" mimeType="image/png" />
+ <mimeMap fileExtension=".pnm" mimeType="image/x-portable-anymap" />
+ <mimeMap fileExtension=".pnz" mimeType="image/png" />
+ <mimeMap fileExtension=".pot" mimeType="application/vnd.ms-powerpoint" />
+ <mimeMap fileExtension=".potm" mimeType="application/vnd.ms-powerpoint.template.macroEnabled.12" />
+ <mimeMap fileExtension=".potx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.template" />
+ <mimeMap fileExtension=".ppam" mimeType="application/vnd.ms-powerpoint.addin.macroEnabled.12" />
+ <mimeMap fileExtension=".ppm" mimeType="image/x-portable-pixmap" />
+ <mimeMap fileExtension=".pps" mimeType="application/vnd.ms-powerpoint" />
+ <mimeMap fileExtension=".ppsm" mimeType="application/vnd.ms-powerpoint.slideshow.macroEnabled.12" />
+ <mimeMap fileExtension=".ppsx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.slideshow" />
+ <mimeMap fileExtension=".ppt" mimeType="application/vnd.ms-powerpoint" />
+ <mimeMap fileExtension=".pptm" mimeType="application/vnd.ms-powerpoint.presentation.macroEnabled.12" />
+ <mimeMap fileExtension=".pptx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" />
+ <mimeMap fileExtension=".prf" mimeType="application/pics-rules" />
+ <mimeMap fileExtension=".prm" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".prx" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".ps" mimeType="application/postscript" />
+ <mimeMap fileExtension=".psd" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".psm" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".psp" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".pub" mimeType="application/x-mspublisher" />
+ <mimeMap fileExtension=".qt" mimeType="video/quicktime" />
+ <mimeMap fileExtension=".qtl" mimeType="application/x-quicktimeplayer" />
+ <mimeMap fileExtension=".qxd" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".ra" mimeType="audio/x-pn-realaudio" />
+ <mimeMap fileExtension=".ram" mimeType="audio/x-pn-realaudio" />
+ <mimeMap fileExtension=".rar" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".ras" mimeType="image/x-cmu-raster" />
+ <mimeMap fileExtension=".rf" mimeType="image/vnd.rn-realflash" />
+ <mimeMap fileExtension=".rgb" mimeType="image/x-rgb" />
+ <mimeMap fileExtension=".rm" mimeType="application/vnd.rn-realmedia" />
+ <mimeMap fileExtension=".rmi" mimeType="audio/mid" />
+ <mimeMap fileExtension=".roff" mimeType="application/x-troff" />
+ <mimeMap fileExtension=".rpm" mimeType="audio/x-pn-realaudio-plugin" />
+ <mimeMap fileExtension=".rtf" mimeType="application/rtf" />
+ <mimeMap fileExtension=".rtx" mimeType="text/richtext" />
+ <mimeMap fileExtension=".scd" mimeType="application/x-msschedule" />
+ <mimeMap fileExtension=".sct" mimeType="text/scriptlet" />
+ <mimeMap fileExtension=".sea" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".setpay" mimeType="application/set-payment-initiation" />
+ <mimeMap fileExtension=".setreg" mimeType="application/set-registration-initiation" />
+ <mimeMap fileExtension=".sgml" mimeType="text/sgml" />
+ <mimeMap fileExtension=".sh" mimeType="application/x-sh" />
+ <mimeMap fileExtension=".shar" mimeType="application/x-shar" />
+ <mimeMap fileExtension=".sit" mimeType="application/x-stuffit" />
+ <mimeMap fileExtension=".sldm" mimeType="application/vnd.ms-powerpoint.slide.macroEnabled.12" />
+ <mimeMap fileExtension=".sldx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.slide" />
+ <mimeMap fileExtension=".smd" mimeType="audio/x-smd" />
+ <mimeMap fileExtension=".smi" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".smx" mimeType="audio/x-smd" />
+ <mimeMap fileExtension=".smz" mimeType="audio/x-smd" />
+ <mimeMap fileExtension=".snd" mimeType="audio/basic" />
+ <mimeMap fileExtension=".snp" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".spc" mimeType="application/x-pkcs7-certificates" />
+ <mimeMap fileExtension=".spl" mimeType="application/futuresplash" />
+ <mimeMap fileExtension=".spx" mimeType="audio/ogg" />
+ <mimeMap fileExtension=".src" mimeType="application/x-wais-source" />
+ <mimeMap fileExtension=".ssm" mimeType="application/streamingmedia" />
+ <mimeMap fileExtension=".sst" mimeType="application/vnd.ms-pki.certstore" />
+ <mimeMap fileExtension=".stl" mimeType="application/vnd.ms-pki.stl" />
+ <mimeMap fileExtension=".sv4cpio" mimeType="application/x-sv4cpio" />
+ <mimeMap fileExtension=".sv4crc" mimeType="application/x-sv4crc" />
+ <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
+ <mimeMap fileExtension=".svgz" mimeType="image/svg+xml" />
+ <mimeMap fileExtension=".swf" mimeType="application/x-shockwave-flash" />
+ <mimeMap fileExtension=".t" mimeType="application/x-troff" />
+ <mimeMap fileExtension=".tar" mimeType="application/x-tar" />
+ <mimeMap fileExtension=".tcl" mimeType="application/x-tcl" />
+ <mimeMap fileExtension=".tex" mimeType="application/x-tex" />
+ <mimeMap fileExtension=".texi" mimeType="application/x-texinfo" />
+ <mimeMap fileExtension=".texinfo" mimeType="application/x-texinfo" />
+ <mimeMap fileExtension=".tgz" mimeType="application/x-compressed" />
+ <mimeMap fileExtension=".thmx" mimeType="application/vnd.ms-officetheme" />
+ <mimeMap fileExtension=".thn" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".tif" mimeType="image/tiff" />
+ <mimeMap fileExtension=".tiff" mimeType="image/tiff" />
+ <mimeMap fileExtension=".toc" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".tr" mimeType="application/x-troff" />
+ <mimeMap fileExtension=".trm" mimeType="application/x-msterminal" />
+ <mimeMap fileExtension=".ts" mimeType="video/vnd.dlna.mpeg-tts" />
+ <mimeMap fileExtension=".tsv" mimeType="text/tab-separated-values" />
+ <mimeMap fileExtension=".ttf" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".tts" mimeType="video/vnd.dlna.mpeg-tts" />
+ <mimeMap fileExtension=".txt" mimeType="text/plain" />
+ <mimeMap fileExtension=".u32" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".uls" mimeType="text/iuls" />
+ <mimeMap fileExtension=".ustar" mimeType="application/x-ustar" />
+ <mimeMap fileExtension=".vbs" mimeType="text/vbscript" />
+ <mimeMap fileExtension=".vcf" mimeType="text/x-vcard" />
+ <mimeMap fileExtension=".vcs" mimeType="text/plain" />
+ <mimeMap fileExtension=".vdx" mimeType="application/vnd.ms-visio.viewer" />
+ <mimeMap fileExtension=".vml" mimeType="text/xml" />
+ <mimeMap fileExtension=".vsd" mimeType="application/vnd.visio" />
+ <mimeMap fileExtension=".vss" mimeType="application/vnd.visio" />
+ <mimeMap fileExtension=".vst" mimeType="application/vnd.visio" />
+ <mimeMap fileExtension=".vsto" mimeType="application/x-ms-vsto" />
+ <mimeMap fileExtension=".vsw" mimeType="application/vnd.visio" />
+ <mimeMap fileExtension=".vsx" mimeType="application/vnd.visio" />
+ <mimeMap fileExtension=".vtx" mimeType="application/vnd.visio" />
+ <mimeMap fileExtension=".wasm" mimeType="application/wasm" />
+ <mimeMap fileExtension=".wav" mimeType="audio/wav" />
+ <mimeMap fileExtension=".wax" mimeType="audio/x-ms-wax" />
+ <mimeMap fileExtension=".wbmp" mimeType="image/vnd.wap.wbmp" />
+ <mimeMap fileExtension=".wcm" mimeType="application/vnd.ms-works" />
+ <mimeMap fileExtension=".wdb" mimeType="application/vnd.ms-works" />
+ <mimeMap fileExtension=".webm" mimeType="video/webm" />
+ <mimeMap fileExtension=".wks" mimeType="application/vnd.ms-works" />
+ <mimeMap fileExtension=".wm" mimeType="video/x-ms-wm" />
+ <mimeMap fileExtension=".wma" mimeType="audio/x-ms-wma" />
+ <mimeMap fileExtension=".wmd" mimeType="application/x-ms-wmd" />
+ <mimeMap fileExtension=".wmf" mimeType="application/x-msmetafile" />
+ <mimeMap fileExtension=".wml" mimeType="text/vnd.wap.wml" />
+ <mimeMap fileExtension=".wmlc" mimeType="application/vnd.wap.wmlc" />
+ <mimeMap fileExtension=".wmls" mimeType="text/vnd.wap.wmlscript" />
+ <mimeMap fileExtension=".wmlsc" mimeType="application/vnd.wap.wmlscriptc" />
+ <mimeMap fileExtension=".wmp" mimeType="video/x-ms-wmp" />
+ <mimeMap fileExtension=".wmv" mimeType="video/x-ms-wmv" />
+ <mimeMap fileExtension=".wmx" mimeType="video/x-ms-wmx" />
+ <mimeMap fileExtension=".wmz" mimeType="application/x-ms-wmz" />
+ <mimeMap fileExtension=".woff" mimeType="font/x-woff" />
+ <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
+ <mimeMap fileExtension=".wps" mimeType="application/vnd.ms-works" />
+ <mimeMap fileExtension=".wri" mimeType="application/x-mswrite" />
+ <mimeMap fileExtension=".wrl" mimeType="x-world/x-vrml" />
+ <mimeMap fileExtension=".wrz" mimeType="x-world/x-vrml" />
+ <mimeMap fileExtension=".wsdl" mimeType="text/xml" />
+ <mimeMap fileExtension=".wtv" mimeType="video/x-ms-wtv" />
+ <mimeMap fileExtension=".wvx" mimeType="video/x-ms-wvx" />
+ <mimeMap fileExtension=".x" mimeType="application/directx" />
+ <mimeMap fileExtension=".xaf" mimeType="x-world/x-vrml" />
+ <mimeMap fileExtension=".xaml" mimeType="application/xaml+xml" />
+ <mimeMap fileExtension=".xap" mimeType="application/x-silverlight-app" />
+ <mimeMap fileExtension=".xbap" mimeType="application/x-ms-xbap" />
+ <mimeMap fileExtension=".xbm" mimeType="image/x-xbitmap" />
+ <mimeMap fileExtension=".xdr" mimeType="text/plain" />
+ <mimeMap fileExtension=".xht" mimeType="application/xhtml+xml" />
+ <mimeMap fileExtension=".xhtml" mimeType="application/xhtml+xml" />
+ <mimeMap fileExtension=".xla" mimeType="application/vnd.ms-excel" />
+ <mimeMap fileExtension=".xlam" mimeType="application/vnd.ms-excel.addin.macroEnabled.12" />
+ <mimeMap fileExtension=".xlc" mimeType="application/vnd.ms-excel" />
+ <mimeMap fileExtension=".xlm" mimeType="application/vnd.ms-excel" />
+ <mimeMap fileExtension=".xls" mimeType="application/vnd.ms-excel" />
+ <mimeMap fileExtension=".xlsb" mimeType="application/vnd.ms-excel.sheet.binary.macroEnabled.12" />
+ <mimeMap fileExtension=".xlsm" mimeType="application/vnd.ms-excel.sheet.macroEnabled.12" />
+ <mimeMap fileExtension=".xlsx" mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" />
+ <mimeMap fileExtension=".xlt" mimeType="application/vnd.ms-excel" />
+ <mimeMap fileExtension=".xltm" mimeType="application/vnd.ms-excel.template.macroEnabled.12" />
+ <mimeMap fileExtension=".xltx" mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.template" />
+ <mimeMap fileExtension=".xlw" mimeType="application/vnd.ms-excel" />
+ <mimeMap fileExtension=".xml" mimeType="text/xml" />
+ <mimeMap fileExtension=".xof" mimeType="x-world/x-vrml" />
+ <mimeMap fileExtension=".xpm" mimeType="image/x-xpixmap" />
+ <mimeMap fileExtension=".xps" mimeType="application/vnd.ms-xpsdocument" />
+ <mimeMap fileExtension=".xsd" mimeType="text/xml" />
+ <mimeMap fileExtension=".xsf" mimeType="text/xml" />
+ <mimeMap fileExtension=".xsl" mimeType="text/xml" />
+ <mimeMap fileExtension=".xslt" mimeType="text/xml" />
+ <mimeMap fileExtension=".xsn" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".xtp" mimeType="application/octet-stream" />
+ <mimeMap fileExtension=".xwd" mimeType="image/x-xwindowdump" />
+ <mimeMap fileExtension=".z" mimeType="application/x-compress" />
+ <mimeMap fileExtension=".zip" mimeType="application/x-zip-compressed" />
+ </staticContent>
+
+ <tracing>
+
+ <traceFailedRequests>
+ <add path="*">
+ <traceAreas>
+ <add provider="ASP" verbosity="Verbose" />
+ <add provider="ASPNET" areas="Infrastructure,Module,Page,AppServices" verbosity="Verbose" />
+ <add provider="ISAPI Extension" verbosity="Verbose" />
+ <add provider="WWW Server" areas="Authentication,Security,Filter,StaticFile,CGI,Compression,Cache,RequestNotifications,Module,Rewrite,WebSocket" verbosity="Verbose" />
+ </traceAreas>
+ <failureDefinitions statusCodes="200-999" />
+ </add>
+ </traceFailedRequests>
+
+ <traceProviderDefinitions>
+ <add name="WWW Server" guid="{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}">
+ <areas>
+ <clear />
+ <add name="Authentication" value="2" />
+ <add name="Security" value="4" />
+ <add name="Filter" value="8" />
+ <add name="StaticFile" value="16" />
+ <add name="CGI" value="32" />
+ <add name="Compression" value="64" />
+ <add name="Cache" value="128" />
+ <add name="RequestNotifications" value="256" />
+ <add name="Module" value="512" />
+ <add name="Rewrite" value="1024" />
+ <add name="FastCGI" value="4096" />
+ <add name="WebSocket" value="16384" />
+ <add name="ANCM" value="65536" />
+ </areas>
+ </add>
+ <add name="ASP" guid="{06b94d9a-b15e-456e-a4ef-37c984a2cb4b}">
+ <areas>
+ <clear />
+ </areas>
+ </add>
+ <add name="ISAPI Extension" guid="{a1c2040e-8840-4c31-ba11-9871031a19ea}">
+ <areas>
+ <clear />
+ </areas>
+ </add>
+ <add name="ASPNET" guid="{AFF081FE-0247-4275-9C4E-021F3DC1DA35}">
+ <areas>
+ <add name="Infrastructure" value="1" />
+ <add name="Module" value="2" />
+ <add name="Page" value="4" />
+ <add name="AppServices" value="8" />
+ </areas>
+ </add>
+ </traceProviderDefinitions>
+
+ </tracing>
+
+ <urlCompression />
+
+ <validation />
+ <webdav>
+ <globalSettings>
+ <propertyStores>
+ <add name="webdav_simple_prop" image="%IIS_BIN%\webdav_simple_prop.dll" image32="%IIS_BIN%\webdav_simple_prop.dll" />
+ </propertyStores>
+ <lockStores>
+ <add name="webdav_simple_lock" image="%IIS_BIN%\webdav_simple_lock.dll" image32="%IIS_BIN%\webdav_simple_lock.dll" />
+ </lockStores>
+
+ </globalSettings>
+ <authoring>
+ <locks enabled="true" lockStore="webdav_simple_lock" />
+ </authoring>
+ <authoringRules />
+ </webdav>
+ <webSocket />
+ <applicationInitialization />
+
+ </system.webServer>
+ <location path="" overrideMode="Allow">
+ <system.webServer>
+ <modules>
+ <add name="IsapiFilterModule" lockItem="true" />
+ <add name="BasicAuthenticationModule" lockItem="true" />
+ <add name="IsapiModule" lockItem="true" />
+ <add name="HttpLoggingModule" lockItem="true" />
+ <add name="DynamicCompressionModule" lockItem="true" />
+ <add name="StaticCompressionModule" lockItem="true" />
+ <add name="DefaultDocumentModule" lockItem="true" />
+ <add name="DirectoryListingModule" lockItem="true" />
+ <add name="ProtocolSupportModule" lockItem="true" />
+ <add name="HttpRedirectionModule" lockItem="true" />
+ <add name="ServerSideIncludeModule" lockItem="true" />
+ <add name="StaticFileModule" lockItem="true" />
+ <add name="AnonymousAuthenticationModule" lockItem="true" />
+ <add name="CertificateMappingAuthenticationModule" lockItem="true" />
+ <add name="UrlAuthorizationModule" lockItem="true" />
+ <add name="WindowsAuthenticationModule" lockItem="true" />
+ <add name="IISCertificateMappingAuthenticationModule" lockItem="true" />
+ <add name="WebMatrixSupportModule" lockItem="true" />
+ <add name="IpRestrictionModule" lockItem="true" />
+ <add name="DynamicIpRestrictionModule" lockItem="true" />
+ <add name="RequestFilteringModule" lockItem="true" />
+ <add name="CustomLoggingModule" lockItem="true" />
+ <add name="CustomErrorModule" lockItem="true" />
+ <add name="FailedRequestsTracingModule" lockItem="true" />
+ <add name="CgiModule" lockItem="true" />
+ <add name="FastCgiModule" lockItem="true" />
+<!-- <add name="WebDAVModule" /> -->
+ <add name="RewriteModule" />
+ <add name="OutputCache" type="System.Web.Caching.OutputCacheModule" preCondition="managedHandler" />
+ <add name="Session" type="System.Web.SessionState.SessionStateModule" preCondition="managedHandler" />
+ <add name="WindowsAuthentication" type="System.Web.Security.WindowsAuthenticationModule" preCondition="managedHandler" />
+ <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" preCondition="managedHandler" />
+ <add name="DefaultAuthentication" type="System.Web.Security.DefaultAuthenticationModule" preCondition="managedHandler" />
+ <add name="RoleManager" type="System.Web.Security.RoleManagerModule" preCondition="managedHandler" />
+ <add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule" preCondition="managedHandler" />
+ <add name="FileAuthorization" type="System.Web.Security.FileAuthorizationModule" preCondition="managedHandler" />
+ <add name="AnonymousIdentification" type="System.Web.Security.AnonymousIdentificationModule" preCondition="managedHandler" />
+ <add name="Profile" type="System.Web.Profile.ProfileModule" preCondition="managedHandler" />
+ <add name="UrlMappingsModule" type="System.Web.UrlMappingsModule" preCondition="managedHandler" />
+ <add name="ApplicationInitializationModule" lockItem="true" />
+ <add name="WebSocketModule" lockItem="true" />
+ <add name="ServiceModel-4.0" type="System.ServiceModel.Activation.ServiceHttpModule,System.ServiceModel.Activation,Version=4.0.0.0,Culture=neutral,PublicKeyToken=31bf3856ad364e35" preCondition="managedHandler,runtimeVersionv4.0" />
+ <add name="ConfigurationValidationModule" lockItem="true" />
+ <add name="UrlRoutingModule-4.0" type="System.Web.Routing.UrlRoutingModule" preCondition="managedHandler,runtimeVersionv4.0" />
+ <add name="ScriptModule-4.0" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="managedHandler,runtimeVersionv4.0" />
+ <add name="AspNetCoreModule" lockItem="true" />
+ <add name="AspNetCoreModuleV2" lockItem="true" />
+ </modules>
+ <handlers accessPolicy="Read, Script">
+<!-- <add name="WebDAV" path="*" verb="PROPFIND,PROPPATCH,MKCOL,PUT,COPY,DELETE,MOVE,LOCK,UNLOCK" modules="WebDAVModule" resourceType="Unspecified" requireAccess="None" /> -->
+ <add name="AXD-ISAPI-4.0_64bit" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="PageHandlerFactory-ISAPI-4.0_64bit" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="SimpleHandlerFactory-ISAPI-4.0_64bit" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="WebServiceHandlerFactory-ISAPI-4.0_64bit" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="HttpRemotingHandlerFactory-rem-ISAPI-4.0_64bit" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="HttpRemotingHandlerFactory-soap-ISAPI-4.0_64bit" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="svc-ISAPI-4.0_64bit" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" />
+ <add name="rules-ISAPI-4.0_64bit" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" />
+ <add name="xoml-ISAPI-4.0_64bit" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" />
+ <add name="xamlx-ISAPI-4.0_64bit" path="*.xamlx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" />
+ <add name="aspq-ISAPI-4.0_64bit" path="*.aspq" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="cshtm-ISAPI-4.0_64bit" path="*.cshtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="cshtml-ISAPI-4.0_64bit" path="*.cshtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="vbhtm-ISAPI-4.0_64bit" path="*.vbhtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="vbhtml-ISAPI-4.0_64bit" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="AXD-ISAPI-4.0_32bit" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="PageHandlerFactory-ISAPI-4.0_32bit" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="SimpleHandlerFactory-ISAPI-4.0_32bit" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="WebServiceHandlerFactory-ISAPI-4.0_32bit" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="HttpRemotingHandlerFactory-rem-ISAPI-4.0_32bit" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="HttpRemotingHandlerFactory-soap-ISAPI-4.0_32bit" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="svc-ISAPI-4.0_32bit" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
+ <add name="rules-ISAPI-4.0_32bit" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
+ <add name="xoml-ISAPI-4.0_32bit" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
+ <add name="xamlx-ISAPI-4.0_32bit" path="*.xamlx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" />
+ <add name="aspq-ISAPI-4.0_32bit" path="*.aspq" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="cshtm-ISAPI-4.0_32bit" path="*.cshtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="cshtml-ISAPI-4.0_32bit" path="*.cshtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="vbhtm-ISAPI-4.0_32bit" path="*.vbhtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="vbhtml-ISAPI-4.0_32bit" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="TraceHandler-Integrated-4.0" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="WebAdminHandler-Integrated-4.0" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="AssemblyResourceLoader-Integrated-4.0" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="PageHandlerFactory-Integrated-4.0" path="*.aspx" verb="GET,HEAD,POST,DEBUG" type="System.Web.UI.PageHandlerFactory" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="SimpleHandlerFactory-Integrated-4.0" path="*.ashx" verb="GET,HEAD,POST,DEBUG" type="System.Web.UI.SimpleHandlerFactory" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="WebServiceHandlerFactory-Integrated-4.0" path="*.asmx" verb="GET,HEAD,POST,DEBUG" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="HttpRemotingHandlerFactory-rem-Integrated-4.0" path="*.rem" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="HttpRemotingHandlerFactory-soap-Integrated-4.0" path="*.soap" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="svc-Integrated-4.0" path="*.svc" verb="*" type="System.ServiceModel.Activation.ServiceHttpHandlerFactory, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="rules-Integrated-4.0" path="*.rules" verb="*" type="System.ServiceModel.Activation.ServiceHttpHandlerFactory, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="xoml-Integrated-4.0" path="*.xoml" verb="*" type="System.ServiceModel.Activation.ServiceHttpHandlerFactory, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="xamlx-Integrated-4.0" path="*.xamlx" verb="GET,HEAD,POST,DEBUG" type="System.Xaml.Hosting.XamlHttpHandlerFactory, System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="aspq-Integrated-4.0" path="*.aspq" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="cshtm-Integrated-4.0" path="*.cshtm" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="cshtml-Integrated-4.0" path="*.cshtml" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="vbhtm-Integrated-4.0" path="*.vbhtm" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="vbhtml-Integrated-4.0" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="ScriptHandlerFactoryAppServices-Integrated-4.0" path="*_AppService.axd" verb="*" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="ScriptResourceIntegrated-4.0" path="*ScriptResource.axd" verb="GET,HEAD" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" />
+ <add name="ASPClassic" path="*.asp" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%IIS_BIN%\asp.dll" resourceType="File" />
+ <add name="SecurityCertificate" path="*.cer" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%IIS_BIN%\asp.dll" resourceType="File" />
+ <add name="ISAPI-dll" path="*.dll" verb="*" modules="IsapiModule" resourceType="File" requireAccess="Execute" allowPathInfo="true" />
+ <add name="TraceHandler-Integrated" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode,runtimeVersionv2.0" />
+ <add name="WebAdminHandler-Integrated" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode,runtimeVersionv2.0" />
+ <add name="AssemblyResourceLoader-Integrated" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode,runtimeVersionv2.0" />
+ <add name="PageHandlerFactory-Integrated" path="*.aspx" verb="GET,HEAD,POST,DEBUG" type="System.Web.UI.PageHandlerFactory" preCondition="integratedMode,runtimeVersionv2.0" />
+ <add name="SimpleHandlerFactory-Integrated" path="*.ashx" verb="GET,HEAD,POST,DEBUG" type="System.Web.UI.SimpleHandlerFactory" preCondition="integratedMode,runtimeVersionv2.0" />
+ <add name="WebServiceHandlerFactory-Integrated" path="*.asmx" verb="GET,HEAD,POST,DEBUG" type="System.Web.Services.Protocols.WebServiceHandlerFactory,System.Web.Services,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b03f5f7f11d50a3a" preCondition="integratedMode,runtimeVersionv2.0" />
+ <add name="HttpRemotingHandlerFactory-rem-Integrated" path="*.rem" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
+ <add name="HttpRemotingHandlerFactory-soap-Integrated" path="*.soap" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
+ <add name="AXD-ISAPI-2.0" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
+ <add name="PageHandlerFactory-ISAPI-2.0" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
+ <add name="SimpleHandlerFactory-ISAPI-2.0" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
+ <add name="WebServiceHandlerFactory-ISAPI-2.0" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
+ <add name="HttpRemotingHandlerFactory-rem-ISAPI-2.0" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
+ <add name="HttpRemotingHandlerFactory-soap-ISAPI-2.0" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
+ <add name="AXD-ISAPI-2.0-64" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
+ <add name="PageHandlerFactory-ISAPI-2.0-64" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
+ <add name="SimpleHandlerFactory-ISAPI-2.0-64" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
+ <add name="WebServiceHandlerFactory-ISAPI-2.0-64" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
+ <add name="HttpRemotingHandlerFactory-rem-ISAPI-2.0-64" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
+ <add name="HttpRemotingHandlerFactory-soap-ISAPI-2.0-64" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" responseBufferLimit="0" />
+ <add name="CGI-exe" path="*.exe" verb="*" modules="CgiModule" resourceType="File" requireAccess="Execute" allowPathInfo="true" />
+ <add name="SSINC-stm" path="*.stm" verb="GET,HEAD,POST" modules="ServerSideIncludeModule" resourceType="File" />
+ <add name="SSINC-shtm" path="*.shtm" verb="GET,HEAD,POST" modules="ServerSideIncludeModule" resourceType="File" />
+ <add name="SSINC-shtml" path="*.shtml" verb="GET,HEAD,POST" modules="ServerSideIncludeModule" resourceType="File" />
+ <add name="TRACEVerbHandler" path="*" verb="TRACE" modules="ProtocolSupportModule" requireAccess="None" />
+ <add name="OPTIONSVerbHandler" path="*" verb="OPTIONS" modules="ProtocolSupportModule" requireAccess="None" />
+ <add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0" />
+ <add name="StaticFile" path="*" verb="*" modules="StaticFileModule,DefaultDocumentModule,DirectoryListingModule" resourceType="Either" requireAccess="Read" />
+ </handlers>
+ </system.webServer>
+ </location>
+</configuration>
diff --git a/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
index 7c1625a..085b9eb 100644
--- a/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
+++ b/WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suo
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug.rar b/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug.rar
deleted file mode 100644
index 013ebe3..0000000
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/bin/Debug.rar
+++ /dev/null
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache
index 27287bc..f8b746e 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.GenerateResource.cache b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.GenerateResource.cache
index 254a593..b49d8fd 100644
--- a/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.GenerateResource.cache
+++ b/WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.GenerateResource.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
index ed1d2e9..8c2f08e 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/Program.cs
@@ -16,7 +16,7 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new ReadCSV());
+ Application.Run(new ReadCSV_New());
}
}
}
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
index 457a52d..cb8c3f7 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
@@ -37,14 +37,14 @@
{
try
{
- DataSet ds = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HBillNo='" + HBillNo + "' ", "Sc_ProcessExchangeBillMain");
+ DataSet ds = oCN.RunProcReturn("select HProjectNum from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HBillNo='" + HBillNo + "' ", "Sc_ProcessExchangeBillMain");
if (ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鏌ユ棤鏁版嵁!");
}
else
{
- DataSet dataSet= oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
+ DataSet dataSet = oCN.RunProcReturn("select HICMOStatus HICMOStatus from Sc_ICMOBillStatus_Tmp WITH(NOLOCK) where HSourceBillNo='" + HBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
if (dataSet.Tables[0].Rows.Count > 0)
{
string HProjectNum = ds.Tables[0].Rows[0]["HProjectNum"].ToString();
@@ -52,7 +52,8 @@
this.txtHBardCode.ReadOnly = true;
list.Clear();
}
- else {
+ else
+ {
MessageBox.Show(HBillNo + ",娴佽浆鍗℃湭寮�宸�!");
}
}
@@ -85,7 +86,7 @@
{
try
{
- DataSet ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + HNumber + "' ", "Gy_Employee");
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Employee WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Employee");
if (ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鏌ユ棤鏁版嵁!");
@@ -123,12 +124,13 @@
private void btnReadData_Click(object sender, EventArgs e)
{
- if (this.HEmpCode.Text == "" || this.txtHBath.Text == ""|| this.HSouceName.Text == "")
+ if (this.HEmpCode.Text == "" || this.txtHBath.Text == "" || this.HSouceName.Text == "")
{
MessageBox.Show("璇疯緭鍏ョ敓浜ц祫婧�,鍛樺伐缂栫爜,鑰呮潯褰㈢爜!");
}
- else {
+ else
+ {
if (num == 0)
{
this.btnReadData.Text = "鏆傚仠";
@@ -151,7 +153,7 @@
private void timer1_Tick(object sender, EventArgs e)
{
- if (this.HEmpCode.Text == ""|| this.txtHBath.Text == "")
+ if (this.HEmpCode.Text == "" || this.txtHBath.Text == "")
{
MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮佹垨鑰呮祦杞崱!");
}
@@ -204,7 +206,7 @@
File.Copy(csv_file_path, csv_file_path_Read, true);
string contents = File.ReadAllText(csv_file_path_Read, Encoding.GetEncoding("gb2312"));
-
+
TextFieldParser parser = new TextFieldParser(new StringReader(contents));
parser.HasFieldsEnclosedInQuotes = true;
@@ -242,7 +244,7 @@
DateTime NowTime = DateTime.Parse(item["娴嬭瘯鏃堕棿"].ToString());
string HBadCodeSN = item["搴忓彿"].ToString();
- if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "" && list.Contains(HBadCodeSN)==false)
+ if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "" && list.Contains(HBadCodeSN) == false)
{
string HSourceCode = this.HSouce.Text; //璁惧缂栧彿 缁勮1 9994 缁勮2 9995 缁勮3 9996
@@ -264,10 +266,10 @@
if (true)
{
- if (Get_AllowLoadData(HBarCode, HProcNumber, flag_1,out flag_2))
+ if (Get_AllowLoadData(HBarCode, HProcNumber, flag_1, out flag_2))
{
string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
- values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql);
ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",褰撳墠鏃ユ湡:" + DateTime.Now.ToString() + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
list.Add(HBarCode);
@@ -281,19 +283,20 @@
string HCount_1 = item[HType].ToString();
//鏌ヨ褰撳ぉ鏉＄爜 瀵瑰簲鐨勫伐鑹哄弬鏁版湁娌℃湁鎻掑叆鍒伴噷闈� 濡傛灉娌℃湁鍒欐柊澧�
- DataSet ds1 = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
+ DataSet ds1 = oCN.RunProcReturn(@"select HBarCode from Sb_EquipMentCollectionTechParam_SN WITH(NOLOCK) where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
if (ds1.Tables[0].Rows.Count == 0)
{
string sql1 = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
-values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount_1}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount_1}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql1);
//ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
}
}
}
}
- else {
+ else
+ {
flag_1 = flag_2;
}
}
@@ -318,13 +321,14 @@
string HProcNumber = "005";
int HFlag = 0;
- if (HResult != "") {
+ if (HResult != "")
+ {
if (HBadCodeSN != "")
{
string HType = "";
int HCount = 1;
- DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
+ DataSet ds = oCN.RunProcReturn(@"select HBarCode from Sb_EquipMentCollectionTechParam_SN WITH(NOLOCK) where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
if (ds.Tables[0].Rows.Count == 0)
@@ -332,7 +336,7 @@
if (Get_AllowLoadData(HBarCode, HProcNumber, flag_1, out flag_2))
{
string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
- values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql);
ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
@@ -352,12 +356,12 @@
HCount_1 = "0";
}
- DataSet ds1 = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
+ DataSet ds1 = oCN.RunProcReturn(@"select HBarCode from Sb_EquipMentCollectionTechParam_SN WITH(NOLOCK) where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
if (ds1.Tables[0].Rows.Count == 0)
{
string sql1 = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
-values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{(HCount_1 == "" ? " 0" : HCount_1)}','{HCreateTime}','{HDate}','{HResult_TechParam}','{HProcNumber}','{HFlag}')";
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{(HCount_1 == "" ? " 0" : HCount_1)}','{HCreateTime}',GETDATE(),'{HResult_TechParam}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql1);
//ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
}
@@ -386,7 +390,7 @@
public static string AllHProName = "";
public static double AllHQty = 0;
//鏍规嵁鏉＄爜 鍒ゆ柇鏄惁淇濆瓨
- public bool Get_AllowLoadData(string HBarCode,string HProcNumber,bool flag_1,out bool flag_2)
+ public bool Get_AllowLoadData(string HBarCode, string HProcNumber, bool flag_1, out bool flag_2)
{
decimal hqty = 2;
if (HBarCode.Length != 29 && HBarCode.Length != 50)
@@ -402,8 +406,9 @@
{
string str1 = HBarCode.Substring(18, 8);
//string str2 = HBarCode.Substring(23, 3);
- if (AllProcessExchange != str1) {
- DataSet ds = oCN.RunProcReturn("select HInterID,HBillNo from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%' order by HMakeDate desc", "Sc_ProcessExchangeBillMain");
+ if (AllProcessExchange != str1)
+ {
+ DataSet ds = oCN.RunProcReturn("select HInterID,HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HProjectNum like'" + str1 + "-1%' order by HMakeDate desc", "Sc_ProcessExchangeBillMain");
//鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
if (ds.Tables[0].Rows.Count > 0)
{
@@ -430,13 +435,14 @@
else if (HBarCode.Length == 50)
{
string str1 = HBarCode.Substring(42, 8);
- DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
+ DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
//鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
if (ds.Tables[0].Rows.Count > 0)
{
AllProcessExchangeHProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
}
- else {
+ else
+ {
//flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
@@ -444,7 +450,7 @@
MessageBox.Show("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!");
}
DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
-
+
flag_2 = true;
return false;
}
@@ -457,9 +463,10 @@
DataSet ds1;
//绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
- if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl) {
+ if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl)
+ {
//鏌ヨ宸ュ簭
- ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
+ ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WITH(NOLOCK) WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
if (ds1.Tables[0].Rows.Count > 0)
{
AllHProcID = ds1.Tables[0].Rows[0]["HItemID"].ToString();
@@ -467,7 +474,7 @@
}
//鏌ヨ娴佽浆鍗℃暟閲�
- ds1 = oCN.RunProcReturn(@"SELECT HQty FROM Sc_ProcessExchangeBillSub where HInterID=" + HProcExchInterID + " and HProcID=" + AllHProcID, "Sc_ProcessExchangeBillSub");
+ ds1 = oCN.RunProcReturn(@"SELECT HQty FROM Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + HProcExchInterID + " and HProcID=" + AllHProcID, "Sc_ProcessExchangeBillSub");
if (ds1.Tables[0].Rows.Count > 0)
{
AllHQty = double.Parse(ds1.Tables[0].Rows[0]["HQty"].ToString());
@@ -475,47 +482,47 @@
AllSNBarcodeProcCtrl = HProcExchBillNo + HProcNumber;
}
-
+
string HProcID = AllHProcID;
string HProName = AllHProName;
////绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
//if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl)
//{
- //鍒ゆ柇 褰撳墠宸ュ簭 鏉＄爜 鐨勪笂涓�閬撳伐搴忔湁娌℃湁杩囩珯
- ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + HProcID, "h_v_Gy_QualifiedRecordsList");
+ //鍒ゆ柇 褰撳墠宸ュ簭 鏉＄爜 鐨勪笂涓�閬撳伐搴忔湁娌℃湁杩囩珯
+ ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + HProcID, "h_p_Sc_SNBarcodeProcCtrl_S");
- if (ds1.Tables[0].Rows.Count == 0)
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
- //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
- if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
- {
- time = DateTime.Now;
- MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!");
- }
- DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
-
- flag_2 = true;
- return false;
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!");
}
- else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
- //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
- if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
- {
- time = DateTime.Now;
- MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!");
- }
- DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
-
- flag_2 = true;
- return false;
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!");
}
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
//}
//鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
ds1 = oCN.RunProcReturn($@"select ({AllHQty}-sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_StationOutBillMain ou WITH(NOLOCK)
-where ou.HProcExchInterID={HProcExchInterID} and ou.HProcID={AllHProcID}
-group by ou.HProcExchInterID,ou.HProcExchEntryID,ou.HQty", "Sc_StationOutBillMain");
+ where ou.HProcExchInterID={HProcExchInterID} and ou.HProcID={AllHProcID}
+ group by ou.HProcExchInterID,ou.HProcExchEntryID,ou.HQty", "Sc_StationOutBillMain");
//鑾峰彇娴佽浆鍗℃暟閲�
double hqtyOut = AllHQty;
@@ -541,7 +548,8 @@
}
//鎷嶇収宸ュ簭闄ゅ
- if (HProcNumber != "013") {
+ if (HProcNumber != "013")
+ {
//澧炲姞浜х嚎缁勮杩芥函鍗�
//鏌ヨ褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏈夋病鏈夐厤浠朵俊鎭�,濡傛灉鏈� 鍒欏垽鏂厤浠跺崟鐨勬暟閲忔槸鍚︿负0
DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
@@ -568,7 +576,7 @@
}
}
}
-
+
flag_2 = false;
return true;
}
@@ -587,7 +595,7 @@
{
try
{
- DataSet ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + HNumber + "' ", "Gy_Source");
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Source WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Source");
if (ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鏌ユ棤鏁版嵁!");
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.Designer.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.Designer.cs
new file mode 100644
index 0000000..3b79a50
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.Designer.cs
@@ -0,0 +1,223 @@
+锘�
+namespace WFormReadData_SMR
+{
+ partial class ReadCSV_New
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.label1 = new System.Windows.Forms.Label();
+ this.ListSelect = new System.Windows.Forms.ListBox();
+ this.btnSelect = new System.Windows.Forms.Button();
+ this.HEmpCodeName = new System.Windows.Forms.TextBox();
+ this.HEmpCode = new System.Windows.Forms.TextBox();
+ this.yg = new System.Windows.Forms.Label();
+ this.btnReadData = new System.Windows.Forms.Button();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.txtHBath = new System.Windows.Forms.TextBox();
+ this.btnGH = new System.Windows.Forms.Button();
+ this.txtHBardCode = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.HSouceName = new System.Windows.Forms.TextBox();
+ this.HSouce = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(16, 174);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(116, 18);
+ this.label1.TabIndex = 22;
+ this.label1.Text = "璇诲彇鏁版嵁鏄剧ず";
+ //
+ // ListSelect
+ //
+ this.ListSelect.FormattingEnabled = true;
+ this.ListSelect.ItemHeight = 18;
+ this.ListSelect.Location = new System.Drawing.Point(19, 195);
+ this.ListSelect.Name = "ListSelect";
+ this.ListSelect.Size = new System.Drawing.Size(889, 310);
+ this.ListSelect.TabIndex = 21;
+ //
+ // btnSelect
+ //
+ this.btnSelect.Location = new System.Drawing.Point(608, 59);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(78, 38);
+ this.btnSelect.TabIndex = 20;
+ this.btnSelect.Text = "鏇存崲";
+ this.btnSelect.UseVisualStyleBackColor = true;
+ this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+ //
+ // HEmpCodeName
+ //
+ this.HEmpCodeName.Location = new System.Drawing.Point(519, 83);
+ this.HEmpCodeName.Name = "HEmpCodeName";
+ this.HEmpCodeName.ReadOnly = true;
+ this.HEmpCodeName.Size = new System.Drawing.Size(82, 28);
+ this.HEmpCodeName.TabIndex = 19;
+ //
+ // HEmpCode
+ //
+ this.HEmpCode.Location = new System.Drawing.Point(395, 83);
+ this.HEmpCode.Name = "HEmpCode";
+ this.HEmpCode.Size = new System.Drawing.Size(118, 28);
+ this.HEmpCode.TabIndex = 18;
+ this.HEmpCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HEmpCode_KeyDown);
+ //
+ // yg
+ //
+ this.yg.AutoSize = true;
+ this.yg.Location = new System.Drawing.Point(345, 86);
+ this.yg.Name = "yg";
+ this.yg.Size = new System.Drawing.Size(44, 18);
+ this.yg.TabIndex = 17;
+ this.yg.Text = "鍛樺伐";
+ //
+ // btnReadData
+ //
+ this.btnReadData.Location = new System.Drawing.Point(44, 67);
+ this.btnReadData.Name = "btnReadData";
+ this.btnReadData.Size = new System.Drawing.Size(114, 35);
+ this.btnReadData.TabIndex = 16;
+ this.btnReadData.Text = "鍚姩";
+ this.btnReadData.UseVisualStyleBackColor = true;
+ this.btnReadData.Click += new System.EventHandler(this.btnReadData_Click);
+ //
+ // timer1
+ //
+ this.timer1.Interval = 10000;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // txtHBath
+ //
+ this.txtHBath.Location = new System.Drawing.Point(604, 140);
+ this.txtHBath.Name = "txtHBath";
+ this.txtHBath.ReadOnly = true;
+ this.txtHBath.Size = new System.Drawing.Size(82, 28);
+ this.txtHBath.TabIndex = 29;
+ //
+ // btnGH
+ //
+ this.btnGH.Location = new System.Drawing.Point(692, 131);
+ this.btnGH.Name = "btnGH";
+ this.btnGH.Size = new System.Drawing.Size(78, 38);
+ this.btnGH.TabIndex = 28;
+ this.btnGH.Text = "鏇存崲";
+ this.btnGH.UseVisualStyleBackColor = true;
+ this.btnGH.Click += new System.EventHandler(this.btnGH_Click);
+ //
+ // txtHBardCode
+ //
+ this.txtHBardCode.Location = new System.Drawing.Point(395, 138);
+ this.txtHBardCode.Name = "txtHBardCode";
+ this.txtHBardCode.Size = new System.Drawing.Size(206, 28);
+ this.txtHBardCode.TabIndex = 27;
+ this.txtHBardCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBardCode_KeyDown);
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(331, 141);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(62, 18);
+ this.label3.TabIndex = 26;
+ this.label3.Text = "鏉″舰鐮�";
+ //
+ // HSouceName
+ //
+ this.HSouceName.Location = new System.Drawing.Point(519, 32);
+ this.HSouceName.Name = "HSouceName";
+ this.HSouceName.ReadOnly = true;
+ this.HSouceName.Size = new System.Drawing.Size(82, 28);
+ this.HSouceName.TabIndex = 25;
+ //
+ // HSouce
+ //
+ this.HSouce.Location = new System.Drawing.Point(395, 32);
+ this.HSouce.Name = "HSouce";
+ this.HSouce.Size = new System.Drawing.Size(118, 28);
+ this.HSouce.TabIndex = 24;
+ this.HSouce.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HSouce_KeyDown);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(309, 35);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(80, 18);
+ this.label2.TabIndex = 23;
+ this.label2.Text = "鐢熶骇璧勬簮";
+ //
+ // ReadCSV
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(920, 520);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.ListSelect);
+ this.Controls.Add(this.btnSelect);
+ this.Controls.Add(this.HEmpCodeName);
+ this.Controls.Add(this.HEmpCode);
+ this.Controls.Add(this.yg);
+ this.Controls.Add(this.btnReadData);
+ this.Controls.Add(this.txtHBath);
+ this.Controls.Add(this.btnGH);
+ this.Controls.Add(this.txtHBardCode);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.HSouceName);
+ this.Controls.Add(this.HSouce);
+ this.Controls.Add(this.label2);
+ this.Name = "ReadCSV";
+ this.Text = "ReadCSV";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ReadCSV_FormClosing);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ListBox ListSelect;
+ private System.Windows.Forms.Button btnSelect;
+ private System.Windows.Forms.TextBox HEmpCodeName;
+ private System.Windows.Forms.TextBox HEmpCode;
+ private System.Windows.Forms.Label yg;
+ private System.Windows.Forms.Button btnReadData;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.TextBox txtHBath;
+ private System.Windows.Forms.Button btnGH;
+ private System.Windows.Forms.TextBox txtHBardCode;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox HSouceName;
+ private System.Windows.Forms.TextBox HSouce;
+ private System.Windows.Forms.Label label2;
+ }
+}
\ No newline at end of file
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.cs
new file mode 100644
index 0000000..1318674
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.cs
@@ -0,0 +1,669 @@
+锘縰sing Microsoft.VisualBasic.FileIO;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace WFormReadData_SMR
+{
+ public partial class ReadCSV_New : Form
+ {
+ public DBHelper oCN = new DBHelper();
+
+ public ReadCSV_New()
+ {
+ InitializeComponent();
+ }
+ public static int num = 0;
+ public static DateTime time = DateTime.Now.AddMinutes(-5);
+
+ //鏇存崲鏉″舰鐮�
+ private void btnGH_Click(object sender, EventArgs e)
+ {
+ this.txtHBardCode.Text = "";
+ this.txtHBath.Text = "";
+ this.txtHBardCode.ReadOnly = false;
+ }
+
+ //鏌ヨ鏉″舰鐮�
+ public void SelectHBardCode(string HBillNo)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select HProjectNum from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HBillNo='" + HBillNo + "' ", "Sc_ProcessExchangeBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏌ユ棤鏁版嵁!");
+ }
+ else
+ {
+ DataSet dataSet = oCN.RunProcReturn("select HICMOStatus HICMOStatus from Sc_ICMOBillStatus_Tmp WITH(NOLOCK) where HSourceBillNo='" + HBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ string HProjectNum = ds.Tables[0].Rows[0]["HProjectNum"].ToString();
+ this.txtHBath.Text = HProjectNum.Split('-')[0];
+ this.txtHBardCode.ReadOnly = true;
+ list.Clear();
+ }
+ else
+ {
+ MessageBox.Show(HBillNo + ",娴佽浆鍗℃湭寮�宸�!");
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(this, e.Message, "鎻愮ず");
+ }
+ }
+
+ private void txtHBardCode_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ SelectHBardCode(this.txtHBardCode.Text);
+ }
+ }
+
+ //鍛樺伐缂栫爜鍥炶溅
+ private void HEmpCode_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ SelectHEmpCode(this.HEmpCode.Text);
+ }
+ }
+
+ //鏌ヨ鍛樺伐
+ public void SelectHEmpCode(string HNumber)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Employee WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Employee");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏌ユ棤鏁版嵁!");
+ }
+ else
+ {
+ string HEmpCodeName = ds.Tables[0].Rows[0]["HName"].ToString();
+ string HEmpCodeNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
+ this.HEmpCodeName.Text = HEmpCodeName;
+ this.HEmpCode.Text = HEmpCodeNumber;
+ this.HEmpCode.ReadOnly = true;
+ }
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(this, e.Message, "鎻愮ず");
+ }
+ }
+
+ //鏇存崲鍛樺伐
+ private void btnSelect_Click(object sender, EventArgs e)
+ {
+ this.HEmpCode.ReadOnly = false;
+ this.HEmpCode.Focus();
+ this.HEmpCode.Text = "";
+ this.HEmpCodeName.Text = "";
+
+ this.HSouce.ReadOnly = false;
+ this.HSouce.Focus();
+ this.HSouce.Text = "";
+ this.HSouceName.Text = "";
+ }
+
+ //璇诲彇鏁版嵁
+ private void btnReadData_Click(object sender, EventArgs e)
+ {
+
+ if (this.HEmpCode.Text == "" || this.txtHBath.Text == "" || this.HSouceName.Text == "")
+ {
+
+ MessageBox.Show("璇疯緭鍏ョ敓浜ц祫婧�,鍛樺伐缂栫爜,鑰呮潯褰㈢爜!");
+ }
+ else
+ {
+ if (num == 0)
+ {
+ this.btnReadData.Text = "鏆傚仠";
+ this.timer1.Enabled = true;
+ this.btnGH.Enabled = false;
+ this.btnSelect.Enabled = false;
+ num = 1;
+ //ReadCsv();
+ }
+ else if (num == 1)
+ {
+ this.btnReadData.Text = "鍚姩";
+ this.timer1.Enabled = false;
+ this.btnGH.Enabled = true;
+ this.btnSelect.Enabled = true;
+ num = 0;
+ }
+ }
+ }
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ if (this.HEmpCode.Text == "" || this.txtHBath.Text == "")
+ {
+ MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮佹垨鑰呮祦杞崱!");
+ }
+ else
+ {
+ ReadCsv();
+ }
+ }
+ public static List<string> list = new List<string>();
+
+ //璇诲彇csv鏍煎紡鏂囦欢
+ private void ReadCsv()
+ {
+ string Date = DateTime.Now.ToString("yyMMdd");
+ string HBath = this.txtHBath.Text;
+
+ string Year = DateTime.Now.Year.ToString();
+ Year = Year.Substring(Year.Length - 2, 2);
+ string Month = DateTime.Now.Month.ToString();
+ Month = Month.Length > 1 ? Month : "0" + Month;
+ string Day = DateTime.Now.Day.ToString();
+ Day = Day.Length > 1 ? Day : "0" + Day;
+
+ //娉�:鏂帿灏旂粍瑁�3 鍦‥鐩� _332009
+ //鍏朵綑鍦―鐩� _C332001_2M
+ //string csv_file_path = $@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\250933P9_250403_C332001_2M.csv";
+ string csv_file_path = $@"D:\THLCR_Data\{HBath}\{HBath}_{Date}_C332001_2M.csv"; //缁勮1 缁勮2璺緞
+ //string csv_file_path = $@"E:\THLCR_Data\{HBath}\{HBath}_{Date}_332009.csv"; //缁勮3璺緞
+ //15杞﹂棿缂哄皯璺緞 D:\DATA SAVE\骞碶骞存湀\骞存湀鏃鎵规鍙穃鏁版嵁淇濆瓨.csv
+ //string csv_file_path = $@"D:\DATA SAVE\{Year}\{Year + Month}\{Year + Month + Day}\{HBath}\鏁版嵁淇濆瓨.csv";
+
+
+ bool flag = File.Exists(csv_file_path);
+
+ if (flag)
+ {
+ DataTable dt = new DataTable();
+ string HTypeName = "鏃犲皹";
+ //string csv_file_path_Read = @"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\250933P9_250403_C332001_2M_1.csv";
+ string csv_file_path_Read = $@"D:\THLCR_Data\{HBath}\{HBath}_{Date}_C332001_2M_Read.csv"; //缁勮1 缁勮2璺緞
+ //string csv_file_path_Read = $@"E:\THLCR_Data\{HBath}\{HBath}_{Date}_332009_Read.csv"; //缁勮3璺緞
+
+ //string HTypeName = "15";
+ ////15杞﹂棿缂哄皯璺緞 D:\DATA SAVE\骞碶骞存湀\骞存湀鏃鎵规鍙穃鏁版嵁淇濆瓨.csv
+ ////string csv_file_path_Read = $@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\DATA SAVE\鏁版嵁淇濆瓨_MES璇诲彇.csv";
+
+ //string csv_file_path_Read = $@"D:\DATA SAVE\{Year}\{Year + Month}\{Year + Month + Day}\{HBath}\鏁版嵁淇濆瓨_MES璇诲彇.csv";
+
+ //澶嶅埗涓�浠芥枃浠�
+ File.Copy(csv_file_path, csv_file_path_Read, true);
+
+ string contents = File.ReadAllText(csv_file_path_Read, Encoding.GetEncoding("gb2312"));
+
+ TextFieldParser parser = new TextFieldParser(new StringReader(contents));
+
+ parser.HasFieldsEnclosedInQuotes = true;
+ parser.SetDelimiters(",");
+
+ string[] fields;
+
+ while (!parser.EndOfData)
+ {
+ fields = parser.ReadFields();
+
+ if (dt.Columns.Count == 0)
+ {
+ foreach (string field in fields)
+ {
+ dt.Columns.Add(new DataColumn(string.IsNullOrWhiteSpace(field.Trim('\"')) ? null : field.Trim('\"'), typeof(string)));
+ }
+ }
+ else
+ {
+ dt.Rows.Add(fields.Select(item => string.IsNullOrWhiteSpace(item.Trim('\"')) ? null : item.Trim('\"')).ToArray());
+ }
+ }
+ parser.Close();
+
+ //鑾峰彇褰撳墠鏃堕棿
+ DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(-20).ToString("yyyy-MM-dd HH:mm:ss"));
+ DateTime EndTime = DateTime.Parse(DateTime.Now.AddMinutes(1).ToString("yyyy-MM-dd HH:mm:00"));
+ bool flag_1 = false;
+ bool flag_2 = false;
+ foreach (DataRow item in dt.Rows)
+ {
+ if (HTypeName == "鏃犲皹")
+ {
+ DateTime NowTime = DateTime.Parse(item["娴嬭瘯鏃堕棿"].ToString());
+ string HBadCodeSN = item["搴忓彿"].ToString();
+
+ if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "" && list.Contains(HBadCodeSN) == false)
+ {
+
+ string HSourceCode = this.HSouce.Text; //璁惧缂栧彿 缁勮1 9994 缁勮2 9995 缁勮3 9996
+ string HEmpCode = this.HEmpCode.Text;
+ string HBarCode = item["搴忓彿"].ToString();
+ string HCreateTime = item["娴嬭瘯鏃堕棿"].ToString();
+ string HDate = DateTime.Parse(item["娴嬭瘯鏃堕棿"].ToString()).ToString("yyyy-MM-dd");
+ string HResult = item["鍒嗛��"].ToString() == "PASS" ? "OK" : "NG";
+ string HProcNumber = "005"; //005
+ int HFlag = 0;
+ //string HEmpCode = "";
+ //鍒ゆ柇鏉＄爜涓嶄负绌�
+ if (HBadCodeSN != "")
+ {
+ string HType = "";
+ int HCount = 1;
+
+ //DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
+
+ if (true)
+ {
+ if (Get_AllowLoadData(HBarCode, HProcNumber, flag_1, out flag_2))
+ {
+ string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql);
+ ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",褰撳墠鏃ユ湡:" + DateTime.Now.ToString() + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ list.Add(HBarCode);
+
+ //鏂板宸ヨ壓鍙傛暟
+ for (int i = 0; i < dt.Columns.Count; i++)
+ {
+ if (dt.Columns[i].ColumnName.Contains("Hz"))
+ {
+ HType = dt.Columns[i].ColumnName;
+ string HCount_1 = item[HType].ToString();
+
+ //鏌ヨ褰撳ぉ鏉＄爜 瀵瑰簲鐨勫伐鑹哄弬鏁版湁娌℃湁鎻掑叆鍒伴噷闈� 濡傛灉娌℃湁鍒欐柊澧�
+ DataSet ds1 = oCN.RunProcReturn(@"select HBarCode from Sb_EquipMentCollectionTechParam_SN WITH(NOLOCK) where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
+
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ string sql1 = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount_1}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql1);
+ //ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ }
+ }
+ }
+ }
+ else
+ {
+ flag_1 = flag_2;
+ }
+ }
+ }
+ }
+ }
+
+ if (HTypeName == "15")
+ {
+ DateTime NowTime = DateTime.Parse(item["CS_鏃堕棿"].ToString());
+ string HBadCodeSN = item["CS_DM鐮�"].ToString();
+
+ if (((NowTime >= ActionTime && NowTime < EndTime) || dt.Rows.Count <= 20) && HBadCodeSN != "")
+ {
+
+ string HSourceCode = this.HSouce.Text; //璁惧缂栧彿 缁勮1 9994 缁勮2 9995 缁勮3 9996
+ string HEmpCode = this.HEmpCode.Text;
+ string HBarCode = item["CS_DM鐮�"].ToString();
+ string HCreateTime = item["CS_鏃堕棿"].ToString();
+ string HDate = DateTime.Parse(item["CS_鏃堕棿"].ToString()).ToString("yyyy-MM-dd");
+ string HResult = item["CS_鎬荤粨鏋�"].ToString();
+ string HProcNumber = "005";
+ int HFlag = 0;
+
+ if (HResult != "")
+ {
+ if (HBadCodeSN != "")
+ {
+ string HType = "";
+ int HCount = 1;
+
+ DataSet ds = oCN.RunProcReturn(@"select HBarCode from Sb_EquipMentCollectionTechParam_SN WITH(NOLOCK) where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
+
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ if (Get_AllowLoadData(HBarCode, HProcNumber, flag_1, out flag_2))
+ {
+ string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql);
+ ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+
+ for (int i = 0; i < dt.Columns.Count; i++)
+ {
+ if (dt.Columns[i].ColumnName.Contains("CS_"))
+ {
+ HType = dt.Columns[i].ColumnName;
+ string HCount_1 = item[HType].ToString();
+ string HResult_TechParam = "";
+ if (HType != "CS_鏃堕棿" && HType != "CS_DM鐮�" && HType != "CS_鎬荤粨鏋�")
+ {
+ HResult_TechParam = HCount_1;
+ double number = 0;
+ if (!Double.TryParse(HCount_1, out number))
+ {
+ HCount_1 = "0";
+ }
+
+ DataSet ds1 = oCN.RunProcReturn(@"select HBarCode from Sb_EquipMentCollectionTechParam_SN WITH(NOLOCK) where HBarCode='" + HBarCode + "' and HType='" + HType + "'", "Sb_EquipMentCollectionTechParam_SN");
+
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ string sql1 = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{(HCount_1 == "" ? " 0" : HCount_1)}','{HCreateTime}',GETDATE(),'{HResult_TechParam}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql1);
+ //ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ flag_1 = flag_2;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ public static string AllProcessExchange = "-1";
+ public static string AllProcessExchangeHProcExchBillNo = "";
+ public static string AllProcessExchangeHProcExchInterID = "";
+ public static string AllSNBarcodeProcCtrl = "";
+ public static string AllHProcID = "0";
+ public static string AllHProName = "";
+ public static double AllHQty = 0;
+ public static Dictionary<string, double> RemainingQtyCache = new Dictionary<string, double>(); // 缂撳瓨姣忎釜娴佽浆鍗�+宸ュ簭鐨勫墿浣欐暟閲�
+ public static Dictionary<string, DateTime> CacheUpdateTime = new Dictionary<string, DateTime>(); // 璁板綍姣忔缂撳瓨鏇存柊鐨勬椂闂达紝鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕佸埛鏂�
+ public string CurrentActiveKey = "";//缂撳瓨閿紝鐢ㄤ簬鍒ゆ柇娴佽浆鍗℃槸鍚﹀垏鎹�
+ //鏍规嵁鏉＄爜 鍒ゆ柇鏄惁淇濆瓨
+ public bool Get_AllowLoadData(string HBarCode, string HProcNumber, bool flag_1, out bool flag_2)
+ {
+ decimal hqty = 2;
+ if (HBarCode.Length != 29 && HBarCode.Length != 50)
+ {
+ flag_2 = false;
+ return false;
+ }
+
+ //鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
+ string HProcExchBillNo = "";
+ string HProcExchInterID = "";
+ if (HBarCode.Length == 29)
+ {
+ string str1 = HBarCode.Substring(18, 8);
+ //string str2 = HBarCode.Substring(23, 3);
+ if (AllProcessExchange != str1)
+ {
+ DataSet ds = oCN.RunProcReturn("select HInterID,HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HProjectNum like'" + str1 + "-1%' order by HMakeDate desc", "Sc_ProcessExchangeBillMain");
+ //鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ AllProcessExchangeHProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ AllProcessExchangeHProcExchInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+
+ }
+ else
+ {
+ //閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show(new Form { TopMost = true }, "鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
+ flag_2 = true;
+ return false;
+ }
+ AllProcessExchange = str1;
+ }
+ }
+ //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
+ else if (HBarCode.Length == 50)
+ {
+ string str1 = HBarCode.Substring(42, 8);
+ DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
+ //鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ AllProcessExchangeHProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ }
+ else
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ }
+
+ //璧嬪��
+ HProcExchBillNo = AllProcessExchangeHProcExchBillNo;
+ HProcExchInterID = AllProcessExchangeHProcExchInterID;
+
+ DataSet ds1;
+
+ //绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
+ if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl)
+ {
+ //鏌ヨ宸ュ簭
+ ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WITH(NOLOCK) WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ AllHProcID = ds1.Tables[0].Rows[0]["HItemID"].ToString();
+ AllHProName = ds1.Tables[0].Rows[0]["HName"].ToString();
+ }
+
+ //鏌ヨ娴佽浆鍗℃暟閲�
+ ds1 = oCN.RunProcReturn(@"SELECT HQty FROM Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + HProcExchInterID + " and HProcID=" + AllHProcID, "Sc_ProcessExchangeBillSub");
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ AllHQty = double.Parse(ds1.Tables[0].Rows[0]["HQty"].ToString());
+ }
+
+ AllSNBarcodeProcCtrl = HProcExchBillNo + HProcNumber;
+ }
+
+ string HProcID = AllHProcID;
+ string HProName = AllHProName;
+ ////绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
+ //if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl)
+ //{
+ //鍒ゆ柇 褰撳墠宸ュ簭 鏉＄爜 鐨勪笂涓�閬撳伐搴忔湁娌℃湁杩囩珯
+ ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S_New '" + HBarCode + "'," + HProcID, "h_p_Sc_SNBarcodeProcCtrl_S_New");
+
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + HProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ //}
+
+
+ // 鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ string cacheKey = $"{HProcExchBillNo}_{AllHProcID}";
+ double hqtyOut;
+
+ // 鍒ゆ柇鏄惁宸茬粡鏈夌紦瀛橈紝骞朵笖缂撳瓨鏈繃鏈燂紙鍋囪5鍒嗛挓鍒锋柊涓�娆★級
+ if (RemainingQtyCache.ContainsKey(cacheKey) && (DateTime.Now - CacheUpdateTime[cacheKey]).TotalMinutes <= 5)
+ {
+ // 浣跨敤缂撳瓨涓殑鍓╀綑鏁伴噺
+ hqtyOut = RemainingQtyCache[cacheKey];
+ }
+ else
+ {
+ if (CurrentActiveKey != cacheKey)
+ {
+ if (RemainingQtyCache.ContainsKey(CurrentActiveKey))
+ {
+ RemainingQtyCache.Remove(CurrentActiveKey);
+ CacheUpdateTime.Remove(CurrentActiveKey);
+ }
+ // 鏇存柊褰撳墠缂撳瓨閿�
+ CurrentActiveKey = cacheKey;
+ }
+ // 缂撳瓨宸茶繃鏈燂紝鏌ヨ鏁版嵁搴撹幏鍙栧綋鍓嶅墿浣欐暟閲�
+ ds1 = oCN.RunProcReturn($@"SELECT ({AllHQty} - SUM(ISNULL(ou.HQty, 0)) - SUM(ISNULL(ou.HBadCount, 0))) AS HQty
+ FROM Sc_StationOutBillMain ou WITH(NOLOCK)
+ WHERE ou.HProcExchInterID = {HProcExchInterID} AND ou.HProcID = {AllHProcID}
+ GROUP BY ou.HProcExchInterID, ou.HProcExchEntryID", "Sc_StationOutBillMain");
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ // 濡傛灉鏌ュ埌鍑虹珯璁板綍锛岃绠楀墿浣欏彲鐢ㄦ暟閲�
+ hqtyOut = double.Parse(ds1.Tables[0].Rows[0]["HQty"].ToString());
+ }
+ else
+ {
+ // 绗竴娆¤繍琛岋紝娌℃湁鍑虹珯璁板綍锛屼娇鐢ㄦ祦杞崱鎬绘暟閲�
+ hqtyOut = AllHQty;
+ }
+ // 鏇存柊缂撳瓨鍜屾洿鏂版椂闂�
+ RemainingQtyCache[cacheKey] = hqtyOut;
+ CacheUpdateTime[cacheKey] = DateTime.Now;
+ }
+
+ //娴佽浆鍗℃暟閲�-鍑虹珯鍗曟暟閲忓ぇ浜�0
+ if (hqtyOut <= 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("娴佽浆鍗�:" + HProcExchBillNo + ",鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!");
+ }
+ DBHelper.CustomWriteLog("娴佽浆鍗�:" + HProcExchBillNo + ",鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!", DateTime.Now.ToString("yyyy-MM-dd"));
+ flag_2 = true;
+ return false;
+ }
+
+ // 姣忔鎴愬姛鏍￠獙涓�涓潯鐮佸悗锛屽墿浣欐暟閲忓噺1
+ hqtyOut -= 1;
+
+ // 鏇存柊缂撳瓨鍊�
+ RemainingQtyCache[cacheKey] = hqtyOut;
+
+ //鎷嶇収宸ュ簭闄ゅ
+ if (HProcNumber != "013")
+ {
+ //澧炲姞浜х嚎缁勮杩芥函鍗�
+ //鏌ヨ褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏈夋病鏈夐厤浠朵俊鎭�,濡傛灉鏈� 鍒欏垽鏂厤浠跺崟鐨勬暟閲忔槸鍚︿负0
+ DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ //鍒ら厤浠舵暟閲忔槸鍚︾瓑浜�0
+ for (int i = 0; i < dataSet.Tables[0].Rows.Count; i++)
+ {
+ double SYHQty = double.Parse(dataSet.Tables[0].Rows[i]["閰嶄欢鏁伴噺"].ToString());
+ string HMaterNamePJ = dataSet.Tables[0].Rows[i]["閰嶄欢浠ｇ爜"].ToString();
+ string HMaterBarCode = dataSet.Tables[0].Rows[i]["HBarCode"].ToString();
+ if (SYHQty == 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("娴佽浆鍗�:" + HProcExchBillNo + ",閰嶄欢鏉＄爜:" + HMaterBarCode + ",閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!");
+ }
+ DBHelper.CustomWriteLog("娴佽浆鍗�:" + HProcExchBillNo + ",閰嶄欢鏉＄爜:" + HMaterBarCode + ",閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!", DateTime.Now.ToString("yyyy-MM-dd"));
+ flag_2 = true;
+ return false;
+ }
+ }
+ }
+ }
+
+ flag_2 = false;
+ return true;
+ }
+
+ //鐢熶骇璧勬簮鍥炶溅
+ private void HSouce_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ SelectHSouc(this.HSouce.Text);
+ }
+ }
+
+ //鏌ヨ鐢熶骇璧勬簮
+ public void SelectHSouc(string HNumber)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Source WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Source");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏌ユ棤鏁版嵁!");
+ }
+ else
+ {
+ string HSouceName = ds.Tables[0].Rows[0]["HName"].ToString();
+ string HSouceNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
+ this.HSouceName.Text = HSouceName;
+ this.HSouce.Text = HSouceNumber;
+ this.HSouce.ReadOnly = true;
+ }
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(this, e.Message, "鎻愮ず");
+ }
+ }
+
+ private void ReadCSV_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ if (num == 1)
+ {
+ MessageBox.Show("褰撳墠鎸夐挳鏈殏鍋�,涓嶅厑璁稿叧闂�!");
+ e.Cancel = true;
+ }
+ else if (MessageBox.Show("纭畾瑕佸叧闂悧锛�", "纭", MessageBoxButtons.YesNo) == DialogResult.No)
+ {
+ e.Cancel = true;
+ }
+ }
+ }
+}
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.resx b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.resx
new file mode 100644
index 0000000..1f666f2
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV_New.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
index fb1578d..108cfe6 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
@@ -23,7 +23,7 @@
{
InitializeComponent();
}
- public static int num = 0;
+ public static int num = 0;
public static int SelectTime = 0;
public static DateTime time = DateTime.Now.AddMinutes(-5);
public static decimal hqty = 2;
@@ -56,7 +56,8 @@
//鍛樺伐缂栫爜鍥炶溅
private void HEmpCode_KeyDown(object sender, KeyEventArgs e)
{
- if (e.KeyCode == Keys.Enter) {
+ if (e.KeyCode == Keys.Enter)
+ {
SelectHEmpCode(this.HEmpCode.Text);
}
}
@@ -66,7 +67,7 @@
{
try
{
- DataSet ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + HNumber + "' ", "Gy_Employee");
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Employee WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Employee");
if (ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鏌ユ棤鏁版嵁!");
@@ -117,7 +118,8 @@
public static List<string> listData = new List<string>();
//鏂囨湰璇诲彇鏁版嵁
- public void Read_Txt() {
+ public void Read_Txt()
+ {
int year = DateTime.Now.Year;
string month = DateTime.Now.Month.ToString();
@@ -168,7 +170,7 @@
{
try
{
- DataSet ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + HNumber + "' ", "Gy_Source");
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Source WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Source");
if (ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鏌ユ棤鏁版嵁!");
@@ -188,10 +190,10 @@
}
}
- public static string AllBeginWork = "-1";
- public static string AllProcessExchange = "-1";
- public static string AllProcessExchangeHProcExchBillNo = "";
- public static string AllProcessExchangeHProcExchInterID = "";
+ public static string AllBeginWork = "-1"; //鏄惁寮�宸�
+ public static string AllProcessExchange = "-1"; //娴佽浆鍗￠」鐩彿
+ public static string AllProcessExchangeHProcExchBillNo = ""; //娴佽浆鍗″彿
+ public static string AllProcessExchangeHProcExchInterID = ""; //娴佽浆鍗′富鐮�
public void Xt_ReadText(string FileData)
{
@@ -220,7 +222,7 @@
{
string HBarCode = list[i]["HBadCodeSN"].ToString();
DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
- if (NowTime >= ActionTime && NowTime < EndTime && list[i]["HBadCodeSN"].ToString() != "" && listData.Contains(HBarCode)==false)
+ if (NowTime >= ActionTime && NowTime < EndTime && list[i]["HBadCodeSN"].ToString() != "" && listData.Contains(HBarCode) == false)
{
string HSourceCode = list[i]["HSouceNumber"].ToString();
string HEmpCode = this.HEmpCode.Text;
@@ -232,20 +234,21 @@
string HResult = list[i]["HResult"].ToString();
string HProcNumber = list[i]["HProcNumber"].ToString();
int HFlag = 0;
-
//DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
if (true)
{
DataSet dataSet;
-
+
string HProjectNum = HBarCode.Substring(18, 8);
//閫氳繃鎴彇椤圭洰鍙� 濡傛灉绗竴鏉℃暟鎹殑椤圭洰鍙疯窡鍚庨潰鐨勪竴鏍� 灏变笉杩涜鍒ゆ柇
- if (HBarCode.Contains(AllProcessExchange)==false) {
+ if (HBarCode.Contains(AllProcessExchange) == false)
+ {
//鍒ゆ柇娴佽浆鍗℃槸鍚﹀瓨鍦�
dataSet = oCN.RunProcReturn("select HInterID,HBillNo from Sc_ProcessExchangeBillMain where HProjectNum='" + HProjectNum + "-1'", "Sc_ProcessExchangeBillMain");
- if (dataSet.Tables[0].Rows.Count > 0) {
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
AllProcessExchangeHProcExchBillNo = dataSet.Tables[0].Rows[0]["HBillNo"].ToString();
AllProcessExchangeHProcExchInterID = dataSet.Tables[0].Rows[0]["HInterID"].ToString();
AllProcessExchange = HProjectNum;
@@ -255,9 +258,10 @@
if (AllProcessExchange == HProjectNum)
{
//閫氳繃鎴彇椤圭洰鍙� 濡傛灉绗竴鏉℃暟鎹殑椤圭洰鍙疯窡鍚庨潰鐨勪竴鏍� 灏变笉杩涜鍒ゆ柇
- if (HBarCode.Contains(AllBeginWork) == false) {
+ if (HBarCode.Contains(AllBeginWork) == false)
+ {
//鍒ゆ柇褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏁版嵁鏄惁寮�宸�
- dataSet = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + AllProcessExchangeHProcExchBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
+ dataSet = oCN.RunProcReturn("select HICMOStatus from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + AllProcessExchangeHProcExchBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
if (dataSet.Tables[0].Rows.Count > 0)
{
@@ -272,9 +276,9 @@
{
//鏂板鏉＄爜鏁版嵁
string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
-values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql);
- ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",褰撳墠鏃ユ湡;"+DateTime.Now.ToString()+",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",褰撳墠鏃ユ湡;" + DateTime.Now.ToString() + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
listData.Add(HBarCode);
}
else
@@ -350,12 +354,12 @@
string HProcNumber = list[i]["HProcNumber"].ToString();
int HFlag = 0;
- DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollectionTechParam_SN");
+ DataSet ds = oCN.RunProcReturn(@"select HItemID from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollectionTechParam_SN");
if (ds.Tables[0].Rows.Count == 0)
{
string sql = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
-values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql);
//ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
}
@@ -368,13 +372,13 @@
}
- public static string AllSNBarcodeProcCtrl = "";
- public static string AllHProcID = "0";
- public static string AllHProName = "";
- public static double AllHQty = 0;
-
+ public static string AllSNBarcodeProcCtrl = ""; //娴佽浆鍗�+宸ュ簭鐨勬嫾鍐�
+ public static string AllHProcID = "0"; //宸ュ簭id
+ public static string AllHProName = ""; //宸ュ簭鍚嶅瓧
+ public static double AllHQty = 0; //榛樿娴佽浆鍗℃暟閲� 濡傛灉鍑虹珯鍗曟湁鏁版嵁浼氭洿鏂版垚鍑虹珯鍗曟暟閲�
+
//鏍规嵁鏉＄爜 鍒ゆ柇鏄惁淇濆瓨
- public bool Get_AllowLoadData(string HBarCode, string HProcNumber, bool flag_1,string HProcExchBillNo,string HProcExchInterID, out bool flag_2)
+ public bool Get_AllowLoadData(string HBarCode, string HProcNumber, bool flag_1, string HProcExchBillNo, string HProcExchInterID, out bool flag_2)
{
//鍒ゆ柇鏉＄爜鐨勯暱搴�
if (HBarCode.Length != 29 && HBarCode.Length != 50)
@@ -386,13 +390,13 @@
//鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
if (HBarCode.Length == 29)
{
-
+
}
//鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
else if (HBarCode.Length == 50)
{
string str1 = HBarCode.Substring(42, 8);
- DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
+ DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
//鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
if (ds.Tables[0].Rows.Count > 0)
{
@@ -415,10 +419,11 @@
DataSet ds1;
//绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
- if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl) {
-
+ if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl)
+ {
+
//鏌ヨ宸ュ簭
- ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
+ ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WITH(NOLOCK) WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
if (ds1.Tables[0].Rows.Count > 0)
{
AllHProcID = ds1.Tables[0].Rows[0]["HItemID"].ToString();
@@ -426,7 +431,7 @@
}
//鏌ヨ娴佽浆鍗℃暟閲�
- ds1 = oCN.RunProcReturn(@"SELECT HQty FROM Sc_ProcessExchangeBillSub where HInterID=" + HProcExchInterID + " and HProcID=" + AllHProcID, "Sc_ProcessExchangeBillSub");
+ ds1 = oCN.RunProcReturn(@"SELECT HQty FROM Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + HProcExchInterID + " and HProcID=" + AllHProcID, "Sc_ProcessExchangeBillSub");
if (ds1.Tables[0].Rows.Count > 0)
{
AllHQty = double.Parse(ds1.Tables[0].Rows[0]["HQty"].ToString());
@@ -438,47 +443,48 @@
////绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
//if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl)
//{
- //杩囩珯鎺у埗
- //鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲鐨勬潯鐮佹槸鍚︿笂閬撳伐搴忚繃绔�
- ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + AllHProcID, "h_p_Sc_SNBarcodeProcCtrl_S");
+ //杩囩珯鎺у埗
+ //鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲鐨勬潯鐮佹槸鍚︿笂閬撳伐搴忚繃绔�
+ ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + AllHProcID, "h_p_Sc_SNBarcodeProcCtrl_S");
- if (ds1.Tables[0].Rows.Count == 0)
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
- //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
- if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
- {
- time = DateTime.Now;
- MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!");
- }
- DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
-
- flag_2 = true;
- return false;
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!");
}
- else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
- //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
- if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
- {
- time = DateTime.Now;
- MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!");
- }
- DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
-
- flag_2 = true;
- return false;
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!");
}
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
//}
- //鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
- ds1 = oCN.RunProcReturn($@"select ({AllHQty}-sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_StationOutBillMain ou WITH(NOLOCK)
-where ou.HProcExchInterID={HProcExchInterID} and ou.HProcID={AllHProcID}
-group by ou.HProcExchInterID,ou.HProcExchEntryID,ou.HQty", "Sc_StationOutBillMain");
+ //鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ ds1 = oCN.RunProcReturn($@"select ({AllHQty}-sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_StationOutBillMain ou WITH(NOLOCK)
+ where ou.HProcExchInterID={HProcExchInterID} and ou.HProcID={AllHProcID}
+ group by ou.HProcExchInterID,ou.HProcExchEntryID,ou.HQty", "Sc_StationOutBillMain");
//鑾峰彇娴佽浆鍗℃暟閲�
double hqtyOut = AllHQty;
- if (ds1.Tables[0].Rows.Count > 0) {
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
hqtyOut = double.Parse(ds1.Tables[0].Rows[0][0].ToString());
}
//娴佽浆鍗℃暟閲�-鍑虹珯鍗曟暟閲忓ぇ浜�0
@@ -531,7 +537,8 @@
private void ReadyDataForm_FormClosing(object sender, FormClosingEventArgs e)
{
- if (num == 1) {
+ if (num == 1)
+ {
MessageBox.Show("褰撳墠鎸夐挳鏈殏鍋�,涓嶅厑璁稿叧闂�!");
e.Cancel = true;
}
@@ -556,7 +563,7 @@
MessageBox.Show("璇峰厛鐐瑰嚮鏆傚仠鎸夐挳!");
}
-
+
}
}
}
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.Designer.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.Designer.cs
new file mode 100644
index 0000000..ec35fd2
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.Designer.cs
@@ -0,0 +1,190 @@
+锘�
+namespace WFormReadData_SMR
+{
+ partial class ReadyDataForm_New
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈淇敼
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.btnReadData = new System.Windows.Forms.Button();
+ this.yg = new System.Windows.Forms.Label();
+ this.HEmpCode = new System.Windows.Forms.TextBox();
+ this.HEmpCodeName = new System.Windows.Forms.TextBox();
+ this.btnSelect = new System.Windows.Forms.Button();
+ this.ListSelect = new System.Windows.Forms.ListBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.HSouceName = new System.Windows.Forms.TextBox();
+ this.HSouce = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.btnSelectAll = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // btnReadData
+ //
+ this.btnReadData.Location = new System.Drawing.Point(47, 47);
+ this.btnReadData.Name = "btnReadData";
+ this.btnReadData.Size = new System.Drawing.Size(114, 35);
+ this.btnReadData.TabIndex = 1;
+ this.btnReadData.Text = "鍚姩";
+ this.btnReadData.UseVisualStyleBackColor = true;
+ this.btnReadData.Click += new System.EventHandler(this.btnReadData_Click);
+ //
+ // yg
+ //
+ this.yg.AutoSize = true;
+ this.yg.Location = new System.Drawing.Point(348, 66);
+ this.yg.Name = "yg";
+ this.yg.Size = new System.Drawing.Size(44, 18);
+ this.yg.TabIndex = 2;
+ this.yg.Text = "鍛樺伐";
+ //
+ // HEmpCode
+ //
+ this.HEmpCode.Location = new System.Drawing.Point(398, 63);
+ this.HEmpCode.Name = "HEmpCode";
+ this.HEmpCode.Size = new System.Drawing.Size(118, 28);
+ this.HEmpCode.TabIndex = 3;
+ this.HEmpCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HEmpCode_KeyDown);
+ //
+ // HEmpCodeName
+ //
+ this.HEmpCodeName.Location = new System.Drawing.Point(522, 63);
+ this.HEmpCodeName.Name = "HEmpCodeName";
+ this.HEmpCodeName.ReadOnly = true;
+ this.HEmpCodeName.Size = new System.Drawing.Size(82, 28);
+ this.HEmpCodeName.TabIndex = 4;
+ //
+ // btnSelect
+ //
+ this.btnSelect.Location = new System.Drawing.Point(611, 39);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(78, 38);
+ this.btnSelect.TabIndex = 5;
+ this.btnSelect.Text = "鏇存崲";
+ this.btnSelect.UseVisualStyleBackColor = true;
+ this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+ //
+ // ListSelect
+ //
+ this.ListSelect.FormattingEnabled = true;
+ this.ListSelect.ItemHeight = 18;
+ this.ListSelect.Location = new System.Drawing.Point(22, 114);
+ this.ListSelect.Name = "ListSelect";
+ this.ListSelect.Size = new System.Drawing.Size(766, 310);
+ this.ListSelect.TabIndex = 6;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(19, 93);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(116, 18);
+ this.label1.TabIndex = 7;
+ this.label1.Text = "璇诲彇鏁版嵁鏄剧ず";
+ //
+ // timer1
+ //
+ this.timer1.Interval = 10000;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // HSouceName
+ //
+ this.HSouceName.Location = new System.Drawing.Point(522, 12);
+ this.HSouceName.Name = "HSouceName";
+ this.HSouceName.ReadOnly = true;
+ this.HSouceName.Size = new System.Drawing.Size(82, 28);
+ this.HSouceName.TabIndex = 10;
+ //
+ // HSouce
+ //
+ this.HSouce.Location = new System.Drawing.Point(398, 12);
+ this.HSouce.Name = "HSouce";
+ this.HSouce.Size = new System.Drawing.Size(118, 28);
+ this.HSouce.TabIndex = 9;
+ this.HSouce.KeyDown += new System.Windows.Forms.KeyEventHandler(this.HSouce_KeyDown);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(312, 15);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(80, 18);
+ this.label2.TabIndex = 8;
+ this.label2.Text = "鐢熶骇璧勬簮";
+ //
+ // btnSelectAll
+ //
+ this.btnSelectAll.Location = new System.Drawing.Point(177, 47);
+ this.btnSelectAll.Name = "btnSelectAll";
+ this.btnSelectAll.Size = new System.Drawing.Size(114, 35);
+ this.btnSelectAll.TabIndex = 11;
+ this.btnSelectAll.Text = "妫�绱㈣ˉ婕�";
+ this.btnSelectAll.UseVisualStyleBackColor = true;
+ this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click);
+ //
+ // ReadyDataForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 435);
+ this.Controls.Add(this.btnSelectAll);
+ this.Controls.Add(this.HSouceName);
+ this.Controls.Add(this.HSouce);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.ListSelect);
+ this.Controls.Add(this.btnSelect);
+ this.Controls.Add(this.HEmpCodeName);
+ this.Controls.Add(this.HEmpCode);
+ this.Controls.Add(this.yg);
+ this.Controls.Add(this.btnReadData);
+ this.Name = "ReadyDataForm";
+ this.Text = "璇诲彇鏁版嵁";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ReadyDataForm_FormClosing);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button btnReadData;
+ private System.Windows.Forms.Label yg;
+ private System.Windows.Forms.TextBox HEmpCode;
+ private System.Windows.Forms.TextBox HEmpCodeName;
+ private System.Windows.Forms.Button btnSelect;
+ private System.Windows.Forms.ListBox ListSelect;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.TextBox HSouceName;
+ private System.Windows.Forms.TextBox HSouce;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Button btnSelectAll;
+ }
+}
+
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.cs
new file mode 100644
index 0000000..6b03adf
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.cs
@@ -0,0 +1,608 @@
+锘縰sing HslCommunication;
+using HslCommunication.Profinet.Melsec;
+using Microsoft.VisualBasic.FileIO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace WFormReadData_SMR
+{
+ public partial class ReadyDataForm_New : Form
+ {
+ public DBHelper oCN = new DBHelper();
+ public ReadyDataForm_New()
+ {
+ InitializeComponent();
+ }
+ public static int num = 0;
+ public static int SelectTime = 0;
+ public static DateTime time = DateTime.Now.AddMinutes(-5);
+ public static decimal hqty = 2;
+ //璇诲彇鏁版嵁
+ private void btnReadData_Click(object sender, EventArgs e)
+ {
+ if (this.HEmpCode.Text == "")
+ {
+
+ MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮�");
+ }
+ else
+ {
+ if (num == 0)
+ {
+ this.btnReadData.Text = "鏆傚仠";
+ this.timer1.Enabled = true;
+ num = 1;
+ SelectTime = -4;
+ }
+ else if (num == 1)
+ {
+ this.btnReadData.Text = "鍚姩";
+ this.timer1.Enabled = false;
+ num = 0;
+ }
+ }
+ }
+
+ //鍛樺伐缂栫爜鍥炶溅
+ private void HEmpCode_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ SelectHEmpCode(this.HEmpCode.Text);
+ }
+ }
+
+ //鏌ヨ鍛樺伐
+ public void SelectHEmpCode(string HNumber)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Employee WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Employee");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏌ユ棤鏁版嵁!");
+ }
+ else
+ {
+ string HEmpCodeName = ds.Tables[0].Rows[0]["HName"].ToString();
+ string HEmpCodeNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
+ this.HEmpCodeName.Text = HEmpCodeName;
+ this.HEmpCode.Text = HEmpCodeNumber;
+ this.HEmpCode.ReadOnly = true;
+ }
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(this, e.Message, "鎻愮ず");
+ }
+ }
+
+ //鏇存崲鍛樺伐
+ private void btnSelect_Click(object sender, EventArgs e)
+ {
+ this.HEmpCode.ReadOnly = false;
+ this.HEmpCode.Focus();
+ this.HEmpCode.Text = "";
+ this.HEmpCodeName.Text = "";
+
+ this.HSouce.ReadOnly = false;
+ this.HSouce.Focus();
+ this.HSouce.Text = "";
+ this.HSouceName.Text = "";
+ }
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ if (this.HEmpCode.Text == "")
+ {
+
+ MessageBox.Show("璇疯緭鍏ュ憳宸ョ紪鐮�");
+ }
+ else
+ {
+ Read_Txt();
+
+ }
+ }
+
+ public static List<string> listData = new List<string>();
+
+ //鏂囨湰璇诲彇鏁版嵁
+ public void Read_Txt()
+ {
+
+ int year = DateTime.Now.Year;
+ string month = DateTime.Now.Month.ToString();
+ string day = DateTime.Now.Day.ToString();
+
+ string dataTime = DateTime.Now.ToString("yyyyMMdd");
+ ////鍒ゆ柇鏄惁鏈夎繖涓枃浠�
+ bool flag = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}.txt");
+ //bool flag = File.Exists($@"C:\Users\z1873\Desktop\20250509.txt");
+
+ if (flag)
+ {
+ StreamReader stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}.txt", Encoding.GetEncoding("gb2312"));
+ //StreamReader stream = new StreamReader($@"C:\Users\z1873\Desktop\20250509.txt", Encoding.GetEncoding("gb2312"));
+
+ string FileData = stream.ReadToEnd();
+ stream.Close();
+
+ //鑾峰彇鏉＄爜淇℃伅
+ Xt_ReadText(FileData);
+
+ bool flag2 = File.Exists($@"D:\{year}\{month}\{day}\{dataTime}gy.txt");
+ //bool flag2 = File.Exists($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123gy.txt");
+
+ if (flag2)
+ {
+ stream = new StreamReader($@"D:\{year}\{month}\{day}\{dataTime}gy.txt", Encoding.GetEncoding("gb2312"));
+ //stream = new StreamReader($@"C:\Users\admin\Desktop\鏂板缓鏂囦欢澶� (2)\20231123gy.txt", Encoding.GetEncoding("gb2312"));
+ FileData = stream.ReadToEnd();
+ //鑾峰彇绯荤粺鍙傛暟
+ Xt_Gy_RoutBill(FileData);
+ }
+ }
+ }
+
+
+ //鐢熶骇璧勬簮鍥炶溅
+ private void HSouce_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ SelectHSouc(this.HSouce.Text);
+ }
+ }
+
+ //鏌ヨ鐢熶骇璧勬簮
+ public void SelectHSouc(string HNumber)
+ {
+ try
+ {
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Source WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Source");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏌ユ棤鏁版嵁!");
+ }
+ else
+ {
+ string HSouceName = ds.Tables[0].Rows[0]["HName"].ToString();
+ string HSouceNumber = ds.Tables[0].Rows[0]["HNumber"].ToString();
+ this.HSouceName.Text = HSouceName;
+ this.HSouce.Text = HSouceNumber;
+ this.HSouce.ReadOnly = true;
+ }
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(this, e.Message, "鎻愮ず");
+ }
+ }
+
+ public static string AllBeginWork = "-1"; //鏄惁寮�宸�
+ public static string AllProcessExchange = "-1"; //娴佽浆鍗￠」鐩彿
+ public static string AllProcessExchangeHProcExchBillNo = ""; //娴佽浆鍗″彿
+ public static string AllProcessExchangeHProcExchInterID = ""; //娴佽浆鍗′富鐮�
+
+ public void Xt_ReadText(string FileData)
+ {
+ //鑾峰彇鏂囨湰鎵�鏈夋暟鎹�
+ FileData = FileData.Substring(0, FileData.Length - 1);
+ FileData = "[" + FileData + "]";
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> DataList = JsonConvert.DeserializeObject<List<object>>(FileData);
+ foreach (JObject item in DataList)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+ //鑾峰彇褰撳墠鏃堕棿
+ DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(SelectTime).ToString("yyyy-MM-dd HH:mm:ss"));
+ DateTime EndTime = DateTime.Parse(DateTime.Now.AddMinutes(1).ToString("yyyy-MM-dd HH:mm:00"));
+ bool flag_1 = false;
+ bool flag_2 = false;
+ //寰幆闆嗗悎
+ for (int i = 0; i < list.Count; i++)
+ {
+ string HBarCode = list[i]["HBadCodeSN"].ToString();
+ DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
+ if (NowTime >= ActionTime && NowTime < EndTime && list[i]["HBadCodeSN"].ToString() != "" && listData.Contains(HBarCode) == false)
+ {
+ string HSourceCode = list[i]["HSouceNumber"].ToString();
+ string HEmpCode = this.HEmpCode.Text;
+ //string HEmpCode = "";
+ string HType = list[i]["HBadReason"].ToString();
+ int HCount = 1;
+ string HCreateTime = list[i]["HDate"].ToString();
+ string HDate = DateTime.Parse(list[i]["HDate"].ToString()).ToString("yyyy-MM-dd");
+ string HResult = list[i]["HResult"].ToString();
+ string HProcNumber = list[i]["HProcNumber"].ToString();
+ int HFlag = 0;
+ //DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
+
+ if (true)
+ {
+ DataSet dataSet;
+
+ string HProjectNum = HBarCode.Substring(18, 8);
+ //閫氳繃鎴彇椤圭洰鍙� 濡傛灉绗竴鏉℃暟鎹殑椤圭洰鍙疯窡鍚庨潰鐨勪竴鏍� 灏变笉杩涜鍒ゆ柇
+ if (HBarCode.Contains(AllProcessExchange) == false)
+ {
+
+ //鍒ゆ柇娴佽浆鍗℃槸鍚﹀瓨鍦�
+ dataSet = oCN.RunProcReturn("select HInterID,HBillNo from Sc_ProcessExchangeBillMain where HProjectNum='" + HProjectNum + "-1'", "Sc_ProcessExchangeBillMain");
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ AllProcessExchangeHProcExchBillNo = dataSet.Tables[0].Rows[0]["HBillNo"].ToString();
+ AllProcessExchangeHProcExchInterID = dataSet.Tables[0].Rows[0]["HInterID"].ToString();
+ AllProcessExchange = HProjectNum;
+ }
+ }
+ //鍒ゆ柇鎴彇鐨勯」鐩彿 璺熻祴鍊肩殑椤圭洰鍙锋槸鍚︿竴鏍� 闇�瑕佸厛婊¤冻涓婇潰鐨勬潯浠�
+ if (AllProcessExchange == HProjectNum)
+ {
+ //閫氳繃鎴彇椤圭洰鍙� 濡傛灉绗竴鏉℃暟鎹殑椤圭洰鍙疯窡鍚庨潰鐨勪竴鏍� 灏变笉杩涜鍒ゆ柇
+ if (HBarCode.Contains(AllBeginWork) == false)
+ {
+ //鍒ゆ柇褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏁版嵁鏄惁寮�宸�
+ dataSet = oCN.RunProcReturn("select HICMOStatus from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + AllProcessExchangeHProcExchBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
+
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ AllBeginWork = HProjectNum;
+ }
+ }
+
+ //婊¤冻涓婅堪鏉′欢 骞朵笖椤圭洰鍙� 鍜岃祴鍊奸」鐩彿涓�鏍� 鍒欒繘琛屾柊澧�
+ if (AllBeginWork == HProjectNum)
+ {
+ if (Get_AllowLoadData(HBarCode, HProcNumber, flag_1, AllProcessExchangeHProcExchBillNo, AllProcessExchangeHProcExchInterID, out flag_2))
+ {
+ //鏂板鏉＄爜鏁版嵁
+ string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql);
+ ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",褰撳墠鏃ユ湡;" + DateTime.Now.ToString() + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ listData.Add(HBarCode);
+ }
+ else
+ {
+ flag_1 = flag_2;
+ }
+ }
+ else
+ {
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show(new Form { TopMost = true }, "鏉＄爜:" + HBarCode + ",瀵瑰簲鐨勬祦杞崱:" + AllProcessExchangeHProcExchBillNo + ",娴佽浆鍗℃湭寮�宸�!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + ",瀵瑰簲鐨勬祦杞崱:" + AllProcessExchangeHProcExchBillNo + ",娴佽浆鍗℃湭寮�宸�!", DateTime.Now.ToString("yyyy-MM-dd"));
+ flag_1 = true;
+ }
+ }
+ else
+ {
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show(new Form { TopMost = true }, "鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
+ flag_1 = true;
+ }
+ }
+ }
+ else
+ {
+ //CustomWriteLog("鏃堕棿涓嶅湪淇濆瓨鑼冨洿鍐�", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ }
+ }
+
+ //璇诲彇绯荤粺鍙傛暟
+ public void Xt_Gy_RoutBill(string FileData)
+ {
+ FileData = FileData.Substring(0, FileData.Length - 1);
+ FileData = "[" + FileData + "]";
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> DataList = JsonConvert.DeserializeObject<List<object>>(FileData);
+ foreach (JObject item in DataList)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+ //鑾峰彇褰撳墠鏃堕棿
+ DateTime ActionTime = DateTime.Parse(DateTime.Now.AddMinutes(-1).ToString("yyyy-MM-dd HH:mm:ss"));
+ DateTime EndTime = DateTime.Parse(DateTime.Now.AddMinutes(1).ToString("yyyy-MM-dd HH:mm:00"));
+ //寰幆闆嗗悎
+ for (int i = 0; i < list.Count; i++)
+ {
+ DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
+ if (NowTime >= ActionTime && NowTime < EndTime)
+ {
+ string HSourceCode = list[i]["HSouceNumber"].ToString();
+ string HEmpCode = this.HEmpCode.Text;
+ //string HEmpCode = "";
+ string HType = list[i]["HType"].ToString();
+ string HBarCode = list[i]["HBadCodeSN"].ToString();
+ double HCount = double.Parse(list[i]["HCount"].ToString());
+ string HCreateTime = list[i]["HDate"].ToString();
+ string HDate = DateTime.Parse(list[i]["HDate"].ToString()).ToString("yyyy-MM-dd");
+ string HResult = list[i]["HResult"].ToString();
+ string HProcNumber = list[i]["HProcNumber"].ToString();
+ int HFlag = 0;
+
+ DataSet ds = oCN.RunProcReturn(@"select HItemID from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollectionTechParam_SN");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ string sql = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
+ oCN.RunProc(sql);
+ //ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ }
+ }
+ else
+ {
+ //CustomWriteLog("鏃堕棿涓嶅湪淇濆瓨鑼冨洿鍐�", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ }
+
+ }
+
+ public static string AllSNBarcodeProcCtrl = ""; //娴佽浆鍗�+宸ュ簭鐨勬嫾鍐�
+ public static string AllHProcID = "0"; //宸ュ簭id
+ public static string AllHProName = ""; //宸ュ簭鍚嶅瓧
+ public static double AllHQty = 0; //榛樿娴佽浆鍗℃暟閲� 濡傛灉鍑虹珯鍗曟湁鏁版嵁浼氭洿鏂版垚鍑虹珯鍗曟暟閲�
+ public static Dictionary<string, double> RemainingQtyCache = new Dictionary<string, double>(); // 缂撳瓨姣忎釜娴佽浆鍗�+宸ュ簭鐨勫墿浣欐暟閲�
+ public static Dictionary<string, DateTime> CacheUpdateTime = new Dictionary<string, DateTime>(); // 璁板綍姣忔缂撳瓨鏇存柊鐨勬椂闂达紝鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕佸埛鏂�
+ public string CurrentActiveKey = "";//缂撳瓨閿紝鐢ㄤ簬鍒ゆ柇娴佽浆鍗℃槸鍚﹀垏鎹�
+ //鏍规嵁鏉＄爜 鍒ゆ柇鏄惁淇濆瓨
+ public bool Get_AllowLoadData(string HBarCode, string HProcNumber, bool flag_1, string HProcExchBillNo, string HProcExchInterID, out bool flag_2)
+ {
+ //鍒ゆ柇鏉＄爜鐨勯暱搴�
+ if (HBarCode.Length != 29 && HBarCode.Length != 50)
+ {
+ flag_2 = false;
+ return false;
+ }
+
+ //鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
+ if (HBarCode.Length == 29)
+ {
+
+ }
+ //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
+ else if (HBarCode.Length == 50)
+ {
+ string str1 = HBarCode.Substring(42, 8);
+ DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
+ //鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ }
+ else
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ }
+ DataSet ds1;
+
+ //绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
+ if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl)
+ {
+
+ //鏌ヨ宸ュ簭
+ ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WITH(NOLOCK) WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ AllHProcID = ds1.Tables[0].Rows[0]["HItemID"].ToString();
+ AllHProName = ds1.Tables[0].Rows[0]["HName"].ToString();
+ }
+
+ //鏌ヨ娴佽浆鍗℃暟閲�
+ ds1 = oCN.RunProcReturn(@"SELECT HQty FROM Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + HProcExchInterID + " and HProcID=" + AllHProcID, "Sc_ProcessExchangeBillSub");
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ AllHQty = double.Parse(ds1.Tables[0].Rows[0]["HQty"].ToString());
+ }
+
+ AllSNBarcodeProcCtrl = HProcExchBillNo + HProcNumber;
+ }
+
+ ////绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
+ //if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl)
+ //{
+ //杩囩珯鎺у埗
+ //鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲鐨勬潯鐮佹槸鍚︿笂閬撳伐搴忚繃绔�
+ ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S_New '" + HBarCode + "'," + AllHProcID, "h_p_Sc_SNBarcodeProcCtrl_S_New");
+
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!");
+ }
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ //}
+
+
+ // 鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ string cacheKey = $"{HProcExchBillNo}_{AllHProcID}";
+ double hqtyOut;
+
+ // 鍒ゆ柇鏄惁宸茬粡鏈夌紦瀛橈紝骞朵笖缂撳瓨鏈繃鏈燂紙鍋囪5鍒嗛挓鍒锋柊涓�娆★級
+ if (RemainingQtyCache.ContainsKey(cacheKey) && (DateTime.Now - CacheUpdateTime[cacheKey]).TotalMinutes <= 15 )
+ {
+ // 浣跨敤缂撳瓨涓殑鍓╀綑鏁伴噺
+ hqtyOut = RemainingQtyCache[cacheKey];
+ }
+ else
+ {
+ if (CurrentActiveKey!= cacheKey)
+ {
+ if (RemainingQtyCache.ContainsKey(CurrentActiveKey))
+ {
+ RemainingQtyCache.Remove(CurrentActiveKey);
+ CacheUpdateTime.Remove(CurrentActiveKey);
+ }
+ // 鏇存柊褰撳墠缂撳瓨閿�
+ CurrentActiveKey = cacheKey;
+ }
+ // 缂撳瓨宸茶繃鏈燂紝鏌ヨ鏁版嵁搴撹幏鍙栧綋鍓嶅墿浣欐暟閲�
+ ds1 = oCN.RunProcReturn($@"SELECT ({AllHQty} - SUM(ISNULL(ou.HQty, 0)) - SUM(ISNULL(ou.HBadCount, 0))) AS HQty
+ FROM Sc_StationOutBillMain ou WITH(NOLOCK)
+ WHERE ou.HProcExchInterID = {HProcExchInterID} AND ou.HProcID = {AllHProcID}
+ GROUP BY ou.HProcExchInterID, ou.HProcExchEntryID", "Sc_StationOutBillMain");
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
+ // 濡傛灉鏌ュ埌鍑虹珯璁板綍锛岃绠楀墿浣欏彲鐢ㄦ暟閲�
+ hqtyOut = double.Parse(ds1.Tables[0].Rows[0]["HQty"].ToString());
+ }
+ else
+ {
+ // 绗竴娆¤繍琛岋紝娌℃湁鍑虹珯璁板綍锛屼娇鐢ㄦ祦杞崱鎬绘暟閲�
+ hqtyOut = AllHQty;
+ }
+ // 鏇存柊缂撳瓨鍜屾洿鏂版椂闂�
+ RemainingQtyCache[cacheKey] = hqtyOut;
+ CacheUpdateTime[cacheKey] = DateTime.Now;
+ }
+
+ //娴佽浆鍗℃暟閲�-鍑虹珯鍗曟暟閲忓ぇ浜�0
+ if (hqtyOut <= 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("娴佽浆鍗�:" + HProcExchBillNo + ",鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!");
+ }
+ DBHelper.CustomWriteLog("娴佽浆鍗�:" + HProcExchBillNo + ",鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!", DateTime.Now.ToString("yyyy-MM-dd"));
+ flag_2 = true;
+ return false;
+ }
+
+ // 姣忔鎴愬姛鏍￠獙涓�涓潯鐮佸悗锛屽墿浣欐暟閲忓噺1
+ hqtyOut -= 1;
+
+ // 鏇存柊缂撳瓨鍊�
+ RemainingQtyCache[cacheKey] = hqtyOut;
+
+ //鎷嶇収宸ュ簭闄ゅ
+ if (HProcNumber != "013")
+ {
+ //澧炲姞浜х嚎缁勮杩芥函鍗�
+ //鏌ヨ褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏈夋病鏈夐厤浠朵俊鎭�,濡傛灉鏈� 鍒欏垽鏂厤浠跺崟鐨勬暟閲忔槸鍚︿负0
+ DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + AllHProcID, "h_p_Gy_BarCodeBillBomList");
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ //鍒ら厤浠舵暟閲忔槸鍚︾瓑浜�0
+ for (int i = 0; i < dataSet.Tables[0].Rows.Count; i++)
+ {
+ double SYHQty = double.Parse(dataSet.Tables[0].Rows[i]["閰嶄欢鏁伴噺"].ToString());
+ string HMaterNamePJ = dataSet.Tables[0].Rows[i]["閰嶄欢浠ｇ爜"].ToString();
+ string HMaterBarCode = dataSet.Tables[0].Rows[i]["HBarCode"].ToString();
+ if (SYHQty == 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
+ {
+ time = DateTime.Now;
+ MessageBox.Show("娴佽浆鍗�:" + HProcExchBillNo + ",閰嶄欢鏉＄爜:" + HMaterBarCode + ",閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!");
+ }
+ DBHelper.CustomWriteLog("娴佽浆鍗�:" + HProcExchBillNo + ",閰嶄欢鏉＄爜:" + HMaterBarCode + ",閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!", DateTime.Now.ToString("yyyy-MM-dd"));
+ flag_2 = true;
+ return false;
+ }
+ }
+ }
+ }
+
+ flag_2 = false;
+ return true;
+ }
+
+ private void ReadyDataForm_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ if (num == 1)
+ {
+ MessageBox.Show("褰撳墠鎸夐挳鏈殏鍋�,涓嶅厑璁稿叧闂�!");
+ e.Cancel = true;
+ }
+ else if (MessageBox.Show("纭畾瑕佸叧闂悧锛�", "纭", MessageBoxButtons.YesNo) == DialogResult.No)
+ {
+ e.Cancel = true;
+ }
+ }
+
+ private void btnSelectAll_Click(object sender, EventArgs e)
+ {
+ if (num == 0)
+ {
+ if (MessageBox.Show("鏄惁鍚敤妫�绱㈣ˉ婕忥紵", "纭", MessageBoxButtons.YesNo) == DialogResult.Yes)
+ {
+ SelectTime = -90;
+ Read_Txt();
+ }
+ }
+ else if (num == 1)
+ {
+ MessageBox.Show("璇峰厛鐐瑰嚮鏆傚仠鎸夐挳!");
+ }
+
+
+ }
+ }
+}
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.resx b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.resx
new file mode 100644
index 0000000..3298079
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm_New.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>19, 21</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj b/WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj
index 081e4fc..57d35bb 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/WFormReadData_SMR.csproj
@@ -110,11 +110,23 @@
<Compile Include="ReadCoordinateExcelFrom.Designer.cs">
<DependentUpon>ReadCoordinateExcelFrom.cs</DependentUpon>
</Compile>
+ <Compile Include="ReadCSV_New.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ReadCSV_New.Designer.cs">
+ <DependentUpon>ReadCSV_New.cs</DependentUpon>
+ </Compile>
<Compile Include="ReadCSV.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ReadCSV.Designer.cs">
<DependentUpon>ReadCSV.cs</DependentUpon>
+ </Compile>
+ <Compile Include="ReadyDataForm_New.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ReadyDataForm_New.Designer.cs">
+ <DependentUpon>ReadyDataForm_New.cs</DependentUpon>
</Compile>
<Compile Include="ReadyDataForm.cs">
<SubType>Form</SubType>
@@ -145,9 +157,15 @@
<EmbeddedResource Include="ReadCoordinateExcelFrom.resx">
<DependentUpon>ReadCoordinateExcelFrom.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="ReadCSV_New.resx">
+ <DependentUpon>ReadCSV_New.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="ReadCSV.resx">
<DependentUpon>ReadCSV.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="ReadyDataForm_New.resx">
+ <DependentUpon>ReadyDataForm_New.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="ReadyDataForm.resx">
<DependentUpon>ReadyDataForm.cs</DependentUpon>
</EmbeddedResource>
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
deleted file mode 100644
index d23779a..0000000
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug.rar
+++ /dev/null
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/Config/SQLAPI.config b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/Config/SQLAPI.config
index 0c300db..49b6bfc 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/Config/SQLAPI.config
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/Config/SQLAPI.config
@@ -2,14 +2,14 @@
<configuration>
<appSettings>
<!--鏂帿灏�-->
- <!--<add key="sServer" value="30.10.7.6"></add>
+ <add key="sServer" value="30.10.7.6"></add>
<add key="sDataBase" value="HX_LMESsys_test"></add>
<add key="sUser" value="HX_USER"></add>
- <add key="sPassword" value="lc@841022"></add>-->
+ <add key="sPassword" value="lc@841022"></add>
<!--47-->
- <add key="sServer" value="47.96.97.237,15127"></add>
+ <!--<add key="sServer" value="47.96.97.237,15127"></add>
<add key="sDataBase" value="HX_LMESsys"></add>
<add key="sUser" value="HX_USER"></add>
- <add key="sPassword" value="lc@841022"></add>
+ <add key="sPassword" value="lc@841022"></add>-->
</appSettings>
</configuration>
\ No newline at end of file
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe
index a035b27..52a8c97 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb
index da77e50..0dd228e 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/Debug/WFormReadData_SMR.pdb
Binary files differ
diff --git "a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\347\273\204\350\243\205Debug.zip" "b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\347\273\204\350\243\205Debug.zip"
new file mode 100644
index 0000000..41935c1
--- /dev/null
+++ "b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\347\273\204\350\243\205Debug.zip"
Binary files differ
diff --git "a/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\351\225\255\351\233\225Debug.zip" "b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\351\225\255\351\233\225Debug.zip"
new file mode 100644
index 0000000..786568c
--- /dev/null
+++ "b/WFormSynchronizeData_SMR/WFormReadData_SMR/bin/\351\225\255\351\233\225Debug.zip"
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 9e72530..bc3ddb0 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 914d283..0f71bc3 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.ReadCSV_New.resources b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.ReadCSV_New.resources
new file mode 100644
index 0000000..6c05a97
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.ReadCSV_New.resources
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.ReadyDataForm_New.resources b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.ReadyDataForm_New.resources
new file mode 100644
index 0000000..6c05a97
--- /dev/null
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.ReadyDataForm_New.resources
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache
deleted file mode 100644
index 56d7fb9..0000000
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.CoreCompileInputs.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.CoreCompileInputs.cache
index c3e889c..e74fac4 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.CoreCompileInputs.cache
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4e018a8b153e5b9b51f87c74986622099197582e
+4e64d6417effead0601237ab1f2ba09cb6ee9653
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt
index e9c379d..fb18540 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.FileListAbsolute.txt
@@ -37,3 +37,43 @@
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.exe
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.pdb
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.AssemblyReference.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\WFormReadData_SMR.exe.config
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\WFormReadData_SMR.exe
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\WFormReadData_SMR.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\BouncyCastle.Crypto.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\DocumentFormat.OpenXml.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\DocumentFormat.OpenXml.Framework.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\HslCommunication.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\ICSharpCode.SharpZipLib.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\Newtonsoft.Json.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.OOXML.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.OpenXml4Net.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.OpenXmlFormats.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\BouncyCastle.Crypto.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\DocumentFormat.OpenXml.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\DocumentFormat.OpenXml.Framework.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\HslCommunication.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\ICSharpCode.SharpZipLib.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\ICSharpCode.SharpZipLib.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\Newtonsoft.Json.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.OOXML.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.OOXML.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.OpenXml4Net.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.OpenXml4Net.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\bin\Debug\NPOI.OpenXmlFormats.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.JZ_ReadDate.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.Properties.Resources.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadCoordinateExcelFrom.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadCSV.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadyDataForm.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ZZ_GlueWeigh.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.GenerateResource.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.CoreCompileInputs.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.csproj.CopyComplete
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.exe
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadyDataForm_New.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormReadData_SMR\obj\Debug\WFormReadData_SMR.ReadCSV_New.resources
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache
index 727ef4d..52dc4fa 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.GenerateResource.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
index a035b27..52a8c97 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
index da77e50..0dd228e 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.pdb
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index 7435b3e..ef473c4 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -31,7 +31,7 @@
CustomWriteLog("1.璁℃椂鍣ㄥ紑濮�:"+timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鏍规嵁鏃堕棿姝ｅ簭鎺掑簭鑾峰彇鍓�150鏉℃暟鎹�
- DataTable list = oCN.RunProcReturn("select top 150 * from Sb_EquipMentCollection_SN WITH(NOLOCK) where HFlag=0 order by HCreateTime", "Sb_EquipMentCollection_SN").Tables[0];
+ DataTable list = oCN.RunProcReturn("select top 150 HResult,HBarCode,HCreateTime from Sb_EquipMentCollection_SN WITH(NOLOCK) where HFlag=0 order by HCreateTime", "Sb_EquipMentCollection_SN").Tables[0];
//寰幆闆嗗悎
for (int i = 0; i < list.Rows.Count; i++)
@@ -75,7 +75,7 @@
bool flag = false;
string HBadCodeSN = dic["HBarCode"].ToString();
- HBadCodeSN = TM_ZH(HBadCodeSN);
+ //HBadCodeSN = TM_ZH(HBadCodeSN);
//鍒ゆ柇褰撳ぉ鏉＄爜鏈夋病鏈夊瓨鍌ㄥ湪鏉＄爜琛ㄩ噷 濡傛灉娌℃湁 鍒欎繚瀛樻暟鎹� 骞惰繑鍥�0
//濡傛灉宸插瓨鍦� 鍒欒繑鍥� 1
//濡傛灉鏉′欢涓嶆弧瓒崇殑 鍒欒繑鍥� 2
@@ -101,9 +101,9 @@
//鏌ヨ杩欎釜宸ュ簭瀵瑰簲鐨勬潯鐮� 鍑虹珯鍗曟槸鍚﹀凡缁忓瓨鍦�
DataSet ds1 = oCN.RunProcReturn(@"select a.HProcID from Sc_StationOutBillMain a WITH(NOLOCK)
-inner join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID
-left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
-where p.HNumber='" + dic["HProcNumber"].ToString() + "' and sn.HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_SN");
+ inner join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID
+ left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
+ where p.HNumber='" + dic["HProcNumber"].ToString() + "' and sn.HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_SN");
//鍒ゆ柇鏉＄爜涔嬪墠鏄惁涓篘G 鍚屾椂 鍒ゆ柇鍑虹珯鍗曠殑鏉＄爜鏁版嵁鏄笉瀛樺湪
if (ds.Tables[0].Rows.Count > 0 && ds1.Tables[0].Rows.Count == 0)
@@ -151,7 +151,7 @@
bool flag = false;
int num = 0;
string HBadCodeSN = dic["HBarCode"].ToString();
- HBadCodeSN = TM_ZH(HBadCodeSN);
+ //HBadCodeSN = TM_ZH(HBadCodeSN);
//鍒ゆ柇褰撳ぉ鏉＄爜鏈夋病鏈夊瓨鍌ㄥ湪鏉＄爜琛ㄩ噷 濡傛灉娌℃湁 鍒欎繚瀛樻暟鎹� 骞惰繑鍥�0
//濡傛灉宸插瓨鍦� 鍒欒繑鍥� 1
//濡傛灉鏉′欢涓嶆弧瓒崇殑 鍒欒繑鍥� 2
@@ -192,16 +192,17 @@
{
Stopwatch timer = new Stopwatch();
timer.Start();
+ string HMakers = ""; //鍒跺崟浜�
CustomWriteLog("2.1.1.鍑虹珯鍗曟柊澧炲紑濮�:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鑾峰彇缁戝畾娴佽浆鍗�
- DataSet ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
+ DataSet ds = oCN.RunProcReturn(@"select HSourceBillNo, from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
string HProcExchBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
string HProcNumber = dic["HProcNumber"].ToString();
CustomWriteLog("2.1.2.缁戝畾娴佽浆鍗�:"+ HProcNumber+"----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鏌ヨ鐢熶骇璧勬簮
- ds = oCN.RunProcReturn("select * from Gy_Source WITH(NOLOCK) where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
+ ds = oCN.RunProcReturn("select HItemID from Gy_Source WITH(NOLOCK) where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
long HSourceID = 0;
if (ds.Tables[0].Rows.Count != 0)
{
@@ -211,13 +212,14 @@
CustomWriteLog("2.1.3.鑾峰彇鐢熶骇璧勬簮:" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鏌ヨ鑱屽憳
- ds = oCN.RunProcReturn("select * from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
+ ds = oCN.RunProcReturn("select HItemID,HName from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
long HEmpIDs = 0;
string HEmpName = "";
if (ds.Tables[0].Rows.Count != 0)
{
HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
HEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
+ HMakers = ds.Tables[0].Rows[0]["HName"].ToString();
}
CustomWriteLog("2.1.4.鏌ヨ鑱屽憳淇℃伅:" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
@@ -245,9 +247,9 @@
//鏍规嵁娴佽浆鍗″拰宸ュ簭 鏌ヨ鍑虹珯鍗曢渶瑕佷繚瀛樼殑淇℃伅
ds = oCN.RunProcReturn(@"select a.HWorkShopID,b.HProcNo,b.HProcID,a.HMaterID,a.HQty,a.HInterID,HEntryID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,b.HCenterID from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-inner join Sc_ProcessExchangeBillSub b WITH(NOLOCK) on a.HInterID=b.HInterID
-left join Gy_Process p WITH(NOLOCK) on b.HProcID=p.HItemID
-where a.HBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "'", "Sc_ProcessExchangeBillMain");
+ inner join Sc_ProcessExchangeBillSub b WITH(NOLOCK) on a.HInterID=b.HInterID
+ left join Gy_Process p WITH(NOLOCK) on b.HProcID=p.HItemID
+ where a.HBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "'", "Sc_ProcessExchangeBillMain");
CustomWriteLog("2.1.6.鏌ヨ娴佽浆鍗′俊鎭�:" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
@@ -346,9 +348,10 @@
//鍒ゆ柇褰撳墠娴佽浆鍗＄殑鍑虹珯鍗� 鏄惁鏈夋暟鎹�
- ds = oCN.RunProcReturn(@"select * from Sc_StationOutBillMain a WITH(NOLOCK)
-left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
-where HProcExchBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "'", "Sc_StationOutBillMain");
+ ds = oCN.RunProcReturn(@"select HInterID,HBillNo from Sc_StationOutBillMain a WITH(NOLOCK)
+ left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
+ where HProcExchBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "'" +
+ " and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "'", "Sc_StationOutBillMain");
CustomWriteLog("2.1.9鑾峰彇鏄惁鏈夊嚭绔欏崟 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
@@ -388,6 +391,7 @@
"," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + ","+ HShiftsID + ") ");
}
+
CustomWriteLog("2.1.10 鍑虹珯鍗曟柊澧� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
if (HResult == "OK")
@@ -395,11 +399,11 @@
CustomWriteLog("2.1.11 鏉＄爜鍙嶅啓 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鏌ヨ 鍑虹珯鍗曞瓙琛� 鏉＄爜琛ㄧ殑鏁版嵁
- ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
+ ds = oCN.RunProcReturn("select HEntryID, from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
string HMakeTime = dic["HCreateTime"].ToString();
oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
-values({ HInterID}, '{ HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{HBadCodeSN}', 1, '"+ HMakeTime + "', '', " + HProcExchInterID + "," + HProcExchEntryID + ", '" + HProcExchBillNo + "', '', 0, 0)");
+ values({ HInterID}, '{ HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{HBadCodeSN}', 1, '"+ HMakeTime + "', '', " + HProcExchInterID + "," + HProcExchEntryID + ", '" + HProcExchBillNo + "', '', 0, 0)");
CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcNumber + ",鍑虹珯鏃堕棿:" + HMakeTime, "TM" + DateTime.Now.ToString("yyyy-MM-dd"));
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺
@@ -411,12 +415,12 @@
{
CustomWriteLog("2.1.13 涓嶅悎鏍煎弽鍐� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//閫氳繃鏉＄爜鏌ヨ鐢熶骇璐ㄩ噺姹囨姤鍗曟暟鎹�
- ds = oCN.RunProcReturn("select * from Sc_QualityReportBillSub WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' order by HMakeDate desc", "Sc_QualityReportBillSub");
+ ds = oCN.RunProcReturn("select HMakeDate from Sc_QualityReportBillSub WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' order by HMakeDate desc", "Sc_QualityReportBillSub");
if (ds.Tables[0].Rows.Count > 0) {
string HBadDate = ds.Tables[0].Rows[0]["HMakeDate"].ToString();
//閫氳繃鏉＄爜鏌ヨ杩斾慨璁板綍鍗曠殑鏁版嵁
- ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillMain WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' order by HMakeDate desc", "Sc_SourceLineRepairBillMain");
+ ds = oCN.RunProcReturn("select HMakeDate from Sc_SourceLineRepairBillMain WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' order by HMakeDate desc", "Sc_SourceLineRepairBillMain");
if (ds.Tables[0].Rows.Count > 0) {
string HRepairDate = ds.Tables[0].Rows[0]["HMakeDate"].ToString();
@@ -445,7 +449,7 @@
return false;
}
- // //鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ //鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
// ds = oCN.RunProcReturn($@"select (b.HQty -sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_ProcessExchangeBillSub b WITH(NOLOCK)
//left join Sc_StationOutBillMain ou WITH(NOLOCK) on b.HInterID=ou.HProcExchInterID and b.HEntryID=ou.HProcExchEntryID
//where b.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
@@ -460,7 +464,7 @@
CustomWriteLog("2.1.15 鍙嶅啓缁撴潫 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
- //澧炲姞宸ュ簭鍒ゆ柇
+ //澧炲姞宸ュ簭鍒ゆ柇 鎷嶇収宸ュ簭璺宠繃宸ヨ壓鍙傛暟缁戝畾 涓嶈蛋涓嬮潰娴佺▼锛岀洿鎺ョ粨鏉熸湰娆℃柊澧�
if (HProcNumber == "013")
{
return true;
@@ -507,13 +511,13 @@
//鏌ヨ鑱屽憳
- ds = oCN.RunProcReturn("select * from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
- string HMakers = "";
- if (ds.Tables[0].Rows.Count != 0)
- {
- HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
- HMakers = ds.Tables[0].Rows[0]["HName"].ToString();
- }
+ //ds = oCN.RunProcReturn("select HItemID,HName from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
+
+ //if (ds.Tables[0].Rows.Count != 0)
+ //{
+ // HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
+ // HMakers = ds.Tables[0].Rows[0]["HName"].ToString();
+ //}
CustomWriteLog("2.1.21 鑱屽憳鏌ヨ :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
@@ -522,11 +526,11 @@
//淇濆瓨鐢熶骇缁勮鍗曚富琛�
string sql = $@"Insert Into Sc_AssemblyBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate
-,HBillNo,HBillStatus,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo
-,HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus,HProdOrgID)
-values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate()
-,'{HBillNo1}','1','{HMakers}',getdate(),{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}'
-,{HICMOInterID},'{HICMOBillNo}','{HBadCodeSN}',{HMaterID},0,'姹囨姤',{HPRDOrgIDs})";
+ ,HBillNo,HBillStatus,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo
+ ,HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus,HProdOrgID)
+ values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate()
+ ,'{HBillNo1}','1','{HMakers}',getdate(),{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}'
+ ,{HICMOInterID},'{HICMOBillNo}','{HBadCodeSN}',{HMaterID},0,'姹囨姤',{HPRDOrgIDs})";
CustomWriteLog("2.1.21 sql璇彞 :" + sql + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RunProc(sql);
@@ -540,11 +544,11 @@
string HBarCodes = dataSet.Tables[0].Rows[i]["HBarCode"].ToString();
//瀛愯〃瀛樺偍
string sq2 = $@"Insert Into Sc_AssemblyBillSub(HInterID,HBillNo_bak,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo
- ,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
- ,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
- values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
- ,'',{ HMaterIDs},0,0,0,1
- ,0,0,getdate(),'{HBarCodes}','{HBadCodeSN}','') ";
+ ,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
+ ,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
+ values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
+ ,'',{ HMaterIDs},0,0,0,1
+ ,0,0,getdate(),'{HBarCodes}','{HBadCodeSN}','') ";
oCN.RunProc(sq2);
}
@@ -742,7 +746,7 @@
string HGetTime = ds.Tables[0].Rows[i]["HCreateTime"].ToString();
string HResult = ds.Tables[0].Rows[i]["HResult"].ToString();
- DataSet dataSet = oCN.RunProcReturn("select * from Sc_StationOutBillSub_TechParam WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "'", "Sc_StationOutBillSub_TechParam");
+ DataSet dataSet = oCN.RunProcReturn("select HInterID,HEntryID from Sc_StationOutBillSub_TechParam WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "'", "Sc_StationOutBillSub_TechParam");
sql = "insert into Sc_StationOutBillSub_TechParam(HInterID,HBillNo_bak,HEntryID ,HSourceInterID,HSourceEntryID,HSourceBillNo,HTechParamID,HRelValue,HGetTime,HBarCode,HMouldID,HRemark)" +
$"values({HInterID},'{HBillNo}',{(dataSet.Tables[0].Rows.Count + 1)},{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}',{HTechParamID},{HCount},'{HGetTime}','{HBadCodeSN}',{HMouldID},'{HResult}')";
@@ -768,78 +772,48 @@
{
try
{
-
- DataSet ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
- //鍒ゆ柇鏉＄爜鏄惁瀛樺湪鏉＄爜妗ｆ
- if (ds.Tables[0].Rows.Count > 0)
- {
- string HSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
- DataSet dataTable = oCN.RunProcReturn(@"select * from Sc_ProcessExchangeBillMain where HBillNo='" + HSourceBillNo + "'", "Sc_ProcessExchangeBillMain");
- //鍒ゆ柇鏉＄爜鐨勬簮鍗� 娴佽浆鍗℃槸鍚﹁鍒犻櫎
- if (dataTable.Tables[0].Rows.Count == 0)
- {
- //濡傛灉婧愬崟宸茬粡鍒犻櫎 鍒欐潯鐮佷篃鍒犻櫎閲嶆柊鐢熸垚
- oCN.RunProc("delete from Gy_BarCodeBill where HBarCode='" + HBadCodeSN + "'");
+ // 鏌ヨ鏉＄爜鏄惁瀛樺湪鏉＄爜妗ｆ
+ DataSet barCodeDs = oCN.RunProcReturn(@"select HSourceBillNo from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
- //閲嶆柊鏌ヨ鏉＄爜妗ｆ 杩涘叆鏂板鏂规硶
- ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
+ if (barCodeDs.Tables[0].Rows.Count > 0)
+ {
+ string HSourceBillNo = barCodeDs.Tables[0].Rows[0]["HSourceBillNo"].ToString();
+ DataSet processExchangeDs = oCN.RunProcReturn(@"select HInterID from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HBillNo='" + HSourceBillNo + "'", "Sc_ProcessExchangeBillMain");
+ if (processExchangeDs.Tables[0].Rows.Count == 0)
+ {
+ oCN.RunProc("delete from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "'");
+ // 閲嶆柊鏌ヨ鏉＄爜妗ｆ
+ barCodeDs = oCN.RunProcReturn(@"select HSourceBillNo from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
}
}
- //鍒ゆ柇鏉＄爜鏄惁鍦ㄦ暟鎹簱閲�
- if (ds.Tables[0].Rows.Count == 0)
+ //鍒ゆ柇鏉＄爜鏄惁鍦ㄦ暟鎹簱閲� 濡傛灉鏈夊垪娌℃湁鏁版嵁杩斿洖閭ｅ氨鏄繘鍘讳繚瀛�
+ if (barCodeDs.Tables[0].Rows.Count == 0)
{
- //鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
- if (HBadCodeSN.Length == 29)
+ //鍒ゆ柇鏉＄爜闀垮害鏄�29浣嶈繕鏄�50浣� 29 鏃犲皹杞﹂棿 50 15杞﹂棿
+ if (HBadCodeSN.Length == 29 || HBadCodeSN.Length == 50)
{
- string str1 = HBadCodeSN.Substring(18, 8);
- ds = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
- //鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
- if (ds.Tables[0].Rows.Count > 0)
+ string str1 = HBadCodeSN.Length == 29 ? HBadCodeSN.Substring(18, 8) : HBadCodeSN.Substring(42, 8);
+ string HProcExchBillNo = GetProcExchBillNo(str1);
+
+ if (HProcExchBillNo == null && HBadCodeSN.Length == 29)
{
- string HProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
- get_HBardBillSave(HBadCodeSN, HProcExchBillNo);
+ // 绗竴娆℃埅鍙栨湭鎵惧埌锛岃繘琛岀浜屾鎴彇
+ str1 = HBadCodeSN.Substring(0, 8); // 绀轰緥鐨勯噸鏂版埅鍙栨柟娉�
+ HProcExchBillNo = GetProcExchBillNo(str1);
}
- else
+
+ if (HProcExchBillNo == null)
{
- str1 = HBadCodeSN.Substring(23, 3);
- ds = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
- //鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
- if (ds.Tables[0].Rows.Count > 0)
- {
- string HProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
- get_HBardBillSave(HBadCodeSN, HProcExchBillNo);
- }
- else
- {
- oCN.RollBack();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
- return 2;
- }
- }
- }
- //鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
- else if (HBadCodeSN.Length == 50)
- {
- string str1 = HBadCodeSN.Substring(42, 8);
- ds = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
- //鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
- if (ds.Tables[0].Rows.Count > 0)
- {
- string HProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
- get_HBardBillSave(HBadCodeSN, HProcExchBillNo);
- }
- else
- {
- oCN.RollBack();
CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
return 2;
}
+ //淇濆瓨鏉＄爜
+ get_HBardBillSave(HBadCodeSN, HProcExchBillNo);
}
else
{
- oCN.RollBack();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",闀垮害涓嶇瓑浜�29浣�!", DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",闀垮害涓嶇瓑浜�29浣嶆垨50浣�!", DateTime.Now.ToString("yyyy-MM-dd"));
return 2;
}
}
@@ -857,6 +831,20 @@
}
}
+ // 鏍规嵁鏉＄爜 鑾峰彇娴佽浆鍗＄紪鍙�
+ public string GetProcExchBillNo(string str1)
+ {
+
+ DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ return ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ }
+ return null;
+ }
+
+
//鏂板鏉＄爜鏁版嵁
public void get_HBardBillSave(string HBarCode, string HProcExchBillNo)
{
@@ -864,10 +852,10 @@
{
//鏌ヨ娴佽浆鍗℃暟鎹�
DataSet dataSet = oCN.RunProcReturn(@"select a.HPRDORGID, m.HModel 鐗╂枡瑙勬牸,m.HName 鍚嶇墿鏂欑О,a.HBillNo,a.HInterID,a.HMaterID,m.HNumber 鐗╂枡浠ｇ爜,o.HNumber 缁勭粐浠ｇ爜,a.HUnitID,u.HNumber 鍗曚綅浠ｇ爜 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
-left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
-left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
-left join Gy_Unit u WITH(NOLOCK) on a.HUnitID=u.HItemID
-where HBillNo='" + HProcExchBillNo + "'", "Sc_ProcessExchangeBillMain");
+ left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
+ left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID
+ left join Gy_Unit u WITH(NOLOCK) on a.HUnitID=u.HItemID
+ where HBillNo='" + HProcExchBillNo + "'", "Sc_ProcessExchangeBillMain");
//鍒ゆ柇娴佽浆鍗′笉鑳戒负绌�
@@ -876,7 +864,7 @@
oCN.RollBack();
CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉鑳戒负绌�!", DateTime.Now.ToString("yyyy-MM-dd"));
}
-
+
//鏃ユ湡鑾峰彇鏂瑰紡
string sDate = DateTime.Now.ToString();
string HWei = "0"; //灏炬暟
@@ -968,7 +956,7 @@
//瀹氭椂璇诲彇鏁版嵁
private void timer1_Tick(object sender, EventArgs e)
{
- DataTable list = oCN.RunProcReturn("select top 100 * from Sb_EquipMentCollection_SN WITH(NOLOCK) where HFlag=0 order by HCreateTime asc", "Sb_EquipMentCollection_SN").Tables[0];
+ DataTable list = oCN.RunProcReturn("select top 100 HResult,HBarCode,HCreateTime from Sb_EquipMentCollection_SN WITH(NOLOCK) where HFlag=0 order by HCreateTime asc", "Sb_EquipMentCollection_SN").Tables[0];
//寰幆闆嗗悎
for (int i = 0; i < list.Rows.Count; i++)
@@ -982,7 +970,7 @@
//HResult = "OK";
//寮�濮嬩簨鍔�
oCN.BeginTran();
-
+
if (HResult == "OK")
{
flag = HResultOK(list.Rows[i]);
@@ -1008,7 +996,7 @@
{
//鏌ヨ鑱屽憳
- DataSet ds = oCN.RunProcReturn("select * from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
+ DataSet ds = oCN.RunProcReturn("select HItemID,HName from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
long HEmpIDs = 0;
string HMakers = "";
if (ds.Tables[0].Rows.Count != 0)
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug.rar b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug.rar
deleted file mode 100644
index 35dbe14..0000000
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug.rar
+++ /dev/null
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
index b1b5d74..4c70611 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
@@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>7YYbHJtCID9TX7m/6Vud7eugByVfVvkzp8Gq8YFnEIw=</dsig:DigestValue>
+ <dsig:DigestValue>XmpBiwt1eZIvqKXjCIffhLl/VWIWnjOikOcUNFESV1M=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe
index 806f134..68ba80e 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
index cac4b42..20aa39f 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -61,7 +61,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>oC4ZjHC7dL0ycLoRjteBTr5sLPvGRaeiCqmI749uNZY=</dsig:DigestValue>
+ <dsig:DigestValue>1YFOk8YtybXMEv1eO1KRN167fneXsT9CiZSGjddw0vM=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb
index 54b03f8..7018bc4 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdb
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe
index 806f134..68ba80e 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application
index b1b5d74..4c70611 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application
@@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>7YYbHJtCID9TX7m/6Vud7eugByVfVvkzp8Gq8YFnEIw=</dsig:DigestValue>
+ <dsig:DigestValue>XmpBiwt1eZIvqKXjCIffhLl/VWIWnjOikOcUNFESV1M=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
index 7364ba8..e6cc9af 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.CoreCompileInputs.cache b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.CoreCompileInputs.cache
index c91eab0..e69e379 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.CoreCompileInputs.cache
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-6e7e5ec0e6ae0214de89541c1d16e704fdf73567
+0d7167dfce51cf79dfbc10e91d9c9104f5325c66
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt
index 22ef75f..c23b1af 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt
@@ -31,3 +31,21 @@
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.CopyComplete
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.exe
E:\鏅轰簯mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\WFormSynchronizeData_SMR.exe.config
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\WFormSynchronizeData_SMR.exe.manifest
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\WFormSynchronizeData_SMR.application
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\WFormSynchronizeData_SMR.exe
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\WFormSynchronizeData_SMR.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\Newtonsoft.Json.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\Newtonsoft.Json.xml
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.AssemblyReference.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.FormBack.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.Form1.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.Properties.Resources.resources
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.GenerateResource.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.CoreCompileInputs.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.exe.manifest
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.application
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.CopyComplete
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.exe
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒鎻掍欢\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.pdb
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache
index 4c84a83..84d43f8 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.GenerateResource.cache
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe
index 806f134..68ba80e 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe
Binary files differ
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
index cac4b42..20aa39f 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -61,7 +61,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
- <dsig:DigestValue>oC4ZjHC7dL0ycLoRjteBTr5sLPvGRaeiCqmI749uNZY=</dsig:DigestValue>
+ <dsig:DigestValue>1YFOk8YtybXMEv1eO1KRN167fneXsT9CiZSGjddw0vM=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb
index 54b03f8..7018bc4 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdb
Binary files differ
--
Gitblit v1.9.1