From 9260682ea679a812b27dcd9209d0aa85df5d03f9 Mon Sep 17 00:00:00 2001
From: qinchulong <qinchulong@hnkhzn.com>
Date: 星期六, 12 十月 2024 15:16:14 +0800
Subject: [PATCH] 1
---
/dev/null | 130 -------------------------------------------
1 files changed, 0 insertions(+), 130 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
deleted file mode 100644
index be0e46a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v8.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v8.bin"
deleted file mode 100644
index 6ddfd70..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v8.bin"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
deleted file mode 100644
index 2579d5b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v8.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v8.bin"
deleted file mode 100644
index ff75062..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v8.bin"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v8.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v8.bin"
deleted file mode 100644
index 42695ce..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v8.bin"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
deleted file mode 100644
index 37a02ec..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/config/applicationhost.config" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/config/applicationhost.config"
deleted file mode 100644
index 269dc55..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/config/applicationhost.config"
+++ /dev/null
@@ -1,1021 +0,0 @@
-锘�<?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" />
- </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" />
- </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" />
- </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="ServiceModel" type="System.ServiceModel.Activation.HttpModule, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="managedHandler,runtimeVersionv2.0" />
- </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="svc-Integrated" path="*.svc" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
- <add name="svc-ISAPI-2.0" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
- <add name="xoml-Integrated" path="*.xoml" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
- <add name="xoml-ISAPI-2.0" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
- <add name="rules-Integrated" path="*.rules" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
- <add name="rules-ISAPI-2.0" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
- <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="svc-ISAPI-2.0-64" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" />
- <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="rules-64-ISAPI-2.0" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" />
- <add name="xoml-64-ISAPI-2.0" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness64" />
- <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/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v16/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v16/.suo"
deleted file mode 100644
index b293fd0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v16/.suo"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
deleted file mode 100644
index 0b29dc3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
deleted file mode 100644
index 1658dae..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
+++ /dev/null
@@ -1,138 +0,0 @@
-{
- "Version": 1,
- "WorkspaceRootPath": "F:\\\u91CD\u6784\\\u91CD\u6784\u6E90\u7801\\Infrastructure\\WIDESEA_WMSServer\\",
- "Documents": [
- {
- "AbsoluteMoniker": "D:0:0:{BA78CC65-6D17-4C76-8285-DC6B6165DA17}|WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj|d:\\project\\infrastructure\\widesea_wmsserver\\widesea_businessservices\\dt_inboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{BA78CC65-6D17-4C76-8285-DC6B6165DA17}|WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj|solutionrelative:widesea_businessservices\\dt_inboundorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}|WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj|d:\\project\\infrastructure\\widesea_wmsserver\\widesea_ibusinessesrepository\\idt_roadwayinforepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}|WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj|solutionrelative:widesea_ibusinessesrepository\\idt_roadwayinforepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}|WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj|d:\\project\\infrastructure\\widesea_wmsserver\\widesea_ibusinessesrepository\\idt_locationinforepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}|WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj|solutionrelative:widesea_ibusinessesrepository\\idt_locationinforepository.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\project\\infrastructure\\widesea_wmsserver\\widesea_wmsserver\\controllers\\dt_inboundordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\dt_inboundordercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{BA78CC65-6D17-4C76-8285-DC6B6165DA17}|WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj|d:\\project\\infrastructure\\widesea_wmsserver\\widesea_businessservices\\dt_billgroupstockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{BA78CC65-6D17-4C76-8285-DC6B6165DA17}|WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj|solutionrelative:widesea_businessservices\\dt_billgroupstockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\project\\infrastructure\\widesea_wmsserver\\widesea_wmsserver\\controllers\\dt_billgroupstockcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\controllers\\dt_billgroupstockcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- }
- ],
- "DocumentGroupContainers": [
- {
- "Orientation": 0,
- "VerticalTabListWidth": 256,
- "DocumentGroups": [
- {
- "DockedWidth": 200,
- "SelectedChildIndex": 3,
- "Children": [
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "IDt_RoadWayInfoRepository.cs",
- "DocumentMoniker": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\IDt_RoadWayInfoRepository.cs",
- "RelativeDocumentMoniker": "WIDESEA_IBusinessesRepository\\IDt_RoadWayInfoRepository.cs",
- "ToolTip": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\IDt_RoadWayInfoRepository.cs",
- "RelativeToolTip": "WIDESEA_IBusinessesRepository\\IDt_RoadWayInfoRepository.cs",
- "ViewState": "AQIAAAAAAAAAAAAAAAAAAAoAAAAuAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-15T07:27:55.605Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 2,
- "Title": "IDt_LocationInfoRepository.cs",
- "DocumentMoniker": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\IDt_LocationInfoRepository.cs",
- "RelativeDocumentMoniker": "WIDESEA_IBusinessesRepository\\IDt_LocationInfoRepository.cs",
- "ToolTip": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\IDt_LocationInfoRepository.cs",
- "RelativeToolTip": "WIDESEA_IBusinessesRepository\\IDt_LocationInfoRepository.cs",
- "ViewState": "AQIAAAAAAAAAAAAAAAAAAAoAAABJAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-15T07:26:37.915Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 4,
- "Title": "Dt_BillGroupStockService.cs",
- "DocumentMoniker": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\Dt_BillGroupStockService.cs",
- "RelativeDocumentMoniker": "WIDESEA_BusinessServices\\Dt_BillGroupStockService.cs",
- "ToolTip": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\Dt_BillGroupStockService.cs",
- "RelativeToolTip": "WIDESEA_BusinessServices\\Dt_BillGroupStockService.cs",
- "ViewState": "AQIAAB4AAAAAAAAAAAAewCAAAAA2AAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-15T07:13:47.938Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "Title": "Dt_InboundOrderService.cs",
- "DocumentMoniker": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\Dt_InboundOrderService.cs",
- "RelativeDocumentMoniker": "WIDESEA_BusinessServices\\Dt_InboundOrderService.cs",
- "ToolTip": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\Dt_InboundOrderService.cs",
- "RelativeToolTip": "WIDESEA_BusinessServices\\Dt_InboundOrderService.cs",
- "ViewState": "AQIAAAYAAAAAAAAAAAAAAOsAAABdAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-15T06:49:34.599Z",
- "EditorCaption": ""
- },
- {
- "$type": "Bookmark",
- "Name": "ST:12:0:{2456bd12-ecf7-4988-a4a6-67d49173f565}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:17:0:{2456bd12-ecf7-4988-a4a6-67d49173f565}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{65ddf8c3-8f89-4077-a6c6-dbb8853aab13}"
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
- "Title": "Dt_InboundOrderController.cs",
- "DocumentMoniker": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Dt_InboundOrderController.cs",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Dt_InboundOrderController.cs",
- "ToolTip": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Dt_InboundOrderController.cs",
- "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Dt_InboundOrderController.cs",
- "ViewState": "AQIAABgAAAAAAAAAAAAiwCoAAAAuAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-15T06:49:25.934Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
- "Title": "Dt_BillGroupStockController.cs",
- "DocumentMoniker": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Dt_BillGroupStockController.cs",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\Controllers\\Dt_BillGroupStockController.cs",
- "ToolTip": "D:\\project\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\Controllers\\Dt_BillGroupStockController.cs",
- "RelativeToolTip": "WIDESEA_WMSServer\\Controllers\\Dt_BillGroupStockController.cs",
- "ViewState": "AQIAAAkAAAAAAAAAAAAAABwAAAAwAAAA",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-15T06:49:11.857Z",
- "EditorCaption": ""
- }
- ]
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
deleted file mode 100644
index 71056a7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/FileUtil.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/FileUtil.cs"
deleted file mode 100644
index 2aaeea4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/FileUtil.cs"
+++ /dev/null
@@ -1,39 +0,0 @@
-锘縰sing System;
-using System.IO;
-using System.Threading;
-
-namespace LogLibrary.Log
-{
- public static class FileUtil
- {
-
- /// <summary>
- /// 杩藉姞鍐呭鍒版寚瀹氭枃浠朵腑
- /// </summary>
- /// <param name="filePath"></param>
- /// <param name="content"></param>
- public static void WriteAppend(string filePath, string content)
- {
- WriteAppend(filePath, new string[] { content });
- }
-
- public static void WriteAppend(string filePath, string[] contents)
- {
- using (FileStream fs = new(filePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite))
- {
- fs.Seek(fs.Length, SeekOrigin.Current);
-
- string content = string.Join(Environment.NewLine, contents) + Environment.NewLine;
-
- //byte[] data = System.Text.Encoding.GetEncoding("GB2312").GetBytes(content);
- byte[] data = System.Text.Encoding.Default.GetBytes(content);
-
-
- fs.Write(data, 0, data.Length);
-
- fs.Close();
- fs.Dispose();
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/ILog.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/ILog.cs"
deleted file mode 100644
index 11c5c38..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/ILog.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing System;
-
-namespace LogLibrary.Log
-{
- public unsafe interface ILog
- {
- bool* IsCryto { set; }
- bool IsDebugEnabled { get; }
-
- bool IsErrorEnabled { get; }
-
- bool IsFatalEnabled { get; }
-
- bool IsInfoEnabled { get; }
-
- bool IsWarnEnabled { get; }
-
- void Debug(bool isWriteFile, object message);
-
- void Debug(bool isWriteFile, object message, Exception exception);
-
- void DebugFormat(bool isWriteFile, string format, object arg0);
-
- void DebugFormat(bool isWriteFile, string format, params object[] args);
-
- void DebugFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args);
-
- void DebugFormat(bool isWriteFile, string format, object arg0, object arg1);
-
- void DebugFormat(bool isWriteFile, string format, object arg0, object arg1, object arg2);
-
- void Error(bool isWriteFile, object message);
-
- void Error(bool isWriteFile, object message, Exception exception);
-
- void ErrorFormat(bool isWriteFile, string format, object arg0);
-
- void ErrorFormat(bool isWriteFile, string format, params object[] args);
-
- void ErrorFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args);
-
- void ErrorFormat(bool isWriteFile, string format, object arg0, object arg1);
-
- void ErrorFormat(bool isWriteFile, string format, object arg0, object arg1, object arg2);
-
- void Fatal(bool isWriteFile, object message);
-
- void Fatal(bool isWriteFile, object message, Exception exception);
-
- void FatalFormat(bool isWriteFile, string format, object arg0);
-
- void FatalFormat(bool isWriteFile, string format, params object[] args);
-
- void FatalFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args);
-
- void FatalFormat(bool isWriteFile, string format, object arg0, object arg1);
-
- void FatalFormat(bool isWriteFile, string format, object arg0, object arg1, object arg2);
-
- void Info(bool isWriteFile, object message);
-
- void Info(bool isWriteFile, object message, Exception exception);
-
- //void InfoFormat(bool isWriteFile, string format, object arg0);
-
- //void InfoFormat(bool isWriteFile, string format, params object[] args);
-
- //void InfoFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args);
-
- //void InfoFormat(bool isWriteFile, string format, object arg0, object arg1);
-
- void InfoFormat(bool isWriteFile, object arg0, object arg1, object arg2);
-
- void Warn(bool isWriteFile, object message);
-
- void Warn(bool isWriteFile, object message, Exception exception);
-
- void WarnFormat(bool isWriteFile, string format, object arg0);
-
- void WarnFormat(bool isWriteFile, string format, params object[] args);
-
- void WarnFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args);
-
- void WarnFormat(bool isWriteFile, string format, object arg0, object arg1);
-
- void WarnFormat(bool isWriteFile, string format, object arg0, object arg1, object arg2);
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/ILogFactory.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/ILogFactory.cs"
deleted file mode 100644
index 520235a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/ILogFactory.cs"
+++ /dev/null
@@ -1,7 +0,0 @@
-锘縩amespace LogLibrary.Log
-{
- public interface ILogFactory
- {
- ILog GetLog(string name);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/Level.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/Level.cs"
deleted file mode 100644
index 0cfd286..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/Level.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LogLibrary.Log
-{
- public enum Level : int
- {
- Debug,
- Info,
- Warning,
- Error
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/Log.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/Log.cs"
deleted file mode 100644
index f636155..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/Log.cs"
+++ /dev/null
@@ -1,755 +0,0 @@
-锘縰sing System;
-using System.Text.RegularExpressions;
-
-namespace LogLibrary.Log
-{
-
- public unsafe class Log
- {
- private string m_Name;
- private const string m_MessageTemplate = "{0}-{1}: {2}";
-
- private const string m_Debug = "DEBUG";
-
- private const string m_Error = "ERROR";
-
- private const string m_Fatal = "FATAL";
-
- private const string m_Info = "INFO";
-
- private const string m_Warn = "WARN";
-
- /// <summary>
- /// Initializes a new instance of the <see cref="Log"/> class.
- /// </summary>
- /// <param name="name">The name.</param>
- public Log(string name)
- {
- m_Name = name;
- }
- public Log()
- {
- m_Name = "NaN";
- }
-
- /// <summary>
- /// Gets a value indicating whether this instance is debug enabled.
- /// </summary>
- /// <value>
- /// <c>true</c> if this instance is debug enabled; otherwise, <c>false</c>.
- /// </value>
- public bool IsDebugEnabled
- {
- get { return true; }
- }
-
- /// <summary>
- /// Gets a value indicating whether this instance is error enabled.
- /// </summary>
- /// <value>
- /// <c>true</c> if this instance is error enabled; otherwise, <c>false</c>.
- /// </value>
- public bool IsErrorEnabled
- {
- get { return true; }
- }
-
- /// <summary>
- /// Gets a value indicating whether this instance is fatal enabled.
- /// </summary>
- /// <value>
- /// <c>true</c> if this instance is fatal enabled; otherwise, <c>false</c>.
- /// </value>
- public bool IsFatalEnabled
- {
- get { return true; }
- }
-
- /// <summary>
- /// Gets a value indicating whether this instance is info enabled.
- /// </summary>
- /// <value>
- /// <c>true</c> if this instance is info enabled; otherwise, <c>false</c>.
- /// </value>
- public bool IsInfoEnabled
- {
- get { return true; }
- }
-
- /// <summary>
- /// Gets a value indicating whether this instance is warn enabled.
- /// </summary>
- /// <value>
- /// <c>true</c> if this instance is warn enabled; otherwise, <c>false</c>.
- /// </value>
- public bool IsWarnEnabled
- {
- get { return true; }
- }
-
-
-
- public string GetDataTimeLog(string log)
- {
- return string.Format("[{0}] >> {1}", DateTime.Now.ToString("yy-MM-dd HH:mm:ss"), log);
- }
-
- /// <summary>
- /// Logs the debug message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- public void Debug(bool isWriteFile, object message)
- {
- string log = GetDataTimeLog(message.ToString());
- Console.WriteLine(m_MessageTemplate, m_Name, m_Debug, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Debug, log);
- }
- }
-
- /// <summary>
- /// Logs the debug message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- /// <param name="exception">The exception.</param>
- public void Debug(bool isWriteFile, object message, Exception exception)
- {
- string log = GetDataTimeLog(message + Environment.NewLine + exception.Message + exception.StackTrace);
- Console.WriteLine(m_MessageTemplate, m_Name, m_Debug, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Debug, log);
- }
- }
-
- /// <summary>
- /// Logs the debug message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- public void DebugFormat(bool isWriteFile, string format, object arg0)
- {
- string log = GetDataTimeLog(string.Format(format, arg0));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Debug, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Debug, log);
- }
- }
-
- /// <summary>
- /// Logs the debug message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- public void DebugFormat(bool isWriteFile, string format, params object[] args)
- {
- string log = GetDataTimeLog(string.Format(format, args));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Debug, string.Format(format, args));
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Debug, log);
- }
- }
-
- /// <summary>
- /// Logs the debug message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="provider">The provider.</param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- public void DebugFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args)
- {
- string log = GetDataTimeLog(string.Format(format, args));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Debug, string.Format(provider, format, args));
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Debug, log);
- }
- }
-
- /// <summary>
- /// Logs the debug message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- public void DebugFormat(bool isWriteFile, string format, object arg0, object arg1)
- {
- string log = GetDataTimeLog(string.Format(format, arg0, arg1));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Debug, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Debug, log);
- }
- }
-
- /// <summary>
- /// Logs the debug message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- /// <param name="arg2">The arg2.</param>
- public void DebugFormat(bool isWriteFile, string format, object arg0, object arg1, object arg2)
- {
- string log = GetDataTimeLog(string.Format(format, arg0, arg1, arg2));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Debug, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Debug, log);
- }
- }
-
- /// <summary>
- /// Logs the error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- public void Error(bool isWriteFile, object message)
- {
- string log = GetDataTimeLog(message.ToString());
- Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Error, log);
- }
- }
-
- /// <summary>
- /// Logs the error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- /// <param name="exception">The exception.</param>
- public void Error(bool isWriteFile, object message, Exception exception)
- {
- //string log = GetDataTimeLog(message + Environment.NewLine + exception.Message + exception.StackTrace);
- string log = GetDataTimeLog(message + Environment.NewLine + exception.Message );
- Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Error, log);
- }
- }
-
- /// <summary>
- /// Logs the error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- public void ErrorFormat(bool isWriteFile, string format, object arg0)
- {
- string log = GetDataTimeLog(string.Format(format, arg0));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Error, log);
- }
- }
-
- /// <summary>
- /// Logs the error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- public void ErrorFormat(bool isWriteFile, string format, params object[] args)
- {
- string log = GetDataTimeLog(string.Format(format, args));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Error, log);
- }
- }
-
- /// <summary>
- /// Logs the error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="provider">The provider.</param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- public void ErrorFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args)
- {
- string log = GetDataTimeLog(string.Format(provider, format, args));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Error, log);
- }
- }
-
- /// <summary>
- /// Logs the error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- public void ErrorFormat(bool isWriteFile, string format, object arg0, object arg1)
- {
- string log = GetDataTimeLog(string.Format(format, arg0, arg1));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Error, log);
- }
- }
-
- /// <summary>
- /// Logs the error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- /// <param name="arg2">The arg2.</param>
- public void ErrorFormat(bool isWriteFile, string format, object arg0, object arg1, object arg2)
- {
- string log = GetDataTimeLog(string.Format(format, arg0, arg2));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Error, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Error, log);
- }
- }
-
- /// <summary>
- /// Logs the fatal error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- public void Fatal(bool isWriteFile, object message)
- {
- string log = GetDataTimeLog(message.ToString());
- Console.WriteLine(m_MessageTemplate, m_Name, m_Fatal, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Fatal, log);
- }
- }
-
- /// <summary>
- /// Logs the fatal error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- /// <param name="exception">The exception.</param>
- public void Fatal(bool isWriteFile, object message, Exception exception)
- {
- string log = GetDataTimeLog(message + Environment.NewLine + exception.Message + exception.StackTrace);
- Console.WriteLine(m_MessageTemplate, m_Name, m_Fatal, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Fatal, log);
- }
- }
-
- /// <summary>
- /// Logs the fatal error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- public void FatalFormat(bool isWriteFile, string format, object arg0)
- {
- string log = GetDataTimeLog(string.Format(format, arg0));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Fatal, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Fatal, log);
- }
- }
-
- /// <summary>
- /// Logs the fatal error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- public void FatalFormat(bool isWriteFile, string format, params object[] args)
- {
- string log = GetDataTimeLog(string.Format(format, args));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Fatal, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Fatal, log);
- }
- }
-
- /// <summary>
- /// Logs the fatal error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="provider">The provider.</param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- public void FatalFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args)
- {
- string log = GetDataTimeLog(string.Format(provider, format, args));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Fatal, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Fatal, log);
- }
- }
-
- /// <summary>
- /// Logs the fatal error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- public void FatalFormat(bool isWriteFile, string format, object arg0, object arg1)
- {
- string log = GetDataTimeLog(string.Format(format, arg0, arg1));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Fatal, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Fatal, log);
- }
- }
-
- /// <summary>
- /// Logs the fatal error message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- /// <param name="arg2">The arg2.</param>
- public void FatalFormat(bool isWriteFile, string format, object arg0, object arg1, object arg2)
- {
- string log = GetDataTimeLog(string.Format(format, arg0, arg1, arg2));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Fatal, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Fatal, log);
- }
- }
-
- /// <summary>
- /// Logs the info message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- public void Info(bool isWriteFile, object message)
- {
- string log = GetDataTimeLog(message.ToString());
- Console.WriteLine(m_MessageTemplate, m_Name, m_Info, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Info, log);
- }
- }
-
- /// <summary>
- /// Logs the info message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- /// <param name="exception">The exception.</param>
- public void Info(bool isWriteFile, object message, Exception exception)
- {
- string log = GetDataTimeLog(message + Environment.NewLine + exception.Message + exception.StackTrace);
- Console.WriteLine(m_MessageTemplate, m_Name, m_Info, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Info, log);
- }
- }
-
- /// <summary>
- /// Logs the info message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- public void InfoFormat(bool isWriteFile, string format, object arg0)
- {
- string log = GetDataTimeLog(string.Format(format, arg0));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Info, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Info, log);
- }
- }
-
- /// <summary>
- /// Logs the info message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- //public void InfoFormat(bool isWriteFile, string format, params object[] args)
- //{
- // string log = GetDataTimeLog(string.Format(format, args));
- // Console.WriteLine(m_MessageTemplate, m_Name, m_Info, log);
- // if (isWriteFile)
- // {
- // LogUtil.WriteLogFile(m_Name, m_Info, log);
- // }
- //}
-
- /// <summary>
- /// Logs the info message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="provider">The provider.</param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- //public void InfoFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args)
- //{
- // string log = GetDataTimeLog(string.Format(provider, format, args));
- // Console.WriteLine(m_MessageTemplate, m_Name, m_Info, log);
- // if (isWriteFile)
- // {
- // LogUtil.WriteLogFile(m_Name, m_Info, log);
- // }
- //}
-
- /// <summary>
- /// Logs the info message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- //public void InfoFormat(bool isWriteFile, string format, object arg0, object arg1)
- //{
- // string log = GetDataTimeLog(string.Format(format, arg0, arg1));
- // Console.WriteLine(m_MessageTemplate, m_Name, m_Info, log);
- // if (isWriteFile)
- // {
- // LogUtil.WriteLogFile(m_Name, m_Info, log);
- // }
- //}
-
- /// <summary>
- /// Logs the info message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- /// <param name="arg2">The arg2.</param>
- public void InfoFormat(bool isWriteFile, object arg0, object arg1, object arg2)
- {
- string func(string str, int len)
- {
- var strSLen = Regex.Replace(str, @"[^\x00-\xff]", "aa").Length;
- var strLen = str.Length;
- return str.PadLeft(len - strSLen + strLen);
- }
- string log = GetDataTimeLog(string.Format("[{0}]\t[{1}]\t{2}", arg0?.ToString(), arg1?.ToString(), arg2));
- //string log = GetDataTimeLog(string.Format("[{0}] [{1}] {2}", func(arg0?.ToString(), 13), func(arg1?.ToString(), 16), arg2));
- //Console.WriteLine(m_MessageTemplate, m_Name, m_Info, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Info, log);
- }
- }
-
- /// <summary>
- /// Logs the warning message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- public void Warn(bool isWriteFile, object message)
- {
- string log = GetDataTimeLog(message.ToString());
- Console.WriteLine(m_MessageTemplate, m_Name, m_Warn, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Warn, log);
- }
- }
-
- /// <summary>
- /// Logs the warning message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="message">The message.</param>
- /// <param name="exception">The exception.</param>
- public void Warn(bool isWriteFile, object message, Exception exception)
- {
- string log = GetDataTimeLog(message + Environment.NewLine + exception.Message + exception.StackTrace);
- Console.WriteLine(m_MessageTemplate, m_Name, m_Warn, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Warn, log);
- }
- }
-
- /// <summary>
- /// Logs the warning message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- public void WarnFormat(bool isWriteFile, string format, object arg0)
- {
- string log = GetDataTimeLog(string.Format(format, arg0));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Warn, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Warn, log);
- }
- }
-
- /// <summary>
- /// Logs the warning message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- public void WarnFormat(bool isWriteFile, string format, params object[] args)
- {
- string log = GetDataTimeLog(string.Format(format, args));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Warn, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Warn, log);
- }
- }
-
- /// <summary>
- /// Logs the warning message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="provider">The provider.</param>
- /// <param name="format">The format.</param>
- /// <param name="args">The args.</param>
- public void WarnFormat(bool isWriteFile, IFormatProvider provider, string format, params object[] args)
- {
- string log = GetDataTimeLog(string.Format(provider, format, args));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Warn, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Warn, log);
- }
- }
-
- /// <summary>
- /// Logs the warning message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- public void WarnFormat(bool isWriteFile, string format, object arg0, object arg1)
- {
- string log = GetDataTimeLog(string.Format(format, arg0, arg1));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Warn, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Warn, log);
- }
- }
-
- /// <summary>
- /// Logs the warning message.
- /// </summary>
- /// <param name="isWriteFile"></param>
- /// <param name="format">The format.</param>
- /// <param name="arg0">The arg0.</param>
- /// <param name="arg1">The arg1.</param>
- /// <param name="arg2">The arg2.</param>
- public void WarnFormat(bool isWriteFile, string format, object arg0, object arg1, object arg2)
- {
- string log = GetDataTimeLog(string.Format(format, arg0, arg1, arg2));
- Console.WriteLine(m_MessageTemplate, m_Name, m_Warn, log);
- if (isWriteFile)
- {
- LogUtil.WriteLogFile(m_Name, m_Warn, log);
- }
- }
-
- //public void Behavior(string logMsg, Level level)
- //{
- // lock (this)
- // {
- // m_Name = "琛屼负";
- // switch (level)
- // {
- // case Level.Debug:
- // Debug(true, logMsg);
- // break;
- // case Level.Info:
- // Info(true, logMsg);
- // break;
- // case Level.Warning:
- // Warn(true, logMsg);
- // break;
- // case Level.Error:
- // Error(true, logMsg);
- // break;
- // default:
- // break;
- // }
- // }
- //}
-
- //public void Interface(string logMsg, Level level)
- //{
- // lock (this)
- // {
- // m_Name = "鎺ュ彛";
- // switch (level)
- // {
- // case Level.Debug:
- // Debug(true, logMsg);
- // break;
- // case Level.Info:
- // Info(true, logMsg);
- // break;
- // case Level.Warning:
- // Warn(true, logMsg);
- // break;
- // case Level.Error:
- // Error(true, logMsg);
- // break;
- // default:
- // break;
- // }
- // }
- //}
-
- //public void Hardware(string logMsg, Level level)
- //{
- // lock (this)
- // {
- // m_Name = "纭欢";
- // switch (level)
- // {
- // case Level.Debug:
- // Debug(true, logMsg);
- // break;
- // case Level.Info:
- // Info(true, logMsg);
- // break;
- // case Level.Warning:
- // Warn(true, logMsg);
- // break;
- // case Level.Error:
- // Error(true, logMsg);
- // break;
- // default:
- // break;
- // }
- // }
- //}
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/LogFactory.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/LogFactory.cs"
deleted file mode 100644
index 218faa9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/LogFactory.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘�
-namespace LogLibrary.Log
-{
- public unsafe class LogFactory
- {
- public Log GetLog(string name)
- {
- return new Log(name);
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/LogUtil.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/LogUtil.cs"
deleted file mode 100644
index 9dd32fa..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Log/LogUtil.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing System;
-using System.Diagnostics;
-using System.Threading;
-
-namespace LogLibrary.Log
-{
- internal unsafe class LogUtil
- {
- static ReaderWriterLockSlim lockSlim = new ReaderWriterLockSlim();
-
- /// <summary>
- /// 鏍煎紡寮忓寲Log淇℃伅
- /// </summary>
- /// <param name="format"></param>
- /// <param name="name"></param>
- /// <param name="logType"></param>
- /// <param name="log"></param>
- /// <returns></returns>
- private static string GetLogString(string name, string logType, string log)
- {
- return string.Format("[{0}]{1}-{2}: {3}", DateTime.Now.ToString("HH:mm:ss"), name, logType, log);
- }
-
- /// <summary>
- /// 鑾峰緱鏃ュ織瑕佷繚瀛樼殑璺緞
- /// </summary>
- /// <param name="name"></param>
- /// <param name="logType"></param>
- /// <returns></returns>
- private static string GetLogPath(string name, string logType)
- {
- string path = AppDomain.CurrentDomain.BaseDirectory + $"Logs/{DateTime.Now:yyyyMM}";
- if (!System.IO.Directory.Exists(path))
- {
- System.IO.Directory.CreateDirectory(path);
- }
-
- return System.IO.Path.Combine(path, string.Format("{0}_{1}_{2}.log", DateTime.Now.ToString("yyyy-MM-dd"), name, logType));
- }
-
- public static void WriteLogFile(string name, string logType, string log)
- {
- string logPath = GetLogPath(name, logType);
- Trace.WriteLine(log);
- lockSlim.EnterWriteLock();//鎵撳紑鍐欐搷浣滈攣
- try
- {
- FileUtil.WriteAppend(logPath, log);
- }
- finally
- {
- lockSlim.ExitWriteLock();
- }
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/LogLibrary.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/LogLibrary.csproj"
deleted file mode 100644
index 552ea92..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/LogLibrary.csproj"
+++ /dev/null
@@ -1,47 +0,0 @@
-锘�<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <OutputType>Library</OutputType>
- <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <Configurations>Debug;Release;Dev</Configurations>
- <Platforms>AnyCPU;x86</Platforms>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
- <OutputPath>bin\x86\Debug\</OutputPath>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DebugType>embedded</DebugType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Dev|x86'">
- <OutputPath>bin\x86\Debug\</OutputPath>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
- <OutputPath>bin\x86\Release\</OutputPath>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DebugType>embedded</DebugType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Dev|AnyCPU'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Dev\</OutputPath>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DebugType>embedded</DebugType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Dev|x86'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Dev\</OutputPath>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Dev|x86'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Dev\</OutputPath>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DebugType>embedded</DebugType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <DebugType>embedded</DebugType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <DebugType>embedded</DebugType>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Properties/AssemblyInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Properties/AssemblyInfo.cs"
deleted file mode 100644
index a6c4576..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/Properties/AssemblyInfo.cs"
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 鏈夊叧绋嬪簭闆嗙殑涓�鑸俊鎭敱浠ヤ笅
-// 鎺у埗銆傛洿鏀硅繖浜涚壒鎬у�煎彲淇敼
-// 涓庣▼搴忛泦鍏宠仈鐨勪俊鎭��
-[assembly: AssemblyTitle("LogLibrary")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LogLibrary")]
-[assembly: AssemblyCopyright("Copyright 漏 2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 灏� ComVisible 璁剧疆涓� false 浼氫娇姝ょ▼搴忛泦涓殑绫诲瀷
-//瀵� COM 缁勪欢涓嶅彲瑙併�傚鏋滈渶瑕佷粠 COM 璁块棶姝ょ▼搴忛泦涓殑绫诲瀷
-//璇峰皢姝ょ被鍨嬬殑 ComVisible 鐗规�ц缃负 true銆�
-[assembly: ComVisible(false)]
-
-// 濡傛灉姝ら」鐩悜 COM 鍏紑锛屽垯涓嬪垪 GUID 鐢ㄤ簬绫诲瀷搴撶殑 ID
-[assembly: Guid("2e0d9770-ab36-4811-a0d0-05b98093b92d")]
-
-// 绋嬪簭闆嗙殑鐗堟湰淇℃伅鐢变笅鍒楀洓涓�肩粍鎴�:
-//
-// 涓荤増鏈�
-// 娆＄増鏈�
-// 鐢熸垚鍙�
-// 淇鍙�
-//
-//鍙互鎸囧畾鎵�鏈夎繖浜涘�硷紝涔熷彲浠ヤ娇鐢ㄢ�滅敓鎴愬彿鈥濆拰鈥滀慨璁㈠彿鈥濈殑榛樿鍊�
-//閫氳繃浣跨敤 "*"锛屽涓嬫墍绀�:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/Debug/net6.0/LogLibrary.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/Debug/net6.0/LogLibrary.assets.cache"
deleted file mode 100644
index a89e55e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/Debug/net6.0/LogLibrary.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.dgspec.json"
deleted file mode 100644
index 380d3e1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "projectName": "LogLibrary",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/LogLibrary.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/project.assets.json"
deleted file mode 100644
index d7cbdf9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/project.assets.json"
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {}
- },
- "libraries": {},
- "projectFileDependencyGroups": {
- "net6.0": []
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "projectName": "LogLibrary",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/project.nuget.cache"
deleted file mode 100644
index 7c1d3e2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/LogLibrary/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "i7TU+8p4fxebSu/xIz26sr7/cE1Z54jw332SwUrvvZeTdUUvAp+QiZUGHM9dizNTAzRfZ0N9Y+05d8HUlPiZgA==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/GlobalUsing.cs"
deleted file mode 100644
index 035feff..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/GlobalUsing.cs"
+++ /dev/null
@@ -1,3 +0,0 @@
-锘縢lobal using WIDESEA_IStorageOutBasicServices;
-global using WIDESEA_IStorageOutOrderServices;
-global using WIDESEA_IStorageOutTaskServices;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/Test.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/Test.cs"
deleted file mode 100644
index 53563da..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/Test.cs"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘縩amespace Test;
-
-public class Test
-{
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/Test.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/Test.csproj"
deleted file mode 100644
index 132c02c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/Test/Test.csproj"
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_AreaInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_AreaInfoService.cs"
deleted file mode 100644
index c34db7d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_AreaInfoService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_AreaInfoService : ServiceBase<Dt_AreaInfo, IDt_AreaInfoRepository>, IDt_AreaInfoService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_AreaInfoService(IDt_AreaInfoRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_BillGroupStockDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_BillGroupStockDetailService.cs"
deleted file mode 100644
index cb1991c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_BillGroupStockDetailService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_BillGroupStockDetailService : ServiceBase<Dt_BillGroupStockDetail, IDt_BillGroupStockDetailRepository>, IDt_BillGroupStockDetailService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_BillGroupStockDetailService(IDt_BillGroupStockDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_BillGroupStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_BillGroupStockService.cs"
deleted file mode 100644
index 68b4953..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_BillGroupStockService.cs"
+++ /dev/null
@@ -1,221 +0,0 @@
-锘縰sing Newtonsoft.Json;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_BillGroupStockService : ServiceBase<Dt_BillGroupStock, IDt_BillGroupStockRepository>, IDt_BillGroupStockService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_BillGroupStockDetailRepository _dt_BillGroupStockDetailRepository;
- private readonly IDt_InboundOrderDetailRepository _dt_InboundOrderDetailRepository;
- private readonly IDt_MaterielInfoRepository _dt_MaterielInfoRepository;
- private readonly IDt_InboundOrderRepository _dt_InboundOrderRepository;
- public Dt_BillGroupStockService(IDt_BillGroupStockRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IDt_BillGroupStockDetailRepository dt_BillGroupStockDetailRepository, IDt_InboundOrderDetailRepository dt_InboundOrderDetailRepository, IDt_MaterielInfoRepository dt_MaterielInfoRepository, IDt_InboundOrderRepository dt_InboundOrderRepository) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _dt_BillGroupStockDetailRepository = dt_BillGroupStockDetailRepository;
- _dt_InboundOrderDetailRepository = dt_InboundOrderDetailRepository;
- _dt_MaterielInfoRepository = dt_MaterielInfoRepository;
- _dt_InboundOrderRepository = dt_InboundOrderRepository;
- }
- /// <summary>
- /// PDA缁勭洏鍓嶏紝閫夋嫨鍗曟嵁淇℃伅鏃堕渶瑕佹牴鎹墿鏂欏彿纭畾缁勭洏鐗╂枡鏁伴噺
- /// PDA缁勭洏纭,璁板綍缁勭洏淇℃伅锛屼繚瀛樺埌锛氫富琛� Dt_BillGroupStock,鏄庣粏琛� Dt_BillGroupStockDetail
- /// </summary>
- /// <param name="dt_BillGroupStock">缁勭洏淇℃伅</param>
- /// <returns></returns>
- public WebResponseContent PDAGroupPlateConfirm(Dt_BillGroupStock dt_BillGroupStock)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- bool isFinishGroup = false;//褰撳墠鍗曟嵁鏄惁瀹屾垚缁勭洏
- Dt_InboundOrder inboundOrder = new Dt_InboundOrder();
- string requeststr = JsonConvert.SerializeObject(dt_BillGroupStock);
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "璇锋眰", requeststr);
- //缁勭洏鐗╂枡鏄惁涓庡崟鎹腑鐨勭墿鏂欏熀纭�淇℃伅鍖归厤
- foreach (var item in dt_BillGroupStock.Dt_BillGroupStockDetailList)
- {
- int count = _dt_MaterielInfoRepository.QueryData(x => x.MaterielCode == item.MaterialNo).Count();//鍦ㄧ墿鏂欎俊鎭〃涓煡璇㈢墿鏂欎俊鎭槸鍚﹀瓨鍦�
- if(count==0)//鐗╂枡淇℃伅涓嶅瓨鍦�
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", $"璇ョ墿鏂欎俊鎭笉瀛樺湪:{item.MaterialName}+{item.MaterialNo}");
- return content = WebResponseContent.Instance.Error($"璇ョ墿鏂欎俊鎭笉瀛樺湪:{item.MaterialName}+{item.MaterialNo},璇风淮鎶ょ墿鏂欏熀鏈俊鎭紒");
- }
- }
-
- //鏌ヨ宸茬粍鐩樼墿鏂欐暟閲忓拰鍏ュ簱鍗曠墿鏂欐�绘暟閲忥紝骞朵笌褰撳墠缁勭洏鐗╂枡鏁伴噺瀵规瘮鍒ゆ柇鏄惁鍙互缁勭洏
- decimal PreInboundQuantity = _dt_InboundOrderDetailRepository.QueryData(x=>x.InboundNo==dt_BillGroupStock.InboundNo&&x.MaterialNo==dt_BillGroupStock.MaterialNo).Sum(x=>Convert.ToDecimal(x.PreInboundQuantity));
- decimal PalletQuantity =Convert.ToDecimal(Db.Queryable<Dt_BillGroupStock>().InnerJoin<Dt_BillGroupStockDetail>((s, sd) => s.InboundNo == sd.InboundNo && s.State != StockStateEmun.缁勭洏鎾ら攢.ToString()).Select((a, b) => b).ToList().Sum(x => x.PalletQuantity));
- decimal currentPalletQuantity = Convert.ToDecimal(dt_BillGroupStock.Dt_BillGroupStockDetailList.Sum(x=>x.PalletQuantity));
- if(currentPalletQuantity > PreInboundQuantity - PalletQuantity)//濡傛灉宸茬粍鐩樼墿鏂欐暟閲忓ぇ浜庡崟鎹墿鏂欐暟閲�
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", "濡傛灉宸茬粍鐩樼墿鏂欐暟閲忓ぇ浜庡崟鎹墿鏂欐暟閲忥紝闇�閲嶆柊璋冩暣鐗╂枡鏁伴噺锛�");
- return content = WebResponseContent.Instance.Error("濡傛灉宸茬粍鐩樼墿鏂欐暟閲忓ぇ浜庡崟鎹墿鏂欐暟閲忥紝闇�閲嶆柊璋冩暣鐗╂枡鏁伴噺锛�");
- }
- else if (currentPalletQuantity == PreInboundQuantity - PalletQuantity)
- {
- isFinishGroup = true;
- }
- inboundOrder = _dt_InboundOrderRepository.QueryData(x => x.InboundNo == dt_BillGroupStock.InboundNo).FirstOrDefault();
- //鍏堝垽鏂粍鐩樼被鍨嬶紝濡傛灉鏄簩娆＄粍鐩�,鎵樼洏鍙峰彲浠ラ噸澶�
- if (dt_BillGroupStock.GroupType == GroupTypeEmun.浜屾缁勭洏.ToString())
- {
- //鏌ヨ褰撳墠鎵樼洏鍙峰凡缁勭洏鐨勪俊鎭紝搴撳瓨鐘舵�佷负鈥滃叆搴撶‘璁も�濈姸鎬佷笉鑳藉啀缁勭洏
- List<Dt_BillGroupStock> billGroupList = BaseDal.QueryData(x => x.PalletCode == dt_BillGroupStock.PalletCode && string.IsNullOrEmpty(x.LocationCode) && x.State == StockStateEmun.缁勭洏鏆傚瓨.ToString());
- if (billGroupList != null && billGroupList.Count == 1)//缁勭洏鏄庣粏涓鍔犱簩娆＄粍鐩樻槑缁�
- {
- Dt_BillGroupStock billGroupStock = billGroupList[0];
- if (Convert.ToBoolean(billGroupStock.IsFull))//濡傛灉宸叉弧鐩橈紝涓嶈兘浜屾缁勭洏
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", "宸叉弧鐩樹笉鑳借繘琛屼簩娆＄粍鐩橈紒");
- return content = WebResponseContent.Instance.Error("宸叉弧鐩樹笉鑳借繘琛屼簩娆＄粍鐩橈紒");
- }
- else
- {
- try
- {
- //寮�鍚簨鐗�
- _unitOfWorkManage.BeginTran();
- //淇敼缁勭洏绫诲瀷涓�"浜屾缁勭洏"
- dt_BillGroupStock.GroupType = "2";
- BaseDal.UpdateData(dt_BillGroupStock);
- //娣诲姞缁勭洏鏄庣粏
- _dt_BillGroupStockDetailRepository.AddData(dt_BillGroupStock.Dt_BillGroupStockDetailList);
-
- if (inboundOrder != null)//濡傛灉褰撳墠鍗曟嵁瀹屾垚缁勭洏锛屾洿鏂板叆搴撹〃Dt_InboundOrder 鍗曟嵁鐘舵�佷负锛氬畬鎴愮粍鐩�
- {
- if (isFinishGroup)
- {
- inboundOrder.InboundState = InboundStateEmun.瀹屾垚缁勭洏.ToString();
- _dt_InboundOrderRepository.UpdateData(inboundOrder);
- }
- else
- {
- inboundOrder.InboundState = InboundStateEmun.缁勭洏涓�.ToString();
- _dt_InboundOrderRepository.UpdateData(inboundOrder);
- }
- }
- //鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- }
- catch
- {
- _unitOfWorkManage.RollbackTran();
- throw;
- }
-
- }
- }
- else if (billGroupList != null && billGroupList.Count > 1)
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", "褰撳墠鎵樼洏鍙峰瓨鍦ㄥ鏉℃殏瀛樼粍鐩樿褰曪紒");
- return content = WebResponseContent.Instance.Error("褰撳墠鎵樼洏鍙峰瓨鍦ㄥ鏉℃殏瀛樼粍鐩樿褰曪紒");
- }
- else
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", "褰撳墠鎵樼洏涔嬪墠鏈粍杩囩洏锛屼笉灞炰簬浜屾缁勭洏锛岃閲嶆柊閫夋嫨缁勭洏绫诲瀷锛�");
- return content = WebResponseContent.Instance.Error("褰撳墠鎵樼洏涔嬪墠鏈粍杩囩洏锛屼笉灞炰簬浜屾缁勭洏锛岃閲嶆柊閫夋嫨缁勭洏绫诲瀷锛�");
- }
- }
- else //鍒濇缁勭洏
- {
- //鏌ヨ褰撳墠鎵樼洏鍙峰凡缁勭洏鐨勪俊鎭紝濡傛灉搴撳瓨鐘舵�佷负宸茬粍鐩樻殏瀛樻垨宸插叆搴擄紝鍒欐彁绀轰笉鍏佽閲嶅缁勭洏
- List<Dt_BillGroupStock> billGroupList = BaseDal.QueryData(x => x.PalletCode == dt_BillGroupStock.PalletCode && (x.State == StockStateEmun.缁勭洏鏆傚瓨.ToString() || x.State == StockStateEmun.宸插叆搴�.ToString()));
- if (billGroupList != null && billGroupList.Count == 1)
- {
- dt_BillGroupStock = billGroupList[0];
- if (Convert.ToBoolean(dt_BillGroupStock.IsFull))
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", "褰撳墠鎵樼洏宸茬粍鐩橈紝涓嶅厑璁￠噸澶嶇粍鐩橈紒");
- return content = WebResponseContent.Instance.Error("褰撳墠鎵樼洏宸茬粍鐩橈紝涓嶅厑璁￠噸澶嶇粍鐩橈紒");
- }
- else
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", "褰撳墠鎵樼洏宸茬粍鐩橈紝鍙互閫夋嫨浜屾缁勭洏閲嶆柊缁勭洏锛�");
- return content = WebResponseContent.Instance.Error("褰撳墠鎵樼洏宸茬粍鐩橈紝鍙互閫夋嫨浜屾缁勭洏閲嶆柊缁勭洏锛�");
- }
- }
- try
- {
- //寮�鍚簨鐗�
- _unitOfWorkManage.BeginTran();
-
- BaseDal.AddData(dt_BillGroupStock);
- //娣诲姞缁勭洏鏄庣粏
- _dt_BillGroupStockDetailRepository.AddData(dt_BillGroupStock.Dt_BillGroupStockDetailList);
-
- if (inboundOrder != null)//濡傛灉褰撳墠鍗曟嵁瀹屾垚缁勭洏锛屾洿鏂板叆搴撹〃Dt_InboundOrder 鍗曟嵁鐘舵�佷负锛氬畬鎴愮粍鐩�
- {
- if (isFinishGroup)
- {
- inboundOrder.InboundState = InboundStateEmun.瀹屾垚缁勭洏.ToString();
- _dt_InboundOrderRepository.UpdateData(inboundOrder);
- }
- else
- {
- inboundOrder.InboundState = InboundStateEmun.缁勭洏涓�.ToString();
- _dt_InboundOrderRepository.UpdateData(inboundOrder);
- }
- }
-
- //鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", $"缁勭洏鎴愬姛");
- content = WebResponseContent.Instance.OK("缁勭洏鎴愬姛");
-
- }
- catch
- {
- _unitOfWorkManage.RollbackTran();
- throw;
- }
-
- }
-
- }
- catch (Exception ex)
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").ErrorFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", $"{dt_BillGroupStock.PalletCode}缁勭洏閿欒:{ex.Message}");
- content = WebResponseContent.Instance.Error($"缁勭洏閿欒:{ex.Message}");
- }
- return content;
-
- }
-
- /// <summary>
- /// PDA缁勭洏鎾ら攢纭,瑙ｇ粦鎵樼洏鐮佸拰鐗╂枡鐮�
- /// 1,鏍规嵁鎵樼洏鐮佹煡璇㈢粍鐩樹俊鎭� 2锛屽綋搴撳瓨鐘舵�佷负鈥滅粍鐩樻殏瀛樷�濇椂鍙互鎾ら攢 3锛屾挙閿�鍚�,淇敼搴撳瓨鐘舵�佷负"缁勭洏鎾ら攢",
- /// </summary>
- /// <param name="plateCode">鎵樼洏鍙�</param>
- /// <returns></returns>
- public WebResponseContent PDAGroupPlateRevoke(string plateCode)
- {
- WebResponseContent content = new WebResponseContent();
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlateRevoke", "璇锋眰", plateCode);
- List<Dt_BillGroupStock> billGroupStockList = BaseDal.QueryData(x => x.PalletCode == plateCode&&x.State== StockStateEmun.缁勭洏鏆傚瓨.ToString());
- if(billGroupStockList != null &&billGroupStockList.Count == 1)
- {
- Dt_BillGroupStock billGroupStock = billGroupStockList[0];
- billGroupStock.State = StockStateEmun.缁勭洏鎾ら攢.ToString();
- BaseDal.UpdateData(billGroupStock);
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlateRevoke", "鍝嶅簲", $"鎾ら攢缁勭洏鎴愬姛");
- content = WebResponseContent.Instance.OK("鎾ら攢缁勭洏鎴愬姛");
- }
- else
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "PDA缁勭洏-PDAGroupPlate", "鍝嶅簲", $"鎾ら攢缁勫姟澶辫触锛屾湭鏌ヨ鍒板彲浠ユ挙閿�鐨勭粍鐩�");
- content = WebResponseContent.Instance.OK("鎾ら攢缁勭洏澶辫触");
- }
-
- return content;
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderDetailService.cs"
deleted file mode 100644
index 1ee24f1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderDetailService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_InboundOrderDetailService : ServiceBase<Dt_InboundOrderDetail, IDt_InboundOrderDetailRepository>, IDt_InboundOrderDetailService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_InboundOrderDetailService(IDt_InboundOrderDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderProductionDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderProductionDetailService.cs"
deleted file mode 100644
index 6f039df..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderProductionDetailService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_InboundOrderProductionDetailService : ServiceBase<Dt_InboundOrderProductionDetail, IDt_InboundOrderProductionDetailRepository>, IDt_InboundOrderProductionDetailService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_InboundOrderProductionDetailService(IDt_InboundOrderProductionDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderProductionService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderProductionService.cs"
deleted file mode 100644
index 2f2415b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderProductionService.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_InboundOrderProductionService : ServiceBase<Dt_InboundOrderProduction, IDt_InboundOrderProductionRepository>, IDt_InboundOrderProductionService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_InboundOrderProductionService(IDt_InboundOrderProductionRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鑾峰彇鍘熷鍏ュ簱鍗曟嵁
- /// </summary>
- /// <returns></returns>
- public async Task<List<Dt_InboundOrderProduction>> GetDt_InboundOrderProduction(int SynchronizationFlag)
- {
- List<Dt_InboundOrderProduction> Dt_InboundOrderProductions = await Db.Queryable<Dt_InboundOrderProduction>().Where(X=>X.SynchronizationFlag==SynchronizationFlag).Includes(x => x.Dt_InboundOrderProductionDetailList).ToListAsync();
- return Dt_InboundOrderProductions;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderPurchaseDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderPurchaseDetailService.cs"
deleted file mode 100644
index fb8f77d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderPurchaseDetailService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_InboundOrderPurchaseDetailService : ServiceBase<Dt_InboundOrderPurchaseDetail, IDt_InboundOrderPurchaseDetailRepository>, IDt_InboundOrderPurchaseDetailService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_InboundOrderPurchaseDetailService(IDt_InboundOrderPurchaseDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderPurchaseService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderPurchaseService.cs"
deleted file mode 100644
index 616d978..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderPurchaseService.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_InboundOrderPurchaseService : ServiceBase<Dt_InboundOrderPurchase, IDt_InboundOrderPurchaseRepository>, IDt_InboundOrderPurchaseService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_InboundOrderPurchaseService(IDt_InboundOrderPurchaseRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鑾峰彇鍘熷鍏ュ簱鍗曟嵁
- /// </summary>
- /// <returns></returns>
- public async Task<List<Dt_InboundOrderPurchase>> GetDt_InboundOrderPurchase(int SynchronizationFlag)
- {
- List<Dt_InboundOrderPurchase> Dt_InboundOrderPurchases = await Db.Queryable<Dt_InboundOrderPurchase>().Where(X => X.SynchronizationFlag == SynchronizationFlag).Includes(x => x.Dt_InboundOrderPurchaseDetailList).ToListAsync();
- return Dt_InboundOrderPurchases;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderService.cs"
deleted file mode 100644
index 69b55af..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_InboundOrderService.cs"
+++ /dev/null
@@ -1,585 +0,0 @@
-锘縰sing log4net.Layout;
-using SkiaSharp;
-using SqlSugar.SplitTableExtensions;
-using System.Data;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_DTO;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-using WIDESEA_Repository;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_InboundOrderService : ServiceBase<Dt_InboundOrder, IDt_InboundOrderRepository>, IDt_InboundOrderService
- {
- #region 闇�娉ㄥ叆鎺ュ彛
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_InboundOrderDetailRepository _dt_InboundOrderDetailRepository;
- private readonly IDt_InboundOrderProductionRepository _dt_InboundOrderProductionRepository;
- private readonly IDt_InboundOrderProductionService _dt_InboundOrderProductionService;
-
- private readonly IDt_InboundOrderPurchaseRepository _dt_InboundOrderPurchaseRepository;
- private readonly IDt_InboundOrderPurchaseService _dt_InboundOrderPurchaseService;
-
- private readonly IDt_BillGroupStockDetailRepository _dt_BillGroupStockDetailRepository;
- private readonly IDt_BillGroupStockRepository _dt_BillGroupStockRepository;
- private readonly IDt_MaterielInfoRepository _dt_MaterielInfoRepository;
- private readonly IDt_WareAreaInfoRepository _dt_WareAreaInfoRepository;
- private readonly IDt_StrategyRepository _dt_StrategyRepository;
- private readonly IDt_LocationInfoRepository _dt_LocationInfoRepository;
- private readonly IDt_TaskRepository _dt_TaskRepository;
- private readonly IDt_TaskExecuteDetailRepository _dt_TaskExecuteDetailRepository;
-
- private readonly IDt_RoadWayInfoRepository _dt_RoadWayInfoRepository;
- #endregion
-
- public Dt_InboundOrderService(IDt_InboundOrderRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IDt_InboundOrderDetailRepository dt_InboundOrderDetailRepository,
- IDt_InboundOrderProductionService dt_InboundOrderProductionService, IDt_InboundOrderProductionRepository dt_InboundOrderProductionRepository,
- IDt_InboundOrderPurchaseRepository dt_InboundOrderPurchaseRepository, IDt_InboundOrderPurchaseService dt_InboundOrderPurchaseService,
- IDt_BillGroupStockDetailRepository dt_BillGroupStockDetailRepository, IDt_MaterielInfoRepository dt_MaterielInfoRepository,
- IDt_WareAreaInfoRepository dt_WareAreaInfoRepository, IDt_StrategyRepository dt_StrategyRepository, IDt_LocationInfoRepository dt_LocationInfoRepository,
- IDt_BillGroupStockRepository dt_BillGroupStockRepository, IDt_TaskRepository dt_TaskRepository, IDt_TaskExecuteDetailRepository dt_TaskExecuteDetailRepository
- , IDt_RoadWayInfoRepository dt_RoadWayInfoRepository) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _dt_InboundOrderDetailRepository = dt_InboundOrderDetailRepository;
- _dt_InboundOrderProductionService = dt_InboundOrderProductionService;
- _dt_InboundOrderProductionRepository = dt_InboundOrderProductionRepository;
- _dt_InboundOrderPurchaseService = dt_InboundOrderPurchaseService;
- _dt_InboundOrderPurchaseRepository = dt_InboundOrderPurchaseRepository;
- _dt_BillGroupStockDetailRepository = dt_BillGroupStockDetailRepository;
- _dt_MaterielInfoRepository = dt_MaterielInfoRepository;
- _dt_WareAreaInfoRepository = dt_WareAreaInfoRepository;
- _dt_StrategyRepository = dt_StrategyRepository;
- _dt_LocationInfoRepository = dt_LocationInfoRepository;
- _dt_BillGroupStockRepository = dt_BillGroupStockRepository;
- _dt_TaskRepository = dt_TaskRepository;
- _dt_TaskExecuteDetailRepository = dt_TaskExecuteDetailRepository;
- _dt_RoadWayInfoRepository = dt_RoadWayInfoRepository;
- }
- /// <summary>
- /// 鍚屾鐢熶骇鍏ュ簱鍘熷鍗曟嵁鍒版湰绯荤粺鍏ュ簱鍗曡〃锛屽苟鏇存柊鍘熷鍗曟嵁鐨勫悓姝ユ爣蹇�
- /// 鍚屾鏍囧織 SynchronizationFlag 0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐�
- /// </summary>
- /// <returns></returns>
- public async Task<WebResponseContent> GetInboundOrderFromProductionOrigin()
- {
- WebResponseContent content = new WebResponseContent();
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鐢熶骇鍏ュ簱鍗曞悓姝�-GetInboundOrderFromProductionOrigin", "璇锋眰", "鏃犲弬鏁�");
-
- List<Dt_InboundOrderProduction> Dt_InboundOrderProductionList = await _dt_InboundOrderProductionService.GetDt_InboundOrderProduction((int)SynchronizationFlagEmun.鏈悓姝�);
- foreach (var mainItem in Dt_InboundOrderProductionList)
- {
- try
- {
-
- List<Dt_InboundOrder> Dt_InboundOrderList = new List<Dt_InboundOrder>();
- List<Dt_InboundOrderDetail> Dt_InboundOrderDetailList = new List<Dt_InboundOrderDetail>();
-
- #region 鍏ュ簱鍘熷鍗曟嵁涓昏〃鏍￠獙锛屽崟鎹浆鎹负鏈郴缁熷叆搴撳崟涓昏〃
- //todo锛氭澶勫仛鍘熷鍗曟嵁涓昏〃瀛楁鏍￠獙
- Dt_InboundOrder dt_InboundOrder = new Dt_InboundOrder();
- dt_InboundOrder.OrderId = Guid.NewGuid();
- dt_InboundOrder.InboundNo = dt_InboundOrder.OrderId.ToString();//todo:璋冪敤鑷姩鐢熸垚鍗曞彿鏂规硶
- dt_InboundOrder.InboundUpperNo = mainItem.ProductionNo;
- dt_InboundOrder.BatchNo = mainItem.BatchNo;
- dt_InboundOrder.InboundDate = mainItem.CreateDate;
- dt_InboundOrder.InboundType = mainItem.ProductionType;
- dt_InboundOrder.InboundState = mainItem.ProductionState;
- dt_InboundOrder.Remark = mainItem.Remark;
- Dt_InboundOrderList.Add(dt_InboundOrder);
- #endregion
-
- #region 鍏ュ簱鍘熷鍗曟嵁鏄庣粏琛ㄦ牎楠岋紝鍗曟嵁杞崲涓烘湰绯荤粺鍏ュ簱鍗曟槑缁�
- foreach (var detailItem in mainItem.Dt_InboundOrderProductionDetailList)
- {
- //todo锛氭澶勫仛鍘熷鍗曟嵁鏄庣粏瀛楁鏍￠獙
- Dt_InboundOrderDetail dt_InboundOrderDetail = new Dt_InboundOrderDetail();
- dt_InboundOrderDetail.OrderDetailId = Guid.NewGuid();
- dt_InboundOrderDetail.OrderId = mainItem.OrderId;
- dt_InboundOrderDetail.InboundNo = dt_InboundOrder.InboundNo;
- dt_InboundOrderDetail.BatchNo = dt_InboundOrder.BatchNo;
- dt_InboundOrderDetail.InboundType = dt_InboundOrder.InboundType;
- dt_InboundOrderDetail.InboundState = dt_InboundOrder.InboundState;
- dt_InboundOrderDetail.MaterialNo = detailItem.ProductionMatcode;
- dt_InboundOrderDetail.MaterialName = detailItem.ProductionName;
- dt_InboundOrderDetail.PreInboundQuantity = detailItem.ReceivableQuantity;
- Dt_InboundOrderDetailList.Add(dt_InboundOrderDetail);
- }
- #endregion
-
- try
- {
- //寮�鍚簨鐗�
- _unitOfWorkManage.BeginTran();
- BaseDal.AddData(Dt_InboundOrderList);//淇濆瓨涓昏〃
- _dt_InboundOrderDetailRepository.AddData(Dt_InboundOrderDetailList);//淇濆瓨鏄庣粏
- mainItem.SynchronizationFlag = (int)SynchronizationFlagEmun.鍚屾鎴愬姛; //鏇存柊鍘熷崟鎹悓姝ユ爣璇嗕负锛�1锛氬悓姝ユ垚鍔�
- _dt_InboundOrderProductionRepository.UpdateData(mainItem);
- //鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鐢熶骇鍏ュ簱鍗曞悓姝�-GetInboundOrderFromProductionOrigin", "鍝嶅簲", "鍚屾鎴愬姛");
- }
- catch (Exception)
- {
- _unitOfWorkManage.RollbackTran();
- throw;
- }
- }
- catch (Exception ex)
- {
- mainItem.SynchronizationFlag = (int)SynchronizationFlagEmun.鍚屾澶辫触; //鏇存柊鍘熷崟鎹悓姝ユ爣璇嗕负锛�2锛氬悓姝ュけ璐�
- mainItem.Remark = ex.Message;//璁板綍澶辫触鍘熷洜
- _dt_InboundOrderProductionRepository.UpdateData(mainItem);
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鐢熶骇鍏ュ簱鍗曞悓姝�-GetInboundOrderFromProductionOrigin", "鍝嶅簲", $"鍚屾澶辫触{ex.ToString()}");
- }
-
- }
-
- return WebResponseContent.Instance.OK();
- }
-
-
-
- /// <summary>
- /// 鍚屾閲囪喘鍏ュ簱鍘熷鍗曟嵁鍒版湰绯荤粺鍏ュ簱鍗曡〃锛屽苟鏇存柊鍘熷鍗曟嵁鐨勫悓姝ユ爣蹇�
- /// 鍚屾鏍囧織 SynchronizationFlag 0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐�
- /// </summary>
- /// <returns></returns>
- public async Task<WebResponseContent> GetInboundOrderFromPurchaseOrigin()
- {
- WebResponseContent content = new WebResponseContent();
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "閲囪喘鍏ュ簱鍗曞悓姝�-GetInboundOrderFromProductionOrigin", "璇锋眰", "鏃犲弬鏁�");
- List<Dt_InboundOrderPurchase> Dt_InboundOrderPurchaseList = await _dt_InboundOrderPurchaseService.GetDt_InboundOrderPurchase((int)SynchronizationFlagEmun.鏈悓姝�);
-
- foreach (var mainItem in Dt_InboundOrderPurchaseList)
- {
- try
- {
- List<Dt_InboundOrder> Dt_InboundOrderList = new List<Dt_InboundOrder>();
- List<Dt_InboundOrderDetail> Dt_InboundOrderDetailList = new List<Dt_InboundOrderDetail>();
-
- #region 鍏ュ簱鍘熷鍗曟嵁涓昏〃鏍￠獙锛屽崟鎹浆鎹负鏈郴缁熷叆搴撳崟涓昏〃
- //todo锛氭澶勫仛鍘熷鍗曟嵁涓昏〃瀛楁鏍￠獙
- Dt_InboundOrder dt_InboundOrder = new Dt_InboundOrder();
- dt_InboundOrder.OrderId = Guid.NewGuid();
- dt_InboundOrder.InboundNo = dt_InboundOrder.OrderId.ToString();//todo:璋冪敤鑷姩鐢熸垚鍗曞彿鏂规硶
- dt_InboundOrder.InboundUpperNo = mainItem.PurchaseNo;
- dt_InboundOrder.BatchNo = mainItem.BatchNo;
- dt_InboundOrder.InboundDate = mainItem.CreateDate;
- dt_InboundOrder.InboundType = mainItem.PurchaseType;
- dt_InboundOrder.InboundState = mainItem.PurchaseState;
- dt_InboundOrder.Remark = mainItem.Remark;
- Dt_InboundOrderList.Add(dt_InboundOrder);
- #endregion
-
- #region 鍏ュ簱鍘熷鍗曟嵁鏄庣粏琛ㄦ牎楠岋紝鍗曟嵁杞崲涓烘湰绯荤粺鍏ュ簱鍗曟槑缁�
- foreach (var detailItem in mainItem.Dt_InboundOrderPurchaseDetailList)
- {
- //todo锛氭澶勫仛鍘熷鍗曟嵁鏄庣粏瀛楁鏍￠獙
- Dt_InboundOrderDetail dt_InboundOrderDetail = new Dt_InboundOrderDetail();
- dt_InboundOrderDetail.OrderDetailId = Guid.NewGuid();
- dt_InboundOrderDetail.OrderId = mainItem.OrderId;
- dt_InboundOrderDetail.InboundNo = dt_InboundOrder.InboundNo;
- dt_InboundOrderDetail.BatchNo = dt_InboundOrder.BatchNo;
- dt_InboundOrderDetail.InboundType = dt_InboundOrder.InboundType;
- dt_InboundOrderDetail.InboundState = dt_InboundOrder.InboundState;
- dt_InboundOrderDetail.MaterialNo = detailItem.ProductionMatcode;
- dt_InboundOrderDetail.MaterialName = detailItem.ProductionName;
- dt_InboundOrderDetail.PreInboundQuantity = detailItem.ReceivableQuantity;
- Dt_InboundOrderDetailList.Add(dt_InboundOrderDetail);
- }
- #endregion
-
- try
- {
- //寮�鍚簨鐗�
- _unitOfWorkManage.BeginTran();
- BaseDal.AddData(Dt_InboundOrderList);//淇濆瓨涓昏〃
- _dt_InboundOrderDetailRepository.AddData(Dt_InboundOrderDetailList);//淇濆瓨鏄庣粏
- mainItem.SynchronizationFlag = (int)SynchronizationFlagEmun.鍚屾鎴愬姛; //鏇存柊鍘熷崟鎹悓姝ユ爣璇嗕负锛�1锛氬悓姝ユ垚鍔�
- _dt_InboundOrderPurchaseRepository.UpdateData(mainItem);
- //鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- }
- catch (Exception)
- {
- _unitOfWorkManage.RollbackTran();
- throw;
- }
- }
- catch (Exception ex)
- {
- mainItem.SynchronizationFlag = (int)SynchronizationFlagEmun.鍚屾澶辫触; //鏇存柊鍘熷崟鎹悓姝ユ爣璇嗕负锛�2锛氬悓姝ュけ璐�
- mainItem.Remark = ex.Message;//璁板綍澶辫触鍘熷洜
- _dt_InboundOrderPurchaseRepository.UpdateData(mainItem);
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "閲囪喘鍏ュ簱鍗曞悓姝�-GetInboundOrderFromProductionOrigin", "鍝嶅簲", $"鍚屾澶辫触{ex.ToString()}");
- }
-
- }
-
- return WebResponseContent.Instance.OK();
- }
-
-
- /// 浜х敓鍏ュ簱浠诲姟 鍒嗛厤宸烽亾
- /// 1,鏍规嵁鐗╂枡灞炴�ф寚瀹氬簱鍖�
- /// 2,鏌ヨ婊¤冻鏉′欢鐨勭┖闂茶揣浣嶇殑宸烽亾锛氱┖闂茶揣浣嶅崰姣� 鐗╂枡搴撳瓨鍗犳瘮
- /// </summary>
- /// <param name="plateCode">鎵樼洏鏉＄爜</param>
- /// <param name="SourceAddress">璧峰鍦板潃</param>
- /// <returns></returns>
- public WebResponseContent GenerateInboundTask(string plateCode, string SourceAddress)
- {
- WebResponseContent webResponseContent = new WebResponseContent();
- try
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "浜х敓鍏ュ簱浠诲姟骞跺垎閰嶅贩閬�-GenerateInboundTask", "璇锋眰", $"plateCode:{plateCode}-SourceAddress:{SourceAddress}");
- List<RoadWayDTO> roadWays = new List<RoadWayDTO>();
- //鏍规嵁鎵樼洏鐮佹煡璇㈢墿鏂欑紪鐮�
- List<Dt_BillGroupStock> billGroup = _dt_BillGroupStockRepository.QueryData(x => x.PalletCode == plateCode && x.State == StockStateEmun.缁勭洏鏆傚瓨.ToString());
- List<Dt_InboundOrder> inboundOrders = new List<Dt_InboundOrder>();
- if (billGroup != null && billGroup.Count == 1)
- {
-
- //鏍规嵁鐗╂枡缂栫爜锛屾煡璇㈢墿鏂欏睘鎬�
- List<Dt_MaterielInfo> masterielInfoList = _dt_MaterielInfoRepository.QueryData(x => x.MaterielCode == billGroup[0].MaterialNo);
- if (masterielInfoList != null && masterielInfoList.Count > 0)
- {
- //鏌ヨ宸烽亾鍒嗛厤绛栫暐
- List<Dt_Strategy> strategyList = _dt_StrategyRepository.QueryData(x => x.StrategyType == "InboundRoadway" && x.IsPreset == true);
- if (strategyList != null && strategyList.Count > 0)
- {
- string strategyName = strategyList[0].StrategyName;
- if (strategyName == "绌洪棽璐т綅鍗犳瘮")//todo锛氱瓥鐣ュ悕绉帮紝杩欓噷鍙互鍦ㄦ暟鎹簱涓厤缃瓥鐣ュ悗锛屽湪杩欓噷鏍规嵁涓嶅悓鐨勭瓥鐣ユ潵澶勭悊
- {
- //鑾峰彇绌洪棽璐т綅闄嶅簭鍒楄〃
-
- var roadWayList = _dt_LocationInfoRepository.QueryData(x => x.Status == (int)LocationStatus.绌洪棽 && x.WareAreaCode == masterielInfoList[0].WareAreaCode.ToString()).GroupBy(x => x.Roadway).OrderByDescending(group => group.Count()).ToList(); // 璁＄畻姣忎釜鍒嗙粍鐨勬暟閲�
- foreach (var item in roadWayList)
- {
- //鍘绘帀绂佺敤鐨勫贩閬�
- Dt_RoadWayInfo roadway= _dt_RoadWayInfoRepository.QueryData(x => x.RoadWayNO == item.Key).FirstOrDefault();
- if (roadway != null&&roadway.IsEnable==false)
- {
- continue;
- }
-
- //鏌ヨ宸烽亾浠诲姟鏁�
- int taskCount = _dt_TaskRepository.QueryData(x => x.Roadway == item.Key && (x.TaskState == TaskStatusEmun.鏂板缓鍏ュ簱浠诲姟.ToString() || x.TaskState == TaskStatusEmun.AGV鍏ュ簱鎵ц涓�.ToString() || x.TaskState == TaskStatusEmun.杈撻�佺嚎鍏ュ簱鎵ц涓�.ToString())).Count();
- RoadWayDTO roadWayDTO = new RoadWayDTO();
- roadWayDTO.RoadWayNO = item.Key;
- roadWayDTO.FreeLocationCount = item.Count();
- roadWayDTO.TaskCount = taskCount;
- roadWays.Add(roadWayDTO);
- }
- //鎸夌┖闂茶揣澶у埌灏忔帓搴忥紝浼樺厛鍙栦换鍔℃暟涓�0鐨勶紝鍐嶉�変换鍔℃暟灏忎簬骞冲潎鏁扮殑鐨勫贩閬擄紝鏈�鍚庨粯璁ゅ彇绗竴鏉＄┖闂茶揣浣嶆渶澶氱殑
- decimal taskSum = roadWays.Sum(x => x.TaskCount);
- decimal avgQTY = roadWays.Count() == 0 ? 0 : taskSum / roadWays.Count();
- string roadWay = "";
- //todo:鏍规嵁宸烽亾浠诲姟鏁板拰绌洪棽鏁拌繑鍥炲贩閬撳彿
- foreach (var item in roadWays)
- {
- if (item.TaskCount == 0)
- {
- roadWay = item.RoadWayNO;
- break;
- }
- else if (item.TaskCount <= avgQTY)
- {
- roadWay = item.RoadWayNO;
- break;
- }
- else
- {
- roadWay = roadWays[0].RoadWayNO;
- break;
- }
-
- }
- //鏌ヨ瀵瑰簲鐨勫叆搴撳崟,鐢ㄤ簬鍙栧�煎叆搴撳崟绫诲瀷
- inboundOrders = BaseDal.QueryData(x => x.InboundNo == billGroup[0].InboundNo);
- try
- {
- //寮�鍚簨鐗�
- _unitOfWorkManage.BeginTran();
- //鐢熸垚浠诲姟锛屽苟杩斿洖浠诲姟
- Dt_Task dt_Task = new Dt_Task();
- dt_Task.TaskId = Guid.NewGuid();
- dt_Task.TaskNum = GetTaskNo();
- dt_Task.PalletCode = plateCode;
- dt_Task.InboundNo = billGroup[0].InboundNo;
- dt_Task.Roadway = roadWay;
- dt_Task.TaskType = inboundOrders[0].InboundType;
- dt_Task.TaskState = TaskStatusEmun.鏂板缓鍏ュ簱浠诲姟.ToString();
- dt_Task.MaterialNo = billGroup[0].MaterialNo;
- dt_Task.SourceAddress = SourceAddress;
- dt_Task.Dispatchertime = DateTime.Now;
- _dt_TaskRepository.AddData(dt_Task);
- //鍒濆鍖栦换鍔℃墽琛屾槑缁�
- List<Dt_TaskExecuteDetail> dt_TaskExecuteDetails = new List<Dt_TaskExecuteDetail>();
- Dt_TaskExecuteDetail dt_TaskExecuteDetail = new Dt_TaskExecuteDetail();
- dt_TaskExecuteDetail.TaskDetailId = Guid.NewGuid();
- dt_TaskExecuteDetail.TaskId = dt_Task.TaskId;
- dt_TaskExecuteDetail.TaskNum = dt_Task.TaskNum.ToString();
- dt_TaskExecuteDetail.TaskState = dt_Task.TaskState;
- dt_TaskExecuteDetail.IsManual = false;
- dt_TaskExecuteDetails.Add(dt_TaskExecuteDetail);
- _dt_TaskExecuteDetailRepository.AddData(dt_TaskExecuteDetail);
- dt_Task.Dt_TaskExecuteDetailList = dt_TaskExecuteDetails;
-
- //鎻愪氦浜嬬墿
- _unitOfWorkManage.CommitTran();
- webResponseContent.OK("鑾峰彇宸烽亾鍙锋垚鍔燂紒", dt_Task);
-
- }
- catch (Exception)
- {
- _unitOfWorkManage.RollbackTran();
- throw;
- }
-
- }
- }
- else
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "浜х敓鍏ュ簱浠诲姟骞跺垎閰嶅贩閬�-GenerateInboundTask", "鍝嶅簲", $"plateCode:{plateCode}-鏃犳鐗╂枡鍩烘湰淇℃伅锛岃閰嶇疆鍒嗛厤宸烽亾绛栫暐锛�");
- webResponseContent.Error($"plateCode:{plateCode}-鏃犳鐗╂枡鍩烘湰淇℃伅锛岃閰嶇疆鍒嗛厤宸烽亾绛栫暐锛�");
- }
- }
- else
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "浜х敓鍏ュ簱浠诲姟骞跺垎閰嶅贩閬�-GenerateInboundTask", "鍝嶅簲", $"plateCode:{plateCode}-鏃犳鐗╂枡鍩烘湰淇℃伅锛岀墿鏂欑紪鍙凤細{billGroup[0].MaterialNo}");
- webResponseContent.Error($"plateCode:{plateCode}-鏃犳鐗╂枡鍩烘湰淇℃伅锛岀墿鏂欑紪鍙凤細{billGroup[0].MaterialNo}");
- }
- }
- }
- catch(Exception ex)
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "浜х敓鍏ュ簱浠诲姟骞跺垎閰嶅贩閬�-GenerateInboundTask", "鍝嶅簲", $"褰撳墠鎷栫洏鍙蜂负{plateCode}鑾峰彇澶辫触{ex.ToString()}");
- webResponseContent.Error($"褰撳墠鎷栫洏鍙蜂负{plateCode}鑾峰彇澶辫触{ex.ToString()}");
-
- }
-
- return webResponseContent.OK();
-
- }
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙疯幏鍙栬揣浣嶅彿
- /// </summary>
- /// <param name="taskNo">浠诲姟鍙�</param>
- /// <returns></returns>
- public WebResponseContent GetInboundLocation(int taskNum)
- {
- WebResponseContent webResponseContent = new WebResponseContent();
- try
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鏍规嵁浠诲姟鍙疯幏鍙栬揣浣嶅彿-GetInboundLocation", "璇锋眰", $"taskNum-{taskNum}");
- List<Dt_Task> dt_TaskList = _dt_TaskRepository.QueryData(x => x.TaskNum == taskNum);
- if (dt_TaskList != null && dt_TaskList.Count > 0)
- {
- //鏍规嵁宸烽亾鏌ヨ璐т綅鍙�
- List<Dt_LocationInfo> dt_LocationInfoList = _dt_LocationInfoRepository.QueryData(x => x.Roadway == dt_TaskList[0].Roadway && x.Status == (int)LocationStatus.绌洪棽).ToList();
- //鏌ヨ绗﹀悎瑕佹眰鐨勮揣浣嶅彿
- List<Dt_LocationInfo> dt_LocationInfoResult = new List<Dt_LocationInfo>();
- foreach (Dt_LocationInfo dt_LocationInfo in dt_LocationInfoList)
- {
- //濡傛灉娣卞害涓�2锛屽垯闇�鍒ゆ柇瀵瑰簲鐨�1娣变綅(鍒楋紝灞備竴鏍凤紝鎺掍负濂囨暟锛屽綋鍓嶆帓鏁�-1),濡傛灉1娣变綅绌洪棽锛屽垯绗﹀悎瑕佹眰
- if (dt_LocationInfo.Depth == "2")
- {
- Dt_LocationInfo locationItem = _dt_LocationInfoRepository.QueryData(x => x.Layer == dt_LocationInfo.Layer && x.Column == dt_LocationInfo.Column && x.Line == (int.Parse(dt_LocationInfo.Line.ToString()) - 1).ToString() && x.Status == (int)LocationStatus.绌洪棽).FirstOrDefault();
- if (locationItem != null)
- {
- dt_LocationInfoResult.Add(dt_LocationInfo);
- }
- }
- else//濡傛灉娣卞害涓�1锛屽垯闇�鍒ゆ柇瀵瑰簲鐨�2娣变綅(鍒楋紝灞備竴鏍凤紝鎺掍负鍋舵暟锛屽綋鍓嶆帓鏁�+1),濡傛灉2娣变綅鏈夎揣锛屽垯绗﹀悎瑕佹眰
- {
- Dt_LocationInfo locationItem = _dt_LocationInfoRepository.QueryData(x => x.Layer == dt_LocationInfo.Layer && x.Column == dt_LocationInfo.Column && x.Line == (int.Parse(dt_LocationInfo.Line.ToString()) + 1).ToString() && x.Status == (int)LocationStatus.鏈夎揣).FirstOrDefault();
- if (locationItem != null)
- {
- dt_LocationInfoResult.Add(dt_LocationInfo);
- }
- }
- }
- //todo锛氬绗﹀悎瑕佹眰鐨勮揣浣嶏紝杩涜绛涢��,鍏堟寜娣卞害闄嶅簭锛堟繁搴︿紭鍏堬級锛屽啀鎸夋帓鍗囧簭锛堝氨杩戝師鍒欙級锛屽啀鎸夊眰鏁帮紙鍏堜笅鍚庝笂锛�
- dt_LocationInfoResult.OrderByDescending(x => x.Depth).ThenBy(x => x.Column).ThenBy(x => x.Layer).ToList();
- List<Dt_LocationInfo> dt_Locations = new List<Dt_LocationInfo>();
- Dt_Task dt_task = dt_TaskList[0];
- foreach (var locationResult in dt_LocationInfoResult)
- {
- if (locationResult != null)
- {
- //1,閿佸畾璐т綅鐘舵�侊紝濡傛灉鏄�2娣变綅锛岄渶鍚屾椂閿佸畾1锛�2娣变綅;1娣变綅锛屽彧闇�閿佸畾褰撳墠璐т綅
- //2,娣诲姞褰撳墠浠诲姟鐨勮揣浣嶅彿
- if (locationResult.Depth == "2")
- {
- locationResult.IsLocked = true;
- locationResult.Status = (int)LocationStatus.閿佸畾;
- //鑾峰彇瀵瑰簲鐨�1娣变綅璐т綅淇℃伅
- Dt_LocationInfo location = _dt_LocationInfoRepository.QueryData(x => x.Layer == locationResult.Layer && x.Column == locationResult.Column && x.Line == (int.Parse(locationResult.Line.ToString()) - 1).ToString() && x.Status == (int)LocationStatus.绌洪棽).FirstOrDefault();
- if (location != null)
- {
- location.IsLocked = true;
- location.Status = (int)LocationStatus.閿佸畾;
- dt_Locations.Add(locationResult);//1娣变綅
- dt_Locations.Add(location);//2娣变綅
-
- dt_task.LocationCode = locationResult.LocationCode;
- break;
- }
- else
- {
- continue;
- }
-
- }
- else
- {
- locationResult.IsLocked = true;
- locationResult.Status = (int)LocationStatus.閿佸畾;
- dt_Locations.Add(locationResult);
- dt_task.LocationCode = locationResult.LocationCode;
- break;
- }
-
- }
- }
- if (dt_Locations.Count > 0)
- {
- try
- {
- //寮�鍚簨鐗�
- _unitOfWorkManage.BeginTran();
- _dt_TaskRepository.UpdateData(dt_task);//鏇存柊璐т綅缂栧彿LocationCode
- _dt_LocationInfoRepository.UpdateData(dt_Locations);//鏇存柊璐т綅鐘舵��
- _unitOfWorkManage.CommitTran();//鎻愪氦浜嬬墿
- webResponseContent.OK("鑾峰彇鎴愬姛",dt_task);
- }
- catch (Exception)
- {
- throw;
- }
-
- }
- else
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鏍规嵁浠诲姟鍙疯幏鍙栬揣浣嶅彿-GetInboundLocation", "鍝嶅簲", $"褰撳墠浠诲姟鍙�:{taskNum} 鏈垎閰嶅埌鍚堥�傜殑璐т綅锛�");
- webResponseContent.Error($"褰撳墠浠诲姟鍙�:{taskNum} 鏈垎閰嶅埌鍚堥�傜殑璐т綅锛�");
- }
-
- }
- else
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鏍规嵁浠诲姟鍙疯幏鍙栬揣浣嶅彿-GetInboundLocation", "鍝嶅簲", $"鏈煡璇㈠埌褰撳墠浠诲姟鍙�:{taskNum}");
- webResponseContent.Error($"鏈煡璇㈠埌褰撳墠浠诲姟鍙�:{taskNum}");
- }
- }
- catch (Exception ex)
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鏍规嵁浠诲姟鍙疯幏鍙栬揣浣嶅彿-GetInboundLocation", "鍝嶅簲", $"褰撳墠浠诲姟鍙蜂负{taskNum}鑾峰彇澶辫触{ex.ToString()}");
- webResponseContent.Error($"褰撳墠浠诲姟鍙蜂负{taskNum}鑾峰彇澶辫触{ex.ToString()}");
- }
-
- return webResponseContent;
-
-
- }
-
-
- /// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚澶勭悊
- /// </summary>
- /// <returns></returns>
- public WebResponseContent FinishInboundTask(int taskNum)
- {
- WebResponseContent webResponseContent = new WebResponseContent();
- try
- {
- //1锛屼慨鏀硅揣浣嶇姸鎬�
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚澶勭悊-FinishInboundTask", "璇锋眰", $"taskNum-{taskNum}");
- List<Dt_LocationInfo> dt_Locations = new List<Dt_LocationInfo>();
- List<Dt_Task> dt_TaskList = _dt_TaskRepository.QueryData(x => x.TaskNum == taskNum);
- if (dt_TaskList != null && dt_TaskList.Count > 0)
- {
- List<Dt_LocationInfo> locationinfos = _dt_LocationInfoRepository.QueryData(x => x.LocationCode == dt_TaskList[0].LocationCode).ToList();
- if (locationinfos != null && locationinfos.Count > 0)
- {
- Dt_LocationInfo locationinfo = locationinfos[0];
- //濡傛灉鏄�2娣变綅锛岃繛1娣变綅鐘舵�佷竴璧烽噴鏀�
- if (locationinfo != null && locationinfo.Depth == "2")
- {
- //鑾峰彇瀵瑰簲鐨�1娣变綅璐т綅淇℃伅
- Dt_LocationInfo location = _dt_LocationInfoRepository.QueryData(x => x.Layer == locationinfo.Layer && x.Column == locationinfo.Column && x.Line == (int.Parse(locationinfo.Line.ToString()) - 1).ToString() && x.Status == (int)LocationStatus.閿佸畾).FirstOrDefault();
- if (location != null)
- {
- locationinfo.Status = (int)LocationStatus.绌洪棽;
- locationinfo.IsLocked = false;
- location.Status = (int)LocationStatus.绌洪棽;
- location.IsLocked = false;
- locationinfos.Add(locationinfo);
- locationinfos.Add(location);
- }
- }
- else
- {
- locationinfo.Status = (int)LocationStatus.绌洪棽;
- locationinfo.IsLocked = false;
- locationinfos.Add(locationinfo);
- }
- }
- dt_TaskList[0].TaskState = TaskStatusEmun.鍏ュ簱浠诲姟瀹屾垚.ToString();
- }
-
- if (dt_Locations.Count > 0)
- {
- try
- {
- //寮�鍚簨鐗�
- _unitOfWorkManage.BeginTran();
- //1,鏇存柊璐т綅鐘舵��
- _dt_LocationInfoRepository.UpdateData(dt_Locations);
- //2锛屾洿鏂颁换鍔＄姸鎬�
- _dt_TaskRepository.UpdateData(dt_TaskList[0]);
- _unitOfWorkManage.CommitTran();//鎻愪氦浜嬬墿
- webResponseContent.OK("鑾峰彇鎴愬姛", dt_TaskList[0]);
- }
- catch (Exception)
- {
- throw;
- }
-
- }
- else
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚澶勭悊-FinishInboundTask", "鍝嶅簲", $"褰撳墠浠诲姟鍙�:{taskNum} 鏈壘鍒板綋鍓嶄换鍔″彿鍏宠仈鐨勮揣浣嶏紒");
- webResponseContent.Error($"褰撳墠浠诲姟鍙�:{taskNum} 鏈壘鍒板綋鍓嶄换鍔″彿鍏宠仈鐨勮揣浣嶏紒");
- }
- }
- catch(Exception ex)
- {
- new LogLibrary.Log.LogFactory().GetLog("鎺ュ彛").InfoFormat(true, "鍏ュ簱浠诲姟瀹屾垚澶勭悊-FinishInboundTask", "鍝嶅簲", $"褰撳墠浠诲姟鍙蜂负{taskNum}鍏ュ簱瀹屾垚澶勭悊澶辫触{ex.ToString()}");
- webResponseContent.Error($"褰撳墠浠诲姟鍙蜂负{taskNum}鍏ュ簱瀹屾垚澶勭悊澶辫触{ex.ToString()}");
- }
-
- return webResponseContent;
- }
-
- /// <summary>
- /// 鑾峰彇浠诲姟缂栧彿
- /// </summary>
- /// <returns></returns>
- public int GetTaskNo()
- {
- DataTable dt = BaseDal.QueryTable("select next value for dbo.seqTaskNum");
- return int.Parse(dt.Rows[0][0].ToString());
- }
-
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_LocationInfoService.cs"
deleted file mode 100644
index 29afa27..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_LocationInfoService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_LocationInfoService : ServiceBase<Dt_LocationInfo, IDt_LocationInfoRepository>, IDt_LocationInfoService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_LocationInfoService(IDt_LocationInfoRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_MaterielAttributeService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_MaterielAttributeService.cs"
deleted file mode 100644
index b7ebdcb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_MaterielAttributeService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_MaterielAttributeService : ServiceBase<Dt_MaterielAttribute, IDt_MaterielAttributeRepository>, IDt_MaterielAttributeService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_MaterielAttributeService(IDt_MaterielAttributeRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_MaterielInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_MaterielInfoService.cs"
deleted file mode 100644
index b0e4fa9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_MaterielInfoService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_MaterielInfoService : ServiceBase<Dt_MaterielInfo, IDt_MaterielInfoRepository>, IDt_MaterielInfoService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_MaterielInfoService(IDt_MaterielInfoRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_RoadWayInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_RoadWayInfoService.cs"
deleted file mode 100644
index 5994359..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_RoadWayInfoService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_RoadWayInfoService : ServiceBase<Dt_RoadWayInfo, IDt_RoadWayInfoRepository>, IDt_RoadWayInfoService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_RoadWayInfoService(IDt_RoadWayInfoRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_StrategyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_StrategyService.cs"
deleted file mode 100644
index 0dd08a6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_StrategyService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_StrategyService : ServiceBase<Dt_Strategy, IDt_StrategyRepository>, IDt_StrategyService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_StrategyService(IDt_StrategyRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_TaskExecuteDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_TaskExecuteDetailService.cs"
deleted file mode 100644
index 39c5f31..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_TaskExecuteDetailService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_TaskExecuteDetailService : ServiceBase<Dt_TaskExecuteDetail, IDt_TaskExecuteDetailRepository>, IDt_TaskExecuteDetailService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_TaskExecuteDetailService(IDt_TaskExecuteDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_TaskService.cs"
deleted file mode 100644
index 7151686..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_TaskService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_TaskService(IDt_TaskRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_UnitInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_UnitInfoService.cs"
deleted file mode 100644
index a61e7f7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_UnitInfoService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_UnitInfoService : ServiceBase<Dt_UnitInfo, IDt_UnitInfoRepository>, IDt_UnitInfoService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_UnitInfoService(IDt_UnitInfoRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_WareAreaInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_WareAreaInfoService.cs"
deleted file mode 100644
index 6a94b9f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/Dt_WareAreaInfoService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BusinessServices
-{
- public class Dt_WareAreaInfoService : ServiceBase<Dt_WareAreaInfo, IDt_WareAreaInfoRepository>, IDt_WareAreaInfoService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Dt_WareAreaInfoService(IDt_WareAreaInfoRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/WIDESEA_BusinessServices.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/WIDESEA_BusinessServices.csproj"
deleted file mode 100644
index 2887970..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/WIDESEA_BusinessServices.csproj"
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_BusinessesRepository\WIDESEA_BusinessesRepository.csproj" />
- <ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
- <ProjectReference Include="..\WIDESEA_IBusinessesRepository\WIDESEA_IBusinessesRepository.csproj" />
- <ProjectReference Include="..\WIDESEA_IBusinessServices\WIDESEA_IBusinessServices.csproj" />
- <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
- <ProjectReference Include="..\WIDESEA_Services\WIDESEA_Services.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Debug/net6.0/WIDESEA_BusinessServices.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Debug/net6.0/WIDESEA_BusinessServices.assets.cache"
deleted file mode 100644
index 94d59c8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Debug/net6.0/WIDESEA_BusinessServices.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.dgspec.json"
deleted file mode 100644
index 35a32df..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,825 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "projectName": "LogLibrary",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "projectName": "WIDESEA_BusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj",
- "projectName": "WIDESEA_BusinessServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "projectName": "WIDESEA_DTO",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "projectName": "WIDESEA_IBusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "projectName": "WIDESEA_IBusinessServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "projectName": "WIDESEA_IRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "projectName": "WIDESEA_IServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "projectName": "WIDESEA_Repository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "projectName": "WIDESEA_Services",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/WIDESEA_BusinessServices.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/project.assets.json"
deleted file mode 100644
index 487143c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/project.assets.json"
+++ /dev/null
@@ -1,314 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "LogLibrary/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/LogLibrary.dll": {}
- },
- "runtime": {
- "bin/placeholder/LogLibrary.dll": {}
- }
- },
- "WIDESEA_BusinessesRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_IBusinessesRepository": "1.0.0",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_BusinessesRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_BusinessesRepository.dll": {}
- }
- },
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- }
- },
- "WIDESEA_IBusinessesRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Core": "1.0.1",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IBusinessesRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IBusinessesRepository.dll": {}
- }
- },
- "WIDESEA_IBusinessServices/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Core": "1.0.1",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IBusinessServices.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IBusinessServices.dll": {}
- }
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_DTO": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- }
- },
- "WIDESEA_IServices/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Repository": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IServices.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IServices.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- },
- "WIDESEA_Repository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_IRepository": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Repository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Repository.dll": {}
- }
- },
- "WIDESEA_Services/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "LogLibrary": "1.0.0",
- "WIDESEA_IBusinessServices": "1.0.0",
- "WIDESEA_IBusinessesRepository": "1.0.0",
- "WIDESEA_IServices": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Services.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Services.dll": {}
- }
- }
- }
- },
- "libraries": {
- "LogLibrary/1.0.0": {
- "type": "project",
- "path": "../LogLibrary/LogLibrary.csproj",
- "msbuildProject": "../LogLibrary/LogLibrary.csproj"
- },
- "WIDESEA_BusinessesRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_BusinessesRepository/WIDESEA_BusinessesRepository.csproj",
- "msbuildProject": "../WIDESEA_BusinessesRepository/WIDESEA_BusinessesRepository.csproj"
- },
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_DTO/WIDESEA_DTO.csproj",
- "msbuildProject": "../WIDESEA_DTO/WIDESEA_DTO.csproj"
- },
- "WIDESEA_IBusinessesRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj",
- "msbuildProject": "../WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj"
- },
- "WIDESEA_IBusinessServices/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj",
- "msbuildProject": "../WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj"
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj",
- "msbuildProject": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj"
- },
- "WIDESEA_IServices/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IServices/WIDESEA_IServices.csproj",
- "msbuildProject": "../WIDESEA_IServices/WIDESEA_IServices.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- },
- "WIDESEA_Repository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Repository/WIDESEA_Repository.csproj",
- "msbuildProject": "../WIDESEA_Repository/WIDESEA_Repository.csproj"
- },
- "WIDESEA_Services/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Services/WIDESEA_Services.csproj",
- "msbuildProject": "../WIDESEA_Services/WIDESEA_Services.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_BusinessesRepository >= 1.0.0",
- "WIDESEA_Core >= 1.0.1",
- "WIDESEA_IBusinessServices >= 1.0.0",
- "WIDESEA_IBusinessesRepository >= 1.0.0",
- "WIDESEA_Model >= 1.0.0",
- "WIDESEA_Services >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj",
- "projectName": "WIDESEA_BusinessServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/project.nuget.cache"
deleted file mode 100644
index deab901..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "3n5vQL5wpTAMyxPjrQa66/WlERYMxwTZgAFeaOpPCKB9d+AuiGQmER0v7pQ0S2p30iYRd2TSLFVTubzP+WBeVA==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_AreaInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_AreaInfoRepository.cs"
deleted file mode 100644
index 3e594dc..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_AreaInfoRepository.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing SqlSugar;
-using System.Linq.Expressions;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_AreaInfoRepository : RepositoryBase<Dt_AreaInfo>, IDt_AreaInfoRepository
- {
- public Dt_AreaInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_BillGroupStockDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_BillGroupStockDetailRepository.cs"
deleted file mode 100644
index a6961ab..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_BillGroupStockDetailRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_BillGroupStockDetailRepository : RepositoryBase<Dt_BillGroupStockDetail>, IDt_BillGroupStockDetailRepository
- {
- public Dt_BillGroupStockDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_BillGroupStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_BillGroupStockRepository.cs"
deleted file mode 100644
index 30010f3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_BillGroupStockRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_BillGroupStockRepository : RepositoryBase<Dt_BillGroupStock>, IDt_BillGroupStockRepository
- {
- public Dt_BillGroupStockRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderDetailRepository.cs"
deleted file mode 100644
index ad5974d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderDetailRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_InboundOrderDetailRepository : RepositoryBase<Dt_InboundOrderDetail>, IDt_InboundOrderDetailRepository
- {
- public Dt_InboundOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderProductionDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderProductionDetailRepository.cs"
deleted file mode 100644
index e0a8568..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderProductionDetailRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_InboundOrderProductionDetailRepository : RepositoryBase<Dt_InboundOrderProductionDetail>, IDt_InboundOrderProductionDetailRepository
- {
- public Dt_InboundOrderProductionDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderProductionRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderProductionRepository.cs"
deleted file mode 100644
index 420c1e2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderProductionRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_InboundOrderProductionRepository : RepositoryBase<Dt_InboundOrderProduction>, IDt_InboundOrderProductionRepository
- {
- public Dt_InboundOrderProductionRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderPurchaseDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderPurchaseDetailRepository.cs"
deleted file mode 100644
index 8530754..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderPurchaseDetailRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_InboundOrderPurchaseDetailRepository : RepositoryBase<Dt_InboundOrderPurchaseDetail>, IDt_InboundOrderPurchaseDetailRepository
- {
- public Dt_InboundOrderPurchaseDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderPurchaseRepository .cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderPurchaseRepository .cs"
deleted file mode 100644
index c2c2a42..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderPurchaseRepository .cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_InboundOrderPurchaseRepository : RepositoryBase<Dt_InboundOrderPurchase>, IDt_InboundOrderPurchaseRepository
- {
- public Dt_InboundOrderPurchaseRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderRepository.cs"
deleted file mode 100644
index 8256a07..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_InboundOrderRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_InboundOrderRepository : RepositoryBase<Dt_InboundOrder>, IDt_InboundOrderRepository
- {
- public Dt_InboundOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_LocationInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_LocationInfoRepository.cs"
deleted file mode 100644
index 1e1efad..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_LocationInfoRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_LocationInfoRepository : RepositoryBase<Dt_LocationInfo>, IDt_LocationInfoRepository
- {
- public Dt_LocationInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_MaterielAttributeRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_MaterielAttributeRepository.cs"
deleted file mode 100644
index b74e9af..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_MaterielAttributeRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_MaterielAttributeRepository : RepositoryBase<Dt_MaterielAttribute>, IDt_MaterielAttributeRepository
- {
- public Dt_MaterielAttributeRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_MaterielInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_MaterielInfoRepository.cs"
deleted file mode 100644
index a2b395a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_MaterielInfoRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_MaterielInfoRepository : RepositoryBase<Dt_MaterielInfo>, IDt_MaterielInfoRepository
- {
- public Dt_MaterielInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_RoadWayInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_RoadWayInfoRepository.cs"
deleted file mode 100644
index e4246bf..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_RoadWayInfoRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_RoadWayInfoRepository : RepositoryBase<Dt_RoadWayInfo>, IDt_RoadWayInfoRepository
- {
- public Dt_RoadWayInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_StrategyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_StrategyRepository.cs"
deleted file mode 100644
index 32dadf4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_StrategyRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_StrategyRepository : RepositoryBase<Dt_Strategy>, IDt_StrategyRepository
- {
- public Dt_StrategyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_TaskExecuteDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_TaskExecuteDetailRepository.cs"
deleted file mode 100644
index 195a930..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_TaskExecuteDetailRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_TaskExecuteDetailRepository : RepositoryBase<Dt_TaskExecuteDetail>, IDt_TaskExecuteDetailRepository
- {
- public Dt_TaskExecuteDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_TaskRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_TaskRepository.cs"
deleted file mode 100644
index 51d3af1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_TaskRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_TaskRepository : RepositoryBase<Dt_Task>, IDt_TaskRepository
- {
- public Dt_TaskRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_UnitInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_UnitInfoRepository.cs"
deleted file mode 100644
index 649de0b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_UnitInfoRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_UnitInfoRepository : RepositoryBase<Dt_UnitInfo>, IDt_UnitInfoRepository
- {
- public Dt_UnitInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_WareAreaInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_WareAreaInfoRepository.cs"
deleted file mode 100644
index 430f186..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/Dt_WareAreaInfoRepository.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing SqlSugar;
-using System.Linq.Expressions;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBusinessesRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_WareAreaInfoRepository : RepositoryBase<Dt_WareAreaInfo>, IDt_WareAreaInfoRepository
- {
- public Dt_WareAreaInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/WIDESEA_BusinessesRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/WIDESEA_BusinessesRepository.csproj"
deleted file mode 100644
index 42aa7da..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/WIDESEA_BusinessesRepository.csproj"
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IBusinessesRepository\WIDESEA_IBusinessesRepository.csproj" />
- <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Debug/net6.0/WIDESEA_BusinessesRepository.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Debug/net6.0/WIDESEA_BusinessesRepository.assets.cache"
deleted file mode 100644
index f8c072d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Debug/net6.0/WIDESEA_BusinessesRepository.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.dgspec.json"
deleted file mode 100644
index 4ff2053..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,314 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "projectName": "WIDESEA_BusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "projectName": "WIDESEA_IBusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/WIDESEA_BusinessesRepository.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/project.assets.json"
deleted file mode 100644
index 939ddec..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/project.assets.json"
+++ /dev/null
@@ -1,152 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_IBusinessesRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Core": "1.0.1",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IBusinessesRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IBusinessesRepository.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- }
- }
- },
- "libraries": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_IBusinessesRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj",
- "msbuildProject": "../WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_IBusinessesRepository >= 1.0.0",
- "WIDESEA_Model >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "projectName": "WIDESEA_BusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/project.nuget.cache"
deleted file mode 100644
index ca1cc0b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "cX/oB/pujeiJAskNX67h9vTgVWj4M30boxgMOddkqntJZ+w+J3rOUA7v/62uWxdT09hYZoe8+KGFUWCibD8f4w==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Location/LocationStateConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Location/LocationStateConst.cs"
deleted file mode 100644
index c854b4e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Location/LocationStateConst.cs"
+++ /dev/null
@@ -1,76 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Common.Location
-{
- public class LocationStateConst
- {
- /// <summary>
- /// 绌鸿揣浣�
- /// </summary>
- public const int LocationState_Empty = 0;
-
- /// <summary>
- /// 鏈夎揣
- /// </summary>
- public const int LocationState_Stored = 1;
-
- /// <summary>
- /// 鍏ュ簱鍒嗛厤寰呮墽琛�
- /// </summary>
- public const int LocationState_Inbound_Assigned = 2;
-
- /// <summary>
- /// 鍑哄簱鍒嗛厤寰呮墽琛�
- /// </summary>
- public const int LocationState_Outbound_Assigned = 3;
-
- /// <summary>
- /// 绌烘墭鐩樹笅鏋舵墽琛屼腑
- /// </summary>
- public const int LocationState_SpecialOutbound_Executing = 4;
-
- /// <summary>
- /// 绌烘墭鐩�
- /// </summary>
- public const int LocationState_Empty_Tray = 6;
-
- /// <summary>
- /// 娉㈡鍑哄簱涓�
- /// </summary>
- public const int LocationState_InWaveComputing = 7;
-
- /// <summary>
- /// 鎸囧畾鍑哄簱涓�
- /// </summary>
- public const int LocationState_OutManualComputing = 8;
-
- /// <summary>
- /// 鍑哄簱鎵ц涓�
- /// </summary>
- public const int LocationState_Outbound_Executing = 9;
-
- /// <summary>
- /// 鍏ュ簱鎵ц涓�
- /// </summary>
- public const int LocationState_Inbound_Executing = 10;
-
- /// <summary>
- /// 绉诲簱涓�傦紙绉诲簱鐨勫紑濮嬭揣浣嶏級
- /// </summary>
- public const int LocationState_Transfer_Executing = 11;
-
- /// <summary>
- /// 绉诲簱绛夊緟涓�傦紙绉诲簱鐨勭洰鐨勮揣浣嶏級
- /// </summary>
- public const int LocationState_TransferWaiting_Executing = 12;
-
- /// <summary>
- /// 璐ㄦ閿佸畾
- /// </summary>
- public const int LocationState_QCLocked = 13;
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/OutOrder/OrderStatusConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/OutOrder/OrderStatusConst.cs"
deleted file mode 100644
index 64d5387..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/OutOrder/OrderStatusConst.cs"
+++ /dev/null
@@ -1,51 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Common
-{
- public static class OrderStatusConst
- {
- /// <summary>
- /// 寰呭鐞�
- /// </summary>
- public const int Pending = 0;
-
- /// <summary>
- /// 澶勭悊涓�
- /// </summary>
- public const int Processing = 1;
-
- /// <summary>
- /// 宸插畬鎴�
- /// </summary>
- public const int Completed = 2;
-
- /// <summary>
- /// 宸插彇娑�
- /// </summary>
- public const int Cancelled = 3;
-
- /// <summary>
- /// 宸叉殏鍋�
- /// </summary>
- public const int Paused = 4;
-
- /// <summary>
- /// 宸叉嫆缁�
- /// </summary>
- public const int Rejected = 5;
-
- /// <summary>
- /// 宸蹭笅鍙�
- /// </summary>
- public const int Dispatched = 6;
-
- /// <summary>
- /// 鎵ц涓�
- /// </summary>
- public const int InProgress = 7;
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Task/TaskStateConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Task/TaskStateConst.cs"
deleted file mode 100644
index 6cc3dc1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Task/TaskStateConst.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Common
-{
- public static class TaskStateConst
- {
- /// <summary>
- /// 浠诲姟寰呬笅鍙�
- /// </summary>
- public const int PendingDispatch = 1;
-
- /// <summary>
- /// 杈撻�佺嚎鎵ц涓�
- /// </summary>
- public const int ConveyorInProgress = 2;
-
- /// <summary>
- /// 杈撻�佺嚎瀹屾垚
- /// </summary>
- public const int ConveyorCompleted = 3;
-
- /// <summary>
- /// AGV鎵ц涓�
- /// </summary>
- public const int AGVInProgress = 4;
-
- /// <summary>
- /// AGV瀹屾垚
- /// </summary>
- public const int AGVCompleted = 5;
-
- /// <summary>
- /// 鍫嗗灈鏈烘墽琛屼腑
- /// </summary>
- public const int StackerInProgress = 6;
-
- /// <summary>
- /// 鍫嗗灈鏈哄畬鎴�
- /// </summary>
- public const int StackerCompleted = 7;
-
- /// <summary>
- /// 浠诲姟瀹屾垚
- /// </summary>
- public const int TaskCompleted = 8;
-
- /// <summary>
- /// 浠诲姟鍙栨秷
- /// </summary>
- public const int TaskCancelled = 9;
- }
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Task/TaskTypeConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Task/TaskTypeConst.cs"
deleted file mode 100644
index 178ae2a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/Task/TaskTypeConst.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Common
-{
- public static class TaskTypeConst
- {
- /// <summary>
- /// 涓�鑸叆搴�
- /// </summary>
- public const int GeneralInbound = 1;
-
- /// <summary>
- /// 鐩樼偣鍏ュ簱
- /// </summary>
- public const int InventoryInbound = 2;
-
- /// <summary>
- /// 鍒嗘嫞鍏ュ簱
- /// </summary>
- public const int SortingInbound = 3;
-
- /// <summary>
- /// 璐ㄦ鍏ュ簱
- /// </summary>
- public const int QualityCheckInbound = 4;
-
- /// <summary>
- /// 搴撳唴绉诲簱
- /// </summary>
- public const int InternalTransfer = 5;
-
- /// <summary>
- /// 搴撳绉诲簱
- /// </summary>
- public const int ExternalTransfer = 6;
-
- /// <summary>
- /// 鏁村嚭鍑哄簱
- /// </summary>
- public const int WholeOutbound = 7;
-
- /// <summary>
- /// 璋冩嫧鍑哄簱
- /// </summary>
- public const int AllocationOutbound = 8;
-
- /// <summary>
- /// 鐢熶骇鍑哄簱
- /// </summary>
- public const int ProductionOutbound = 9;
- }
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj"
deleted file mode 100644
index 132c02c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj"
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Debug/net6.0/WIDESEA_Common.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Debug/net6.0/WIDESEA_Common.assets.cache"
deleted file mode 100644
index 4f25ef3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Debug/net6.0/WIDESEA_Common.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.dgspec.json"
deleted file mode 100644
index 0683415..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/WIDESEA_Common.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/project.assets.json"
deleted file mode 100644
index e0cda8c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/project.assets.json"
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {}
- },
- "libraries": {},
- "projectFileDependencyGroups": {
- "net6.0": []
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/project.nuget.cache"
deleted file mode 100644
index cdff53a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "/+ja209JbSD+C7ybIXQUuUFPIMsx3u9poC7Pgv8Zh2mX7PEQbZbNqQd7P6TVRpX1XFquJa0y2JrEebyGqJptzA==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/LogAOP.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/LogAOP.cs"
deleted file mode 100644
index 6f29980..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/LogAOP.cs"
+++ /dev/null
@@ -1,325 +0,0 @@
-锘縰sing Castle.DynamicProxy;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.SignalR;
-using Newtonsoft.Json;
-using StackExchange.Profiling;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.LogHelper;
-
-namespace WIDESEA_Core.AOP
-{
- /// <summary>
- /// 鎷︽埅鍣˙logLogAOP 缁ф壙IInterceptor鎺ュ彛
- /// </summary>
- public class LogAOP : IInterceptor
- {
- private readonly IHttpContextAccessor _accessor;
-
- public LogAOP(IHttpContextAccessor accessor)
- {
- _accessor = accessor;
- }
-
-
- /// <summary>
- /// 瀹炰緥鍖朓Interceptor鍞竴鏂规硶
- /// </summary>
- /// <param name="invocation">鍖呭惈琚嫤鎴柟娉曠殑淇℃伅</param>
- public void Intercept(IInvocation invocation)
- {
- string UserName = _accessor.HttpContext?.User?.Identity?.Name;
- string json;
- try
- {
- if(invocation.Arguments.Any())
- {
- json = JsonConvert.SerializeObject(invocation.Arguments);
- }
- else
- {
- json = "鏃犲弬鏁�";
- }
- }
- catch (Exception ex)
- {
- json = "鏃犳硶搴忓垪鍖栵紝鍙兘鏄叞濮嗚揪琛ㄨ揪寮忕瓑鍘熷洜閫犳垚锛屾寜鐓ф鏋朵紭鍖栦唬鐮�" + ex.ToString();
- }
-
- DateTime startTime = DateTime.Now;
- AOPLogInfo apiLogAopInfo = new AOPLogInfo
- {
- RequestTime = startTime.ToString("yyyy-MM-dd hh:mm:ss fff"),
- OpUserName = "銆愬綋鍓嶆搷浣滅敤鎴枫�戯細" + UserName,
- RequestMethodName = "銆愬綋鍓嶆墽琛屾柟娉曘�戯細" + invocation.Method.Name,
- RequestParamsName = "銆愭惡甯︾殑鍙傛暟鏈夈�戯細" + string.Join(", ", invocation.Arguments.Select(a => (a ?? "").ToString()).ToArray()),
- RequestParamsData = json
- };
-
- var dataIntercept = $"";
-
- try
- {
- MiniProfiler.Current.Step($"鎵ц{invocation.InvocationTarget}.{invocation.Method.Name}()鏂规硶 -> ");
- //鍦ㄨ鎷︽埅鐨勬柟娉曟墽琛屽畬姣曞悗 缁х画鎵ц褰撳墠鏂规硶锛屾敞鎰忔槸琚嫤鎴殑鏄紓姝ョ殑
- invocation.Proceed();
-
- // 寮傛鑾峰彇寮傚父锛屽厛鎵ц
- if (IsAsyncMethod(invocation.Method))
- {
- #region 鏂规涓�
-
- //Wait task execution and modify return value
- if (invocation.Method.ReturnType == typeof(Task))
- {
- invocation.ReturnValue = InternalAsyncHelper.AwaitTaskWithPostActionAndFinally(
- (Task)invocation.ReturnValue,
- async () => await SuccessAction(invocation, apiLogAopInfo, startTime), /*鎴愬姛鏃舵墽琛�*/
- ex =>
- {
- LogEx(ex, apiLogAopInfo);
- });
- }
- //Task<TResult>
- else
- {
- invocation.ReturnValue = InternalAsyncHelper.CallAwaitTaskWithPostActionAndFinallyAndGetResult(
- invocation.Method.ReturnType.GenericTypeArguments[0],
- invocation.ReturnValue,
- //async () => await SuccessAction(invocation, dataIntercept),/*鎴愬姛鏃舵墽琛�*/
- async (o) => await SuccessAction(invocation, apiLogAopInfo, startTime, o), /*鎴愬姛鏃舵墽琛�*/
- ex =>
- {
- LogEx(ex, apiLogAopInfo);
- });
- }
-
- #endregion
-
-
- // 濡傛灉鏂规涓�涓嶈锛岃瘯璇曡繖涓柟妗�
- //#region 鏂规浜�
-
- //var type = invocation.Method.ReturnType;
- //var resultProperty = type.GetProperty("Result");
- //DateTime endTime = DateTime.Now;
- //string ResponseTime = (endTime - startTime).Milliseconds.ToString();
- //apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff");
- //apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms";
- //apiLogAopInfo.ResponseJsonData = JsonConvert.SerializeObject(resultProperty.GetValue(invocation.ReturnValue));
-
- ////dataIntercept += ($"銆愬搷搴旀椂闂淬�戯細{ResponseTime}ms\r\n");
- ////dataIntercept += ($"銆愭墽琛屽畬鎴愭椂闂淬�戯細{endTime.ToString("yyyy-MM-dd hh:mm:ss fff")}\r\n");
- ////dataIntercept += ($"銆愭墽琛屽畬鎴愮粨鏋溿�戯細{JsonConvert.SerializeObject(resultProperty.GetValue(invocation.ReturnValue))}\r\n");
-
- //Parallel.For(0, 1, e =>
- //{
- // //LogLock.OutLogAOP("AOPLog", new string[] { dataIntercept });
- // LogLock.OutLogAOP("AOPLog", new string[] { apiLogAopInfo.GetType().ToString() + " - ResponseJsonDataType:" + type, JsonConvert.SerializeObject(apiLogAopInfo) });
- //});
-
- //#endregion
- }
- else
- {
- // 鍚屾1
- string jsonResult;
- try
- {
- jsonResult = JsonConvert.SerializeObject(invocation.ReturnValue);
- }
- catch (Exception ex)
- {
- jsonResult = "鏃犳硶搴忓垪鍖栵紝鍙兘鏄叞濮嗚揪琛ㄨ揪寮忕瓑鍘熷洜閫犳垚锛屾寜鐓ф鏋朵紭鍖栦唬鐮�" + ex.ToString();
- }
-
- var type = invocation.Method.ReturnType;
- var resultProperty = type.GetProperty("Result");
- DateTime endTime = DateTime.Now;
- string ResponseTime = (endTime - startTime).Milliseconds.ToString();
- apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff");
- apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms";
- apiLogAopInfo.ResponseJsonData = jsonResult;
- Parallel.For(0, 1, e =>
- {
- LogLock.OutLogAOP("AOPLog", new string[] { apiLogAopInfo.GetType().ToString(), JsonConvert.SerializeObject(apiLogAopInfo) });
- });
- }
- }
- catch (Exception ex) // 鍚屾2
- {
- LogEx(ex, apiLogAopInfo);
- throw;
- }
-
- }
-
- private async Task SuccessAction(IInvocation invocation, AOPLogInfo apiLogAopInfo, DateTime startTime, object o = null)
- {
- DateTime endTime = DateTime.Now;
- string ResponseTime = (endTime - startTime).Milliseconds.ToString();
- apiLogAopInfo.ResponseTime = endTime.ToString("yyyy-MM-dd hh:mm:ss fff");
- apiLogAopInfo.ResponseIntervalTime = ResponseTime + "ms";
- apiLogAopInfo.ResponseJsonData = JsonConvert.SerializeObject(o);
-
-
- await Task.Run(() =>
- {
- Parallel.For(0, 1, e =>
- {
- //LogLock.OutSql2Log("AOPLog", new string[] { JsonConvert.SerializeObject(apiLogAopInfo) });
- LogLock.OutLogAOP("AOPLog", new string[] { apiLogAopInfo.GetType().ToString(), JsonConvert.SerializeObject(apiLogAopInfo) });
- });
- });
- }
-
- private void LogEx(Exception ex, AOPLogInfo dataIntercept)
- {
- if (ex != null)
- {
- //鎵ц鐨� service 涓紝鏀跺綍寮傚父
- MiniProfiler.Current.CustomTiming("Errors锛�", ex.Message);
- //鎵ц鐨� service 涓紝鎹曡幏寮傚父
- AOPLogExInfo apiLogAopExInfo = new AOPLogExInfo
- {
- ExMessage = ex.Message,
- InnerException = "InnerException-鍐呴儴寮傚父:\r\n" + (ex.InnerException == null ? "" : ex.InnerException.InnerException.ToString()) +
- "\r\nStackTrace-鍫嗘爤璺熻釜:\r\n" + (ex.StackTrace == null ? "" : ex.StackTrace.ToString()),
- ApiLogAopInfo = dataIntercept
- };
- // 寮傚父鏃ュ織閲屾湁璇︾粏鐨勫爢鏍堜俊鎭�
- Parallel.For(0, 1, e =>
- {
- LogLock.OutLogAOP("AOPLogEx", new string[] { apiLogAopExInfo.GetType().ToString(), JsonConvert.SerializeObject(apiLogAopExInfo) });
- });
- }
- }
-
-
- public static bool IsAsyncMethod(MethodInfo method)
- {
- return
- method.ReturnType == typeof(Task) ||
- method.ReturnType.IsGenericType && method.ReturnType.GetGenericTypeDefinition() == typeof(Task<>)
- ;
- }
- }
-
-
- internal static class InternalAsyncHelper
- {
- public static async Task AwaitTaskWithPostActionAndFinally(Task actualReturnValue, Func<Task> postAction, Action<Exception> finalAction)
- {
- Exception exception = null;
-
- try
- {
- await actualReturnValue;
- await postAction();
- }
- catch (Exception ex)
- {
- exception = ex;
- }
- finally
- {
- finalAction(exception);
- }
- }
-
- public static async Task<T> AwaitTaskWithPostActionAndFinallyAndGetResult<T>(Task<T> actualReturnValue, Func<object, Task> postAction,
- Action<Exception> finalAction)
- {
- Exception exception = null;
- try
- {
- var result = await actualReturnValue;
- await postAction(result);
- return result;
- }
- catch (Exception ex)
- {
- exception = ex;
- throw;
- }
- finally
- {
- finalAction(exception);
- }
- }
-
- public static object CallAwaitTaskWithPostActionAndFinallyAndGetResult(Type taskReturnType, object actualReturnValue,
- Func<object, Task> action, Action<Exception> finalAction)
- {
- return typeof(InternalAsyncHelper)
- .GetMethod("AwaitTaskWithPostActionAndFinallyAndGetResult", BindingFlags.Public | BindingFlags.Static)
- .MakeGenericMethod(taskReturnType)
- .Invoke(null, new object[] { actualReturnValue, action, finalAction });
- }
- }
-
- public class AOPLogInfo
- {
- /// <summary>
- /// 璇锋眰鏃堕棿
- /// </summary>
- [Description("璇锋眰鏃堕棿")]
- public string RequestTime { get; set; } = string.Empty;
- /// <summary>
- /// 鎿嶄綔浜哄憳
- /// </summary>
- [Description("鎿嶄綔浜哄憳")]
- public string OpUserName { get; set; } = string.Empty;
- /// <summary>
- /// 璇锋眰鏂规硶鍚�
- /// </summary>
- [Description("璇锋眰鏂规硶鍚�")]
- public string RequestMethodName { get; set; } = string.Empty;
- /// <summary>
- /// 璇锋眰鍙傛暟鍚�
- /// </summary>
- [Description("璇锋眰鍙傛暟鍚�")]
- public string RequestParamsName { get; set; } = string.Empty;
- /// <summary>
- /// 璇锋眰鍙傛暟鏁版嵁JSON
- /// </summary>
- [Description("璇锋眰鍙傛暟鏁版嵁JSON")]
- public string RequestParamsData { get; set; } = string.Empty;
- /// <summary>
- /// 璇锋眰鍝嶅簲闂撮殧鏃堕棿
- /// </summary>
- [Description("璇锋眰鍝嶅簲闂撮殧鏃堕棿")]
- public string ResponseIntervalTime { get; set; } = string.Empty;
- /// <summary>
- /// 鍝嶅簲鏃堕棿
- /// </summary>
- [Description("鍝嶅簲鏃堕棿")]
- public string ResponseTime { get; set; } = string.Empty;
- /// <summary>
- /// 鍝嶅簲缁撴灉
- /// </summary>
- [Description("鍝嶅簲缁撴灉")]
- public string ResponseJsonData { get; set; } = string.Empty;
- }
-
- public class AOPLogExInfo
- {
- public AOPLogInfo ApiLogAopInfo { get; set; }
- /// <summary>
- /// 寮傚父
- /// </summary>
- [Description("寮傚父")]
- public string InnerException { get; set; } = string.Empty;
- /// <summary>
- /// 寮傚父淇℃伅
- /// </summary>
- [Description("寮傚父淇℃伅")]
- public string ExMessage { get; set; } = string.Empty;
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs"
deleted file mode 100644
index e0880c9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs"
+++ /dev/null
@@ -1,72 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Core.AOP
-{
- public static class SqlSugarAop
- {
- public static void DataExecuting(object oldValue, DataFilterModel entityInfo)
- {
- if (entityInfo.EntityValue is BaseEntity baseEntity)
- {
- // 鏂板鎿嶄綔
- if (entityInfo.OperationType == DataFilterType.InsertByObject)
- {
- if (entityInfo.PropertyName == nameof(BaseEntity.CreateDate))
- {
- baseEntity.CreateDate = DateTime.Now;
- }
- }
-
- if (entityInfo.OperationType == DataFilterType.UpdateByObject)
- {
- baseEntity.ModifyDate = DateTime.Now;
- }
-
-
- if (App.User?.UserId > 0)
- {
- switch (entityInfo.OperationType)
- {
- case DataFilterType.UpdateByObject:
- baseEntity.Modifier = App.User.UserName;
- break;
- case DataFilterType.InsertByObject:
- baseEntity.Creater = App.User.UserName;
- break;
- }
- }
- }
- }
-
- private static string GetWholeSql(SugarParameter[] paramArr, string sql)
- {
- foreach (var param in paramArr)
- {
- sql = sql.Replace(param.ParameterName, $@"'{param.Value.ObjToString()}'");
- }
-
- return sql;
- }
-
- private static string GetParas(SugarParameter[] pars)
- {
- string key = "銆怱QL鍙傛暟銆戯細";
- foreach (var param in pars)
- {
- key += $"{param.ParameterName}:{param.Value}\n";
- }
-
- return key;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/App.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/App.cs"
deleted file mode 100644
index 243735e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/App.cs"
+++ /dev/null
@@ -1,202 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Core;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.HttpContextUser;
-
-namespace WIDESEA_Core
-{
- public class App
- {
- static App()
- {
- EffectiveTypes = Assemblies.SelectMany(GetTypes);
- }
-
- private static bool _isRun;
-
- /// <summary>鏄惁姝ｅ湪杩愯</summary>
- public static bool IsBuild { get; set; }
-
- public static bool IsRun
- {
- get => _isRun;
- set => _isRun = IsBuild = value;
- }
-
- /// <summary>搴旂敤鏈夋晥绋嬪簭闆�</summary>
- public static readonly IEnumerable<Assembly> Assemblies = RuntimeExtension.GetAllAssemblies();
-
- /// <summary>鏈夋晥绋嬪簭闆嗙被鍨�</summary>
- public static readonly IEnumerable<Type> EffectiveTypes;
-
- /// <summary>浼樺厛浣跨敤App.GetService()鎵嬪姩鑾峰彇鏈嶅姟</summary>
- public static IServiceProvider RootServices => IsRun || IsBuild ? InternalApp.RootServices : null;
-
- /// <summary>鑾峰彇Web涓绘満鐜锛屽锛屾槸鍚︽槸寮�鍙戠幆澧冿紝鐢熶骇鐜绛�</summary>
- public static IWebHostEnvironment WebHostEnvironment => InternalApp.WebHostEnvironment;
-
- /// <summary>鑾峰彇娉涘瀷涓绘満鐜锛屽锛屾槸鍚︽槸寮�鍙戠幆澧冿紝鐢熶骇鐜绛�</summary>
- public static IHostEnvironment HostEnvironment => InternalApp.HostEnvironment;
-
- /// <summary>鍏ㄥ眬閰嶇疆閫夐」</summary>
- public static IConfiguration Configuration => InternalApp.Configuration;
-
- /// <summary>
- /// 鑾峰彇璇锋眰涓婁笅鏂�
- /// </summary>
- public static HttpContext HttpContext => RootServices?.GetService<IHttpContextAccessor>()?.HttpContext;
-
- public static IUser User => GetService<IUser>();
-
- #region Service
-
- /// <summary>瑙ｆ瀽鏈嶅姟鎻愪緵鍣�</summary>
- /// <param name="serviceType"></param>
- /// <param name="mustBuild"></param>
- /// <param name="throwException"></param>
- /// <returns></returns>
- public static IServiceProvider GetServiceProvider(Type serviceType, bool mustBuild = false, bool throwException = true)
- {
- if (App.HostEnvironment == null || App.RootServices != null &&
- InternalApp.InternalServices
- .Where((u =>
- u.ServiceType ==
- (serviceType.IsGenericType ? serviceType.GetGenericTypeDefinition() : serviceType)))
- .Any((u => u.Lifetime == ServiceLifetime.Singleton)))
- return App.RootServices;
-
- //鑾峰彇璇锋眰鐢熷瓨鍛ㄦ湡鐨勬湇鍔�
- if (HttpContext?.RequestServices != null)
- return HttpContext.RequestServices;
-
- if (App.RootServices != null)
- {
- IServiceScope scope = RootServices.CreateScope();
- return scope.ServiceProvider;
- }
-
- if (mustBuild)
- {
- if (throwException)
- {
- throw new ApplicationException("褰撳墠涓嶅彲鐢紝蹇呴』瑕佺瓑鍒� WebApplication Build鍚�");
- }
-
- return default;
- }
-
- ServiceProvider serviceProvider = InternalApp.InternalServices.BuildServiceProvider();
- return serviceProvider;
- }
-
- public static TService GetService<TService>(bool mustBuild = true) where TService : class
- {
- TService test = App.GetService(typeof(TService), null, mustBuild) as TService;
- return test;
- }
-
- /// <summary>鑾峰彇璇锋眰鐢熷瓨鍛ㄦ湡鐨勬湇鍔�</summary>
- /// <typeparam name="TService"></typeparam>
- /// <param name="serviceProvider"></param>
- /// <param name="mustBuild"></param>
- /// <returns></returns>
- public static TService GetService<TService>(IServiceProvider serviceProvider, bool mustBuild = true)
- where TService : class => (serviceProvider ?? App.GetServiceProvider(typeof(TService), mustBuild, false))?.GetService<TService>();
-
- /// <summary>鑾峰彇璇锋眰鐢熷瓨鍛ㄦ湡鐨勬湇鍔�</summary>
- /// <param name="type"></param>
- /// <param name="serviceProvider"></param>
- /// <param name="mustBuild"></param>
- /// <returns></returns>
- public static object GetService(Type type, IServiceProvider serviceProvider = null, bool mustBuild = true)
- {
- object obj = (serviceProvider ?? App.GetServiceProvider(type, mustBuild, false))?.GetService(type);
- return obj;
- }
-
-
- #endregion
-
- #region private
-
- /// <summary>鍔犺浇绋嬪簭闆嗕腑鐨勬墍鏈夌被鍨�</summary>
- /// <param name="ass"></param>
- /// <returns></returns>
- private static IEnumerable<Type> GetTypes(Assembly ass)
- {
- Type[] source = Array.Empty<Type>();
- try
- {
- source = ass.GetTypes();
- }
- catch
- {
- //$@"Error load `{ass.FullName}` assembly.".WriteErrorLine();
- }
-
- return source.Where(u => u.IsPublic);
- }
-
- #endregion
-
- #region Options
-
- /// <summary>鑾峰彇閰嶇疆</summary>
- /// <typeparam name="TOptions">寮虹被鍨嬮�夐」绫�</typeparam>
- /// <returns>TOptions</returns>
- public static TOptions GetConfig<TOptions>()
- where TOptions : class, IConfigurableOptions
- {
- TOptions instance = App.Configuration
- .GetSection(ConfigurableOptions.GetConfigurationPath(typeof(TOptions)))
- .Get<TOptions>();
- return instance;
- }
-
- /// <summary>鑾峰彇閫夐」</summary>
- /// <typeparam name="TOptions">寮虹被鍨嬮�夐」绫�</typeparam>
- /// <param name="serviceProvider"></param>
- /// <returns>TOptions</returns>
- public static TOptions GetOptions<TOptions>(IServiceProvider serviceProvider = null) where TOptions : class, new()
- {
- IOptions<TOptions> service = App.GetService<IOptions<TOptions>>(serviceProvider ?? App.RootServices, false);
- return service?.Value;
- }
-
- /// <summary>鑾峰彇閫夐」</summary>
- /// <typeparam name="TOptions">寮虹被鍨嬮�夐」绫�</typeparam>
- /// <param name="serviceProvider"></param>
- /// <returns>TOptions</returns>
- public static TOptions GetOptionsMonitor<TOptions>(IServiceProvider serviceProvider = null)
- where TOptions : class, new()
- {
- IOptionsMonitor<TOptions> service =
- App.GetService<IOptionsMonitor<TOptions>>(serviceProvider ?? App.RootServices, false);
- return service?.CurrentValue;
- }
-
- /// <summary>鑾峰彇閫夐」</summary>
- /// <typeparam name="TOptions">寮虹被鍨嬮�夐」绫�</typeparam>
- /// <param name="serviceProvider"></param>
- /// <returns>TOptions</returns>
- public static TOptions GetOptionsSnapshot<TOptions>(IServiceProvider serviceProvider = null)
- where TOptions : class, new()
- {
- IOptionsSnapshot<TOptions> service = App.GetService<IOptionsSnapshot<TOptions>>(serviceProvider, false);
- return service?.Value;
- }
-
- #endregion
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/AuthorizationResponse.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/AuthorizationResponse.cs"
deleted file mode 100644
index 3db0e6a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/AuthorizationResponse.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
-using System.Net;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Const;
-
-namespace WIDESEA_Core.Authorization
-{
- public static class AuthorizationResponse
- {
- public static AuthorizationFilterContext FilterResult(
- this AuthorizationFilterContext context,
- HttpStatusCode statusCode,
- string message = null)
- {
- context.Result = new ContentResult()
- {
- Content = new { message, status = false, code = (int)statusCode }.Serialize(),
- ContentType = "application/json",
- StatusCode = (int)statusCode
- };
- //Logger.Info(LoggerType.ApiAuthorize, message);
- return context;
- }
- public static AuthorizationFilterContext Unauthorized(this AuthorizationFilterContext context, string message = null)
- {
- return context.FilterResult(HttpStatusCode.Unauthorized, message);
- }
- //涓嶉�氳繃JWT楠岃瘉鐨勶紝鐩存帴灏嗙敤鎴蜂俊鎭紦瀛樿捣鏉�
- public static void AddIdentity(this AuthorizationFilterContext context, int? userId = null)
- {
- int _userId = userId ?? JwtHelper.GetUserId(context.HttpContext.Request.Headers[AppSecret.TokenHeaderName]);
- if (_userId <= 0) return;
- //灏嗙敤鎴稩d缂撳瓨鍒颁笂涓嬫枃(鎴栬�呰嚜瀹氫竴涓璞★紝閫氳繃DI浠ddScoped鏂瑰紡娉ㄥ叆涓婁笅鏂囨潵绠＄悊鐢ㄦ埛淇℃伅)
- var claims = new Claim[] { new Claim(JwtRegisteredClaimNames.Jti, _userId.ToString()) };
- context.HttpContext.User.AddIdentity(new ClaimsIdentity(claims));
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/AuthorizationSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/AuthorizationSetup.cs"
deleted file mode 100644
index 31cff24..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/AuthorizationSetup.cs"
+++ /dev/null
@@ -1,67 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Authorization
-{
- /// <summary>
- /// 绯荤粺 鎺堟潈鏈嶅姟 閰嶇疆
- /// </summary>
- public static class AuthorizationSetup
- {
- /// <summary>
- /// 绯荤粺 鎺堟潈鏈嶅姟 閰嶇疆
- /// </summary>
- /// <param name="services"></param>
- /// <exception cref="ArgumentNullException"></exception>
- public static void AddAuthorizationSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- services.AddAuthentication(options =>
- {
- options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
- options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
- options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
- })
- .AddJwtBearer(options =>
- {
- options.TokenValidationParameters = new TokenValidationParameters
- {
- SaveSigninToken = true,//淇濆瓨token,鍚庡彴楠岃瘉token鏄惁鐢熸晥(閲嶈)
- ValidateIssuer = true,//鏄惁楠岃瘉Issuer
- ValidateAudience = true,//鏄惁楠岃瘉Audience
- ValidateLifetime = true,//鏄惁楠岃瘉澶辨晥鏃堕棿
- ValidateIssuerSigningKey = true,//鏄惁楠岃瘉SecurityKey
- ValidAudience = AppSecret.Audience,//Audience
- ValidIssuer = AppSecret.Issuer,//Issuer锛岃繖涓ら」鍜屽墠闈㈢鍙慾wt鐨勮缃竴鑷�
- IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(AppSecret.JWT))
- };
- options.Events = new JwtBearerEvents()
- {
- OnChallenge = context =>
- {
- context.HandleResponse();
- context.Response.Clear();
- context.Response.ContentType = "application/json";
- context.Response.StatusCode = 401;
- context.Response.WriteAsync(new { message = "鎺堟潈鏈�氳繃", status = false, code = 401 }.Serialize());
- return Task.CompletedTask;
- }
- };
- });
-
- services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/JwtHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/JwtHelper.cs"
deleted file mode 100644
index 2669558..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/JwtHelper.cs"
+++ /dev/null
@@ -1,118 +0,0 @@
-锘縰sing Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.HttpContextUser;
-
-namespace WIDESEA_Core.Authorization
-{
- public class JwtHelper
- {
-
- /// <summary>
- /// 鐢熸垚JWT
- /// </summary>
- /// <param name="serInfo"></param>
- /// <returns></returns>
- public static string IssueJwt(TokenModelJwt tokenModel)
- {
- string exp = $"{new DateTimeOffset(DateTime.Now.AddMinutes(/*tokenModel.UserId == 1 ? 43200 : */AppSettings.app("ExpMinutes").ObjToInt())).ToUnixTimeSeconds()}";
- var claims = new List<Claim>
- {
- new Claim(JwtRegisteredClaimNames.Jti,tokenModel.UserId.ToString()),
- new Claim(JwtRegisteredClaimNames.Iat, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"),
- new Claim(JwtRegisteredClaimNames.Nbf,$"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}") ,
- //JWT杩囨湡鏃堕棿
- //榛樿璁剧疆jwt杩囨湡鏃堕棿120鍒嗛挓
- new Claim (JwtRegisteredClaimNames.Exp,exp),
- new Claim(JwtRegisteredClaimNames.Iss,AppSecret.Issuer),
- new Claim(JwtRegisteredClaimNames.Aud,AppSecret.Audience),
- new Claim(ClaimTypes.Role, tokenModel.RoleId.ToString())
- };
-
- // 鍙互灏嗕竴涓敤鎴风殑澶氫釜瑙掕壊鍏ㄩ儴璧嬩簣锛�
- // 浣滆�咃細DX 鎻愪緵鎶�鏈敮鎸侊紱
-
- //绉橀挜16浣�
- var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(AppSecret.JWT));
- var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
- JwtSecurityToken securityToken = new JwtSecurityToken(issuer: AppSecret.Issuer, claims: claims, signingCredentials: creds);
- string jwt = new JwtSecurityTokenHandler().WriteToken(securityToken);
- return jwt;
- }
-
- /// <summary>
- /// 瑙ｆ瀽
- /// </summary>
- /// <param name="jwtStr"></param>
- /// <returns></returns>
- public static UserInfo SerializeJwt(string jwtStr)
- {
- var jwtHandler = new JwtSecurityTokenHandler();
- JwtSecurityToken jwtToken = jwtHandler.ReadJwtToken(jwtStr);
- UserInfo userInfo = new UserInfo
- {
- UserId = Convert.ToInt32(jwtToken.Id),
- RoleId = (jwtToken.Payload[ClaimTypes.Role] ?? 0).ObjToInt(),
- };
- return userInfo;
- }
- /// <summary>
- /// 鑾峰彇杩囨湡鏃堕棿
- /// </summary>
- /// <param name="jwtStr"></param>
- /// <returns></returns>
- public static DateTime GetExp(string jwtStr)
- {
- var jwtHandler = new JwtSecurityTokenHandler();
- JwtSecurityToken jwtToken = jwtHandler.ReadJwtToken(jwtStr);
-
- DateTime expDate = (jwtToken.Payload[JwtRegisteredClaimNames.Exp] ?? 0).ObjToInt().GetTimeSpmpToDate();
- return expDate;
- }
- public static bool IsExp(string jwtStr)
- {
- return GetExp(jwtStr) < DateTime.Now;
- }
-
- public static int GetUserId(string jwtStr)
- {
- try
- {
- if (jwtStr.IsNullOrEmpty()) return 0;
- jwtStr = jwtStr.Replace("Bearer ", "");
- return new JwtSecurityTokenHandler().ReadJwtToken(jwtStr).Id.ObjToInt();
- }
- catch
- {
- return 0;
- }
- }
- }
-
- /// <summary>
- /// 浠ょ墝
- /// </summary>
- public class TokenModelJwt
- {
- /// <summary>
- /// UserId
- /// </summary>
- public long UserId { get; set; }
- /// <summary>
- /// 瑙掕壊
- /// </summary>
- public int RoleId { get; set; }
- /// <summary>
- /// 鑱岃兘
- /// </summary>
- public string Work { get; set; }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseController/ApiBaseController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseController/ApiBaseController.cs"
deleted file mode 100644
index 6a8c66b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseController/ApiBaseController.cs"
+++ /dev/null
@@ -1,112 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-
-namespace WIDESEA_Core.BaseController
-{
- [Authorize, ApiController]
- public class ApiBaseController<IService, TEntity> : Controller
- {
- protected IService Service;
-
- public ApiBaseController(IService service)
- {
- Service = service;
- }
-
- [HttpPost, Route("GetPageData")]
- public virtual ActionResult GetPageData([FromBody] PageDataOptions options)
- {
- return Json(InvokeService("GetPageData", new object[] { options }));
- }
-
- [HttpPost, Route("GetDetailPage")]
- public virtual ActionResult GetDetailPage([FromBody] PageDataOptions pageData)
- {
- return Json(InvokeService("GetDetailPage", new object[] { pageData }));
- }
-
- [HttpPost, Route("AddData")]
- public virtual ActionResult AddData([FromBody] TEntity options)
- {
- return Json(InvokeService("AddData", new object[] { options }));
- }
-
- [HttpPost, Route("Add")]
- public virtual ActionResult Add([FromBody] SaveModel options)
- {
- return Json(InvokeService("AddData", new object[] { options }));
- }
-
- [HttpPost, Route("Update")]
- public virtual ActionResult Update([FromBody] SaveModel options)
- {
- return Json(InvokeService("UpdateData", new object[] { options }));
- }
-
- [HttpPost, Route("UpdateData")]
- public virtual ActionResult UpdateData([FromBody] TEntity options)
- {
- return Json(InvokeService("UpdateData", new object[] { options }));
- }
-
- [HttpPost, Route("Del")]
- public virtual ActionResult Del(object key)
- {
- return Json(InvokeService("DeleteData", new object[] { key }));
- }
-
- [HttpPost, Route("Export")]
- public virtual ActionResult Export([FromBody] PageDataOptions loadData)
- {
- WebResponseContent result = InvokeService("Export", new object[] { loadData }) as WebResponseContent;
- if (result.Status)
- return File(
- System.IO.File.ReadAllBytes(result.Data.ToString()),
- System.Net.Mime.MediaTypeNames.Application.Octet,
- Path.GetFileName(result.Data.ToString())
- );
- return Json(result);
- }
-
- [HttpPost, Route("DownLoadTemplate")]
- public virtual ActionResult DownLoadTemplate()
- {
- WebResponseContent result = InvokeService("DownLoadTemplate", new object[] { }) as WebResponseContent;
- if (result.Status)
- return File(
- System.IO.File.ReadAllBytes(result.Data.ToString()),
- System.Net.Mime.MediaTypeNames.Application.Octet,
- Path.GetFileName(result.Data.ToString())
- );
- return Json(result);
- }
-
- [HttpPost, Route("Import")]
- public virtual ActionResult Import(List<IFormFile> fileInput)
- {
- return Json(InvokeService("Import", new object[] { fileInput }));
-
- }
-
- private object InvokeService(string methodName, object[] parameters)
- {
- Type t = Service.GetType();
- List<Type> types = new List<Type>();
- foreach (var param in parameters)
- {
- types.Add(param.GetType());
- }
- MethodInfo method = t.GetMethod(methodName, types.ToArray());
- return method.Invoke(Service, parameters);
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs"
deleted file mode 100644
index bffe798..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs"
+++ /dev/null
@@ -1,35 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core
-{
- public class PageDataOptions
- {
- public int Page { get; set; }
- public int Rows { get; set; }
- public int Total { get; set; }
- public string TableName { get; set; }
- public string Sort { get; set; }
- /// <summary>
- /// 鎺掑簭鏂瑰紡
- /// </summary>
- public string Order { get; set; }
- public string Wheres { get; set; }
- public bool Export { get; set; }
- public object Value { get; set; }
- /// <summary>
- /// 鏌ヨ鏉′欢
- /// </summary>
- public List<SearchParameters> Filter { get; set; }
- }
- public class SearchParameters
- {
- public string Name { get; set; }
- public string Value { get; set; }
- //鏌ヨ绫诲瀷锛歀inqExpressionType
- public string DisplayType { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageGridData.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageGridData.cs"
deleted file mode 100644
index 7ad6817..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageGridData.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core
-{
- public class PageGridData<T>
- {
- public int Total { get; set; }
- public List<T> Rows { get; set; }
- public object Summary { get; set; }
-
- public PageGridData()
- {
-
- }
-
- public PageGridData(int total, List<T> rows)
- {
- Total = total;
- Rows = rows;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/Permissions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/Permissions.cs"
deleted file mode 100644
index e8c006b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/Permissions.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core
-{
- public class Permissions
- {
- public int MenuId { get; set; }
- public int ParentId { get; set; }
- public string TableName { get; set; }
- public string MenuAuth { get; set; }
- public string UserAuth { get; set; }
- /// <summary>
- /// 褰撳墠鐢ㄦ埛鏉冮檺,瀛樺偍鐨勬槸鏉冮檺鐨勫�硷紝濡�:Add,Search绛�
- /// </summary>
- public string[] UserAuthArr { get; set; }
-
- /// <summary>
- /// 2022.03.26
- /// 鑿滃崟绫诲瀷1:绉诲姩绔紝0:PC绔�
- /// </summary>
- public int MenuType { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/SaveModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/SaveModel.cs"
deleted file mode 100644
index f103ccf..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/SaveModel.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core
-{
- public class SaveModel
- {
- public Dictionary<string, object> MainData { get; set; }
- public List<Dictionary<string, object>> DetailData { get; set; }
- public List<object> DelKeys { get; set; }
-
- /// <summary>
- /// 浠庡墠鍙颁紶鍏ョ殑鍏朵粬鍙傛暟(鑷畾涔夋墿灞曞彲浠ヤ娇鐢�)
- /// </summary>
- public object Extra { get; set; }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs"
deleted file mode 100644
index 66feb1b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/WebResponseContent.cs"
+++ /dev/null
@@ -1,53 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core
-{
- public class WebResponseContent
- {
- public WebResponseContent()
- {
- }
- public WebResponseContent(bool status)
- {
- Status = status;
- }
- public bool Status { get; set; }
-
- public int Code { get; set; }
-
- public string Message { get; set; }
-
- public object Data { get; set; }
-
- public string DevMessage { get; set; }
-
- public WebResponseContent OK()
- {
- Status = true;
- return this;
- }
-
- public static WebResponseContent Instance
- {
- get { return new WebResponseContent(); }
- }
- public WebResponseContent OK(string message = null, object data = null)
- {
- Status = true;
- Message = message;
- Data = data;
- return this;
- }
-
- public WebResponseContent Error(string message = null)
- {
- Status = false;
- Message = message;
- return this;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/IRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/IRepository.cs"
deleted file mode 100644
index fa36fd6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/IRepository.cs"
+++ /dev/null
@@ -1,339 +0,0 @@
-锘縰sing Microsoft.Data.SqlClient;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.BaseRepository
-{
- public interface IRepository<TEntity> : IDependency where TEntity : class, new()
- {
- /// <summary>
- /// SqlsugarClient瀹炰綋
- /// </summary>
- ISqlSugarClient Db { get; }
- /// <summary>
- /// 閫氳繃涓婚敭鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="id">涓婚敭</param>
- /// <returns>鏌ヨ缁撴灉</returns>
- TEntity QureyDataById(object id);
-
- /// <summary>
- /// 閫氳繃涓婚敭鏁扮粍鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="lstIds">涓婚敭鏁扮粍</param>
- /// <returns>鏌ヨ缁撴灉闆嗗悎</returns>
- List<TEntity> QureyDataByIds(object[] lstIds);
-
- /// <summary>
- /// 閫氳繃涓婚敭闆嗗悎鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="lstIds">涓婚敭闆嗗悎</param>
- /// <returns>鏌ヨ缁撴灉闆嗗悎</returns>
- List<TEntity> QureyDataByIds(List<object> lstIds);
-
- /// <summary>
- /// 娣诲姞鍗曟潯鏁版嵁
- /// </summary>
- /// <param name="entity"></param>
- /// <returns>褰卞搷琛屾暟</returns>
- int AddData(TEntity entity);
-
- /// <summary>
- /// 娣诲姞澶氭潯鏁版嵁
- /// </summary>
- /// <param name="listEntity"></param>
- /// <returns>褰卞搷琛屾暟</returns>
- int AddData(List<TEntity> listEntity);
-
- /// <summary>
- /// 閫氳繃涓婚敭鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="id">涓婚敭</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- bool DeleteDataById(object id);
-
- /// <summary>
- /// 閫氳繃涓婚敭鏁版嵁鍒犻櫎澶氭潯鏁版嵁
- /// </summary>
- /// <param name="ids">涓婚敭鏁扮粍</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- bool DeleteDataByIds(object[] ids);
-
- /// <summary>
- /// 閫氳繃瀹炰綋鏁版嵁鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="ids">涓婚敭鏁扮粍</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- bool DeleteData(TEntity entity);
-
- /// <summary>
- /// 閫氳繃瀹炰綋闆嗗悎鏁版嵁鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="ids">涓婚敭鏁扮粍</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- bool DeleteData(List<TEntity> listEntity);
-
- /// <summary>
- /// 鏇存柊鍗曟潯鏁版嵁
- /// </summary>
- /// <param name="entity"></param>
- /// <returns></returns>
- bool UpdateData(TEntity entity);
-
- /// <summary>
- /// 鏇存柊澶氭潯鏁版嵁
- /// </summary>
- /// <param name="listEntity"></param>
- /// <returns></returns>
- bool UpdateData(List<TEntity> listEntity);
-
- /// <summary>
- /// 鎸囧畾鍒楁洿鏂版暟鎹�
- /// </summary>
- /// <param name="entity"></param>
- /// <param name="lstColumns"></param>
- /// <param name="lstIgnoreColumns"></param>
- /// <returns></returns>
- bool UpdateData(TEntity entity, List<string> lstColumns, List<string> lstIgnoreColumns = null);
-
- /// <summary>
- /// 鏌ヨ鎵�鏈夋暟鎹�
- /// </summary>
- /// <returns></returns>
- List<TEntity> QueryData();
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="where"></param>
- /// <returns></returns>
- List<TEntity> QueryData(string where);
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <returns></returns>
- List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression);
-
- TEntity QueryFirst(Expression<Func<TEntity, bool>> whereExpression);
-
- TResult QueryFirst<TResult>(Expression<Func<TEntity, bool>> whereExpression, Expression<Func<TEntity, TResult>> expression);
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁骞舵帓搴�
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, string orderByFields);
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁骞舵帓搴�
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="where"></param>
- /// <returns></returns>
- List<TEntity> QueryData(string where, Dictionary<string, OrderByType> orderBy);
-
- /// <summary>
- /// 鏌ヨ鎸囧畾鏁版嵁瀵硅薄
- /// </summary>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="expression"></param>
- /// <returns></returns>
- List<TResult> QueryData<TResult>(Expression<Func<TEntity, TResult>> expression);
-
- /// <summary>
- /// 鏉′欢鏌ヨ鎸囧畾鏁版嵁瀵硅薄
- /// </summary>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="expression"></param>
- /// <param name="whereExpression"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- List<TResult> QueryData<TResult>(Expression<Func<TEntity, TResult>> expression, Expression<Func<TEntity, bool>> whereExpression, string orderByFields);
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁骞舵帓搴�
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="orderByExpression"></param>
- /// <param name="isAsc"></param>
- /// <returns></returns>
- List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, Expression<Func<TEntity, object>> orderByExpression, bool isAsc = true);
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁骞舵帓搴�
- /// </summary>
- /// <param name="where"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- List<TEntity> QueryData(string where, string orderByFields);
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="parameters"></param>
- /// <returns></returns>
- List<TEntity> QueryDataBySql(string sql, SugarParameter[] parameters = null);
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="parameters"></param>
- /// <returns></returns>
- List<dynamic> QueryDynamicDataBySql(string sql, SugarParameter[] parameters = null);
-
- List<object> QueryObjectDataBySql(string sql, SugarParameter[] parameters = null);
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鎵ц鎿嶄綔
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="sqlParameters"></param>
- /// <returns></returns>
- public int ExecuteSqlCommand(string sql, params SqlParameter[] sqlParameters);
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="parameters"></param>
- /// <returns></returns>
- DataTable QueryTable(string sql, SugarParameter[] parameters = null);
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁鎸囧畾鏁伴噺鐨勮
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="top"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, int top, string orderByFields);
-
- /// <summary>
- /// 鏉′欢鏌ヨ鎸囧畾鏁伴噺鐨勮
- /// </summary>
- /// <param name="where"></param>
- /// <param name="top"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- List<TEntity> QueryData(string where, int top, string orderByFields);
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, int pageIndex, int pageSize, string orderByFields);
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="where"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- List<TEntity> QueryData(string where, int pageIndex, int pageSize, string orderByFields);
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- PageGridData<TEntity> QueryPage(Expression<Func<TEntity, bool>> whereExpression, int pageIndex, int pageSize, string orderByFields = null);
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pagesize"></param>
- /// <param name="orderBy"></param>
- /// <returns></returns>
- PageGridData<TEntity> QueryPage(Expression<Func<TEntity, bool>> whereExpression, int pageIndex, int pagesize, Dictionary<string, OrderByType> orderBy);
-
- PageGridData<TEntity> QueryPage(string where, int pageIndex, int pageSize, Dictionary<string, OrderByType> orderBy);
-
- /// <summary>
- /// 涓よ〃鑱旀煡
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <typeparam name="T2"></typeparam>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="joinExpression"></param>
- /// <param name="selectExpression"></param>
- /// <param name="whereExpression"></param>
- /// <returns></returns>
- List<TResult> QueryTabs<T, T2, TResult>(
- Expression<Func<T, T2, object[]>> joinExpression,
- Expression<Func<T, T2, TResult>> selectExpression,
- Expression<Func<TResult, bool>> whereExpression);
-
- /// <summary>
- /// 涓よ〃鑱旀煡-鍒嗛〉
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <typeparam name="T2"></typeparam>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="joinExpression"></param>
- /// <param name="selectExpression"></param>
- /// <param name="whereExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- PageGridData<TResult> QueryTabsPage<T, T2, TResult>(
- Expression<Func<T, T2, object[]>> joinExpression,
- Expression<Func<T, T2, TResult>> selectExpression,
- Expression<Func<TResult, bool>> whereExpression,
- int pageIndex = 1,
- int pageSize = 20,
- string orderByFields = null);
-
- /// <summary>
- /// 涓よ〃鑱斿悎鏌ヨ-鍒嗛〉-鍒嗙粍
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <typeparam name="T2"></typeparam>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="joinExpression"></param>
- /// <param name="selectExpression"></param>
- /// <param name="whereExpression"></param>
- /// <param name="groupExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- PageGridData<TResult> QueryTabsPage<T, T2, TResult>(
- Expression<Func<T, T2, object[]>> joinExpression,
- Expression<Func<T, T2, TResult>> selectExpression,
- Expression<Func<TResult, bool>> whereExpression,
- Expression<Func<T, object>> groupExpression,
- int pageIndex = 1,
- int pageSize = 20,
- string orderByFields = null);
-
- //List<TResult> QueryMuch<T, T2, T3, TResult>(
- // Expression<Func<T, T2, T3, object[]>> joinExpression,
- // Expression<Func<T, T2, T3, TResult>> selectExpression,
- // Expression<Func<T, T2, T3, bool>> whereLambda = null) where T : class, new();
- //Task<PageModel<TEntity>> QueryPage(PaginationModel pagination);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
deleted file mode 100644
index 46695de..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
+++ /dev/null
@@ -1,588 +0,0 @@
-锘縰sing SqlSugar;
-using System.Data;
-using System.Linq.Expressions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Reflection;
-using WIDESEA_Core.Helper;
-using Microsoft.Data.SqlClient;
-using System.Drawing.Printing;
-using WIDESEA_Core.Tenants;
-using WIDESEA_Core.Seed;
-using WIDESEA_Core.DB;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.AOP;
-
-namespace WIDESEA_Core.BaseRepository
-{
- public class RepositoryBase<TEntity> : IRepository<TEntity> where TEntity : class, new()
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly SqlSugarClient _dbBase;
-
- private ISqlSugarClient _db
- {
- get
- {
- ISqlSugarClient db = _dbBase;
-
- //澶氱鎴�
- var mta = typeof(TEntity).GetCustomAttribute<MultiTenantAttribute>();
- if (mta is { TenantType: TenantTypeEnum.Db })
- {
- //鑾峰彇绉熸埛淇℃伅 绉熸埛淇℃伅鍙互鎻愬墠缂撳瓨涓嬫潵
- if (App.User is { TenantId: > 0 })
- {
- dynamic tenant = db.Queryable(MainDb.TenantTableName, "x").Where(MainDb.TenantId, "=", App.User.TenantId).First();
- if (tenant != null)
- {
- var iTenant = db.AsTenant();
- if (!iTenant.IsAnyConnection(tenant.TenantId))
- {
- string conStr = tenant.ConnectionString;
- ConnectionConfig connectionConfig = new ConnectionConfig()
- {
- ConfigId = tenant.TenantId,
- ConnectionString = conStr.DecryptDES(AppSecret.DB),
- DbType = (SqlSugar.DbType)tenant.DbType,
- IsAutoCloseConnection = true,
- AopEvents = new AopEvents()
- {
- DataExecuting = SqlSugarAop.DataExecuting
- }
- };
- iTenant.AddConnection(connectionConfig);
- }
-
- return iTenant.GetConnection(tenant.TenantId);
- }
- }
- }
-
- return db;
- }
- }
-
- public ISqlSugarClient Db => _db;
-
- public RepositoryBase(IUnitOfWorkManage unitOfWorkManage)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _dbBase = unitOfWorkManage.GetDbClient();
- }
-
- /// <summary>
- /// 閫氳繃涓婚敭鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="id">涓婚敭</param>
- /// <returns>鏌ヨ缁撴灉</returns>
- public virtual TEntity QureyDataById(object id)
- {
- return _db.Queryable<TEntity>().In(id).Single();
- }
-
- /// <summary>
- /// 閫氳繃涓婚敭鏁扮粍鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="lstIds">涓婚敭鏁扮粍</param>
- /// <returns>鏌ヨ缁撴灉闆嗗悎</returns>
- public virtual List<TEntity> QureyDataByIds(object[] lstIds)
- {
- return _db.Queryable<TEntity>().In(lstIds).ToList();
- }
-
- /// <summary>
- /// 閫氳繃涓婚敭闆嗗悎鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="lstIds">涓婚敭闆嗗悎</param>
- /// <returns>鏌ヨ缁撴灉闆嗗悎</returns>
- public virtual List<TEntity> QureyDataByIds(List<object> lstIds)
- {
- return _db.Queryable<TEntity>().In(lstIds).ToList();
- }
-
- /// <summary>
- /// 娣诲姞鍗曟潯鏁版嵁
- /// </summary>
- /// <param name="entity"></param>
- /// <returns>褰卞搷琛屾暟</returns>
- public virtual int AddData(TEntity entity)
- {
- IInsertable<TEntity> insert = _db.Insertable(entity);
- return insert.ExecuteReturnIdentity();
- }
-
- /// <summary>
- /// 娣诲姞澶氭潯鏁版嵁
- /// </summary>
- /// <param name="listEntity"></param>
- /// <returns>褰卞搷琛屾暟</returns>
- public virtual int AddData(List<TEntity> listEntity)
- {
- IInsertable<TEntity> insert = _db.Insertable(listEntity);
- return insert.ExecuteReturnIdentity();
- }
-
- /// <summary>
- /// 閫氳繃涓婚敭鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="id">涓婚敭</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- public virtual bool DeleteDataById(object id)
- {
- return _db.Deleteable<TEntity>().In(id).ExecuteCommandHasChange();
- }
-
- /// <summary>
- /// 閫氳繃涓婚敭鏁版嵁鍒犻櫎澶氭潯鏁版嵁
- /// </summary>
- /// <param name="ids">涓婚敭鏁扮粍</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- public virtual bool DeleteDataByIds(object[] ids)
- {
- return _db.Deleteable<TEntity>().In(ids).ExecuteCommandHasChange();
- }
-
- /// <summary>
- /// 閫氳繃瀹炰綋鏁版嵁鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="ids">涓婚敭鏁扮粍</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- public virtual bool DeleteData(TEntity entity)
- {
- return _db.Deleteable(entity).ExecuteCommandHasChange();
- }
-
- /// <summary>
- /// 閫氳繃瀹炰綋闆嗗悎鏁版嵁鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="ids">涓婚敭鏁扮粍</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- public virtual bool DeleteData(List<TEntity> listEntity)
- {
- return _db.Deleteable(listEntity).ExecuteCommandHasChange();
- }
-
- /// <summary>
- /// 鏇存柊鍗曟潯鏁版嵁
- /// </summary>
- /// <param name="entity"></param>
- /// <returns></returns>
- public virtual bool UpdateData(TEntity entity)
- {
- return _db.Updateable(entity).ExecuteCommandHasChange();
- }
-
- /// <summary>
- /// 鏇存柊澶氭潯鏁版嵁
- /// </summary>
- /// <param name="listEntity"></param>
- /// <returns></returns>
- public virtual bool UpdateData(List<TEntity> listEntity)
- {
- return _db.Updateable(listEntity).ExecuteCommandHasChange();
- }
-
- /// <summary>
- /// 鎸囧畾鍒楁洿鏂版暟鎹�
- /// </summary>
- /// <param name="entity"></param>
- /// <param name="lstColumns"></param>
- /// <param name="lstIgnoreColumns"></param>
- /// <returns></returns>
- public virtual bool UpdateData(TEntity entity, List<string> lstColumns, List<string> lstIgnoreColumns = null)
- {
- IUpdateable<TEntity> update = _db.Updateable(entity);
-
- if (lstIgnoreColumns != null && lstIgnoreColumns.Count > 0)
- {
- update = update.IgnoreColumns(lstIgnoreColumns.ToArray());
- }
-
- if (lstColumns != null && lstColumns.Count > 0)
- {
- update = update.UpdateColumns(lstColumns.ToArray());
- }
-
- return update.ExecuteCommandHasChange();
- }
-
- /// <summary>
- /// 鏌ヨ鎵�鏈夋暟鎹�
- /// </summary>
- /// <returns></returns>
- public virtual List<TEntity> QueryData()
- {
- return _db.Queryable<TEntity>().ToList();
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="where"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(string where)
- {
- return _db.Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(where), where).ToList();
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression)
- {
- return _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).ToList();
- }
-
- public virtual TEntity QueryFirst(Expression<Func<TEntity, bool>> whereExpression)
- {
- return _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).First();
- }
-
- public virtual TResult QueryFirst<TResult>(Expression<Func<TEntity, bool>> whereExpression, Expression<Func<TEntity, TResult>> expression)
- {
- return _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).Select(expression).First();
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁骞舵帓搴�
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, string orderByFields)
- {
- return _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).ToList();
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁骞舵帓搴�
- /// </summary>
- /// <param name="where"></param>
- /// <param name="orderBy"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(string where, Dictionary<string, OrderByType> orderBy)
- {
- List<OrderByModel> orderByModels = new List<OrderByModel>();
- foreach (var item in orderBy)
- {
- OrderByModel orderByModel = new OrderByModel()
- {
- FieldName = item.Key,
- OrderByType = item.Value
- };
- orderByModels.Add(orderByModel);
- }
- return _db.Queryable<TEntity>().WhereIF(!string.IsNullOrEmpty(where), where).OrderBy(orderByModels).ToList();
- }
-
- /// <summary>
- /// 鏌ヨ鎸囧畾鏁版嵁瀵硅薄
- /// </summary>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="expression"></param>
- /// <returns></returns>
- public virtual List<TResult> QueryData<TResult>(Expression<Func<TEntity, TResult>> expression)
- {
- return _db.Queryable<TEntity>().Select(expression).ToList();
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鎸囧畾鏁版嵁瀵硅薄
- /// </summary>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="expression"></param>
- /// <param name="whereExpression"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual List<TResult> QueryData<TResult>(Expression<Func<TEntity, TResult>> expression, Expression<Func<TEntity, bool>> whereExpression, string orderByFields)
- {
- return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Select(expression).ToList();
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁骞舵帓搴�
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="orderByExpression"></param>
- /// <param name="isAsc"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, Expression<Func<TEntity, object>> orderByExpression, bool isAsc = true)
- {
- return _db.Queryable<TEntity>().OrderByIF(orderByExpression != null, orderByExpression, isAsc ? OrderByType.Asc : OrderByType.Desc).WhereIF(whereExpression != null, whereExpression).ToList();
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁骞舵帓搴�
- /// </summary>
- /// <param name="where"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(string where, string orderByFields)
- {
- return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).ToList();
- }
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="parameters"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryDataBySql(string sql, SugarParameter[] parameters = null)
- {
- return _db.Ado.SqlQuery<TEntity>(sql, parameters);
- }
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="parameters"></param>
- /// <returns></returns>
- public virtual List<dynamic> QueryDynamicDataBySql(string sql, SugarParameter[] parameters = null)
- {
- return _db.Ado.SqlQuery<dynamic>(sql, parameters);
- }
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="parameters"></param>
- /// <returns></returns>
- public virtual List<object> QueryObjectDataBySql(string sql, SugarParameter[] parameters = null)
- {
- return _db.Ado.SqlQuery<object>(sql, parameters);
- }
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鎵ц鎿嶄綔
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="sqlParameters"></param>
- /// <returns></returns>
- public virtual int ExecuteSqlCommand(string sql, params SqlParameter[] sqlParameters)
- {
- return _db.Ado.ExecuteCommand(sql, sqlParameters);
- }
-
- /// <summary>
- /// 鍘熺敓Sql璇彞鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="sql"></param>
- /// <param name="parameters"></param>
- /// <returns></returns>
- public virtual DataTable QueryTable(string sql, SugarParameter[] parameters = null)
- {
- return _db.Ado.GetDataTable(sql, parameters);
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鏁版嵁鎸囧畾鏁伴噺鐨勮
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="top"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, int top, string orderByFields)
- {
- return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(whereExpression != null, whereExpression).Take(top).ToList();
- }
-
- /// <summary>
- /// 鏉′欢鏌ヨ鎸囧畾鏁伴噺鐨勮
- /// </summary>
- /// <param name="where"></param>
- /// <param name="top"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(string where, int top, string orderByFields)
- {
- return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields).WhereIF(!string.IsNullOrEmpty(where), where).Take(top).ToList();
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(Expression<Func<TEntity, bool>> whereExpression, int pageIndex, int pageSize, string orderByFields)
- {
- return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields)
- .WhereIF(whereExpression != null, whereExpression).ToPageList(pageIndex, pageSize);
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="where"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual List<TEntity> QueryData(string where, int pageIndex, int pageSize, string orderByFields)
- {
- return _db.Queryable<TEntity>().OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields)
- .WhereIF(!string.IsNullOrEmpty(where), where).ToPageList(pageIndex, pageSize);
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual PageGridData<TEntity> QueryPage(Expression<Func<TEntity, bool>> whereExpression, int pageIndex, int pageSize, string orderByFields = null)
- {
- int totalCount = 0;
- var list = _db.Queryable<TEntity>()
- .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields)
- .WhereIF(whereExpression != null, whereExpression)
- .ToPageList(pageIndex, pageSize, ref totalCount);
-
- return new PageGridData<TEntity> { Rows = list, Total = totalCount };
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="whereExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderBy"></param>
- /// <returns></returns>
- public virtual PageGridData<TEntity> QueryPage(Expression<Func<TEntity, bool>> whereExpression, int pageIndex, int pageSize, Dictionary<string, OrderByType> orderBy)
- {
- List<OrderByModel> orderByModels = new List<OrderByModel>();
- foreach (var item in orderBy)
- {
- OrderByModel orderByModel = new OrderByModel()
- {
- FieldName = item.Key,
- OrderByType = item.Value
- };
- orderByModels.Add(orderByModel);
- }
- int totalCount = 0;
- List<TEntity> list = _db.Queryable<TEntity>()
- .OrderBy(orderByModels)
- .WhereIF(whereExpression != null, whereExpression)
- .ToPageList(pageIndex, pageSize, ref totalCount);
-
- return new PageGridData<TEntity>(totalCount, list);
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ
- /// </summary>
- /// <param name="where"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual PageGridData<TEntity> QueryPage(string where, int pageIndex, int pageSize, Dictionary<string, OrderByType> orderBy)
- {
- List<OrderByModel> orderByModels = new List<OrderByModel>();
- foreach (var item in orderBy)
- {
- OrderByModel orderByModel = new OrderByModel()
- {
- FieldName = item.Key,
- OrderByType = item.Value
- };
- orderByModels.Add(orderByModel);
- }
- int totalCount = 0;
- List<TEntity> list = _db.Queryable<TEntity>()
- .WhereIF(!string.IsNullOrEmpty(where), where).OrderBy(orderByModels).ToPageList(pageIndex, pageSize, ref totalCount);
-
- return new PageGridData<TEntity>(totalCount, list);
- }
-
- /// <summary>
- /// 涓よ〃鑱旀煡
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <typeparam name="T2"></typeparam>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="joinExpression"></param>
- /// <param name="selectExpression"></param>
- /// <param name="whereExpression"></param>
- /// <returns></returns>
- public virtual List<TResult> QueryTabs<T, T2, TResult>(
- Expression<Func<T, T2, object[]>> joinExpression,
- Expression<Func<T, T2, TResult>> selectExpression,
- Expression<Func<TResult, bool>> whereExpression)
- {
- List<TResult> list = _db.Queryable(joinExpression)
- .Select(selectExpression)
- .WhereIF(whereExpression != null, whereExpression).ToList();
- return list;
- }
-
- /// <summary>
- /// 涓よ〃鑱旀煡-鍒嗛〉
- /// </summary>
- /// <typeparam name="T1"></typeparam>
- /// <typeparam name="T2"></typeparam>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="joinExpression"></param>
- /// <param name="selectExpression"></param>
- /// <param name="whereExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- public virtual PageGridData<TResult> QueryTabsPage<T1, T2, TResult>(Expression<Func<T1, T2, object[]>> joinExpression, Expression<Func<T1, T2, TResult>> selectExpression, Expression<Func<TResult, bool>> whereExpression, int pageIndex, int pageSize, string orderByFields = null)
- {
- int totalCount = 0;
- List<TResult> list = _db.Queryable(joinExpression)
- .Select(selectExpression)
- .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields)
- .WhereIF(whereExpression != null, whereExpression)
- .ToPageList(pageIndex, pageSize, ref totalCount);
- return new PageGridData<TResult>(totalCount, list);
- }
-
- /// <summary>
- /// 涓よ〃鑱斿悎鏌ヨ-鍒嗛〉-鍒嗙粍
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <typeparam name="T2"></typeparam>
- /// <typeparam name="TResult"></typeparam>
- /// <param name="joinExpression"></param>
- /// <param name="selectExpression"></param>
- /// <param name="whereExpression"></param>
- /// <param name="groupExpression"></param>
- /// <param name="pageIndex"></param>
- /// <param name="pageSize"></param>
- /// <param name="orderByFields"></param>
- /// <returns></returns>
- public virtual PageGridData<TResult> QueryTabsPage<T1, T2, TResult>(Expression<Func<T1, T2, object[]>> joinExpression, Expression<Func<T1, T2, TResult>> selectExpression, Expression<Func<TResult, bool>> whereExpression, Expression<Func<T1, object>> groupExpression, int pageIndex, int pageSize, string orderByFields = null)
- {
- int totalCount = 0;
- List<TResult> list = _db.Queryable(joinExpression).GroupBy(groupExpression)
- .Select(selectExpression)
- .OrderByIF(!string.IsNullOrEmpty(orderByFields), orderByFields)
- .WhereIF(whereExpression != null, whereExpression)
- .ToPageList(pageIndex, pageSize, ref totalCount);
- return new PageGridData<TResult>(totalCount, list);
- }
-
- //List<TResult> QueryMuch<T, T2, T3, TResult>(
- // Expression<Func<T, T2, T3, object[]>> joinExpression,
- // Expression<Func<T, T2, T3, TResult>> selectExpression,
- // Expression<Func<T, T2, T3, bool>> whereLambda = null) where T : class, new(){throw new NotImplementedException();}
- //Task<PageModel<TEntity>> QueryPage(PaginationModel pagination){throw new NotImplementedException();}
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/IUnitOfWorkManage.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/IUnitOfWorkManage.cs"
deleted file mode 100644
index 7d715d8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/IUnitOfWorkManage.cs"
+++ /dev/null
@@ -1,25 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.BaseRepository
-{
- public interface IUnitOfWorkManage
- {
- SqlSugarClient GetDbClient();
- int TranCount { get; }
-
- UnitOfWork CreateUnitOfWork();
-
- void BeginTran();
- void BeginTran(MethodInfo method);
- void CommitTran();
- void CommitTran(MethodInfo method);
- void RollbackTran();
- void RollbackTran(MethodInfo method);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/UnitOfWork.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/UnitOfWork.cs"
deleted file mode 100644
index d4ca76b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/UnitOfWork.cs"
+++ /dev/null
@@ -1,55 +0,0 @@
-锘縰sing Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.BaseRepository
-{
- public class UnitOfWork : IDisposable
- {
- public ILogger Logger { get; set; }
- public ISqlSugarClient Db { get; internal set; }
-
- public ITenant Tenant { get; internal set; }
-
- public bool IsTran { get; internal set; }
-
- public bool IsCommit { get; internal set; }
-
- public bool IsClose { get; internal set; }
-
- public void Dispose()
- {
- if (IsTran && !IsCommit)
- {
- Logger.LogDebug("UnitOfWork RollbackTran");
- this.Tenant.RollbackTran();
- }
-
- if (this.Db.Ado.Transaction != null || this.IsClose)
- return;
- this.Db.Close();
- }
-
- public bool Commit()
- {
- if (this.IsTran && !this.IsCommit)
- {
- Logger.LogDebug("UnitOfWork CommitTran");
- this.Tenant.CommitTran();
- this.IsCommit = true;
- }
-
- if (this.Db.Ado.Transaction == null && !this.IsClose)
- {
- this.Db.Close();
- this.IsClose = true;
- }
-
- return this.IsCommit;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/UnitOfWorkManage.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/UnitOfWorkManage.cs"
deleted file mode 100644
index 81607a6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/UnitOfWorks/UnitOfWorkManage.cs"
+++ /dev/null
@@ -1,194 +0,0 @@
-锘縰sing Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.BaseRepository
-{
- public class UnitOfWorkManage : IUnitOfWorkManage
- {
- private readonly ILogger<UnitOfWorkManage> _logger;
- private readonly ISqlSugarClient _sqlSugarClient;
-
- private int _tranCount { get; set; }
- public int TranCount => _tranCount;
- public readonly ConcurrentStack<string> TranStack = new();
-
- public UnitOfWorkManage(ISqlSugarClient sqlSugarClient, ILogger<UnitOfWorkManage> logger)
- {
- _sqlSugarClient = sqlSugarClient;
- _logger = logger;
- _tranCount = 0;
- }
-
- /// <summary>
- /// 鑾峰彇DB锛屼繚璇佸敮涓�鎬�
- /// </summary>
- /// <returns></returns>
- public SqlSugarClient GetDbClient()
- {
- // 蹇呴』瑕乤s锛屽悗杈逛細鐢ㄥ埌鍒囨崲鏁版嵁搴撴搷浣�
- return _sqlSugarClient as SqlSugarClient;
- }
-
-
- public UnitOfWork CreateUnitOfWork()
- {
- UnitOfWork uow = new UnitOfWork();
- uow.Logger = _logger;
- uow.Db = _sqlSugarClient;
- uow.Tenant = (ITenant)_sqlSugarClient;
- uow.IsTran = true;
-
- uow.Db.Open();
- uow.Tenant.BeginTran();
-
- _logger.LogDebug("UnitOfWork Begin");
- return uow;
- }
-
- public void BeginTran()
- {
- lock (this)
- {
- _tranCount++;
- GetDbClient().BeginTran();
- }
- }
-
- public void BeginTran(MethodInfo method)
- {
- lock (this)
- {
- GetDbClient().BeginTran();
- TranStack.Push(method.GetFullName());
- _tranCount = TranStack.Count;
- }
- }
-
- public WebResponseContent BeginTran(Func<WebResponseContent> func)
- {
- lock (this)
- {
- BeginTran();
- try
- {
- WebResponseContent content = func();
- if (content.Status)
- {
- CommitTran();
- }
- else
- {
- RollbackTran();
- }
- return content;
- }
- catch(Exception ex)
- {
- RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- }
-
- public void CommitTran()
- {
- lock (this)
- {
- _tranCount--;
- if (_tranCount == 0)
- {
- try
- {
- GetDbClient().CommitTran();
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- GetDbClient().RollbackTran();
- }
- }
- }
- }
-
- public void CommitTran(MethodInfo method)
- {
- lock (this)
- {
- string result = "";
- while (!TranStack.IsEmpty && !TranStack.TryPeek(out result))
- {
- Thread.Sleep(1);
- }
-
-
- if (result == method.GetFullName())
- {
- try
- {
- GetDbClient().CommitTran();
-
- _logger.LogDebug($"Commit Transaction");
- Console.WriteLine($"Commit Transaction");
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- GetDbClient().RollbackTran();
- _logger.LogDebug($"Commit Error , Rollback Transaction");
- }
- finally
- {
- while (!TranStack.TryPop(out _))
- {
- Thread.Sleep(1);
- }
-
- _tranCount = TranStack.Count;
- }
- }
- }
- }
-
- public void RollbackTran()
- {
- lock (this)
- {
- _tranCount--;
- GetDbClient().RollbackTran();
- }
- }
-
- public void RollbackTran(MethodInfo method)
- {
- lock (this)
- {
- string result = "";
- while (!TranStack.IsEmpty && !TranStack.TryPeek(out result))
- {
- Thread.Sleep(1);
- }
-
- if (result == method.GetFullName())
- {
- GetDbClient().RollbackTran();
- _logger.LogDebug($"Rollback Transaction");
- Console.WriteLine($"Rollback Transaction");
- while (!TranStack.TryPop(out _))
- {
- Thread.Sleep(1);
- }
-
- _tranCount = TranStack.Count;
- }
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/IService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/IService.cs"
deleted file mode 100644
index 55fd30c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/IService.cs"
+++ /dev/null
@@ -1,121 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.BaseServices
-{
- public interface IService<TEntity> : IDependency where TEntity : class
- {
- ISqlSugarClient Db { get; }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ鏁版嵁
- /// </summary>
- /// <param name="options"></param>
- /// <returns></returns>
- PageGridData<TEntity> GetPageData(PageDataOptions options);
-
- object GetDetailPage(PageDataOptions pageData);
-
- /// <summary>
- /// 娣诲姞鏁版嵁
- /// </summary>
- /// <param name="entity">鍗曚釜瀹炰綋</param>
- /// <returns></returns>
- WebResponseContent AddData(TEntity entity);
-
- /// <summary>
- /// 娣诲姞鏁版嵁
- /// </summary>
- /// <param name="entities">瀹炰綋闆嗗悎</param>
- /// <returns></returns>
- WebResponseContent AddData(List<TEntity> entities);
-
- /// <summary>
- /// 娣诲姞鏁版嵁
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- WebResponseContent AddData(SaveModel saveModel);
-
- /// <summary>
- /// 淇敼鏁版嵁
- /// </summary>
- /// <param name="entity">鍗曚釜瀹炰綋</param>
- /// <returns></returns>
- WebResponseContent UpdateData(TEntity entity);
-
- /// <summary>
- /// 淇敼鏁版嵁
- /// </summary>
- /// <param name="entities">瀹炰綋闆嗗悎</param>
- /// <returns></returns>
- WebResponseContent UpdateData(List<TEntity> entities);
-
- /// <summary>
- /// 淇敼鏁版嵁
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- WebResponseContent UpdateData(SaveModel saveModel);
-
- /// <summary>
- /// 鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="key">涓婚敭</param>
- /// <returns></returns>
- WebResponseContent DeleteData(object key);
-
- /// <summary>
- /// 鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="keys">涓婚敭鏁扮粍</param>
- /// <returns></returns>
- WebResponseContent DeleteData(object[] keys);
-
- /// <summary>
- /// 鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="entity">鍗曚釜瀹炰綋</param>
- /// <returns></returns>
- WebResponseContent DeleteData(TEntity entity);
-
- /// <summary>
- /// 鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="entities">瀹炰綋闆嗗悎</param>
- /// <returns></returns>
- WebResponseContent DeleteData(List<TEntity> entities);
-
- /// <summary>
- /// 瀵煎嚭鏁版嵁
- /// </summary>
- /// <param name="pageData"></param>
- /// <returns></returns>
- WebResponseContent Export(PageDataOptions pageData);
-
- /// <summary>
- /// 瀵煎叆鏁版嵁
- /// </summary>
- /// <param name="files"></param>
- /// <returns></returns>
- WebResponseContent Import(List<IFormFile> files);
-
- /// <summary>
- /// 涓婁紶鏂囦欢
- /// </summary>
- /// <param name="files"></param>
- /// <returns></returns>
- WebResponseContent Upload(List<IFormFile> files);
-
- /// <summary>
- /// 妯℃澘涓嬭浇
- /// </summary>
- /// <returns></returns>
- WebResponseContent DownLoadTemplate();
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs"
deleted file mode 100644
index 88fae6b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs"
+++ /dev/null
@@ -1,555 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Core.Models;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
-using SqlSugar;
-using System.Drawing.Drawing2D;
-using System.Dynamic;
-using System.Linq.Expressions;
-using System.Reflection;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Utilities;
-
-namespace WIDESEA_Core.BaseServices
-{
- public class ServiceBase<TEntity, TRepository> : ServiceFunFilter<TEntity>, IService<TEntity>
- where TEntity : class, new()
- where TRepository : IRepository<TEntity>
-
- {
- public ServiceBase(TRepository BaseDal)
- {
- this.BaseDal = BaseDal;
- }
-
- public TRepository BaseDal { get; set; } //閫氳繃鍦ㄥ瓙绫荤殑鏋勯�犲嚱鏁颁腑娉ㄥ叆锛岃繖閲屾槸鍩虹被锛屼笉鐢ㄦ瀯閫犲嚱鏁�
-
- public ISqlSugarClient Db => BaseDal.Db;
-
- private PropertyInfo[] _propertyInfo { get; set; } = null;
- private PropertyInfo[] TProperties
- {
- get
- {
- if (_propertyInfo != null)
- {
- return _propertyInfo;
- }
- _propertyInfo = typeof(TEntity).GetProperties();
- return _propertyInfo;
- }
- }
-
- public virtual PageGridData<TEntity> GetPageData(PageDataOptions options)
- {
- string wheres = ValidatePageOptions(options);
- //鑾峰彇鎺掑簭瀛楁
- Dictionary<string, OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
-
- PageGridData<TEntity> pageGridData = new PageGridData<TEntity>();
- //if (QueryRelativeExpression != null)
- //{
- // queryable = QueryRelativeExpression.Invoke(queryable);
- //}
- //if (options.Export)
- //{
- // queryable = queryable.GetIQueryableOrderBy(orderbyDic);
- // if (Limit > 0)
- // {
- // queryable = queryable.Take(Limit);
- // }
- // pageGridData.rows = queryable.ToList();
- //}
- //else
- //{
- // pageGridData.rows = repository.IQueryablePage(queryable,
- // options.Page,
- // options.Rows,
- // out int rowCount,
- // orderbyDic).ToList();
- // pageGridData.total = rowCount;
- // //鏌ヨ鐣岄潰缁熻姹傜瓑瀛楁
- // if (SummaryExpress != null)
- // {
- // pageGridData.summary = SummaryExpress.Invoke(queryable);
- // //Func<T, T> groupExpress = x =>x;
- // //pageGridData.summary = queryable.GroupBy(groupExpress).Select(SummaryExpress).FirstOrDefault();
- // }
- //}
- //GetPageDataOnExecuted?.Invoke(pageGridData);
-
- pageGridData = BaseDal.QueryPage(wheres, options.Page, options.Rows, orderbyDic);
-
- return pageGridData;
- }
-
-
- protected string ValidatePageOptions(PageDataOptions options)
- {
- options = options ?? new PageDataOptions();
- string where = "";
- List<SearchParameters> searchParametersList = new List<SearchParameters>();
- if (options.Filter != null && options.Filter.Count > 0)
- {
- searchParametersList.AddRange(options.Filter);
- }
- else if (!string.IsNullOrEmpty(options.Wheres))
- {
- try
- {
- searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
- options.Filter = searchParametersList;
- }
- catch { }
- }
- QueryRelativeList?.Invoke(searchParametersList);
-
- for (int i = 0; i < searchParametersList.Count; i++)
- {
- if (string.IsNullOrEmpty(searchParametersList[i].Value))
- {
- continue;
- }
-
- PropertyInfo property = TProperties.Where(c => c.Name.ToUpper() == searchParametersList[i].Name.ToUpper()).FirstOrDefault();
-
- if (property == null) continue;
-
- (bool, string, object) result = property.ValidationVal(searchParametersList[i].Value.Split(','));
- if (result.Item1)
- {
- continue;
- }
-
- LinqExpressionType expressionType = searchParametersList[i].DisplayType.GetLinqCondition();
- if (expressionType == LinqExpressionType.Equal)
- {
- if (string.IsNullOrEmpty(where))
- where += $"{searchParametersList[i].Name} = '{searchParametersList[i].Value}'";
- else
- where += $" and {searchParametersList[i].Name} = '{searchParametersList[i].Value}'";
- }
- else
- {
- if (string.IsNullOrEmpty(where))
- where += $"{searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'";
- else
- where += $" and {searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'";
- }
- }
- return where;
- }
-
- /// <summary>
- /// 鑾峰彇鎺掑簭瀛楁
- /// </summary>
- /// <param name="pageData"></param>
- /// <param name="propertyInfo"></param>
- /// <returns></returns>
- private Dictionary<string, OrderByType> GetPageDataSort(PageDataOptions pageData, PropertyInfo[] propertyInfo)
- {
- if (!string.IsNullOrEmpty(pageData.Sort))
- {
- if (pageData.Sort.Contains(","))
- {
- List<string> sortArr = pageData.Sort.Split(",").Where(x => propertyInfo.Any(p => p.Name == x)).ToList();
- Dictionary<string, OrderByType> sortDic = new Dictionary<string, OrderByType>();
- foreach (var item in sortArr)
- {
- sortDic[item] = pageData.Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc;
- }
- return sortDic;
- }
- else if (propertyInfo.Any(x => x.Name == pageData.Sort))
- {
- return new Dictionary<string, OrderByType> {
- {
- pageData.Sort,pageData.Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc
- } };
- }
- }
- return new Dictionary<string, OrderByType> { { "CreateDate", pageData.Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc } };
- }
-
- public virtual object GetDetailPage(PageDataOptions pageData)
- {
- Type t = typeof(TEntity);
-
- if (pageData.Value == null) return new PageGridData<object>(total: 0, null);
- string keyName = t.GetKeyName();
- ////鐢熸垚鏌ヨ鏉′欢
- //Expression<Func<TEntity, bool>> whereExpression = keyName.CreateExpression<TEntity>(pageData.Value, LinqExpressionType.Equal);
- int totalCount = 0;
- PropertyInfo propertyInfo = t.GetProperties().FirstOrDefault(x => x.GetCustomAttribute<Navigate>() != null);
- if (propertyInfo != null)
- {
- Type detailType = propertyInfo.PropertyType.GetGenericArguments()[0];
- List<ExpandoObject> list = BaseDal.Db.Queryable(detailType.Name, "detail").Where(keyName, "=", pageData.Value).ToPageList(pageData.Page, pageData.Rows, ref totalCount);
- return new PageGridData<ExpandoObject>(totalCount, list);
- }
- return new PageGridData<object>(total: 0, null);
- }
-
- /// <summary>
- /// 娣诲姞鏁版嵁
- /// </summary>
- /// <param name="entity">鍗曚釜瀹炰綋</param>
- /// <returns></returns>
- public virtual WebResponseContent AddData(TEntity entity)
- {
- try
- {
- return BaseDal.AddData(entity) > 0 ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 娣诲姞鏁版嵁
- /// </summary>
- /// <param name="entities">瀹炰綋闆嗗悎</param>
- /// <returns></returns>
- public virtual WebResponseContent AddData(List<TEntity> entities)
- {
- try
- {
- return BaseDal.AddData(entities) > 0 ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 娣诲姞鏁版嵁
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- public virtual WebResponseContent AddData(SaveModel saveModel)
- {
- try
- {
- if (saveModel == null || saveModel.MainData == null || saveModel.MainData.Count == 0)//鍒ゆ柇鍙傛暟鏄惁浼犲叆
- {
- return WebResponseContent.Instance.Error("浼犲弬閿欒,鍙傛暟涓嶈兘涓虹┖");
- }
- //string validResult = typeof(TEntity).ValidateDicInEntity(saveModel.MainData, true, TProperties);
-
- //if (!string.IsNullOrEmpty(validResult))
- //{
- // return WebResponseContent.Instance.Error(validResult);
- //}
-
- PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
- if (keyPro == null)
- {
- return WebResponseContent.Instance.Error("璇峰厛璁剧疆涓婚敭");
- }
- if (keyPro.PropertyType == typeof(Guid))
- {
- saveModel.MainData.Add(keyPro.Name, Guid.NewGuid());
- }
- else if (keyPro.PropertyType == typeof(int) || keyPro.PropertyType == typeof(long))
- {
- SugarColumn sugarColumn = keyPro.GetCustomAttribute<SugarColumn>();
- if (sugarColumn.IsIdentity)
- {
- saveModel.MainData.Remove(keyPro.Name);
- }
- }
-
- TEntity entity = saveModel.MainData.DicToModel<TEntity>();
-
- BaseDal.AddData(entity);
-
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 淇敼鏁版嵁
- /// </summary>
- /// <param name="entity">鍗曚釜瀹炰綋</param>
- /// <returns></returns>
- public virtual WebResponseContent UpdateData(TEntity entity)
- {
- try
- {
- return BaseDal.UpdateData(entity) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 淇敼鏁版嵁
- /// </summary>
- /// <param name="entities">瀹炰綋闆嗗悎</param>
- /// <returns></returns>
- public virtual WebResponseContent UpdateData(List<TEntity> entities)
- {
- try
- {
- return BaseDal.UpdateData(entities) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 淇敼鏁版嵁
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- public virtual WebResponseContent UpdateData(SaveModel saveModel)
- {
- try
- {
- List<string> list = UpdateIgnoreColOnExecute?.Invoke(saveModel);
- if (saveModel == null || saveModel.MainData == null || saveModel.MainData.Count == 0)//鍒ゆ柇鍙傛暟鏄惁浼犲叆
- {
- return WebResponseContent.Instance.Error("浼犲弬閿欒,鍙傛暟涓嶈兘涓虹┖");
- }
- //string validResult = typeof(TEntity).ValidateDicInEntity(saveModel.MainData, false, TProperties, list.ToArray());
-
- //if (!string.IsNullOrEmpty(validResult))
- //{
- // return WebResponseContent.Instance.Error(validResult);
- //}
-
- //PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
- //if (keyPro == null)
- //{
- // return WebResponseContent.Instance.Error("璇峰厛璁剧疆涓婚敭");
- //}
-
- TEntity entity = saveModel.MainData.DicToModel<TEntity>();
-
- List<string> listCol = new List<string>();
- foreach (var item in saveModel.MainData)
- {
- PropertyInfo propertyInfo = typeof(TEntity).GetProperty(item.Key);
- if (propertyInfo == null)
- {
- propertyInfo = typeof(TEntity).GetProperty(item.Key.FirstLetterToLower());
- if (propertyInfo == null)
- {
- propertyInfo = typeof(TEntity).GetProperty(item.Key.FirstLetterToUpper());
- }
- }
-
- listCol.Add(propertyInfo?.Name);
- }
- if (list != null)
- listCol = listCol.Where(x => !list.Contains(x)).ToList();
- bool result = BaseDal.UpdateData(entity, listCol, list);
-
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="key">涓婚敭</param>
- /// <returns></returns>
- public virtual WebResponseContent DeleteData(object key)
- {
- try
- {
- return BaseDal.DeleteDataById(key) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="keys">涓婚敭鏁扮粍</param>
- /// <returns></returns>
- public virtual WebResponseContent DeleteData(object[] keys)
- {
- try
- {
- return BaseDal.DeleteDataByIds(keys) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="entity">鍗曚釜瀹炰綋</param>
- /// <returns></returns>
- public virtual WebResponseContent DeleteData(TEntity entity)
- {
- try
- {
- return BaseDal.DeleteData(entity) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鍒犻櫎鏁版嵁
- /// </summary>
- /// <param name="entities">瀹炰綋闆嗗悎</param>
- /// <returns></returns>
- public virtual WebResponseContent DeleteData(List<TEntity> entities)
- {
- try
- {
- return BaseDal.DeleteData(entities) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 瀵煎嚭鏁版嵁
- /// </summary>
- /// <param name="pageData"></param>
- /// <returns></returns>
- public virtual WebResponseContent Export(PageDataOptions options)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Type t = typeof(TEntity);
-
- string savePath = AppDomain.CurrentDomain.BaseDirectory + $"ExcelExport";
- IExporter exporter = new ExcelExporter();
- string wheres = ValidatePageOptions(options);
- //鑾峰彇鎺掑簭瀛楁
- Dictionary<string, OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
-
- List<TEntity> entities = BaseDal.QueryData(wheres, orderbyDic);
-
- byte[] data = exporter.ExportAsByteArray(entities).Result;
-
- string fileName = "";
- SugarTable sugarTable = t.GetCustomAttribute<SugarTable>();
- if (sugarTable != null)
- {
- fileName = sugarTable.TableDescription + ".xlsx";
- }
- else
- {
- fileName = nameof(TEntity) + ".xlsx";
- }
-
- FileHelper.WriteFile(savePath, fileName, data);
-
- content = WebResponseContent.Instance.OK(data: savePath + "\\" + fileName);
- }
- catch (Exception ex)
- {
- content = WebResponseContent.Instance.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 瀵煎叆鏁版嵁
- /// </summary>
- /// <param name="files"></param>
- /// <returns></returns>
- public virtual WebResponseContent Import(List<IFormFile> files)
- {
- try
- {
- if (files == null || files.Count == 0)
- return new WebResponseContent { Status = true, Message = "璇烽�夋嫨涓婁紶鐨勬枃浠�" };
- Microsoft.AspNetCore.Http.IFormFile formFile = files[0];
- string dicPath = AppDomain.CurrentDomain.BaseDirectory + $"ExcelImprot/{DateTime.Now.ToString("yyyMMdd")}/{typeof(TEntity).Name}/";
- if (!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
- string fileName = $"{Guid.NewGuid()}_{formFile.FileName}";
- dicPath = $"{dicPath}{fileName}";
- using (FileStream stream = new FileStream(dicPath, FileMode.Create))
- {
- formFile.CopyTo(stream);
- }
- ExcelImporter importer = new ExcelImporter();
- ImportResult<TEntity> importResult = importer.Import<TEntity>(dicPath, "").Result;
- if (importResult.HasError)
- {
- return WebResponseContent.Instance.Error(importResult.TemplateErrors.Serialize());
- }
- BaseDal.AddData(importResult.Data.ToList());
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 涓婁紶鏂囦欢
- /// </summary>
- /// <param name="files"></param>
- /// <returns></returns>
- public virtual WebResponseContent Upload(List<IFormFile> files)
- {
- throw new NotImplementedException();
- }
-
- /// <summary>
- /// 妯℃澘涓嬭浇
- /// </summary>
- /// <returns></returns>
- public virtual WebResponseContent DownLoadTemplate()
- {
- WebResponseContent content = new WebResponseContent();
- Type t = typeof(TEntity);
- IExporter exporter = new ExcelExporter();
- byte[] data = exporter.ExportHeaderAsByteArray(new TEntity()).Result;
- string fileName = "";
- SugarTable sugarTable = t.GetCustomAttribute<SugarTable>();
- if (sugarTable != null)
- {
- fileName = sugarTable.TableDescription + "瀵煎叆妯℃澘.xlsx";
- }
- else
- {
- fileName = nameof(TEntity) + "瀵煎叆妯℃澘.xlsx";
- }
- string savePath = AppDomain.CurrentDomain.BaseDirectory + $"ExcelImprotTemplate";
- FileHelper.WriteFile(savePath, fileName, data);
-
- content = WebResponseContent.Instance.OK(data: savePath + "\\" + fileName);
- return content;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceFunFilter.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceFunFilter.cs"
deleted file mode 100644
index 441cd3d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceFunFilter.cs"
+++ /dev/null
@@ -1,234 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.BaseServices
-{
- public abstract class ServiceFunFilter<T> where T : class
- {
- /// <summary>
- /// 2020.08.15鏄惁寮�鍚绉熸埛鍔熻兘
- /// 浣跨敤鏂规硶瑙佹枃妗ｆ垨SellOrderService.cs
- /// </summary>
- protected bool IsMultiTenancy { get; set; }
-
- /// <summary>
- /// 鏌ヨ鐣岄潰table 缁熻銆佹眰鍜屻�佸钩鍧囧�肩瓑
- /// 瀹炵幇鏂瑰紡
- ///SummaryExpress = (IQueryable<App_TransactionAvgPrice> queryable) =>
- // {
- // return queryable.GroupBy(x => 1).Select(x => new
- // {
- // AvgPrice = x.Average(o => o.AvgPrice),
- // Enable = x.Sum(o => o.Enable)
- // }).FirstOrDefault();
- //};
- /// </summary>
- // protected Func<IGrouping<T, T>, object> SummaryExpress = null;
- protected Func<IQueryable<T>, object> SummaryExpress = null;
-
- /// <summary>
- /// 鏄庣粏table 缁熻銆佹眰鍜屻�佸钩鍧囧�肩瓑
- /// </summary>
- /// <typeparam name="Detail"></typeparam>
- /// <param name="queryeable"></param>
- /// <returns></returns>
- //protected abstract object GetDetailSummary<Detail>(IQueryable<Detail> queryeable);
-
- /// <summary>
- /// 鏄惁寮�鍚敤鎴锋暟鎹潈闄�,true=鐢ㄦ埛鍙兘鎿嶄綔鑷繁(鍙婁笅绾ц鑹�)鍒涘缓鐨勬暟鎹�,濡�:鏌ヨ銆佸垹闄ゃ�佷慨鏀圭瓑鎿嶄綔
- /// 娉ㄦ剰锛氶渶瑕佸湪浠ｇ爜鐢熸垚鍣ㄧ晫闈㈤�夋嫨銆愭槸銆戝強鐢熸垚Model鎵嶄細鐢熸晥)
- /// </summary>
- protected bool LimitCurrentUserPermission { get; set; } = false;
-
- ///榛樿瀵煎嚭鏈�澶ц〃鏁伴噺锛�0涓嶉檺鍒�
- protected int Limit { get; set; } = 0;
-
- /// <summary>
- /// 榛樿涓婁紶鏂囦欢澶у皬闄愬埗3M
- /// </summary>
- protected int LimitUpFileSizee { get; set; } = 3;
-
-
- /// <summary>
- /// 2020.08.15娣诲姞鑷畾涔夊師鐢熸煡璇ql,杩欎釜瀵逛簬涓嶆兂鍐欒〃杈惧紡鍏宠仈鎴栬�呭鏉傛煡璇㈤潪甯告湁鐢�
- /// 渚嬶細QuerySql=$"select * from tb1 as a where a.name='xxxx' x.id in (select b.id from tb2 b)";
- /// select * 杩欓噷鍙互鑷畾涔夛紝浣唖elect 蹇呴』杩斿洖琛ㄦ墍鏈夌殑鍒楋紝涓嶈兘灏�
- /// </summary>
- protected string QuerySql = null;
-
- /// <summary>
- /// 鏌ヨ鍓�,瀵圭幇鍦ㄦ湁鐨勬煡璇㈠瓧绗︿覆鏉′欢澧炲姞鎴栧垹闄�
- /// </summary>
- protected Action<List<SearchParameters>> QueryRelativeList { get; set; }
-
- //鏌ヨ鍓�,鍦ㄧ幇鏈夌殑鏌ヨ鏉′欢涓婇�氳繃琛ㄨ揪寮忎慨鏀规煡璇㈡潯浠�
- protected Func<IQueryable<T>, IQueryable<T>> QueryRelativeExpression { get; set; }
-
-
- /// <summary>
- /// 鎸囧畾鏌ヨ鐨勫垪锛屾牸寮�:Expression<Func<T, object>> exp = x => new { x.瀛楁1, x.瀛楁2 }(鏆傛椂鏈惎鐢�)
- /// </summary>
- protected Expression<Func<T, object>> Columns { get; set; }
-
- /// <summary>
- /// 璁剧疆鏌ヨ鎺掑簭鍙傛暟鍙婃柟寮�,鍙傛暟鏍煎紡涓猴細
- /// Expression<Func<T, Dictionary<object, bool>>> orderBy = x => new Dictionary<object, QueryOrderBy>()
- /// {{ x.ID, QueryOrderBy.Asc },{ x.DestWarehouseName, QueryOrderBy.Desc } };
- /// 杩斿洖鐨勬槸new Dictionary<object, bool>(){{}}key涓烘帓搴忓瓧娈碉紝QueryOrderBy涓烘帓搴忔柟寮�
- /// </summary>
- protected Expression<Func<T, Dictionary<object, OrderByType>>> OrderByExpression;
-
- /// <summary>
- /// 璁剧疆鏌ヨ鐨勮〃鍚�(宸插純鐢�)
- /// </summary>
- protected string TableName { get; set; }
-
- /// <summary>
- /// 椤甸潰鏌ヨ鎴栧鍑猴紝浠庢暟鎹簱鏌ヨ鍑烘潵鐨勭粨鏋�
- /// </summary>
- protected Action<PageGridData<T>> GetPageDataOnExecuted;
-
- /// <summary>
- /// 璋冪敤鏂板缓澶勭悊鍓�(SaveModel涓轰紶鍏ョ殑鍘熺敓鏁版嵁)
- /// </summary>
- protected Func<SaveModel, WebResponseContent> AddOnExecute;
-
- /// <summary>
- /// 璋冪敤鏂板缓淇濆瓨鏁版嵁搴撳墠澶勭悊(宸插皢鎻愪氦鐨勫師鐢熸暟鎹浆鎹㈡垚浜嗗璞�)
- /// Func<T, object,ResponseData> T涓轰富琛ㄦ暟鎹紝object涓烘槑缁嗘暟鎹�(濡傛灉闇�瑕佷娇鐢ㄦ槑缁嗗璞�,璇风敤 object as List<T>杞崲)
- /// </summary>
- protected Func<T, object, WebResponseContent> AddOnExecuting;
-
- /// <summary>
- /// 璋冪敤鏂板缓淇濆瓨鏁版嵁搴撳悗澶勭悊銆�
- /// **瀹炵幇褰撳墠鏂规硶鏃讹紝鍐呴儴榛樿宸茬粡寮�鍚簨鍔★紝濡傛灉瀹炵幇鐨勬柟娉曟搷浣滅殑鏄悓涓�鏁版嵁搴�,鍒欎笉闇�瑕佸湪AddOnExecuted涓簨鍔�
- /// Func<T, object,ResponseData> T涓轰富琛ㄦ暟鎹紝object涓烘槑缁嗘暟鎹�(濡傛灉闇�瑕佷娇鐢ㄦ槑缁嗗璞�,璇风敤 object as List<T>杞崲)
- /// 姝ゅ宸插紑鍚簡DbContext浜嬪姟(閲嶇偣),濡傛灉杩樻湁鍏朵粬涓氬姟澶勪簨锛岀洿鎺ュ湪杩欓噷鍐橢F浠ｇ爜,涓嶉渶瑕佸啀寮�鍚簨鍔�
- /// 濡傛灉鎵ц鐨勬槸鎵嬪啓sql璇风敤repository.DbContext.Database.ExecuteSqlCommand()鎴� repository.DbContext.Set<T>().FromSql鎵ц鍏蜂綋sql璇彞
- /// </summary>
- protected Func<T, object, WebResponseContent> AddOnExecuted;
-
- /// <summary>
- /// 杩涘叆瀹℃壒娴佺▼鏂规硶涔嬪墠
- /// </summary>
- protected Func<T, bool> AddWorkFlowExecuting;
-
- /// <summary>
- /// 鍐欏叆瀹℃壒娴佺▼鏁版嵁涔嬪悗
- /// list:瀹℃壒鐨勪汉id
- /// </summary>
- protected Action<T, List<int>> AddWorkFlowExecuted;
-
- /// <summary>
- /// 璋冪敤鏇存柊鏂规硶鍓嶅鐞�(SaveModel涓轰紶鍏ョ殑鍘熺敓鏁版嵁)
- /// </summary>
- protected Func<SaveModel, WebResponseContent> UpdateOnExecute;
-
- /// <summary>
- /// 璋冪敤鏇存柊鏂规硶鍓嶅鐞�(SaveModel涓轰紶鍏ョ殑鍘熺敓鏁版嵁)
- /// </summary>
- protected Func<SaveModel, List<string>> UpdateIgnoreColOnExecute;
-
- /// <summary>
- /// 璋冪敤鏇存柊鏂规硶淇濆瓨鏁版嵁搴撳墠澶勭悊
- /// (宸插皢鎻愪氦鐨勫師鐢熸暟鎹浆鎹㈡垚浜嗗璞�,灏嗘槑缁嗘柊澧炪�佷慨鏀广�佸垹闄ょ殑鏁版嵁鍒嗗埆鐢╫bject1/2/3鏍囪瘑鍑烘潵 )
- /// T=鏇存柊鐨勪富琛ㄥ璞�
- /// object1=涓烘柊澧炴槑缁嗙殑瀵硅薄锛屼娇鐢ㄦ椂灏唎bject as List<T>杞崲涓�涓�
- /// object2=涓烘洿鏂版槑缁嗙殑瀵硅薄
- /// List<object>=涓哄垹闄ょ殑缁嗙殑瀵硅薄Key
- /// </summary>
- protected Func<T, object, object, List<object>, WebResponseContent> UpdateOnExecuting;
-
- /// <summary>
- /// 璋冪敤鏇存柊鏂规硶淇濆瓨鏁版嵁搴撳悗澶勭悊
- /// **瀹炵幇褰撳墠鏂规硶鏃讹紝鍐呴儴榛樿宸茬粡寮�鍚簨鍔★紝濡傛灉瀹炵幇鐨勬柟娉曟搷浣滅殑鏄悓涓�鏁版嵁搴�,鍒欎笉闇�瑕佸湪UpdateOnExecuted涓簨鍔�
- /// (宸插皢鎻愪氦鐨勫師鐢熸暟鎹浆鎹㈡垚浜嗗璞�,灏嗘槑缁嗘柊澧炪�佷慨鏀广�佸垹闄ょ殑鏁版嵁鍒嗗埆鐢╫bject1/2/3鏍囪瘑鍑烘潵 )
- /// T=鏇存柊鐨勪富琛ㄥ璞�
- /// object1=涓烘柊澧炴槑缁嗙殑瀵硅薄锛屼娇鐢ㄦ椂灏唎bject as List<T>杞崲涓�涓�
- /// object2=涓烘洿鏂版槑缁嗙殑瀵硅薄
- /// List<object>=涓哄垹闄ょ殑缁嗙殑瀵硅薄Key
- /// 姝ゅ宸插紑鍚簡DbContext浜嬪姟(閲嶇偣),濡傛灉杩樻湁鍏朵粬涓氬姟澶勪簨锛岀洿鎺ュ湪杩欓噷鍐橢F浠ｇ爜,涓嶉渶瑕佸啀寮�鍚簨鍔�
- /// 濡傛灉鎵ц鐨勬槸鎵嬪啓sql璇风敤repository.DbContext.Database.ExecuteSqlCommand()鎴� repository.DbContext.Set<T>().FromSql鎵ц鍏蜂綋sql璇彞
- /// </summary>
- protected Func<T, object, object, List<object>, WebResponseContent> UpdateOnExecuted;
-
- /// <summary>
- /// 鍒犻櫎鍓嶅鐞�,object[]鍑嗗鍒犻櫎鐨勪富閿�
- /// </summary>
- protected Func<object[], WebResponseContent> DelOnExecuting;
-
- /// <summary>
- /// 鍒犻櫎鍚庡鐞�,object[]宸插垹闄ょ殑涓婚敭,姝ゅ宸插紑鍚簡DbContext浜嬪姟(閲嶇偣),濡傛灉杩樻湁鍏朵粬涓氬姟澶勪簨锛岀洿鎺ュ湪杩欓噷鍐橢F浠ｇ爜,涓嶉渶瑕佸啀寮�鍚簨鍔�
- /// 濡傛灉鎵ц鐨勬槸鎵嬪啓sql璇风敤repository.DbContext.Database.ExecuteSqlCommand()鎴� repository.DbContext.Set<T>().FromSql鎵ц鍏蜂綋sql璇彞
- /// </summary>
- protected Func<object[], WebResponseContent> DelOnExecuted;
-
- /// <summary>
- /// 瀹℃牳鍓嶅鐞�
- /// </summary>
- protected Func<List<T>, WebResponseContent> AuditOnExecuting;
- /// <summary>
- /// 瀹℃牳鍚庡鐞�
- /// </summary>
- protected Func<List<T>, WebResponseContent> AuditOnExecuted;
-
-
- /// <summary>
- ///瀵煎嚭鍓嶅鐞�,DataTable瀵煎嚭鐨勮〃鏁版嵁
- ///List<T>瀵煎嚭鐨勬暟鎹�, List<string>蹇界暐涓嶉渶瑕佸鍑虹殑瀛楁
- ///姝ゆ柟娉曚笉寤鸿浣跨敤,鐢变笅闈xportColumns濮旀墭鏇夸唬2020.05.07
- /// </summary>
- protected Func<List<T>, List<string>, WebResponseContent> ExportOnExecuting;
-
- /// <summary>
- /// 2020.05.07
- /// 瀵煎嚭琛ㄦ暟鎹�(鐣岄潰涓婂鍑烘搷浣�),鎸囧畾瑕佸鍑虹殑鍒楋紝鏍煎紡:Expression<Func<T, object>> exp = x => new { x.瀛楁1, x.瀛楁2 }
- /// </summary>
- protected Expression<Func<T, object>> ExportColumns { get; set; }
-
-
- /// <summary>
- /// 2020.05.07
- /// 瀵煎嚭涓嬭浇妯℃澘锛屾寚瀹氳瀵煎嚭鐨勬ā鏉垮垪锛屾牸寮�:Expression<Func<T, object>> exp = x => new { x.瀛楁1, x.瀛楁2 }
- /// </summary>
- protected Expression<Func<T, object>> DownLoadTemplateColumns { get; set; }
-
-
- /// <summary>
- /// 瀵煎叆淇濆瓨鍚�
- /// </summary>
- protected Func<List<T>, WebResponseContent> ImportOnExecuted;
-
- /// <summary>
- /// 瀵煎叆淇濆瓨鍓�
- /// </summary>
- protected Func<List<T>, WebResponseContent> ImportOnExecuting;
-
- /// <summary>
- /// 瀵煎叆鏃朵笉楠岃瘉涓嬫媺妗嗘暟鎹簮鐨勫瓧娈靛��2023.05.03
- /// </summary>
- protected Expression<Func<T, object>> ImportIgnoreSelectValidationColumns;
-
- /// <summary>
- /// 2022.06.20澧炲姞鍘熺敓excel璇诲彇鏂规硶(瀵煎叆鏃跺彲浠ヨ嚜瀹氫箟璇诲彇excel鍐呭)
- /// string=褰撳墠璇诲彇鐨別xcel鍗曞厓鏍肩殑鍊�
- /// ExcelWorksheet=excel瀵硅薄
- /// ExcelRange褰撳墠excel鍗曞厓鏍煎璞�
- /// int=褰撳墠璇诲彇鐨勭鍑犳暟
- /// int=褰撳墠璇诲彇鐨勭鍑犲垪
- /// string=杩斿洖鐨勫��
- /// </summary>
- //protected Func<string, ExcelWorksheet, ExcelRange, int, int, string> ImportOnReadCellValue;
-
-
- /// <summary>
- /// 鑷畾涔変笂浼犳枃浠跺す(2022.10.07)
- /// </summary>
- protected string UploadFolder = null;
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/Caching.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/Caching.cs"
deleted file mode 100644
index fff2699..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/Caching.cs"
+++ /dev/null
@@ -1,351 +0,0 @@
-锘縰sing Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Caching.Memory;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-
-namespace WIDESEA_Core.Caches
-{
- /// <summary>
- /// 瀹炰緥鍖栫紦瀛樻帴鍙Caching
- /// </summary>
- public class Caching : ICaching
- {
- private readonly IDistributedCache _cache;
-
- public Caching(IDistributedCache cache)
- {
- _cache = cache;
- }
-
- private byte[] GetBytes<T>(T source)
- {
- return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(source));
- }
-
- public IDistributedCache Cache => _cache;
-
- public void AddCacheKey(string cacheKey)
- {
- var res = _cache.GetString(CacheConst.KeyAll);
- var allkeys = string.IsNullOrWhiteSpace(res) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(res);
- if (!allkeys.Any(m => m == cacheKey))
- {
- allkeys.Add(cacheKey);
- _cache.SetString(CacheConst.KeyAll, JsonConvert.SerializeObject(allkeys));
- }
- }
-
- /// <summary>
- /// 澧炲姞缂撳瓨Key
- /// </summary>
- /// <param name="cacheKey"></param>
- /// <returns></returns>
- public async Task AddCacheKeyAsync(string cacheKey)
- {
- var res = await _cache.GetStringAsync(CacheConst.KeyAll);
- var allkeys = string.IsNullOrWhiteSpace(res) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(res);
- if (!allkeys.Any(m => m == cacheKey))
- {
- allkeys.Add(cacheKey);
- await _cache.SetStringAsync(CacheConst.KeyAll, JsonConvert.SerializeObject(allkeys));
- }
- }
-
- public void DelByPattern(string key)
- {
- var allkeys = GetAllCacheKeys();
- if (allkeys == null) return;
-
- var delAllkeys = allkeys.Where(u => u.Contains(key)).ToList();
- delAllkeys.ForEach(u => { _cache.Remove(u); });
-
- // 鏇存柊鎵�鏈夌紦瀛橀敭
- allkeys = allkeys.Where(u => !u.Contains(key)).ToList();
- _cache.SetString(CacheConst.KeyAll, JsonConvert.SerializeObject(allkeys));
- }
-
- /// <summary>
- /// 鍒犻櫎鏌愮壒寰佸叧閿瓧缂撳瓨
- /// </summary>
- /// <param name="key"></param>
- /// <returns></returns>
- public async Task DelByPatternAsync(string key)
- {
- var allkeys = await GetAllCacheKeysAsync();
- if (allkeys == null) return;
-
- var delAllkeys = allkeys.Where(u => u.Contains(key)).ToList();
- delAllkeys.ForEach(u => { _cache.Remove(u); });
-
- // 鏇存柊鎵�鏈夌紦瀛橀敭
- allkeys = allkeys.Where(u => !u.Contains(key)).ToList();
- await _cache.SetStringAsync(CacheConst.KeyAll, JsonConvert.SerializeObject(allkeys));
- }
-
- public void DelCacheKey(string cacheKey)
- {
- var res = _cache.GetString(CacheConst.KeyAll);
- var allkeys = string.IsNullOrWhiteSpace(res) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(res);
- if (allkeys.Any(m => m == cacheKey))
- {
- allkeys.Remove(cacheKey);
- _cache.SetString(CacheConst.KeyAll, JsonConvert.SerializeObject(allkeys));
- }
- }
-
- /// <summary>
- /// 鍒犻櫎缂撳瓨
- /// </summary>
- /// <param name="cacheKey"></param>
- /// <returns></returns>
- public async Task DelCacheKeyAsync(string cacheKey)
- {
- var res = await _cache.GetStringAsync(CacheConst.KeyAll);
- var allkeys = string.IsNullOrWhiteSpace(res) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(res);
- if (allkeys.Any(m => m == cacheKey))
- {
- allkeys.Remove(cacheKey);
- await _cache.SetStringAsync(CacheConst.KeyAll, JsonConvert.SerializeObject(allkeys));
- }
- }
-
- public bool Exists(string cacheKey)
- {
- var res = _cache.Get(cacheKey);
- return res != null;
- }
-
- /// <summary>
- /// 妫�鏌ョ粰瀹� key 鏄惁瀛樺湪
- /// </summary>
- /// <param name="cacheKey">閿�</param>
- /// <returns></returns>
- public async Task<bool> ExistsAsync(string cacheKey)
- {
- var res = await _cache.GetAsync(cacheKey);
- return res != null;
- }
-
- public List<string> GetAllCacheKeys()
- {
- var res = _cache.GetString(CacheConst.KeyAll);
- return string.IsNullOrWhiteSpace(res) ? null : JsonConvert.DeserializeObject<List<string>>(res);
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈夌紦瀛樺垪琛�
- /// </summary>
- /// <returns></returns>
- public async Task<List<string>> GetAllCacheKeysAsync()
- {
- var res = await _cache.GetStringAsync(CacheConst.KeyAll);
- return string.IsNullOrWhiteSpace(res) ? null : JsonConvert.DeserializeObject<List<string>>(res);
- }
-
- public T Get<T>(string cacheKey)
- {
- var res = _cache.Get(cacheKey);
- return res == null ? default : JsonConvert.DeserializeObject<T>(Encoding.UTF8.GetString(res));
- }
-
- /// <summary>
- /// 鑾峰彇缂撳瓨
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <param name="cacheKey"></param>
- /// <returns></returns>
- public async Task<T> GetAsync<T>(string cacheKey)
- {
- var res = await _cache.GetAsync(cacheKey);
- return res == null ? default : JsonConvert.DeserializeObject<T>(Encoding.UTF8.GetString(res));
- }
-
- public object Get(Type type, string cacheKey)
- {
- var res = _cache.Get(cacheKey);
- return res == null ? default : JsonConvert.DeserializeObject(Encoding.UTF8.GetString(res), type);
- }
-
- public async Task<object> GetAsync(Type type, string cacheKey)
- {
- var res = await _cache.GetAsync(cacheKey);
- return res == null ? default : JsonConvert.DeserializeObject(Encoding.UTF8.GetString(res), type);
- }
-
- public string GetString(string cacheKey)
- {
- return _cache.GetString(cacheKey);
- }
-
- /// <summary>
- /// 鑾峰彇缂撳瓨
- /// </summary>
- /// <param name="cacheKey"></param>
- /// <returns></returns>
- public async Task<string> GetStringAsync(string cacheKey)
- {
- return await _cache.GetStringAsync(cacheKey);
- }
-
- public void Remove(string key)
- {
- _cache.Remove(key);
- DelCacheKey(key);
- }
-
- /// <summary>
- /// 鍒犻櫎缂撳瓨
- /// </summary>
- /// <param name="key"></param>
- /// <returns></returns>
- public async Task RemoveAsync(string key)
- {
- await _cache.RemoveAsync(key);
- await DelCacheKeyAsync(key);
- }
-
- public void RemoveAll()
- {
- var catches = GetAllCacheKeys();
- foreach (var @catch in catches) Remove(@catch);
-
- catches.Clear();
- _cache.SetString(CacheConst.KeyAll, JsonConvert.SerializeObject(catches));
- }
-
- public async Task RemoveAllAsync()
- {
- var catches = await GetAllCacheKeysAsync();
- foreach (var @catch in catches) await RemoveAsync(@catch);
-
- catches.Clear();
- await _cache.SetStringAsync(CacheConst.KeyAll, JsonConvert.SerializeObject(catches));
- }
-
-
- public void Set<T>(string cacheKey, T value, TimeSpan? expire = null)
- {
- _cache.Set(cacheKey, GetBytes(value),
- expire == null
- ? new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(6) }
- : new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = expire });
-
- AddCacheKey(cacheKey);
- }
-
- /// <summary>
- /// 澧炲姞瀵硅薄缂撳瓨
- /// </summary>
- /// <param name="cacheKey"></param>
- /// <param name="value"></param>
- /// <returns></returns>
- public async Task SetAsync<T>(string cacheKey, T value)
- {
- await _cache.SetAsync(cacheKey, Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value)),
- new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(6) });
-
- await AddCacheKeyAsync(cacheKey);
- }
-
- /// <summary>
- /// 澧炲姞瀵硅薄缂撳瓨,骞惰缃繃鏈熸椂闂�
- /// </summary>
- /// <param name="cacheKey"></param>
- /// <param name="value"></param>
- /// <param name="expire"></param>
- /// <returns></returns>
- public async Task SetAsync<T>(string cacheKey, T value, TimeSpan expire)
- {
- await _cache.SetAsync(cacheKey, Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value)),
- new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = expire });
-
- await AddCacheKeyAsync(cacheKey);
- }
-
- public void SetPermanent<T>(string cacheKey, T value)
- {
- _cache.Set(cacheKey, Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value)));
- AddCacheKey(cacheKey);
- }
-
- public async Task SetPermanentAsync<T>(string cacheKey, T value)
- {
- await _cache.SetAsync(cacheKey, Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(value)));
- await AddCacheKeyAsync(cacheKey);
- }
-
- public void SetString(string cacheKey, string value, TimeSpan? expire = null)
- {
- if (expire == null)
- _cache.SetString(cacheKey, value, new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(6) });
- else
- _cache.SetString(cacheKey, value, new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = expire });
-
- AddCacheKey(cacheKey);
- }
-
- /// <summary>
- /// 澧炲姞瀛楃涓茬紦瀛�
- /// </summary>
- /// <param name="cacheKey"></param>
- /// <param name="value"></param>
- /// <returns></returns>
- public async Task SetStringAsync(string cacheKey, string value)
- {
- await _cache.SetStringAsync(cacheKey, value, new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(6) });
-
- await AddCacheKeyAsync(cacheKey);
- }
-
- /// <summary>
- /// 澧炲姞瀛楃涓茬紦瀛�,骞惰缃繃鏈熸椂闂�
- /// </summary>
- /// <param name="cacheKey"></param>
- /// <param name="value"></param>
- /// <param name="expire"></param>
- /// <returns></returns>
- public async Task SetStringAsync(string cacheKey, string value, TimeSpan expire)
- {
- await _cache.SetStringAsync(cacheKey, value, new DistributedCacheEntryOptions() { AbsoluteExpirationRelativeToNow = expire });
-
- await AddCacheKeyAsync(cacheKey);
- }
-
-
- /// <summary>
- /// 缂撳瓨鏈�澶ц鑹叉暟鎹寖鍥�
- /// </summary>
- /// <param name="userId"></param>
- /// <param name="dataScopeType"></param>
- /// <returns></returns>
- public async Task SetMaxDataScopeType(long userId, int dataScopeType)
- {
- var cacheKey = CacheConst.KeyMaxDataScopeType + userId;
- await SetStringAsync(cacheKey, dataScopeType.ToString());
-
- await AddCacheKeyAsync(cacheKey);
- }
-
- /// <summary>
- /// 鏍规嵁鐖堕敭娓呯┖
- /// </summary>
- /// <param name="key"></param>
- /// <returns></returns>
- public async Task DelByParentKeyAsync(string key)
- {
- var allkeys = await GetAllCacheKeysAsync();
- if (allkeys == null) return;
-
- var delAllkeys = allkeys.Where(u => u.StartsWith(key)).ToList();
- delAllkeys.ForEach(Remove);
- // 鏇存柊鎵�鏈夌紦瀛橀敭
- allkeys = allkeys.Where(u => !u.StartsWith(key)).ToList();
- await SetStringAsync(CacheConst.KeyAll, JsonConvert.SerializeObject(allkeys));
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/ICaching.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/ICaching.cs"
deleted file mode 100644
index 052615c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/ICaching.cs"
+++ /dev/null
@@ -1,59 +0,0 @@
-锘縰sing Microsoft.Extensions.Caching.Distributed;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Caches
-{
- /// <summary>
- /// 缂撳瓨鎶借薄鎺ュ彛,鍩轰簬IDistributedCache灏佽
- /// </summary>
- public interface ICaching
- {
- public IDistributedCache Cache { get; }
- void AddCacheKey(string cacheKey);
- Task AddCacheKeyAsync(string cacheKey);
-
- void DelByPattern(string key);
- Task DelByPatternAsync(string key);
-
- void DelCacheKey(string cacheKey);
- Task DelCacheKeyAsync(string cacheKey);
-
- bool Exists(string cacheKey);
- Task<bool> ExistsAsync(string cacheKey);
-
- List<string> GetAllCacheKeys();
- Task<List<string>> GetAllCacheKeysAsync();
-
- T Get<T>(string cacheKey);
- Task<T> GetAsync<T>(string cacheKey);
-
- object Get(Type type, string cacheKey);
- Task<object> GetAsync(Type type, string cacheKey);
-
- string GetString(string cacheKey);
- Task<string> GetStringAsync(string cacheKey);
-
- void Remove(string key);
- Task RemoveAsync(string key);
-
- void RemoveAll();
- Task RemoveAllAsync();
-
- void Set<T>(string cacheKey, T value, TimeSpan? expire = null);
- Task SetAsync<T>(string cacheKey, T value);
- Task SetAsync<T>(string cacheKey, T value, TimeSpan expire);
-
- void SetPermanent<T>(string cacheKey, T value);
- Task SetPermanentAsync<T>(string cacheKey, T value);
-
- void SetString(string cacheKey, string value, TimeSpan? expire = null);
- Task SetStringAsync(string cacheKey, string value);
- Task SetStringAsync(string cacheKey, string value, TimeSpan expire);
-
- Task DelByParentKeyAsync(string key);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/SqlSugarCacheService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/SqlSugarCacheService.cs"
deleted file mode 100644
index 4b6d04d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Caches/SqlSugarCacheService.cs"
+++ /dev/null
@@ -1,69 +0,0 @@
-锘縰sing Microsoft.Extensions.Caching.Memory;
-using SqlSugar;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Caches
-{
- /// <summary>
- /// 瀹炵幇SqlSugar鐨処CacheService鎺ュ彛
- /// </summary>
- public class SqlSugarCacheService : ICacheService
- {
- private readonly Lazy<ICaching> _caching = new(() => App.GetService<ICaching>(false));
- private ICaching Caching => _caching.Value;
-
- public void Add<V>(string key, V value)
- {
- Caching.Set(key, value);
- }
-
- public void Add<V>(string key, V value, int cacheDurationInSeconds)
- {
- Caching.Set(key, value, TimeSpan.FromSeconds(cacheDurationInSeconds));
- }
-
- public bool ContainsKey<V>(string key)
- {
- return Caching.Exists(key);
- }
-
- public V Get<V>(string key)
- {
- return Caching.Get<V>(key);
- }
-
- public IEnumerable<string> GetAllKey<V>()
- {
- return Caching.GetAllCacheKeys();
- }
-
- public V GetOrCreate<V>(string cacheKey, Func<V> create, int cacheDurationInSeconds = int.MaxValue)
- {
- if (!ContainsKey<V>(cacheKey))
- {
- var value = create();
- Caching.Set(cacheKey, value, TimeSpan.FromSeconds(cacheDurationInSeconds));
- return value;
- }
-
- return Caching.Get<V>(cacheKey);
- }
-
- public void Remove<V>(string key)
- {
- Caching.Remove(key);
- }
-
- public bool RemoveAll()
- {
- Caching.RemoveAll();
- return true;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/AppSecret.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/AppSecret.cs"
deleted file mode 100644
index 8760498..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/AppSecret.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Const
-{
- /// <summary>
- /// 绉橀挜閰嶇疆
- /// </summary>
- public struct AppSecret
- {
- public const string JWT = "BB3647441FFA4B5DB4E64A29B53CE525";
-
- public const string Audience = "WIDESEA_WMS";
-
- public const string Issuer = "WIDESEA_WMS_Owner";
-
- public const string TokenHeaderName = "Authorization";
-
- public const string User = "C5ABA9E202D94C43A3CA66002BF77FAF";
-
- public const string DB = "3F8B7B38AD3D484A89ACA513CBD79F36";
-
- //杩炴帴瀛楃涓�
- //Data Source=.;Initial Catalog=WIDESEA_DB_2;User ID=sa;Password=P@ssw0rd;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/CacheConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/CacheConst.cs"
deleted file mode 100644
index 841d5d2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/CacheConst.cs"
+++ /dev/null
@@ -1,94 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Const
-{
- /// <summary>
- /// 缂撳瓨鐩稿叧甯搁噺
- /// </summary>
- public class CacheConst
- {
- /// <summary>
- /// 鐢ㄦ埛缂撳瓨
- /// </summary>
- public const string KeyUser = "user:";
-
- /// <summary>
- /// 鐢ㄦ埛閮ㄩ棬缂撳瓨
- /// </summary>
- public const string KeyUserDepart = "userDepart:";
-
- /// <summary>
- /// 鑿滃崟缂撳瓨
- /// </summary>
- public const string KeyMenu = "menu:";
-
- /// <summary>
- /// 鑿滃崟
- /// </summary>
- public const string KeyPermissions = "permissions";
-
- /// <summary>
- /// 鏉冮檺缂撳瓨
- /// </summary>
- public const string KeyPermission = "permission:";
-
- /// <summary>
- /// 鎺ュ彛璺敱
- /// </summary>
- public const string KeyModules = "modules";
-
- /// <summary>
- /// 绯荤粺閰嶇疆
- /// </summary>
- public const string KeySystemConfig = "sysConfig";
-
- /// <summary>
- /// 鏌ヨ杩囨护鍣ㄧ紦瀛�
- /// </summary>
- public const string KeyQueryFilter = "queryFilter:";
-
- /// <summary>
- /// 鏈烘瀯Id闆嗗悎缂撳瓨
- /// </summary>
- public const string KeyOrgIdList = "org:";
-
- /// <summary>
- /// 鏈�澶ц鑹叉暟鎹寖鍥寸紦瀛�
- /// </summary>
- public const string KeyMaxDataScopeType = "maxDataScopeType:";
-
- /// <summary>
- /// 楠岃瘉鐮佺紦瀛�
- /// </summary>
- public const string KeyVerCode = "verCode:";
-
- /// <summary>
- /// 鎵�鏈夌紦瀛樺叧閿瓧闆嗗悎
- /// </summary>
- public const string KeyAll = "keys";
-
- /// <summary>
- /// 瀹氭椂浠诲姟缂撳瓨
- /// </summary>
- public const string KeyTimer = "timer:";
-
- /// <summary>
- /// 鍦ㄧ嚎鐢ㄦ埛缂撳瓨
- /// </summary>
- public const string KeyOnlineUser = "onlineuser:";
-
- /// <summary>
- /// 甯搁噺涓嬫媺妗�
- /// </summary>
- public const string KeyConstSelector = "selector:";
-
- /// <summary>
- /// swagger鐧诲綍缂撳瓨
- /// </summary>
- public const string SwaggerLogin = "swaggerLogin:";
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ErrorMsgConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ErrorMsgConst.cs"
deleted file mode 100644
index 3456c44..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ErrorMsgConst.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Const
-{
- public class ErrorMsgConst
- {
- public const string ParamIsNull = "鍙傛暟鏃犳晥";
- public const string EntityValueIsNull = "涓哄繀椤绘彁浜ら」";
- public const string SugarColumnIsNull = "璇烽厤缃甋ugarColumn灞炴��";
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs"
deleted file mode 100644
index 735718d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/HtmlElementType.cs"
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Const
-{
- public struct HtmlElementType
- {
- public const string drop = "drop";
- public const string droplist = "droplist";
- public const string select = "select";
- public const string selectlist = "selectlist";
- public const string checkbox = "checkbox";
- public const string textarea = "textarea";
- public const string thanorequal = "thanorequal";
- public const string lessorequal = "lessorequal";
-
-
- public const string gt = "gt";
- public const string lt = "lt";
- public const string GT = ">";
- public const string LT = "<";
- public const string like = "like";
-
- public const string ThanOrEqual = ">=";
- public const string LessOrequal = "<=";
- public const string Contains = "in";
- public const string Equal = "=";
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/SqlDbTypeName.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/SqlDbTypeName.cs"
deleted file mode 100644
index b12f10d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/SqlDbTypeName.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Const
-{
- public struct SqlDbTypeName
- {
- public const string NVarChar = "nvarchar";
- public const string VarChar = "varchar";
- public const string NChar = "nchar";
- public const string Char = "char";
- public const string Text = "text";
- public const string Int = "int";
- public const string BigInt = "bigint";
- public const string DateTime = "datetime";
- public const string Date = "date";
- public const string SmallDateTime = "smalldatetime";
- public const string SmallDate = "smalldate";
- public const string Float = "float";
- public const string Decimal = "decimal";
- public const string Double = "double";
- public const string Bit = "bit";
- public const string Bool = "bool";
- public const string UniqueIdentifier = "uniqueidentifier";
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/TenantConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/TenantConst.cs"
deleted file mode 100644
index eeeeae4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/TenantConst.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Const
-{
- public class TenantConst
- {
- public const string DBConStr = "Data Source={0};Initial Catalog={1};User ID={2};Password={3};Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False";
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/TenantStatus.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/TenantStatus.cs"
deleted file mode 100644
index 581b035..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/TenantStatus.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Const
-{
- public struct TenantStatus
- {
- public const int Enable = 1;
- public const int Disable = 2;
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/ConfigurableOptions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/ConfigurableOptions.cs"
deleted file mode 100644
index a313a78..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/ConfigurableOptions.cs"
+++ /dev/null
@@ -1,66 +0,0 @@
-锘縰sing Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Core
-{
- public static class ConfigurableOptions
- {
- /// <summary>娣诲姞閫夐」閰嶇疆</summary>
- /// <typeparam name="TOptions">閫夐」绫诲瀷</typeparam>
- /// <param name="services">鏈嶅姟闆嗗悎</param>
- /// <returns>鏈嶅姟闆嗗悎</returns>
- public static IServiceCollection AddConfigurableOptions<TOptions>(this IServiceCollection services)
- where TOptions : class, IConfigurableOptions
- {
- Type optionsType = typeof(TOptions);
- string path = GetConfigurationPath(optionsType);
- services.Configure<TOptions>(App.Configuration.GetSection(path));
-
- return services;
- }
-
- public static IServiceCollection AddConfigurableOptions(this IServiceCollection services, Type type)
- {
- string path = GetConfigurationPath(type);
- var config = App.Configuration.GetSection(path);
-
- Type iOptionsChangeTokenSource = typeof(IOptionsChangeTokenSource<>);
- Type iConfigureOptions = typeof(IConfigureOptions<>);
- Type configurationChangeTokenSource = typeof(ConfigurationChangeTokenSource<>);
- Type namedConfigureFromConfigurationOptions = typeof(NamedConfigureFromConfigurationOptions<>);
- iOptionsChangeTokenSource = iOptionsChangeTokenSource.MakeGenericType(type);
- iConfigureOptions = iConfigureOptions.MakeGenericType(type);
- configurationChangeTokenSource = configurationChangeTokenSource.MakeGenericType(type);
- namedConfigureFromConfigurationOptions = namedConfigureFromConfigurationOptions.MakeGenericType(type);
-
- services.AddOptions();
- services.AddSingleton(iOptionsChangeTokenSource,
- Activator.CreateInstance(configurationChangeTokenSource, Options.DefaultName, config) ?? throw new InvalidOperationException());
- return services.AddSingleton(iConfigureOptions,
- Activator.CreateInstance(namedConfigureFromConfigurationOptions, Options.DefaultName, config) ?? throw new InvalidOperationException());
- }
-
- /// <summary>鑾峰彇閰嶇疆璺緞</summary>
- /// <param name="optionsType">閫夐」绫诲瀷</param>
- /// <returns></returns>
- public static string GetConfigurationPath(Type optionsType)
- {
- var endPath = new[] { "Option", "Options" };
- var configurationPath = optionsType.Name;
- foreach (var s in endPath)
- {
- if (configurationPath.EndsWith(s))
- {
- return configurationPath[..^s.Length];
- }
- }
-
- return configurationPath;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/IConfigurableOptions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/IConfigurableOptions.cs"
deleted file mode 100644
index a891834..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/IConfigurableOptions.cs"
+++ /dev/null
@@ -1,12 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Core
-{
- public interface IConfigurableOptions
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/InternalApp.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/InternalApp.cs"
deleted file mode 100644
index 5dfff8e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Core/InternalApp.cs"
+++ /dev/null
@@ -1,47 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Core
-{
- public static class InternalApp
- {
- internal static IServiceCollection InternalServices;
-
- /// <summary>鏍规湇鍔�</summary>
- internal static IServiceProvider RootServices;
-
- /// <summary>鑾峰彇Web涓绘満鐜</summary>
- internal static IWebHostEnvironment WebHostEnvironment;
-
- /// <summary>鑾峰彇娉涘瀷涓绘満鐜</summary>
- internal static IHostEnvironment HostEnvironment;
-
- /// <summary>閰嶇疆瀵硅薄</summary>
- internal static IConfiguration Configuration;
-
- public static void ConfigureApplication(this WebApplicationBuilder wab)
- {
- HostEnvironment = wab.Environment;
- WebHostEnvironment = wab.Environment;
- InternalServices = wab.Services;
- }
-
- public static void ConfigureApplication(this IConfiguration configuration)
- {
- Configuration = configuration;
- }
-
- public static void ConfigureApplication(this IHost app)
- {
- RootServices = app.Services;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs"
deleted file mode 100644
index ed0e254..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs"
+++ /dev/null
@@ -1,121 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Core.DB
-{
- public class BaseDBConfig
- {
- /* 涔嬪墠鐨勫崟搴撴搷浣滃凡缁忓垹闄わ紝濡傛灉鎯宠涔嬪墠鐨勪唬鐮侊紝鍙互鏌ョ湅鎴戠殑GitHub鐨勫巻鍙茶褰�
- * 鐩墠鏄搴撴搷浣滐紝榛樿鍔犺浇鐨勬槸appsettings.json璁剧疆涓簍rue鐨勭涓�涓猟b杩炴帴銆�
- */
- public static List<MutiDBOperate> MutiConnectionString => MutiInitConn();
-
- private static string DifDBConnOfSecurity(params string[] conn)
- {
- foreach (var item in conn)
- {
- try
- {
- if (File.Exists(item))
- {
- return File.ReadAllText(item).Trim();
- }
- }
- catch (System.Exception)
- {
- }
- }
-
- return conn[conn.Length - 1];
- }
-
- public static List<MutiDBOperate> MutiInitConn()
- {
- SqlSugarClient sqlSugarClient = new SqlSugarClient(new ConnectionConfig
- {
- ConfigId = MainDb.CurrentDbConnId,
- ConnectionString = AppSettings.app(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
- IsAutoCloseConnection = true,
- DbType = MainDb.DbType,
- AopEvents = new AopEvents
- {
- OnError = x =>
- {
- Console.WriteLine(x.Sql);
- }
- }
- });
-
- List<ExpandoObject> list = sqlSugarClient.Queryable(MainDb.TenantTableName, "x").Where(MainDb.TenantStatus, "=", TenantStatus.Enable).Select(TenantUtil.GetTenantSelectModels()).ToList();
- List<MutiDBOperate> listdatabaseSlaveDB = new List<MutiDBOperate>();
- MutiDBOperate mainDb = new MutiDBOperate()
- {
- Connection = AppSettings.app(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
- ConnId = MainDb.CurrentDbConnId,
- DbType = DataBaseType.SqlServer
- };
- listdatabaseSlaveDB.Add(mainDb);
- for (int i = 0; i < list.Count; i++)
- {
- dynamic data = list[i];
- MutiDBOperate mutiDBOperate = new MutiDBOperate()
- {
- Connection = data.ConnectionString,
- ConnId = data.TenantId + "",
- DbType = (DataBaseType)data.DbType,
- };
- mutiDBOperate.Connection = mutiDBOperate.Connection.DecryptDES(AppSecret.DB);
- listdatabaseSlaveDB.Add(mutiDBOperate);
- }
-
- return listdatabaseSlaveDB;
- }
- }
-
- public enum DataBaseType
- {
- MySql = 0,
- SqlServer = 1,
- Sqlite = 2,
- Oracle = 3,
- PostgreSQL = 4,
- Dm = 5,
- Kdbndp = 6,
- }
-
- public class MutiDBOperate
- {
- /// <summary>
- /// 杩炴帴鍚敤寮�鍏�
- /// </summary>
- public bool Enabled { get; set; }
-
- /// <summary>
- /// 杩炴帴ID
- /// </summary>
- public string ConnId { get; set; }
-
- /// <summary>
- /// 浠庡簱鎵ц绾у埆锛岃秺澶ц秺鍏堟墽琛�
- /// </summary>
- public int HitRate { get; set; }
-
- /// <summary>
- /// 杩炴帴瀛楃涓�
- /// </summary>
- public string Connection { get; set; }
-
- /// <summary>
- /// 鏁版嵁搴撶被鍨�
- /// </summary>
- public DataBaseType DbType { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/MainDb.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/MainDb.cs"
deleted file mode 100644
index 1ff34f4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/MainDb.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.DB
-{
- public static class MainDb
- {
- public const string CurrentDbConnId = "WIDESEA";
- public const string ConnectionString = "ConnectionString";
- public const string TenantTableName = "Sys_Tenant";
- public const string TenantStatus = "Status";
- public const string TenantId = "TenantId";
- public const string TenantName = "TenantName";
- public const string EntityNameSpace = "WIDESEA_Model.Models";
- public const string TenantDbType = "DbType";
- public const string AssemblyName = "WIDESEA_Model.dll";
- public static DbType DbType = DbType.SqlServer;
- public const string UserTableName = "Sys_User";
- public const string RoleId = "Role_Id";
- public const string SystemType = "SystemType";
- public const string UserName = "UserName";
- public const string UserId = "User_Id";
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
deleted file mode 100644
index 824057d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs"
+++ /dev/null
@@ -1,96 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.DB.Models
-{
- public class BaseEntity
- {
- #region 鏁版嵁鐘舵�佺鐞�
-
- /// <summary>
- /// 鐘舵�� <br/>
- /// 涓珛瀛楁锛屾煇浜涜〃鍙娇鐢ㄦ煇浜涜〃涓嶄娇鐢�
- /// </summary>
- //public bool Enabled { get; set; } = true;
-
- /// <summary>
- /// 涓珛瀛楁锛屾煇浜涜〃鍙娇鐢ㄦ煇浜涜〃涓嶄娇鐢� <br/>
- /// 閫昏緫涓婄殑鍒犻櫎锛岄潪鐗╃悊鍒犻櫎 <br/>
- /// 渚嬪锛氬崟鎹垹闄ゅ苟闈炵洿鎺ュ垹闄�
- /// </summary>
- //public bool IsDeleted { get; set; }
-
- /// <summary>
- /// 涓珛瀛楁 <br/>
- /// 鏄惁鍐呯疆鏁版嵁
- /// </summary>
- //public bool IsInternal { get; set; }
-
- #endregion
-
- #region 鍒涘缓
-
- /// <summary>
- /// 鍒涘缓鑰�
- /// </summary>
- [ImporterHeader(Name = "鍒涘缓鑰�")]
- [ExporterHeader(DisplayName = "鍒涘缓鑰�")]
- [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鍒涘缓鑰�")]
- public string Creater { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [ImporterHeader(Name = "鍒涘缓鏃堕棿")]
- [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")]
- [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鍒涘缓鏃堕棿")]
- public DateTime CreateDate { get; set; } = DateTime.Now;
-
-
- /// <summary>
- /// 澶� 娉�:鍒涘缓鑰匢D
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "CreateID")]
- public int? CreateID { get; set; }
-
- #endregion
-
- #region 淇敼
-
- /// <summary>
- /// 鏇存柊鑰�
- /// </summary>
- [ImporterHeader(Name = "淇敼浜�")]
- [ExporterHeader(DisplayName = "淇敼浜�")]
- [SugarColumn(IsNullable = true, IsOnlyIgnoreInsert = true, ColumnDescription = "淇敼浜�")]
- public string Modifier { get; set; }
-
- /// <summary>
- /// 淇敼鏃ユ湡
- /// </summary>
- [ImporterHeader(Name = "淇敼鏃ユ湡")]
- [ExporterHeader(DisplayName = "淇敼鏃ユ湡")]
- [SugarColumn(IsNullable = true, IsOnlyIgnoreInsert = true, ColumnDescription = "淇敼鏃ユ湡")]
- public DateTime? ModifyDate { get; set; } = DateTime.Now;
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "ModifyID")]
- public int? ModifyID { get; set; }
- /// <summary>
- /// 鏁版嵁鐗堟湰
- /// </summary>
- //[SugarColumn(DefaultValue = "0", IsEnableUpdateVersionValidation = true)] //鏍囪瘑鐗堟湰瀛楁
- //public long Version { get; set; }
-
- #endregion
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/RepositorySetting.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/RepositorySetting.cs"
deleted file mode 100644
index 67c4968..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/RepositorySetting.cs"
+++ /dev/null
@@ -1,53 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Core.DB
-{
- public class RepositorySetting
- {
- private static readonly Lazy<IEnumerable<Type>> AllEntitys = new(() =>
- {
- var path = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory;
- var referencedAssemblies = System.IO.Directory.GetFiles(path, MainDb.AssemblyName).Select(Assembly.LoadFrom).FirstOrDefault();
- return referencedAssemblies
- .GetTypes()
- .Where(t => t.IsClass && !t.IsAbstract && t.IsSubclassOf(typeof(BaseEntity)))
- .Where(it => it.FullName != null && it.FullName.StartsWith(MainDb.EntityNameSpace));
- });
-
- public static IEnumerable<Type> Entitys => AllEntitys.Value;
-
- /// <summary>
- /// 閰嶇疆瀹炰綋杞垹闄よ繃婊ゅ櫒<br/>
- /// 缁熶竴杩囨护 杞垹闄� 鏃犻渶鑷繁鍐欐潯浠�
- /// </summary>
- public static void SetDeletedEntityFilter(SqlSugarScopeProvider db)
- {
- //db.QueryFilter.AddTableFilter<IDeleteFilter>(it => it.IsDeleted == false);
- }
-
- /// <summary>
- /// 閰嶇疆绉熸埛
- /// </summary>
- public static void SetTenantEntityFilter(SqlSugarScopeProvider db)
- {
- if (App.User is not { UserId: > 0, TenantId: > 0 })
- {
- return;
- }
-
- //澶氱鎴� 鍗曡〃
- //db.QueryFilter.AddTableFilter<ITenantEntity>(it => it.TenantId == App.User.TenantId || it.TenantId == 0);
-
- //澶氱鎴� 澶氳〃
- //db.SetTenantTable(App.User.TenantId.ToString());
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/EnumHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/EnumHelper.cs"
deleted file mode 100644
index 60cddd4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/EnumHelper.cs"
+++ /dev/null
@@ -1,111 +0,0 @@
-锘縰sing System.ComponentModel;
-using System.Reflection;
-
-namespace WIDESEA_Core.Enums
-{
- public static class EnumHelper
- {
- /// <summary>
- /// 鏋氫妇杞瓧鍏搁泦鍚�
- /// </summary>
- /// <typeparam name="T">鏋氫妇绫诲悕绉�</typeparam>
- /// <param name="keyDefault">榛樿key鍊�</param>
- /// <param name="valueDefault">榛樿value鍊�</param>
- /// <returns>杩斿洖鐢熸垚鐨勫瓧鍏搁泦鍚�</returns>
- public static Dictionary<string, object> EnumListDic<T>(string keyDefault, string valueDefault = "")
- {
- Dictionary<string, object> dicEnum = new Dictionary<string, object>();
- Type enumType = typeof(T);
- if (!enumType.IsEnum)
- {
- return dicEnum;
- }
- if (!string.IsNullOrEmpty(keyDefault)) //鍒ゆ柇鏄惁娣诲姞榛樿閫夐」
- {
- dicEnum.Add(keyDefault, valueDefault);
- }
- string[] fieldstrs = Enum.GetNames(enumType); //鑾峰彇鏋氫妇瀛楁鏁扮粍
- foreach (var item in fieldstrs)
- {
- string description = string.Empty;
- var field = enumType.GetField(item);
- object[] arr = field.GetCustomAttributes(typeof(DescriptionAttribute), true); //鑾峰彇灞炴�у瓧娈垫暟缁�
- if (arr != null && arr.Length > 0)
- {
- description = ((DescriptionAttribute)arr[0]).Description; //灞炴�ф弿杩�
- }
- else
- {
- description = item; //鎻忚堪涓嶅瓨鍦ㄥ彇瀛楁鍚嶇О
- }
- dicEnum.Add(description, (int)Enum.Parse(enumType, item)); //涓嶇敤鏋氫妇鐨剉alue鍊间綔涓哄瓧鍏竗ey鍊肩殑鍘熷洜浠庢灇涓句緥瀛愯兘鐪嬪嚭鏉ワ紝鍏跺疄杩欒竟搴旇鍒ゆ柇浠栫殑鍊间笉瀛樺湪锛岄粯璁ゅ彇瀛楁鍚嶇О
- }
- return dicEnum;
- }
- /// <summary>
- /// 鑾峰彇鏋氫妇椤规弿杩颁俊鎭� 渚嬪GetEnumDesc(Days.Sunday)
- /// </summary>
- /// <param name="en">鏋氫妇椤� 濡侱ays.Sunday</param>
- /// <returns></returns>
- public static string GetIntegralRuleTypeEnumDesc(this Enum en)
- {
- Type type = en.GetType();
- MemberInfo[] memInfo = type.GetMember(en.ToString());
- if (memInfo != null && memInfo.Length > 0)
- {
- object[] attrs = memInfo[0].GetCustomAttributes(typeof(System.ComponentModel.DescriptionAttribute), false);
- if (attrs != null && attrs.Length > 0)
- return ((DescriptionAttribute)attrs[0]).Description;
- }
- return en.ToString();
- }
- /// <summary>
- /// 鑾峰彇鏋氫妇闆嗗悎
- /// </summary>
- /// <typeparam name="T">鏋氫妇绫诲悕绉�</typeparam>
- /// <returns></returns>
- public static IEnumerable<EnumModel> GetEnumList<T>()
- {
- var model = default(T);
- FieldInfo[] fieldinfo = typeof(T).GetFields();
- List<EnumModel> result = new List<EnumModel>();
- foreach (FieldInfo field in fieldinfo)
- {
- EnumModel enumModel = new EnumModel();
- if (!(Attribute.GetCustomAttribute(field, typeof(DescriptionAttribute)) is DescriptionAttribute attribute))
- {
- enumModel.Desc = field.GetValue(model).ToString();
- }
- else
- {
- enumModel.Desc = attribute.Description;
- }
- enumModel.Value = field.GetValue(model).GetHashCode();
- enumModel.Key = field.GetValue(model) as ValueType;
- if (field.GetValue(model).ToString() != "0")
- {
- result.Add(enumModel);
- }
-
- }
- return result;
- }
- }
-
- public class EnumModel
- {
- /// <summary>
- /// Enum鐨勫��
- /// </summary>
- public int Value { get; set; }
- /// <summary>
- /// Enum鐨刱ey
- /// </summary>
- public ValueType Key { get; set; }
- /// <summary>
- /// Enum鎻忚堪
- /// </summary>
- public string Desc { get; set; }
- }
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/LinqExpressionType.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/LinqExpressionType.cs"
deleted file mode 100644
index cd90b5a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/LinqExpressionType.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Enums
-{
- public enum LinqExpressionType
- {
- Equal = 0,//=
- NotEqual = 1,//!=
- GreaterThan,//>
- LessThan,//<
- ThanOrEqual,//>=
- LessThanOrEqual,//<=
- In,
- Contains,//Contains
- NotContains//NotContains
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
deleted file mode 100644
index 11c36c0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
+++ /dev/null
@@ -1,161 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Enums
-{
- /// <summary>
- /// 鍚鐘舵��
- /// </summary>
- public enum EnableEnum
- {
- /// <summary>
- /// 鍏ㄩ儴
- /// </summary>
- [Description("鍏ㄩ儴")]
- All = -1,
- /// <summary>
- /// 绂佺敤
- /// </summary>
- [Description("绂佺敤")]
- Disable = 0,
- /// <summary>
- /// 鍚敤
- /// </summary>
- [Description("鍚敤")]
- Enable = 1,
- }
- /// <summary>
- /// 璐т綅鐘舵��
- /// </summary>
- public enum LocationEnum
- {
- /// <summary>
- /// 鍏ㄩ儴
- /// </summary>
- [Description("鍏ㄩ儴")]
- All = -1,
- /// <summary>
- /// 绌洪棽
- /// </summary>
- [Description("绌洪棽")]
- Free = 0,
- /// <summary>
- /// 閿佸畾
- /// </summary>
- [Description("閿佸畾")]
- Lock = 1,
- [Description("鏈夎揣")]
- InStock = 2,
- [Description("鏈夎揣绂佺敤")]
- InStockDisable = 3,
- [Description("鏃犺揣绂佺敤")]
- FreeDisable = 4,
- }
- #region 浠诲姟绫诲瀷
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- public enum TaskTypeEmun
- {
- //鍑哄簱 =100
- //鐩樼偣鍑哄簱=101
- //鍒嗘嫞鍑哄簱=102
- //璐ㄦ鍑哄簱=103
- //鍏ュ簱=200
- //鐩樼偣鍏ュ簱=201
- //鍒嗘嫞鍏ュ簱=202
- //璐ㄦ鍏ュ簱=203
- //绉诲簱=300
- //搴撳唴绉诲簱=301
- //搴撳绉诲簱=302
- }
- #endregion
-
- #region 浠诲姟鐘舵��
- /// <summary>
- /// 浠诲姟鐘舵��
- /// </summary>
- public enum TaskStatusEmun
- {
- 鏂板缓鍏ュ簱浠诲姟 = 0,
- AGV鍏ュ簱鎵ц涓� = 100,
- AGV鍏ュ簱瀹屾垚 = 101,
- 杈撻�佺嚎鍏ュ簱鎵ц涓� = 102,
- 杈撻�佺嚎鍏ュ簱瀹屾垚 = 103,
- 鍫嗗灈鏈哄叆搴撴墽琛屼腑 = 104,
- 鍫嗗灈鏈哄叆搴撳畬鎴� = 105,
- 鍏ュ簱浠诲姟鍙栨秷 = 106,
- 鍏ュ簱浠诲姟瀹屾垚 = 107,
- 鍏ュ簱浠诲姟寮傚父 =999
- }
- #endregion
-
- #region 鍘熷鍗曟嵁鍚屾鐘舵��
- /// <summary>
- /// 鍚屾鏍囧織 0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐�
- /// </summary>
- public enum SynchronizationFlagEmun
- {
- 鏈悓姝� = 0,
- 鍚屾鎴愬姛 = 1,
- 鍚屾澶辫触 = 2
- }
- #endregion
-
- #region 鍏ュ簱鍗曟嵁鐘舵��
- /// <summary>
- /// 鍏ュ簱鍗曟嵁鐘舵�� 0锛屾湭寮�濮� 1锛岀粍鐩樹腑 2锛屽畬鎴愮粍鐩� 3锛屽叆搴撲腑 4锛屽凡鍏ュ簱
- /// </summary>
- public enum InboundStateEmun
- {
- 鏈紑濮� = 0,
- 缁勭洏涓� = 1,
- 瀹屾垚缁勭洏 = 2,
- 鍏ュ簱涓� = 3,
- 宸插叆搴� = 4
- }
-
- #endregion
-
- #region 缁勭洏绫诲瀷
- /// <summary>
- /// 鍚屾鏍囧織 0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐�
- /// </summary>
- public enum GroupTypeEmun
- {
- 涓�娆＄粍鐩� = 1,
- 浜屾缁勭洏 = 2
- }
- #endregion
-
- #region 搴撳瓨鐘舵��
- /// <summary>
- /// 搴撳瓨鐘舵�侊細 1锛岀粍鐩樻殏瀛� 2锛岀粍鐩樻挙閿� 3锛屽叆搴撶‘璁� 4锛屽凡鍏ュ簱 5锛屽凡鍑哄簱
- /// </summary>
- public enum StockStateEmun
- {
- 缁勭洏鏆傚瓨 = 1,
- 缁勭洏鎾ら攢 = 2,
- 鍏ュ簱纭 = 3,
- 宸插叆搴� = 4,
- 宸插嚭搴� = 5
- }
- #endregion
-
- #region 璐т綅鐘舵��
- public enum LocationStatus
- {
- 绌洪棽 =0,
- 鏈夎揣 = 1,
- 閿佸畾 = 2,
- 鏈夎揣绂佺敤 = 3,
- 鏃犺揣绂佺敤 = 4
- }
- #endregion
-
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/AllOptionRegister.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/AllOptionRegister.cs"
deleted file mode 100644
index 93eefc0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/AllOptionRegister.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Core;
-
-namespace WIDESEA_Core.Extensions
-{
- public static class AllOptionRegister
- {
- public static void AddAllOptionRegister(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- foreach (var optionType in App.EffectiveTypes.Where(s =>
- !s.IsInterface && typeof(IConfigurableOptions).IsAssignableFrom(s)))
- {
- services.AddConfigurableOptions(optionType);
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/ApplicationSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/ApplicationSetup.cs"
deleted file mode 100644
index 404bf07..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/ApplicationSetup.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Builder;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Extensions
-{
- public static class ApplicationSetup
- {
- public static void UseApplicationSetup(this WebApplication app)
- {
- app.Lifetime.ApplicationStarted.Register(() =>
- {
- App.IsRun = true;
- });
-
- app.Lifetime.ApplicationStopped.Register(() =>
- {
- App.IsRun = false;
-
- //娓呴櫎鏃ュ織
- //Log.CloseAndFlush();
- });
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/AutofacModuleRegister.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/AutofacModuleRegister.cs"
deleted file mode 100644
index 8da6ce0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/AutofacModuleRegister.cs"
+++ /dev/null
@@ -1,65 +0,0 @@
-锘縰sing Autofac;
-using Autofac.Extras.DynamicProxy;
-using log4net;
-using Microsoft.Extensions.DependencyModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Loader;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.AOP;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Extensions
-{
- public class AutofacModuleRegister : Autofac.Module
- {
- //private static readonly ILog log = LogManager.GetLogger(typeof(AutofacModuleRegister));
- protected override void Load(ContainerBuilder builder)
- {
- var cacheType = new List<Type>();
-
- builder.RegisterType<LogAOP>();
- cacheType.Add(typeof(LogAOP));
-
- builder.RegisterGeneric(typeof(RepositoryBase<>)).As(typeof(IRepository<>)).InstancePerDependency();//娉ㄥ唽浠撳偍
- builder.RegisterGeneric(typeof(ServiceBase<,>)).As(typeof(IService<>)).InstancePerDependency();//娉ㄥ唽鏈嶅姟
-
- Type baseType = typeof(IDependency);
-
- List<RuntimeLibrary> compilationLibrary = DependencyContext.Default
- .RuntimeLibraries
- .Where(x => !x.Serviceable
- && x.Type == "project")
- .ToList();
- List<Assembly> assemblyList = new List<Assembly>();
- foreach (var library in compilationLibrary)
- {
- try
- {
- assemblyList.Add(AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName(library.Name)));
- }
- catch (Exception ex)
- {
- Console.WriteLine(library.Name + ex.Message);
- }
- }
-
- builder.RegisterAssemblyTypes(assemblyList.ToArray()).Where(x => !x.IsInterface && !x.IsAbstract && baseType.IsAssignableFrom(x))
- .AsImplementedInterfaces()
- .PropertiesAutowired()
- .InstancePerDependency().
- EnableInterfaceInterceptors()
- .InterceptedBy(cacheType.ToArray());
-
- builder.RegisterType<UnitOfWorkManage>().As<IUnitOfWorkManage>()
- .AsImplementedInterfaces()
- .InstancePerLifetimeScope()
- .PropertiesAutowired();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/CorsSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/CorsSetup.cs"
deleted file mode 100644
index e449a0e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/CorsSetup.cs"
+++ /dev/null
@@ -1,56 +0,0 @@
-锘縰sing Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Extensions
-{
- /// <summary>
- /// Cors 璺ㄥ煙
- /// </summary>
- public static class CorsSetup
- {
- /// <summary>
- /// 璺ㄥ煙
- /// </summary>
- /// <param name="services"></param>
- /// <exception cref="ArgumentNullException"></exception>
- public static void AddCorsSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- services.AddCors(c =>
- {
- if (!AppSettings.app(new string[] { "Cors", "EnableAllIPs" }).ObjToBool())
- {
- c.AddPolicy(AppSettings.app(new string[] {"Cors", "PolicyName" }),
-
- policy =>
- {
- policy
- .WithOrigins(AppSettings.app(new string[] { "Cors", "IPs" }).Split(','))
- .AllowAnyHeader()//Ensures that the policy allows any header.
- .AllowAnyMethod();
- });
- }
- else
- {
- //鍏佽浠绘剰璺ㄥ煙璇锋眰
- c.AddPolicy(AppSettings.app(new string[] { "Cors", "PolicyName" }),
- policy =>
- {
- policy
- .SetIsOriginAllowed((host) => true)
- .AllowAnyMethod()
- .AllowAnyHeader()
- .AllowCredentials();
- });
- }
-
- });
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/DbSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/DbSetup.cs"
deleted file mode 100644
index dba095c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/DbSetup.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Seed;
-
-namespace WIDESEA_Core
-{
- /// <summary>
- /// Db 鍚姩鏈嶅姟
- /// </summary>
- public static class DbSetup
- {
- public static void AddDbSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- services.AddScoped<DBSeed>();
- services.AddScoped<DBContext>();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/HttpContextSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/HttpContextSetup.cs"
deleted file mode 100644
index 2615700..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/HttpContextSetup.cs"
+++ /dev/null
@@ -1,30 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.HttpContextUser;
-
-namespace WIDESEA_Core.Extensions
-{
- /// <summary>
- /// HttpContext 鐩稿叧鏈嶅姟
- /// </summary>
- public static class HttpContextSetup
- {
- /// <summary>
- /// HttpContext 鐩稿叧鏈嶅姟
- /// </summary>
- /// <param name="services"></param>
- /// <exception cref="ArgumentNullException"></exception>
- public static void AddHttpContextSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
- services.AddScoped<IUser, AspNetUser>();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/InitializationHostServiceSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/InitializationHostServiceSetup.cs"
deleted file mode 100644
index 9acbd1e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/InitializationHostServiceSetup.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Extensions
-{
- public static class InitializationHostServiceSetup
- {
- /// <summary>
- /// 搴旂敤鍒濆鍖栨湇鍔℃敞鍏�
- /// </summary>
- /// <param name="services"></param>
- public static void AddInitializationHostServiceSetup(this IServiceCollection services)
- {
- if (services is null)
- {
- ArgumentNullException.ThrowIfNull(nameof(services));
- }
- services.AddHostedService<SeedDataHostedService>();//绉嶅瓙鏁版嵁
- //services.AddHostedService<QuartzJobHostedService>();
- //services.AddHostedService<ConsulHostedService>();
- //services.AddHostedService<EventBusHostedService>();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/IpPolicyRateLimitSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/IpPolicyRateLimitSetup.cs"
deleted file mode 100644
index 9684dfa..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/IpPolicyRateLimitSetup.cs"
+++ /dev/null
@@ -1,43 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Extensions
-{
- /// <summary>
- /// IPLimit闄愭祦 鍚姩鏈嶅姟
- /// </summary>
- public static class IpPolicyRateLimitSetup
- {
- public static void AddIpPolicyRateLimitSetup(this IServiceCollection services, IConfiguration Configuration)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- // needed to store rate limit counters and ip rules
- //services.AddMemoryCache();
-
- //load general configuration from appsettings.json
- //services.Configure<IpRateLimitOptions>(Configuration.GetSection("IpRateLimiting"));
-
- // inject counter and rules stores
- //services.AddSingleton<IIpPolicyStore, MemoryCacheIpPolicyStore>();
- //services.AddSingleton<IRateLimitCounterStore, MemoryCacheRateLimitCounterStore>();
- //services.AddSingleton<IProcessingStrategy, AsyncKeyLockProcessingStrategy>();
-
- // inject counter and rules distributed cache stores
- //services.AddSingleton<IIpPolicyStore, DistributedCacheIpPolicyStore>();
- //services.AddSingleton<IRateLimitCounterStore, DistributedCacheRateLimitCounterStore>();
-
- // the clientId/clientIp resolvers use it.
- //services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-
- // configuration (resolvers, counter key builders)
- //services.AddSingleton<IRateLimitConfiguration, RateLimitConfiguration>();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/JobSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/JobSetup.cs"
deleted file mode 100644
index 1851aa6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/JobSetup.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Extensions
-{
-
- /// <summary>
- /// 浠诲姟璋冨害 鍚姩鏈嶅姟
- /// </summary>
- public static class JobSetup
- {
- public static void AddJobSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/MemoryCacheSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/MemoryCacheSetup.cs"
deleted file mode 100644
index 4d3a5ab..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/MemoryCacheSetup.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using System;
-using WIDESEA_Core.Caches;
-
-namespace WIDESEA_Core.Extensions
-{
- /// <summary>
- /// Memory缂撳瓨 鍚姩鏈嶅姟
- /// </summary>
- public static class MemoryCacheSetup
- {
- public static void AddMemoryCacheSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- services.AddScoped<ICaching, Caching>();
- services.AddSingleton<IMemoryCache>(factory =>
- {
- var value = factory.GetRequiredService<IOptions<MemoryCacheOptions>>();
- var cache = new MemoryCache(value);
- return cache;
- });
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/MiniProfilerSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/MiniProfilerSetup.cs"
deleted file mode 100644
index 3ceecb8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/MiniProfilerSetup.cs"
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縰sing Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Extensions
-{
- /// <summary>
- /// MiniProfiler 鎬ц兘鍒嗘瀽
- /// </summary>
- public static class MiniProfilerSetup
- {
- /// <summary>
- /// 鎬ц兘鍒嗘瀽
- /// </summary>
- /// <param name="services"></param>
- /// <exception cref="ArgumentNullException"></exception>
- public static void AddMiniProfilerSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
- //if (AppSettings.app(new string[] { "Startup", "MiniProfiler", "Enabled" }).ObjToBool())
- //{
- services.AddMiniProfiler(options =>
- {
- options.RouteBasePath = "/profiler";
- });
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SqlsugarSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SqlsugarSetup.cs"
deleted file mode 100644
index 364bbff..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SqlsugarSetup.cs"
+++ /dev/null
@@ -1,143 +0,0 @@
-锘縰sing Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection;
-using SqlSugar;
-using StackExchange.Profiling;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.AOP;
-using WIDESEA_Core.DB;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.LogHelper;
-using WIDESEA_Core.Seed;
-
-namespace WIDESEA_Core
-{
- /// <summary>
- /// SqlSugar 鍚姩鏈嶅姟
- /// </summary>
- public static class SqlsugarSetup
- {
- private static readonly MemoryCache Cache = new MemoryCache(new MemoryCacheOptions());
-
- public static void AddSqlsugarSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- // 榛樿娣诲姞涓绘暟鎹簱杩炴帴
- //MainDb.CurrentDbConnId = AppSettings.app(new string[] { "MainDB" });
-
- // SqlSugarScope鏄嚎绋嬪畨鍏紝鍙娇鐢ㄥ崟渚嬫敞鍏�
- // 鍙傝�冿細https://www.donet5.com/Home/Doc?typeId=1181
- services.AddScoped<ISqlSugarClient>(o =>
- {
- var memoryCache = o.GetRequiredService<IMemoryCache>();
-
- // 杩炴帴瀛楃涓�
- var listConfig = new List<ConnectionConfig>
- {
- new ConnectionConfig
- {
- ConfigId = MainDb.CurrentDbConnId,
- ConnectionString = DBContext.GetMainConnectionDb().Connection,
- IsAutoCloseConnection = true,
- DbType = MainDb.DbType,
- AopEvents = new AopEvents
- {
- OnLogExecuting = (sql, p) =>
- {
- Parallel.For(0, 1, e =>
- {
- MiniProfiler.Current.CustomTiming("SQL锛�", GetParas(p) + "銆怱QL璇彞銆戯細" + sql);
- });
- }
- }
- }
- };
- #region 浠庡簱
- //var listConfig_Slave = new List<SlaveConnectionConfig>();
- //BaseDBConfig.MutiConnectionString.ForEach(s =>
- //{
- // if(s.ConnId != MainDb.CurrentDbConnId)
- // {
- // listConfig_Slave.Add(new SlaveConnectionConfig()
- // {
- // HitRate = s.HitRate,
- // ConnectionString = s.Connection
- // });
- // }
-
- //});
-
- //BaseDBConfig.MutiConnectionString.ForEach(m =>
- //{
- // listConfig.Add(new ConnectionConfig()
- // {
- // ConfigId = m.ConnId.ObjToString().ToLower(),
- // ConnectionString = m.Connection,
- // DbType = (DbType)m.DbType,
- // IsAutoCloseConnection = true,
- // MoreSettings = new ConnMoreSettings()
- // {
- // //IsWithNoLockQuery = true,
- // IsAutoRemoveDataCache = true
- // },
- // // 浠庡簱
- // //SlaveConnectionConfigs = listConfig_Slave,
- // // 鑷畾涔夌壒鎬�
- // ConfigureExternalServices = new ConfigureExternalServices()
- // {
- // DataInfoCacheService = new SqlSugarMemoryCacheService(memoryCache),
- // EntityService = (property, column) =>
- // {
- // if (column.IsPrimarykey && property.PropertyType == typeof(int))
- // {
- // column.IsIdentity = true;
- // }
- // }
- // },
- // InitKeyType = InitKeyType.Attribute,
- // AopEvents = new AopEvents()
- // {
- // OnError = x =>
- // {
- // Console.WriteLine(x.Sql);
- // }
- // }
- // }
- // );
- //});
- #endregion
-
- SqlSugarClient sqlSugarClient = new SqlSugarClient(listConfig, db =>
- {
- db.Aop.DataExecuting = SqlSugarAop.DataExecuting;
- });
- return sqlSugarClient;
- });
- }
-
- private static string GetWholeSql(SugarParameter[] paramArr, string sql)
- {
- foreach (var param in paramArr)
- {
- sql.Replace(param.ParameterName, param.Value.ObjToString());
- }
-
- return sql;
- }
-
- private static string GetParas(SugarParameter[] pars)
- {
- string key = "銆怱QL鍙傛暟銆戯細";
- foreach (var param in pars)
- {
- key += $"{param.ParameterName}:{param.Value}\n";
- }
-
- return key;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs"
deleted file mode 100644
index b0f70df..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs"
+++ /dev/null
@@ -1,134 +0,0 @@
-锘縰sing log4net;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-using static WIDESEA_Core.Extensions.CustomApiVersion;
-using Swashbuckle.AspNetCore.Filters;
-
-namespace WIDESEA_Core.Extensions
-{
- /// <summary>
- /// Swagger
- /// </summary>
- public static class SwaggerSetup
- {
-
- private static readonly ILog log =
- LogManager.GetLogger(typeof(SwaggerSetup));
- /// <summary>
- /// Swagger
- /// </summary>
- /// <param name="services"></param>
- /// <exception cref="ArgumentNullException"></exception>
- public static void AddSwaggerSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- var basePath = AppContext.BaseDirectory;
- //var basePath2 = Microsoft.DotNet.PlatformAbstractions.ApplicationEnvironment.ApplicationBasePath;
- var ApiName = AppSettings.app(new string[] { "ApiName" });
-
- services.AddSwaggerGen(c =>
- {
- //閬嶅巻鍑哄叏閮ㄧ殑鐗堟湰锛屽仛鏂囨。淇℃伅灞曠ず
- typeof(ApiVersions).GetEnumNames().ToList().ForEach(version =>
- {
- c.SwaggerDoc(version, new OpenApiInfo
- {
- Version = version,
- Title = $"{ApiName} 鎺ュ彛鏂囨。鈥斺�攞RuntimeInformation.FrameworkDescription}",
- Description = $"{ApiName} HTTP API " + version,
- //Contact = new OpenApiContact { Name = ApiName, Email = "Blog.Core@xxx.com", Url = new Uri("https://neters.club") },
- //License = new OpenApiLicense { Name = ApiName + " 瀹樻柟鏂囨。", Url = new Uri("http://apk.neters.club/.doc/") }
- });
- //c.OrderActionsBy(o => o.RelativePath);
- });
-
- c.UseInlineDefinitionsForEnums();
- try
- {
- //杩欎釜灏辨槸鍒氬垰閰嶇疆鐨剎ml鏂囦欢鍚�
- //var xmlPath = Path.Combine(basePath, "Blog.Core.xml");
- //榛樿鐨勭浜屼釜鍙傛暟鏄痜alse锛岃繖涓槸controller鐨勬敞閲婏紝璁板緱淇敼
- //c.IncludeXmlComments(xmlPath, true);
-
- //杩欎釜灏辨槸Model灞傜殑xml鏂囦欢鍚�
- //var xmlModelPath = Path.Combine(basePath, "Blog.Core.Model.xml");
- //c.IncludeXmlComments(xmlModelPath);
- }
- catch (Exception ex)
- {
- log.Error("Blog.Core.xml鍜孊log.Core.Model.xml 涓㈠け锛岃妫�鏌ュ苟鎷疯礉銆俓n" + ex.Message);
- }
-
- // 寮�鍚姞鏉冨皬閿�
- c.OperationFilter<AddResponseHeadersFilter>();
- c.OperationFilter<AppendAuthorizeToSummaryOperationFilter>();
-
- // 鍦╤eader涓坊鍔爐oken锛屼紶閫掑埌鍚庡彴
- //c.OperationFilter<SecurityRequirementsOperationFilter>();
-
- c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
- {
- Description = "JWT鎺堟潈token鍓嶉潰闇�瑕佸姞涓婂瓧娈礏earer涓庝竴涓┖鏍�,濡侭earer token",
- Name = "Authorization",
- In = ParameterLocation.Header,
- Type = SecuritySchemeType.ApiKey,
- BearerFormat = "JWT",
- Scheme = "Bearer"
- });
-
- c.AddSecurityRequirement(new OpenApiSecurityRequirement
- {
- {
- new OpenApiSecurityScheme
- {
- Reference = new OpenApiReference {
- Type = ReferenceType.SecurityScheme,
- Id = "Bearer"
- }
- },
- new string[] { }
- }
- });
- }).AddControllers()
- .ConfigureApiBehaviorOptions(options =>
- {
- options.SuppressConsumesConstraintForFormFileParameters = true;
- options.SuppressInferBindingSourcesForParameters = true;
- options.SuppressModelStateInvalidFilter = true;
- options.SuppressMapClientErrors = true;
- options.ClientErrorMapping[404].Link =
- "https://*/404";
- });
- //services.AddSwaggerGenNewtonsoftSupport();
- }
- }
-
- /// <summary>
- /// 鑷畾涔夌増鏈�
- /// </summary>
- public class CustomApiVersion
- {
- /// <summary>
- /// Api鎺ュ彛鐗堟湰 鑷畾涔�
- /// </summary>
- public enum ApiVersions
- {
- /// <summary>
- /// V1 鐗堟湰
- /// </summary>
- V1 = 1,
- /// <summary>
- /// V2 鐗堟湰
- /// </summary>
- V2 = 2,
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs"
deleted file mode 100644
index 456a451..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs"
+++ /dev/null
@@ -1,90 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc.Filters;
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
-using System.Runtime;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Authorization;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Filter
-{
- /// <summary>
- /// 鍒ゆ柇token鏄惁姝ｇ‘
- /// </summary>
- public class ApiAuthorizeFilter : IAuthorizationFilter
- {
- private static readonly string replaceTokenPath = "/api/User/replaceToken";
-
- public ApiAuthorizeFilter()
- {
-
- }
-
- /// <summary>
- /// 鍙垽鏂璽oken鏄惁姝ｇ‘锛屼笉鍒ゆ柇鏉冮檺
- /// 濡傛灉闇�瑕佸垽鏂潈闄愮殑鍦ˋction涓婂姞涓夾piActionPermission灞炴�ф爣璇嗘潈闄愮被鍒紝ActionPermissionFilter浣滄潈闄愬鐞�
- ///(string,string,string)1銆佽姹傚弬鏁�,2銆佽繑鍥炴秷鎭紝3,寮傚父娑堟伅,4鐘舵��
- /// </summary>
- /// <param name="context"></param>
- public void OnAuthorization(AuthorizationFilterContext context)
- {
- // is Microsoft.AspNetCore.Authentication.AllowAnonymousAttribute
- //if (context.Filters.Any(item => item is IAllowAnonymousFilter))
- if (context.ActionDescriptor.EndpointMetadata.Any(item => item is IAllowAnonymous))
- {
- //if (context.Filters
- // .Where(item => item is IApiTaskFilter)
- // .FirstOrDefault() is IApiTaskFilter apiTaskFilter)
- //{
- // apiTaskFilter.OnAuthorization(context);
- // return;
- //}
- //濡傛灉浣跨敤浜嗗浐瀹歍oken涓嶈繃鏈燂紝鐩存帴瀵箃oken鐨勫悎娉曟�у強token鏄惁瀛樺湪杩涜楠岃瘉
- if (context.Filters
- .Where(item => item is IFixedTokenFilter)
- .FirstOrDefault() is IFixedTokenFilter tokenFilter)
- {
- tokenFilter.OnAuthorization(context);
- return;
- }
- //鍖垮悕骞朵紶鍏ヤ簡token锛岄渶瑕佸皢鐢ㄦ埛鐨処D缂撳瓨璧锋潵锛屼繚璇乁serHelper閲岃兘姝ｇ‘鑾峰彇鍒扮敤鎴蜂俊鎭�
- if (!context.HttpContext.User.Identity.IsAuthenticated
- && !string.IsNullOrEmpty(context.HttpContext.Request.Headers[AppSecret.TokenHeaderName]))
- {
- context.AddIdentity();
- }
- return;
- }
- //闄愬畾涓�涓笎鍙蜂笉鑳藉湪澶氬鐧婚檰 UserContext.Current.Token != ((ClaimsIdentity)context.HttpContext.User.Identity)?.BootstrapContext?.ToString()
-
- // &&UserContext.Current.UserName!="admin666"涓烘紨绀虹幆澧冿紝瀹為檯浣跨敤鏃跺幓鎺夋鏉′欢
- //if (!context.HttpContext.User.Identity.IsAuthenticated
- // || (
- // UserContext.Current.Token != ((ClaimsIdentity)context.HttpContext.User.Identity)
- // ?.BootstrapContext?.ToString()
- // && UserContext.Current.UserName != "admin666"
- // ))
- //{
- // Console.Write($"IsAuthenticated:{context.HttpContext.User.Identity.IsAuthenticated}," +
- // $"userToken{UserContext.Current.Token}" +
- // $"BootstrapContext:{((ClaimsIdentity)context.HttpContext.User.Identity)?.BootstrapContext?.ToString()}");
- // context.Unauthorized("鐧婚檰宸茶繃鏈�");
- // return;
- //}
-
- DateTime expDate = context.HttpContext.User.Claims.Where(x => x.Type == JwtRegisteredClaimNames.Exp)
- .Select(x => x.Value).FirstOrDefault().GetTimeSpmpToDate();
- //鍔ㄦ�佹爣璇嗗埛鏂皌oken(2021.05.01)
- int ExpMinutes = AppSettings.app("ExpMinutes").ObjToInt();
- if ((expDate - DateTime.Now).TotalMinutes < ExpMinutes / 3 && context.HttpContext.Request.Path != replaceTokenPath)
- {
- context.HttpContext.Response.Headers.Add("widesea_exp", "1");
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ExporterHeaderFilter.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ExporterHeaderFilter.cs"
deleted file mode 100644
index 81dc421..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ExporterHeaderFilter.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core.Filters;
-using Magicodes.ExporterAndImporter.Core.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Filter
-{
- public class ExporterHeaderFilter : IExporterHeaderFilter
- {
- /// <summary>
- /// 琛ㄥご绛涢�夊櫒锛堜慨鏀瑰悕绉帮級
- /// </summary>
- /// <param name="exporterHeaderInfo"></param>
- /// <returns></returns>
- public ExporterHeaderInfo Filter(ExporterHeaderInfo exporterHeaderInfo)
- {
- return exporterHeaderInfo;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/GlobalExceptionsFilter.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/GlobalExceptionsFilter.cs"
deleted file mode 100644
index b8e02ba..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/GlobalExceptionsFilter.cs"
+++ /dev/null
@@ -1,93 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
-using StackExchange.Profiling;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-using System.Reflection.Metadata;
-using WIDESEA_Core.LogHelper;
-
-namespace WIDESEA_Core.Filter
-{
- /// <summary>
- /// 鍏ㄥ眬寮傚父閿欒鏃ュ織
- /// </summary>
- public class GlobalExceptionsFilter : IExceptionFilter
- {
- private readonly IWebHostEnvironment _env;
- private readonly ILogger<GlobalExceptionsFilter> _loggerHelper;
-
- public GlobalExceptionsFilter(IWebHostEnvironment env, ILogger<GlobalExceptionsFilter> loggerHelper)
- {
- _env = env;
- _loggerHelper = loggerHelper;
- }
-
- public void OnException(ExceptionContext context)
- {
- var json = new WebResponseContent();
-
- json.Message = context.Exception.Message;//閿欒淇℃伅
- json.Code = 500;//500寮傚父
- var errorAudit = "Unable to resolve service for";
- if (!string.IsNullOrEmpty(json.Message) && json.Message.Contains(errorAudit))
- {
- json.Message = json.Message.Replace(errorAudit, $"锛堣嫢鏂版坊鍔犳湇鍔★紝闇�瑕侀噸鏂扮紪璇戦」鐩級{errorAudit}");
- }
-
- if (_env.EnvironmentName.ObjToString().Equals("Development"))
- {
- json.DevMessage = context.Exception.StackTrace;//鍫嗘爤淇℃伅
- }
- var res = new ContentResult();
- res.Content = json.Serialize();
-
- context.Result = res;
- MiniProfiler.Current.CustomTiming("Errors锛�", json.Message);
-
- LogLock.OutLogAOP("鍏ㄥ眬寮傚父閿欒鏃ュ織", new string[] { json.Message + WriteLog(json.Message, context.Exception) });
- //閲囩敤log4net 杩涜閿欒鏃ュ織璁板綍
- //_loggerHelper.LogError(json.Message + WriteLog(json.Message, context.Exception));
- }
-
- /// <summary>
- /// 鑷畾涔夎繑鍥炴牸寮�
- /// </summary>
- /// <param name="throwMsg"></param>
- /// <param name="ex"></param>
- /// <returns></returns>
- public string WriteLog(string throwMsg, Exception ex)
- {
- return string.Format("\r\n銆愯嚜瀹氫箟閿欒銆戯細{0} \r\n銆愬紓甯哥被鍨嬨�戯細{1} \r\n銆愬紓甯镐俊鎭�戯細{2} \r\n銆愬爢鏍堣皟鐢ㄣ�戯細{3}", new object[] { throwMsg,
- ex.GetType().Name, ex.Message, ex.StackTrace });
- }
-
- }
- public class InternalServerErrorObjectResult : ObjectResult
- {
- public InternalServerErrorObjectResult(object value) : base(value)
- {
- StatusCode = StatusCodes.Status500InternalServerError;
- }
- }
- //杩斿洖閿欒淇℃伅
- public class JsonErrorResponse
- {
- /// <summary>
- /// 鐢熶骇鐜鐨勬秷鎭�
- /// </summary>
- public string Message { get; set; }
- /// <summary>
- /// 寮�鍙戠幆澧冪殑娑堟伅
- /// </summary>
- public string DevelopmentMessage { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/IFixedTokenFilter.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/IFixedTokenFilter.cs"
deleted file mode 100644
index 99368a2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/IFixedTokenFilter.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc.Filters;
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
-using System.Net;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Authorization;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Filter
-{
- public interface IFixedTokenFilter : IFilterMetadata
- {
- AuthorizationFilterContext OnAuthorization(AuthorizationFilterContext context);
- }
- public class FixedTokenAttribute : Attribute, IFixedTokenFilter, IAllowAnonymous
- {
- public AuthorizationFilterContext OnAuthorization(AuthorizationFilterContext context)
- {
- string fixedoken = "";
- //濡傛灉token宸插け鏁堬紝鐩存帴鑾峰彇header閲岀殑token
- if (!context.HttpContext.User.Identity.IsAuthenticated)
- {
- fixedoken = context.HttpContext.Request.Headers[AppSecret.TokenHeaderName];
- fixedoken = fixedoken?.Replace("Bearer ", "");
- //鍒ゆ柇鏄惁浼犲叆浜唗oken
- if (string.IsNullOrEmpty(fixedoken))
- {
- return context.Unauthorized("娌℃湁浼犲叆token");
- }
- //瑙ｆ瀽token
- int userId = JwtHelper.GetUserId(fixedoken);
- if (userId <= 0)
- {
- return context.Unauthorized("token涓嶆纭�");
- }
- context.AddIdentity(userId);
- }
- else
- {
- fixedoken = ((ClaimsIdentity)context.HttpContext.User.Identity)
- ?.BootstrapContext?.ToString();
- }
- //鍒ゆ柇褰撳墠鐢ㄦ埛鐨則oken涓庣紦瀛樼殑token鏄惁鐩稿悓
- if (App.User.Token != fixedoken)
- {
- context.FilterResult(HttpStatusCode.Unauthorized, "token宸插け鏁�");
- }
- return context;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/UseServiceDIAttribute.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/UseServiceDIAttribute.cs"
deleted file mode 100644
index be1d4a8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/UseServiceDIAttribute.cs"
+++ /dev/null
@@ -1,38 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Filter
-{
- public class UseServiceDIAttribute : ActionFilterAttribute
- {
-
- protected readonly ILogger<UseServiceDIAttribute> _logger;
- //private readonly IBlogArticleServices _blogArticleServices;
- private readonly string _name;
-
- public UseServiceDIAttribute(ILogger<UseServiceDIAttribute> logger/*, IBlogArticleServices blogArticleServices*/, string Name = "")
- {
- _logger = logger;
- /*_blogArticleServices = blogArticleServices;*/
- _name = Name;
- }
-
-
- public override void OnActionExecuted(ActionExecutedContext context)
- {
- //var dd =await _blogArticleServices.Query();
- base.OnActionExecuted(context);
- DeleteSubscriptionFiles();
- }
-
- private void DeleteSubscriptionFiles()
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AppSettings.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AppSettings.cs"
deleted file mode 100644
index 1245695..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AppSettings.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing Microsoft.Extensions.Configuration.Json;
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- /// <summary>
- /// appsettings.json鎿嶄綔绫�
- /// </summary>
- public class AppSettings
- {
- public static IConfiguration Configuration { get; set; }
- static string contentPath { get; set; }
-
- public AppSettings(string contentPath)
- {
- string Path = "appsettings.json";
-
- //濡傛灉浣犳妸閰嶇疆鏂囦欢 鏄� 鏍规嵁鐜鍙橀噺鏉ュ垎寮�浜嗭紝鍙互杩欐牱鍐�
- //Path = $"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json";
-
- Configuration = new ConfigurationBuilder()
- .SetBasePath(contentPath)
- .Add(new JsonConfigurationSource { Path = Path, Optional = false, ReloadOnChange = true })//杩欐牱鐨勮瘽锛屽彲浠ョ洿鎺ヨ鐩綍閲岀殑json鏂囦欢锛岃�屼笉鏄� bin 鏂囦欢澶逛笅鐨勶紝鎵�浠ヤ笉鐢ㄤ慨鏀瑰鍒跺睘鎬�
- .Build();
- }
-
- public AppSettings(IConfiguration configuration)
- {
- Configuration = configuration;
- }
-
- /// <summary>
- /// 灏佽瑕佹搷浣滅殑瀛楃
- /// </summary>
- /// <param name="sections">鑺傜偣閰嶇疆</param>
- /// <returns></returns>
- public static string app(params string[] sections)
- {
- try
- {
-
- if (sections.Any())
- {
- return Configuration[string.Join(":", sections)];
- }
- }
- catch (Exception) { }
-
- return "";
- }
-
- /// <summary>
- /// 閫掑綊鑾峰彇閰嶇疆淇℃伅鏁扮粍
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <param name="sections"></param>
- /// <returns></returns>
- public static List<T> app<T>(params string[] sections)
- {
- List<T> list = new List<T>();
- // 寮曠敤 Microsoft.Extensions.Configuration.Binder 鍖�
- Configuration.Bind(string.Join(":", sections), list);
- return list;
- }
-
-
- /// <summary>
- /// 鏍规嵁璺緞 configuration["App:Name"];
- /// </summary>
- /// <param name="sectionsPath"></param>
- /// <returns></returns>
- public static string GetValue(string sectionsPath)
- {
- try
- {
- return Configuration[sectionsPath];
- }
- catch (Exception) { }
-
- return "";
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AutoMapperHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AutoMapperHelper.cs"
deleted file mode 100644
index cb72738..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AutoMapperHelper.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing AutoMapper;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
-
- /// <summary>
- /// AutoMapper鏄犲皠甯姪绫�
- /// AutoMapper 鐗堟湰13.0.1
- /// </summary>
- public static class AutoMapperHelper
- {
-
-
- }
-
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ConsoleHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ConsoleHelper.cs"
deleted file mode 100644
index 2cc4614..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ConsoleHelper.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public static class ConsoleHelper
- {
- private static readonly object _objLock = new();
-
- /// <summary>
- /// 鍦ㄦ帶鍒跺彴杈撳嚭
- /// </summary>
- /// <param name="str">鏂囨湰</param>
- /// <param name="color">鍓嶉鑹�</param>
- public static void WriteColorLine(string str, ConsoleColor color)
- {
- lock (_objLock)
- {
- ConsoleColor currentForeColor = Console.ForegroundColor;
- Console.ForegroundColor = color;
- Console.WriteLine(str);
- Console.ForegroundColor = currentForeColor;
- }
- }
-
- /// <summary>
- /// 鎵撳嵃閿欒淇℃伅
- /// </summary>
- /// <param name="str">寰呮墦鍗扮殑瀛楃涓�</param>
- /// <param name="color">鎯宠鎵撳嵃鐨勯鑹�</param>
- public static void WriteErrorLine(this string str, ConsoleColor color = ConsoleColor.Red) => WriteColorLine(str, color);
-
- /// <summary>
- /// 鎵撳嵃璀﹀憡淇℃伅
- /// </summary>
- /// <param name="str">寰呮墦鍗扮殑瀛楃涓�</param>
- /// <param name="color">鎯宠鎵撳嵃鐨勯鑹�</param>
- public static void WriteWarningLine(this string str, ConsoleColor color = ConsoleColor.Yellow) => WriteColorLine(str, color);
-
- /// <summary>
- /// 鎵撳嵃姝ｅ父淇℃伅
- /// </summary>
- /// <param name="str">寰呮墦鍗扮殑瀛楃涓�</param>
- /// <param name="color">鎯宠鎵撳嵃鐨勯鑹�</param>
- public static void WriteInfoLine(this string str, ConsoleColor color = ConsoleColor.White) => WriteColorLine(str, color);
-
- /// <summary>
- /// 鎵撳嵃鎴愬姛鐨勪俊鎭�
- /// </summary>
- /// <param name="str">寰呮墦鍗扮殑瀛楃涓�</param>
- /// <param name="color">鎯宠鎵撳嵃鐨勯鑹�</param>
- public static void WriteSuccessLine(this string str, ConsoleColor color = ConsoleColor.Green) => WriteColorLine(str, color);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ExportHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ExportHelper.cs"
deleted file mode 100644
index 6e9a8fc..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ExportHelper.cs"
+++ /dev/null
@@ -1,106 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Magicodes.IE.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public static class ExportHelper
- {
- public static Type CreateDynamicClass(this PropertyInfo[] propertyInfos)
- {
- string className = "DynamicClass";
- AssemblyName assemblyName = new AssemblyName("WIDESEA_Model.Models");
- AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);//瀹氫箟鍏锋湁鎸囧畾鍚嶇О鍜岃闂潈闄愮殑鍔ㄦ�佺▼搴忛泦
- ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("MainModule");//鍦ㄦ绋嬪簭闆嗕腑瀹氫箟鍛藉悕鐨勬殏鏃跺姩鎬佹ā鍧�
- TypeBuilder typeBuilder = moduleBuilder.DefineType(className, TypeAttributes.Public);//TypeBuilder:鍦ㄨ繍琛屾椂瀹氫箟骞跺垱寤虹被鐨勬柊瀹炰緥
-
- Type attributeType1 = typeof(ExcelExporterAttribute);
- MethodInfo [] methodInfos = attributeType1.GetMethods(BindingFlags.Public);
- ConstructorInfo[] constructorInfos2 = attributeType1.GetConstructors();
- ConstructorInfo constructorInfo2 = constructorInfos2[0];
- CustomAttributeBuilder customAttributeBuilder2 = new CustomAttributeBuilder(constructorInfo2, new object[] { });
-
- typeBuilder.SetCustomAttribute(customAttributeBuilder2);
-
- foreach (var property in propertyInfos)
- {
- string propertyName = property.Name;
- Type propertyType = property.PropertyType;
-
- FieldBuilder fieldBuilder = typeBuilder.DefineField("_" + propertyName, propertyType, FieldAttributes.Private);
- PropertyBuilder propertyBuilder = typeBuilder.DefineProperty(propertyName, PropertyAttributes.HasDefault, propertyType, null);
-
- SugarColumn sugarColumn = property.GetCustomAttribute<SugarColumn>();
- if (sugarColumn != null)
- {
- Type attributeType = typeof(ExporterHeaderAttribute);
- ConstructorInfo[] constructorInfos = attributeType.GetConstructors();
- ConstructorInfo constructorInfo = constructorInfos[0];
- CustomAttributeBuilder customAttributeBuilder = new CustomAttributeBuilder(constructorInfo, new object[] { sugarColumn.ColumnDescription, 11f, null, false, true, true, 0, KnownColor.Empty });
- propertyBuilder.SetCustomAttribute(customAttributeBuilder);
- }
-
- MethodAttributes getSetAttributes = MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig;
-
- MethodBuilder getMethodBuilder = typeBuilder.DefineMethod("get_" + propertyName, getSetAttributes, propertyType, Type.EmptyTypes);
- ILGenerator getIL = getMethodBuilder.GetILGenerator();
- getIL.Emit(OpCodes.Ldarg_0);
- getIL.Emit(OpCodes.Ldfld, fieldBuilder);
- getIL.Emit(OpCodes.Ret);
-
- MethodBuilder setMethodBuilder = typeBuilder.DefineMethod("set_" + propertyName, getSetAttributes, null, new Type[] { propertyType });
- ILGenerator setIL = setMethodBuilder.GetILGenerator();
- setIL.Emit(OpCodes.Ldarg_0);
- setIL.Emit(OpCodes.Ldarg_1);
- setIL.Emit(OpCodes.Stfld, fieldBuilder);
- setIL.Emit(OpCodes.Ret);
-
- propertyBuilder.SetGetMethod(getMethodBuilder);
- propertyBuilder.SetSetMethod(setMethodBuilder);
-
-
- }
-
- Type generatedType = typeBuilder.CreateType();
- return generatedType;
- }
-
- public static void SetProperty(object instance, string propertyName, object value)
- {
- Type type = instance.GetType();
- PropertyInfo propertyInfo = type.GetProperty(propertyName);
- propertyInfo.SetValue(instance, value);
- }
-
- public static object GetProperty(object instance, string propertyName)
- {
- Type type = instance.GetType();
- PropertyInfo propertyInfo = type.GetProperty(propertyName);
- return propertyInfo.GetValue(instance);
- }
-
- public static void SetValue<T>(object instance, T value)
- {
- Type type = instance.GetType();
-
- PropertyInfo[] propertyInfos = typeof(T).GetProperties();
- for (int j = 0; j < propertyInfos.Length; j++)
- {
- PropertyInfo propertyInfo = type.GetProperty(propertyInfos[j].Name);
- object obj = propertyInfos[j].GetValue(value);
- propertyInfo.SetValue(instance, obj);
- ExporterHeaderAttribute exporterHeaderAttribute = propertyInfo.GetCustomAttribute<ExporterHeaderAttribute>();
- }
-
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/FileHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/FileHelper.cs"
deleted file mode 100644
index 9a83b21..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/FileHelper.cs"
+++ /dev/null
@@ -1,428 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public class FileHelper : IDisposable
- {
-
- private bool _alreadyDispose = false;
-
- #region 鏋勯�犲嚱鏁�
- public FileHelper()
- {
-
- }
- ~FileHelper()
- {
- Dispose(); ;
- }
-
- protected virtual void Dispose(bool isDisposing)
- {
- if (_alreadyDispose) return;
- _alreadyDispose = true;
- }
- #endregion
-
- #region IDisposable 鎴愬憳
-
- public void Dispose()
- {
- Dispose(true);
- GC.SuppressFinalize(this);
- }
-
- #endregion
-
- #region 鍙栧緱鏂囦欢鍚庣紑鍚�
- /****************************************
- * 鍑芥暟鍚嶇О锛欸etPostfixStr
- * 鍔熻兘璇存槑锛氬彇寰楁枃浠跺悗缂�鍚�
- * 鍙� 鏁帮細filename:鏂囦欢鍚嶇О
- * 璋冪敤绀哄垪锛�
- * string filename = "aaa.aspx";
- * string s = EC.FileObj.GetPostfixStr(filename);
- *****************************************/
- /// <summary>
- /// 鍙栧悗缂�鍚�
- /// </summary>
- /// <param name="filename">鏂囦欢鍚�</param>
- /// <returns>.gif|.html鏍煎紡</returns>
- public static string GetPostfixStr(string filename)
- {
- int start = filename.LastIndexOf(".");
- int length = filename.Length;
- string postfix = filename.Substring(start, length - start);
- return postfix;
- }
- #endregion
-
- #region 鏍规嵁鏂囦欢澶у皬鑾峰彇鎸囧畾鍓嶇紑鐨勫彲鐢ㄦ枃浠跺悕
- /// <summary>
- /// 鏍规嵁鏂囦欢澶у皬鑾峰彇鎸囧畾鍓嶇紑鐨勫彲鐢ㄦ枃浠跺悕
- /// </summary>
- /// <param name="folderPath">鏂囦欢澶�</param>
- /// <param name="prefix">鏂囦欢鍓嶇紑</param>
- /// <param name="size">鏂囦欢澶у皬(1m)</param>
- /// <param name="ext">鏂囦欢鍚庣紑(.log)</param>
- /// <returns>鍙敤鏂囦欢鍚�</returns>
- public static string GetAvailableFileWithPrefixOrderSize(string folderPath, string prefix, int size = 1 * 1024 * 1024, string ext = ".log")
- {
- var allFiles = new DirectoryInfo(folderPath);
- var selectFiles = allFiles.GetFiles().Where(fi => fi.Name.ToLower().Contains(prefix.ToLower()) && fi.Extension.ToLower() == ext.ToLower() && fi.Length < size).OrderByDescending(d => d.Name).ToList();
-
- if (selectFiles.Count > 0)
- {
- return selectFiles.FirstOrDefault().FullName;
- }
-
- return Path.Combine(folderPath, $@"{prefix}_{DateTime.Now.DateToTimeStamp()}.log");
- }
- public static string GetAvailableFileNameWithPrefixOrderSize(string _contentRoot, string prefix, int size = 1 * 1024 * 1024, string ext = ".log")
- {
- var folderPath = Path.Combine(_contentRoot, "Log");
- if (!Directory.Exists(folderPath))
- {
- Directory.CreateDirectory(folderPath);
- }
-
- var allFiles = new DirectoryInfo(folderPath);
- var selectFiles = allFiles.GetFiles().Where(fi => fi.Name.ToLower().Contains(prefix.ToLower()) && fi.Extension.ToLower() == ext.ToLower() && fi.Length < size).OrderByDescending(d => d.Name).ToList();
-
- if (selectFiles.Count > 0)
- {
- return selectFiles.FirstOrDefault().Name.Replace(".log", "");
- }
-
- return $@"{prefix}_{DateTime.Now.DateToTimeStamp()}";
- }
- #endregion
-
- #region 鍐欐枃浠�
- /****************************************
- * 鍑芥暟鍚嶇О锛歐riteFile
- * 鍔熻兘璇存槑锛氬啓鏂囦欢,浼氳鐩栨帀浠ュ墠鐨勫唴瀹�
- * 鍙� 鏁帮細Path:鏂囦欢璺緞,Strings:鏂囨湰鍐呭
- * 璋冪敤绀哄垪锛�
- * string Path = Server.MapPath("Default2.aspx");
- * string Strings = "杩欐槸鎴戝啓鐨勫唴瀹瑰晩";
- * EC.FileObj.WriteFile(Path,Strings);
- *****************************************/
- /// <summary>
- /// 鍐欐枃浠�
- /// </summary>
- /// <param name="Path">鏂囦欢璺緞</param>
- /// <param name="Strings">鏂囦欢鍐呭</param>
- public static void WriteFile(string Path, string Strings)
- {
- if (!File.Exists(Path))
- {
- FileStream f = File.Create(Path);
- f.Close();
- }
- StreamWriter f2 = new StreamWriter(Path, false, System.Text.Encoding.GetEncoding("gb2312"));
- f2.Write(Strings);
- f2.Close();
- f2.Dispose();
- }
- /// <summary>
- /// 鍐欐枃浠�
- /// </summary>
- /// <param name="Path">鏂囦欢璺緞</param>
- /// <param name="Strings">鏂囦欢鍐呭</param>
- public static void WriteFile(string Path, byte[] buf)
- {
- if (!File.Exists(Path))
- {
- FileStream f = File.Create(Path);
- f.Close();
- }
- FileStream f2 = new FileStream(Path, FileMode.Create, FileAccess.Write);
- f2.Write(buf, 0, buf.Length);
- f2.Close();
- f2.Dispose();
- }
-
- public static void WriteFile(string Path, string fileName, byte[] buf)
- {
- if (!Directory.Exists(Path))
- {
- Directory.CreateDirectory(Path);
- }
- if (!File.Exists(Path + "\\" + fileName))
- {
- FileStream f = File.Create(Path + "\\" + fileName);
- f.Close();
- }
- FileStream f2 = new FileStream(Path + "\\" + fileName, FileMode.Create, FileAccess.Write);
- f2.Write(buf, 0, buf.Length);
- f2.Close();
- f2.Dispose();
- }
-
- /// <summary>
- /// 鍐欐枃浠�
- /// </summary>
- /// <param name="Path">鏂囦欢璺緞</param>
- /// <param name="Strings">鏂囦欢鍐呭</param>
- /// <param name="encode">缂栫爜鏍煎紡</param>
- public static void WriteFile(string Path, string Strings, Encoding encode)
- {
- if (!File.Exists(Path))
- {
- FileStream f = File.Create(Path);
- f.Close();
- }
- StreamWriter f2 = new StreamWriter(Path, false, encode);
- f2.Write(Strings);
- f2.Close();
- f2.Dispose();
- }
- #endregion
-
- #region 璇绘枃浠�
- /****************************************
- * 鍑芥暟鍚嶇О锛歊eadFile
- * 鍔熻兘璇存槑锛氳鍙栨枃鏈唴瀹�
- * 鍙� 鏁帮細Path:鏂囦欢璺緞
- * 璋冪敤绀哄垪锛�
- * string Path = Server.MapPath("Default2.aspx");
- * string s = EC.FileObj.ReadFile(Path);
- *****************************************/
- /// <summary>
- /// 璇绘枃浠�
- /// </summary>
- /// <param name="Path">鏂囦欢璺緞</param>
- /// <returns></returns>
- public static string ReadFile(string Path)
- {
- string s = "";
- if (!File.Exists(Path))
- s = "涓嶅瓨鍦ㄧ浉搴旂殑鐩綍";
- else
- {
- StreamReader f2 = new StreamReader(Path, System.Text.Encoding.GetEncoding("gb2312"));
- s = f2.ReadToEnd();
- f2.Close();
- f2.Dispose();
- }
-
- return s;
- }
-
- /// <summary>
- /// 璇绘枃浠�
- /// </summary>
- /// <param name="Path">鏂囦欢璺緞</param>
- /// <param name="encode">缂栫爜鏍煎紡</param>
- /// <returns></returns>
- public static string ReadFile(string Path, Encoding encode)
- {
- string s = "";
- if (!File.Exists(Path))
- s = "涓嶅瓨鍦ㄧ浉搴旂殑鐩綍";
- else
- {
- StreamReader f2 = new StreamReader(Path, encode);
- s = f2.ReadToEnd();
- f2.Close();
- f2.Dispose();
- }
-
- return s;
- }
- #endregion
-
- #region 杩藉姞鏂囦欢
- /****************************************
- * 鍑芥暟鍚嶇О锛欶ileAdd
- * 鍔熻兘璇存槑锛氳拷鍔犳枃浠跺唴瀹�
- * 鍙� 鏁帮細Path:鏂囦欢璺緞,strings:鍐呭
- * 璋冪敤绀哄垪锛�
- * string Path = Server.MapPath("Default2.aspx");
- * string Strings = "鏂拌拷鍔犲唴瀹�";
- * EC.FileObj.FileAdd(Path, Strings);
- *****************************************/
- /// <summary>
- /// 杩藉姞鏂囦欢
- /// </summary>
- /// <param name="Path">鏂囦欢璺緞</param>
- /// <param name="strings">鍐呭</param>
- public static void FileAdd(string Path, string strings)
- {
- StreamWriter sw = File.AppendText(Path);
- sw.Write(strings);
- sw.Flush();
- sw.Close();
- }
- #endregion
-
- #region 鎷疯礉鏂囦欢
- /****************************************
- * 鍑芥暟鍚嶇О锛欶ileCoppy
- * 鍔熻兘璇存槑锛氭嫹璐濇枃浠�
- * 鍙� 鏁帮細OrignFile:鍘熷鏂囦欢,NewFile:鏂版枃浠惰矾寰�
- * 璋冪敤绀哄垪锛�
- * string orignFile = Server.MapPath("Default2.aspx");
- * string NewFile = Server.MapPath("Default3.aspx");
- * EC.FileObj.FileCoppy(OrignFile, NewFile);
- *****************************************/
- /// <summary>
- /// 鎷疯礉鏂囦欢
- /// </summary>
- /// <param name="OrignFile">鍘熷鏂囦欢</param>
- /// <param name="NewFile">鏂版枃浠惰矾寰�</param>
- public static void FileCoppy(string orignFile, string NewFile)
- {
- File.Copy(orignFile, NewFile, true);
- }
-
- #endregion
-
- #region 鍒犻櫎鏂囦欢
- /****************************************
- * 鍑芥暟鍚嶇О锛欶ileDel
- * 鍔熻兘璇存槑锛氬垹闄ゆ枃浠�
- * 鍙� 鏁帮細Path:鏂囦欢璺緞
- * 璋冪敤绀哄垪锛�
- * string Path = Server.MapPath("Default3.aspx");
- * EC.FileObj.FileDel(Path);
- *****************************************/
- /// <summary>
- /// 鍒犻櫎鏂囦欢
- /// </summary>
- /// <param name="Path">璺緞</param>
- public static void FileDel(string Path)
- {
- File.Delete(Path);
- }
- #endregion
-
- #region 绉诲姩鏂囦欢
- /****************************************
- * 鍑芥暟鍚嶇О锛欶ileMove
- * 鍔熻兘璇存槑锛氱Щ鍔ㄦ枃浠�
- * 鍙� 鏁帮細OrignFile:鍘熷璺緞,NewFile:鏂版枃浠惰矾寰�
- * 璋冪敤绀哄垪锛�
- * string orignFile = Server.MapPath("../璇存槑.txt");
- * string NewFile = Server.MapPath("http://www.cnblogs.com/璇存槑.txt");
- * EC.FileObj.FileMove(OrignFile, NewFile);
- *****************************************/
- /// <summary>
- /// 绉诲姩鏂囦欢
- /// </summary>
- /// <param name="OrignFile">鍘熷璺緞</param>
- /// <param name="NewFile">鏂拌矾寰�</param>
- public static void FileMove(string orignFile, string NewFile)
- {
- File.Move(orignFile, NewFile);
- }
- #endregion
-
- #region 鍦ㄥ綋鍓嶇洰褰曚笅鍒涘缓鐩綍
- /****************************************
- * 鍑芥暟鍚嶇О锛欶olderCreate
- * 鍔熻兘璇存槑锛氬湪褰撳墠鐩綍涓嬪垱寤虹洰褰�
- * 鍙� 鏁帮細OrignFolder:褰撳墠鐩綍,NewFloder:鏂扮洰褰�
- * 璋冪敤绀哄垪锛�
- * string orignFolder = Server.MapPath("test/");
- * string NewFloder = "new";
- * EC.FileObj.FolderCreate(OrignFolder, NewFloder);
- *****************************************/
- /// <summary>
- /// 鍦ㄥ綋鍓嶇洰褰曚笅鍒涘缓鐩綍
- /// </summary>
- /// <param name="OrignFolder">褰撳墠鐩綍</param>
- /// <param name="NewFloder">鏂扮洰褰�</param>
- public static void FolderCreate(string orignFolder, string NewFloder)
- {
- Directory.SetCurrentDirectory(orignFolder);
- Directory.CreateDirectory(NewFloder);
- }
- #endregion
-
- #region 閫掑綊鍒犻櫎鏂囦欢澶圭洰褰曞強鏂囦欢
- /****************************************
- * 鍑芥暟鍚嶇О锛欴eleteFolder
- * 鍔熻兘璇存槑锛氶�掑綊鍒犻櫎鏂囦欢澶圭洰褰曞強鏂囦欢
- * 鍙� 鏁帮細dir:鏂囦欢澶硅矾寰�
- * 璋冪敤绀哄垪锛�
- * string dir = Server.MapPath("test/");
- * EC.FileObj.DeleteFolder(dir);
- *****************************************/
- /// <summary>
- /// 閫掑綊鍒犻櫎鏂囦欢澶圭洰褰曞強鏂囦欢
- /// </summary>
- /// <param name="dir"></param>
- /// <returns></returns>
- public static void DeleteFolder(string dir)
- {
- if (Directory.Exists(dir)) //濡傛灉瀛樺湪杩欎釜鏂囦欢澶瑰垹闄や箣
- {
- foreach (string d in Directory.GetFileSystemEntries(dir))
- {
- if (File.Exists(d))
- File.Delete(d); //鐩存帴鍒犻櫎鍏朵腑鐨勬枃浠�
- else
- DeleteFolder(d); //閫掑綊鍒犻櫎瀛愭枃浠跺す
- }
- Directory.Delete(dir); //鍒犻櫎宸茬┖鏂囦欢澶�
- }
-
- }
- #endregion
-
- #region 灏嗘寚瀹氭枃浠跺す涓嬮潰鐨勬墍鏈夊唴瀹筩opy鍒扮洰鏍囨枃浠跺す涓嬮潰 鏋滅洰鏍囨枃浠跺す涓哄彧璇诲睘鎬у氨浼氭姤閿欍��
- /****************************************
- * 鍑芥暟鍚嶇О锛欳opyDir
- * 鍔熻兘璇存槑锛氬皢鎸囧畾鏂囦欢澶逛笅闈㈢殑鎵�鏈夊唴瀹筩opy鍒扮洰鏍囨枃浠跺す涓嬮潰 鏋滅洰鏍囨枃浠跺す涓哄彧璇诲睘鎬у氨浼氭姤閿欍��
- * 鍙� 鏁帮細srcPath:鍘熷璺緞,aimPath:鐩爣鏂囦欢澶�
- * 璋冪敤绀哄垪锛�
- * string srcPath = Server.MapPath("test/");
- * string aimPath = Server.MapPath("test1/");
- * EC.FileObj.CopyDir(srcPath,aimPath);
- *****************************************/
- /// <summary>
- /// 鎸囧畾鏂囦欢澶逛笅闈㈢殑鎵�鏈夊唴瀹筩opy鍒扮洰鏍囨枃浠跺す涓嬮潰
- /// </summary>
- /// <param name="srcPath">鍘熷璺緞</param>
- /// <param name="aimPath">鐩爣鏂囦欢澶�</param>
- public static void CopyDir(string srcPath, string aimPath)
- {
- try
- {
- // 妫�鏌ョ洰鏍囩洰褰曟槸鍚︿互鐩綍鍒嗗壊瀛楃缁撴潫濡傛灉涓嶆槸鍒欐坊鍔犱箣
- if (aimPath[aimPath.Length - 1] != Path.DirectorySeparatorChar)
- aimPath += Path.DirectorySeparatorChar;
- // 鍒ゆ柇鐩爣鐩綍鏄惁瀛樺湪濡傛灉涓嶅瓨鍦ㄥ垯鏂板缓涔�
- if (!Directory.Exists(aimPath))
- Directory.CreateDirectory(aimPath);
- // 寰楀埌婧愮洰褰曠殑鏂囦欢鍒楄〃锛岃閲岄潰鏄寘鍚枃浠朵互鍙婄洰褰曡矾寰勭殑涓�涓暟缁�
- //濡傛灉浣犳寚鍚慶opy鐩爣鏂囦欢涓嬮潰鐨勬枃浠惰�屼笉鍖呭惈鐩綍璇蜂娇鐢ㄤ笅闈㈢殑鏂规硶
- //string[] fileList = Directory.GetFiles(srcPath);
- string[] fileList = Directory.GetFileSystemEntries(srcPath);
- //閬嶅巻鎵�鏈夌殑鏂囦欢鍜岀洰褰�
- foreach (string file in fileList)
- {
- //鍏堝綋浣滅洰褰曞鐞嗗鏋滃瓨鍦ㄨ繖涓洰褰曞氨閫掑綊Copy璇ョ洰褰曚笅闈㈢殑鏂囦欢
-
- if (Directory.Exists(file))
- CopyDir(file, aimPath + Path.GetFileName(file));
- //鍚﹀垯鐩存帴Copy鏂囦欢
- else
- File.Copy(file, aimPath + Path.GetFileName(file), true);
- }
-
- }
- catch (Exception ee)
- {
- throw new Exception(ee.ToString());
- }
- }
- #endregion
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpContextHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpContextHelper.cs"
deleted file mode 100644
index d0d23cd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpContextHelper.cs"
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public static class HttpContextHelper
- {
- public static string GetUserIp(this HttpContext context)
- {
- string realIP = null;
- string forwarded = null;
- string remoteIpAddress = context.Connection.RemoteIpAddress.ToString();
- if (context.Request.Headers.ContainsKey("X-Real-IP"))
- {
- realIP = context.Request.Headers["X-Real-IP"].ToString();
- if (realIP != remoteIpAddress)
- {
- remoteIpAddress = realIP;
- }
- }
- if (context.Request.Headers.ContainsKey("X-Forwarded-For"))
- {
- forwarded = context.Request.Headers["X-Forwarded-For"].ToString();
- if (forwarded != remoteIpAddress)
- {
- remoteIpAddress = forwarded;
- }
- }
- return remoteIpAddress;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs"
deleted file mode 100644
index 77224e9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs"
+++ /dev/null
@@ -1,104 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public class HttpHelper
- {
- public static async Task<string> GetAsync(string serviceAddress, string contentType = "application/json", Dictionary<string, string>? headers = null)
- {
- try
- {
- string result = string.Empty;
- using HttpClient httpClient = new HttpClient();
- httpClient.Timeout = new TimeSpan(0, 0, 60);
-
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
-
- result = await httpClient.GetAsync(serviceAddress).Result.Content.ReadAsStringAsync();
- return result;
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- return null;
- }
-
- public static async Task<string> PostAsync(string serviceAddress, string requestJson = null, string contentType = "application/json", Dictionary<string, string>? headers = null)
- {
- try
- {
- string result = string.Empty;
- using (HttpContent httpContent = new StringContent(requestJson))
- {
- httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
- using HttpClient httpClient = new HttpClient();
- httpClient.Timeout = new TimeSpan(0, 0, 60);
-
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
-
- result = await httpClient.PostAsync(serviceAddress, httpContent).Result.Content.ReadAsStringAsync();
- }
- return result;
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- return null;
- }
-
- public static string Get(string serviceAddress, string contentType = "application/json", Dictionary<string, string>? headers = null)
- {
- try
- {
- string result = string.Empty;
- using HttpClient httpClient = new HttpClient();
- httpClient.Timeout = new TimeSpan(0, 0, 60);
-
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
-
- result = httpClient.GetStringAsync(serviceAddress).Result;
- return result;
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- return null;
- }
-
- public static string Post(string serviceAddress, string requestJson = null, string contentType = "application/json", Dictionary<string, string>? headers = null)
- {
- try
- {
- string result = string.Empty;
- using (HttpContent httpContent = new StringContent(requestJson))
- {
- httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
- using HttpClient httpClient = new HttpClient();
- httpClient.Timeout = new TimeSpan(0, 0, 60);
-
- foreach (var header in headers)
- httpClient.DefaultRequestHeaders.Add(header.Key, header.Value);
-
- result = httpClient.PostAsync(serviceAddress, httpContent).Result.Content.ReadAsStringAsync().Result;
- }
- return result;
- }
- catch (Exception e)
- {
- Console.WriteLine(e.Message);
- }
- return null;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/MethodInfoExtensions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/MethodInfoExtensions.cs"
deleted file mode 100644
index 63edd4b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/MethodInfoExtensions.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public static class MethodInfoExtensions
- {
- public static string GetFullName(this MethodInfo method)
- {
- if (method.DeclaringType == null)
- {
- return $@"{method.Name}";
- }
-
- return $"{method.DeclaringType.FullName}.{method.Name}";
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ObjectExtension.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ObjectExtension.cs"
deleted file mode 100644
index 6eab3f8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/ObjectExtension.cs"
+++ /dev/null
@@ -1,48 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public static class ObjectExtension
- {
- public static IEnumerable<T> DicToIEnumerable<T>(this List<Dictionary<string, object>> dicList)
- {
- foreach (Dictionary<string, object> dic in dicList)
- {
- T model = Activator.CreateInstance<T>();
- foreach (PropertyInfo property in model.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
- {
- if (!dic.TryGetValue(property.Name, out object value)) continue;
- property.SetValue(model, value?.ToString().ChangeType(property.PropertyType), null);
- }
- yield return model;
- }
- }
-
- public static T DicToModel<T>(this Dictionary<string, object> dic)
- {
- T model = Activator.CreateInstance<T>();
- PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance);
- foreach (var property in propertyInfos)
- {
- object value = null;
- if (!dic.TryGetValue(property.Name, out value))
- {
- if (!dic.TryGetValue(property.Name.FirstLetterToUpper(), out value))
- {
- if (!dic.TryGetValue(property.Name.FirstLetterToLower(), out value))
- {
- continue;
- }
- }
- };
- property.SetValue(model, value?.ToString().ChangeType(property.PropertyType));
- }
- return model;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/RuntimeExtension.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/RuntimeExtension.cs"
deleted file mode 100644
index 20f5b5b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/RuntimeExtension.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing log4net;
-using Microsoft.Extensions.DependencyModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Loader;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public static class RuntimeExtension
- {
- /// <summary>
- /// 鑾峰彇椤圭洰绋嬪簭闆嗭紝鎺掗櫎鎵�鏈夌殑绯荤粺绋嬪簭闆�(Microsoft.***銆丼ystem.***绛�)銆丯uget涓嬭浇鍖�
- /// </summary>
- /// <returns></returns>
- public static IList<Assembly> GetAllAssemblies()
- {
- var list = new List<Assembly>();
- var deps = DependencyContext.Default;
- //鍙姞杞介」鐩腑鐨勭▼搴忛泦
- var libs = deps.CompileLibraries.Where(lib => !lib.Serviceable && lib.Type == "project"); //鎺掗櫎鎵�鏈夌殑绯荤粺绋嬪簭闆嗐�丯uget涓嬭浇鍖�
- foreach (var lib in libs)
- {
- try
- {
- var assembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName(lib.Name));
- list.Add(assembly);
- }
- catch (Exception e)
- {
- //Log.Debug(e, "GetAllAssemblies Exception:{ex}", e.Message);
- }
- }
-
- return list;
- }
-
- public static Assembly GetAssembly(string assemblyName)
- {
- return GetAllAssemblies().FirstOrDefault(assembly => assembly.FullName.Contains(assemblyName));
- }
-
- public static IList<Type> GetAllTypes()
- {
- var list = new List<Type>();
- foreach (var assembly in GetAllAssemblies())
- {
- var typeInfos = assembly.DefinedTypes;
- foreach (var typeInfo in typeInfos)
- {
- list.Add(typeInfo.AsType());
- }
- }
-
- return list;
- }
-
- public static IList<Type> GetTypesByAssembly(string assemblyName)
- {
- var list = new List<Type>();
- var assembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName(assemblyName));
- var typeInfos = assembly.DefinedTypes;
- foreach (var typeInfo in typeInfos)
- {
- list.Add(typeInfo.AsType());
- }
-
- return list;
- }
-
- public static Type GetImplementType(string typeName, Type baseInterfaceType)
- {
- return GetAllTypes().FirstOrDefault(t =>
- {
- if (t.Name == typeName &&
- t.GetTypeInfo().GetInterfaces().Any(b => b.Name == baseInterfaceType.Name))
- {
- var typeInfo = t.GetTypeInfo();
- return typeInfo.IsClass && !typeInfo.IsAbstract && !typeInfo.IsGenericType;
- }
-
- return false;
- });
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SecurityEncDecryptHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SecurityEncDecryptHelper.cs"
deleted file mode 100644
index 43f564c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SecurityEncDecryptHelper.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Helper
-{
- public static class SecurityEncDecryptHelper
- {
- private static byte[] Keys = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
- /// <summary>
- /// DES鍔犲瘑瀛楃涓�
- /// </summary>
- /// <param name="encryptString">寰呭姞瀵嗙殑瀛楃涓�</param>
- /// <param name="encryptKey">鍔犲瘑瀵嗛挜,瑕佹眰涓�16浣�</param>
- /// <returns>鍔犲瘑鎴愬姛杩斿洖鍔犲瘑鍚庣殑瀛楃涓诧紝澶辫触杩斿洖婧愪覆</returns>
-
- public static string EncryptDES(this string encryptString, string encryptKey)
- {
- try
- {
- byte[] rgbKey = Encoding.UTF8.GetBytes(encryptKey.Substring(0, 16));
- byte[] rgbIV = Keys;
- byte[] inputByteArray = Encoding.UTF8.GetBytes(encryptString);
-
- using (var DCSP = Aes.Create())
- {
- using (MemoryStream mStream = new MemoryStream())
- {
- using (CryptoStream cStream = new CryptoStream(mStream, DCSP.CreateEncryptor(rgbKey, rgbIV), CryptoStreamMode.Write))
- {
- cStream.Write(inputByteArray, 0, inputByteArray.Length);
- cStream.FlushFinalBlock();
- return Convert.ToBase64String(mStream.ToArray()).Replace('+', '_').Replace('/', '~');
- }
- }
- }
- }
- catch (Exception ex)
- {
- throw new Exception("瀵嗙爜鍔犲瘑寮傚父" + ex.Message);
- }
-
- }
-
- /// <summary>
- /// DES瑙ｅ瘑瀛楃涓�
- /// </summary>
- /// <param name="decryptString">寰呰В瀵嗙殑瀛楃涓�</param>
- /// <param name="decryptKey">瑙ｅ瘑瀵嗛挜,瑕佹眰涓�16浣�,鍜屽姞瀵嗗瘑閽ョ浉鍚�</param>
- /// <returns>瑙ｅ瘑鎴愬姛杩斿洖瑙ｅ瘑鍚庣殑瀛楃涓诧紝澶辫触杩旀簮涓�</returns>
-
- public static string DecryptDES(this string decryptString, string decryptKey)
- {
- byte[] rgbKey = Encoding.UTF8.GetBytes(decryptKey.Substring(0, 16));
- byte[] rgbIV = Keys;
- byte[] inputByteArray = Convert.FromBase64String(decryptString.Replace('_', '+').Replace('~', '/'));
- using (var DCSP = Aes.Create())
- {
- using (MemoryStream mStream = new MemoryStream())
- {
- using (CryptoStream cStream = new CryptoStream(mStream, DCSP.CreateDecryptor(rgbKey, rgbIV), CryptoStreamMode.Write))
- {
- byte[] inputByteArrays = new byte[inputByteArray.Length];
- cStream.Write(inputByteArray, 0, inputByteArray.Length);
- cStream.FlushFinalBlock();
- return Encoding.UTF8.GetString(mStream.ToArray());
- }
- }
- }
-
- }
- public static bool TryDecryptDES(this string decryptString, string decryptKey, out string result)
- {
- result = "";
- try
- {
- result = DecryptDES(decryptString, decryptKey);
- return true;
- }
- catch
- {
- return false;
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs"
deleted file mode 100644
index ae82614..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs"
+++ /dev/null
@@ -1,970 +0,0 @@
-锘縰sing Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Web;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Enums;
-
-namespace WIDESEA_Core.Helper
-{
- public static class UtilConvert
- {
- private static DateTime dateStart = new DateTime(1970, 1, 1, 8, 0, 0);
-
- private static long longTime = 621355968000000000;
-
- private static int samllTime = 10000000;
- /// <summary>
- /// 鏃堕棿鎴宠浆鎹㈡垚鏃ユ湡
- /// </summary>
- /// <param name="timeStamp"></param>
- /// <returns></returns>
- public static DateTime GetTimeSpmpToDate(this object timeStamp)
- {
- if (timeStamp == null) return dateStart;
- DateTime dateTime = new DateTime(longTime + Convert.ToInt64(timeStamp) * samllTime, DateTimeKind.Utc).ToLocalTime();
- return dateTime;
- }
-
- public static string Serialize(this object obj, JsonSerializerSettings formatDate = null)
- {
- if (obj == null) return null;
- formatDate = formatDate ?? new JsonSerializerSettings
- {
- DateFormatString = "yyyy-MM-dd HH:mm:ss"
- };
- return JsonConvert.SerializeObject(obj, formatDate);
- }
-
- public static T DeserializeObject<T>(this string json)
- {
- if (string.IsNullOrEmpty(json))
- {
- return default(T);
- }
- if (json == "{}")
- {
- json = "[]";
- }
- return JsonConvert.DeserializeObject<T>(json);
- }
-
- public static string FirstLetterToLower(this string thisValue)
- {
- if (string.IsNullOrEmpty(thisValue)) return string.Empty;
- string result = thisValue.Substring(0, 1).ToLower() + thisValue.Substring(1, thisValue.Length - 1);
- return result;
- }
-
- public static string FirstLetterToUpper(this string thisValue)
- {
- if (string.IsNullOrEmpty(thisValue)) return string.Empty;
- string result = thisValue.Substring(0, 1).ToUpper() + thisValue.Substring(1, thisValue.Length - 1);
- return result;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static int ObjToInt(this object thisValue)
- {
- int reval = 0;
- if (thisValue == null) return 0;
- if (thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return reval;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static int DoubleToInt(this double thisValue)
- {
- int reval = 0;
-
- return Convert.ToInt32(thisValue);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <param name="errorValue"></param>
- /// <returns></returns>
- public static int ObjToInt(this object thisValue, int errorValue)
- {
- int reval = 0;
- if (thisValue != null && thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return errorValue;
- }
-
- public static long ObjToLong(this object thisValue)
- {
- long reval = 0;
- if (thisValue == null) return 0;
- if (thisValue != DBNull.Value && long.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return reval;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static double ObjToMoney(this object thisValue)
- {
- double reval = 0;
- if (thisValue != null && thisValue != DBNull.Value && double.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return 0;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <param name="errorValue"></param>
- /// <returns></returns>
- public static double ObjToMoney(this object thisValue, double errorValue)
- {
- double reval = 0;
- if (thisValue != null && thisValue != DBNull.Value && double.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return errorValue;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static string ObjToString(this object thisValue)
- {
- if (thisValue != null) return thisValue.ToString().Trim();
- return "";
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static bool IsNotEmptyOrNull(this object thisValue)
- {
- return ObjToString(thisValue) != "" && ObjToString(thisValue) != "undefined" && ObjToString(thisValue) != "null";
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <param name="errorValue"></param>
- /// <returns></returns>
- public static string ObjToString(this object thisValue, string errorValue)
- {
- if (thisValue != null) return thisValue.ToString().Trim();
- return errorValue;
- }
-
- public static bool IsNullOrEmpty(this object thisValue) => thisValue == null || thisValue == DBNull.Value || string.IsNullOrWhiteSpace(thisValue.ToString());
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static Decimal ObjToDecimal(this object thisValue)
- {
- Decimal reval = 0;
- if (thisValue != null && thisValue != DBNull.Value && decimal.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return 0;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <param name="errorValue"></param>
- /// <returns></returns>
- public static Decimal ObjToDecimal(this object thisValue, decimal errorValue)
- {
- Decimal reval = 0;
- if (thisValue != null && thisValue != DBNull.Value && decimal.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return errorValue;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static DateTime ObjToDate(this object thisValue)
- {
- DateTime reval = DateTime.MinValue;
- if (thisValue != null && thisValue != DBNull.Value && DateTime.TryParse(thisValue.ToString(), out reval))
- {
- reval = Convert.ToDateTime(thisValue);
- }
-
- return reval;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <param name="errorValue"></param>
- /// <returns></returns>
- public static DateTime ObjToDate(this object thisValue, DateTime errorValue)
- {
- DateTime reval = DateTime.MinValue;
- if (thisValue != null && thisValue != DBNull.Value && DateTime.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return errorValue;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static bool ObjToBool(this object thisValue)
- {
- bool reval = false;
- if (thisValue != null && thisValue != DBNull.Value && bool.TryParse(thisValue.ToString(), out reval))
- {
- return reval;
- }
-
- return reval;
- }
-
-
- /// <summary>
- /// 鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
- /// </summary>
- /// <param name="thisValue"></param>
- /// <returns></returns>
- public static string DateToTimeStamp(this DateTime thisValue)
- {
- TimeSpan ts = thisValue - new DateTime(1970, 1, 1, 0, 0, 0, 0);
- return Convert.ToInt64(ts.TotalSeconds).ToString();
- }
-
- public static object ChangeType(this object value, Type type)
- {
- if (value == null && type.IsGenericType) return Activator.CreateInstance(type);
- if (value == null) return null;
- if (type == value.GetType()) return value;
- if (type.IsEnum)
- {
- if (value is string)
- return Enum.Parse(type, value as string);
- else
- return Enum.ToObject(type, value);
- }
-
- if (!type.IsInterface && type.IsGenericType)
- {
- Type innerType = type.GetGenericArguments()[0];
- object innerValue = ChangeType(value, innerType);
- return Activator.CreateInstance(type, new object[] { innerValue });
- }
-
- if (value is string && type == typeof(Guid)) return new Guid(value as string);
- if (value is string && type == typeof(Version)) return new Version(value as string);
- if (!(value is IConvertible)) return value;
- return Convert.ChangeType(value, type);
- }
-
- public static object ChangeTypeList(this object value, Type type)
- {
- if (value == null) return default;
-
- var gt = typeof(List<>).MakeGenericType(type);
- dynamic lis = Activator.CreateInstance(gt);
-
- var addMethod = gt.GetMethod("Add");
- string values = value.ToString();
- if (values != null && values.StartsWith("(") && values.EndsWith(")"))
- {
- string[] splits;
- if (values.Contains("\",\""))
- {
- splits = values.Remove(values.Length - 2, 2)
- .Remove(0, 2)
- .Split("\",\"");
- }
- else
- {
- splits = values.Remove(0, 1)
- .Remove(values.Length - 2, 1)
- .Split(",");
- }
-
- foreach (var split in splits)
- {
- var str = split;
- if (split.StartsWith("\"") && split.EndsWith("\""))
- {
- str = split.Remove(0, 1)
- .Remove(split.Length - 2, 1);
- }
-
- addMethod.Invoke(lis, new object[] { ChangeType(str, type) });
- }
- }
-
- return lis;
- }
-
- public static string ToJson(this object value)
- {
- return JsonConvert.SerializeObject(value);
- }
-
- public static bool IsInt(this object obj)
- {
- if (obj == null)
- return false;
- bool reslut = Int32.TryParse(obj.ToString(), out int _number);
- return reslut;
-
- }
- public static bool IsDate(this object str)
- {
- return str.IsDate(out _);
- }
- public static bool IsDate(this object str, out DateTime dateTime)
- {
- dateTime = DateTime.Now;
- if (str == null || str.ToString() == "")
- {
- return false;
- }
- return DateTime.TryParse(str.ToString(), out dateTime);
- }
-
- /// <summary>
- /// 鏍规嵁浼犲叆鏍煎紡鍒ゆ柇鏄惁涓哄皬鏁�
- /// </summary>
- /// <param name="str"></param>
- /// <param name="formatString">18,5</param>
- /// <returns></returns>
- public static bool IsNumber(this string str, string formatString)
- {
- if (string.IsNullOrEmpty(str)) return false;
-
- return Regex.IsMatch(str, @"^[+-]?\d*[.]?\d*$");
- }
-
- public static bool IsGuid(this string guid)
- {
- Guid newId;
- return guid.GetGuid(out newId);
- }
-
- public static bool GetGuid(this string guid, out Guid outId)
- {
- Guid emptyId = Guid.Empty;
- return Guid.TryParse(guid, out outId);
- }
-
- /// <summary>
- /// 杞崲涓虹煭鏁村瀷 qy 2024-7-15
- /// </summary>
- /// <param name="data">鏁版嵁</param>
- public static short ToShort(this object data)
- {
- if (data == null)
- return 0;
- short result;
- var success = short.TryParse(data.ToString(), out result);
- if (success)
- return result;
- try
- {
- return Convert.ToInt16(data);
- }
- catch (Exception)
- {
- return 0;
- }
- }
-
- /// <summary>
- /// 杞崲涓洪珮绮惧害娴偣鏁�,骞舵寜鎸囧畾鐨勫皬鏁颁綅4鑸�5鍏� qy 2024-7-15
- /// </summary>
- /// <param name="data">鏁版嵁</param>
- /// <param name="digits">灏忔暟浣嶆暟</param>
- public static decimal ToDecimal(this object data, int digits)
- {
- return Math.Round(ObjToDecimal(data), digits);
- }
-
-
-
- /// <summary>
- /// 鏋氫妇杞琇ist qy 2024-7-15
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <returns></returns>
- public static List<object> GetEnumList<T>()
- {
- List<object> list = new List<object>();
- var t = typeof(T);
- foreach (var item in Enum.GetValues(typeof(T)))
- {
- FieldInfo f = t.GetField(Enum.GetName(typeof(T), item));
- var r = (System.ComponentModel.DescriptionAttribute[])f.GetCustomAttributes(typeof(System.ComponentModel.DescriptionAttribute), false);
- list.Add(new { ID = item, value = Enum.GetName(typeof(T), item), name = r[0].Description });
- }
- return list;
- }
-
- /// <summary>
- /// 楠岃瘉鍔ㄦ�佺被鍨嬪厓绱犳槸鍚︿负绌� qy 2024-7-15
- /// </summary>
- /// <param name="obj"></param>
- /// <returns></returns>
- public static bool CheckDynamic(object obj)
- {
- return (obj != null && Convert.ToString(obj) != "") ? true : false;
- }
-
- /// <summary>
- /// 鍔ㄦ�佺被鍨嬪厓绱犺浆瀛楃涓插苟瑙ｇ爜 qy 2024-7-15
- /// </summary>
- /// <param name="obj"></param>
- /// <returns></returns>
- public static string DynamicToString(object obj)
- {
- return CheckDynamic(obj) ? HttpUtility.UrlDecode(Convert.ToString(obj).Trim()) : "";
- }
-
- /// <summary>
- /// DataTable杞负json qy 2024-7-15
- /// </summary>
- /// <param name="parObjRefDataTable">DataTable</param>
- /// <returns>json鏁版嵁</returns>
- public static string ToJson(this DataTable parObjRefDataTable)
- {
- List<object> objArrList = new List<object>();
-
- foreach (DataRow objDataRow in parObjRefDataTable.Rows)
- {
- Dictionary<string, object> objResult = new Dictionary<string, object>();
-
- foreach (DataColumn objDataColumn in parObjRefDataTable.Columns)
- objResult.Add(objDataColumn.ColumnName, objDataRow[objDataColumn].ToString());
-
- objArrList.Add(objResult);
- }
-
- return ToJson(objArrList);
- }
- /// <summary>
- /// Json杞琇ist qy 2024-7-15
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <param name="parJson"></param>
- /// <returns></returns>
- public static List<T> JsonToList<T>(this string parJson)
- {
- if (string.IsNullOrWhiteSpace(parJson))
- {
- return new List<T>();
- }
- else
- {
- return JsonConvert.DeserializeObject<List<T>>(parJson);
- }
- }
-
- /// <summary>
- /// 鏃ユ湡杞负unix鍊�
- /// </summary>
- /// <param name="dt"></param>
- /// <param name="utc">T:鎸塙TC鏃堕棿璁＄畻(榛樿);F:鎸夋湰鍦版椂闂磋绠�</param>
- /// <returns></returns>
- public static double ToUnix(this DateTime dt, bool utc = true)
- {
- double intResult = 0;
- System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1));
- intResult = (dt - startTime).TotalSeconds;
- intResult = Math.Round(intResult, 0);
- return intResult;
- }
-
- #region 鍒ゆ柇鏄惁涓哄瓧绗︿覆 qy 2024-7-15
- /// <summary>
- /// 鍒ゆ柇瀛楃涓叉槸鍚︿负鍚堟硶鐨刯son瀛楃涓� qy 2024-7-15
- /// </summary>
- /// <param name="json"></param>
- /// <returns></returns>
- public static bool IsJson(string json)
- {
- int errIndex;
- return IsJson(json, out errIndex);
- }
- public static bool IsJson(string json, out int errIndex)
- {
- errIndex = 0;
- if (IsJsonStart(ref json))
- {
- CharState cs = new CharState();
- char c;
- for (int i = 0; i < json.Length; i++)
- {
- c = json[i];
- if (SetCharState(c, ref cs) && cs.childrenStart)//璁剧疆鍏抽敭绗﹀彿鐘舵�併��
- {
- string item = json.Substring(i);
- int err;
- int length = GetValueLength(item, true, out err);
- cs.childrenStart = false;
- if (err > 0)
- {
- errIndex = i + err;
- return false;
- }
- i = i + length - 1;
- }
- if (cs.isError)
- {
- errIndex = i;
- return false;
- }
- }
-
- return !cs.arrayStart && !cs.jsonStart;
- }
- return false;
- }
-
- private static bool IsJsonStart(ref string json)
- {
- if (!string.IsNullOrEmpty(json))
- {
- json = json.Trim('\r', '\n', ' ');
- if (json.Length > 1)
- {
- char s = json[0];
- char e = json[json.Length - 1];
- return (s == '{' && e == '}') || (s == '[' && e == ']');
- }
- }
- return false;
- }
-
- /// <summary>
- /// 鑾峰彇鍊肩殑闀垮害锛堝綋Json鍊煎祵濂椾互"{"鎴�"["寮�澶存椂锛� qy 2024-7-15
- /// </summary>
- private static int GetValueLength(string json, bool breakOnErr, out int errIndex)
- {
- errIndex = 0;
- int len = 0;
- if (!string.IsNullOrEmpty(json))
- {
- CharState cs = new CharState();
- char c;
- for (int i = 0; i < json.Length; i++)
- {
- c = json[i];
- if (!SetCharState(c, ref cs))//璁剧疆鍏抽敭绗﹀彿鐘舵�併��
- {
- if (!cs.jsonStart && !cs.arrayStart)//json缁撴潫锛屽張涓嶆槸鏁扮粍锛屽垯閫�鍑恒��
- {
- break;
- }
- }
- else if (cs.childrenStart)//姝ｅ父瀛楃锛屽�肩姸鎬佷笅銆�
- {
- int length = GetValueLength(json.Substring(i), breakOnErr, out errIndex);//閫掑綊瀛愬�硷紝杩斿洖涓�涓暱搴︺�傘�傘��
- cs.childrenStart = false;
- cs.valueStart = 0;
- //cs.state = 0;
- i = i + length - 1;
- }
- if (breakOnErr && cs.isError)
- {
- errIndex = i;
- return i;
- }
- if (!cs.jsonStart && !cs.arrayStart)//璁板綍褰撳墠缁撴潫浣嶇疆銆�
- {
- len = i + 1;//闀垮害姣旂储寮�+1
- break;
- }
- }
- }
- return len;
- }
-
- /// <summary>
- /// 瀛楃鐘舵�� qy 2024-7-15
- /// </summary>
- private class CharState
- {
- internal bool jsonStart = false;//浠� "{"寮�濮嬩簡...
- internal bool setDicValue = false;// 鍙互璁剧疆瀛楀吀鍊间簡銆�
- internal bool escapeChar = false;//浠�"\"杞箟绗﹀彿寮�濮嬩簡
- /// <summary>
- /// 鏁扮粍寮�濮嬨�愪粎绗竴寮�澶存墠绠椼�戯紝鍊煎祵濂楃殑浠ャ�恈hildrenStart銆戞潵鏍囪瘑銆�
- /// </summary>
- internal bool arrayStart = false;//浠�"[" 绗﹀彿寮�濮嬩簡
- internal bool childrenStart = false;//瀛愮骇宓屽寮�濮嬩簡銆�
- /// <summary>
- /// 銆�0 鍒濆鐘舵�侊紝鎴� 閬囧埌鈥�,鈥濋�楀彿銆戯紱銆�1 閬囧埌鈥滐細鈥濆啋鍙枫��
- /// </summary>
- internal int state = 0;
-
- /// <summary>
- /// 銆�-1 鍙栧�肩粨鏉熴�戙��0 鏈紑濮嬨�戙��1 鏃犲紩鍙峰紑濮嬨�戙��2 鍗曞紩鍙峰紑濮嬨�戙��3 鍙屽紩鍙峰紑濮嬨��
- /// </summary>
- internal int keyStart = 0;
- /// <summary>
- /// 銆�-1 鍙栧�肩粨鏉熴�戙��0 鏈紑濮嬨�戙��1 鏃犲紩鍙峰紑濮嬨�戙��2 鍗曞紩鍙峰紑濮嬨�戙��3 鍙屽紩鍙峰紑濮嬨��
- /// </summary>
- internal int valueStart = 0;
- internal bool isError = false;//鏄惁璇硶閿欒銆�
-
- internal void CheckIsError(char c)//鍙綋鎴愪竴绾у鐞嗭紙鍥犱负GetLength浼氶�掑綊鍒版瘡涓�涓瓙椤瑰鐞嗭級
- {
- if (keyStart > 1 || valueStart > 1)
- {
- return;
- }
- //绀轰緥 ["aa",{"bbbb":123,"fff","ddd"}]
- switch (c)
- {
- case '{'://[{ "[{A}]":[{"[{B}]":3,"m":"C"}]}]
- isError = jsonStart && state == 0;//閲嶅寮�濮嬮敊璇� 鍚屾椂涓嶆槸鍊煎鐞嗐��
- break;
- case '}':
- isError = !jsonStart || (keyStart != 0 && state == 0);//閲嶅缁撴潫閿欒 鎴栬�� 鎻愬墠缁撴潫{"aa"}銆傛甯哥殑鏈墈}
- break;
- case '[':
- isError = arrayStart && state == 0;//閲嶅寮�濮嬮敊璇�
- break;
- case ']':
- isError = !arrayStart || jsonStart;//閲嶅寮�濮嬮敊璇� 鎴栬�� Json 鏈粨鏉�
- break;
- case '"':
- case '\'':
- isError = !(jsonStart || arrayStart); //json 鎴栨暟缁勫紑濮嬨��
- if (!isError)
- {
- //閲嶅寮�濮� [""",{"" "}]
- isError = (state == 0 && keyStart == -1) || (state == 1 && valueStart == -1);
- }
- if (!isError && arrayStart && !jsonStart && c == '\'')//['aa',{}]
- {
- isError = true;
- }
- break;
- case ':':
- isError = !jsonStart || state == 1;//閲嶅鍑虹幇銆�
- break;
- case ',':
- isError = !(jsonStart || arrayStart); //json 鎴栨暟缁勫紑濮嬨��
- if (!isError)
- {
- if (jsonStart)
- {
- isError = state == 0 || (state == 1 && valueStart > 1);//閲嶅鍑虹幇銆�
- }
- else if (arrayStart)//["aa,] [,] [{},{}]
- {
- isError = keyStart == 0 && !setDicValue;
- }
- }
- break;
- case ' ':
- case '\r':
- case '\n'://[ "a",\r\n{} ]
- case '\0':
- case '\t':
- break;
- default: //鍊煎紑澶淬�傘��
- isError = (!jsonStart && !arrayStart) || (state == 0 && keyStart == -1) || (valueStart == -1 && state == 1);//
- break;
- }
- //if (isError)
- //{
-
- //}
- }
- }
- /// <summary>
- /// 璁剧疆瀛楃鐘舵��(杩斿洖true鍒欎负鍏抽敭璇嶏紝杩斿洖false鍒欏綋涓烘櫘閫氬瓧绗﹀鐞嗭級 qy 2024-7-15
- /// </summary>
- private static bool SetCharState(char c, ref CharState cs)
- {
- cs.CheckIsError(c);
- switch (c)
- {
- case '{'://[{ "[{A}]":[{"[{B}]":3,"m":"C"}]}]
- #region 澶ф嫭鍙�
- if (cs.keyStart <= 0 && cs.valueStart <= 0)
- {
- cs.keyStart = 0;
- cs.valueStart = 0;
- if (cs.jsonStart && cs.state == 1)
- {
- cs.childrenStart = true;
- }
- else
- {
- cs.state = 0;
- }
- cs.jsonStart = true;//寮�濮嬨��
- return true;
- }
- #endregion
- break;
- case '}':
- #region 澶ф嫭鍙风粨鏉�
- if (cs.keyStart <= 0 && cs.valueStart < 2 && cs.jsonStart)
- {
- cs.jsonStart = false;//姝ｅ父缁撴潫銆�
- cs.state = 0;
- cs.keyStart = 0;
- cs.valueStart = 0;
- cs.setDicValue = true;
- return true;
- }
- // cs.isError = !cs.jsonStart && cs.state == 0;
- #endregion
- break;
- case '[':
- #region 涓嫭鍙峰紑濮�
- if (!cs.jsonStart)
- {
- cs.arrayStart = true;
- return true;
- }
- else if (cs.jsonStart && cs.state == 1)
- {
- cs.childrenStart = true;
- return true;
- }
- #endregion
- break;
- case ']':
- #region 涓嫭鍙风粨鏉�
- if (cs.arrayStart && !cs.jsonStart && cs.keyStart <= 2 && cs.valueStart <= 0)//[{},333]//杩欐牱缁撴潫銆�
- {
- cs.keyStart = 0;
- cs.valueStart = 0;
- cs.arrayStart = false;
- return true;
- }
- #endregion
- break;
- case '"':
- case '\'':
- #region 寮曞彿
- if (cs.jsonStart || cs.arrayStart)
- {
- if (cs.state == 0)//key闃舵,鏈夊彲鑳芥槸鏁扮粍["aa",{}]
- {
- if (cs.keyStart <= 0)
- {
- cs.keyStart = (c == '"' ? 3 : 2);
- return true;
- }
- else if ((cs.keyStart == 2 && c == '\'') || (cs.keyStart == 3 && c == '"'))
- {
- if (!cs.escapeChar)
- {
- cs.keyStart = -1;
- return true;
- }
- else
- {
- cs.escapeChar = false;
- }
- }
- }
- else if (cs.state == 1 && cs.jsonStart)//鍊奸樁娈靛繀椤绘槸Json寮�濮嬩簡銆�
- {
- if (cs.valueStart <= 0)
- {
- cs.valueStart = (c == '"' ? 3 : 2);
- return true;
- }
- else if ((cs.valueStart == 2 && c == '\'') || (cs.valueStart == 3 && c == '"'))
- {
- if (!cs.escapeChar)
- {
- cs.valueStart = -1;
- return true;
- }
- else
- {
- cs.escapeChar = false;
- }
- }
-
- }
- }
- #endregion
- break;
- case ':':
- #region 鍐掑彿
- if (cs.jsonStart && cs.keyStart < 2 && cs.valueStart < 2 && cs.state == 0)
- {
- if (cs.keyStart == 1)
- {
- cs.keyStart = -1;
- }
- cs.state = 1;
- return true;
- }
- // cs.isError = !cs.jsonStart || (cs.keyStart < 2 && cs.valueStart < 2 && cs.state == 1);
- #endregion
- break;
- case ',':
- #region 閫楀彿 //["aa",{aa:12,}]
-
- if (cs.jsonStart)
- {
- if (cs.keyStart < 2 && cs.valueStart < 2 && cs.state == 1)
- {
- cs.state = 0;
- cs.keyStart = 0;
- cs.valueStart = 0;
- //if (cs.valueStart == 1)
- //{
- // cs.valueStart = 0;
- //}
- cs.setDicValue = true;
- return true;
- }
- }
- else if (cs.arrayStart && cs.keyStart <= 2)
- {
- cs.keyStart = 0;
- //if (cs.keyStart == 1)
- //{
- // cs.keyStart = -1;
- //}
- return true;
- }
- #endregion
- break;
- case ' ':
- case '\r':
- case '\n'://[ "a",\r\n{} ]
- case '\0':
- case '\t':
- if (cs.keyStart <= 0 && cs.valueStart <= 0) //cs.jsonStart &&
- {
- return true;//璺宠繃绌烘牸銆�
- }
- break;
- default: //鍊煎紑澶淬�傘��
- if (c == '\\') //杞箟绗﹀彿
- {
- if (cs.escapeChar)
- {
- cs.escapeChar = false;
- }
- else
- {
- cs.escapeChar = true;
- return true;
- }
- }
- else
- {
- cs.escapeChar = false;
- }
- if (cs.jsonStart || cs.arrayStart) // Json 鎴栨暟缁勫紑濮嬩簡銆�
- {
- if (cs.keyStart <= 0 && cs.state == 0)
- {
- cs.keyStart = 1;//鏃犲紩鍙风殑
- }
- else if (cs.valueStart <= 0 && cs.state == 1 && cs.jsonStart)//鍙湁Json寮�濮嬫墠鏈夊�笺��
- {
- cs.valueStart = 1;//鏃犲紩鍙风殑
- }
- }
- break;
- }
- return false;
- }
-
- #endregion
-
- public static LinqExpressionType GetLinqCondition(this string stringType)
- {
- LinqExpressionType linqExpression;
- switch (stringType)
- {
- case HtmlElementType.Contains:
- linqExpression = LinqExpressionType.In;
- break;
- case HtmlElementType.ThanOrEqual:
- linqExpression = LinqExpressionType.ThanOrEqual;
- break;
- case HtmlElementType.LessOrequal:
- linqExpression = LinqExpressionType.LessThanOrEqual;
- break;
- case HtmlElementType.GT:
- linqExpression = LinqExpressionType.GreaterThan;
- break;
- case HtmlElementType.lt:
- linqExpression = LinqExpressionType.LessThan;
- break;
- case HtmlElementType.like:
- linqExpression = LinqExpressionType.Contains;
- break;
- default:
- linqExpression = LinqExpressionType.Equal;
- break;
- }
- return linqExpression;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs"
deleted file mode 100644
index 21bbef2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs"
+++ /dev/null
@@ -1,72 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Seed;
-
-namespace WIDESEA_Core
-{
- public sealed class SeedDataHostedService : IHostedService
- {
- private readonly DBContext _dbContext;
- private readonly ILogger<SeedDataHostedService> _logger;
- private readonly string _webRootPath;
- private readonly IServiceProvider _serviceProvider;
-
- public SeedDataHostedService(
- IServiceProvider serviceProvider,
- IWebHostEnvironment webHostEnvironment,
- ILogger<SeedDataHostedService> logger)
- {
- _serviceProvider = serviceProvider;
- _logger = logger;
- _webRootPath = webHostEnvironment.WebRootPath;
-
- using var scope = _serviceProvider.CreateScope();
-
- var dbContext = scope.ServiceProvider.GetService<DBContext>();
- //dbContext.Db.Aop.DataExecuting = SqlSugarAop.DataExecuting;
- _dbContext = dbContext;
- }
-
- public async Task StartAsync(CancellationToken cancellationToken)
- {
- _logger.LogInformation("Start Initialization Db Seed Service!");
- await DoWork();
- }
-
- private async Task DoWork()
- {
- try
- {
- //if (AppSettings.app("AppSettings", "SeedDBEnabled").ObjToBool() || AppSettings.app("AppSettings", "SeedDBDataEnabled").ObjToBool())
- {
- // 浣跨敤 myScopedService 鎵ц浠诲姟
-
- //await DBSeed.SeedAsync(_dbContext, _webRootPath);
-
- //澶氱鎴� 鍚屾
- //await DBSeed.TenantSeedAsync(_dbContext);
- }
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Error occured seeding the Database.");
- throw;
- }
- }
-
- public Task StopAsync(CancellationToken cancellationToken)
- {
- _logger.LogInformation("Stop Initialization Db Seed Service!");
- return Task.CompletedTask;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs"
deleted file mode 100644
index 36743dd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs"
+++ /dev/null
@@ -1,195 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.DB;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Seed;
-
-namespace WIDESEA_Core.HttpContextUser
-{
- public class AspNetUser : IUser
- {
- private readonly IHttpContextAccessor _accessor;
- //private readonly ILogger<AspNetUser> _logger;
-
- public AspNetUser(IHttpContextAccessor accessor/*, ILogger<AspNetUser> logger*/)
- {
- _accessor = accessor;
- /*_logger = logger;*/
- }
-
- public string UserName => UserInfo.UserName;
-
- //private string GetName()
- //{
- // if (IsAuthenticated() && _accessor.HttpContext.User.Identity.Name.IsNotEmptyOrNull())
- // {
- // return _accessor.HttpContext.User.Identity.Name;
- // }
- // else
- // {
- // if (!string.IsNullOrEmpty(GetToken()))
- // {
- // var getNameType = /*Permissions.IsUseIds4 ? */"name" /*: "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"*/;
- // return GetUserInfoFromToken(getNameType).FirstOrDefault().ObjToString();
- // }
- // }
-
- // return "";
- //}
-
- public int UserId => GetClaimValueByType("jti").FirstOrDefault().ObjToInt();
- public long TenantId => UserInfo.TenantId;
-
- public int RoleId => UserInfo.RoleId;
-
- public string Token => "throw new NotImplementedException()";
-
- public int SystemType => UserInfo.SystemType;
-
- public bool IsAuthenticated()
- {
- return _accessor.HttpContext.User.Identity.IsAuthenticated;
- }
-
-
- public string GetToken()
- {
- return _accessor.HttpContext?.Request?.Headers["Authorization"].ObjToString().Replace("Bearer ", "");
- }
-
- private UserInfo _userInfo { get; set; }
- private UserInfo UserInfo
- {
- get
- {
- if (_userInfo != null)
- return _userInfo;
-
- SqlSugarClient sqlSugarClient = new SqlSugarClient(new ConnectionConfig
- {
- ConfigId = MainDb.CurrentDbConnId,
- DbType = MainDb.DbType,
- //ConnectionString = AppSettings.app(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
- ConnectionString = AppSettings.app(MainDb.ConnectionString),
- IsAutoCloseConnection = true
- });
-
- dynamic userInfo = sqlSugarClient.Queryable(MainDb.UserTableName, "x").Where(MainDb.UserId, "=", UserId).Select(GetUserInfoSelectModels()).First();
- if (userInfo != null)
- {
- _userInfo = new UserInfo()
- {
- RoleId = userInfo.Role_Id,
- TenantId = userInfo.TenantId,
- SystemType = userInfo.SystemType,
- UserName = userInfo.UserName,
- };
- return _userInfo;
- }
-
- return new UserInfo();
- }
- }
-
- public bool IsSuperAdmin => IsRoleIdSuperAdmin(RoleId);
-
- public List<Permissions> Permissions => throw new NotImplementedException();
-
- public UserInfo GetCurrentUserInfo()
- {
- return UserInfo;
- }
-
- public List<SelectModel> GetUserInfoSelectModels()
- {
- List<SelectModel> selectModels = new List<SelectModel>()
- {
- new() {
- FieldName = MainDb.TenantId
- },
- new() {
- FieldName = MainDb.RoleId,
- },
- new() {
- FieldName = MainDb.SystemType
- },
- new() {
- FieldName = MainDb.UserName
- }
- };
- return selectModels;
- }
-
- public List<string> GetUserInfoFromToken(string ClaimType)
- {
- var jwtHandler = new JwtSecurityTokenHandler();
- var token = "";
-
- token = GetToken();
- // token鏍￠獙
- if (token.IsNotEmptyOrNull() && jwtHandler.CanReadToken(token))
- {
- JwtSecurityToken jwtToken = jwtHandler.ReadJwtToken(token);
-
- return (from item in jwtToken.Claims
- where item.Type == ClaimType
- select item.Value).ToList();
- }
-
- return new List<string>() { };
- }
-
- //public MessageModel<string> MessageModel { get; set; }
-
- public IEnumerable<Claim> GetClaimsIdentity()
- {
- var claims = _accessor.HttpContext.User.Claims.ToList();
- var headers = _accessor.HttpContext.Request.Headers;
- foreach (var header in headers)
- {
- claims.Add(new Claim(header.Key, header.Value));
- }
-
- return claims;
- }
-
- public List<string> GetClaimValueByType(string ClaimType)
- {
- return (from item in GetClaimsIdentity()
- where item.Type == ClaimType
- select item.Value).ToList();
- }
-
- public bool IsRoleIdSuperAdmin(int roleId)
- {
- return roleId == 1;
- }
- }
-
- public class UserInfo
- {
- public long TenantId { get; set; }
-
- public int RoleId { get; set; }
-
- public int SystemType { get; set; }
-
- public string UserName { get; set; }
-
- public int UserId { get; set; }
-
- public string UserTrueName { get; set; }
-
- public string HeadImageUrl { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs"
deleted file mode 100644
index 0b3bbb4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs"
+++ /dev/null
@@ -1,56 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.HttpContextUser
-{
- public interface IUser
- {
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- string UserName { get; }
-
- /// <summary>
- /// UserId
- /// </summary>
- int UserId { get; }
-
- /// <summary>
- /// 绉熸埛ID
- /// </summary>
- long TenantId { get; }
-
- int RoleId { get;}
-
- string Token { get; }
-
- int SystemType { get; }
-
- /// <summary>
- /// 鏄惁璁よ瘉
- /// </summary>
- /// <returns></returns>
- bool IsAuthenticated();
-
-
- IEnumerable<Claim> GetClaimsIdentity();
- List<string> GetClaimValueByType(string ClaimType);
-
- string GetToken();
- List<string> GetUserInfoFromToken(string ClaimType);
-
- bool IsSuperAdmin { get; }
-
- bool IsRoleIdSuperAdmin(int roleId);
-
- List<Permissions> Permissions { get; }
-
- UserInfo GetCurrentUserInfo();
-
- //MessageModel<string> MessageModel { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/IDependency.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/IDependency.cs"
deleted file mode 100644
index 98e47b1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/IDependency.cs"
+++ /dev/null
@@ -1,12 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core
-{
- public interface IDependency
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/LogLock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/LogLock.cs"
deleted file mode 100644
index 2366ffe..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/LogLock.cs"
+++ /dev/null
@@ -1,93 +0,0 @@
-锘縰sing log4net;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.LogHelper
-{
- public class LogLock
- {
- private static readonly ILog log = LogManager.GetLogger(typeof(LogLock));
- static ReaderWriterLockSlim LogWriteLock = new ReaderWriterLockSlim();
- static int WritedCount = 0;
- static int FailedCount = 0;
- static string _contentRoot = string.Empty;
-
- public LogLock(string contentPath)
- {
- _contentRoot = contentPath;
- }
-
- public static void OutLogAOP(string prefix, string[] dataParas, bool IsHeader = true)
- {
- OutSql2LogToFile(prefix, dataParas, IsHeader);
- }
-
- public static void OutSql2LogToFile(string prefix, string[] dataParas, bool IsHeader = true, bool isWrt = false)
- {
- try
- {
- //璁剧疆璇诲啓閿佷负鍐欏叆妯″紡鐙崰璧勬簮锛屽叾浠栧啓鍏ヨ姹傞渶瑕佺瓑寰呮湰娆″啓鍏ョ粨鏉熶箣鍚庢墠鑳界户缁啓鍏�
- //娉ㄦ剰锛氶暱鏃堕棿鎸佹湁璇荤嚎绋嬮攣鎴栧啓绾跨▼閿佷細浣垮叾浠栫嚎绋嬪彂鐢熼ゥ楗� (starve)銆� 涓轰簡寰楀埌鏈�濂界殑鎬ц兘锛岄渶瑕佽�冭檻閲嶆柊鏋勯�犲簲鐢ㄧ▼搴忎互灏嗗啓璁块棶鐨勬寔缁椂闂村噺灏戝埌鏈�灏忋��
- // 浠庢�ц兘鏂归潰鑰冭檻锛岃姹傝繘鍏ュ啓鍏ユā寮忓簲璇ョ揣璺熸枃浠舵搷浣滀箣鍓嶏紝鍦ㄦ澶勮繘鍏ュ啓鍏ユā寮忎粎鏄负浜嗛檷浣庝唬鐮佸鏉傚害
- // 鍥犺繘鍏ヤ笌閫�鍑哄啓鍏ユā寮忓簲鍦ㄥ悓涓�涓猼ry finally璇彞鍧楀唴锛屾墍浠ュ湪璇锋眰杩涘叆鍐欏叆妯″紡涔嬪墠涓嶈兘瑙﹀彂寮傚父锛屽惁鍒欓噴鏀炬鏁板ぇ浜庤姹傛鏁板皢浼氳Е鍙戝紓甯�
- LogWriteLock.EnterWriteLock();
-
- var folderPath = Path.Combine(_contentRoot, "Log");
- if (!Directory.Exists(folderPath))
- {
- Directory.CreateDirectory(folderPath);
- }
- //string logFilePath = Path.Combine(path, $@"{filename}.log");
- var logFilePath = FileHelper.GetAvailableFileWithPrefixOrderSize(folderPath, prefix);
-
- var now = DateTime.Now;
- string logContent = String.Join("\r\n", dataParas);
- if (IsHeader)
- {
- logContent = (
- "--------------------------------\r\n" +
- DateTime.Now + "|\r\n" +
- String.Join("\r\n", dataParas) + "\r\n"
- );
- }
- else
- {
- logContent = (
- dataParas[1] + ",\r\n"
- );
- }
-
- //if (logContent.IsNotEmptyOrNull() && logContent.Length > 500)
- //{
- // logContent = logContent.Substring(0, 500) + "\r\n";
- //}
- if (isWrt)
- {
- System.IO.File.WriteAllText(logFilePath, logContent);
- }
- else
- {
- System.IO.File.AppendAllText(logFilePath, logContent);
- }
- WritedCount++;
- }
- catch (Exception e)
- {
- //Console.Write(e.Message);
- FailedCount++;
- }
- finally
- {
- //閫�鍑哄啓鍏ユā寮忥紝閲婃斁璧勬簮鍗犵敤
- //娉ㄦ剰锛氫竴娆¤姹傚搴斾竴娆￠噴鏀�
- // 鑻ラ噴鏀炬鏁板ぇ浜庤姹傛鏁板皢浼氳Е鍙戝紓甯竅鍐欏叆閿佸畾鏈粡淇濇寔鍗宠閲婃斁]
- // 鑻ヨ姹傚鐞嗗畬鎴愬悗鏈噴鏀惧皢浼氳Е鍙戝紓甯竅姝ゆā寮忎笉涓嬪厑璁镐互閫掑綊鏂瑰紡鑾峰彇鍐欏叆閿佸畾]
- LogWriteLock.ExitWriteLock();
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs"
deleted file mode 100644
index 487c512..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs"
+++ /dev/null
@@ -1,124 +0,0 @@
-锘縰sing log4net;
-using Microsoft.AspNetCore.Http;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.HttpContextUser;
-using WIDESEA_Core.Seed;
-
-namespace WIDESEA_Core.LogHelper
-{
- public class Logger
- {
- private static readonly ILog log = LogManager.GetLogger(typeof(Logger));
-
- public static void Debug(string message)
- {
-
- }
-
- public static void Debug(string message, Exception exception)
- {
-
- }
-
- public static void Info(string message)
- {
-
- }
-
- public static void Info(string message, Exception exception)
- {
-
- }
-
- public static void Warn(string message)
- {
-
- }
-
- public static void Warning(string message, Exception exception)
- {
-
- }
-
- public static void Error(string message)
- {
-
- }
-
- public static void Error(string message, Exception exception)
- {
-
- }
-
- public static void Fatal(string message)
- {
-
- }
-
- public static void Fatal(string message, Exception exception)
- {
-
- }
-
- public static void WriteApiLog2DB(HttpContext context, string requestParameter, DateTime beginDate, string responseParameter, DateTime endDate, LoggerStatus loggerStatus)
- {
- try
- {
- if (context.Request.Method == "OPTIONS") return;
-
- if (context == null)
- {
- Console.WriteLine($"鏈幏鍙栧埌httpcontext淇℃伅,reqParam:{requestParameter},respParam:{responseParameter},success:{loggerStatus}");
- return;
- }
-
- Dictionary<string, object> dic = new Dictionary<string, object>
- {
- {"BeginDate",beginDate },
- {"ElapsedTime",(endDate - beginDate).TotalMilliseconds.DoubleToInt() },
- {"EndDate",endDate },
- {"RequestParam",requestParameter },
- {"ResponseParam",responseParameter },
- {"Success",1 },
- {"Url",context.Request.Path.Value??"" },
- {"UserIP",context.GetUserIp() },
- {"UserName","App.User?.Name" },
- {"User_Id","0" }
-
- //{"BeginDate",beginDate },
- //{"ElapsedTime",(endDate - beginDate).TotalMilliseconds.ObjToInt() },
- //{"EndDate",endDate },
- //{"RequestParam",requestParameter },
- //{"ResponseParam",responseParameter },
- //{"Success",1 },
- //{"Url",context.Request.Path.Value??"" },
- //{"UserIP",context.GetUserIp() },
- //{"UserName","App.User?.Name" },
- //{"User_Id","App.User?.ID" }
- };
-
-
- SqlSugarClient sqlSugarClient = DBContext.GetCustomDB(DBContext.GetConnectionConfig());
- sqlSugarClient.Insertable(dic).AS("Sys_Log").ExecuteCommand();
- }
- catch (Exception ex)
- {
-
- }
- }
- }
-
- public enum LoggerStatus
- {
- Success = 1,
- Error = 2,
- Info = 3
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs"
deleted file mode 100644
index ee5aea4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs"
+++ /dev/null
@@ -1,113 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.LogHelper;
-
-namespace WIDESEA_Core.Middlewares
-{
- /// <summary>
- /// 璁板綍璇锋眰鍜屽搷搴旀暟鎹�
- /// </summary>
- public class ApiLogMiddleware
- {
- /// <summary>
- ///
- /// </summary>
- private readonly RequestDelegate _next;
- private readonly ILogger<ApiLogMiddleware> _logger;
-
- public ApiLogMiddleware(RequestDelegate next, ILogger<ApiLogMiddleware> logger)
- {
- _next = next;
- _logger = logger;
- }
-
- //todo
- public async Task InvokeAsync(HttpContext context)
- {
- //if (AppSettings.app("Middleware", "RequestResponseLog", "Enabled").ObjToBool())
- {
- // 杩囨护锛屽彧鏈夋帴鍙�
- if (context.Request.Path.Value.Contains("api"))
- {
- context.Request.EnableBuffering();
- //Stream originalBody = context.Response.Body;
-
- try
- {
- // 瀛樺偍璇锋眰鏁版嵁
- //string requestParam = GetRequestData(context);
- //DateTime beginDate = DateTime.Now;
-
- //using var ms = new MemoryStream();
- //context.Response.Body = ms;
-
- await _next(context);
-
- // 瀛樺偍鍝嶅簲鏁版嵁
- //DateTime endDate = DateTime.Now;
- //string responseParam = GetResponsetData(context);
-
- //context.Response.Body.Position = 0;
- //await context.Response.Body.CopyToAsync(originalBody);
-
- //Logger.WriteApiLog2DB(context,requestParam, beginDate, responseParam, endDate, context.Response.StatusCode == 200 ? LoggerStatus.Success : LoggerStatus.Error);
- }
- catch (Exception ex)
- {
- // 璁板綍寮傚父
- _logger.LogError(ex.Message + "" + ex.InnerException);
- }
- finally
- {
- //context.Response.Body = originalBody;
- }
- }
- //else
- //{
- // await _next(context);
- //}
- }
- //else
- //{
- // await _next(context);
- //}
- }
-
- private string GetRequestData(HttpContext context)
- {
- try
- {
- using StreamReader sr = new StreamReader(context.Request.Body);
- string request = JsonConvert.SerializeObject(sr.ReadToEnd()); ;
- context.Request.Body.Position = 0;
- return request;
- }
- catch (Exception ex)
- {
- return $"璇锋眰鍙傛暟鑾峰彇閿欒,{ex.Message}";
- }
- }
-
- private string GetResponsetData(HttpContext context)
- {
- try
- {
- using StreamReader sr = new StreamReader(context.Response.Body);
- string response = JsonConvert.SerializeObject(sr.ReadToEnd()); ;
- context.Response.Body.Position = 0;
- return response;
- }
- catch (Exception ex)
- {
- return $"鍝嶅簲鍙傛暟鑾峰彇閿欒,{ex.Message}";
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ExceptionHandlerMiddleware.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ExceptionHandlerMiddleware.cs"
deleted file mode 100644
index 33d8e0d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ExceptionHandlerMiddleware.cs"
+++ /dev/null
@@ -1,59 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.DirectoryServices.Protocols;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Middlewares
-{
- public class ExceptionHandlerMiddleware
- {
- private readonly RequestDelegate _next;
-
- public ExceptionHandlerMiddleware(RequestDelegate next)
- {
- _next = next;
- }
-
- public async Task Invoke(HttpContext context)
- {
- try
- {
- await _next(context);
- }
- catch (Exception ex)
- {
- await HandleExceptionAsync(context, ex);
- }
- }
-
- private async Task HandleExceptionAsync(HttpContext context, Exception e)
- {
- if (e == null) return;
-
- await WriteExceptionAsync(context, e).ConfigureAwait(false);
- }
-
- private static async Task WriteExceptionAsync(HttpContext context, Exception e)
- {
- var message = e.Message;
- switch (e)
- {
- case UnauthorizedAccessException:
- context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
- break;
- default:
- context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
- break;
- }
- context.Response.ContentType = "application/json";
- await context.Response
- .WriteAsync(JsonConvert.SerializeObject(WebResponseContent.Instance.Error(message)))
- .ConfigureAwait(false);
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/IpLimitMiddleware.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/IpLimitMiddleware.cs"
deleted file mode 100644
index 79a266c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/IpLimitMiddleware.cs"
+++ /dev/null
@@ -1,41 +0,0 @@
-锘縰sing log4net;
-using Microsoft.AspNetCore.Builder;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Middlewares
-{
- /// <summary>
- /// ip 闄愭祦
- /// </summary>
- public static class IpLimitMiddleware
- {
- private static readonly ILog Log = LogManager.GetLogger(typeof(IpLimitMiddleware));
- /// <summary>
- /// ip闄愭祦
- /// </summary>
- /// <param name="app"></param>
- /// <exception cref="ArgumentNullException"></exception>
- public static void UseIpLimitMiddle(this IApplicationBuilder app)
- {
- if (app == null) throw new ArgumentNullException(nameof(app));
-
- //try
- //{
- // if (AppSettings.app("Middleware", "IpRateLimit", "Enabled").ObjToBool())
- // {
- // app.UseIpRateLimiting();
- // }
- //}
- //catch (Exception e)
- //{
- // Log.Error($"Error occured limiting ip rate.\n{e.Message}");
- // throw;
- //}
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/JwtTokenAuthMiddleware.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/JwtTokenAuthMiddleware.cs"
deleted file mode 100644
index ef95892..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/JwtTokenAuthMiddleware.cs"
+++ /dev/null
@@ -1,94 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Authorization;
-using WIDESEA_Core.HttpContextUser;
-
-namespace WIDESEA_Core.Middlewares
-{
- /// <summary>
- /// 涓棿浠�
- /// 鍘熷仛涓鸿嚜瀹氫箟鎺堟潈涓棿浠�
- /// 鍏堝仛妫�鏌� header token鐨勪娇鐢�
- /// </summary>
- public class JwtTokenAuthMiddleware
- {
- /// <summary>
- ///
- /// </summary>
- private readonly RequestDelegate _next;
- /// <summary>
- ///
- /// </summary>
- /// <param name="next"></param>
- public JwtTokenAuthMiddleware(RequestDelegate next)
- {
- _next = next;
- }
-
-
- private void PreProceed(HttpContext next)
- {
- //Console.WriteLine($"{DateTime.Now} middleware invoke preproceed");
- //...
- }
- private void PostProceed(HttpContext next)
- {
- //Console.WriteLine($"{DateTime.Now} middleware invoke postproceed");
- //....
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="httpContext"></param>
- /// <returns></returns>
- public Task Invoke(HttpContext httpContext)
- {
- PreProceed(httpContext);
-
-
- //妫�娴嬫槸鍚﹀寘鍚�'Authorization'璇锋眰澶�
- if (!httpContext.Request.Headers.ContainsKey("Authorization"))
- {
- PostProceed(httpContext);
-
- return _next(httpContext);
- }
- //var tokenHeader = httpContext.Request.Headers["Authorization"].ToString();
- var tokenHeader = httpContext.Request.Headers["Authorization"].ToString().Replace("Bearer ", "");
-
- try
- {
- if (tokenHeader.Length >= 128)
- {
- //Console.WriteLine($"{DateTime.Now} token :{tokenHeader}");
- UserInfo tm = JwtHelper.SerializeJwt(tokenHeader);
-
- //鎺堟潈
- //var claimList = new List<Claim>();
- //var claim = new Claim(ClaimTypes.Role, tm.Role);
- //claimList.Add(claim);
- //var identity = new ClaimsIdentity(claimList);
- //var principal = new ClaimsPrincipal(identity);
- //httpContext.User = principal;
- }
-
- }
- catch (Exception e)
- {
- Console.WriteLine($"{DateTime.Now} middleware wrong:{e.Message}");
- }
-
-
- PostProceed(httpContext);
-
-
- return _next(httpContext);
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/MiddlewareHelpers.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/MiddlewareHelpers.cs"
deleted file mode 100644
index 917faa5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/MiddlewareHelpers.cs"
+++ /dev/null
@@ -1,42 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Builder;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Middlewares
-{
- public static class MiddlewareHelpers
- {
- /// <summary>
- /// 璇锋眰鍝嶅簲涓棿浠�
- /// </summary>
- /// <param name="app"></param>
- /// <returns></returns>
- public static IApplicationBuilder UseApiLogMiddleware(this IApplicationBuilder app)
- {
- return app.UseMiddleware<ApiLogMiddleware>();
- }
-
- /// <summary>
- /// 鑷畾涔夋巿鏉冧腑闂翠欢
- /// </summary>
- /// <param name="app"></param>
- /// <returns></returns>
- public static IApplicationBuilder UseJwtTokenAuth(this IApplicationBuilder app)
- {
- return app.UseMiddleware<JwtTokenAuthMiddleware>();
- }
-
- /// <summary>
- /// 寮傚父澶勭悊涓棿浠�
- /// </summary>
- /// <param name="app"></param>
- /// <returns></returns>
- public static IApplicationBuilder UseExceptionHandlerMiddle(this IApplicationBuilder app)
- {
- return app.UseMiddleware<ExceptionHandlerMiddleware>();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerAuthMiddleware.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerAuthMiddleware.cs"
deleted file mode 100644
index feba460..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerAuthMiddleware.cs"
+++ /dev/null
@@ -1,80 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Middlewares
-{
- public class SwaggerAuthMiddleware
- {
-
- private readonly RequestDelegate next;
-
- public SwaggerAuthMiddleware(RequestDelegate next)
- {
- this.next = next;
- }
-
- public async Task InvokeAsync(HttpContext context)
- {
- // 涔熷彲浠ユ牴鎹槸鍚︽槸鏈湴鍋氬垽鏂� IsLocalRequest
- if (context.Request.Path.Value.ToLower().Contains("index.html"))
- {
- // 鍒ゆ柇鏉冮檺鏄惁姝ｇ‘
- if (IsAuthorized(context))
- {
- await next.Invoke(context);
- return;
- }
-
- // 鏃犳潈闄愶紝璺宠浆swagger鐧诲綍椤�
- context.Response.Redirect("/swg-login.html");
- }
- else
- {
- await next.Invoke(context);
- }
- }
-
- public bool IsAuthorized(HttpContext context)
- {
- // 浣跨敤session妯″紡
- // 鍙互浣跨敤鍏朵粬鐨�
- return context.Session.GetString("swagger-code") == "success";
- }
-
- /// <summary>
- /// 鍒ゆ柇鏄笉鏄湰鍦拌闂�
- /// 鏈湴涓嶇敤swagger鎷︽埅
- /// </summary>
- /// <param name="context"></param>
- /// <returns></returns>
- public bool IsLocalRequest(HttpContext context)
- {
- if (context.Connection.RemoteIpAddress == null && context.Connection.LocalIpAddress == null)
- {
- return true;
- }
- if (context.Connection.RemoteIpAddress.Equals(context.Connection.LocalIpAddress))
- {
- return true;
- }
- if (IPAddress.IsLoopback(context.Connection.RemoteIpAddress))
- {
- return true;
- }
- return false;
- }
- }
- public static class SwaggerAuthorizeExtensions
- {
- public static IApplicationBuilder UseSwaggerAuthorized(this IApplicationBuilder builder)
- {
- return builder.UseMiddleware<SwaggerAuthMiddleware>();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerMiddleware.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerMiddleware.cs"
deleted file mode 100644
index 08baad0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerMiddleware.cs"
+++ /dev/null
@@ -1,59 +0,0 @@
-锘縰sing log4net;
-using Microsoft.AspNetCore.Builder;
-using Swashbuckle.AspNetCore.SwaggerUI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Helper;
-using static WIDESEA_Core.Extensions.CustomApiVersion;
-
-namespace WIDESEA_Core.Middlewares
-{
- /// <summary>
- /// Swagger涓棿浠�
- /// </summary>
- public static class SwaggerMiddleware
- {
- private static readonly ILog Log = LogManager.GetLogger(typeof(SwaggerMiddleware));
- public static void UseSwaggerMiddle(this IApplicationBuilder app, Func<Stream> streamHtml)
- {
- if (app == null) throw new ArgumentNullException(nameof(app));
-
- app.UseSwagger();
- app.UseSwaggerUI(c =>
- {
- //鏍规嵁鐗堟湰鍚嶇О鍊掑簭 閬嶅巻灞曠ず
- var apiName = AppSettings.app(new string[] { "ApiName" });
- typeof(ApiVersions).GetEnumNames().OrderByDescending(e => e).ToList().ForEach(version =>
- {
- c.SwaggerEndpoint($"/swagger/{version}/swagger.json", $"{apiName} {version}");
- });
-
- //c.SwaggerEndpoint("/swagger/v1/swagger.json", "WIDESEA.Core鍚庡彴Api");
-
- //c.SwaggerEndpoint($"https://petstore.swagger.io/v2/swagger.json", $"{apiName} pet");
-
- // 灏唖wagger棣栭〉锛岃缃垚鎴戜滑鑷畾涔夌殑椤甸潰锛岃寰楄繖涓瓧绗︿覆鐨勫啓娉曪細{椤圭洰鍚�.index.html}
- if (streamHtml.Invoke() == null)
- {
- var msg = "index.html鐨勫睘鎬э紝蹇呴』璁剧疆涓哄祵鍏ョ殑璧勬簮";
- //Log.Error(msg);
- throw new Exception(msg);
- }
- c.IndexStream = streamHtml;
- c.DocExpansion(DocExpansion.None); //->淇敼鐣岄潰鎵撳紑鏃惰嚜鍔ㄦ姌鍙�
-
- //if (Permissions.IsUseIds4)
- //{
- // c.OAuthClientId("blogadminjs");
- //}
-
-
- // 璺緞閰嶇疆锛岃缃负绌猴紝琛ㄧず鐩存帴鍦ㄦ牴鍩熷悕锛坙ocalhost:8001锛夎闂鏂囦欢,娉ㄦ剰localhost:8001/swagger鏄闂笉鍒扮殑锛屽幓launchSettings.json鎶妉aunchUrl鍘绘帀锛屽鏋滀綘鎯虫崲涓�涓矾寰勶紝鐩存帴鍐欏悕瀛楀嵆鍙紝姣斿鐩存帴鍐檆.RoutePrefix = "doc";
- c.RoutePrefix = "";
- });
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBContext.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBContext.cs"
deleted file mode 100644
index a3fda65..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBContext.cs"
+++ /dev/null
@@ -1,217 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.DB;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Seed
-{
- public class DBContext
- {
- private static MutiDBOperate connectObject => GetMainConnectionDb();
- private static string _connectionString = connectObject.Connection;
- private static DbType _dbType = (DbType)connectObject.DbType;
- public static string ConnId = connectObject.ConnId;
- private SqlSugarClient _db;
-
- /// <summary>
- /// 杩炴帴瀛楃涓�
- /// </summary>
- public static MutiDBOperate GetMainConnectionDb()
- {
- MutiDBOperate mainDb = new MutiDBOperate()
- {
- //Connection = AppSettings.app(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
- Connection = AppSettings.app(MainDb.ConnectionString),
- ConnId = MainDb.CurrentDbConnId,
- DbType = DataBaseType.SqlServer
- };
-
- return mainDb;
- }
- /// <summary>
- /// 杩炴帴瀛楃涓�
- /// </summary>
- public static string ConnectionString
- {
- get { return _connectionString; }
- set { _connectionString = value; }
- }
- /// <summary>
- /// 鏁版嵁搴撶被鍨�
- /// </summary>
- public static DbType DbType
- {
- get { return _dbType; }
- set { _dbType = value; }
- }
- /// <summary>
- /// 鏁版嵁杩炴帴瀵硅薄
- /// </summary>
- public SqlSugarClient Db
- {
- get { return _db; }
- private set { _db = value; }
- }
-
- //public SqlSugarScope DbClient
- //{
- // get { return _dbClient; }
- // private set { _dbClient = value; }
- //}
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏋勯�犲嚱鏁�
- /// </summary>
- public DBContext(ISqlSugarClient sqlSugarClient)
- {
- if (string.IsNullOrEmpty(_connectionString))
- throw new ArgumentNullException("鏁版嵁搴撹繛鎺ュ瓧绗︿覆涓虹┖");
-
- _db = sqlSugarClient as SqlSugarClient;
- //_db.Aop.DataExecuting = SqlSugarAop.DataExecuting;
- }
-
- #region 瀹炰緥鏂规硶
- /// <summary>
- /// 鍔熻兘鎻忚堪:鑾峰彇鏁版嵁搴撳鐞嗗璞�
- /// </summary>
- /// <returns>杩斿洖鍊�</returns>
- public SimpleClient<T> GetEntityDB<T>() where T : class, new()
- {
- return new SimpleClient<T>(_db);
- }
- /// <summary>
- /// 鍔熻兘鎻忚堪:鑾峰彇鏁版嵁搴撳鐞嗗璞�
- /// </summary>
- /// <param name="db">db</param>
- /// <returns>杩斿洖鍊�</returns>
- //public SimpleClient<T> GetEntityDB<T>(SqlSugarClient db) where T : class, new()
- //{
- // return new SimpleClient<T>(db);
- //}
-
-
-
- #endregion
-
-
- #region 鏍规嵁瀹炰綋绫荤敓鎴愭暟鎹簱琛�
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏍规嵁瀹炰綋绫荤敓鎴愭暟鎹簱琛�
- /// </summary>
- /// <param name="blnBackupTable">鏄惁澶囦唤琛�</param>
- /// <param name="lstEntitys">鎸囧畾鐨勫疄浣�</param>
- public void CreateTableByEntity<T>(bool blnBackupTable, params T[] lstEntitys) where T : class, new()
- {
- Type[] lstTypes = null;
- if (lstEntitys != null)
- {
- lstTypes = new Type[lstEntitys.Length];
- for (int i = 0; i < lstEntitys.Length; i++)
- {
- T t = lstEntitys[i];
- lstTypes[i] = typeof(T);
- }
- }
- CreateTableByEntity(blnBackupTable, lstTypes);
- }
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏍规嵁瀹炰綋绫荤敓鎴愭暟鎹簱琛�
- /// </summary>
- /// <param name="blnBackupTable">鏄惁澶囦唤琛�</param>
- /// <param name="lstEntitys">鎸囧畾鐨勫疄浣�</param>
- public void CreateTableByEntity(bool blnBackupTable, params Type[] lstEntitys)
- {
- if (blnBackupTable)
- {
- _db.CodeFirst.BackupTable().InitTables(lstEntitys); //change entity backupTable
- }
- else
- {
- _db.CodeFirst.InitTables(lstEntitys);
- }
- }
- #endregion
-
-
- #region 闈欐�佹柟娉�
-
- ///// <summary>
- ///// 鍔熻兘鎻忚堪:鑾峰緱涓�涓狣bContext
- ///// </summary>
- ///// <returns></returns>
- //public static MyContext GetDbContext()
- //{
- // return new MyContext();
- //}
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:璁剧疆鍒濆鍖栧弬鏁�
- /// </summary>
- /// <param name="strConnectionString">杩炴帴瀛楃涓�</param>
- /// <param name="enmDbType">鏁版嵁搴撶被鍨�</param>
- public static void Init(string strConnectionString, DbType enmDbType = SqlSugar.DbType.SqlServer)
- {
- _connectionString = strConnectionString;
- _dbType = enmDbType;
- }
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鍒涘缓涓�涓摼鎺ラ厤缃�
- /// </summary>
- /// <param name="blnIsAutoCloseConnection">鏄惁鑷姩鍏抽棴杩炴帴</param>
- /// <param name="blnIsShardSameThread">鏄惁澶哥被浜嬪姟</param>
- /// <returns>ConnectionConfig</returns>
- public static ConnectionConfig GetConnectionConfig(bool blnIsAutoCloseConnection = true, bool blnIsShardSameThread = false)
- {
- ConnectionConfig config = new ConnectionConfig()
- {
- ConnectionString = _connectionString,
- DbType = _dbType,
- IsAutoCloseConnection = blnIsAutoCloseConnection,
- ConfigureExternalServices = new ConfigureExternalServices()
- {
- //DataInfoCacheService = new HttpRuntimeCache()
- },
- //IsShardSameThread = blnIsShardSameThread
- };
- return config;
- }
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鑾峰彇涓�涓嚜瀹氫箟鐨凞B
- /// </summary>
- /// <param name="config">config</param>
- /// <returns>杩斿洖鍊�</returns>
- public static SqlSugarClient GetCustomDB(ConnectionConfig config)
- {
- return new SqlSugarClient(config);
- }
- /// <summary>
- /// 鍔熻兘鎻忚堪:鑾峰彇涓�涓嚜瀹氫箟鐨勬暟鎹簱澶勭悊瀵硅薄
- /// </summary>
- /// <param name="sugarClient">sugarClient</param>
- /// <returns>杩斿洖鍊�</returns>
- public static SimpleClient<T> GetCustomEntityDB<T>(SqlSugarClient sugarClient) where T : class, new()
- {
- return new SimpleClient<T>(sugarClient);
- }
- /// <summary>
- /// 鍔熻兘鎻忚堪:鑾峰彇涓�涓嚜瀹氫箟鐨勬暟鎹簱澶勭悊瀵硅薄
- /// </summary>
- /// <param name="config">config</param>
- /// <returns>杩斿洖鍊�</returns>
- public static SimpleClient<T> GetCustomEntityDB<T>(ConnectionConfig config) where T : class, new()
- {
- SqlSugarClient sugarClient = GetCustomDB(config);
- return GetCustomEntityDB<T>(sugarClient);
- }
- #endregion
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBSeed.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBSeed.cs"
deleted file mode 100644
index b9b4568..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBSeed.cs"
+++ /dev/null
@@ -1,293 +0,0 @@
-锘縰sing Castle.Components.DictionaryAdapter.Xml;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.DB;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Core.Seed
-{
- public class DBSeed
- {
- private static string SeedDataFolder = "WIDESEA_DB.DBSeed.Json/{0}.tsv";
-
- /// <summary>
- /// 寮傛娣诲姞绉嶅瓙鏁版嵁
- /// </summary>
- /// <param name="myContext"></param>
- /// <param name="WebRootPath"></param>
- /// <returns></returns>
- public static async Task SeedAsync(DBContext dbContext, string WebRootPath)
- {
- try
- {
- if (string.IsNullOrEmpty(WebRootPath))
- {
- throw new Exception("鑾峰彇wwwroot璺緞鏃讹紝寮傚父锛�");
- }
-
- SeedDataFolder = Path.Combine(WebRootPath, SeedDataFolder);
-
- Console.WriteLine("************ WIDESEA DataBase Set *****************");
-
- Console.WriteLine($"Master DB ConId: {DBContext.ConnId}");
- Console.WriteLine($"Master DB Type: {DBContext.DbType}");
- //Console.WriteLine($"Master DB ConnectString: {DBContext.ConnectionString}");
-
- Console.WriteLine();
-
- // 鍒涘缓鏁版嵁搴�
- Console.WriteLine($"Create Database(The Db Id:{DBContext.ConnId})...");
-
- if (DBContext.DbType != SqlSugar.DbType.Oracle)
- {
- dbContext.Db.DbMaintenance.CreateDatabase();
- ConsoleHelper.WriteSuccessLine($"Database created successfully!");
- }
- else
- {
- //Oracle 鏁版嵁搴撲笉鏀寔璇ユ搷浣�
- ConsoleHelper.WriteSuccessLine($"Oracle 鏁版嵁搴撲笉鏀寔璇ユ搷浣滐紝鍙墜鍔ㄥ垱寤篛racle鏁版嵁搴�!");
- }
-
- // 鍒涘缓鏁版嵁搴撹〃锛岄亶鍘嗘寚瀹氬懡鍚嶇┖闂翠笅鐨刢lass锛�
- // 娉ㄦ剰涓嶈鎶婂叾浠栧懡鍚嶇┖闂翠笅鐨勪篃娣诲姞杩涙潵銆�
- Console.WriteLine("Create Tables...");
-
- var path = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory;
- var referencedAssemblies = System.IO.Directory.GetFiles(path, MainDb.AssemblyName).Select(Assembly.LoadFrom).ToArray();
-
- var modelTypes = referencedAssemblies
- .SelectMany(a => a.DefinedTypes)
- .Select(type => type.AsType())
- .Where(x => x.IsClass && x.Namespace is MainDb.EntityNameSpace && x.GetCustomAttribute<SugarTable>() != null)
- .ToList();
- //{
- // List<string> models = modelTypes.Select(x => x.Name).ToList();
- // List<DbTableInfo> dbTableInfos = dbContext.Db.DbMaintenance.GetTableInfoList(false);
- // string[] dropTables = dbTableInfos.Select(x => x.Name).Where(x => !models.Contains(x)).ToArray();
-
- // dbContext.Db.DbMaintenance.DropTable(dropTables);
- //}
-
- modelTypes.ForEach(t =>
- {
- //var diffString = dbContext.Db.CodeFirst.GetDifferenceTables(t).ToDiffString();
- // 杩欓噷鍙敮鎸佹坊鍔犺〃锛屼笉鏀寔鍒犻櫎
- // 濡傛灉鎯宠鍒犻櫎锛屾暟鎹簱鐩存帴鍙抽敭鍒犻櫎锛屾垨鑰呰仈绯籗qlSugar浣滆�咃紱
- IDbMaintenance dbMaintenance = dbContext.Db.DbMaintenance;
- if (!dbMaintenance.IsAnyTable(t.Name, false))
- {
- Console.WriteLine(t.Name);
- dbContext.Db.CodeFirst.InitTables(t);
- //dbContext.DbClient.QueryableByObject(t).ToList() == null
- string seedData = FileHelper.ReadFile(string.Format(SeedDataFolder, t.Name), Encoding.UTF8);
-
-
- #region Sys_User
- if (seedData != "涓嶅瓨鍦ㄧ浉搴旂殑鐩綍")
- {
- List<Dictionary<string, object>> dic = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(seedData);
- //dbContext.GetEntityDB<BlogArticle>().InsertRange(JsonHelper.ParseFormByJson<List<BlogArticle>>());
- //Console.WriteLine("Table:BlogArticle created success!");
-
- for (int i = 0; i < dic.Count; i++)
- {
- if (dic[i].ContainsKey("CreateDate"))
- dic[i]["CreateDate"] = DateTime.Now;
- else
- dic[i].Add("CreateDate", DateTime.Now);
- }
-
- dbContext.Db.Insertable(dic).AS(t.Name).ExecuteCommand();
- }
- #endregion
- }
- else
- {
- List<string> columnNames = dbContext.Db.DbMaintenance.GetColumnInfosByTableName(t.Name, false).Select(x => x.DbColumnName).ToList();
- if (t.GetProperties().FirstOrDefault(x => !columnNames.Contains(x.Name)) != null)
- {
- bool isChange = true;
- List<PropertyInfo> propertyInfos = t.GetProperties().Where(x => !columnNames.Contains(x.Name)).ToList();
- for (int i = 0; i < propertyInfos.Count; i++)
- {
- PropertyInfo propertyInfo = propertyInfos[i];
- SugarColumn sugarColumn = propertyInfo.GetCustomAttribute<SugarColumn>();
- if (sugarColumn != null)
- {
- if (!sugarColumn.IsIgnore)
- {
- if (!sugarColumn.IsNullable)
- {
- isChange = false;
- break;
- }
- }
- }
- }
- if (isChange)
- dbContext.Db.CodeFirst.InitTables(t);
- }
- }
- });
- ConsoleHelper.WriteSuccessLine($"Tables created successfully!");
- Console.WriteLine();
-
-
- }
- catch (Exception ex)
- {
- // 1銆佽嫢鏄疢ysql,鏌ョ湅甯歌闂:https://github.com/anjoy8/Blog.Core/issues/148#issue-776281770
- //2銆佽嫢鏄疧racle,鏌ョ湅甯歌闂:https://github.com/anjoy8/Blog.Core/issues/148#issuecomment-752340231
- throw new Exception("閿欒锛�" + ex.Message);
- }
- }
-
- /// <summary>
- /// 鍒濆鍖� 澶氱鎴�
- /// </summary>
- /// <param name="dbContext"></param>
- /// <returns></returns>
- public static async Task TenantSeedAsync(DBContext dbContext)
- {
-
- if (BaseDBConfig.MutiConnectionString.Where(x => x.ConnId != MainDb.CurrentDbConnId).Any())
- {
- Console.WriteLine($@"Init Multi Tenant Db");
- foreach (MutiDBOperate tenant in BaseDBConfig.MutiConnectionString.Where(x => x.ConnId != MainDb.CurrentDbConnId))
- {
-
- Console.WriteLine($@"Init Multi Tenant Db : {tenant.ConnId}");
- ConnectionConfig connectionConfig = new ConnectionConfig()
- {
- ConfigId = tenant.ConnId,
- ConnectionString = tenant.Connection,
- IsAutoCloseConnection = true,
- MoreSettings = new ConnMoreSettings()
- {
- IsAutoRemoveDataCache = true
- },
- DbType = (DbType)tenant.DbType,
- };
- await InitTenantSeedAsync(dbContext.Db.AsTenant(), connectionConfig);
- }
-
- Console.WriteLine(DateTime.Now + $@"Init Multi Tenant Db Finish");
- }
-
- //tenants = await myContext.Db.Queryable<SysTenant>().Where(s => s.TenantType == TenantTypeEnum.Tables).ToListAsync();
- //if (tenants.Any())
- //{
- // await InitTenantSeedAsync(myContext, tenants);
- //}
- }
-
- #region 澶氱鎴� 澶氬簱 鍒濆鍖�
-
- /// <summary>
- /// 鍒濆鍖栧搴�
- /// </summary>
- /// <param name="itenant"></param>
- /// <param name="config"></param>
- /// <returns></returns>
- public static async Task InitTenantSeedAsync(ITenant itenant, ConnectionConfig config)
- {
- Console.WriteLine(DateTime.Now + $@"Init Multi Tenant Db");
- //itenant.RemoveConnection(config.ConfigId);
- itenant.AddConnection(config);
-
- var db = itenant.GetConnectionScope(config.ConfigId);
-
- db.DbMaintenance.CreateDatabase();
- ConsoleHelper.WriteSuccessLine($"Init Multi Tenant Db : {config.ConfigId} Database created successfully!");
-
- Console.WriteLine($@"Init Multi Tenant Db : {config.ConfigId} Create Tables");
-
- // 鑾峰彇鎵�鏈夊疄浣撹〃-鍒濆鍖栫鎴蜂笟鍔¤〃
- var entityTypes = TenantUtil.GetTenantEntityTypes(TenantTypeEnum.Db);
- if (!entityTypes.Any()) return;
- foreach (var entityType in entityTypes)
- {
- //var splitTable = entityType.GetCustomAttribute<SplitTableAttribute>();
- //if (splitTable == null)
- db.CodeFirst.InitTables(entityType);
- //else
- // db.CodeFirst.SplitTables().InitTables(entityType);
-
- Console.WriteLine(entityType.Name);
- }
- Console.WriteLine(DateTime.Now + $@"Init Multi Tenant Db Finish");
- //澶氱鎴峰垵濮嬪寲绉嶅瓙鏁版嵁
- //await TenantSeedDataAsync(db, TenantTypeEnum.Db);
- }
-
- #endregion
-
- //private static async Task TenantSeedDataAsync(ISqlSugarClient db, TenantTypeEnum tenantType)
- //{
- // // 鑾峰彇鎵�鏈夌瀛愰厤缃�-鍒濆鍖栨暟鎹�
- // var seedDataTypes = AssemblysExtensions.GetAllAssemblies().SelectMany(s => s.DefinedTypes)
- // .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass)
- // .Where(u =>
- // {
- // var esd = u.GetInterfaces().FirstOrDefault(i => i.HasImplementedRawGeneric(typeof(IEntitySeedData<>)));
- // if (esd is null)
- // {
- // return false;
- // }
-
- // var eType = esd.GenericTypeArguments[0];
- // return eType.IsTenantEntity(tenantType);
- // });
- // if (!seedDataTypes.Any()) return;
- // foreach (var seedType in seedDataTypes)
- // {
- // dynamic instance = Activator.CreateInstance(seedType);
- // //鍒濆鍖栨暟鎹�
- // {
- // var seedData = instance.InitSeedData();
- // if (seedData != null && Enumerable.Any(seedData))
- // {
- // var entityType = seedType.GetInterfaces().First().GetGenericArguments().First();
- // var entity = db.EntityMaintenance.GetEntityInfo(entityType);
-
- // if (!await db.Queryable(entity.DbTableName, "").AnyAsync())
- // {
- // await db.Insertable(Enumerable.ToList(seedData)).ExecuteCommandAsync();
- // Console.WriteLine($"Table:{entity.DbTableName} init success!");
- // }
- // }
- // }
-
- // //绉嶅瓙鏁版嵁
- // {
- // var seedData = instance.SeedData();
- // if (seedData != null && Enumerable.Any(seedData))
- // {
- // var entityType = seedType.GetInterfaces().First().GetGenericArguments().First();
- // var entity = db.EntityMaintenance.GetEntityInfo(entityType);
-
- // await db.Storageable(Enumerable.ToList(seedData)).ExecuteCommandAsync();
- // Console.WriteLine($"Table:{entity.DbTableName} seedData success!");
- // }
- // }
-
- // //鑷畾涔夊鐞�
- // {
- // await instance.CustomizeSeedData(db);
- // }
- // }
- //}
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/FrameSeed.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/FrameSeed.cs"
deleted file mode 100644
index 4711bda..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/FrameSeed.cs"
+++ /dev/null
@@ -1,582 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Seed
-{
- public class FrameSeed
- {
-
- /// <summary>
- /// 鐢熸垚Controller灞�
- /// </summary>
- /// <param name="sqlSugarClient">sqlsugar瀹炰緥</param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="tableNames">鏁版嵁搴撹〃鍚嶆暟缁勶紝榛樿绌猴紝鐢熸垚鎵�鏈夎〃</param>
- /// <param name="isMuti"></param>
- /// <returns></returns>
- public static bool CreateControllers(SqlSugarScope sqlSugarClient, string ConnId = null, bool isMuti = false, string[] tableNames = null)
- {
- Create_Controller_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.Api.Controllers", "Blog.Core.Api.Controllers", tableNames, "", isMuti);
- return true;
- }
-
- /// <summary>
- /// 鐢熸垚Model灞�
- /// </summary>
- /// <param name="sqlSugarClient">sqlsugar瀹炰緥</param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="tableNames">鏁版嵁搴撹〃鍚嶆暟缁勶紝榛樿绌猴紝鐢熸垚鎵�鏈夎〃</param>
- /// <param name="isMuti"></param>
- /// <returns></returns>
- public static bool CreateModels(SqlSugarScope sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
- {
- Create_Model_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.Model", "Blog.Core.Model.Models", tableNames, "", isMuti);
- return true;
- }
-
- /// <summary>
- /// 鐢熸垚IRepository灞�
- /// </summary>
- /// <param name="sqlSugarClient">sqlsugar瀹炰緥</param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="isMuti"></param>
- /// <param name="tableNames">鏁版嵁搴撹〃鍚嶆暟缁勶紝榛樿绌猴紝鐢熸垚鎵�鏈夎〃</param>
- /// <returns></returns>
- public static bool CreateIRepositorys(SqlSugarScope sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
- {
- Create_IRepository_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.IRepository", "Blog.Core.IRepository", tableNames, "", isMuti);
- return true;
- }
-
-
-
- /// <summary>
- /// 鐢熸垚 IService 灞�
- /// </summary>
- /// <param name="sqlSugarClient">sqlsugar瀹炰緥</param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="isMuti"></param>
- /// <param name="tableNames">鏁版嵁搴撹〃鍚嶆暟缁勶紝榛樿绌猴紝鐢熸垚鎵�鏈夎〃</param>
- /// <returns></returns>
- public static bool CreateIServices(SqlSugarScope sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
- {
- Create_IServices_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.IServices", "Blog.Core.IServices", tableNames, "", isMuti);
- return true;
- }
-
-
-
- /// <summary>
- /// 鐢熸垚 Repository 灞�
- /// </summary>
- /// <param name="sqlSugarClient">sqlsugar瀹炰緥</param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="isMuti"></param>
- /// <param name="tableNames">鏁版嵁搴撹〃鍚嶆暟缁勶紝榛樿绌猴紝鐢熸垚鎵�鏈夎〃</param>
- /// <returns></returns>
- public static bool CreateRepository(SqlSugarScope sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
- {
- Create_Repository_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.Repository", "Blog.Core.Repository", tableNames, "", isMuti);
- return true;
- }
-
-
-
- /// <summary>
- /// 鐢熸垚 Service 灞�
- /// </summary>
- /// <param name="sqlSugarClient">sqlsugar瀹炰緥</param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="isMuti"></param>
- /// <param name="tableNames">鏁版嵁搴撹〃鍚嶆暟缁勶紝榛樿绌猴紝鐢熸垚鎵�鏈夎〃</param>
- /// <returns></returns>
- public static bool CreateServices(SqlSugarScope sqlSugarClient, string ConnId, bool isMuti = false, string[] tableNames = null)
- {
- Create_Services_ClassFileByDBTalbe(sqlSugarClient, ConnId, $@"C:\my-file\Blog.Core.Services", "Blog.Core.Services", tableNames, "", isMuti);
- return true;
- }
-
-
- #region 鏍规嵁鏁版嵁搴撹〃鐢熶骇Controller灞�
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏍规嵁鏁版嵁搴撹〃鐢熶骇Controller灞�
- /// 浣溿��銆�鑰�:Blog.Core
- /// </summary>
- /// <param name="sqlSugarClient"></param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="strPath">瀹炰綋绫诲瓨鏀捐矾寰�</param>
- /// <param name="strNameSpace">鍛藉悕绌洪棿</param>
- /// <param name="lstTableNames">鐢熶骇鎸囧畾鐨勮〃</param>
- /// <param name="strInterface">瀹炵幇鎺ュ彛</param>
- /// <param name="isMuti"></param>
- /// <param name="blnSerializable">鏄惁搴忓垪鍖�</param>
- private static void Create_Controller_ClassFileByDBTalbe(
- SqlSugarScope sqlSugarClient,
- string ConnId,
- string strPath,
- string strNameSpace,
- string[] lstTableNames,
- string strInterface,
- bool isMuti = false,
- bool blnSerializable = false)
- {
- var IDbFirst = sqlSugarClient.DbFirst;
- if (lstTableNames != null && lstTableNames.Length > 0)
- {
- IDbFirst = IDbFirst.Where(lstTableNames);
- }
- var ls = IDbFirst.IsCreateDefaultValue().IsCreateAttribute()
-
- .SettingClassTemplate(p => p =
-@"using Blog.Core.IServices;
-using Blog.Core.Model;
-using Blog.Core.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
-namespace " + strNameSpace + @"
-{
- [Route(""api/[controller]/[action]"")]
- [ApiController]
- [Authorize(Permissions.Name)]
- public class {ClassName}Controller : ControllerBase
- {
- /// <summary>
- /// 鏈嶅姟鍣ㄦ帴鍙ｏ紝鍥犱负鏄ā鏉跨敓鎴愶紝鎵�浠ラ瀛楁瘝鏄ぇ鍐欑殑锛岃嚜宸卞彲浠ラ噸鏋勪笅
- /// </summary>
- private readonly I{ClassName}Services _{ClassName}Services;
-
- public {ClassName}Controller(I{ClassName}Services {ClassName}Services)
- {
- _{ClassName}Services = {ClassName}Services;
- }
-
- [HttpGet]
- public async Task<MessageModel<PageModel<{ClassName}>>> Get(int page = 1, string key = """",int intPageSize = 50)
- {
- if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
- {
- key = """";
- }
-
- Expression<Func<{ClassName}, bool>> whereExpression = a => true;
-
- return new MessageModel<PageModel<{ClassName}>>()
- {
- msg = ""鑾峰彇鎴愬姛"",
- success = true,
- response = await _{ClassName}Services.QueryPage(whereExpression, page, intPageSize)
- };
-
- }
-
- [HttpGet(""{id}"")]
- public async Task<MessageModel<{ClassName}>> Get(string id)
- {
- return new MessageModel<{ClassName}>()
- {
- msg = ""鑾峰彇鎴愬姛"",
- success = true,
- response = await _{ClassName}Services.QueryById(id)
- };
- }
-
- [HttpPost]
- public async Task<MessageModel<string>> Post([FromBody] {ClassName} request)
- {
- var data = new MessageModel<string>();
-
- var id = await _{ClassName}Services.Add(request);
- data.success = id > 0;
- if (data.success)
- {
- data.response = id.ObjToString();
- data.msg = ""娣诲姞鎴愬姛"";
- }
-
- return data;
- }
-
- [HttpPut]
- public async Task<MessageModel<string>> Put([FromBody] {ClassName} request)
- {
- var data = new MessageModel<string>();
- data.success = await _{ClassName}Services.Update(request);
- if (data.success)
- {
- data.msg = ""鏇存柊鎴愬姛"";
- data.response = request?.id.ObjToString();
- }
-
- return data;
- }
-
- [HttpDelete]
- public async Task<MessageModel<string>> Delete(int id)
- {
- var data = new MessageModel<string>();
- var model = await _{ClassName}Services.QueryById(id);
- model.IsDeleted = true;
- data.success = await _departmentServices.Update(model);
- if (data.success)
- {
- data.msg = ""鍒犻櫎鎴愬姛"";
- data.response = model?.Id.ObjToString();
- }
-
- return data;
- }
- }
-}")
-
- .ToClassStringList(strNameSpace);
-
- Dictionary<string, string> newdic = new Dictionary<string, string>();
- //寰幆澶勭悊 棣栧瓧姣嶅皬鍐� 骞舵彃鍏ユ柊鐨� Dictionary
- foreach (KeyValuePair<string, string> item in ls)
- {
- string newkey = "_" + item.Key.First().ToString().ToLower() + item.Key.Substring(1);
- string newvalue = item.Value.Replace("_" + item.Key, newkey);
- newdic.Add(item.Key, newvalue);
- }
- CreateFilesByClassStringList(newdic, strPath, "{0}Controller");
- }
- #endregion
-
-
- #region 鏍规嵁鏁版嵁搴撹〃鐢熶骇Model灞�
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏍规嵁鏁版嵁搴撹〃鐢熶骇Model灞�
- /// 浣溿��銆�鑰�:Blog.Core
- /// </summary>
- /// <param name="sqlSugarClient"></param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="strPath">瀹炰綋绫诲瓨鏀捐矾寰�</param>
- /// <param name="strNameSpace">鍛藉悕绌洪棿</param>
- /// <param name="lstTableNames">鐢熶骇鎸囧畾鐨勮〃</param>
- /// <param name="strInterface">瀹炵幇鎺ュ彛</param>
- /// <param name="isMuti"></param>
- /// <param name="blnSerializable">鏄惁搴忓垪鍖�</param>
- private static void Create_Model_ClassFileByDBTalbe(
- SqlSugarScope sqlSugarClient,
- string ConnId,
- string strPath,
- string strNameSpace,
- string[] lstTableNames,
- string strInterface,
- bool isMuti = false,
- bool blnSerializable = false)
- {
- //澶氬簱鏂囦欢鍒嗙
- if (isMuti)
- {
- strPath = strPath + @"\Models\" + ConnId;
- strNameSpace = strNameSpace + "." + ConnId;
- }
-
- var IDbFirst = sqlSugarClient.DbFirst;
- if (lstTableNames != null && lstTableNames.Length > 0)
- {
- IDbFirst = IDbFirst.Where(lstTableNames);
- }
- var ls = IDbFirst.IsCreateDefaultValue().IsCreateAttribute()
-
- .SettingClassTemplate(p => p =
-@"{using}
-
-namespace " + strNameSpace + @"
-{
-{ClassDescription}
- [SugarTable( ""{ClassName}"", """ + ConnId + @""")]" + (blnSerializable ? "\n [Serializable]" : "") + @"
- public class {ClassName}" + (string.IsNullOrEmpty(strInterface) ? "" : (" : " + strInterface)) + @"
- {
- public {ClassName}()
- {
- }
-{PropertyName}
- }
-}")
- //.SettingPropertyDescriptionTemplate(p => p = string.Empty)
- .SettingPropertyTemplate(p => p =
-@"{SugarColumn}
- public {PropertyType} {PropertyName} { get; set; }")
-
- //.SettingConstructorTemplate(p => p = " this._{PropertyName} ={DefaultValue};")
-
- .ToClassStringList(strNameSpace);
- CreateFilesByClassStringList(ls, strPath, "{0}");
- }
- #endregion
-
-
- #region 鏍规嵁鏁版嵁搴撹〃鐢熶骇IRepository灞�
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏍规嵁鏁版嵁搴撹〃鐢熶骇IRepository灞�
- /// 浣溿��銆�鑰�:Blog.Core
- /// </summary>
- /// <param name="sqlSugarClient"></param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="strPath">瀹炰綋绫诲瓨鏀捐矾寰�</param>
- /// <param name="strNameSpace">鍛藉悕绌洪棿</param>
- /// <param name="lstTableNames">鐢熶骇鎸囧畾鐨勮〃</param>
- /// <param name="strInterface">瀹炵幇鎺ュ彛</param>
- /// <param name="isMuti"></param>
- private static void Create_IRepository_ClassFileByDBTalbe(
- SqlSugarScope sqlSugarClient,
- string ConnId,
- string strPath,
- string strNameSpace,
- string[] lstTableNames,
- string strInterface,
- bool isMuti = false
- )
- {
- //澶氬簱鏂囦欢鍒嗙
- if (isMuti)
- {
- strPath = strPath + @"\" + ConnId;
- strNameSpace = strNameSpace + "." + ConnId;
- }
-
- var IDbFirst = sqlSugarClient.DbFirst;
- if (lstTableNames != null && lstTableNames.Length > 0)
- {
- IDbFirst = IDbFirst.Where(lstTableNames);
- }
- var ls = IDbFirst.IsCreateDefaultValue().IsCreateAttribute()
-
- .SettingClassTemplate(p => p =
-@"using Blog.Core.IRepository.Base;
-using Blog.Core.Model.Models" + (isMuti ? "." + ConnId + "" : "") + @";
-
-namespace " + strNameSpace + @"
-{
- /// <summary>
- /// I{ClassName}Repository
- /// </summary>
- public interface I{ClassName}Repository : IBaseRepository<{ClassName}>" + (string.IsNullOrEmpty(strInterface) ? "" : (" , " + strInterface)) + @"
- {
- }
-}")
-
- .ToClassStringList(strNameSpace);
- CreateFilesByClassStringList(ls, strPath, "I{0}Repository");
- }
- #endregion
-
-
- #region 鏍规嵁鏁版嵁搴撹〃鐢熶骇IServices灞�
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏍规嵁鏁版嵁搴撹〃鐢熶骇IServices灞�
- /// 浣溿��銆�鑰�:Blog.Core
- /// </summary>
- /// <param name="sqlSugarClient"></param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="strPath">瀹炰綋绫诲瓨鏀捐矾寰�</param>
- /// <param name="strNameSpace">鍛藉悕绌洪棿</param>
- /// <param name="lstTableNames">鐢熶骇鎸囧畾鐨勮〃</param>
- /// <param name="strInterface">瀹炵幇鎺ュ彛</param>
- /// <param name="isMuti"></param>
- private static void Create_IServices_ClassFileByDBTalbe(
- SqlSugarScope sqlSugarClient,
- string ConnId,
- string strPath,
- string strNameSpace,
- string[] lstTableNames,
- string strInterface,
- bool isMuti = false)
- {
- //澶氬簱鏂囦欢鍒嗙
- if (isMuti)
- {
- strPath = strPath + @"\" + ConnId;
- strNameSpace = strNameSpace + "." + ConnId;
- }
-
- var IDbFirst = sqlSugarClient.DbFirst;
- if (lstTableNames != null && lstTableNames.Length > 0)
- {
- IDbFirst = IDbFirst.Where(lstTableNames);
- }
- var ls = IDbFirst.IsCreateDefaultValue().IsCreateAttribute()
-
- .SettingClassTemplate(p => p =
-@"using Blog.Core.IServices.BASE;
-using Blog.Core.Model.Models" + (isMuti ? "." + ConnId + "" : "") + @";
-
-namespace " + strNameSpace + @"
-{
- /// <summary>
- /// I{ClassName}Services
- /// </summary>
- public interface I{ClassName}Services :IBaseServices<{ClassName}>" + (string.IsNullOrEmpty(strInterface) ? "" : (" , " + strInterface)) + @"
- {
- }
-}")
-
- .ToClassStringList(strNameSpace);
- CreateFilesByClassStringList(ls, strPath, "I{0}Services");
- }
- #endregion
-
-
-
- #region 鏍规嵁鏁版嵁搴撹〃鐢熶骇 Repository 灞�
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏍规嵁鏁版嵁搴撹〃鐢熶骇 Repository 灞�
- /// 浣溿��銆�鑰�:Blog.Core
- /// </summary>
- /// <param name="sqlSugarClient"></param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="strPath">瀹炰綋绫诲瓨鏀捐矾寰�</param>
- /// <param name="strNameSpace">鍛藉悕绌洪棿</param>
- /// <param name="lstTableNames">鐢熶骇鎸囧畾鐨勮〃</param>
- /// <param name="strInterface">瀹炵幇鎺ュ彛</param>
- /// <param name="isMuti"></param>
- private static void Create_Repository_ClassFileByDBTalbe(
- SqlSugarScope sqlSugarClient,
- string ConnId,
- string strPath,
- string strNameSpace,
- string[] lstTableNames,
- string strInterface,
- bool isMuti = false)
- {
- //澶氬簱鏂囦欢鍒嗙
- if (isMuti)
- {
- strPath = strPath + @"\" + ConnId;
- strNameSpace = strNameSpace + "." + ConnId;
- }
-
- var IDbFirst = sqlSugarClient.DbFirst;
- if (lstTableNames != null && lstTableNames.Length > 0)
- {
- IDbFirst = IDbFirst.Where(lstTableNames);
- }
- var ls = IDbFirst.IsCreateDefaultValue().IsCreateAttribute()
-
- .SettingClassTemplate(p => p =
-@"using Blog.Core.IRepository" + (isMuti ? "." + ConnId + "" : "") + @";
-using Blog.Core.IRepository.UnitOfWork;
-using Blog.Core.Model.Models" + (isMuti ? "." + ConnId + "" : "") + @";
-using Blog.Core.Repository.Base;
-
-namespace " + strNameSpace + @"
-{
- /// <summary>
- /// {ClassName}Repository
- /// </summary>
- public class {ClassName}Repository : BaseRepository<{ClassName}>, I{ClassName}Repository" + (string.IsNullOrEmpty(strInterface) ? "" : (" , " + strInterface)) + @"
- {
- public {ClassName}Repository(IUnitOfWork unitOfWork) : base(unitOfWork)
- {
- }
- }
-}")
- .ToClassStringList(strNameSpace);
-
-
- CreateFilesByClassStringList(ls, strPath, "{0}Repository");
- }
- #endregion
-
-
- #region 鏍规嵁鏁版嵁搴撹〃鐢熶骇 Services 灞�
-
- /// <summary>
- /// 鍔熻兘鎻忚堪:鏍规嵁鏁版嵁搴撹〃鐢熶骇 Services 灞�
- /// 浣溿��銆�鑰�:Blog.Core
- /// </summary>
- /// <param name="sqlSugarClient"></param>
- /// <param name="ConnId">鏁版嵁搴撻摼鎺D</param>
- /// <param name="strPath">瀹炰綋绫诲瓨鏀捐矾寰�</param>
- /// <param name="strNameSpace">鍛藉悕绌洪棿</param>
- /// <param name="lstTableNames">鐢熶骇鎸囧畾鐨勮〃</param>
- /// <param name="strInterface">瀹炵幇鎺ュ彛</param>
- /// <param name="isMuti"></param>
- private static void Create_Services_ClassFileByDBTalbe(
- SqlSugarScope sqlSugarClient,
- string ConnId,
- string strPath,
- string strNameSpace,
- string[] lstTableNames,
- string strInterface,
- bool isMuti = false)
- {
- //澶氬簱鏂囦欢鍒嗙
- if (isMuti)
- {
- strPath = strPath + @"\" + ConnId;
- strNameSpace = strNameSpace + "." + ConnId;
- }
-
- var IDbFirst = sqlSugarClient.DbFirst;
- if (lstTableNames != null && lstTableNames.Length > 0)
- {
- IDbFirst = IDbFirst.Where(lstTableNames);
- }
- var ls = IDbFirst.IsCreateDefaultValue().IsCreateAttribute()
-
- .SettingClassTemplate(p => p =
-@"
-using Blog.Core.IServices" + (isMuti ? "." + ConnId + "" : "") + @";
-using Blog.Core.Model.Models" + (isMuti ? "." + ConnId + "" : "") + @";
-using Blog.Core.Services.BASE;
-using Blog.Core.IRepository.Base;
-
-namespace " + strNameSpace + @"
-{
- public class {ClassName}Services : BaseServices<{ClassName}>, I{ClassName}Services" + (string.IsNullOrEmpty(strInterface) ? "" : (" , " + strInterface)) + @"
- {
- private readonly IBaseRepository<{ClassName}> _dal;
- public {ClassName}Services(IBaseRepository<{ClassName}> dal)
- {
- this._dal = dal;
- base.BaseDal = dal;
- }
- }
-}")
- .ToClassStringList(strNameSpace);
-
- CreateFilesByClassStringList(ls, strPath, "{0}Services");
- }
- #endregion
-
-
- #region 鏍规嵁妯℃澘鍐呭鎵归噺鐢熸垚鏂囦欢
- /// <summary>
- /// 鏍规嵁妯℃澘鍐呭鎵归噺鐢熸垚鏂囦欢
- /// </summary>
- /// <param name="ls">绫绘枃浠跺瓧绗︿覆list</param>
- /// <param name="strPath">鐢熸垚璺緞</param>
- /// <param name="fileNameTp">鏂囦欢鍚嶆牸寮忔ā鏉�</param>
- private static void CreateFilesByClassStringList(Dictionary<string, string> ls, string strPath, string fileNameTp)
- {
-
- foreach (var item in ls)
- {
- var fileName = $"{string.Format(fileNameTp, item.Key)}.cs";
- var fileFullPath = Path.Combine(strPath, fileName);
- if (!Directory.Exists(strPath))
- {
- Directory.CreateDirectory(strPath);
- }
- File.WriteAllText(fileFullPath, item.Value, Encoding.UTF8);
- }
- }
- #endregion
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/ITenantEntity.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/ITenantEntity.cs"
deleted file mode 100644
index ca499c4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/ITenantEntity.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Tenants
-{
- /// <summary>
- /// 绉熸埛妯″瀷鎺ュ彛
- /// </summary>
- public interface ITenantEntity
- {
- /// <summary>
- /// 绉熸埛Id
- /// </summary>
- [SugarColumn(DefaultValue = "0")]
- public long TenantId { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/MultiTenantAttribute.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/MultiTenantAttribute.cs"
deleted file mode 100644
index a0927c3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/MultiTenantAttribute.cs"
+++ /dev/null
@@ -1,56 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Tenants
-{
- /// <summary>
- /// 鏍囪瘑 澶氱鎴� 鐨勪笟鍔¤〃 <br/>
- /// 榛樿璁剧疆鏄搴� <br/>
- /// 鍏叡琛ㄦ棤闇�鍖哄垎 鐩存帴浣跨敤涓诲簱 鍚勮嚜涓氬姟鍦ㄥ悇鑷簱涓� <br/>
- /// </summary>
- [AttributeUsage(AttributeTargets.Class)]
- public class MultiTenantAttribute : Attribute
- {
- public MultiTenantAttribute()
- {
- }
-
- public MultiTenantAttribute(TenantTypeEnum tenantType)
- {
- TenantType = tenantType;
- }
-
-
- public TenantTypeEnum TenantType { get; set; } = TenantTypeEnum.Db;
- }
-
- /// <summary>
- /// 绉熸埛闅旂鏂规
- /// </summary>
- public enum TenantTypeEnum
- {
- None = 0,
-
- /// <summary>
- /// Id闅旂
- /// </summary>
- [Description("Id闅旂")]
- Id = 1,
-
- /// <summary>
- /// 搴撻殧绂�
- /// </summary>
- [Description("搴撻殧绂�")]
- Db = 2,
-
- /// <summary>
- /// 琛ㄩ殧绂�
- /// </summary>
- [Description("琛ㄩ殧绂�")]
- Tables = 3,
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/TenantUtil.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/TenantUtil.cs"
deleted file mode 100644
index a0a9755..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Tenants/TenantUtil.cs"
+++ /dev/null
@@ -1,127 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB;
-
-namespace WIDESEA_Core.Tenants
-{
- public static class TenantUtil
- {
- //public static SysTenant DefaultTenantConfig(this SysTenant tenant)
- //{
- // tenant.DbType ??= DbType.Sqlite;
-
- // //濡傛灉娌℃湁閰嶇疆杩炴帴
- // if (tenant.Connection.IsNullOrEmpty())
- // {
- // //姝ゅ榛樿閰嶇疆 Sqlite 鍦板潃
- // //瀹為檯涓氬姟涓� 涔熶細鏈夎繍缁淬�佺郴缁熺鐞嗗憳绛夋潵缁存姢
- // switch (tenant.DbType.Value)
- // {
- // case DbType.Sqlite:
- // tenant.Connection = $"DataSource={Path.Combine(Environment.CurrentDirectory, tenant.ConfigId)}.db";
- // break;
- // }
- // }
-
- // return tenant;
- //}
-
- //public static ConnectionConfig GetConnectionConfig(this SysTenant tenant)
- //{
- // if (tenant.DbType is null)
- // {
- // throw new ArgumentException("Tenant DbType Must");
- // }
-
-
- // return new ConnectionConfig()
- // {
- // ConfigId = tenant.ConfigId,
- // DbType = tenant.DbType.Value,
- // ConnectionString = tenant.Connection,
- // IsAutoCloseConnection = true,
- // MoreSettings = new ConnMoreSettings()
- // {
- // IsAutoRemoveDataCache = true
- // },
- // };
- //}
-
- public static List<Type> GetTenantEntityTypes(TenantTypeEnum? tenantType = null)
- {
- List<Type> types = RepositorySetting.Entitys.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass).ToList();
-
- List<Type> returnTypes = types.Where(s => IsTenantEntity(s, tenantType)).ToList();
- return returnTypes;
- }
-
- public static bool IsTenantEntity(this Type u, TenantTypeEnum? tenantType = null)
- {
- var mta = u.GetCustomAttribute<MultiTenantAttribute>();
- if (mta is null)
- {
- return false;
- }
-
- if (tenantType != null)
- {
- if (mta.TenantType != tenantType)
- {
- return false;
- }
- }
-
- return true;
- }
-
- public static string GetTenantTableName(this Type type, ISqlSugarClient db, string id)
- {
- var entityInfo = db.EntityMaintenance.GetEntityInfo(type);
- return $@"{entityInfo.DbTableName}_{id}";
- }
-
- //public static string GetTenantTableName(this Type type, ISqlSugarClient db, SysTenant tenant)
- //{
- // return GetTenantTableName(type, db, tenant.Id.ToString());
- //}
-
- public static void SetTenantTable(this ISqlSugarClient db, string id)
- {
- var types = GetTenantEntityTypes(TenantTypeEnum.Tables);
-
- foreach (var type in types)
- {
- db.MappingTables.Add(type.Name, type.GetTenantTableName(db, id));
- }
- }
-
- public static List<SelectModel> GetTenantSelectModels()
- {
- List<SelectModel> selectModels = new List<SelectModel>()
- {
- new SelectModel
- {
- FieldName = MainDb.TenantId
- },
- //new SelectModel
- //{
- // FieldName = MainDb.TenantName
- //},
- new SelectModel
- {
- FieldName = MainDb.ConnectionString,
- },
- new SelectModel
- {
- FieldName = MainDb.TenantDbType
- }
- };
- return selectModels;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs"
deleted file mode 100644
index ab489a0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs"
+++ /dev/null
@@ -1,216 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Utilities
-{
- public static class EntityProperties
- {
- /// <summary>
- /// 楠岃瘉鏁版嵁搴撳瓧娈电被鍨嬩笌鍊兼槸鍚︽纭紝
- /// </summary>
- /// <param name="dbType">鏁版嵁搴撳瓧娈电被鍨�(濡倂archar,nvarchar,decimal,涓嶈甯﹀悗闈㈤暱搴﹀:varchar(50))</param>
- /// <param name="value">鍊�</param>
- /// <param name="propertyInfo">瑕侀獙璇佺殑绫荤殑灞炴�э紝鑻ヤ笉涓簄ull锛屽垯浼氬垽鏂瓧绗︿覆鐨勯暱搴︽槸鍚︽纭�</param>
- /// <returns>(bool, string, object)bool鎴愬惁鏍￠獙鎴愬姛,string鏍￠獙澶辫触淇℃伅,object,褰撳墠鏍￠獙鐨勫��</returns>
- public static (bool, string, object) ValidationVal(this PropertyInfo propertyInfo, object value)
- {
- string dbType = "";
- SugarColumn sugarColumn = null;
- if (propertyInfo != null)
- {
- sugarColumn = propertyInfo.GetCustomAttribute<SugarColumn>();
- dbType = propertyInfo != null ? propertyInfo.GetProperWithDbType() : SqlDbTypeName.NVarChar;
- }
- dbType = dbType.ToLower();
- string val = value?.ToString();
- //楠岃瘉闀垮害
- string reslutMsg = string.Empty;
- if (dbType == SqlDbTypeName.Int)
- {
- if (!value.IsInt())
- reslutMsg = "鍙兘涓烘湁鏁堟暣鏁�";
- } //2021.10.12澧炲姞灞炴�ф牎楠宭ong绫诲瀷鐨勬敮鎸�
- else if (dbType == SqlDbTypeName.BigInt)
- {
- if (!long.TryParse(val, out _))
- {
- reslutMsg = "鍙兘涓烘湁鏁堟暣鏁�";
- }
- }
- else if (dbType == SqlDbTypeName.DateTime
- || dbType == SqlDbTypeName.Date
- || dbType == SqlDbTypeName.SmallDateTime
- || dbType == SqlDbTypeName.SmallDate
- )
- {
- if (!value.IsDate())
- reslutMsg = "蹇呴』涓烘棩鏈熸牸寮�";
- }
- else if (dbType == SqlDbTypeName.Float || dbType == SqlDbTypeName.Decimal || dbType == SqlDbTypeName.Double)
- {
-
- if (!val.IsNumber(null))
- {
- reslutMsg = "涓嶆槸鏈夋晥鏁板瓧";
- }
- }
- else if (dbType == SqlDbTypeName.UniqueIdentifier)
- {
- if (!val.IsGuid())
- {
- reslutMsg = propertyInfo.Name + "Guid涓嶆纭�";
- }
- }
- else if (propertyInfo != null
- && (dbType == SqlDbTypeName.VarChar
- || dbType == SqlDbTypeName.NVarChar
- || dbType == SqlDbTypeName.NChar
- || dbType == SqlDbTypeName.Char
- || dbType == SqlDbTypeName.Text))
- {
-
- //榛樿nvarchar(max) 銆乼ext 闀垮害涓嶈兘瓒呰繃20000
- if (val.Length > 200000)
- {
- reslutMsg = $"瀛楃闀垮害鏈�澶氥��200000銆�";
- }
- else
- {
-
- int length = sugarColumn.Length;
- if (length == 0) { return (true, null, null); }
- //鍒ゆ柇鍙屽瓧鑺備笌鍗曞瓧娈�
- else if (length < 8000 &&
- ((dbType.Substring(0, 1) != "n"
- && Encoding.UTF8.GetBytes(val.ToCharArray()).Length > length)
- || val.Length > length)
- )
- {
- reslutMsg = $"鏈�澶氬彧鑳姐�恵length}銆戜釜瀛楃銆�";
- }
- }
- }
- if (!string.IsNullOrEmpty(reslutMsg) && propertyInfo != null)
- {
- reslutMsg = sugarColumn.ColumnDescription + reslutMsg;
- }
- return (reslutMsg == "" ? true : false, reslutMsg, value);
- }
-
- private static readonly Dictionary<Type, string> ProperWithDbType = new Dictionary<Type, string>() {
- { typeof(string),SqlDbTypeName.NVarChar },
- { typeof(DateTime),SqlDbTypeName.DateTime},
- {typeof(long),SqlDbTypeName.BigInt },
- {typeof(int),SqlDbTypeName.Int},
- { typeof(decimal),SqlDbTypeName.Decimal },
- { typeof(float),SqlDbTypeName.Float },
- { typeof(double),SqlDbTypeName.Double },
- { typeof(byte),SqlDbTypeName.Int },//绫诲瀷寰呭畬
- { typeof(Guid),SqlDbTypeName.UniqueIdentifier}
- };
- public static string GetProperWithDbType(this PropertyInfo propertyInfo)
- {
- bool result = ProperWithDbType.TryGetValue(propertyInfo.PropertyType, out string value);
- if (result)
- {
- return value;
- }
- return SqlDbTypeName.NVarChar;
- }
-
- /// <summary>
- /// 鍒ゆ柇hash鐨勫垪鏄惁涓哄搴旂殑瀹炰綋锛屽苟涓斿�兼槸鍚︽湁鏁�
- /// </summary>
- /// <param name="typeinfo"></param>
- /// <param name="dic"></param>
- /// <param name="removeNotContains">绉婚櫎涓嶅瓨鍦ㄥ瓧娈�</param>
- /// <param name="removerKey">绉婚櫎涓婚敭</param>
- /// <returns></returns>
- public static string ValidateDicInEntity(this Type typeinfo, Dictionary<string, object> dic, bool removerKey, PropertyInfo[] propertyInfo, string[] ignoreFields = null)
- {
- if (dic == null || dic.Count == 0) { return "鍙傛暟鏃犳晥"; }
-
- // 涓嶅瓨鍦ㄧ殑瀛楁鐩存帴绉婚櫎
- dic.Where(x => !propertyInfo.Any(p => p.Name == x.Key.FirstLetterToUpper())).Select(s => s.Key).ToList().ForEach(f =>
- {
- dic.Remove(f);
- });
-
- string keyName = typeinfo.GetKeyName();
- //绉婚櫎涓婚敭
- if (removerKey)
- dic.Remove(keyName);
- //else
- //{
- // if (!dic.ContainsKey(keyName))
- // return "璇蜂紶鍏ヤ富閿弬鏁�";
- //}
-
- foreach (PropertyInfo property in propertyInfo)
- {
- SugarColumn sugarColumn = property.GetCustomAttribute<SugarColumn>();
- if (sugarColumn == null)
- return "璇烽厤缃甋ugarColumn灞炴��";
- //蹇界暐涓庝富閿殑瀛楁涓嶅仛楠岃瘉
- if (property.Name == keyName.FirstLetterToUpper() || (ignoreFields != null && ignoreFields.Contains(property.Name)) || sugarColumn.IsOnlyIgnoreInsert || sugarColumn.IsOnlyIgnoreUpdate || sugarColumn.IsIgnore)
- continue;
-
- //涓嶅湪缂栬緫涓殑鍒楋紝鏄惁涔熻蹇呭～
- if (!dic.ContainsKey(property.Name.FirstLetterToLower()))
- {
- if (!sugarColumn.IsNullable)
- {
- if (sugarColumn.DefaultValue == null)
- return sugarColumn.ColumnDescription + "涓哄繀椤绘彁浜ら」";
- continue;
- }
- continue;
- }
- string str = dic[property.Name.FirstLetterToLower()].ToString();
- //灏嗘墍鏈夌┖鍊艰缃负null
- if (dic[property.Name.FirstLetterToLower()] != null && str == string.Empty)
- dic[property.Name.FirstLetterToLower()] = null;
- }
- return string.Empty;
- }
-
- public static string GetKeyName(this Type typeinfo)
- {
- return typeinfo.GetProperties().GetKeyName();
- }
-
- public static string GetKeyName(this PropertyInfo[] properties)
- {
- foreach (PropertyInfo property in properties)
- {
- SugarColumn sugarColumn = property.GetCustomAttribute<SugarColumn>();
- if (sugarColumn.IsPrimaryKey)
- return property.Name;
- }
- return null;
- }
-
- public static PropertyInfo GetKeyProperty(this Type typeinfo)
- {
- PropertyInfo[] properties = typeinfo.GetProperties();
- foreach (PropertyInfo property in properties)
- {
- SugarColumn sugarColumn = property.GetCustomAttribute<SugarColumn>();
- if (sugarColumn?.IsPrimaryKey ?? false)
- {
- return property;
- }
- }
- return null;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/LambdaExtensions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/LambdaExtensions.cs"
deleted file mode 100644
index 459408a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/LambdaExtensions.cs"
+++ /dev/null
@@ -1,183 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-
-namespace WIDESEA_Core.Utilities
-{
- public static class LambdaExtensions
- {
- /// <summary>
- ///
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <param name="propertyName">瀛楁鍚�</param>
- /// <param name="propertyValue">琛ㄨ揪寮忕殑鍊�</param>
- /// <param name="expressionType">鍒涘缓琛ㄨ揪寮忕殑绫诲瀷,濡�:p=>p.propertyName != propertyValue
- /// p=>p.propertyName.Contains(propertyValue)</param>
- /// <returns></returns>
- public static Expression<Func<T, bool>> CreateExpression<T>(this string propertyName, object propertyValue, LinqExpressionType expressionType)
- {
- return propertyName.CreateExpression<T>(propertyValue, null, expressionType);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <param name="propertyName">瀛楁鍚�</param>
- /// <param name="propertyValue">琛ㄨ揪寮忕殑鍊�</param>
- /// <param name="expressionType">鍒涘缓琛ㄨ揪寮忕殑绫诲瀷,濡�:p=>p.propertyName != propertyValue
- /// p=>p.propertyName.Contains(propertyValue)</param>
- /// <returns></returns>
- private static Expression<Func<T, bool>> CreateExpression<T>(
- this string propertyName,
- object propertyValue,
- ParameterExpression parameter,
- LinqExpressionType expressionType)
- {
- Type proType = null;
- PropertyInfo propertyInfo = typeof(T).GetProperty(propertyName);
- if (propertyInfo != null)
- proType = propertyInfo.PropertyType;
- else
- {
- propertyInfo = typeof(T).GetProperty(propertyName.FirstLetterToLower());
- if (propertyInfo != null)
- proType = propertyInfo.PropertyType;
- else
- {
- propertyInfo = typeof(T).GetProperty(propertyName.FirstLetterToUpper());
- if (propertyInfo != null)
- proType = propertyInfo.PropertyType;
- else
- {
- throw new Exception($"鏈壘鍒拌灞炴��,type:{typeof(T)}");
- }
- }
- }
- //鍒涘缓鑺傜偣鍙橀噺濡俻=>鐨勮妭鐐筽
- // parameter ??= Expression.Parameter(typeof(T), "p");//鍒涘缓鍙傛暟p
- parameter = parameter ?? Expression.Parameter(typeof(T), "p");
-
- //鍒涘缓鑺傜偣鐨勫睘鎬=>p.name 灞炴�ame
- MemberExpression memberProperty = Expression.PropertyOrField(parameter, propertyName);
- if (expressionType == LinqExpressionType.In)
- {
- if (!(propertyValue is System.Collections.IList list) || list.Count == 0) throw new Exception("灞炴�у�肩被鍨嬩笉姝ｇ‘");
-
- bool isStringValue = true;
- List<object> objList = new List<object>();
-
- if (proType.ToString() != "System.String")
- {
- isStringValue = false;
- foreach (var value in list)
- {
- objList.Add(value.ToString().ChangeType(proType));
- }
- list = objList;
- }
-
- if (isStringValue)
- {
- //string 绫诲瀷鐨勫瓧娈碉紝濡傛灉鍊煎甫鏈�'鍗曞紩鍙�,EF浼氶粯璁ゅ彉鎴�''涓や釜鍗曞紩鍙�
- MethodInfo method = typeof(System.Collections.IList).GetMethod("Contains");
- //鍒涘缓闆嗗悎甯搁噺骞惰缃负甯搁噺鐨勫��
- ConstantExpression constantCollection = Expression.Constant(list);
- //鍒涘缓涓�涓〃绀鸿皟鐢ㄥ甫鍙傛暟鐨勬柟娉曠殑锛歯ew string[]{"1","a"}.Contains("a");
- MethodCallExpression methodCall = Expression.Call(constantCollection, method, memberProperty);
- return Expression.Lambda<Func<T, bool>>(methodCall, parameter);
- }
- //闈瀞tring瀛楁锛屾寜涓婇潰鏂瑰紡澶勭悊鎶ュ紓甯窷ull TypeMapping in Sql Tree
- BinaryExpression body = null;
- foreach (var value in list)
- {
- ConstantExpression constantExpression = Expression.Constant(value);
- UnaryExpression unaryExpression = Expression.Convert(memberProperty, constantExpression.Type);
-
- body = body == null
- ? Expression.Equal(unaryExpression, constantExpression)
- : Expression.OrElse(body, Expression.Equal(unaryExpression, constantExpression));
- }
- return Expression.Lambda<Func<T, bool>>(body, parameter);
- }
-
- // object value = propertyValue;
- ConstantExpression constant = proType.ToString() == "System.String"
- ? Expression.Constant(propertyValue) : Expression.Constant(propertyValue.ToString().ChangeType(proType));
-
- // DateTime鍙�夋嫨浜嗘棩鏈熺殑鏃跺�欒嚜鍔ㄥ湪缁撴潫鏃ユ湡鍔犱竴澶╋紝淇DateTime绫诲瀷浣跨敤鏃ユ湡鍖洪棿鏌ヨ鏃犳硶鏌ヨ鍒扮粨鏉熸棩鏈熺殑闂
- if ((proType == typeof(DateTime) || proType == typeof(DateTime?)) && expressionType == LinqExpressionType.LessThanOrEqual && propertyValue.ToString().Length == 10)
- {
- constant = Expression.Constant(Convert.ToDateTime(propertyValue.ToString()).AddDays(1));
- }
-
- UnaryExpression member = Expression.Convert(memberProperty, constant.Type);
- Expression<Func<T, bool>> expression;
- switch (expressionType)
- {
- //p=>p.propertyName == propertyValue
- case LinqExpressionType.Equal:
- expression = Expression.Lambda<Func<T, bool>>(Expression.Equal(member, constant), parameter);
- break;
- //p=>p.propertyName != propertyValue
- case LinqExpressionType.NotEqual:
- expression = Expression.Lambda<Func<T, bool>>(Expression.NotEqual(member, constant), parameter);
- break;
- // p => p.propertyName > propertyValue
- case LinqExpressionType.GreaterThan:
- expression = Expression.Lambda<Func<T, bool>>(Expression.GreaterThan(member, constant), parameter);
- break;
- // p => p.propertyName < propertyValue
- case LinqExpressionType.LessThan:
- expression = Expression.Lambda<Func<T, bool>>(Expression.LessThan(member, constant), parameter);
- break;
- // p => p.propertyName >= propertyValue
- case LinqExpressionType.ThanOrEqual:
- expression = Expression.Lambda<Func<T, bool>>(Expression.GreaterThanOrEqual(member, constant), parameter);
- break;
- // p => p.propertyName <= propertyValue
- case LinqExpressionType.LessThanOrEqual:
- expression = Expression.Lambda<Func<T, bool>>(Expression.LessThanOrEqual(member, constant), parameter);
- break;
- // p => p.propertyName.Contains(propertyValue)
- // p => !p.propertyName.Contains(propertyValue)
- case LinqExpressionType.Contains:
- case LinqExpressionType.NotContains:
- MethodInfo method = typeof(string).GetMethod("Contains", new[] { typeof(string) });
- constant = Expression.Constant(propertyValue, typeof(string));
- if (expressionType == LinqExpressionType.Contains)
- {
- expression = Expression.Lambda<Func<T, bool>>(Expression.Call(member, method, constant), parameter);
- }
- else
- {
- expression = Expression.Lambda<Func<T, bool>>(Expression.Not(Expression.Call(member, method, constant)), parameter);
- }
- break;
- default:
- // p => p.false
- expression = False<T>();
- break;
- }
- return expression;
- }
-
- /// <summary>
- /// 鍒涘缓lambda琛ㄨ揪寮忥細p=>false
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <returns></returns>
- public static Expression<Func<T, bool>> False<T>()
- {
-
- return p => false;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/VierificationCode.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/VierificationCode.cs"
deleted file mode 100644
index bc8ad68..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/VierificationCode.cs"
+++ /dev/null
@@ -1,123 +0,0 @@
-锘縰sing SkiaSharp;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static log4net.Appender.ColoredConsoleAppender;
-
-namespace WIDESEA_Core.Utilities
-{
- public static class VierificationCode
- {
- private static readonly string[] _chars = new string[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "P", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
-
- private static readonly SKColor[] colors = { SKColors.Black, SKColors.Green, SKColors.Brown };
-
- private static readonly string[] fonts = { "Verdana", "Microsoft Sans Serif", "Comic Sans MS", "Arial", "瀹嬩綋" };
- public static string RandomText()
- {
- string code = "";//浜х敓鐨勯殢鏈烘暟
- int temp = -1;
- Random rand = new Random();
- for (int i = 1; i < 5; i++)
- {
- if (temp != -1)
- {
- rand = new Random(i * temp * unchecked((int)DateTime.Now.Ticks));
- }
- int t = rand.Next(61);
- if (temp != -1 && temp == t)
- {
- return RandomText();
- }
- temp = t;
- code += _chars[t];
- }
- return code;
- }
- public static string CreateBase64Imgage(string code)
- {
- var random = new Random();
- var info = new SKImageInfo((int)code.Length * 18, 32);
- using var bitmap = new SKBitmap(info);
- using var canvas = new SKCanvas(bitmap);
-
- canvas.Clear(SKColors.White);
-
- using var pen = new SKPaint();
- pen.FakeBoldText = true;
- pen.Style = SKPaintStyle.Fill;
- pen.TextSize = 20;// 0.6f * info.Width * pen.TextSize / pen.MeasureText(code);
-
- //缁樺埗闅忔満瀛楃
- for (int i = 0; i < code.Length; i++)
- {
- pen.Color = random.GetRandom(colors);//闅忔満棰滆壊绱㈠紩鍊�
-
- pen.Typeface = SKTypeface.FromFamilyName(random.GetRandom(fonts), 700, 20, SKFontStyleSlant.Italic);//閰嶇疆瀛椾綋
- var point = new SKPoint()
- {
- X = i * 16,
- Y = 22// info.Height - ((i + 1) % 2 == 0 ? 2 : 4),
-
- };
- canvas.DrawText(code.Substring(i, 1), point, pen);//缁樺埗涓�涓獙璇佸瓧绗�
-
- }
-
- // 缁樺埗鍣偣
- var points = Enumerable.Range(0, 100).Select(
- _ => new SKPoint(random.Next(bitmap.Width), random.Next(bitmap.Height))
- ).ToArray();
- canvas.DrawPoints(
- SKPointMode.Points,
- points,
- pen);
-
- //缁樺埗璐濆灏旂嚎鏉�
- for (int i = 0; i < 2; i++)
- {
- var p1 = new SKPoint(0, 0);
- var p2 = new SKPoint(0, 0);
- var p3 = new SKPoint(0, 0);
- var p4 = new SKPoint(0, 0);
-
- var touchPoints = new SKPoint[] { p1, p2, p3, p4 };
-
- using var bPen = new SKPaint();
- bPen.Color = random.GetRandom(colors);
- bPen.Style = SKPaintStyle.Stroke;
-
- using var path = new SKPath();
- path.MoveTo(touchPoints[0]);
- path.CubicTo(touchPoints[1], touchPoints[2], touchPoints[3]);
- canvas.DrawPath(path, bPen);
- }
- return bitmap.ToBase64String(SKEncodedImageFormat.Png);
- }
-
- public static T GetRandom<T>(this Random random, T[] tArray)
- {
- if (random == null) random = new Random();
- return tArray[random.Next(tArray.Length)];
- }
-
- /// <summary>
- /// SKBitmap杞珺ase64String
- /// </summary>
- /// <param name="bitmap"></param>
- /// <param name="format"></param>
- /// <returns></returns>
- public static string ToBase64String(this SKBitmap bitmap, SKEncodedImageFormat format)
- {
- using var memStream = new MemoryStream();
- using var wstream = new SKManagedWStream(memStream);
- bitmap.Encode(wstream, format, 32);
- memStream.TryGetBuffer(out ArraySegment<byte> buffer);
- return $"{Convert.ToBase64String(buffer.Array, 0, (int)memStream.Length)}";
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/WIDESEA_Core.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/WIDESEA_Core.csproj"
deleted file mode 100644
index cbe710c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/WIDESEA_Core.csproj"
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- <Version>1.0.1</Version>
- <Authors>test</Authors>
- <Description>dddddddddddddddddddddddddddddddddddd</Description>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Autofac" Version="8.0.0" />
- <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
- <PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
- <PackageReference Include="AutoMapper" Version="13.0.1" />
- <PackageReference Include="log4net" Version="2.0.17" />
- <PackageReference Include="Magicodes.IE.EPPlus" Version="2.7.5.1" />
- <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />
- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.29" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
- <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
- <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
- <PackageReference Include="OfficeOpenXml.Core.ExcelPackage" Version="1.0.0" />
- <PackageReference Include="SkiaSharp" Version="2.88.8" />
- <PackageReference Include="SqlSugarCore" Version="5.1.4.152" />
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
- <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.5" />
- <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />
- <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
- </ItemGroup>
-
- <ItemGroup>
- <Folder Include="Attribute\" />
- <Folder Include="ServiceExtensions\" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.assets.cache"
deleted file mode 100644
index 8894bc6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.dgspec.json"
deleted file mode 100644
index 8e2a2d6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/WIDESEA_Core.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/project.assets.json"
deleted file mode 100644
index 8d1eb3d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/project.assets.json"
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {}
- },
- "libraries": {},
- "projectFileDependencyGroups": {
- "net6.0": []
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/project.nuget.cache"
deleted file mode 100644
index 6b52ee9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "6P1XNSnYVpKYfqbetJsgVGgVFKrzcvZbXgkX3rkzPXr1XqUdAxUbTYrcET9Y5f6SfRx0sGUERa5KBIwPBuYl4Q==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/RoadWayDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/RoadWayDTO.cs"
deleted file mode 100644
index 5860bba..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/RoadWayDTO.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO
-{
- /// <summary>
- /// 绛涢�夊贩閬�
- /// </summary>
- public class RoadWayDTO
- {
- /// <summary>
- /// 宸烽亾缂栧彿
- /// </summary>
- public string? RoadWayNO { get; set; }
-
- /// <summary>
- /// 璐т綅绌洪棽鏁�
- /// </summary>
- public int FreeLocationCount { get; set; }
-
- /// <summary>
- /// 宸烽亾褰撳墠浠诲姟鏁�
- /// </summary>
- public int TaskCount { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/ActionDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/ActionDTO.cs"
deleted file mode 100644
index 57ed299..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/ActionDTO.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.System
-{
- public class ActionDTO
- {
- public int ActionId { get; set; }
- public int MenuId { get; set; }
- public string Text { get; set; }
- public string Value { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/MenuDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/MenuDTO.cs"
deleted file mode 100644
index 44d8bde..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/MenuDTO.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_DTO.System
-{
- public class MenuDTO : Sys_Menu
- {
- public List<ActionDTO> Actions { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/UserPermissions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/UserPermissions.cs"
deleted file mode 100644
index 9c892bb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/System/UserPermissions.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.System
-{
- public class UserPermissionDTO
- {
- public int Id { get; set; }
- public int Pid { get; set; }
- public string Text { get; set; }
- public bool IsApp { get; set; }
- public List<ActionDTO> Actions { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/WIDESEA_DTO.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/WIDESEA_DTO.csproj"
deleted file mode 100644
index 3c9bb11..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/WIDESEA_DTO.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘�<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.assets.cache"
deleted file mode 100644
index 9b3925e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.dgspec.json"
deleted file mode 100644
index d36b5df..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,247 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "projectName": "WIDESEA_DTO",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/WIDESEA_DTO.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/project.assets.json"
deleted file mode 100644
index 486f235..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/project.assets.json"
+++ /dev/null
@@ -1,129 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- }
- }
- },
- "libraries": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_Model >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "projectName": "WIDESEA_DTO",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/project.nuget.cache"
deleted file mode 100644
index eb2b9c9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "w6z3i+Jr89kxKuv05qXouV3yQqjuXXinzqn/zw1COclr0xJxfRAZfOpVmzp1zn4hRYg34G1DnGseT+s6AQ5pbQ==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/Dt_RoadWayInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/Dt_RoadWayInfoService.cs"
deleted file mode 100644
index 083aa50..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/Dt_RoadWayInfoService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_RoadWayInfoService : IService<Dt_RoadWayInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_AreaInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_AreaInfoService.cs"
deleted file mode 100644
index a749e36..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_AreaInfoService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_AreaInfoService : IService<Dt_AreaInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_BillGroupStockDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_BillGroupStockDetailService.cs"
deleted file mode 100644
index 1a9450b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_BillGroupStockDetailService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_BillGroupStockDetailService : IService<Dt_BillGroupStockDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_BillGroupStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_BillGroupStockService.cs"
deleted file mode 100644
index 02a2a67..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_BillGroupStockService.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_BillGroupStockService : IService<Dt_BillGroupStock>
- {
- /// <summary>
- /// PDA缁勭洏纭,缁戝畾鎵樼洏鐮佸拰鐗╂枡鐮侊紝璁板綍缁勭洏淇℃伅锛屼繚瀛樺埌锛氫富琛� Dt_BillGroupStock,鏄庣粏琛� Dt_BillGroupStockDetail
- /// </summary>
- /// <param name="dt_BillGroupStock">缁勭洏淇℃伅</param>
- /// <returns></returns>
- WebResponseContent PDAGroupPlateConfirm(Dt_BillGroupStock dt_BillGroupStock);
-
-
- /// <summary>
- /// PDA缁勭洏鎾ら攢纭,瑙ｇ粦鎵樼洏鐮佸拰鐗╂枡鐮�
- /// </summary>
- /// <param name="plateCode">鎵樼洏鍙�</param>
- /// <returns></returns>
- WebResponseContent PDAGroupPlateRevoke(string plateCode);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderDetailService.cs"
deleted file mode 100644
index bbbc8bb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderDetailService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_InboundOrderDetailService : IService<Dt_InboundOrderDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderProductionDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderProductionDetailService.cs"
deleted file mode 100644
index 2b33540..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderProductionDetailService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_InboundOrderProductionDetailService : IService<Dt_InboundOrderProductionDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderProductionService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderProductionService.cs"
deleted file mode 100644
index 23ce0bd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderProductionService.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_InboundOrderProductionService : IService<Dt_InboundOrderProduction>
- {
- Task<List<Dt_InboundOrderProduction>> GetDt_InboundOrderProduction(int SynchronizationFlag);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderPurchaseDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderPurchaseDetailService.cs"
deleted file mode 100644
index e365bd8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderPurchaseDetailService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_InboundOrderPurchaseDetailService : IService<Dt_InboundOrderPurchaseDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderPurchaseService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderPurchaseService.cs"
deleted file mode 100644
index e23e24e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderPurchaseService.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_InboundOrderPurchaseService : IService<Dt_InboundOrderPurchase>
- {
- Task<List<Dt_InboundOrderPurchase>> GetDt_InboundOrderPurchase(int SynchronizationFlag);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderService.cs"
deleted file mode 100644
index 78dd20b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_InboundOrderService.cs"
+++ /dev/null
@@ -1,50 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_InboundOrderService : IService<Dt_InboundOrder>
- {
- /// <summary>
- /// 鍚屾鐢熶骇鍏ュ簱鍘熷鍗曟嵁鍒版湰绯荤粺鍏ュ簱鍗曡〃锛屽苟鏇存柊鍘熷鍗曟嵁鐨勫悓姝ユ爣蹇�
- /// 鍚屾鏍囧織 SynchronizationFlag 0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐�
- /// </summary>
- /// <returns></returns>
- Task<WebResponseContent> GetInboundOrderFromProductionOrigin();
-
- /// <summary>
- /// 鍚屾閲囪喘鍏ュ簱鍘熷鍗曟嵁鍒版湰绯荤粺鍏ュ簱鍗曡〃锛屽苟鏇存柊鍘熷鍗曟嵁鐨勫悓姝ユ爣蹇�
- /// 鍚屾鏍囧織 SynchronizationFlag 0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐�
- /// </summary>
- /// <returns></returns>
- Task<WebResponseContent> GetInboundOrderFromPurchaseOrigin();
-
- /// <summary>
- /// 浜х敓鍏ュ簱浠诲姟 鍒嗛厤宸烽亾/璐т綅鍙�
- /// </summary>
- /// <param name="plateCode">鎵樼洏鏉＄爜</param>
- /// <param name="SourceAddress">璧峰鍦板潃</param>
- /// <returns></returns>
- WebResponseContent GenerateInboundTask(string plateCode, string SourceAddress);
-
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙疯幏鍙栬揣浣嶅彿
- /// </summary>
- /// <param name="taskNo">浠诲姟鍙�</param>
- /// <returns></returns>
- WebResponseContent GetInboundLocation(int taskNum);
-
- /// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚澶勭悊
- /// </summary>
- /// <returns></returns>
- WebResponseContent FinishInboundTask(int taskNum);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_LocationInfoService.cs"
deleted file mode 100644
index ac08e7b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_LocationInfoService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_LocationInfoService : IService<Dt_LocationInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_MaterielAttributeService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_MaterielAttributeService.cs"
deleted file mode 100644
index 04e7601..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_MaterielAttributeService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_MaterielAttributeService : IService<Dt_MaterielAttribute>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_MaterielInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_MaterielInfoService.cs"
deleted file mode 100644
index 4e11e6e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_MaterielInfoService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_MaterielInfoService : IService<Dt_MaterielInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_StrategyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_StrategyService.cs"
deleted file mode 100644
index f3e491c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_StrategyService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_StrategyService : IService<Dt_Strategy>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_TaskExecuteDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_TaskExecuteDetailService.cs"
deleted file mode 100644
index c1ae710..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_TaskExecuteDetailService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_TaskExecuteDetailService : IService<Dt_TaskExecuteDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_TaskService.cs"
deleted file mode 100644
index 9af3254..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_TaskService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_TaskService : IService<Dt_Task>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_UnitInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_UnitInfoService.cs"
deleted file mode 100644
index 44435b0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_UnitInfoService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_UnitInfoService : IService<Dt_UnitInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_WareAreaInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_WareAreaInfoService.cs"
deleted file mode 100644
index b2e6918..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/IDt_WareAreaInfoService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessServices
-{
- public interface IDt_WareAreaInfoService : IService<Dt_WareAreaInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj"
deleted file mode 100644
index 17d93c8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj"
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
- <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Debug/net6.0/WIDESEA_IBusinessServices.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Debug/net6.0/WIDESEA_IBusinessServices.assets.cache"
deleted file mode 100644
index 938df40..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Debug/net6.0/WIDESEA_IBusinessServices.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.dgspec.json"
deleted file mode 100644
index f4bed6e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "projectName": "WIDESEA_IBusinessServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/WIDESEA_IBusinessServices.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/project.assets.json"
deleted file mode 100644
index 5dbd13e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/project.assets.json"
+++ /dev/null
@@ -1,133 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- }
- }
- },
- "libraries": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_Core >= 1.0.1",
- "WIDESEA_Model >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "projectName": "WIDESEA_IBusinessServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/project.nuget.cache"
deleted file mode 100644
index 5ed83f9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "+xO17GgqcVPEHnUs0mUIaGTuvntCjDrYw9VOqDkP9tL1GzESQi9LQuWbRm/XpiMCP9+uQPmOeoHMK/h5MKKxwQ==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_AreaInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_AreaInfoRepository.cs"
deleted file mode 100644
index c52cff3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_AreaInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_AreaInfoRepository : IRepository<Dt_AreaInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_BillGroupStockDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_BillGroupStockDetailRepository.cs"
deleted file mode 100644
index 1ece4f2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_BillGroupStockDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_BillGroupStockDetailRepository : IRepository<Dt_BillGroupStockDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_BillGroupStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_BillGroupStockRepository.cs"
deleted file mode 100644
index 568c79d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_BillGroupStockRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_BillGroupStockRepository : IRepository<Dt_BillGroupStock>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderDetailRepository.cs"
deleted file mode 100644
index ab75ba3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_InboundOrderDetailRepository : IRepository<Dt_InboundOrderDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderProductionDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderProductionDetailRepository.cs"
deleted file mode 100644
index e3ca8aa..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderProductionDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_InboundOrderProductionDetailRepository : IRepository<Dt_InboundOrderProductionDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderProductionRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderProductionRepository.cs"
deleted file mode 100644
index 5e4dff0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderProductionRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_InboundOrderProductionRepository : IRepository<Dt_InboundOrderProduction>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderPurchaseDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderPurchaseDetailRepository.cs"
deleted file mode 100644
index c0c9adc..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderPurchaseDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_InboundOrderPurchaseDetailRepository : IRepository<Dt_InboundOrderPurchaseDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderPurchaseRepository .cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderPurchaseRepository .cs"
deleted file mode 100644
index ef50482..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderPurchaseRepository .cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_InboundOrderPurchaseRepository : IRepository<Dt_InboundOrderPurchase>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderRepository.cs"
deleted file mode 100644
index 02c4972..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_InboundOrderRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_InboundOrderRepository : IRepository<Dt_InboundOrder>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_LocationInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_LocationInfoRepository.cs"
deleted file mode 100644
index d0ce83c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_LocationInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_LocationInfoRepository : IRepository<Dt_LocationInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_MaterielAttributeRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_MaterielAttributeRepository.cs"
deleted file mode 100644
index aa86d4d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_MaterielAttributeRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_MaterielAttributeRepository : IRepository<Dt_MaterielAttribute>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_MaterielInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_MaterielInfoRepository.cs"
deleted file mode 100644
index 31011c8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_MaterielInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_MaterielInfoRepository : IRepository<Dt_MaterielInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_RoadWayInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_RoadWayInfoRepository.cs"
deleted file mode 100644
index 96438c7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_RoadWayInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_RoadWayInfoRepository : IRepository<Dt_RoadWayInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_StrategyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_StrategyRepository.cs"
deleted file mode 100644
index 0f7e47c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_StrategyRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_StrategyRepository : IRepository<Dt_Strategy>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_TaskExecuteDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_TaskExecuteDetailRepository.cs"
deleted file mode 100644
index 47f8907..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_TaskExecuteDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_TaskExecuteDetailRepository : IRepository<Dt_TaskExecuteDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_TaskRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_TaskRepository.cs"
deleted file mode 100644
index e3d83df..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_TaskRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_TaskRepository : IRepository<Dt_Task>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_UnitInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_UnitInfoRepository.cs"
deleted file mode 100644
index 374aff6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_UnitInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_UnitInfoRepository : IRepository<Dt_UnitInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_WareAreaInfoRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_WareAreaInfoRepository.cs"
deleted file mode 100644
index 0da5d6c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/IDt_WareAreaInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBusinessesRepository
-{
- public interface IDt_WareAreaInfoRepository : IRepository<Dt_WareAreaInfo>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj"
deleted file mode 100644
index 17d93c8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj"
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
- <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Debug/net6.0/WIDESEA_IBusinessesRepository.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Debug/net6.0/WIDESEA_IBusinessesRepository.assets.cache"
deleted file mode 100644
index 4c58cac..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Debug/net6.0/WIDESEA_IBusinessesRepository.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.dgspec.json"
deleted file mode 100644
index 0f00e11..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "projectName": "WIDESEA_IBusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/WIDESEA_IBusinessesRepository.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/project.assets.json"
deleted file mode 100644
index 7a6a534..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/project.assets.json"
+++ /dev/null
@@ -1,133 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- }
- }
- },
- "libraries": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_Core >= 1.0.1",
- "WIDESEA_Model >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "projectName": "WIDESEA_IBusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/project.nuget.cache"
deleted file mode 100644
index 98550a9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "GD5R/26Kn2Dr6U+318uoj6i9wI4wDeZZZl5+YA7DuI5SYNyAFpCz1fDJBdMCPt6k9MnSPO7W+f41H+Juz3NrkA==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_BillGroupStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_BillGroupStockRepository.cs"
deleted file mode 100644
index 9216f1b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_BillGroupStockRepository.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_BillGroupStockRepository : IRepository<Dt_BillGroupStock>
- {
- /// <summary>
- /// 鑾峰彇鍑哄簱搴撳瓨
- /// </summary>
- /// <returns></returns>
- List<Dt_BillGroupStock> GetOutboundStockList();
-
- /// <summary>
- /// 鏇存柊搴撳瓨闆嗗悎
- /// </summary>
- /// <param name="stocks">搴撳瓨闆嗗悎</param>
- /// <returns></returns>
- bool UpdateNavStock(List<Dt_BillGroupStock> stocks);
-
- /// <summary>
- /// 鏇存柊鍗曚釜搴撳瓨
- /// </summary>
- /// <param name="stocks">搴撳瓨</param>
- /// <returns></returns>
- bool UpdateNavStock(Dt_BillGroupStock stock);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_LocationRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_LocationRepository.cs"
deleted file mode 100644
index 43dc4cb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_LocationRepository.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_LocationRepository : IRepository<Dt_LocationInfo>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_TaskRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_TaskRepository.cs"
deleted file mode 100644
index 723818c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_TaskRepository.cs"
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_TaskRepository : IRepository<Dt_Task>
- {
- Task<Dt_Task> GetById(int id);
-
- Task<List<Dt_Task>> GetList();
-
- Task<Dt_Task> Create(Dt_Task model);
-
- Task<bool> Create(List<Dt_Task> models);
-
- Task<bool> Update(Dt_Task model);
-
- Task<bool> Update(List<Dt_Task> models);
-
- Task<bool> Delete(int id);
-
- Task<bool> Delete(List<int> ids);
-
- Task<List<Dt_Task>> GetListByOutOrder(int outOrderId);
-
- Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status);
-
- Task<List<Dt_Task>> GetListByStatus(int status);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_Task_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_Task_HtyRepository.cs"
deleted file mode 100644
index cc95a3a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/Basic/IDt_Task_HtyRepository.cs"
+++ /dev/null
@@ -1,12 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_Task_HtyRepository : IRepository<Dt_Task_Hty>
- {
- bool InsertTask(Dt_Task_Hty task);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_DictionaryRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_DictionaryRepository.cs"
deleted file mode 100644
index 8a10124..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_DictionaryRepository.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface ISys_DictionaryRepository : IRepository<Sys_Dictionary>
- {
- IEnumerable<Sys_Dictionary> GetDictionaries(IEnumerable<string> dicNos, bool executeSql = true);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_MenuRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_MenuRepository.cs"
deleted file mode 100644
index 6e6af38..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_MenuRepository.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_DTO.System;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface ISys_MenuRepository : IRepository<Sys_Menu>
- {
- List<MenuDTO> GetAllMenu();
-
- object GetSuperAdminMenu();
-
- object GetMenuByRoleId(int roleId);
-
- List<Permissions> GetPermissions(int roleId);
-
- object GetMenu(List<int> menuIds);
-
- object GetTreeItem(int menuId);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_RoleAuthRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_RoleAuthRepository.cs"
deleted file mode 100644
index 5825b44..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_RoleAuthRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface ISys_RoleAuthRepository : IRepository<Sys_RoleAuth>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_RoleRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_RoleRepository.cs"
deleted file mode 100644
index 1247e3d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_RoleRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface ISys_RoleRepository : IRepository<Sys_Role>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_TenantRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_TenantRepository.cs"
deleted file mode 100644
index 401e256..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_TenantRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface ISys_TenantRepository : IRepository<Sys_Tenant>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_TestRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_TestRepository.cs"
deleted file mode 100644
index 246cede..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_TestRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface ISys_TestRepository : IRepository<Sys_Test>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_UserRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_UserRepository.cs"
deleted file mode 100644
index 577c4fb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/ISys_UserRepository.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.HttpContextUser;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface ISys_UserRepository : IRepository<Sys_User>
- {
- UserInfo GetUserInfo(string userName, string password);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderAndStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderAndStockRepository.cs"
deleted file mode 100644
index 2cfb1dd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderAndStockRepository.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_OutOrderAndStockRepository : IRepository<Dt_OutOrderAndStock>
- {
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇鍑哄簱鐗╂枡淇℃伅
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="orderNum">鍑哄簱璁㈠崟</param>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <returns>鍑哄簱鐗╂枡淇℃伅</returns>
- Task<Dt_OutOrderAndStock> GetOrderAndStock(string locationID = null, string orderNum = null, string palletCode = null);
-
- /// <summary>
- /// 瀵艰埅鍒犻櫎
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool DeleteNavOrderStock(Dt_OutOrderAndStock stock);
-
- /// <summary>
- /// 瀵艰埅鏇存柊
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool UpdateNavOrderStock(Dt_OutOrderAndStock stock);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderAndStock_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderAndStock_HtyRepository.cs"
deleted file mode 100644
index ab732f3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderAndStock_HtyRepository.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_OutOrderAndStock_HtyRepository : IRepository<Dt_OutOrderAndStock_Hty>
- {
- /// <summary>
- /// 瀵艰埅娣诲姞锛堟坊鍔犲簱瀛樹富浠庡巻鍙诧紝璁㈠崟涓讳粠鍘嗗彶锛�
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅鍘嗗彶</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool InsertNav(Dt_OutOrderAndStock_Hty stock);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderDtailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderDtailRepository.cs"
deleted file mode 100644
index 791e690..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderDtailRepository.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_OutOrderDtailRepository : IRepository<Dt_OutOrderDetail>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderProductionDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderProductionDetailRepository.cs"
deleted file mode 100644
index 9153154..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderProductionDetailRepository.cs"
+++ /dev/null
@@ -1,10 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_OutOrderProductionDetailRepository : IRepository<Dt_OutOrderProductionDetail>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderProductionRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderProductionRepository.cs"
deleted file mode 100644
index abc2ca8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderProductionRepository.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_OutOrderProductionRepository : IRepository<Dt_OutOrderProduction>
- {
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="production">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- int InsertOrderProduction(Dt_OutOrderProduction production);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderRepository.cs"
deleted file mode 100644
index e2e0a0d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderRepository.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_OutOrderRepository : IRepository<Dt_OutOrder>
- {
-
- /// <summary>
- /// 淇敼鍑哄簱璁㈠崟锛堝鑸慨鏀癸級
- /// </summary>
- /// <param name="outOrder"></param>
- /// <returns>鏄惁鎴愬姛</returns>
- Task<bool> OutOrderUpdated(Dt_OutOrder outOrder);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderTransferDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderTransferDetailRepository.cs"
deleted file mode 100644
index cc47ea5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderTransferDetailRepository.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_OutOrderTransferDetailRepository : IRepository<Dt_OutOrderTransferDetail>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderTransferRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderTransferRepository.cs"
deleted file mode 100644
index 3792b3b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/OutboundOrder/IDt_OutOrderTransferRepository.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRepository
-{
- public interface IDt_OutOrderTransferRepository : IRepository<Dt_OutOrderTransfer>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/WIDESEA_IRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/WIDESEA_IRepository.csproj"
deleted file mode 100644
index a70161f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/WIDESEA_IRepository.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_DTO\WIDESEA_DTO.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Debug/net6.0/WIDESEA_IRepository.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Debug/net6.0/WIDESEA_IRepository.assets.cache"
deleted file mode 100644
index 473936c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Debug/net6.0/WIDESEA_IRepository.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.dgspec.json"
deleted file mode 100644
index 78f24c5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,308 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "projectName": "WIDESEA_DTO",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "projectName": "WIDESEA_IRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/WIDESEA_IRepository.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/project.assets.json"
deleted file mode 100644
index a969c5e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/project.assets.json"
+++ /dev/null
@@ -1,147 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- }
- }
- },
- "libraries": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_DTO/WIDESEA_DTO.csproj",
- "msbuildProject": "../WIDESEA_DTO/WIDESEA_DTO.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_DTO >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "projectName": "WIDESEA_IRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/project.nuget.cache"
deleted file mode 100644
index c8c1dc3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "D0VlhdIC8cuiDgwmaVEpMhKbsdANoPDhGpDei+LJkYQRvIuIgFSY8Ddz/LqRiayv873VxxxTWUUV5vRKV3Hnvg==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_BillGroupStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_BillGroupStockService.cs"
deleted file mode 100644
index fa576cf..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_BillGroupStockService.cs"
+++ /dev/null
@@ -1,38 +0,0 @@
-锘縰sing WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public interface IDt_BillGroupStockService : IService<Dt_BillGroupStock>
- {
- /// <summary>
- /// 鑾峰彇鎵�鏈夊彲鍑哄簱搴撳瓨锛屼笉鍖呮嫭宸茬粡鍑哄簱鐨勬垨宸茬粡鍒嗛厤鐨勩��
- /// </summary>
- /// <returns>鍑哄簱搴撳瓨鍒楄〃</returns>
- Task<WebResponseContent> GetOutboundStock();
-
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇搴撳瓨
- /// </summary>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="materialNo">鐗╂枡缂栧彿</param>
- /// <returns>鐗瑰畾搴撳瓨</returns>
- Task<Dt_BillGroupStock> GetStocks(string palletCode = null, string locationID = null, string materialNo = null);
-
- /// <summary>
- /// 鍫嗗灈鏈轰换鍔″畬鎴�
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- Task<WebResponseContent> CompleteStackTaskAsync(SaveModel saveModel);
-
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- Task<WebResponseContent> CompleteTaskAsync(SaveModel saveModel);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_TaskService.cs"
deleted file mode 100644
index dce81c9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_TaskService.cs"
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public interface IDt_TaskService : IService<Dt_Task>
- {
- Task<Dt_Task> GetById(int id);
-
- Task<Dt_Task> GetByLocation(string locationID);
-
- Task<Dt_Task> GetByTaskNum(int taskNum);
-
- Task<List<Dt_Task>> GetList();
-
- Task<Dt_Task> Create(Dt_Task model);
-
- Task<bool> Create(List<Dt_Task> models);
-
- Task<bool> Update(Dt_Task model);
-
- Task<bool> Update(List<Dt_Task> models);
-
- Task<bool> Delete(int id);
-
- Task<bool> Delete(List<int> ids);
-
- Task<List<Dt_Task>> GetListByOutOrder(int outOrderId);
-
- Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status);
-
- Task<List<Dt_Task>> GetListByStatus(int status);
-
- bool IsExist(string palletCode);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_Task_HtyService.cs"
deleted file mode 100644
index d2f38dd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_Task_HtyService.cs"
+++ /dev/null
@@ -1,10 +0,0 @@
-锘縰sing WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public interface IDt_Task_HtyService : IService<Dt_Task_Hty>
- {
- bool InsertTask(Dt_Task_Hty task);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_locationService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_locationService.cs"
deleted file mode 100644
index cf64a29..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/Basic/IDt_locationService.cs"
+++ /dev/null
@@ -1,9 +0,0 @@
-锘縰sing WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public interface IDt_LocationService : IService<Dt_LocationInfo>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_DictionaryService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_DictionaryService.cs"
deleted file mode 100644
index 9bf55c4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_DictionaryService.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface ISys_DictionaryService : IService<Sys_Dictionary>
- {
- object GetVueDictionary(string[] dicNos);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_MenuService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_MenuService.cs"
deleted file mode 100644
index b054aa3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_MenuService.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.System;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface ISys_MenuService : IService<Sys_Menu>
- {
- object GetCurrentMenuActionList();
-
- List<MenuDTO> GetUserMenuList(int roleId);
-
- List<ActionDTO> GetActions(int menuId, List<ActionDTO> menuActions, List<Permissions> permissions, int roleId);
-
- object GetMenu();
-
- object GetTreeItem(int menuId);
-
- WebResponseContent Save(Sys_Menu menu);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_RoleService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_RoleService.cs"
deleted file mode 100644
index 1fdd979..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_RoleService.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.System;
-using WIDESEA_Model.Models;
-using WIDESEA_Model.Models.System;
-
-namespace WIDESEA_IServices
-{
- public interface ISys_RoleService : IService<Sys_Role>
- {
- List<RoleNodes> GetAllChildren(int roleId);
- WebResponseContent GetCurrentTreePermission();
-
- WebResponseContent GetUserTreePermission(int role_Id);
-
- WebResponseContent SavePermission(List<UserPermissionDTO> userPermissions, int roleId);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_TenantService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_TenantService.cs"
deleted file mode 100644
index b3bbb8a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_TenantService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface ISys_TenantService : IService<Sys_Tenant>
- {
- WebResponseContent InitTenantInfo(string tenantName, int tenantType);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_TestService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_TestService.cs"
deleted file mode 100644
index e4f9568..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_TestService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface ISys_TestService : IService<Sys_Test>
- {
- WebResponseContent TranTest();
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_UserService.cs"
deleted file mode 100644
index fe0d422..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/ISys_UserService.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface ISys_UserService : IService<Sys_User>
- {
- WebResponseContent Login(LoginInfo loginInfo);
-
- WebResponseContent GetCurrentUserInfo();
-
- WebResponseContent ModifyPwd(string oldPwd, string newPwd);
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderAndStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderAndStockService.cs"
deleted file mode 100644
index 0135c1e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderAndStockService.cs"
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縰sing WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface IDt_OutOrderAndStockService : IService<Dt_OutOrderAndStock>
- {
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇鍑哄簱鐗╂枡淇℃伅
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="orderNum">鍑哄簱璁㈠崟</param>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <returns>鍑哄簱鐗╂枡淇℃伅</returns>
- Task<Dt_OutOrderAndStock> GetOrderAndStock(string locationID = null, string orderNum = null, string palletCode = null);
-
- /// <summary>
- /// 瀵艰埅鍒犻櫎
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool DeleteNavOrderStock(Dt_OutOrderAndStock stock);
-
- /// <summary>
- /// 瀵艰埅鏇存柊
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool UpdateNavOrderStock(Dt_OutOrderAndStock stock);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderAndStock_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderAndStock_HtyService.cs"
deleted file mode 100644
index 0f01102..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderAndStock_HtyService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface IDt_OutOrderAndStock_HtyService : IService<Dt_OutOrderAndStock_Hty>
- {
- /// <summary>
- /// 瀵艰埅娣诲姞锛堟坊鍔犲簱瀛樹富浠庡巻鍙诧紝璁㈠崟涓讳粠鍘嗗彶锛�
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅鍘嗗彶</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool InsertNav(Dt_OutOrderAndStock_Hty stock);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderDtailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderDtailService.cs"
deleted file mode 100644
index 5a2c255..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderDtailService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface IDt_OutOrderDtailService : IService<Dt_OutOrderDetail>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderProductionDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderProductionDetailService.cs"
deleted file mode 100644
index 21a6b33..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderProductionDetailService.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface IDt_OutOrderProductionDetailService : IService<Dt_OutOrderProductionDetail>
- {
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="productionDetail">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- int AddOrderProductionDetail(Dt_OutOrderProductionDetail productionDetail);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderProductionService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderProductionService.cs"
deleted file mode 100644
index c3ccb30..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderProductionService.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface IDt_OutOrderProductionService : IService<Dt_OutOrderProduction>
- {
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="production">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- int AddOrderProduction(Dt_OutOrderProduction production);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderService.cs"
deleted file mode 100644
index 947fd13..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderService.cs"
+++ /dev/null
@@ -1,37 +0,0 @@
-锘縰sing WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface IDt_OutOrderService : IService<Dt_OutOrder>
- {
- /// <summary>
- /// 娣诲姞鐢熶骇鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- WebResponseContent AddOutOrderProduction(SaveModel model);
-
- /// <summary>
- /// 娣诲姞璋冩嫧鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- WebResponseContent AddOutOrderTransfer(SaveModel model);
-
- /// <summary>
- /// 鏍规嵁鍑哄簱鍗曞彿鏌ヨ鍑哄簱璁㈠崟
- /// </summary>
- /// <param name="orderNumber">鍑哄簱鍗曞彿</param>
- /// <returns>鍑哄簱璁㈠崟</returns>
- WebResponseContent GetOutOrderByNumber(string orderNumber);
-
- /// <summary>
- /// 淇敼鍑哄簱璁㈠崟锛堝鑸慨鏀癸級
- /// </summary>
- /// <param name="outOrder"></param>
- /// <returns>鏄惁鎴愬姛</returns>
- Task<bool> OutOrderUpdated(Dt_OutOrder outOrder);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderTransferDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderTransferDetailService.cs"
deleted file mode 100644
index a2ca9c3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderTransferDetailService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface IDt_OutOrderTransferDetailService : IService<Dt_OutOrderTransferDetail>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderTransferService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderTransferService.cs"
deleted file mode 100644
index e512da7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/OutboundOrder/IDt_OutOrderTransferService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IServices
-{
- public interface IDt_OutOrderTransferService : IService<Dt_OutOrderTransfer>
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/WIDESEA_IServices.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/WIDESEA_IServices.csproj"
deleted file mode 100644
index 1867b89..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/WIDESEA_IServices.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_Repository\WIDESEA_Repository.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Debug/net6.0/WIDESEA_IServices.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Debug/net6.0/WIDESEA_IServices.assets.cache"
deleted file mode 100644
index 21eaa38..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Debug/net6.0/WIDESEA_IServices.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.dgspec.json"
deleted file mode 100644
index d8b3ed7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,430 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "projectName": "WIDESEA_DTO",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "projectName": "WIDESEA_IRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "projectName": "WIDESEA_IServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "projectName": "WIDESEA_Repository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/WIDESEA_IServices.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/project.assets.json"
deleted file mode 100644
index 7cb4491..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/project.assets.json"
+++ /dev/null
@@ -1,183 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- }
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_DTO": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- },
- "WIDESEA_Repository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_IRepository": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Repository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Repository.dll": {}
- }
- }
- }
- },
- "libraries": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_DTO/WIDESEA_DTO.csproj",
- "msbuildProject": "../WIDESEA_DTO/WIDESEA_DTO.csproj"
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj",
- "msbuildProject": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- },
- "WIDESEA_Repository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Repository/WIDESEA_Repository.csproj",
- "msbuildProject": "../WIDESEA_Repository/WIDESEA_Repository.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_Repository >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "projectName": "WIDESEA_IServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/project.nuget.cache"
deleted file mode 100644
index 38eb104..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "VvHQCl6Zg6rXZ0wxAudOEqqZ2CNMma9zuEQ6JfAY2zvbVD3SFdeEGmOzH9r63b5z0SNCb9oEvNpSb7/jCfmsyw==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/GlobalUsing.cs"
deleted file mode 100644
index db797a1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/GlobalUsing.cs"
+++ /dev/null
@@ -1,2 +0,0 @@
-锘縢lobal using WIDESEA_Core.BaseRepository;
-global using WIDESEA_Model.Models;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/Location/IDt_LocationRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/Location/IDt_LocationRepository.cs"
deleted file mode 100644
index 3dc1825..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/Location/IDt_LocationRepository.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutBasicRepository;
-
-public interface IDt_LocationRepository : IRepository<Dt_LocationInfo>
-{
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/Stock/IDt_BillGroupStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/Stock/IDt_BillGroupStockRepository.cs"
deleted file mode 100644
index 3e2f5bc..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/Stock/IDt_BillGroupStockRepository.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutBasicRepository;
-
-public interface IDt_BillGroupStockRepository : IRepository<Dt_BillGroupStock>
-{
- /// <summary>
- /// 鑾峰彇鍑哄簱搴撳瓨
- /// </summary>
- /// <returns></returns>
- List<Dt_BillGroupStock> GetOutboundStockList();
-
- /// <summary>
- /// 鏇存柊搴撳瓨闆嗗悎
- /// </summary>
- /// <param name="stocks">搴撳瓨闆嗗悎</param>
- /// <returns></returns>
- bool UpdateNavStock(List<Dt_BillGroupStock> stocks);
-
- /// <summary>
- /// 鏇存柊鍗曚釜搴撳瓨
- /// </summary>
- /// <param name="stocks">搴撳瓨</param>
- /// <returns></returns>
- bool UpdateNavStock(Dt_BillGroupStock stock);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/WIDESEA_IStorageOutBasicRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/WIDESEA_IStorageOutBasicRepository.csproj"
deleted file mode 100644
index a70161f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicRepository/WIDESEA_IStorageOutBasicRepository.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_DTO\WIDESEA_DTO.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/Basic/IDt_BillGroupStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/Basic/IDt_BillGroupStockService.cs"
deleted file mode 100644
index de0877b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/Basic/IDt_BillGroupStockService.cs"
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutBasicServices;
-
-public interface IDt_BillGroupStockService : IService<Dt_BillGroupStock>
-{
- /// <summary>
- /// 鑾峰彇鎵�鏈夊彲鍑哄簱搴撳瓨锛屼笉鍖呮嫭宸茬粡鍑哄簱鐨勬垨宸茬粡鍒嗛厤鐨勩��
- /// </summary>
- /// <returns>鍑哄簱搴撳瓨鍒楄〃</returns>
- abstract Task<WebResponseContent> GetOutboundStock();
-
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇搴撳瓨
- /// </summary>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="materialNo">鐗╂枡缂栧彿</param>
- /// <returns>鐗瑰畾搴撳瓨</returns>
- abstract Task<Dt_BillGroupStock> GetStocks(string palletCode = null, string locationID = null, string materialNo = null);
-
- /// <summary>
- /// 鏇存柊搴撳瓨闆嗗悎
- /// </summary>
- /// <param name="stocks">搴撳瓨闆嗗悎</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- abstract bool UpdateNavStock(List<Dt_BillGroupStock> stocks);
-
- /// <summary>
- /// 鏇存柊鍗曚釜搴撳瓨
- /// </summary>
- /// <param name="stocks">搴撳瓨</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- abstract bool UpdateNavStock(Dt_BillGroupStock stock);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/GlobalUsing.cs"
deleted file mode 100644
index 6dfb8c0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/GlobalUsing.cs"
+++ /dev/null
@@ -1,3 +0,0 @@
-锘縢lobal using WIDESEA_Core;
-global using WIDESEA_Core.BaseServices;
-global using WIDESEA_Model.Models;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/Location/IDt_LocationService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/Location/IDt_LocationService.cs"
deleted file mode 100644
index 34b6d0e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/Location/IDt_LocationService.cs"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutBasicServices;
-
-public interface IDt_LocationService : IService<Dt_LocationInfo>
-{
- abstract Task<Dt_Task> TransferCheck(string locationID);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/WIDESEA_IStorageOutBasicService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/WIDESEA_IStorageOutBasicService.csproj"
deleted file mode 100644
index 00f57cb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutBasicService/WIDESEA_IStorageOutBasicService.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IStorageOutBasicRepository\WIDESEA_IStorageOutBasicRepository.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/GlobalUsing.cs"
deleted file mode 100644
index d9777d7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/GlobalUsing.cs"
+++ /dev/null
@@ -1,3 +0,0 @@
-锘縢lobal using WIDESEA_Core;
-global using WIDESEA_Core.BaseServices;
-global using WIDESEA_Model.Models;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderAndStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderAndStockService.cs"
deleted file mode 100644
index 0252119..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderAndStockService.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderServices;
-
-public interface IDt_OutOrderAndStockService : IService<Dt_OutOrderAndStock>
-{
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇鍑哄簱鐗╂枡淇℃伅
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="orderNum">鍑哄簱璁㈠崟</param>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <returns>鍑哄簱鐗╂枡淇℃伅</returns>
- Task<Dt_OutOrderAndStock> GetOrderAndStock(string locationID = null, string orderNum = null, string palletCode = null);
-
- /// <summary>
- /// 瀵艰埅鍒犻櫎
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool DeleteNavOrderStock(Dt_OutOrderAndStock stock);
-
- /// <summary>
- /// 瀵艰埅鏇存柊
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool UpdateNavOrderStock(Dt_OutOrderAndStock stock);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderAndStock_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderAndStock_HtyService.cs"
deleted file mode 100644
index 4f353df..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderAndStock_HtyService.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderServices;
-
-public interface IDt_OutOrderAndStock_HtyService : IService<Dt_OutOrderAndStock_Hty>
-{
- /// <summary>
- /// 瀵艰埅娣诲姞锛堟坊鍔犲簱瀛樹富浠庡巻鍙诧紝璁㈠崟涓讳粠鍘嗗彶锛�
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅鍘嗗彶</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool InsertNav(Dt_OutOrderAndStock_Hty stock);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderDtailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderDtailService.cs"
deleted file mode 100644
index 3b41b6e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderDtailService.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderServices;
-
-public interface IDt_OutOrderDtailService : IService<Dt_OutOrderDetail>
-{
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderProductionDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderProductionDetailService.cs"
deleted file mode 100644
index f1bcb6f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderProductionDetailService.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderServices;
-
-public interface IDt_OutOrderProductionDetailService : IService<Dt_OutOrderProductionDetail>
-{
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="productionDetail">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- int AddOrderProductionDetail(Dt_OutOrderProductionDetail productionDetail);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderProductionService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderProductionService.cs"
deleted file mode 100644
index 33dc77d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderProductionService.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderServices;
-
-public interface IDt_OutOrderProductionService : IService<Dt_OutOrderProduction>
-{
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="production">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- int AddOrderProduction(Dt_OutOrderProduction production);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderService.cs"
deleted file mode 100644
index 423898b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderService.cs"
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderServices;
-
-public interface IDt_OutOrderService : IService<Dt_OutOrder>
-{
- /// <summary>
- /// 娣诲姞鐢熶骇鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- WebResponseContent AddOutOrderProduction(SaveModel model);
-
- /// <summary>
- /// 娣诲姞璋冩嫧鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- WebResponseContent AddOutOrderTransfer(SaveModel model);
-
- /// <summary>
- /// 鏍规嵁鍑哄簱鍗曞彿鏌ヨ鍑哄簱璁㈠崟
- /// </summary>
- /// <param name="orderNumber">鍑哄簱鍗曞彿</param>
- /// <returns>鍑哄簱璁㈠崟</returns>
- WebResponseContent GetOutOrderByNumber(string orderNumber);
-
- /// <summary>
- /// 淇敼鍑哄簱璁㈠崟锛堝鑸慨鏀癸級
- /// </summary>
- /// <param name="outOrder"></param>
- /// <returns>鏄惁鎴愬姛</returns>
- Task<bool> OutOrderUpdated(Dt_OutOrder outOrder);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderTransferDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderTransferDetailService.cs"
deleted file mode 100644
index 4ab29a7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderTransferDetailService.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderServices;
-
-public interface IDt_OutOrderTransferDetailService : IService<Dt_OutOrderTransferDetail>
-{
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderTransferService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderTransferService.cs"
deleted file mode 100644
index bc29a1e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/OutboundOrder/IDt_OutOrderTransferService.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderServices;
-
-public interface IDt_OutOrderTransferService : IService<Dt_OutOrderTransfer>
-{
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/WIDESEA_IStorageOutOrderService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/WIDESEA_IStorageOutOrderService.csproj"
deleted file mode 100644
index ef6b8e4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/WIDESEA_IStorageOutOrderService.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_StorageOutIRepository\WIDESEA_IStorageOutOrderRepository.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/GlobalUsing.cs"
deleted file mode 100644
index 74a991a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/GlobalUsing.cs"
+++ /dev/null
@@ -1,2 +0,0 @@
-锘縢lobal using WIDESEA_Core.BaseRepository;
-global using WIDESEA_Model.Models;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/Task/IDt_TaskRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/Task/IDt_TaskRepository.cs"
deleted file mode 100644
index 11a1864..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/Task/IDt_TaskRepository.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutTaskRepository;
-
-public interface IDt_TaskRepository : IRepository<Dt_Task>
-{
- Task<Dt_Task> GetById(int id);
-
- Task<List<Dt_Task>> GetList();
-
- Task<Dt_Task> Create(Dt_Task model);
-
- Task<bool> Create(List<Dt_Task> models);
-
- Task<bool> Update(Dt_Task model);
-
- Task<bool> Update(List<Dt_Task> models);
-
- Task<bool> Delete(int id);
-
- Task<bool> Delete(List<int> ids);
-
- Task<List<Dt_Task>> GetListByOutOrder(int outOrderId);
-
- Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status);
-
- Task<List<Dt_Task>> GetListByStatus(int status);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/Task/IDt_Task_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/Task/IDt_Task_HtyRepository.cs"
deleted file mode 100644
index 648d822..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/Task/IDt_Task_HtyRepository.cs"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutTaskRepository;
-
-public interface IDt_Task_HtyRepository : IRepository<Dt_Task_Hty>
-{
- bool InsertTask(Dt_Task_Hty task);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/WIDESEA_IStorageOutTaskRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/WIDESEA_IStorageOutTaskRepository.csproj"
deleted file mode 100644
index a70161f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskRepository/WIDESEA_IStorageOutTaskRepository.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_DTO\WIDESEA_DTO.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/GlobalUsing.cs"
deleted file mode 100644
index d9777d7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/GlobalUsing.cs"
+++ /dev/null
@@ -1,3 +0,0 @@
-锘縢lobal using WIDESEA_Core;
-global using WIDESEA_Core.BaseServices;
-global using WIDESEA_Model.Models;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/Task/IDt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/Task/IDt_TaskService.cs"
deleted file mode 100644
index fb52d92..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/Task/IDt_TaskService.cs"
+++ /dev/null
@@ -1,116 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutTaskServices;
-
-public interface IDt_TaskService : IService<Dt_Task>
-{
- /// <summary>
- /// 閫氳繃ID鑾峰彇浠诲姟
- /// </summary>
- /// <param name="id">浠诲姟ID</param>
- /// <returns>浠诲姟妯″瀷</returns>
- Task<Dt_Task> GetById(int id);
-
- /// <summary>
- /// 鏍规嵁璐т綅ID鑾峰彇浠诲姟
- /// </summary>
- /// <param name="locationID"></param>
- /// <returns></returns>
- Task<Dt_Task> GetByLocation(string locationID);
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔�
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- Task<Dt_Task> GetByTaskNum(int taskNum);
-
- /// <summary>
- /// 鑾峰彇鎵�鏈変换鍔″垪琛�
- /// </summary>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- Task<List<Dt_Task>> GetList();
-
- /// <summary>
- /// 鍒涘缓涓�涓柊鐨勪换鍔�
- /// </summary>
- /// <param name="model">浠诲姟妯″瀷</param>
- /// <returns>鍒涘缓鐨勪换鍔�</returns>
- Task<Dt_Task> Create(Dt_Task model);
-
- /// <summary>
- /// 鎵归噺鍒涘缓浠诲姟
- /// </summary>
- /// <param name="models">浠诲姟妯″瀷鍒楄〃</param>
- /// <returns>鏄惁鍒涘缓鎴愬姛</returns>
- Task<bool> Create(List<Dt_Task> models);
-
- /// <summary>
- /// 鏇存柊涓�涓换鍔�
- /// </summary>
- /// <param name="model">浠诲姟妯″瀷</param>
- /// <returns>鏄惁鏇存柊鎴愬姛</returns>
- Task<bool> Update(Dt_Task model);
-
- /// <summary>
- /// 鎵归噺鏇存柊浠诲姟
- /// </summary>
- /// <param name="models">浠诲姟妯″瀷鍒楄〃</param>
- /// <returns>鏄惁鏇存柊鎴愬姛</returns>
- Task<bool> Update(List<Dt_Task> models);
-
- /// <summary>
- /// 鍒犻櫎涓�涓换鍔�
- /// </summary>
- /// <param name="id">浠诲姟ID</param>
- /// <returns>鏄惁鍒犻櫎鎴愬姛</returns>
- Task<bool> Delete(int id);
-
- /// <summary>
- /// 鎵归噺鍒犻櫎浠诲姟
- /// </summary>
- /// <param name="ids">浠诲姟ID鍒楄〃</param>
- /// <returns>鏄惁鍒犻櫎鎴愬姛</returns>
- Task<bool> Delete(List<int> ids);
-
- /// <summary>
- /// 鏍规嵁鍑哄簱璁㈠崟ID鑾峰彇浠诲姟鍒楄〃
- /// </summary>
- /// <param name="outOrderId">鍑哄簱璁㈠崟ID</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- Task<List<Dt_Task>> GetListByOutOrder(int outOrderId);
-
- /// <summary>
- /// 鏍规嵁鍑哄簱璁㈠崟ID鍜岀姸鎬佽幏鍙栦换鍔″垪琛�
- /// </summary>
- /// <param name="outOrderId">鍑哄簱璁㈠崟ID</param>
- /// <param name="status">浠诲姟鐘舵��</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status);
-
- /// <summary>
- /// 鏍规嵁鐘舵�佽幏鍙栦换鍔″垪琛�
- /// </summary>
- /// <param name="status">浠诲姟鐘舵��</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- Task<List<Dt_Task>> GetListByStatus(int status);
-
- /// <summary>
- /// 妫�鏌ヤ换鍔℃槸鍚﹀瓨鍦�
- /// </summary>
- /// <param name="palletCode">鎵樼洏缂栫爜</param>
- /// <returns>浠诲姟鏄惁瀛樺湪</returns>
- bool IsExist(string palletCode);
-
- /// <summary>
- /// 鍫嗗灈鏈轰换鍔″畬鎴�
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- abstract Task<WebResponseContent> CompleteStackTaskAsync(SaveModel saveModel);
-
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- abstract Task<WebResponseContent> CompleteTaskAsync(SaveModel saveModel);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/Task/IDt_Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/Task/IDt_Task_HtyService.cs"
deleted file mode 100644
index e64269f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/Task/IDt_Task_HtyService.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutTaskServices;
-
-public interface IDt_Task_HtyService : IService<Dt_Task_Hty>
-{
- /// <summary>
- /// 娣诲姞鍘嗗彶浠诲姟
- /// </summary>
- /// <param name="task">鍘嗗彶浠诲姟Model</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool InsertTask(Dt_Task_Hty task);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/WIDESEA_IStorageOutTaskService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/WIDESEA_IStorageOutTaskService.csproj"
deleted file mode 100644
index af12b4d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutTaskService/WIDESEA_IStorageOutTaskService.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IStorageOutTaskRepository\WIDESEA_IStorageOutTaskRepository.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/LoginInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/LoginInfo.cs"
deleted file mode 100644
index 678745b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/LoginInfo.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Model
-{
- public class LoginInfo
- {
- public string UserName { get; set; }
-
- public string Password { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStock.cs"
deleted file mode 100644
index b71e4d6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStock.cs"
+++ /dev/null
@@ -1,145 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 搴撳瓨缁勭洏澶磋〃
- ///</summary>
- [SugarTable("Dt_BillGroupStock", "搴撳瓨缁勭洏澶磋〃")]
- public class Dt_BillGroupStock : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupId", IsPrimaryKey = true, ColumnDescription = "涓婚敭ID", IsIdentity = true)]
- public int GroupId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏鏉＄爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletCode", ColumnDescription = "鎵樼洏鏉＄爜")]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿锛堝叧鑱攊nbound_order锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InboundNo", ColumnDescription = "鍗曟嵁缂栧彿锛堝叧鑱攊nbound_order锛�")]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialNo", ColumnDescription = "鐗╂枡缂栧彿")]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNo", ColumnDescription = "鎵规鍙�")]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏绫诲瀷 1,涓�娆＄粍鐩� 2,浜屾缁勭洏(涓婃灦鍓嶏紝绌烘墭缁勮繃鐩�)
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupType", ColumnDescription = "缁勭洏绫诲瀷 1,涓�娆＄粍鐩� 2,浜屾缁勭洏(涓婃灦鍓嶏紝绌烘墭缁勮繃鐩�)")]
- public string? GroupType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鏂瑰紡锛�1,鍐呯爜 2,澶栫爜 3锛屽唴澶栫爜 4,绌烘墭鐩橈級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupWay", ColumnDescription = "缁勭洏鏂瑰紡锛�1,鍐呯爜 2,澶栫爜 3锛屽唴澶栫爜 4,绌烘墭鐩橈級")]
- public string? GroupWay { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏娆℃暟
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Times", ColumnDescription = "缁勭洏娆℃暟")]
- public int? Times { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁婊＄洏锛堝鏋滃凡婊＄洏涓嶅彲浜屾缁勭洏锛屼汉宸ョ‘瀹氭槸鍚︽弧鐩橈級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "IsFull", ColumnDescription = "鏄惁婊＄洏锛堝鏋滃凡婊＄洏涓嶅彲浜屾缁勭洏锛屼汉宸ョ‘瀹氭槸鍚︽弧鐩橈級")]
- public bool? IsFull { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撲綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationCode", ColumnDescription = "搴撲綅")]
- public string? LocationCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鐘舵�侊細1锛岀粍鐩樻殏瀛� 2锛屽瓨鍌ㄥ簱瀛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "State", ColumnDescription = "搴撳瓨鐘舵�侊細1锛岀粍鐩樻殏瀛� 2锛屽瓨鍌ㄥ簱瀛�")]
- public string? State { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 棰勭暀1
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Spare1", ColumnDescription = "棰勭暀1", IsNullable = true)]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀2
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Spare2", ColumnDescription = "棰勭暀2", IsNullable = true)]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀3
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Spare3", ColumnDescription = "棰勭暀3", IsNullable = true)]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀4
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "棰勭暀4")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀5
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "棰勭暀5")]
- public string? Spare5 { get; set; }
-
- /// <summary>
- /// 璐т綅鏄庣粏鏁版嵁
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(LocationCode), nameof(Dt_LocationInfo.LocationID))]
- public Dt_LocationInfo? LocationInfo { get; set; }
-
- /// <summary>
- /// 搴撳瓨鏄庣粏鏁版嵁
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(GroupId), nameof(Dt_BillGroupStockDetail.GroupId))]
- public Dt_BillGroupStockDetail? StockDetailList { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStockDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStockDetail.cs"
deleted file mode 100644
index 87ea265..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStockDetail.cs"
+++ /dev/null
@@ -1,152 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 搴撳瓨缁勭洏鏄庣粏琛�
- ///</summary>
- [SugarTable("Dt_BillGroupStockDetail", "搴撳瓨缁勭洏鏄庣粏琛�")]
- public class Dt_BillGroupStockDetail : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupDetailId", IsPrimaryKey = true, ColumnDescription = "涓婚敭ID", IsIdentity = true)]
- public int GroupDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶栧仴锛堝叧鑱斾富琛↖D锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupId", ColumnDescription = "澶栧仴锛堝叧鑱斾富琛↖D锛�")]
- public int? GroupId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏鍙凤紙鍏宠仈 BillGroupStock锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletCode", ColumnDescription = "鎵樼洏鍙凤紙鍏宠仈 BillGroupStock锛�")]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InboundNo", ColumnDescription = "鍗曟嵁缂栧彿")]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InboundDate", ColumnDescription = "鍗曟嵁鏃ユ湡")]
- public DateTime? InboundDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNo", ColumnDescription = "鎵规鍙�")]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialNo", ColumnDescription = "鐗╂枡缂栧彿")]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialName", ColumnDescription = "鐗╂枡鍚嶇О")]
- public string? MaterialName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶栫鐮�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutBoxCode", ColumnDescription = "澶栫鐮�")]
- public string? OutBoxCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍐呯鐮�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InBoxCode", ColumnDescription = "鍐呯鐮�")]
- public string? InBoxCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:绌烘墭鐩樼爜锛堜富琛╣roupWay=4绌烘墭缁勭爜鏃惰褰曟墭鐩樼爜锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "EmptyPalletCode", ColumnDescription = "绌烘墭鐩樼爜锛堜富琛╣roupWay=4绌烘墭缁勭爜鏃惰褰曟墭鐩樼爜锛�")]
- public string? EmptyPalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletUnit", ColumnDescription = "缁勭洏鍗曚綅")]
- public string? PalletUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "palletQuantity", ColumnDescription = "缁勭洏鏁伴噺")]
- public decimal? PalletQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍩烘湰鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BasicUnit", ColumnDescription = "鍩烘湰鍗曚綅")]
- public string? BasicUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍩烘湰璁￠噺锛堟牴鎹崟浣嶄箣闂寸殑鎹㈢畻閫昏緫鑷姩鎹㈢畻锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BsicQuantity", ColumnDescription = "鍩烘湰璁￠噺锛堟牴鎹崟浣嶄箣闂寸殑鎹㈢畻閫昏緫鑷姩鎹㈢畻锛�")]
- public decimal? BasicQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 棰勭暀1
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare1", ColumnDescription = "棰勭暀1")]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀2
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare2", ColumnDescription = "棰勭暀2")]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀3
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare3", ColumnDescription = "棰勭暀3")]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀4
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "棰勭暀4")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀5
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "棰勭暀5")]
- public string? Spare5 { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStockDetail_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStockDetail_Hty.cs"
deleted file mode 100644
index 9f58de4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStockDetail_Hty.cs"
+++ /dev/null
@@ -1,173 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 搴撳瓨缁勭洏鏄庣粏琛�
- ///</summary>
- [SugarTable("Dt_BillGroupStockDetail_Hty", "搴撳瓨缁勭洏鏄庣粏琛�")]
- public class Dt_BillGroupStockDetail_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupDetailId", IsPrimaryKey = true, ColumnDescription = "涓婚敭ID", IsIdentity = true)]
- public int GroupDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶栧仴锛堝叧鑱斾富琛↖D锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupId", ColumnDescription = "澶栧仴锛堝叧鑱斾富琛↖D锛�")]
- public int? GroupId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏鍙凤紙鍏宠仈 BillGroupStock锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletCode", ColumnDescription = "鎵樼洏鍙凤紙鍏宠仈 BillGroupStock锛�")]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InboundNo", ColumnDescription = "鍗曟嵁缂栧彿")]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InboundDate", ColumnDescription = "鍗曟嵁鏃ユ湡")]
- public DateTime? InboundDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNo", ColumnDescription = "鎵规鍙�")]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialNo", ColumnDescription = "鐗╂枡缂栧彿")]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialName", ColumnDescription = "鐗╂枡鍚嶇О")]
- public string? MaterialName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶栫鐮�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutBoxCode", ColumnDescription = "澶栫鐮�")]
- public string? OutBoxCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍐呯鐮�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InBoxCode", ColumnDescription = "鍐呯鐮�")]
- public string? InBoxCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:绌烘墭鐩樼爜锛堜富琛╣roupWay=4绌烘墭缁勭爜鏃惰褰曟墭鐩樼爜锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "EmptyPalletCode", ColumnDescription = "绌烘墭鐩樼爜锛堜富琛╣roupWay=4绌烘墭缁勭爜鏃惰褰曟墭鐩樼爜锛�")]
- public string? EmptyPalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletUnit", ColumnDescription = "缁勭洏鍗曚綅")]
- public string? PalletUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "palletQuantity", ColumnDescription = "缁勭洏鏁伴噺")]
- public decimal? PalletQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍩烘湰鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BasicUnit", ColumnDescription = "鍩烘湰鍗曚綅")]
- public string? BasicUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍩烘湰璁￠噺锛堟牴鎹崟浣嶄箣闂寸殑鎹㈢畻閫昏緫鑷姩鎹㈢畻锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BsicQuantity", ColumnDescription = "鍩烘湰璁￠噺锛堟牴鎹崟浣嶄箣闂寸殑鎹㈢畻閫昏緫鑷姩鎹㈢畻锛�")]
- public decimal? BasicQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 棰勭暀1
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare1", ColumnDescription = "棰勭暀1")]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀2
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare2", ColumnDescription = "棰勭暀2")]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀3
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare3", ColumnDescription = "棰勭暀3")]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀4
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "棰勭暀4")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀5
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "棰勭暀5")]
- public string? Spare5 { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStock_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStock_Hty.cs"
deleted file mode 100644
index 55b48ce..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_BillGroupStock_Hty.cs"
+++ /dev/null
@@ -1,166 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 搴撳瓨缁勭洏澶磋〃
- ///</summary>
- [SugarTable("Dt_BillGroupStock_Hty", "搴撳瓨缁勭洏澶磋〃")]
- public class Dt_BillGroupStock_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupId", IsPrimaryKey = true, ColumnDescription = "涓婚敭ID", IsIdentity = true)]
- public int GroupId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏鏉＄爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletCode", ColumnDescription = "鎵樼洏鏉＄爜")]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿锛堝叧鑱攊nbound_order锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InboundNo", ColumnDescription = "鍗曟嵁缂栧彿锛堝叧鑱攊nbound_order锛�")]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialNo", ColumnDescription = "鐗╂枡缂栧彿")]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNo", ColumnDescription = "鎵规鍙�")]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏绫诲瀷 1,涓�娆＄粍鐩� 2,浜屾缁勭洏(涓婃灦鍓嶏紝绌烘墭缁勮繃鐩�)
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupType", ColumnDescription = "缁勭洏绫诲瀷 1,涓�娆＄粍鐩� 2,浜屾缁勭洏(涓婃灦鍓嶏紝绌烘墭缁勮繃鐩�)")]
- public string? GroupType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鏂瑰紡锛�1,鍐呯爜 2,澶栫爜 3锛屽唴澶栫爜 4,绌烘墭鐩橈級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupWay", ColumnDescription = "缁勭洏鏂瑰紡锛�1,鍐呯爜 2,澶栫爜 3锛屽唴澶栫爜 4,绌烘墭鐩橈級")]
- public string? GroupWay { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏娆℃暟
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Times", ColumnDescription = "缁勭洏娆℃暟")]
- public int? Times { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁婊＄洏锛堝鏋滃凡婊＄洏涓嶅彲浜屾缁勭洏锛屼汉宸ョ‘瀹氭槸鍚︽弧鐩橈級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "IsFull", ColumnDescription = "鏄惁婊＄洏锛堝鏋滃凡婊＄洏涓嶅彲浜屾缁勭洏锛屼汉宸ョ‘瀹氭槸鍚︽弧鐩橈級")]
- public bool? IsFull { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撲綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationCode", ColumnDescription = "搴撲綅")]
- public string? LocationCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鐘舵�侊細1锛岀粍鐩樻殏瀛� 2锛屽瓨鍌ㄥ簱瀛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "State", ColumnDescription = "搴撳瓨鐘舵�侊細1锛岀粍鐩樻殏瀛� 2锛屽瓨鍌ㄥ簱瀛�")]
- public string? State { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 棰勭暀1
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Spare1", ColumnDescription = "棰勭暀1", IsNullable = true)]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀2
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Spare2", ColumnDescription = "棰勭暀2", IsNullable = true)]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀3
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Spare3", ColumnDescription = "棰勭暀3", IsNullable = true)]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀4
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "棰勭暀4")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勭暀5
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "棰勭暀5")]
- public string? Spare5 { get; set; }
-
- /// <summary>
- /// 璐т綅鏄庣粏鏁版嵁
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(LocationCode), nameof(Dt_LocationInfo.LocationID))]
- public Dt_LocationInfo? LocationInfo { get; set; }
-
- /// <summary>
- /// 搴撳瓨鏄庣粏鏁版嵁
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(GroupId), nameof(Dt_BillGroupStockDetail.GroupId))]
- public Dt_BillGroupStockDetail? StockDetailList { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs"
deleted file mode 100644
index 959938b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_LocationInfo.cs"
+++ /dev/null
@@ -1,124 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 璐т綅琛�
- ///</summary>
- [SugarTable("Dt_LocationInfo", "璐т綅琛�")]
- public class Dt_LocationInfo : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, ColumnDescription = "涓婚敭ID", IsIdentity = true)]
- public int ID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationID", ColumnDescription = "璐т綅ID")]
- public string LocationID { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:璐т綅鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationName", ColumnDescription = "璐т綅鍚嶇О")]
- public string? LocationName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳尯ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "WareAreaID", ColumnDescription = "搴撳尯ID")]
- public string WareAreaID { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:琛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Line", ColumnDescription = "琛�")]
- public string? Line { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍒�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Column", ColumnDescription = "鍒�")]
- public string? Column { get; set; }
-
- /// <summary>
- /// 澶� 娉�:灞�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Layer", ColumnDescription = "灞�")]
- public string? Layer { get; set; }
-
- /// <summary>
- /// 澶� 娉�:宸烽亾
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Roadway", ColumnDescription = "宸烽亾")]
- public string? Roadway { get; set; }
-
- /// <summary>
- /// 澶� 娉�:娣卞害
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Depth", ColumnDescription = "娣卞害")]
- public string? Depth { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀵瑰簲鍫嗗灈鏈哄彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SCNo", ColumnDescription = "瀵瑰簲鍫嗗灈鏈哄彿")]
- public string? SCNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍫嗗灈鏈哄搴旇揣浣嶇珯鍙板彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SClocationID", ColumnDescription = "鍫嗗灈鏈哄搴旇揣浣嶇珯鍙板彿")]
- public string? SClocationID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationType", ColumnDescription = "璐т綅绫诲瀷")]
- public string? LocationType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁琚攣瀹�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "IsLocked", ColumnDescription = "鏄惁琚攣瀹�")]
- public bool? IsLocked { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "璐т綅鐘舵��")]
- public int? Status { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅鎻忚堪
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationDesc", ColumnDescription = "璐т綅鎻忚堪")]
- public string? LocationDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁鍒犻櫎
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "IsDelete", ColumnDescription = "鏄惁鍒犻櫎")]
- public bool? IsDelete { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielAttribute.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielAttribute.cs"
deleted file mode 100644
index 4ba2516..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielAttribute.cs"
+++ /dev/null
@@ -1,99 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐗╂枡灞炴�ц〃
- ///</summary>
- [SugarTable("Dt_MaterielAttribute", "鐗╂枡灞炴�ц〃")]
- public class Dt_MaterielAttribute : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, ColumnDescription = "涓婚敭ID", IsIdentity = true)]
- public int ID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:灞炴�D
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AttributeID", ColumnDescription = "灞炴�D")]
- public string? AttributeID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡灞炴�у悕绉�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AttributeName", ColumnDescription = "鐗╂枡灞炴�у悕绉�")]
- public string? AttributeName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡灞炴�ф弿杩�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AttributeDesc", ColumnDescription = "鐗╂枡灞炴�ф弿杩�")]
- public string? AttributeDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀛樺偍鏉′欢
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Stroagecon", ColumnDescription = "瀛樺偍鏉′欢")]
- public string? Stroagecon { get; set; }
-
- /// <summary>
- /// 澶� 娉�:杩愯緭鏉′欢
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Transpcon", ColumnDescription = "杩愯緭鏉′欢")]
- public string? Transpcon { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare1", ColumnDescription = "")]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare2", ColumnDescription = "")]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare3", ColumnDescription = "")]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "")]
- public string? Spare5 { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
deleted file mode 100644
index 72e3024..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
+++ /dev/null
@@ -1,166 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐗╂枡琛�
- ///</summary>
- [SugarTable("Dt_MaterielInfo", "鐗╂枡琛�")]
- public class Dt_MaterielInfo : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, ColumnDescription = "涓婚敭ID", IsIdentity = true)]
- public int ID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterielID", ColumnDescription = "鐗╂枡ID")]
- public string? MaterielID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵�灞炲簱鍖�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AreaID", ColumnDescription = "鎵�灞炲簱鍖�")]
- public string? AreaID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterielName", ColumnDescription = "鐗╂枡鍚嶇О")]
- public string? MaterielName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖呰瑙勬牸
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Packspes", ColumnDescription = "鍖呰瑙勬牸")]
- public string? Packspes { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鎻忚堪
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterielDesc", ColumnDescription = "鐗╂枡鎻忚堪")]
- public string? MaterielDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡灞炴��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Attribute", ColumnDescription = "鐗╂枡灞炴��")]
- public string? Attribute { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璁￠噸鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Unit", ColumnDescription = "璁￠噸鍗曚綅")]
- public string? Unit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:褰撳墠鐘舵�侊紙0锛岀鐢� 1锛屽惎鐢級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "褰撳墠鐘舵�侊紙0锛岀鐢� 1锛屽惎鐢級")]
- public int? Status { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏈�灏忓寘瑁呮暟
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MinpackQty", ColumnDescription = "鏈�灏忓寘瑁呮暟")]
- public decimal? MinpackQty { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐢熶骇鍟�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Mfacturer", ColumnDescription = "鐢熶骇鍟�")]
- public string? Mfacturer { get; set; }
-
- /// <summary>
- /// 澶� 娉�:渚涘簲鍟�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Supplier", ColumnDescription = "渚涘簲鍟�")]
- public string? Supplier { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑�閲�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "NetWeight", ColumnDescription = "鍑�閲�")]
- public decimal? NetWeight { get; set; }
-
- /// <summary>
- /// 澶� 娉�:姣涢噸
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GrossWeight", ColumnDescription = "姣涢噸")]
- public decimal? GrossWeight { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏈夋晥鏈�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Validity", ColumnDescription = "鏈夋晥鏈�")]
- public int? Validity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹夊叏搴撳瓨
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Safety", ColumnDescription = "瀹夊叏搴撳瓨")]
- public decimal? Safety { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare1", ColumnDescription = "")]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare2", ColumnDescription = "")]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare3", ColumnDescription = "")]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "")]
- public string? Spare5 { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs"
deleted file mode 100644
index 1e2eaca..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs"
+++ /dev/null
@@ -1,152 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 浠诲姟琛�
- ///</summary>
- [SugarTable("Dt_Task", "浠诲姟琛�")]
- public class Dt_Task : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskId", IsPrimaryKey = true, ColumnDescription = "涓婚敭", IsIdentity = true)]
- public int TaskId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskNum", ColumnDescription = "浠诲姟鍙�")]
- public int? TaskNum { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletCode", ColumnDescription = "鎵樼洏缂栧彿")]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InboundNo", ColumnDescription = "鍗曟嵁缂栧彿")]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:宸烽亾
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Roadway", ColumnDescription = "宸烽亾")]
- public string? Roadway { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟绫诲瀷锛�1锛屼竴鑸叆搴� 2锛岀洏鐐瑰叆搴� 3锛屽垎鎷ｅ叆搴� 4锛岃川妫�鍏ュ簱 5锛屽簱鍐呯Щ搴� 6锛屽簱澶栫Щ搴� 锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskType", ColumnDescription = "浠诲姟绫诲瀷锛�1锛屼竴鑸叆搴� 2锛岀洏鐐瑰叆搴� 3锛屽垎鎷ｅ叆搴� 4锛岃川妫�鍏ュ簱 5锛屽簱鍐呯Щ搴� 6锛屽簱澶栫Щ搴� 锛�")]
- public string? TaskType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鐘舵�侊紙1锛屼换鍔″緟涓嬪彂 2锛岃緭閫佺嚎鎵ц涓� 3锛岃緭閫佺嚎瀹屾垚 4锛孉GV鎵ц涓� 5锛孉GV瀹屾垚 6锛屽爢鍨涙満鎵ц涓� 7锛屽爢鍨涙満瀹屾垚 8锛屼换鍔″畬鎴愶紝9锛屼换鍔″彇娑堬級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskState", ColumnDescription = "浠诲姟鐘舵�侊紙1锛屼换鍔″緟涓嬪彂 2锛岃緭閫佺嚎鎵ц涓� 3锛岃緭閫佺嚎瀹屾垚 4锛孉GV鎵ц涓� 5锛孉GV瀹屾垚 6锛屽爢鍨涙満鎵ц涓� 7锛屽爢鍨涙満瀹屾垚 8锛屼换鍔″畬鎴愶紝9锛屼换鍔″彇娑堬級")]
- public string? TaskState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialNo", ColumnDescription = "鐗╂枡缂栧彿")]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璧峰鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceAddress", ColumnDescription = "璧峰鍦板潃")]
- public string? SourceAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐩爣鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TargetAddress", ColumnDescription = "鐩爣鍦板潃")]
- public string? TargetAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:褰撳墠浣嶇疆
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "CurrentAddress", ColumnDescription = "褰撳墠浣嶇疆")]
- public string? CurrentAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:涓嬩竴鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "NextAddress", ColumnDescription = "涓嬩竴鍦板潃")]
- public string? NextAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浼樺厛绾�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Grade", ColumnDescription = "浼樺厛绾�")]
- public int? Grade { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟涓嬪彂鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Dispatchertime", ColumnDescription = "浠诲姟涓嬪彂鏃堕棿")]
- public DateTime? Dispatchertime { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare1", ColumnDescription = "")]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare2", ColumnDescription = "")]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare3", ColumnDescription = "")]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "")]
- public string? Spare5 { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_TaskExecuteDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_TaskExecuteDetail.cs"
deleted file mode 100644
index a74aef7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_TaskExecuteDetail.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- ///
- ///</summary>
- [SugarTable("Dt_TaskExecuteDetail", "浠诲姟鎵ц鏄庣粏琛�")]
- public class Dt_TaskExecuteDetail : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭Id
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskDetailId", IsPrimaryKey = true, ColumnDescription = "涓婚敭Id", IsIdentity = true)]
- public int TaskDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskId", ColumnDescription = "浠诲姟ID")]
- public int? TaskId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskNum", ColumnDescription = "浠诲姟鍙�")]
- public string? TaskNum { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskState", ColumnDescription = "浠诲姟鐘舵��")]
- public string? TaskState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁浜哄伐鎿嶄綔
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "IsManual", ColumnDescription = "鏄惁浜哄伐鎿嶄綔")]
- public bool? IsManual { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare1", ColumnDescription = "")]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare2", ColumnDescription = "")]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare3", ColumnDescription = "")]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "")]
- public string? Spare5 { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task_Hty.cs"
deleted file mode 100644
index fa7c533..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task_Hty.cs"
+++ /dev/null
@@ -1,173 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 浠诲姟琛�
- ///</summary>
- [SugarTable("Dt_Task_Hty", "浠诲姟鍘嗗彶琛�")]
- public class Dt_Task_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskId", IsPrimaryKey = true, ColumnDescription = "涓婚敭", IsIdentity = true)]
- public int TaskId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskNum", ColumnDescription = "浠诲姟鍙�")]
- public int? TaskNum { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletCode", ColumnDescription = "鎵樼洏缂栧彿")]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "InboundNo", ColumnDescription = "鍗曟嵁缂栧彿")]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:宸烽亾
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Roadway", ColumnDescription = "宸烽亾")]
- public string? Roadway { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟绫诲瀷锛�1锛屼竴鑸叆搴� 2锛岀洏鐐瑰叆搴� 3锛屽垎鎷ｅ叆搴� 4锛岃川妫�鍏ュ簱 5锛屽簱鍐呯Щ搴� 6锛屽簱澶栫Щ搴� 锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskType", ColumnDescription = "浠诲姟绫诲瀷锛�1锛屼竴鑸叆搴� 2锛岀洏鐐瑰叆搴� 3锛屽垎鎷ｅ叆搴� 4锛岃川妫�鍏ュ簱 5锛屽簱鍐呯Щ搴� 6锛屽簱澶栫Щ搴� 锛�")]
- public string? TaskType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鐘舵�侊紙1锛屼换鍔″緟涓嬪彂 2锛岃緭閫佺嚎鎵ц涓� 3锛岃緭閫佺嚎瀹屾垚 4锛孉GV鎵ц涓� 5锛孉GV瀹屾垚 6锛屽爢鍨涙満鎵ц涓� 7锛屽爢鍨涙満瀹屾垚 8锛屼换鍔″畬鎴愶紝9锛屼换鍔″彇娑堬級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TaskState", ColumnDescription = "浠诲姟鐘舵�侊紙1锛屼换鍔″緟涓嬪彂 2锛岃緭閫佺嚎鎵ц涓� 3锛岃緭閫佺嚎瀹屾垚 4锛孉GV鎵ц涓� 5锛孉GV瀹屾垚 6锛屽爢鍨涙満鎵ц涓� 7锛屽爢鍨涙満瀹屾垚 8锛屼换鍔″畬鎴愶紝9锛屼换鍔″彇娑堬級")]
- public string? TaskState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialNo", ColumnDescription = "鐗╂枡缂栧彿")]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璧峰鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceAddress", ColumnDescription = "璧峰鍦板潃")]
- public string? SourceAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐩爣鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TargetAddress", ColumnDescription = "鐩爣鍦板潃")]
- public string? TargetAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:褰撳墠浣嶇疆
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "CurrentAddress", ColumnDescription = "褰撳墠浣嶇疆")]
- public string? CurrentAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:涓嬩竴鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "NextAddress", ColumnDescription = "涓嬩竴鍦板潃")]
- public string? NextAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浼樺厛绾�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Grade", ColumnDescription = "浼樺厛绾�")]
- public int? Grade { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟涓嬪彂鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Dispatchertime", ColumnDescription = "浠诲姟涓嬪彂鏃堕棿")]
- public DateTime? Dispatchertime { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare1", ColumnDescription = "")]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare2", ColumnDescription = "")]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare3", ColumnDescription = "")]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "")]
- public string? Spare5 { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_AreaInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_AreaInfo.cs"
deleted file mode 100644
index bfe7892..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_AreaInfo.cs"
+++ /dev/null
@@ -1,102 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- ///
- ///</summary>
- [SugarTable("Dt_AreaInfo")]
- public class Dt_AreaInfo : BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:鍖哄煙ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AreaID" ,IsPrimaryKey = true) ]
- public Guid AreaID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖哄煙缂栫爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AreaCode" ) ]
- public string AreaCode { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鍖哄煙鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AreaName" ) ]
- public string? AreaName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖哄煙绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AreaType" ) ]
- public string? AreaType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖哄煙鎻忚堪
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AreaDesc" ) ]
- public string? AreaDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖哄煙鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AreaStatus" ) ]
- public int? AreaStatus { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
- /// <summary>
- /// 搴撳尯鏄庣粏
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_WareAreaInfo.AreaID))]
- public List<Dt_WareAreaInfo> Dt_WareAreaInfoDetailList { get; set; }
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_BillGroupStock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_BillGroupStock.cs"
deleted file mode 100644
index 5288fd6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_BillGroupStock.cs"
+++ /dev/null
@@ -1,142 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 缁勭洏琛紙搴撳瓨锛変富琛�
- ///</summary>
- [SugarTable("Dt_BillGroupStock")]
- public class Dt_BillGroupStock:BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="GroupId" ,IsPrimaryKey = true) ]
- public Guid GroupId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏鏉＄爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PalletCode" ) ]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿锛堝叧鑱攊nbound_order锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundNo" ) ]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterialNo" ) ]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏绫诲瀷 1,涓�娆＄粍鐩� 2,浜屾缁勭洏(涓婃灦鍓嶏紝绌烘墭缁勮繃鐩�)
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="GroupType" ) ]
- public string? GroupType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鏂瑰紡锛�1,鍐呯爜 2,澶栫爜 3锛屽唴澶栫爜 4,绌烘墭鐩橈級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="GroupWay" ) ]
- public string? GroupWay { get; set; }
-
- ///// <summary>
- ///// 澶� 娉�:缁勭洏娆℃暟
- ///// 榛樿鍊�:
- /////</summary>
- //[SugarColumn(ColumnName="Times" ) ]
- //public int? Times { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁婊＄洏锛堝鏋滃凡婊＄洏涓嶅彲浜屾缁勭洏锛屼汉宸ョ‘瀹氭槸鍚︽弧鐩橈級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="IsFull" ) ]
- public bool? IsFull { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撲綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="LocationCode" ) ]
- public string? LocationCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鐘舵�侊細1锛岀粍鐩樻殏瀛� 2锛屽瓨鍌ㄥ簱瀛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="State" ) ]
- public string? State { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(Dt_BillGroupStockDetail.GroupId))]
- public List<Dt_BillGroupStockDetail> Dt_BillGroupStockDetailList { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_BillGroupStockDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_BillGroupStockDetail.cs"
deleted file mode 100644
index d7d8148..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_BillGroupStockDetail.cs"
+++ /dev/null
@@ -1,161 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 缁勭洏琛紙搴撳瓨锛夋槑缁�
- ///</summary>
- [SugarTable("Dt_BillGroupStockDetail")]
- public class Dt_BillGroupStockDetail: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="GroupDetailId" ,IsPrimaryKey = true) ]
- public Guid GroupDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶栧仴锛堝叧鑱斾富琛↖D锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="GroupId" ) ]
- public Guid? GroupId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏鍙凤紙鍏宠仈 BillGroupStock锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PalletCode" ) ]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundNo" ) ]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundDate" ) ]
- public DateTime? InboundDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterialNo" ) ]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterialName" ) ]
- public string? MaterialName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶栫鐮�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OutBoxCode" ) ]
- public string? OutBoxCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍐呯鐮�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InBoxCode" ) ]
- public string? InBoxCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:绌烘墭鐩樼爜锛堜富琛╣roupWay=4绌烘墭缁勭爜鏃惰褰曟墭鐩樼爜锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="EmptyPalletCode" ) ]
- public string? EmptyPalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PalletUnit" ) ]
- public string? PalletUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:缁勭洏鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PalletQuantity" ) ]
- public decimal? PalletQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍩烘湰鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BasicUnit" ) ]
- public string? BasicUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍩烘湰璁￠噺锛堟牴鎹崟浣嶄箣闂寸殑鎹㈢畻閫昏緫鑷姩鎹㈢畻锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BasicQuantity" ) ]
- public decimal? BasicQuantity { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrder.cs"
deleted file mode 100644
index 41b7261..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrder.cs"
+++ /dev/null
@@ -1,112 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍏ュ簱涓昏〃
- ///</summary>
- [SugarTable("Dt_InboundOrder")]
- public class Dt_InboundOrder: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderId" ,IsPrimaryKey = true) ]
- public Guid OrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundNo" ) ]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:涓婃父鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundUpperNo" ) ]
- public string? InboundUpperNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundDate" ) ]
- public DateTime? InboundDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:涓婃父鍗曟嵁绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundType" ) ]
- public string? InboundType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵�侊紙0锛屾湭寮�濮� 1锛屽叆搴撲腑 2锛屽凡鍏ュ簱 锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundState" ) ]
- public string? InboundState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderDetail.cs"
deleted file mode 100644
index ee61184..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderDetail.cs"
+++ /dev/null
@@ -1,105 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍏ュ簱鏄庣粏琛�
- ///</summary>
- [SugarTable("Dt_InboundOrderDetail")]
- public class Dt_InboundOrderDetail: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderDetailId" ,IsPrimaryKey = true) ]
- public Guid OrderDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderId" ) ]
- public Guid? OrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿锛堝叧鑱� inboundOrder琛級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundNo" ) ]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁绫诲瀷锛�1锛岀敓浜у叆搴撳崟 2锛岀敓浜ч��鏂欏崟 3锛岄噰璐叆搴撳崟 4锛岃皟鎷ㄥ叆搴撳崟 5锛岄攢鍞��璐у崟 6锛岀┖鐩樺叆搴撳崟 7锛屽叾浠栧叆搴撳崟锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundType" ) ]
- public string? InboundType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏄庣粏鐘舵�侊紙0锛屾湭寮�濮� 1锛屽叆搴撲腑 2锛屽凡鍏ュ簱 锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundState" ) ]
- public string? InboundState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterialNo" ) ]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterialName" ) ]
- public string? MaterialName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:棰勮鍏ュ簱鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PreInboundQuantity" ) ]
- public string? PreInboundQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹為檯鍏ュ簱鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ActualInboundQuantity" ) ]
- public string? ActualInboundQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍏ュ簱鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Unit" ) ]
- public string? Unit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderProduction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderProduction.cs"
deleted file mode 100644
index 3ef199b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderProduction.cs"
+++ /dev/null
@@ -1,114 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐢熶骇鍏ュ簱涓昏〃
- ///</summary>
- [SugarTable("Dt_InboundOrderProduction")]
- public class Dt_InboundOrderProduction: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderId" ,IsPrimaryKey = true) ]
- public Guid OrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionNo" ) ]
- public string? ProductionNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐢熶骇鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionDate" ) ]
- public string? ProductionDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionType" ) ]
- public string? ProductionType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionState" ) ]
- public string? ProductionState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍚屾鏍囧織锛�0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐ワ級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="SynchronizationFlag" ) ]
- public int? SynchronizationFlag { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(Dt_InboundOrderProductionDetail.OrderId))]
- public List<Dt_InboundOrderProductionDetail> Dt_InboundOrderProductionDetailList { get; set; }
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderProductionDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderProductionDetail.cs"
deleted file mode 100644
index 62ba0f3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderProductionDetail.cs"
+++ /dev/null
@@ -1,153 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐢熶骇鍏ュ簱鏄庣粏
- ///</summary>
- [SugarTable("Dt_InboundOrderProductionDetail")]
- public class Dt_InboundOrderProductionDetail: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderDetailId" ,IsPrimaryKey = true) ]
- public Guid OrderDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶栧仴锛堝叧鑱斾富琛↖D锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderId" ) ]
- public Guid? OrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿 锛堝叧鑱攊nbound_order_production锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionNo" ) ]
- public string? ProductionNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionType" ) ]
- public string? ProductionType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍏ュ簱缁勭粐
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundOrganize" ) ]
- public string? InboundOrganize { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐢熶骇缁勭粐
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionOrganize" ) ]
- public string? ProductionOrganize { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionState" ) ]
- public string? ProductionState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栫爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionMatcode" ) ]
- public string? ProductionMatcode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionName" ) ]
- public string? ProductionName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴旀敹鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ReceivableQuantity" ) ]
- public string? ReceivableQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹炴敹鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ActualQuantity" ) ]
- public string? ActualQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ProductionUnit" ) ]
- public string? ProductionUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderPurchase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderPurchase.cs"
deleted file mode 100644
index aa2f811..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderPurchase.cs"
+++ /dev/null
@@ -1,115 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 閲囪喘鍏ュ簱涓昏〃
- ///</summary>
- [SugarTable("Dt_InboundOrderPurchase")]
- public class Dt_InboundOrderPurchase: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderId" ,IsPrimaryKey = true) ]
- public Guid OrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseNo" ) ]
- public string? PurchaseNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseType" ) ]
- public string? PurchaseType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseState" ) ]
- public string? PurchaseState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍚屾鏍囧織锛�0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐ワ級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="SynchronizationFlag" ) ]
- public int? SynchronizationFlag { get; set; }
-
- /// <summary>
- /// 澶� 娉�:閲囪喘鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseDate" ) ]
- public string? PurchaseDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(Dt_InboundOrderPurchaseDetail.OrderId))]
- public List<Dt_InboundOrderProductionDetail> Dt_InboundOrderPurchaseDetailList { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderPurchaseDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderPurchaseDetail.cs"
deleted file mode 100644
index 49bbdfb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_InboundOrderPurchaseDetail.cs"
+++ /dev/null
@@ -1,147 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 閲囪喘鍏ュ簱鏄庣粏
- ///</summary>
- [SugarTable("Dt_InboundOrderPurchaseDetail")]
- public class Dt_InboundOrderPurchaseDetail: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderDetailId" ,IsPrimaryKey = true) ]
- public Guid OrderDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶栧仴(鍏宠仈涓昏〃ID)
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderId" ) ]
- public Guid? OrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseNo" ) ]
- public string? PurchaseNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浜よ揣鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="DeliveryDate" ) ]
- public DateTime? DeliveryDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:渚涘簲鍟�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseSupplier" ) ]
- public string? PurchaseSupplier { get; set; }
-
- /// <summary>
- /// 澶� 娉�:閲囪喘缁勭粐
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseOrganize" ) ]
- public string? PurchaseOrganize { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseState" ) ]
- public string? PurchaseState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栫爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseMatcode" ) ]
- public string? PurchaseMatcode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseName" ) ]
- public string? PurchaseName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴旀敹鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseQty" ) ]
- public string? PurchaseQty { get; set; }
-
- /// <summary>
- /// 澶� 娉�:閲囪喘鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PurchaseUnit" ) ]
- public string? PurchaseUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_LocationInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_LocationInfo.cs"
deleted file mode 100644
index 9e62e27..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_LocationInfo.cs"
+++ /dev/null
@@ -1,185 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- ///
- ///</summary>
- [SugarTable("Dt_LocationInfo")]
- public class Dt_LocationInfo : BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:璐т綅ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="LocationID" ,IsPrimaryKey = true) ]
- public Guid LocationID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳尯缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "WareAreaCode")]
- public string WareAreaCode { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:璐т綅缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="LocationCode" ) ]
- public string LocationCode { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:璐т綅鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="LocationName" ) ]
- public string? LocationName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:宸烽亾缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="RoadwayNO" ) ]
- public string RoadwayNO { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:琛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Line" ) ]
- public string? Line { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍒�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Column" ) ]
- public string? Column { get; set; }
-
- /// <summary>
- /// 澶� 娉�:灞�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Layer" ) ]
- public string? Layer { get; set; }
-
- /// <summary>
- /// 澶� 娉�:宸烽亾
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Roadway" ) ]
- public string? Roadway { get; set; }
-
- /// <summary>
- /// 澶� 娉�:娣卞害
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Depth" ) ]
- public string? Depth { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀵瑰簲鍫嗗灈鏈哄彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="SCNo" ) ]
- public string? SCNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍫嗗灈鏈哄搴旇揣浣嶇珯鍙板彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="SClocationID" ) ]
- public string? SClocationID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅绫诲瀷锛�1锛屽崟娣� 2锛屽娣憋級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="LocationType" ) ]
- public string? LocationType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁琚攣瀹�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="IsLocked" ) ]
- public bool? IsLocked { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅鐘舵�侊紙0锛岀┖闂� 2锛屽崰鐢級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Status" ) ]
- public int? Status { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅鎻忚堪
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="LocationDesc" ) ]
- public string? LocationDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁鍒犻櫎
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="IsDelete" ) ]
- public bool? IsDelete { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
-
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_MaterielAttribute.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_MaterielAttribute.cs"
deleted file mode 100644
index 309cc92..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_MaterielAttribute.cs"
+++ /dev/null
@@ -1,113 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐗╂枡灞炴��
- ///</summary>
- [SugarTable("Dt_MaterielAttribute")]
- public class Dt_MaterielAttribute: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName= "AttributeID", IsPrimaryKey = true) ]
- public Guid AttributeID { get; set; }
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterielID", IsPrimaryKey = true)]
- public Guid MaterielID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:灞炴�х紪鐮�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AttributeCode" ) ]
- public string? AttributeCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡灞炴�у悕绉�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AttributeName" ) ]
- public string? AttributeName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡灞炴�ф弿杩�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AttributeDesc" ) ]
- public string? AttributeDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀛樺偍鏉′欢
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Stroagecon" ) ]
- public string? Stroagecon { get; set; }
-
- /// <summary>
- /// 澶� 娉�:杩愯緭鏉′欢
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Transpcon" ) ]
- public string? Transpcon { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_MaterielInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_MaterielInfo.cs"
deleted file mode 100644
index 3783dbb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_MaterielInfo.cs"
+++ /dev/null
@@ -1,180 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐗╂枡淇℃伅
- ///</summary>
- [SugarTable("Dt_MaterielInfo")]
- public class Dt_MaterielInfo: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName= "MaterielID", IsPrimaryKey = true) ]
- public Guid MaterielID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栫爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterielCode" ) ]
- public string? MaterielCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵�灞炲簱鍖�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName= "WareAreaCode") ]
- public string? WareAreaCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterielName" ) ]
- public string? MaterielName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖呰瑙勬牸
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Packspes" ) ]
- public string? Packspes { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鎻忚堪
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterielDesc" ) ]
- public string? MaterielDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡灞炴��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Attribute" ) ]
- public string? Attribute { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璁￠噸鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Unit" ) ]
- public string? Unit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:褰撳墠鐘舵�侊紙0锛岀鐢� 1锛屽惎鐢級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Status" ) ]
- public int? Status { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏈�灏忓寘瑁呮暟
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MinpackQty" ) ]
- public decimal? MinpackQty { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐢熶骇鍟�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Mfacturer" ) ]
- public string? Mfacturer { get; set; }
-
- /// <summary>
- /// 澶� 娉�:渚涘簲鍟�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Supplier" ) ]
- public string? Supplier { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑�閲�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Netweight" ) ]
- public decimal? Netweight { get; set; }
-
- /// <summary>
- /// 澶� 娉�:姣涢噸
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Grossweight" ) ]
- public decimal? Grossweight { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏈夋晥鏈�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Validity" ) ]
- public int? Validity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹夊叏搴撳瓨
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Safety" ) ]
- public decimal? Safety { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="spare5" ) ]
- public string? Spare5 { get; set; }
-
- /// <summary>
- /// 鐗╂枡灞炴��
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_MaterielAttribute.MaterielID))]
- public List<Dt_MaterielAttribute> Dt_MaterielAttributeList { get; set; }
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_RoadWayInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_RoadWayInfo.cs"
deleted file mode 100644
index 5e884d9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_RoadWayInfo.cs"
+++ /dev/null
@@ -1,92 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 宸烽亾琛�
- ///</summary>
- [SugarTable("Dt_RoadWayInfo")]
- public class Dt_RoadWayInfo : BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:宸烽亾ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="RoadwayID" ) ]
- public Guid? RoadwayID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:宸烽亾鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="RoadWayNO" ) ]
- public string? RoadWayNO { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳尯ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="WareAreaID" ) ]
- public Guid? WareAreaID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁鍚敤
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="IsEnable" ) ]
- public bool? IsEnable { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_Strategy.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_Strategy.cs"
deleted file mode 100644
index 915f69e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_Strategy.cs"
+++ /dev/null
@@ -1,124 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- ///
- ///</summary>
- [SugarTable("Dt_Strategy")]
- public class Dt_Strategy : BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:绛栫暐ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="StrategyId" ,IsPrimaryKey = true) ]
- public Guid StrategyId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:绛栫暐缂栫爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="StrategyCode" ) ]
- public string? StrategyCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:绛栫暐鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="StrategyName" ) ]
- public string? StrategyName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀛楁鏉ユ簮
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="FiledSource" ) ]
- public string? FiledSource { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瑙勫垯瀛楁
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="FieldName" ) ]
- public string? FieldName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎺掑簭鏂瑰紡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="SordOrder" ) ]
- public string? SordOrder { get; set; }
-
- /// <summary>
- /// 澶� 娉�:绛栫暐绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="StrategyType" ) ]
- public string? StrategyType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁棰勮
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="IsPreset" ) ]
- public bool? IsPreset { get; set; }
-
- /// <summary>
- /// 鎵ц椤哄簭
- /// </summary>
- [SugarColumn(ColumnName = "ExecutionOrder")]
- public int ExecutionOrder { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_Task.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_Task.cs"
deleted file mode 100644
index 0a0fc61..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_Task.cs"
+++ /dev/null
@@ -1,170 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 浠诲姟
- ///</summary>
- [SugarTable("Dt_Task")]
- public class Dt_Task: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:涓婚敭
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TaskId" ,IsPrimaryKey = true) ]
- public Guid TaskId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TaskNum" ) ]
- public int? TaskNum { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PalletCode" ) ]
- public string? PalletCode { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundNo" ) ]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:宸烽亾
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Roadway" ) ]
- public string? Roadway { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationCode")]
- public string? LocationCode { get; set; }
-
-
- /// <summary>
- /// 澶� 娉�:浠诲姟绫诲瀷锛�1锛屼竴鑸叆搴� 2锛岀洏鐐瑰叆搴� 3锛屽垎鎷ｅ叆搴� 4锛岃川妫�鍏ュ簱 5锛屽簱鍐呯Щ搴� 6锛屽簱澶栫Щ搴� 锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TaskType" ) ]
- public string? TaskType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鐘舵�侊紙1锛屼换鍔″緟涓嬪彂 2锛岃緭閫佺嚎鎵ц涓� 3锛岃緭閫佺嚎瀹屾垚 4锛孉GV鎵ц涓� 5锛孉GV瀹屾垚 6锛屽爢鍨涙満鎵ц涓� 7锛屽爢鍨涙満瀹屾垚 8锛屼换鍔″畬鎴愶紝9锛屼换鍔″彇娑堬級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TaskState" ) ]
- public string? TaskState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MaterialNo" ) ]
- public string? MaterialNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璧峰鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="SourceAddress" ) ]
- public string? SourceAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐩爣鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TargetAddress" ) ]
- public string? TargetAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:褰撳墠浣嶇疆
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="CurrentAddress" ) ]
- public string? CurrentAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:涓嬩竴鍦板潃
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="NextAddress" ) ]
- public string? NextAddress { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浼樺厛绾�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Grade" ) ]
- public int? Grade { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟涓嬪彂鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Dispatchertime" ) ]
- public DateTime? Dispatchertime { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(Dt_TaskExecuteDetail.TaskId))]
- public List<Dt_TaskExecuteDetail> Dt_TaskExecuteDetailList { get; set; }
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_TaskExecuteDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_TaskExecuteDetail.cs"
deleted file mode 100644
index 5a25c81..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_TaskExecuteDetail.cs"
+++ /dev/null
@@ -1,100 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 浠诲姟鎵ц琛�
- ///</summary>
- [SugarTable("Dt_TaskExecuteDetail")]
- public class Dt_TaskExecuteDetail: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TaskDetailId" ,IsPrimaryKey = true) ]
- public Guid TaskDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TaskId" ) ]
- public Guid? TaskId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TaskNum" ) ]
- public string? TaskNum { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠诲姟鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="TaskState" ) ]
- public string? TaskState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏄惁浜哄伐鎿嶄綔
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="IsManual" ) ]
- public bool? IsManual { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_UnitInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_UnitInfo.cs"
deleted file mode 100644
index 841233f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_UnitInfo.cs"
+++ /dev/null
@@ -1,111 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍗曚綅鎹㈢畻
- ///</summary>
- [SugarTable("Dt_UnitInfo")]
- public class Dt_UnitInfo: BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true) ]
- public Guid ID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曚綅浠ｇ爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="UnitID" ) ]
- public string? UnitID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曚綅鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="UnitName" ) ]
- public string? UnitName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖呰鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PackUnit" ) ]
- public string? PackUnit { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖呰鍗曚綅閲�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="PackUnitNum" ) ]
- public decimal? PackUnitNum { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏈�灏忓崟浣嶉噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="MinUnitNum" ) ]
- public decimal? MinUnitNum { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎻忚堪
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="UnitDesc" ) ]
- public string? UnitDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_WareAreaInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_WareAreaInfo.cs"
deleted file mode 100644
index 254b616..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Dt_WareAreaInfo.cs"
+++ /dev/null
@@ -1,111 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 搴撳尯琛�
- ///</summary>
- [SugarTable("Dt_WareAreaInfo")]
- public class Dt_WareAreaInfo : BaseEntity
- {
-
-
- /// <summary>
- /// 澶� 娉�:搴撳尯ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="WareAreaID" ,IsPrimaryKey = true) ]
- public Guid WareAreaID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍖哄煙ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="AreaID" ) ]
- public Guid? AreaID { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳尯浠ｇ爜
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="WareAreaCode" ) ]
- public string WareAreaCode { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:搴撳尯鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="WareAreaName" ) ]
- public string? WareAreaName { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳尯绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="WareAreaType" ) ]
- public string? WareAreaType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳尯鎻忚堪
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="WareAreaDesc" ) ]
- public string? WareAreaDesc { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Status" ) ]
- public int? Status { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
-
- /// <summary>
- /// 宸烽亾鏄庣粏
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_RoadWayInfo.WareAreaID))]
- public List<Dt_RoadWayInfo> Dt_RoadWayInfoDetailList { get; set; }
-
-
- }
-
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrder.cs"
deleted file mode 100644
index 31f3fa5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrder.cs"
+++ /dev/null
@@ -1,68 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 绯荤粺鍑哄簱璁㈠崟澶磋〃
- ///</summary>
- [SugarTable("Dt_OutOrder", "绯荤粺鍑哄簱璁㈠崟澶磋〃")]
- public class Dt_OutOrder : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱鍗曞彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderNumber", ColumnDescription = "鍑哄簱鍗曞彿")]
- public string OrderNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 鍑哄簱鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderDate", ColumnDescription = " 鍑哄簱鏃ユ湡")]
- public DateTime OrderDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠撳簱ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "WarehouseId", ColumnDescription = "浠撳簱ID")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "鍗曟嵁鐘舵��")]
- public string Status { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:涓婃湁绯荤粺鍗曟嵁ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "UpperOutOrderId", ColumnDescription = "涓婃湁绯荤粺鍗曟嵁ID")]
- public int? UpperOutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = " 澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 璁㈠崟鏄庣粏鏁版嵁
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(Id), nameof(Dt_OutOrderDetail.OutOrderId))]
- public Dt_OutOrderDetail? OrderDetailList { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderAndStock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderAndStock.cs"
deleted file mode 100644
index e685817..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderAndStock.cs"
+++ /dev/null
@@ -1,159 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍑哄簱璁㈠崟搴撳瓨鏁版嵁鏄庣粏琛�
- ///</summary>
- [SugarTable("Dt_OutOrderAndStock", "鍑哄簱璁㈠崟搴撳瓨鏁版嵁鏄庣粏琛�")]
- public class Dt_OutOrderAndStock : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭ID")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱璁㈠崟澶碔D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutOrderId", ColumnDescription = "鍑哄簱璁㈠崟澶碔D锛堝閿級")]
- public int OutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱璁㈠崟鏄庣粏ID锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutOrderDetailId", ColumnDescription = "鍑哄簱璁㈠崟鏄庣粏ID锛堝閿級")]
- public int OutOrderDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨澶碔D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupId", ColumnDescription = "搴撳瓨澶碔D锛堝閿級")]
- public int GroupId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鏄庣粏ID锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupDetailId", ColumnDescription = "搴撳瓨鏄庣粏ID锛堝閿級")]
- public int GroupDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅缂栧彿锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationCode", ColumnDescription = "璐т綅缂栧彿锛堝閿級")]
- public string LocationCode { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:璁㈠崟缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderNumber", ColumnDescription = "璁㈠崟缂栧彿")]
- public string OrderNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNumber", ColumnDescription = "鎵规鍙�")]
- public string BatchNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutboundQuantity", ColumnDescription = "鍑哄簱鏁伴噺")]
- public decimal OutboundQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍒嗛厤鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AllocatedQuantity", ColumnDescription = "鍒嗛厤鏁伴噺")]
- public decimal AllocatedQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹屾垚鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "CompletedQuantity", ColumnDescription = "瀹屾垚鏁伴噺")]
- public decimal CompletedQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletCode", ColumnDescription = "鎵樼洏鍙�")]
- public string PalletCode { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialNo", ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialNo { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialName", ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "State", ColumnDescription = "搴撳瓨鐘舵��")]
- public string State { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "palletQuantity", ColumnDescription = "搴撳瓨鏁伴噺")]
- public decimal? PalletQuantity { get; set; }
-
- /// <summary>
- /// 璐т綅鏄庣粏鏁版嵁
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(LocationCode), nameof(Dt_LocationInfo.LocationID))]
- public Dt_LocationInfo? LocationList { get; set; }
-
- /// <summary>
- /// 搴撳瓨澶存槑缁嗘暟鎹�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(GroupId), nameof(Dt_BillGroupStock.GroupId))]
- public Dt_BillGroupStock? StockList { get; set; }
-
- /// <summary>
- /// 搴撳瓨浣撴槑缁嗘暟鎹�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(GroupDetailId), nameof(Dt_BillGroupStockDetail.GroupDetailId))]
- public Dt_BillGroupStockDetail? StockDetailList { get; set; }
-
- /// <summary>
- /// 璁㈠崟澶存槑缁嗘暟鎹�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(OutOrderId), nameof(Dt_OutOrder.Id))]
- public Dt_OutOrder? OrderList { get; set; }
-
- /// <summary>
- /// 璁㈠崟浣撴槑缁嗘暟鎹�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(OutOrderDetailId), nameof(Dt_OutOrderDetail.Id))]
- public Dt_OutOrderDetail? OrderDetailList { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderAndStock_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderAndStock_Hty.cs"
deleted file mode 100644
index 91ff976..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderAndStock_Hty.cs"
+++ /dev/null
@@ -1,173 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍑哄簱璁㈠崟搴撳瓨鏁版嵁鏄庣粏琛�
- ///</summary>
- [SugarTable("Dt_OutOrderAndStock_Hty", "鍑哄簱璁㈠崟搴撳瓨鏁版嵁鏄庣粏琛�")]
- public class Dt_OutOrderAndStock_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭ID")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱璁㈠崟澶碔D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutOrderId", ColumnDescription = "鍑哄簱璁㈠崟澶碔D锛堝閿級")]
- public int OutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱璁㈠崟鏄庣粏ID锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutOrderDetailId", ColumnDescription = "鍑哄簱璁㈠崟鏄庣粏ID锛堝閿級")]
- public int OutOrderDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨澶碔D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupId", ColumnDescription = "搴撳瓨澶碔D锛堝閿級")]
- public int GroupId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鏄庣粏ID锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GroupDetailId", ColumnDescription = "搴撳瓨鏄庣粏ID锛堝閿級")]
- public int GroupDetailId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璐т綅缂栧彿锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "LocationCode", ColumnDescription = "璐т綅缂栧彿锛堝閿級")]
- public string LocationCode { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:璁㈠崟缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderNumber", ColumnDescription = "璁㈠崟缂栧彿")]
- public string OrderNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNumber", ColumnDescription = "鎵规鍙�")]
- public string BatchNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutboundQuantity", ColumnDescription = "鍑哄簱鏁伴噺")]
- public decimal OutboundQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍒嗛厤鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AllocatedQuantity", ColumnDescription = "鍒嗛厤鏁伴噺")]
- public decimal AllocatedQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹屾垚鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "CompletedQuantity", ColumnDescription = "瀹屾垚鏁伴噺")]
- public decimal CompletedQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵樼洏鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "PalletCode", ColumnDescription = "鎵樼洏鍙�")]
- public string PalletCode { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialNo", ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialNo { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialName", ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "State", ColumnDescription = "搴撳瓨鐘舵��")]
- public string State { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:搴撳瓨鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "palletQuantity", ColumnDescription = "搴撳瓨鏁伴噺")]
- public decimal PalletQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
-
- /// <summary>
- /// 搴撳瓨澶存槑缁嗘暟鎹�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(GroupId), nameof(Dt_BillGroupStock_Hty.GroupId))]
- public Dt_BillGroupStock_Hty? StockList { get; set; }
-
- /// <summary>
- /// 搴撳瓨浣撴槑缁嗘暟鎹�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(GroupDetailId), nameof(Dt_BillGroupStockDetail_Hty.GroupDetailId))]
- public Dt_BillGroupStockDetail_Hty? StockDetailList { get; set; }
-
- /// <summary>
- /// 璁㈠崟澶存槑缁嗘暟鎹�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(OutOrderId), nameof(Dt_OutOrder_Hty.Id))]
- public Dt_OutOrder_Hty? OrderList { get; set; }
-
- /// <summary>
- /// 璁㈠崟浣撴槑缁嗘暟鎹�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToOne, nameof(OutOrderDetailId), nameof(Dt_OutOrderDetail_Hty.Id))]
- public Dt_OutOrderDetail_Hty? OrderDetailList { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderDetail.cs"
deleted file mode 100644
index 9738851..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderDetail.cs"
+++ /dev/null
@@ -1,124 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 绯荤粺鍑哄簱璁㈠崟鏄庣粏
- ///</summary>
- [SugarTable("Dt_OutOrderDetail", "绯荤粺鍑哄簱璁㈠崟鏄庣粏")]
- public class Dt_OutOrderDetail : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�: 涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = " 涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱鍗旾D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutOrderId", ColumnDescription = "鍑哄簱鍗旾D锛堝閿級")]
- public int OutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialId", ColumnDescription = "鐗╂枡ID")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialName", ColumnDescription = " 鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNumber", ColumnDescription = "鎵规鍙�")]
- public string BatchNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutboundQuantity", ColumnDescription = "鍑哄簱鏁伴噺")]
- public decimal OutboundQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍒嗛厤鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AllocatedQuantity", ColumnDescription = "鍒嗛厤鏁伴噺")]
- public decimal AllocatedQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹屾垚鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "CompletedQuantity", ColumnDescription = "瀹屾垚鏁伴噺")]
- public decimal CompletedQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曚环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "UnitPrice", ColumnDescription = "鍗曚环")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎬讳环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TotalPrice", ColumnDescription = "鎬讳环")]
- public decimal? TotalPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囩敤瀛楁1
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField1", ColumnDescription = "澶囩敤瀛楁1")]
- public string? SpareField1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囩敤瀛楁2
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField2", ColumnDescription = "澶囩敤瀛楁2")]
- public string? SpareField2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囩敤瀛楁3
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField3", ColumnDescription = "澶囩敤瀛楁3")]
- public string? SpareField3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囩敤瀛楁4
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField4", ColumnDescription = "澶囩敤瀛楁4")]
- public string? SpareField4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囩敤瀛楁5
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField5", ColumnDescription = "澶囩敤瀛楁5")]
- public string? SpareField5 { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderDetail_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderDetail_Hty.cs"
deleted file mode 100644
index 94036a8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderDetail_Hty.cs"
+++ /dev/null
@@ -1,145 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 绯荤粺鍑哄簱璁㈠崟鏄庣粏鍘嗗彶
- ///</summary>
- [SugarTable("Dt_OutOrderDetail_Hty", "绯荤粺鍑哄簱璁㈠崟鏄庣粏鍘嗗彶")]
- public class Dt_OutOrderDetail_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�: 涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鍑哄簱鍗旾D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutOrderId", ColumnDescription = "鍑哄簱鍗旾D锛堝閿級")]
- public int OutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鐗╂枡ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialId", ColumnDescription = "鐗╂枡ID")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialName", ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNumber", ColumnDescription = "鎵规鍙�")]
- public string BatchNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 鍑哄簱鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OutboundQuantity", ColumnDescription = "鍑哄簱鏁伴噺")]
- public decimal OutboundQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鍒嗛厤鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AllocatedQuantity", ColumnDescription = "鍒嗛厤鏁伴噺")]
- public decimal AllocatedQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 瀹屾垚鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "CompletedQuantity", ColumnDescription = "瀹屾垚鏁伴噺")]
- public decimal CompletedQuantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鍗曚环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "UnitPrice", ColumnDescription = "鍗曚环")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鎬讳环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TotalPrice", ColumnDescription = "鎬讳环")]
- public decimal? TotalPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囩敤瀛楁1
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField1", ColumnDescription = "澶囩敤瀛楁1")]
- public string? SpareField1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囩敤瀛楁2
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField2", ColumnDescription = "澶囩敤瀛楁2")]
- public string? SpareField2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囩敤瀛楁3
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField3", ColumnDescription = "澶囩敤瀛楁3")]
- public string? SpareField3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囩敤瀛楁4
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField4", ColumnDescription = "澶囩敤瀛楁4")]
- public string? SpareField4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囩敤瀛楁5
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SpareField5", ColumnDescription = "澶囩敤瀛楁5")]
- public string? SpareField5 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProduction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProduction.cs"
deleted file mode 100644
index 690e5a9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProduction.cs"
+++ /dev/null
@@ -1,54 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐢熶骇鍑哄簱鍗曞ご琛�
- ///</summary>
- [SugarTable("Dt_OutOrderProduction", "鐢熶骇鍑哄簱鍗曞ご琛�")]
- public class Dt_OutOrderProduction : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderNumber", ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderDate", ColumnDescription = "鍗曟嵁鏃ユ湡")]
- public DateTime OrderDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:浠撳簱ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "WarehouseId", ColumnDescription = "浠撳簱ID")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "鍗曟嵁鐘舵��")]
- public string Status { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProductionDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProductionDetail.cs"
deleted file mode 100644
index c14c5ad..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProductionDetail.cs"
+++ /dev/null
@@ -1,68 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐢熶骇鍑哄簱鍗曟槑缁�
- ///</summary>
- [SugarTable("Dt_OutOrderProductionDetail", "鐢熶骇鍑哄簱鍗曟槑缁�")]
- public class Dt_OutOrderProductionDetail : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐢熶骇鍑哄簱鍗旾D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "ProductionOutOrderId", ColumnDescription = "鐢熶骇鍑哄簱鍗旾D锛堝閿級")]
- public int ProductionOutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialId", ColumnDescription = "鐗╂枡ID")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Quantity", ColumnDescription = " 鏁伴噺")]
- public decimal Quantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曚环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "UnitPrice", ColumnDescription = "鍗曚环")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎬讳环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TotalPrice", ColumnDescription = "鎬讳环")]
- public decimal? TotalPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNumber", ColumnDescription = "鎵规鍙�")]
- public string BatchNumber { get; set; } = null!;
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProductionDetail_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProductionDetail_Hty.cs"
deleted file mode 100644
index 3d2fe07..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProductionDetail_Hty.cs"
+++ /dev/null
@@ -1,92 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐢熶骇鍑哄簱鍗曟槑缁嗗巻鍙�
- ///</summary>
- [SugarTable("Dt_OutOrderProductionDetail_Hty", "鐢熶骇鍑哄簱鍗曟槑缁嗗巻鍙�")]
- public class Dt_OutOrderProductionDetail_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�: 涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鐢熶骇鍑哄簱鍗旾D锛堝閿�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "ProductionOutOrderId", ColumnDescription = "鐢熶骇鍑哄簱鍗旾D锛堝閿�")]
- public int ProductionOutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鐗╂枡ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialId", ColumnDescription = "鐗╂枡ID")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Quantity", ColumnDescription = "鏁伴噺")]
- public decimal Quantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鍗曚环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "UnitPrice", ColumnDescription = "鍗曚环")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鎬讳环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TotalPrice", ColumnDescription = "鎬讳环")]
- public decimal? TotalPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNumber", ColumnDescription = "鎵规鍙�")]
- public string BatchNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProduction_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProduction_Hty.cs"
deleted file mode 100644
index c5a2d63..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderProduction_Hty.cs"
+++ /dev/null
@@ -1,75 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐢熶骇鍑哄簱鍗曞ご琛ㄥ巻鍙�
- ///</summary>
- [SugarTable("Dt_OutOrderProduction_Hty", "鐢熶骇鍑哄簱鍗曞ご琛ㄥ巻鍙�")]
- public class Dt_OutOrderProduction_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderNumber", ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderDate", ColumnDescription = "鍗曟嵁鏃ユ湡")]
- public DateTime OrderDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 浠撳簱ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "WarehouseId", ColumnDescription = "浠撳簱ID")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "鍗曟嵁鐘舵��")]
- public string Status { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransfer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransfer.cs"
deleted file mode 100644
index 99209e5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransfer.cs"
+++ /dev/null
@@ -1,61 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 璋冩嫧鍑哄簱鍗曞ご琛�
- ///</summary>
- [SugarTable("Dt_OutOrderTransfer", "璋冩嫧鍑哄簱鍗曞ご琛�")]
- public class Dt_OutOrderTransfer : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderNumber", ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderDate", ColumnDescription = "鍗曟嵁鏃ユ湡")]
- public DateTime OrderDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:婧愪粨搴揑D
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceWarehouseId", ColumnDescription = "婧愪粨搴揑D")]
- public int SourceWarehouseId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐩爣浠撳簱ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "DestinationWarehouseId", ColumnDescription = "鐩爣浠撳簱ID")]
- public int DestinationWarehouseId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "鍗曟嵁鐘舵��")]
- public string Status { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransferDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransferDetail.cs"
deleted file mode 100644
index 81a4e15..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransferDetail.cs"
+++ /dev/null
@@ -1,68 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 璋冩嫧鍑哄簱鍗曟槑缁嗚〃
- ///</summary>
- [SugarTable("Dt_OutOrderTransferDetail", "璋冩嫧鍑哄簱鍗曟槑缁嗚〃")]
- public class Dt_OutOrderTransferDetail : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璋冩嫧鍑哄簱鍗旾D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TransferOutOrderId", ColumnDescription = "璋冩嫧鍑哄簱鍗旾D锛堝閿級")]
- public int TransferOutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialId", ColumnDescription = "鐗╂枡ID")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Quantity", ColumnDescription = "鏁伴噺")]
- public decimal Quantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曚环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "UnitPrice", ColumnDescription = "鍗曚环")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎬讳环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TotalPrice", ColumnDescription = "鎬讳环")]
- public decimal? TotalPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNumber", ColumnDescription = "鎵规鍙�")]
- public string? BatchNumber { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransferDetail_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransferDetail_Hty.cs"
deleted file mode 100644
index ee33198..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransferDetail_Hty.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 璋冩嫧鍑哄簱鍗曟槑缁嗚〃鍘嗗彶
- ///</summary>
- [SugarTable("Dt_OutOrderTransferDetail_Hty", "璋冩嫧鍑哄簱鍗曟槑缁嗚〃鍘嗗彶")]
- public class Dt_OutOrderTransferDetail_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:璋冩嫧鍑哄簱鍗旾D锛堝閿級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TransferOutOrderId", ColumnDescription = "璋冩嫧鍑哄簱鍗旾D")]
- public int TransferOutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐗╂枡ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterialId", ColumnDescription = "鐗╂枡ID")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏁伴噺
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Quantity", ColumnDescription = "鏁伴噺")]
- public decimal Quantity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曚环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "UnitPrice", ColumnDescription = "鍗曚环")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎬讳环
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "TotalPrice", ColumnDescription = "鎬讳环")]
- public decimal? TotalPrice { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "BatchNumber", ColumnDescription = "鎵规鍙�")]
- public string? BatchNumber { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransfer_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransfer_Hty.cs"
deleted file mode 100644
index fb8b73b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrderTransfer_Hty.cs"
+++ /dev/null
@@ -1,82 +0,0 @@
-锘縰sing SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 璋冩嫧鍑哄簱鍗曞ご琛ㄥ巻鍙�
- ///</summary>
- [SugarTable("Dt_OutOrderTransfer_Hty", "璋冩嫧鍑哄簱鍗曞ご琛ㄥ巻鍙�")]
- public class Dt_OutOrderTransfer_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderNumber", ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderDate", ColumnDescription = "鍗曟嵁鏃ユ湡")]
- public DateTime OrderDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�:婧愪粨搴揑D
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceWarehouseId", ColumnDescription = "婧愪粨搴揑D")]
- public int SourceWarehouseId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鐩爣浠撳簱ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "DestinationWarehouseId", ColumnDescription = "鐩爣浠撳簱ID")]
- public int DestinationWarehouseId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "鍗曟嵁鐘舵��")]
- public string Status { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�:婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrder_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrder_Hty.cs"
deleted file mode 100644
index ee77af0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/OutboundOrder/Dt_OutOrder_Hty.cs"
+++ /dev/null
@@ -1,85 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 绯荤粺鍑哄簱璁㈠崟澶村巻鍙茶〃
- ///</summary>
- [SugarTable("Dt_OutOrder_Hty", "绯荤粺鍑哄簱璁㈠崟澶村巻鍙茶〃")]
- public class Dt_OutOrder_Hty : BaseEntity
- {
- /// <summary>
- /// 澶� 娉�:涓婚敭锛岃嚜鍔ㄥ闀�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Id", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭锛岃嚜鍔ㄥ闀�")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍑哄簱鍗曞彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderNumber", ColumnDescription = "鍑哄簱鍗曞彿")]
- public string OrderNumber { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 鍑哄簱鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OrderDate", ColumnDescription = "鍑哄簱鏃ユ湡")]
- public DateTime OrderDate { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 浠撳簱ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "WarehouseId", ColumnDescription = "浠撳簱ID")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鍗曟嵁鐘舵��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "鍗曟嵁鐘舵��")]
- public string Status { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 涓婃湁绯荤粺鍗曟嵁ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "UpperOutOrderId", ColumnDescription = "涓婃湁绯荤粺鍗曟嵁ID")]
- public int? UpperOutOrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remarks", ColumnDescription = "澶囨敞")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 瀹屾垚鏃堕棿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "FinishTime", ColumnDescription = "瀹屾垚鏃堕棿")]
- public DateTime FinishTime { get; set; }
-
- /// <summary>
- /// 澶� 娉�: 鎿嶄綔绫诲瀷
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "OperateType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; } = null!;
-
- /// <summary>
- /// 澶� 娉�: 婧愬崟ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
- public int SourceId { get; set; }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/RoleAuthor.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/RoleAuthor.cs"
deleted file mode 100644
index 4cd4407..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/RoleAuthor.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Model
-{
- public class RoleAuthor
- {
- public int menuId { get; set; }
- public string actions { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/RoleNodes.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/RoleNodes.cs"
deleted file mode 100644
index 25b6b51..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/RoleNodes.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Model.Models.System
-{
- public class RoleNodes
- {
- public int Id { get; set; }
- public int ParentId { get; set; }
- public string RoleName { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Department.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Department.cs"
deleted file mode 100644
index 1ac637a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Department.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- [SugarTable("Sys_Department", "缁勭粐鏋舵瀯"), MultiTenant]
- public class Sys_Department : BaseEntity
- {
- /// <summary>
- /// 缁勭粐ID
- /// </summary>
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "缁勭粐ID")]
- public int DepartmentId { get; set; }
-
- /// <summary>
- /// 缁勭粐鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "缁勭粐鍚嶇О")]
- public string DepartmentName { get; set; }
-
- /// <summary>
- /// 缁勭粐缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "缁勭粐缂栧彿")]
- public string DepartmentCode { get; set; }
-
- /// <summary>
- /// 涓婄骇缁勭粐
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "涓婄骇缁勭粐")]
- public int ParentId { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "閮ㄩ棬绫诲瀷")]
- public string DepartmentType { get; set; }
-
- /// <summary>
- /// 鏄惁鍙敤
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍙敤")]
- public int Enable { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 2000, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Dictionary.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Dictionary.cs"
deleted file mode 100644
index ea9724b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Dictionary.cs"
+++ /dev/null
@@ -1,95 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Filter;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- [MultiTenant]
- [Exporter(ExporterHeaderFilter = typeof(ExporterHeaderFilter))]
- [SugarTable("Sys_Dictionary", "瀛楀吀鏁版嵁")]
- public class Sys_Dictionary : BaseEntity
- {
- /// <summary>
- /// 瀛楀吀ID
- /// </summary>
- [ExporterHeader(DisplayName = "瀛楀吀ID")]
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "瀛楀吀ID")]
- public int DicId { get; set; }
-
- /// <summary>
- /// 閰嶇疆椤�
- /// </summary>
- [ExporterHeader(DisplayName = "閰嶇疆椤�")]
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "閰嶇疆椤�")]
- public string Config { get; set; }
-
- /// <summary>
- /// 鏁版嵁搴撴湇鍔�
- /// </summary>
- [ExporterHeader(DisplayName = "鏁版嵁搴撴湇鍔�")]
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鏁版嵁搴撴湇鍔�")]
- public string DBServer { get; set; }
-
- /// <summary>
- /// Sql璇彞
- /// </summary>
- [ExporterHeader(DisplayName = "Sql璇彞")]
- [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "Sql璇彞")]
- public string DBSql { get; set; }
-
- /// <summary>
- /// 瀛楀吀鍚嶇О
- /// </summary>
- [ExporterHeader(DisplayName = "瀛楀吀鍚嶇О")]
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "瀛楀吀鍚嶇О")]
- public string DicName { get; set; }
-
- /// <summary>
- /// 瀛楀吀缂栧彿
- /// </summary>
- [ExporterHeader(DisplayName = "瀛楀吀缂栧彿")]
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "瀛楀吀缂栧彿")]
- public string DicNo { get; set; }
-
- /// <summary>
- /// 鏄惁鍚敤
- /// </summary>
- [ExporterHeader(DisplayName = "鏄惁鍚敤")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鏄惁鍚敤")]
- public byte? Enable { get; set; }
-
- /// <summary>
- /// 鎺掑簭鍙�
- /// </summary>
- [ExporterHeader(DisplayName = "鎺掑簭鍙�")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鎺掑簭鍙�")]
- public int? OrderNo { get; set; }
-
- /// <summary>
- /// 鐖剁骇ID
- /// </summary>
- [ExporterHeader(DisplayName = "鐖剁骇ID")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鐖剁骇ID")]
- public int ParentId { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExporterHeader(DisplayName = "澶囨敞")]
- [SugarColumn(IsNullable = true, Length = 2000, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 绯荤粺绫诲瀷
- /// </summary>
- [ExporterHeader(DisplayName = "绯荤粺绫诲瀷")]
- [SugarColumn(IsNullable = false, ColumnDescription = "绯荤粺绫诲瀷")]
- public int SystemType { get; set; }
-
- [ExporterHeader(IsIgnore = true)]
- [Navigate(NavigateType.OneToMany, nameof(DicId),nameof(DicId)), SugarColumn(IsIgnore = true, IsNullable = true)]
- public List<Sys_DictionaryList> DicList { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_DictionaryList.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_DictionaryList.cs"
deleted file mode 100644
index 4eef8cd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_DictionaryList.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-using SqlSugar;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- [SugarTable("Sys_DictionaryList", "瀛楀吀鏄庣粏"), MultiTenant]
- public class Sys_DictionaryList : BaseEntity
- {
- /// <summary>
- /// 瀛楀吀鍒楄〃ID
- /// </summary>
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "瀛楀吀鍒楄〃ID")]
- public int DicListId { get; set; }
-
- /// <summary>
- /// 鏁版嵁婧怲ext
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鏁版嵁婧怲ext")]
- public string DicName { get; set; }
-
- /// <summary>
- /// 鏁版嵁婧怴alue
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鏁版嵁婧怴alue")]
- public string DicValue { get; set; }
-
- /// <summary>
- /// 鏁版嵁婧怚D
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁版嵁婧怚D")]
- public string DicId { get; set; }
-
- /// <summary>
- /// 鏄惁鍙敤
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鏄惁鍙敤")]
- public byte? Enable { get; set; }
-
- /// <summary>
- /// 鎺掑簭鍙�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鎺掑簭鍙�")]
- public int? OrderNo { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 2000, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Log.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Log.cs"
deleted file mode 100644
index ed75231..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Log.cs"
+++ /dev/null
@@ -1,86 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- [MultiTenant]
- public class Sys_Log
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 寮�濮嬫椂闂�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "寮�濮嬫椂闂�")]
- public DateTime? BeginDate { get; set; }
-
- /// <summary>
- /// 鏃堕暱
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鏃堕暱")]
- public int? ElapsedTime { get; set; }
-
- /// <summary>
- /// 缁撴潫鏃堕棿
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "缁撴潫鏃堕棿")]
- public DateTime EndDate { get; set; }
-
- /// <summary>
- /// 鏃ュ織绫诲瀷
- /// </summary>
- //[SugarColumn(IsNullable = true, ColumnDescription = "鏃ュ織绫诲瀷")]
- //public DateTime LogType { get; set; }
-
- /// <summary>
- /// 璇锋眰鍙傛暟
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 2000, ColumnDescription = "璇锋眰鍙傛暟")]
- public string RequestParam { get; set; }
-
- /// <summary>
- /// 鍝嶅簲鍙傛暟
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 2000, ColumnDescription = "鍝嶅簲鍙傛暟")]
- public string ResponseParam { get; set; }
-
- /// <summary>
- /// 鍝嶅簲鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍝嶅簲鐘舵��")]
- public int? Success { get; set; }
-
- /// <summary>
- /// 璇锋眰鍦板潃
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 2000, ColumnDescription = "璇锋眰鍦板潃")]
- public string Url { get; set; }
-
- /// <summary>
- /// 鐢ㄦ埛IP
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "鐢ㄦ埛IP")]
- public string UserIP { get; set; }
-
- /// <summary>
- /// 鐢ㄦ埛鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐢ㄦ埛鍚嶇О")]
- public string UserName { get; set; }
-
- /// <summary>
- /// 鐢ㄦ埛涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐢ㄦ埛涓婚敭")]
- public int? User_Id { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Menu.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Menu.cs"
deleted file mode 100644
index ff956ec..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Menu.cs"
+++ /dev/null
@@ -1,85 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- [SugarTable("Sys_Menu", "鑿滃崟閰嶇疆"), MultiTenant]
- public class Sys_Menu : BaseEntity
- {
- /// <summary>
- /// 鑿滃崟ID
- /// </summary>
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "鑿滃崟ID")]
- public int MenuId { get; set; }
-
- /// <summary>
- /// 鑿滃崟鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鑿滃崟鍚嶇О")]
- public string MenuName { get; set; }
-
- /// <summary>
- /// 鏉冮檺
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 2000, ColumnDescription = "鏉冮檺")]
- public string Auth { get; set; }
-
- /// <summary>
- /// 鍥炬爣
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鍥炬爣")]
- public string Icon { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 2000, ColumnDescription = "鎻忚堪")]
- public string Description { get; set; }
-
- /// <summary>
- /// 鏄惁鍚敤
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鏄惁鍚敤")]
- public byte? Enable { get; set; }
-
- /// <summary>
- /// 琛ㄥ悕
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "琛ㄥ悕")]
- public string TableName { get; set; }
-
- /// <summary>
- /// 鐖剁骇ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐖剁骇ID")]
- public int ParentId { get; set; }
-
- /// <summary>
- /// 璺緞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "璺緞")]
- public string Url { get; set; }
-
- /// <summary>
- /// 鎺掑簭鍙�
- /// </summary>
- [SugarColumn(IsNullable = true,ColumnDescription ="鎺掑簭鍙�")]
- public int? OrderNo { get; set; }
-
- /// <summary>
- /// 鑿滃崟绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鑿滃崟绫诲瀷")]
- public int? MenuType { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(ParentId), nameof(MenuId)), SugarColumn(IsIgnore = true, IsNullable = true)]
- public List<Sys_Menu> Menus { get; set; }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Role.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Role.cs"
deleted file mode 100644
index cd54e64..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Role.cs"
+++ /dev/null
@@ -1,54 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- [SugarTable("Sys_Role", "瑙掕壊琛�"), MultiTenant]
- public class Sys_Role : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "涓婚敭")]
- public int RoleId { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true,IsIgnore = true, Length = 50, ColumnDescription = "閮ㄩ棬鍚嶇О")]
- public string DeptName { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "閮ㄩ棬涓婚敭")]
- public int? DeptId { get; set; }
-
- /// <summary>
- /// 鏄惁鍚敤
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍚敤")]
- public byte Enable { get; set; }
-
- /// <summary>
- /// 鐖禝D
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐖禝D")]
- public int ParentId { get; set; }
-
- /// <summary>
- /// 瑙掕壊鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瑙掕壊鍚嶇О")]
- public string RoleName { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(ParentId), nameof(RoleId)), SugarColumn(IsIgnore = true, IsNullable = true)]
- public List<Sys_Role> Roles { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_RoleAuth.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_RoleAuth.cs"
deleted file mode 100644
index 1d9c5ff..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_RoleAuth.cs"
+++ /dev/null
@@ -1,48 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 瑙掕壊韬唤楠岃瘉绠＄悊琛�
- /// </summary>
- [SugarTable("Sys_RoleAuth", "瑙掕壊韬唤楠岃瘉绠＄悊"), MultiTenant]
- public class Sys_RoleAuth : BaseEntity
- {
- /// <summary>
- /// 瑙掕壊韬唤楠岃瘉ID
- /// </summary>
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "瑙掕壊韬唤楠岃瘉ID")]
- public int AuthId { get; set; }
-
- /// <summary>
- /// 鐢ㄦ埛鏉冮檺
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "鐢ㄦ埛鏉冮檺")]
- public string AuthValue { get; set; }
-
- /// <summary>
- /// 鑿滃崟ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鑿滃崟ID")]
- public int MenuId { get; set; }
-
- /// <summary>
- /// 瑙掕壊ID
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "瑙掕壊ID")]
- public int? RoleId { get; set; }
-
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐢ㄦ埛ID")]
- public int? UserId { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Tenant.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Tenant.cs"
deleted file mode 100644
index 33836b0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Tenant.cs"
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- [SugarTable("Sys_Tenant", "绉熸埛")]
- public class Sys_Tenant : BaseEntity
- {
- /// <summary>
- /// 绉熸埛ID
- /// </summary>
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "绉熸埛ID")]
- public int TenantId { get; set; }
-
- /// <summary>
- /// 绉熸埛鍚嶇О
- /// </summary>
- [SugarColumn(Length = 200, IsNullable = false, ColumnDescription = "绉熸埛鍚嶇О")]
- public string TenantName { get; set; }
-
- /// <summary>
- /// 绉熸埛绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "绉熸埛绫诲瀷")]
- public int TenantType { get; set; }
-
- /// <summary>
- /// 鏁版嵁搴撶被鍨�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁版嵁搴撶被鍨�")]
- public int DbType { get; set; }
-
- /// <summary>
- /// 杩炴帴瀛楃涓�
- /// </summary>
- [SugarColumn(Length = 1000, IsNullable = false, ColumnDescription = "杩炴帴瀛楃涓�")]
- public string ConnectionString { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
- public int Status { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(Length = 2000, IsNullable = true, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Test.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Test.cs"
deleted file mode 100644
index e2141c7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_Test.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- [SugarTable("Sys_Test", "娴嬭瘯"), MultiTenant]
- public class Sys_Test : BaseEntity
- {
- [ImporterHeader(Name = "Id")]
- [ExporterHeader(DisplayName = "Id")]
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "Id")]
- public int Id { get; set; }
-
- [ImporterHeader(Name = "娴嬭瘯Content")]
- [ExporterHeader(DisplayName = "娴嬭瘯Content")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "娴嬭瘯Content")]
- public string TestContent { get; set; }
-
- [ImporterHeader(Name = "娴嬭瘯Count")]
- [ExporterHeader(DisplayName = "娴嬭瘯Count")]
- [SugarColumn(IsNullable = false, ColumnDescription = "娴嬭瘯Count")]
- public int TestCount { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_User.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_User.cs"
deleted file mode 100644
index a8632b0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/System/Sys_User.cs"
+++ /dev/null
@@ -1,151 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Tenants;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐢ㄦ埛淇℃伅琛�
- /// </summary>
- //[SugarTable("SysUserInfo")]
- [SugarTable("Sys_User", "鐢ㄦ埛琛�")] //('鏁版嵁搴撹〃鍚�'锛�'鏁版嵁搴撹〃澶囨敞')
- public class Sys_User : BaseEntity
- {
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "鐢ㄦ埛ID")]
- public int User_Id { get; set; }
-
- /// <summary>
- ///甯愬彿
- /// </summary>
- [SugarColumn(Length = 100, IsNullable = false, ColumnDescription = "甯愬彿")]
- public string UserName { get; set; }
-
- /// <summary>
- /// 瑙掕壊ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "瑙掕壊ID")]
- public int Role_Id { get; set; }
-
- /// <summary>
- /// 瑙掕壊鍚嶇О
- /// </summary>
- [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "瑙掕壊鍚嶇О")]
- public string RoleName { get; set; }
-
- /// <summary>
- /// 鐢佃瘽
- /// </summary>
- [SugarColumn(Length = 11, IsNullable = true, ColumnDescription = "鐢佃瘽")]
- public string PhoneNo { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(Length = 200, IsNullable = true, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 瀵嗙爜
- /// </summary>
- [SugarColumn(Length = 200, IsNullable = false, ColumnDescription = "瀵嗙爜")]
- public string UserPwd { get; set; }
-
- /// <summary>
- /// 鐪熷疄濮撳悕
- /// </summary>
- [SugarColumn(Length = 100, IsNullable = false, ColumnDescription = "鐪熷疄濮撳悕")]
- public string UserTrueName { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬
- /// </summary>
- [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "閮ㄩ棬")]
- public string DeptName { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬ID
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "閮ㄩ棬ID")]
- public int? Dept_Id { get; set; }
-
- /// <summary>
- /// 閭
- /// </summary>
- [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "閭")]
- public string Email { get; set; }
-
- /// <summary>
- /// 鏄惁鍙敤
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍙敤")]
- public byte Enable { get; set; }
-
- /// <summary>
- /// 鎬у埆
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鎬у埆")]
- public int? Gender { get; set; }
-
- /// <summary>
- /// 澶村儚
- /// </summary>
- [SugarColumn(Length = 500, IsNullable = true, ColumnDescription = "澶村儚")]
- public string HeadImageUrl { get; set; }
-
- /// <summary>
- /// 鏈�鍚庡瘑鐮佷慨鏀规椂闂�
- /// </summary>
- [SugarColumn(IsNullable = true, IsOnlyIgnoreInsert = true, ColumnDescription = "鏈�鍚庡瘑鐮佷慨鏀规椂闂�")]
- public DateTime? LastModifyPwdDate { get; set; }
-
- /// <summary>
- /// 鍦板潃
- /// </summary>
- [SugarColumn(Length = 200, IsNullable = true, ColumnDescription = "鍦板潃")]
- public string Address { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃堕棿
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "瀹℃牳鏃堕棿")]
- public DateTime? AuditDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "瀹℃牳鐘舵��")]
- public int? AuditStatus { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(Length = 100, IsNullable = true, ColumnDescription = "瀹℃牳浜�")]
- public string Auditor { get; set; }
-
- /// <summary>
- /// 浠ょ墝
- /// </summary>
- [SugarColumn(Length = 500, IsNullable = true, ColumnDescription = "浠ょ墝")]
- public string Token { get; set; }
-
- /// <summary>
- /// 绯荤粺绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "绯荤粺绫诲瀷", DefaultValue = "0")]
- public int SystemType { get; set; }
-
- /// <summary>
- /// 绉熸埛ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "绉熸埛ID",DefaultValue = "0")]
- public long TenantId { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/WIDESEA_Model.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/WIDESEA_Model.csproj"
deleted file mode 100644
index f1d8179..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/WIDESEA_Model.csproj"
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_Common\WIDESEA_Common.csproj" />
- <ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.assets.cache"
deleted file mode 100644
index 347d9b1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.dgspec.json"
deleted file mode 100644
index 75adb46..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,186 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/WIDESEA_Model.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/project.assets.json"
deleted file mode 100644
index cfb4b5f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/project.assets.json"
+++ /dev/null
@@ -1,114 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- }
- }
- },
- "libraries": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_Common >= 1.0.0",
- "WIDESEA_Core >= 1.0.1"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/project.nuget.cache"
deleted file mode 100644
index c52fd8f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "2gNhPeflyZND85/Rys0zEovBuXlQlBKpU0mpSzlC0MfwGmW48KNkzyoNlp5SBWOnJ/FHtwgwwEIb9vWPdFJQOA==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_BillGroupStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_BillGroupStockRepository.cs"
deleted file mode 100644
index b31202e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_BillGroupStockRepository.cs"
+++ /dev/null
@@ -1,45 +0,0 @@
-锘縰sing WIDESEA_Common;
-using WIDESEA_Common.Location;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_BillGroupStockRepository : RepositoryBase<Dt_BillGroupStock>, IDt_BillGroupStockRepository
- {
- public Dt_BillGroupStockRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 鑾峰彇鍑哄簱搴撳瓨
- /// </summary>
- /// <returns></returns>
- public List<Dt_BillGroupStock> GetOutboundStockList()
- {
- var stocks = Db.Queryable<Dt_BillGroupStock>()
- .Includes(x => x.LocationInfo)
- .Where(x => x.LocationInfo.IsLocked == false && x.LocationInfo.Status == LocationStateConst.LocationState_Stored)
- .Includes(x => x.StockDetailList)
- .Where(x => x.State == OrderStatusConst.Pending.ToString()).ToList();
- return stocks;
- }
-
- public bool UpdateNavStock(List<Dt_BillGroupStock> stocks)
- {
- return Db.UpdateNav(stocks)
- .Include(x => x.LocationInfo)
- .Include(x => x.StockDetailList)
- .ExecuteCommand();
- }
-
- public bool UpdateNavStock(Dt_BillGroupStock stock)
- {
- return Db.UpdateNav(stock)
- .Include(x => x.LocationInfo)
- .Include(x => x.StockDetailList)
- .ExecuteCommand();
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_LocationRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_LocationRepository.cs"
deleted file mode 100644
index f6dc151..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_LocationRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_LocationRepository : RepositoryBase<Dt_LocationInfo>, IDt_LocationRepository
- {
- public Dt_LocationRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_TaskRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_TaskRepository.cs"
deleted file mode 100644
index e6751bb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_TaskRepository.cs"
+++ /dev/null
@@ -1,73 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_TaskRepository : RepositoryBase<Dt_Task>, IDt_TaskRepository
- {
- public Dt_TaskRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- public async Task<Dt_Task> Create(Dt_Task model)
- {
- return await Db.Insertable(model).ExecuteReturnEntityAsync();
- }
-
- public async Task<bool> Create(List<Dt_Task> models)
- {
- var num = Db.Insertable(models).ExecuteCommand();
- if (num == models.Count)
- return await Task.FromResult(true);
- else
- return await Task.FromResult(false);
- }
-
- public async Task<bool> Delete(int id)
- {
- return await Db.Deleteable<Dt_Task>().In(id).ExecuteCommandHasChangeAsync();
- }
-
- public async Task<bool> Delete(List<int> ids)
- {
- return await Db.Deleteable<Dt_Task>().In(ids.ToArray()).ExecuteCommandHasChangeAsync();
- }
-
- public async Task<Dt_Task> GetById(int id)
- {
- return await Db.Queryable<Dt_Task>().InSingleAsync(id);
- }
-
- public async Task<List<Dt_Task>> GetList()
- {
- return await Db.Queryable<Dt_Task>().ToListAsync();
- }
-
- public async Task<List<Dt_Task>> GetListByOutOrder(int outOrderId)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.InboundNo == outOrderId.ToString()).ToListAsync();
- }
-
- public async Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.InboundNo == outOrderId.ToString())
- .Where(x => x.TaskState == status.ToString()).ToListAsync();
- }
-
- public async Task<List<Dt_Task>> GetListByStatus(int status)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.TaskState == status.ToString()).ToListAsync();
- }
-
- public async Task<bool> Update(Dt_Task model)
- {
- return await Db.Updateable(model).ExecuteCommandHasChangeAsync();
- }
-
- public async Task<bool> Update(List<Dt_Task> models)
- {
- return await Db.Updateable(models).ExecuteCommandHasChangeAsync();
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_Task_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_Task_HtyRepository.cs"
deleted file mode 100644
index 09efbeb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Basic/Dt_Task_HtyRepository.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_Task_HtyRepository : RepositoryBase<Dt_Task_Hty>, IDt_Task_HtyRepository
- {
- public Dt_Task_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- public bool InsertTask(Dt_Task_Hty task)
- {
- return Db.Insertable(task).ExecuteCommand() > 0;
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderAndStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderAndStockRepository.cs"
deleted file mode 100644
index a3ff602..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderAndStockRepository.cs"
+++ /dev/null
@@ -1,64 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_OutOrderAndStockRepository : RepositoryBase<Dt_OutOrderAndStock>, IDt_OutOrderAndStockRepository
- {
- public Dt_OutOrderAndStockRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇鍑哄簱鐗╂枡淇℃伅
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="orderNum">鍑哄簱璁㈠崟</param>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <returns>鍑哄簱鐗╂枡淇℃伅</returns>
- public async Task<Dt_OutOrderAndStock> GetOrderAndStock(string locationID = null, string orderNum = null, string palletCode = null)
- {
- return await Db.Queryable<Dt_OutOrderAndStock>()
- .Includes(x => x.OrderList)
- .Includes(x => x.StockList)
- .Includes(x => x.OrderDetailList)
- .Includes(x => x.StockDetailList)
- .Includes(x => x.LocationList)
- .WhereIF(locationID != null, x => x.LocationCode == locationID)
- .WhereIF(orderNum != null, x => x.OrderNumber == orderNum)
- .WhereIF(palletCode != null, x => x.PalletCode == palletCode)
- .FirstAsync();
- }
-
- /// <summary>
- /// 瀵艰埅鍒犻櫎
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool DeleteNavOrderStock(Dt_OutOrderAndStock stock)
- {
- return Db.DeleteNav<Dt_OutOrderAndStock>(x => x.Id == stock.Id)
- .Include(x => x.OrderDetailList)
- .Include(x => x.OrderList)
- .Include(x => x.StockDetailList)
- .Include(x => x.StockList)
- .ExecuteCommand();
- }
-
- /// <summary>
- /// 瀵艰埅鏇存柊
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool UpdateNavOrderStock(Dt_OutOrderAndStock stock)
- {
- return Db.UpdateNav(stock)
- .Include(x => x.OrderDetailList)
- .Include(x => x.OrderList)
- .Include(x => x.StockDetailList)
- .Include(x => x.StockList)
- .ExecuteCommand();
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderAndStock_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderAndStock_HtyRepository.cs"
deleted file mode 100644
index 2346af9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderAndStock_HtyRepository.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_OutOrderAndStock_HtyRepository : RepositoryBase<Dt_OutOrderAndStock_Hty>, IDt_OutOrderAndStock_HtyRepository
- {
- public Dt_OutOrderAndStock_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 瀵艰埅娣诲姞锛堟坊鍔犲簱瀛樹富浠庡巻鍙诧紝璁㈠崟涓讳粠鍘嗗彶锛�
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅鍘嗗彶</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool InsertNav(Dt_OutOrderAndStock_Hty stock)
- {
- return Db.InsertNav(stock)
- .Include(x => x.OrderList)
- .Include(x => x.OrderDetailList)
- .Include(x => x.StockList)
- .Include(x => x.StockDetailList)
- .ExecuteCommand();
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderDtailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderDtailRepository.cs"
deleted file mode 100644
index 867dd86..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderDtailRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_OutOrderDtailRepository : RepositoryBase<Dt_OutOrderDetail>, IDt_OutOrderDtailRepository
- {
- public Dt_OutOrderDtailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderProductionDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderProductionDetailRepository.cs"
deleted file mode 100644
index 3fd1d61..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderProductionDetailRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_OutOrderProductionDetailRepository : RepositoryBase<Dt_OutOrderProductionDetail>, IDt_OutOrderProductionDetailRepository
- {
- public Dt_OutOrderProductionDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderProductionRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderProductionRepository.cs"
deleted file mode 100644
index 0107975..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderProductionRepository.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_OutOrderProductionRepository : RepositoryBase<Dt_OutOrderProduction>, IDt_OutOrderProductionRepository
- {
- public Dt_OutOrderProductionRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="production">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- public int InsertOrderProduction(Dt_OutOrderProduction production)
- {
- return Db.Insertable(production).ExecuteReturnIdentity();
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderRepository.cs"
deleted file mode 100644
index 294add7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderRepository.cs"
+++ /dev/null
@@ -1,25 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_OutOrderRepository : RepositoryBase<Dt_OutOrder>, IDt_OutOrderRepository
- {
- public Dt_OutOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 淇敼鍑哄簱璁㈠崟锛堝鑸慨鏀癸級
- /// </summary>
- /// <param name="outOrder"></param>
- /// <returns>鏄惁鎴愬姛</returns>
- public async Task<bool> OutOrderUpdated(Dt_OutOrder outOrder)
- {
- return await Db.UpdateNav(outOrder)
- .Include(x => x.OrderDetailList)
- .ExecuteCommandAsync();
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderTransferDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderTransferDetailRepository.cs"
deleted file mode 100644
index 36f208e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderTransferDetailRepository.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Dt_OutOrderTransferDetailRepository : RepositoryBase<Dt_OutOrderTransferDetail>, IDt_OutOrderTransferDetailRepository
- {
- public Dt_OutOrderTransferDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderTransferRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderTransferRepository.cs"
deleted file mode 100644
index c1eb5cc..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/OutboundOrder/Dt_OutOrderTransferRepository.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WWIDESEA_Repository
-{
- public class Dt_OutOrderTransferRepository : RepositoryBase<Dt_OutOrderTransfer>, IDt_OutOrderTransferRepository
- {
- public Dt_OutOrderTransferRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_DictionaryRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_DictionaryRepository.cs"
deleted file mode 100644
index d60dbd6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_DictionaryRepository.cs"
+++ /dev/null
@@ -1,75 +0,0 @@
-锘縰sing Microsoft.AspNetCore.DataProtection.KeyManagement;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Sys_DictionaryRepository : RepositoryBase<Sys_Dictionary>, ISys_DictionaryRepository
- {
- public Sys_DictionaryRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="dicNos"></param>
- /// <param name="executeSql">鏄惁鎵ц鑷畾涔塻ql</param>
- /// <returns></returns>
- public IEnumerable<Sys_Dictionary> GetDictionaries(IEnumerable<string> dicNos, bool executeSql = true)
- {
- List<Sys_Dictionary> Dictionaries = GetAllDictionary();
-
- foreach (var item in Dictionaries.Where(x => dicNos.Contains(x.DicNo)))
- {
- if (executeSql)
- {
- // 2020.05.01澧炲姞鏍规嵁鐢ㄦ埛淇℃伅鍔犺浇瀛楀吀鏁版嵁婧恠ql
- string sql = item.DBSql;
- if (!string.IsNullOrEmpty(sql))
- {
- item.DicList = Query(sql);
- }
- }
- }
-
- return Dictionaries;
- }
-
- List<Sys_DictionaryList> Query(string sql)
- {
- try
- {
- return base.QueryDynamicDataBySql(sql, null).Select(s => new Sys_DictionaryList()
- {
- DicName = s.Value,
- DicValue = s.Key.ToString()
- }).ToList();
- }
- catch (Exception ex)
- {
- throw ex;
- }
- }
-
- private List<Sys_Dictionary> GetAllDictionary()
- {
- //base.QueryData().ToList();
- List<Sys_Dictionary> _dictionaries = Db.Queryable<Sys_Dictionary>().Includes(x => x.DicList).Where(x => x.Enable == 1).ToList();
- return _dictionaries;
- }
- }
-
- public class SourceKeyVaule
- {
- public object Key { get; set; }
- public string Value { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs"
deleted file mode 100644
index a51c6bb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs"
+++ /dev/null
@@ -1,206 +0,0 @@
-锘縰sing AutoMapper;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.System;
-using WIDESEA_IRepository;
-using WIDESEA_Model;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Sys_MenuRepository : RepositoryBase<Sys_Menu>, ISys_MenuRepository
- {
- private readonly IMapper _mapper;
- public Sys_MenuRepository(IUnitOfWorkManage unitOfWorkManage, IMapper mapper) : base(unitOfWorkManage)
- {
- _mapper = mapper;
- }
-
- public List<MenuDTO> GetAllMenu()
- {
- List<Sys_Menu> menus = base.QueryData(x => x.Enable == 1 || x.Enable == 2).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
-
- List<MenuDTO> _menus = _mapper.Map<List<MenuDTO>>(menus);
-
- _menus.ForEach(x =>
- {
- x.MenuType ??= 0;
- if (!string.IsNullOrEmpty(x.Auth) && x.Auth.Length > 10)
- {
- try
- {
- x.Actions = x.Auth.DeserializeObject<List<ActionDTO>>();
- }
- catch { }
- }
- x.Actions ??= new List<ActionDTO>();
- });
- string test = _menus.Serialize();
- return _menus;
- }
-
- public object GetSuperAdminMenu()
- {
- return GetAllMenu().Select(x =>
- new
- {
- id = x.MenuId,
- name = x.MenuName,
- url = x.Url,
- parentId = x.ParentId,
- icon = x.Icon,
- x.Enable,
- x.TableName, // 2022.03.26澧炵Щ鍔ㄧ鍔犺彍鍗曠被鍨�
- permission = x.Actions.Select(s => s.Value).ToArray()
- }).ToList();
- }
-
- public object GetMenuByRoleId(int roleId)
- {
- var menu = from a in GetPermissions(roleId)
- join b in GetAllMenu()
- on a.MenuId equals b.MenuId
- orderby b.OrderNo descending
- select new
- {
- id = a.MenuId,
- name = b.MenuName,
- url = b.Url,
- parentId = b.ParentId,
- icon = b.Icon,
- b.Enable,
- b.TableName,
- permission = a.UserAuthArr
- };
- return menu.ToList();
- }
-
- /// <summary>
- /// 鑾峰彇瑙掕壊鏉冮檺鏃堕�氳繃瀹夊叏瀛楀吀閿佸畾鐨勮鑹瞚d
- /// </summary>
- private static ConcurrentDictionary<string, object> objKeyValue = new ConcurrentDictionary<string, object>();
-
- public List<Permissions> GetPermissions(int roleId)
- {
- if (App.User.IsRoleIdSuperAdmin(roleId))
- {
- //2020.12.27澧炲姞鑿滃崟鐣岄潰涓婁笉鏄剧ず锛屼絾鍙互鍒嗛厤鏉冮檺
- var permissions = QueryData(x => x.Enable == 1 || x.Enable == 2)
- .Select(a => new Permissions
- {
- MenuId = a.MenuId,
- ParentId = a.ParentId,
- TableName = (a.TableName ?? "").ToLower(),
- UserAuth = a.Auth,
- MenuType = a.MenuType ?? 0
- }).ToList();
- return MenuActionToArray(permissions);
- }
-
- //閿佸畾姣忎釜瑙掕壊锛岄�氳繃瀹夊叏瀛楀吀鍑忓皯閿佺矑搴︼紝鍚﹀垯澶氫釜鍚屾椂瑙掕壊鑾峰彇缂撳瓨浼氬鑷撮樆濉�
- object objId = objKeyValue.GetOrAdd(roleId.ToString(), new object());
- //閿佸畾姣忎釜瑙掕壊
- lock (objId)
- {
- //娌℃湁redis/memory缂撳瓨瑙掕壊鐨勭増鏈彿鎴栦笌褰撳墠鏈嶅姟鍣ㄧ殑瑙掕壊鐗堟湰鍙蜂笉鍚屾椂锛屽埛鏂扮紦瀛�
-
- List<Permissions> _permissions = QueryTabs<Sys_Menu, Sys_RoleAuth, Permissions>((a, b) => new object[] { a.MenuId, b.MenuId }, (a, b) => new Permissions { MenuId = a.MenuId, ParentId = a.ParentId, TableName = (a.TableName ?? "").ToLower(), MenuAuth = a.Auth, UserAuth = b.AuthValue ?? "", MenuType = a.MenuType ?? 0 }, x => true);
-
- ActionToArray(_permissions);
-
- return _permissions;
- }
- }
-
- private List<Permissions> MenuActionToArray(List<Permissions> permissions)
- {
- permissions.ForEach(x =>
- {
- try
- {
- x.UserAuthArr = string.IsNullOrEmpty(x.UserAuth)
- ? new string[0]
- : x.UserAuth.DeserializeObject<List<ActionDTO>>().Select(s => s.Value).ToArray();
- }
- catch { }
- finally
- {
- if (x.UserAuthArr == null)
- {
- x.UserAuthArr = new string[0];
- }
- }
- });
- return permissions;
- }
-
- private List<Permissions> ActionToArray(List<Permissions> permissions)
- {
- permissions.ForEach(x =>
- {
- try
- {
- var menuAuthArr = x.MenuAuth.DeserializeObject<List<ActionDTO>>();
- x.UserAuthArr = string.IsNullOrEmpty(x.UserAuth)
- ? new string[0]
- : x.UserAuth.Split(",").Where(c => menuAuthArr.Any(m => m.Value == c)).ToArray();
-
- }
- catch { }
- finally
- {
- if (x.UserAuthArr == null)
- {
- x.UserAuthArr = new string[0];
- }
- }
- });
- return permissions;
- }
-
- public object GetMenu(List<int> menuIds)
- {
- return QueryData(x => menuIds.Contains(x.MenuId)).Select(a =>
- new
- {
- id = a.MenuId,
- parentId = a.ParentId,
- name = a.MenuName,
- a.MenuType,
- a.OrderNo
- }).OrderByDescending(a => a.OrderNo)
- .ThenByDescending(q => q.parentId).ToList();
- }
-
- public object GetTreeItem(int menuId)
- {
- var sysMenu = base.QueryData(x => x.MenuId == menuId)
- .Select(
- p => new
- {
- p.MenuId,
- p.ParentId,
- p.MenuName,
- p.Url,
- p.Auth,
- p.OrderNo,
- p.Icon,
- p.Enable,
- // 2022.03.26澧炵Щ鍔ㄧ鍔犺彍鍗曠被鍨�
- MenuType = p.MenuType ?? 0,
- p.CreateDate,
- p.Creater,
- p.TableName,
- p.ModifyDate
- }).FirstOrDefault();
- return sysMenu;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_RoleAuthRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_RoleAuthRepository.cs"
deleted file mode 100644
index e61495b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_RoleAuthRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- internal class Sys_RoleAuthRepository : RepositoryBase<Sys_RoleAuth>, ISys_RoleAuthRepository
- {
- public Sys_RoleAuthRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_RoleRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_RoleRepository.cs"
deleted file mode 100644
index 2b0da40..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_RoleRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Sys_RoleRepository : RepositoryBase<Sys_Role>, ISys_RoleRepository
- {
- public Sys_RoleRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_TenantRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_TenantRepository.cs"
deleted file mode 100644
index b213f56..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_TenantRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Sys_TenantRepository : RepositoryBase<Sys_Tenant>, ISys_TenantRepository
- {
- public Sys_TenantRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_TestRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_TestRepository.cs"
deleted file mode 100644
index f331eeb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_TestRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- internal class Sys_TestRepository : RepositoryBase<Sys_Test>, ISys_TestRepository
- {
- public Sys_TestRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_UserRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_UserRepository.cs"
deleted file mode 100644
index d601902..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_UserRepository.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.HttpContextUser;
-using WIDESEA_IRepository;
-using WIDESEA_Model;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Repository
-{
- public class Sys_UserRepository : RepositoryBase<Sys_User>, ISys_UserRepository
- {
- public Sys_UserRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
-
- }
-
- public UserInfo GetUserInfo(string userName, string password)
- {
- return QueryFirst(x => x.UserName == userName && x.UserPwd == password, x => new UserInfo { HeadImageUrl = x.HeadImageUrl, RoleId = x.Role_Id, SystemType = x.SystemType, TenantId = x.TenantId, UserId = x.User_Id, UserName = x.UserName, UserTrueName = x.UserTrueName });
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/WIDESEA_Repository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/WIDESEA_Repository.csproj"
deleted file mode 100644
index 3311fdb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/WIDESEA_Repository.csproj"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘�<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="AutoMapper" Version="13.0.1" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IRepository\WIDESEA_IRepository.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Debug/net6.0/WIDESEA_Repository.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Debug/net6.0/WIDESEA_Repository.assets.cache"
deleted file mode 100644
index ce93173..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Debug/net6.0/WIDESEA_Repository.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.dgspec.json"
deleted file mode 100644
index 548c93a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,369 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "projectName": "WIDESEA_DTO",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "projectName": "WIDESEA_IRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "projectName": "WIDESEA_Repository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/WIDESEA_Repository.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/project.assets.json"
deleted file mode 100644
index 4a429ac..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/project.assets.json"
+++ /dev/null
@@ -1,165 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- }
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_DTO": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- }
- }
- },
- "libraries": {
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_DTO/WIDESEA_DTO.csproj",
- "msbuildProject": "../WIDESEA_DTO/WIDESEA_DTO.csproj"
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj",
- "msbuildProject": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_IRepository >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "projectName": "WIDESEA_Repository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/project.nuget.cache"
deleted file mode 100644
index f9ff7c8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "woeDGMFG2FqLa4xr1yBqBAiTtQAz14Z9i+yMypzWiEl/aiVVlMb3OKU5qwKteQHcOgOverRZ2dPdzS73qGr/GA==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_BillGroupStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_BillGroupStockService.cs"
deleted file mode 100644
index 81b7d2a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_BillGroupStockService.cs"
+++ /dev/null
@@ -1,549 +0,0 @@
-锘縰sing AutoMapper;
-using System.Threading.Tasks;
-using WIDESEA_Common;
-using WIDESEA_Common.Location;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_BillGroupStockService : ServiceBase<Dt_BillGroupStock, IDt_BillGroupStockRepository>, IDt_BillGroupStockService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderService _outOrderService;
- private readonly IDt_TaskService _taskService;
- private readonly IDt_OutOrderAndStockRepository _OutOrderAndStockRepository;
- private readonly IDt_OutOrderAndStock_HtyService _OutOrderAndStock_HtyService;
- private readonly IDt_Task_HtyService _Task_HtyService;
- private readonly IMapper _mapper;
-
- public Dt_BillGroupStockService(IDt_BillGroupStockRepository baseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService,
- IDt_TaskService taskService,
- IDt_OutOrderAndStockRepository outOrderAndStockRepository,
- IMapper mapper,
- IDt_OutOrderAndStock_HtyService outOrderAndStock_HtyService,
- IDt_Task_HtyService task_HtyService) : base(baseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderService = outOrderService;
- _taskService = taskService;
- _OutOrderAndStockRepository = outOrderAndStockRepository;
- _mapper = mapper;
- _OutOrderAndStock_HtyService = outOrderAndStock_HtyService;
- _Task_HtyService = task_HtyService;
- }
-
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇搴撳瓨
- /// </summary>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="materialNo">鐗╂枡缂栧彿</param>
- /// <returns>鐗瑰畾搴撳瓨</returns>
- public async Task<Dt_BillGroupStock> GetStocks(string palletCode = null, string locationID = null, string materialNo = null)
- {
- return await Db.Queryable<Dt_BillGroupStock>()
- .WhereIF(palletCode != null, x => x.PalletCode == palletCode)
- .WhereIF(locationID != null, x => x.LocationCode == locationID)
- .WhereIF(materialNo != null, x => x.MaterialNo == materialNo)
- .Includes(x => x.LocationInfo)
- .Includes(x => x.StockDetailList)
- .FirstAsync();
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈夊彲鍑哄簱搴撳瓨锛屼笉鍖呮嫭宸茬粡鍑哄簱鐨勬垨宸茬粡鍒嗛厤鐨勩��
- /// </summary>
- /// <returns>鍑哄簱搴撳瓨鍒楄〃</returns>
- public async Task<WebResponseContent> GetOutboundStock()
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- #region 鍓嶆湡娌℃暟鎹复鏃跺紑鍙戜娇鐢紝鍚庢湡鏇存崲鏍规嵁璁㈠崟杩涜绛涢�夊簱瀛�
-
- // 鑾峰彇鎵�鏈夊彲鍑哄簱搴撳瓨
- var stocks = BaseDal.GetOutboundStockList();
-
- // 鑾峰彇璁㈠崟
- var order = GetOrder("2");
-
- // 妫�鏌ヨ鍗曟槸鍚﹁幏鍙栨垚鍔�
- if (order == null)
- {
- return content.Error("鑾峰彇璁㈠崟澶辫触");
- }
- // 鑾峰彇璁㈠崟涓殑绗竴涓墿鏂欏彿
- var materialNo = order.OrderDetailList.MaterialId;
-
- // 绛涢�夊苟鎺掑簭搴撳瓨
- var filteredStocks = stocks.Where(x => x.MaterialNo == materialNo.ToString())
- .OrderBy(x => x.CreateDate)
- .ToList();
-
- #endregion 鍓嶆湡娌℃暟鎹复鏃跺紑鍙戜娇鐢紝鍚庢湡鏇存崲鏍规嵁璁㈠崟杩涜绛涢�夊簱瀛�
-
- // 鍒涘缓浠诲姟鍒楄〃
- var (tasks, updateOrder) = CreateTasks(order, filteredStocks);
-
- // 鏇存柊搴撳瓨鐘舵��
- var stockList = UpdateStocks(filteredStocks, updateOrder);
-
- // 鍒涘缓璁㈠崟搴撳瓨鍒楄〃
- var orderStocks = CreateOrderStock(filteredStocks, updateOrder, tasks);
-
- // 寮�濮嬩簨鍔�
- _unitOfWorkManage.BeginTran();
-
- // 鏇存柊搴撳瓨
- var isStockUpdated = BaseDal.UpdateNavStock(stockList);
-
- // 鏇存柊璁㈠崟
- var isOrderUpdated = await _outOrderService.OutOrderUpdated(updateOrder);
-
- //娣诲姞璁㈠崟搴撳瓨
- var isOrderStockCread = _OutOrderAndStockRepository.AddData(orderStocks) > 0;
-
- // 鍒涘缓浠诲姟
- var isTaskCreated = await _taskService.Create(tasks);
-
- // 鎻愪氦鎴栧洖婊氫簨鍔�
- if (isStockUpdated && isTaskCreated && isOrderUpdated && isOrderStockCread)
- {
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- }
-
- return content.OK(data: stocks);
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鍫嗗灈鏈轰换鍔″畬鎴�
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> CompleteStackTaskAsync(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- // 鎻愬彇骞堕獙璇佷富鏁版嵁
- var barCode = saveModel.MainData.GetValueOrDefault("barCode")?.ToString();
- var taskNum = saveModel.MainData.GetValueOrDefault("taskNum")?.ObjToInt() ?? 0;
- var target = saveModel.MainData.GetValueOrDefault("target")?.ToString();
-
- // 鑾峰彇浠诲姟鍜屽簱瀛樹俊鎭�
- var task = await _taskService.GetByTaskNum(taskNum);
- if (task == null)
- {
- return content.Error("浠诲姟涓嶅瓨鍦�");
- }
-
- var stock = await GetStocks(palletCode: barCode);
- if (stock == null)
- {
- return content.Error("搴撳瓨涓嶅瓨鍦�");
- }
-
- // 鏇存柊搴撳瓨鐘舵��
- stock.LocationCode = null;
- stock.LocationInfo.Status = LocationStateConst.LocationState_Empty;
-
- // 鏇存柊浠诲姟鐘舵��
- task.TaskState = TaskStateConst.StackerCompleted.ToString();
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = target;
- task.TargetAddress = target;
-
- // 浜嬪姟澶勭悊
- _unitOfWorkManage.BeginTran();
- var isStockUpdated = BaseDal.UpdateNavStock(stock);
- var isTaskUpdated = await _taskService.Update(task);
-
- if (isStockUpdated && isTaskUpdated)
- {
- _unitOfWorkManage.CommitTran();
- return content.OK("浠诲姟瀹屾垚鎴愬姛");
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("浠诲姟鎴栧簱瀛樻洿鏂板け璐�");
- }
- }
- catch (Exception err)
- {
- Console.WriteLine(err.Message);
- return content.Error(err.Message);
- }
- }
-
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> CompleteTaskAsync(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
-
- try
- {
- // 鎻愬彇浠诲姟鏁版嵁
- var barCode = saveModel.MainData.GetValueOrDefault("barCode")?.ToString();
- var taskNum = saveModel.MainData.GetValueOrDefault("taskNum")?.ObjToInt() ?? 0;
-
- // 楠岃瘉浠诲姟鏄惁瀛樺湪
- var task = await _taskService.GetByTaskNum(taskNum);
- if (task == null)
- {
- return content.Error("浠诲姟涓嶅瓨鍦�");
- }
-
- // 楠岃瘉搴撳瓨鏄惁瀛樺湪
- var stock = await GetStocks(palletCode: barCode);
- if (stock == null)
- {
- return content.Error("搴撳瓨涓嶅瓨鍦�");
- }
-
- // 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樹俊鎭�
- var orderStock = await UpdateOrderAndStockAsync(stock, barCode);
-
- // 妫�鏌ヨ鍗曟槸鍚﹀畬鎴愬苟澶勭悊鍚庣画鎿嶄綔
- if (IsOrderComplete(orderStock))
- {
- // 澶勭悊宸插畬鎴愯鍗�
- await ProcessCompletedOrderAsync(orderStock, task);
- }
- else
- {
- // 澶勭悊鏈畬鎴愯鍗�
- await ProcessUpdateOrderAsync(orderStock, task);
- }
-
- content.OK("浠诲姟瀹屾垚");
- }
- catch (Exception err)
- {
- // 璁板綍寮傚父淇℃伅
- Console.WriteLine(err.Message.ToString());
- content.Error("浠诲姟瀹屾垚澶辫触");
- }
-
- return content;
- }
-
- #region 鍐呴儴鏂规硶
-
- /// <summary>
- /// 鏍规嵁璁㈠崟鍙疯幏鍙栬鍗�
- /// </summary>
- /// <param name="orderNumber">璁㈠崟鍙�</param>
- /// <returns>璁㈠崟瀵硅薄</returns>
- private Dt_OutOrder GetOrder(string orderNumber)
- {
- // 鑾峰彇璁㈠崟淇℃伅
- var content = _outOrderService.GetOutOrderByNumber(orderNumber);
-
- // 妫�鏌ヨ鍗曟槸鍚﹁幏鍙栨垚鍔�
- if (!content.Status)
- {
- return null;
- }
-
- // 鍙嶅簭鍒楀寲璁㈠崟瀵硅薄
- return (Dt_OutOrder)content.Data;
- }
-
- /// <summary>
- /// 鍒涘缓浠诲姟鍒楄〃
- /// </summary>
- /// <param name="order">璁㈠崟瀵硅薄</param>
- /// <param name="filteredStocks">绛涢�夊悗鐨勫簱瀛樺垪琛�</param>
- /// <returns>浠诲姟鍒楄〃</returns>
- private (List<Dt_Task>, Dt_OutOrder orderDetail) CreateTasks(Dt_OutOrder order, List<Dt_BillGroupStock> filteredStocks)
- {
- var tasks = new List<Dt_Task>();
-
- foreach (var stock in filteredStocks)
- {
- // 濡傛灉宸插垎閰嶆暟閲忚揪鍒板嚭搴撴暟閲忥紝鍋滄鍒嗛厤
- if (order.OrderDetailList.AllocatedQuantity >= order.OrderDetailList.OutboundQuantity)
- break;
-
- // 濡傛灉鎵樼洏浠诲姟宸插瓨鍦紝璺宠繃
- if (_taskService.IsExist(stock.PalletCode))
- continue;
-
- // 鍒涘缓浠诲姟
- tasks.Add(new Dt_Task
- {
- CreateDate = DateTime.Now, // 鍒涘缓鏃堕棿
- Creater = "System", // 鍒涘缓浜�
- CurrentAddress = stock.LocationCode, //褰撳墠浣嶇疆
- Dispatchertime = DateTime.Now, //璋冨害鏃堕棿锛堜换鍔′笅鍙戞椂闂达級
- Grade = 1, // 绛夌骇
- InboundNo = stock.InboundNo, //鍗曟嵁缂栧彿
- MaterialNo = stock.MaterialNo, // 鐗╂枡鍙�
- NextAddress = stock.LocationCode, // 涓嬩竴浣嶇疆
- PalletCode = stock.PalletCode, //鎵樼洏鍙�
- Remark = stock.Remark, //澶囨敞
- Roadway = stock.Remark, //宸烽亾
- SourceAddress = stock.LocationCode, //鏉ユ簮浣嶇疆
- TargetAddress = order.OrderDetailList.Remarks, //鐩爣鍦板潃
- TaskNum = 1001, //浠诲姟鍙�
- TaskState = TaskStateConst.PendingDispatch.ToString(), //浠诲姟鐘舵��
- TaskType = TaskTypeConst.WholeOutbound.ToString(), //浠诲姟绫诲瀷
- });
-
- // 鏇存柊宸插垎閰嶆暟閲�
- order.OrderDetailList.AllocatedQuantity++;
- }
-
- return (tasks, order);
- }
-
- /// <summary>
- /// 鏇存柊搴撳瓨鐘舵��
- /// </summary>
- /// <param name="filteredStocks">绛涢�夊悗鐨勫簱瀛樺垪琛�</param>
- /// <param name="order">璁㈠崟瀵硅薄</param>
- /// <returns>鏇存柊鍚庣殑搴撳瓨鍒楄〃</returns>
- private List<Dt_BillGroupStock> UpdateStocks(List<Dt_BillGroupStock> filteredStocks, Dt_OutOrder order)
- {
- var updatedStocks = new List<Dt_BillGroupStock>();
- var orderDetail = order.OrderDetailList;
- int index = 0;
-
- foreach (var stock in filteredStocks)
- {
- // 濡傛灉宸插垎閰嶆暟閲忚揪鍒板嚭搴撴暟閲忥紝鍋滄鍒嗛厤
- if (index >= orderDetail.OutboundQuantity)
- {
- break;
- }
-
- // 鏇存柊搴撳瓨鐘舵��
- stock.LocationInfo.IsLocked = true;
- stock.LocationInfo.Status = 0;
- stock.State = "3";
- updatedStocks.Add(stock);
- }
-
- return updatedStocks;
- }
-
- /// <summary>
- /// 鍒涘缓璁㈠崟搴撳瓨鍒楄〃
- /// </summary>
- /// <param name="stock">绛涢�夊悗鐨勫簱瀛樺垪琛�</param>
- /// <param name="order">璁㈠崟瀵硅薄</param>
- /// <param name="task">浠诲姟鍒楄〃</param>
- /// <returns>璁㈠崟搴撳瓨鍒楄〃</returns>
- private List<Dt_OutOrderAndStock> CreateOrderStock(List<Dt_BillGroupStock> stock, Dt_OutOrder order, List<Dt_Task> task)
- {
- var orderStocks = new List<Dt_OutOrderAndStock>();
- for (int i = 0; i < task.Count; i++)
- {
- orderStocks.Add(new Dt_OutOrderAndStock()
- {
- AllocatedQuantity = order.OrderDetailList.AllocatedQuantity,
- MaterialNo = stock[i].MaterialNo,
- MaterialName = order.OrderDetailList.MaterialName,
- OrderNumber = order.OrderNumber,
- OutboundQuantity = order.OrderDetailList.OutboundQuantity,
- PalletCode = stock[i].PalletCode,
- PalletQuantity = stock[i].StockDetailList.PalletQuantity,
- State = stock[i].State,
- BatchNumber = order.OrderDetailList.BatchNumber,
- CompletedQuantity = order.OrderDetailList.CompletedQuantity,
- Creater = "System",
- CreateDate = DateTime.Now,
- GroupId = stock[i].GroupId,
- GroupDetailId = stock[i].StockDetailList.GroupDetailId,
- LocationCode = stock[i].LocationInfo.LocationID,
- OutOrderDetailId = order.OrderDetailList.Id,
- OutOrderId = order.Id,
- });
- }
- return orderStocks;
- }
-
- /// <summary>
- /// 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樹俊鎭�
- /// </summary>
- /// <param name="stock">搴撳瓨瀹炰緥</param>
- /// <param name="barCode">鏉＄爜</param>
- /// <returns>鏇存柊鍚庣殑璁㈠崟鍜屽簱瀛樹俊鎭�</returns>
- private async Task<Dt_OutOrderAndStock> UpdateOrderAndStockAsync(Dt_BillGroupStock stock, string barCode)
- {
- var orderStock = await _OutOrderAndStockRepository.GetOrderAndStock(palletCode: barCode);
-
- orderStock.CompletedQuantity += stock.StockDetailList.PalletQuantity.Value;
- orderStock.OrderDetailList.CompletedQuantity += stock.StockDetailList.PalletQuantity.Value;
-
- return orderStock;
- }
-
- /// <summary>
- /// 鍒ゆ柇璁㈠崟鏄惁瀹屾垚
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <returns>鏄惁瀹屾垚</returns>
- private bool IsOrderComplete(Dt_OutOrderAndStock orderStock)
- {
- return orderStock.CompletedQuantity == orderStock.OutboundQuantity;
- }
-
- /// <summary>
- /// 澶勭悊宸插畬鎴愮殑璁㈠崟
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <param name="task">浠诲姟鏁版嵁</param>
- /// <returns>寮傛浠诲姟</returns>
- private async Task ProcessCompletedOrderAsync(Dt_OutOrderAndStock orderStock, Dt_Task task)
- {
- // 鍒涘缓鍘嗗彶璁㈠崟璁板綍
- var stockHty = CreateHistoricalOrder(orderStock);
-
- // 鍒涘缓鑾峰彇鍘嗗彶浠诲姟
- var taskHty = CreateHistoricalTask(task);
-
- _unitOfWorkManage.BeginTran();
-
- try
- {
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = _Task_HtyService.InsertTask(taskHty);
-
- // 鍒犻櫎浠诲姟鏁版嵁
- var isTaskDelete = await _taskService.Delete(task.TaskId);
-
- // 鎻掑叆鍘嗗彶璁㈠崟
- var isStockInsert = _OutOrderAndStock_HtyService.InsertNav(stockHty);
-
- // 鍒犻櫎鍘熻鍗�
- var isOrderStockDelete = _OutOrderAndStockRepository.DeleteNavOrderStock(orderStock);
-
- if (isStockInsert && isOrderStockDelete && isTaskHtyAdd && isTaskDelete)
- {
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- }
- }
- catch
- {
- _unitOfWorkManage.RollbackTran();
- throw; // 閲嶆柊鎶涘嚭寮傚父浠ヤ緵澶栭儴鎹曡幏
- }
- }
-
- /// <summary>
- /// 澶勭悊鏈畬鎴愯鍗�
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <param name="task">浠诲姟鏁版嵁</param>
- /// <returns>寮傛浠诲姟</returns>
- private async Task ProcessUpdateOrderAsync(Dt_OutOrderAndStock orderStock, Dt_Task task)
- {
- // 鍒涘缓鑾峰彇鍘嗗彶浠诲姟
- var taskHty = CreateHistoricalTask(task);
-
- _unitOfWorkManage.BeginTran();
- try
- {
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = _Task_HtyService.InsertTask(taskHty);
-
- // 鍒犻櫎浠诲姟鏁版嵁
- var isTaskDelete = await _taskService.Delete(task.TaskId);
-
- // 鏇存柊璁㈠崟涓庡簱瀛�
- var isOrderUpdated = _OutOrderAndStockRepository.UpdateNavOrderStock(orderStock);
- if (isTaskDelete && isTaskHtyAdd && isOrderUpdated)
- {
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- }
- }
- catch (Exception err)
- {
- Console.WriteLine(err.Message.ToString());
- _unitOfWorkManage.RollbackTran();
- throw; // 閲嶆柊鎶涘嚭寮傚父浠ヤ緵澶栭儴鎹曡幏
- }
- }
-
- /// <summary>
- /// 鍒涘缓鍘嗗彶璁㈠崟璁板綍
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <returns>鍘嗗彶璁㈠崟璁板綍</returns>
- private Dt_OutOrderAndStock_Hty CreateHistoricalOrder(Dt_OutOrderAndStock orderStock)
- {
- var stockHty = _mapper.Map<Dt_OutOrderAndStock_Hty>(orderStock);
-
- stockHty.StockDetailList.FinishTime = DateTime.Now;
- stockHty.StockDetailList.OperateType = "Finish";
- stockHty.StockDetailList.SourceId = orderStock.StockDetailList.GroupDetailId;
- stockHty.StockDetailList.GroupDetailId = 0;
-
- stockHty.StockList.FinishTime = DateTime.Now;
- stockHty.StockList.OperateType = "Finish";
- stockHty.StockList.SourceId = orderStock.StockList.GroupId;
- stockHty.StockList.GroupId = 0;
-
- stockHty.OrderDetailList.FinishTime = DateTime.Now;
- stockHty.OrderDetailList.OperateType = "Finish";
- stockHty.OrderDetailList.SourceId = orderStock.OrderDetailList.Id;
- stockHty.OrderDetailList.Id = 0;
-
- stockHty.OrderList.FinishTime = DateTime.Now;
- stockHty.OrderList.OperateType = "Finish";
- stockHty.OrderList.SourceId = orderStock.OrderList.Id;
- stockHty.OrderList.Id = 0;
-
- return stockHty;
- }
-
- private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
- {
- // 鏇存柊浠诲姟鐘舵��
- task.TaskState = TaskStateConst.TaskCompleted.ToString();
- task.CurrentAddress = task.NextAddress;
-
- // 鍒涘缓鍘嗗彶浠诲姟
- var taskHty = _mapper.Map<Dt_Task_Hty>(task);
- taskHty.FinishTime = DateTime.Now;
- taskHty.OperateType = "Finish";
- taskHty.SourceId = task.TaskId;
- taskHty.TaskState = TaskStateConst.TaskCompleted.ToString();
- return taskHty;
- }
-
- #endregion 鍐呴儴鏂规硶
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_LocationService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_LocationService.cs"
deleted file mode 100644
index 681a89e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_LocationService.cs"
+++ /dev/null
@@ -1,172 +0,0 @@
-锘縰sing WIDESEA_Common;
-using WIDESEA_Common.Location;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_LocationService : ServiceBase<Dt_LocationInfo, IDt_LocationRepository>, IDt_LocationService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderService _outOrderService;
- private readonly IDt_TaskService _taskService;
- private readonly IDt_BillGroupStockService _BillGroupStockService;
-
- public Dt_LocationService(IDt_LocationRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService,
- IDt_TaskService taskService,
- IDt_BillGroupStockService billGroupStockService) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderService = outOrderService;
- _taskService = taskService;
- _BillGroupStockService = billGroupStockService;
- }
-
- /// <summary>
- /// 妫�鏌ュ苟鐢熸垚绉诲簱浠诲姟鎴栬繑鍥炲嚭搴撲换鍔�
- /// </summary>
- /// <param name="locationID">搴撲綅ID</param>
- /// <returns>浠诲姟瀵硅薄</returns>
- public async Task<Dt_Task> TransferCheck(string locationID)
- {
- try
- {
- // 鑾峰彇鎸囧畾搴撲綅鐨勪换鍔�
- var outboundTask = await _taskService.GetByLocation(locationID);
- if (outboundTask == null)
- return null;
-
- // 妫�鏌ユ槸鍚﹂渶瑕佽繘琛岀Щ搴�
- if (CheckForInternalTransfer(locationID))
- {
- // 璁＄畻瀵瑰簲浣嶇疆鐨勭浉瀵瑰簱浣� 锛堝鏁拌鐨勪笅涓�琛屾垨鑰呭伓鏁拌鐨勪笂涓�琛岋級
- var newLocationID = GetRelativeLocationID(locationID);
-
- // 鑾峰彇鏂扮殑搴撲綅鐨勪换鍔�
- var internalTransferTask = await _taskService.GetByLocation(newLocationID);
-
- // 濡傛灉鏂扮殑搴撲綅娌℃湁鎵惧埌瀵瑰簲鐨勪换鍔�
- if (internalTransferTask == null)
- {
- return await HandleNoTaskAtLocation(locationID, newLocationID, outboundTask);
- }
-
- // 鐩存帴杩斿洖涓�娣变綅鍑哄簱浠诲姟
- return internalTransferTask;
- }
-
- // 杩斿洖褰撳墠搴撲綅鐨勫嚭搴撲换鍔�
- return outboundTask;
- }
- catch (Exception)
- {
- return null;
- }
- }
-
- #region 鍐呴儴鏂规硶
-
- /// <summary>
- /// 璁＄畻鐩稿鐨勫簱浣岻D
- /// </summary>
- /// <param name="locationID">褰撳墠搴撲綅ID</param>
- /// <returns>鐩稿鐨勫簱浣岻D</returns>
- private string GetRelativeLocationID(string locationID)
- {
- string[] parts = locationID.Split('-');
- int line = int.Parse(parts[0]);
-
- // 璁＄畻鐩稿鐨勮揣浣嶈鍊硷紝濂囨暟琛岀殑涓嬩竴琛屾垨鑰呭伓鏁拌鐨勪笂涓�琛�
- int relativeLine = line % 2 == 1 ? line + 1 : line - 1;
-
- // 鏋勫缓鏂扮殑搴撲綅ID
- string[] newLocationParts = new string[] { relativeLine.ToString().PadLeft(3, '0'), parts[1], parts[2] };
- return string.Join("-", newLocationParts);
- }
-
- /// <summary>
- /// 澶勭悊娌℃湁浠诲姟鐨勫簱浣嶆儏鍐�
- /// </summary>
- /// <param name="originalLocationID">鍘熷搴撲綅ID</param>
- /// <param name="newLocationID">鏂扮殑搴撲綅ID</param>
- /// <param name="outboundTask">鍑哄簱浠诲姟</param>
- /// <returns>鐢熸垚鐨勭Щ搴撲换鍔℃垨鍘熷鍑哄簱浠诲姟</returns>
- private async Task<Dt_Task> HandleNoTaskAtLocation(string originalLocationID, string newLocationID, Dt_Task outboundTask)
- {
- // 鍒ゆ柇璇ヤ綅缃槸鍚︽湁搴撳瓨
- var stockInfo = await _BillGroupStockService.GetStocks(locationID: newLocationID);
-
- if (stockInfo == null)
- {
- // 濡傛灉娌℃湁搴撳瓨锛岀洿鎺ヨ繑鍥炲綋鍓嶅嚭搴撲换鍔�
- return outboundTask;
- }
- else
- {
- // 濡傛灉鏈夊簱瀛橈紝鐢熸垚绉诲簱浠诲姟
- var emptyLocation = GetTransferLocationEmpty(outboundTask.Roadway);
-
- Dt_Task newTransferTask = new Dt_Task()
- {
- CreateDate = DateTime.Now,
- Creater = "System",
- CurrentAddress = originalLocationID,
- Grade = 99,
- MaterialNo = stockInfo.MaterialNo,
- NextAddress = emptyLocation.LocationID,
- PalletCode = stockInfo.PalletCode,
- Remark = "绉诲簱",
- Roadway = stockInfo.LocationInfo.Roadway,
- SourceAddress = originalLocationID,
- TaskNum = 0,
- TargetAddress = emptyLocation.LocationID,
- TaskState = TaskStateConst.PendingDispatch.ToString(),
- TaskType = TaskTypeConst.InternalTransfer.ToString(),
- };
-
- return await _taskService.Create(newTransferTask);
- }
- }
-
- /// <summary>
- /// 妫�鏌ヤ竴娣变綅鏄惁闇�瑕佺Щ搴�
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <returns>鏄惁闇�瑕佺Щ搴�</returns>
- private bool CheckForInternalTransfer(string locationID)
- {
- // 鏍规嵁 "-" 鎴彇瀛楃涓插苟鑾峰彇绗竴浣嶆暟瀛�
- string[] parts = locationID.Split('-');
- if (parts.Length > 0 && int.TryParse(parts[0], out int row))
- {
- // 鑾峰彇浜屾繁浣嶇殑琛屽彿鍒楄〃锛岃〃绀洪渶瑕佺Щ搴�
- List<int> transfertRows = AppSettings.app("TransfertRows").Split(',').ToList().ConvertAll(x => int.Parse(x));
- // 鍒ゆ柇琛屽彿鏄惁鍦ㄧ洰鏍囪鍙峰垪琛ㄤ腑
- return transfertRows.Contains(row);
- }
- return false;
- }
-
- /// <summary>
- /// 鑾峰彇浜屾繁浣嶇殑绌哄簱浣�
- /// </summary>
- /// <param name="roadway">宸烽亾</param>
- /// <returns>璐т綅瀵硅薄</returns>
- private Dt_LocationInfo GetTransferLocationEmpty(string roadway)
- {
- return Db.Queryable<Dt_LocationInfo>()
- .Where(x => x.Status == LocationStateConst.LocationState_Empty)
- .Where(x => x.Depth == 2.ToString())
- .Where(x => x.Roadway == roadway)
- .First();
- }
-
- #endregion 鍐呴儴鏂规硶
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_TaskService.cs"
deleted file mode 100644
index ba9fb07..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_TaskService.cs"
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderService _outOrderService;
-
- public Dt_TaskService(IDt_TaskRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderService = outOrderService;
- }
-
- /// <summary>
- /// 鍒涘缓涓�涓柊鐨勪换鍔�
- /// </summary>
- /// <param name="model">浠诲姟妯″瀷</param>
- /// <returns>鍒涘缓鐨勪换鍔�</returns>
- public async Task<Dt_Task> Create(Dt_Task model)
- {
- return await BaseDal.Create(model);
- }
-
- /// <summary>
- /// 鎵归噺鍒涘缓浠诲姟
- /// </summary>
- /// <param name="models">浠诲姟妯″瀷鍒楄〃</param>
- /// <returns>鏄惁鍒涘缓鎴愬姛</returns>
- public async Task<bool> Create(List<Dt_Task> models)
- {
- return await BaseDal.Create(models);
- }
-
- /// <summary>
- /// 鍒犻櫎涓�涓换鍔�
- /// </summary>
- /// <param name="id">浠诲姟ID</param>
- /// <returns>鏄惁鍒犻櫎鎴愬姛</returns>
- public async Task<bool> Delete(int id)
- {
- return await BaseDal.Delete(id);
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎浠诲姟
- /// </summary>
- /// <param name="ids">浠诲姟ID鍒楄〃</param>
- /// <returns>鏄惁鍒犻櫎鎴愬姛</returns>
- public async Task<bool> Delete(List<int> ids)
- {
- return await BaseDal.Delete(ids);
- }
-
- /// <summary>
- /// 閫氳繃ID鑾峰彇浠诲姟
- /// </summary>
- /// <param name="id">浠诲姟ID</param>
- /// <returns>浠诲姟妯″瀷</returns>
- public async Task<Dt_Task> GetById(int id)
- {
- return await BaseDal.GetById(id);
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈変换鍔″垪琛�
- /// </summary>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- public async Task<List<Dt_Task>> GetList()
- {
- return await BaseDal.GetList();
- }
-
- /// <summary>
- /// 鏍规嵁鍑哄簱璁㈠崟ID鑾峰彇浠诲姟鍒楄〃
- /// </summary>
- /// <param name="outOrderId">鍑哄簱璁㈠崟ID</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- public async Task<List<Dt_Task>> GetListByOutOrder(int outOrderId)
- {
- return await BaseDal.GetListByOutOrder(outOrderId);
- }
-
- /// <summary>
- /// 鏍规嵁鍑哄簱璁㈠崟ID鍜岀姸鎬佽幏鍙栦换鍔″垪琛�
- /// </summary>
- /// <param name="outOrderId">鍑哄簱璁㈠崟ID</param>
- /// <param name="status">浠诲姟鐘舵��</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- public async Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status)
- {
- return await BaseDal.GetListByOutOrderAndStatus(outOrderId, status);
- }
-
- /// <summary>
- /// 鏍规嵁鐘舵�佽幏鍙栦换鍔″垪琛�
- /// </summary>
- /// <param name="status">浠诲姟鐘舵��</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- public async Task<List<Dt_Task>> GetListByStatus(int status)
- {
- return await BaseDal.GetListByStatus(status);
- }
-
- /// <summary>
- /// 鏇存柊涓�涓换鍔�
- /// </summary>
- /// <param name="model">浠诲姟妯″瀷</param>
- /// <returns>鏄惁鏇存柊鎴愬姛</returns>
- public async Task<bool> Update(Dt_Task model)
- {
- return await BaseDal.Update(model);
- }
-
- /// <summary>
- /// 鎵归噺鏇存柊浠诲姟
- /// </summary>
- /// <param name="models">浠诲姟妯″瀷鍒楄〃</param>
- /// <returns>鏄惁鏇存柊鎴愬姛</returns>
- public async Task<bool> Update(List<Dt_Task> models)
- {
- return await BaseDal.Update(models);
- }
-
- /// <summary>
- /// 妫�鏌ヤ换鍔℃槸鍚﹀瓨鍦�
- /// </summary>
- /// <param name="palletCode">鎵樼洏缂栫爜</param>
- /// <returns>浠诲姟鏄惁瀛樺湪</returns>
- public bool IsExist(string palletCode)
- {
- return Db.Queryable<Dt_Task>().Any(x => x.PalletCode == palletCode);
- }
-
- /// <summary>
- /// 鏍规嵁璐т綅ID鑾峰彇浠诲姟
- /// </summary>
- /// <param name="locationID"></param>
- /// <returns></returns>
- public async Task<Dt_Task> GetByLocation(string locationID)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.SourceAddress == locationID).FirstAsync();
- }
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔�
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- public async Task<Dt_Task> GetByTaskNum(int taskNum)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.TaskNum == taskNum).FirstAsync();
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_Task_HtyService.cs"
deleted file mode 100644
index 80b231e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Basic/Dt_Task_HtyService.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_Task_HtyService : ServiceBase<Dt_Task_Hty, IDt_Task_HtyRepository>, IDt_Task_HtyService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderService _outOrderService;
-
- public Dt_Task_HtyService(IDt_Task_HtyRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderService = outOrderService;
- }
-
- public bool InsertTask(Dt_Task_Hty task)
- {
- return BaseDal.InsertTask(task);
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderAndStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderAndStockService.cs"
deleted file mode 100644
index f934c65..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderAndStockService.cs"
+++ /dev/null
@@ -1,51 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_OutOrderAndStockService : ServiceBase<Dt_OutOrderAndStock, IDt_OutOrderAndStockRepository>, IDt_OutOrderAndStockService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderAndStockService(IDt_OutOrderAndStockRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇鍑哄簱鐗╂枡淇℃伅
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="orderNum">鍑哄簱璁㈠崟</param>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <returns>鍑哄簱鐗╂枡淇℃伅</returns>
- public async Task<Dt_OutOrderAndStock> GetOrderAndStock(string locationID = null, string orderNum = null, string palletCode = null)
- {
- return await BaseDal.GetOrderAndStock(locationID, orderNum, palletCode);
- }
-
- /// <summary>
- /// 瀵艰埅鍒犻櫎
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool DeleteNavOrderStock(Dt_OutOrderAndStock stock)
- {
- return BaseDal.DeleteNavOrderStock(stock);
- }
-
- /// <summary>
- /// 瀵艰埅鏇存柊
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool UpdateNavOrderStock(Dt_OutOrderAndStock stock)
- {
- return BaseDal.UpdateNavOrderStock(stock);
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderAndStock_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderAndStock_HtyService.cs"
deleted file mode 100644
index 3bf36b5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderAndStock_HtyService.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_OutOrderAndStock_HtyService : ServiceBase<Dt_OutOrderAndStock_Hty, IDt_OutOrderAndStock_HtyRepository>, IDt_OutOrderAndStock_HtyService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderAndStock_HtyService(IDt_OutOrderAndStock_HtyRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 瀵艰埅娣诲姞锛堟坊鍔犲簱瀛樹富浠庡巻鍙诧紝璁㈠崟涓讳粠鍘嗗彶锛�
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅鍘嗗彶</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool InsertNav(Dt_OutOrderAndStock_Hty stock)
- {
- return BaseDal.InsertNav(stock);
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderDtailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderDtailService.cs"
deleted file mode 100644
index 6e92044..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderDtailService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_OutOrderDtailService : ServiceBase<Dt_OutOrderDetail, IDt_OutOrderDtailRepository>, IDt_OutOrderDtailService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderDtailService(IDt_OutOrderDtailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderProductionDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderProductionDetailService.cs"
deleted file mode 100644
index 48f5ea4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderProductionDetailService.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_OutOrderProductionDetailService : ServiceBase<Dt_OutOrderProductionDetail, IDt_OutOrderProductionDetailRepository>, IDt_OutOrderProductionDetailService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderProductionDetailService(IDt_OutOrderProductionDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="productionDetail">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- public int AddOrderProductionDetail(Dt_OutOrderProductionDetail productionDetail)
- {
- return BaseDal.AddData(productionDetail);
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderProductionService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderProductionService.cs"
deleted file mode 100644
index 2ee8c35..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderProductionService.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_OutOrderProductionService : ServiceBase<Dt_OutOrderProduction, IDt_OutOrderProductionRepository>, IDt_OutOrderProductionService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderProductionService(IDt_OutOrderProductionRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="production">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- public int AddOrderProduction(Dt_OutOrderProduction production)
- {
- return BaseDal.AddData(production);
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderService.cs"
deleted file mode 100644
index 83719f8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderService.cs"
+++ /dev/null
@@ -1,359 +0,0 @@
-锘縰sing WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_OutOrderService : ServiceBase<Dt_OutOrder, IDt_OutOrderRepository>, IDt_OutOrderService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderProductionService _outOrderProductionService;
- private readonly IDt_OutOrderProductionDetailService _outOrderProductionDetailService;
- private readonly IDt_OutOrderDtailService _outOrderDtailService;
- private readonly IDt_OutOrderTransferRepository _OutOrderTransferRepository;
- private readonly IDt_OutOrderTransferDetailRepository _OutOrderTransferDetailRepository;
-
- public Dt_OutOrderService(IDt_OutOrderRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderProductionService outOrderProductionService,
- IDt_OutOrderProductionDetailService outOrderProductionDetailService,
- IDt_OutOrderDtailService outOrderDtailService,
- IDt_OutOrderTransferDetailRepository outOrderTransferDetailRepository,
- IDt_OutOrderTransferRepository outOrderTransferRepository) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderProductionService = outOrderProductionService;
- _outOrderProductionDetailService = outOrderProductionDetailService;
- _outOrderDtailService = outOrderDtailService;
- _OutOrderTransferDetailRepository = outOrderTransferDetailRepository;
- _OutOrderTransferRepository = outOrderTransferRepository;
- }
-
- /// <summary>
- /// 娣诲姞鐢熶骇鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- public WebResponseContent AddOutOrderProduction(SaveModel model)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- // 1. 鏋勫缓鐢熶骇鍑哄簱鍗曞璞�
- var production = CreateProductionOrder(model.MainData);
-
- // 2. 鏋勫缓鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛�
- var productionDetails = CreateProductionDetails(model.DetailData);
-
- // 3. 鏋勫缓绯荤粺鍑哄簱鍗曞璞�
- var order = CreateSystemOrder(production);
-
- // 4. 鏋勫缓绯荤粺鍑哄簱鍗曟槑缁嗗垪琛�
- var orderDetails = CreateSystemOrderDetails(productionDetails);
-
- // 寮�鍚簨鍔�
- _unitOfWorkManage.BeginTran();
- // 5. 娣诲姞鐢熶骇鍑哄簱鍗曞苟鑾峰彇涓婚敭ID
- var productionId = _outOrderProductionService.AddOrderProduction(production);
-
- // 6. 鐢熶骇鍑哄簱鍗曟槑缁嗙粦瀹氫富琛↖D
- productionDetails.ForEach(item => { item.ProductionOutOrderId = productionId; });
-
- // 7. 娣诲姞鐢熶骇鍑哄簱鍗曟槑缁�
- var detailAddResult = _outOrderProductionDetailService.AddData(productionDetails);
-
- // 8. 绯荤粺鍑哄簱鍗曠粦瀹氱敓浜у嚭搴撳崟ID
- order.UpperOutOrderId = productionId;
-
- // 9. 娣诲姞绯荤粺鍑哄簱鍗曞苟鑾峰彇涓婚敭ID
- var orderId = BaseDal.AddData(order);
-
- // 10 . 绯荤粺鍑哄簱鍗曟槑缁嗙粦瀹氫富琛↖D
- orderDetails.ForEach(item => { item.OutOrderId = orderId; });
-
- // 11. 娣诲姞绯荤粺鍑哄簱鍗曟槑缁嗗苟杩斿洖缁撴灉
- content = _outOrderDtailService.AddData(orderDetails);
- if (content.Status && productionId > 0 && detailAddResult.Status && orderId > 0)
- _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
- else
- throw new Exception("鍑哄簱鍗曟坊鍔犲け璐�");
-
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran(); // 鍥炴粴浜嬪姟
- return content.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 娣诲姞璋冩嫧鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- public WebResponseContent AddOutOrderTransfer(SaveModel model)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- // 1. 鏋勫缓璋冩嫧鍑哄簱鍗曞璞�
- var transfer = CreateTransferOrder(model.MainData);
-
- // 2. 鏋勫缓璋冩嫧鍑哄簱鍗曟槑缁嗗垪琛�
- var transferDetail = CreateTransferDetails(model.DetailData);
-
- // 3. 鏋勫缓绯荤粺鍑哄簱鍗曞璞�
- var order = CreateSystemOrder(transfer);
-
- // 4. 鏋勫缓绯荤粺鍑哄簱鍗曟槑缁嗗垪琛�
- var orderDetails = CreateSystemOrderDetails(transferDetail);
-
- // 娣诲姞浜嬪姟
- _unitOfWorkManage.BeginTran();
-
- // 5. 娣诲姞璋冩嫧鍑哄簱鍗曞苟鑾峰彇涓婚敭ID
- var transferId = _OutOrderTransferRepository.AddData(transfer);
-
- // 6. 璋冩嫧鍑哄簱鍗曟槑缁嗙粦瀹氫富琛↖D
- transferDetail.ForEach(item => { item.TransferOutOrderId = transferId; });
-
- // 7. 娣诲姞鐢熶骇鍑哄簱鍗曟槑缁�
- var detailAddResult = _OutOrderTransferDetailRepository.AddData(transferDetail);
-
- // 8. 绯荤粺鍑哄簱鍗曠粦瀹氳皟鎷ㄥ嚭搴撳崟ID
- order.UpperOutOrderId = transferId;
-
- // 9. 娣诲姞绯荤粺鍑哄簱鍗曞苟鑾峰彇涓婚敭ID
- var orderId = BaseDal.AddData(order);
-
- // 10 . 绯荤粺鍑哄簱鍗曟槑缁嗙粦瀹氫富琛↖D
- orderDetails.ForEach(item => { item.OutOrderId = orderId; });
-
- // 11. 娣诲姞绯荤粺鍑哄簱鍗曟槑缁嗗苟杩斿洖缁撴灉
- content = _outOrderDtailService.AddData(orderDetails);
- if (content.Status && transferId > 0 && detailAddResult > 0 && orderId > 0)
- _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
- else
- throw new Exception("鍑哄簱鍗曟坊鍔犲け璐�");
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran(); // 鍥炴粴浜嬪姟
- return content.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鏍规嵁鍑哄簱鍗曞彿鏌ヨ鍑哄簱璁㈠崟
- /// </summary>
- /// <param name="orderNumber">鍑哄簱鍗曞彿</param>
- /// <returns>鍑哄簱璁㈠崟</returns>
- public WebResponseContent GetOutOrderByNumber(string orderNumber)
- {
- WebResponseContent content = new WebResponseContent();
- var order = Db.Queryable<Dt_OutOrder>()
- .Includes(x => x.OrderDetailList)
- .Where(x => x.OrderNumber == orderNumber).First();
- if (order == null)
- content.Error($"璁㈠崟缂栧彿{orderNumber}鏌ヨ涓虹┖");
- else
- content.OK("鏌ヨ鎴愬姛", order);
- return content;
- }
-
- /// <summary>
- /// 淇敼鍑哄簱璁㈠崟锛堝鑸慨鏀癸級
- /// </summary>
- /// <param name="outOrder"></param>
- /// <returns>鏄惁鎴愬姛</returns>
- public async Task<bool> OutOrderUpdated(Dt_OutOrder outOrder)
- {
- return await BaseDal.OutOrderUpdated(outOrder);
- }
-
- #region 绉佹湁鏂规硶
-
- #region 鐢熶骇鍑哄簱鍗�
-
- /// <summary>
- /// 鏍规嵁涓绘暟鎹瀯寤虹敓浜у嚭搴撳崟瀵硅薄銆�
- /// </summary>
- private Dt_OutOrderProduction CreateProductionOrder(Dictionary<string, object> mainData)
- {
- return new Dt_OutOrderProduction
- {
- OrderNumber = mainData.GetValueOrDefault("OrderNumber")?.ToString(),
- WarehouseId = mainData.GetValueOrDefault("WarehouseId")?.ObjToInt() ?? 0,
- Status = mainData.GetValueOrDefault("Status")?.ToString(),
- Remarks = mainData.GetValueOrDefault("Remarks")?.ToString(),
- Creater = mainData.GetValueOrDefault("Creater")?.ToString(),
- CreateDate = mainData.GetValueOrDefault("CreateDate")?.ObjToDate() ?? DateTime.Now,
- OrderDate = mainData.GetValueOrDefault("OrderDate")?.ObjToDate() ?? DateTime.Now,
- };
- }
-
- /// <summary>
- /// 鏍规嵁鏄庣粏鏁版嵁鍜岀敓浜у嚭搴撳崟ID鏋勫缓鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛ㄣ��
- /// </summary>
- private List<Dt_OutOrderProductionDetail> CreateProductionDetails(List<Dictionary<string, object>> detailData)
- {
- var details = new List<Dt_OutOrderProductionDetail>();
- foreach (var item in detailData)
- {
- var detail = new Dt_OutOrderProductionDetail
- {
- MaterialId = item.GetValueOrDefault("MaterialId")?.ObjToInt() ?? 0,
- Quantity = item.GetValueOrDefault("Quantity")?.ObjToInt() ?? 0,
- UnitPrice = item.GetValueOrDefault("UnitPrice")?.ObjToDecimal(),
- TotalPrice = item.GetValueOrDefault("TotalPrice")?.ObjToDecimal(),
- Remarks = item.GetValueOrDefault("Remarks")?.ToString(),
- CreateDate = item.GetValueOrDefault("CreateDate")?.ObjToDate() ?? DateTime.Now,
- Creater = item.GetValueOrDefault("Creater")?.ToString(),
- BatchNumber = item.GetValueOrDefault("BatchNumber")?.ToString(),
- };
- details.Add(detail);
- }
- return details;
- }
-
- /// <summary>
- /// 鏍规嵁鐢熶骇鍑哄簱鍗曞璞″拰鐢熶骇鍑哄簱鍗旾D鏋勫缓绯荤粺鍑哄簱鍗曞璞°��
- /// </summary>
- private Dt_OutOrder CreateSystemOrder(Dt_OutOrderProduction production)
- {
- return new Dt_OutOrder
- {
- Status = production.Status,
- CreateDate = DateTime.Now,
- Creater = production.Creater,
- OrderDate = DateTime.Now,
- OrderNumber = production.OrderNumber,
- Remarks = production.Remarks,
- WarehouseId = production.WarehouseId,
- };
- }
-
- /// <summary>
- /// 鏍规嵁鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛ㄥ拰绯荤粺鍑哄簱鍗旾D鏋勫缓绯荤粺鍑哄簱鍗曟槑缁嗗垪琛ㄣ��
- /// </summary>
- private List<Dt_OutOrderDetail> CreateSystemOrderDetails(List<Dt_OutOrderProductionDetail> productionDetails)
- {
- var orderDetails = new List<Dt_OutOrderDetail>();
- foreach (var item in productionDetails)
- {
- var detail = new Dt_OutOrderDetail
- {
- AllocatedQuantity = 0,
- BatchNumber = item.BatchNumber,
- CompletedQuantity = 0,
- CreateDate = item.CreateDate,
- Creater = item.Creater,
- MaterialId = item.MaterialId,
- OutboundQuantity = item.Quantity,
- Remarks = item.Remarks,
- MaterialName = item.Remarks // 鐗╂枡鍚嶇О
- };
- orderDetails.Add(detail);
- }
- return orderDetails;
- }
-
- #endregion 鐢熶骇鍑哄簱鍗�
-
- #region 璋冩嫧鍑哄簱鍗�
-
- /// <summary>
- /// 鏍规嵁涓绘暟鎹瀯寤虹敓浜у嚭搴撳崟瀵硅薄銆�
- /// </summary>
- private Dt_OutOrderTransfer CreateTransferOrder(Dictionary<string, object> mainData)
- {
- return new Dt_OutOrderTransfer
- {
- OrderNumber = mainData.GetValueOrDefault("OrderNumber")?.ToString(),
- SourceWarehouseId = mainData.GetValueOrDefault("SourceWarehouseId")?.ObjToInt() ?? 0,
- DestinationWarehouseId = mainData.GetValueOrDefault("WarehouseId")?.ObjToInt() ?? 0,
- Status = mainData.GetValueOrDefault("Status")?.ToString(),
- Remarks = mainData.GetValueOrDefault("Remarks")?.ToString(),
- Creater = mainData.GetValueOrDefault("Creater")?.ToString(),
- CreateDate = mainData.GetValueOrDefault("CreateDate")?.ObjToDate() ?? DateTime.Now,
- OrderDate = mainData.GetValueOrDefault("OrderDate")?.ObjToDate() ?? DateTime.Now,
- };
- }
-
- /// <summary>
- /// 鏍规嵁鏄庣粏鏁版嵁鍜岀敓浜у嚭搴撳崟ID鏋勫缓鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛ㄣ��
- /// </summary>
- private List<Dt_OutOrderTransferDetail> CreateTransferDetails(List<Dictionary<string, object>> detailData)
- {
- var details = new List<Dt_OutOrderTransferDetail>();
- foreach (var item in detailData)
- {
- var detail = new Dt_OutOrderTransferDetail
- {
- MaterialId = item.GetValueOrDefault("MaterialId")?.ObjToInt() ?? 0,
- Quantity = item.GetValueOrDefault("Quantity")?.ObjToInt() ?? 0,
- UnitPrice = item.GetValueOrDefault("UnitPrice")?.ObjToDecimal(),
- TotalPrice = item.GetValueOrDefault("TotalPrice")?.ObjToDecimal(),
- Remarks = item.GetValueOrDefault("Remarks")?.ToString(),
- CreateDate = item.GetValueOrDefault("CreateDate")?.ObjToDate() ?? DateTime.Now,
- Creater = item.GetValueOrDefault("Creater")?.ToString(),
- BatchNumber = item.GetValueOrDefault("BatchNumber")?.ToString(),
- };
- details.Add(detail);
- }
- return details;
- }
-
- /// <summary>
- /// 鏍规嵁鐢熶骇鍑哄簱鍗曞璞″拰鐢熶骇鍑哄簱鍗旾D鏋勫缓绯荤粺鍑哄簱鍗曞璞°��
- /// </summary>
- private Dt_OutOrder CreateSystemOrder(Dt_OutOrderTransfer transfer)
- {
- return new Dt_OutOrder
- {
- Status = transfer.Status,
- CreateDate = DateTime.Now,
- Creater = transfer.Creater,
- OrderDate = DateTime.Now,
- OrderNumber = transfer.OrderNumber,
- Remarks = transfer.Remarks,
- WarehouseId = transfer.SourceWarehouseId,
- };
- }
-
- /// <summary>
- /// 鏍规嵁鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛ㄥ拰绯荤粺鍑哄簱鍗旾D鏋勫缓绯荤粺鍑哄簱鍗曟槑缁嗗垪琛ㄣ��
- /// </summary>
- private List<Dt_OutOrderDetail> CreateSystemOrderDetails(List<Dt_OutOrderTransferDetail> transferDetails)
- {
- var orderDetails = new List<Dt_OutOrderDetail>();
- foreach (var item in transferDetails)
- {
- var detail = new Dt_OutOrderDetail
- {
- AllocatedQuantity = 0,
- BatchNumber = item.BatchNumber,
- CompletedQuantity = 0,
- CreateDate = item.CreateDate,
- Creater = item.Creater,
- MaterialId = item.MaterialId,
- OutboundQuantity = item.Quantity,
- Remarks = item.Remarks,
- MaterialName = item.Remarks // 鐗╂枡鍚嶇О
- };
- orderDetails.Add(detail);
- }
- return orderDetails;
- }
-
- #endregion 璋冩嫧鍑哄簱鍗�
-
- #endregion 绉佹湁鏂规硶
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderTransferDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderTransferDetailService.cs"
deleted file mode 100644
index 17259a6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderTransferDetailService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_OutOrderTransferDetailService : ServiceBase<Dt_OutOrderTransferDetail, IDt_OutOrderTransferDetailRepository>, IDt_OutOrderTransferDetailService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderTransferDetailService(IDt_OutOrderTransferDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderTransferService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderTransferService.cs"
deleted file mode 100644
index aca01ea..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/OutboundOrder/Dt_OutOrderTransferService.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Dt_OutOrderTransferService : ServiceBase<Dt_OutOrderTransfer, IDt_OutOrderTransferRepository>, IDt_OutOrderTransferService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderTransferService(IDt_OutOrderTransferRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_DictionaryService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_DictionaryService.cs"
deleted file mode 100644
index 621a3ec..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_DictionaryService.cs"
+++ /dev/null
@@ -1,50 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Sys_DictionaryService : ServiceBase<Sys_Dictionary, ISys_DictionaryRepository>, ISys_DictionaryService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- public object GetVueDictionary(string[] dicNos)
- {
- if (dicNos == null || dicNos.Count() == 0) return new string[] { };
-
- var dicConfig = BaseDal.GetDictionaries(dicNos, false).Select(s => new
- {
- dicNo = s.DicNo,
- config = s.Config,
- dbSql = s.DBSql,
- list = s.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName })
- }).ToList();
-
- object GetSourceData(string dicNo, string dbSql, object data)
- {
- if (string.IsNullOrEmpty(dbSql))
- {
- return data as object;
- }
- return BaseDal.QueryObjectDataBySql(dbSql, null);
- }
- return dicConfig.Select(item => new
- {
- item.dicNo,
- item.config,
- data = GetSourceData(item.dicNo, item.dbSql, item.list)
- }).ToList();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs"
deleted file mode 100644
index 11a40cf..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs"
+++ /dev/null
@@ -1,178 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.System;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Sys_MenuService : ServiceBase<Sys_Menu, ISys_MenuRepository>, ISys_MenuService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Sys_MenuService(ISys_MenuRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鑾峰彇褰撳墠鐢ㄦ埛鎵�鏈夎彍鍗曚笌鏉冮檺
- /// </summary>
- /// <returns></returns>
- public object GetCurrentMenuActionList()
- {
- object obj = GetMenuActionList(App.User.RoleId);
- if (obj is IEnumerable<object> list)
- {
- if (list.Any())
- {
- return obj;
- }
- else
- {
- return WebResponseContent.Instance.Error("鏈幏鍙栧埌鑿滃崟淇℃伅");
- }
- }
- return obj;
- }
-
- /// <summary>
- /// 鏍规嵁瑙掕壊ID鑾峰彇鑿滃崟涓庢潈闄�
- /// </summary>
- /// <param name="roleId"></param>
- /// <returns></returns>
- public object GetMenuActionList(int roleId)
- {
- if (App.User.IsRoleIdSuperAdmin(roleId))
- {
- return BaseDal.GetSuperAdminMenu();
- }
- return BaseDal.GetMenuByRoleId(roleId);
- }
-
-
- public List<MenuDTO> GetUserMenuList(int roleId)
- {
- if (App.User.IsRoleIdSuperAdmin(roleId))
- {
- return BaseDal.GetAllMenu();
- }
- List<int> menuIds = BaseDal.GetPermissions(roleId).Select(x => x.MenuId).ToList();
- return BaseDal.GetAllMenu().Where(x => menuIds.Contains(x.MenuId)).ToList();
- }
-
- public List<ActionDTO> GetActions(int menuId, List<ActionDTO> menuActions, List<Permissions> permissions, int roleId)
- {
- if (App.User.IsRoleIdSuperAdmin(roleId))
- {
- return menuActions;
- }
-
- return menuActions.Where(p => permissions
- .Exists(w => menuId == w.MenuId
- && w.UserAuthArr.Contains(p.Value)))
- .ToList();
- }
-
- /// <summary>
- /// 缂栬緫淇敼鑿滃崟鏃�,鑾峰彇鎵�鏈夎彍鍗�
- /// </summary>
- /// <returns></returns>
- public object GetMenu()
- {
- if (App.User.IsRoleIdSuperAdmin(App.User.RoleId))
- {
- List<int> menuIds = BaseDal.QueryData().Select(x => x.MenuId).ToList();
- return BaseDal.GetMenu(menuIds);
- }
- else
- {
- List<int> menuIds = BaseDal.GetPermissions(App.User.RoleId).Select(x => x.MenuId).ToList();
- return BaseDal.GetMenu(menuIds);
- }
- }
-
- /// <summary>
- /// 缂栬緫鑿滃崟鏃讹紝鑾峰彇鑿滃崟淇℃伅
- /// </summary>
- /// <param name="menuId"></param>
- /// <returns></returns>
- public object GetTreeItem(int menuId)
- {
- return BaseDal.GetTreeItem(menuId);
- }
-
- /// <summary>
- /// 鏂板缓鎴栫紪杈戣彍鍗�
- /// </summary>
- /// <param name="menu"></param>
- /// <returns></returns>
- public WebResponseContent Save(Sys_Menu menu)
- {
- WebResponseContent webResponse = new WebResponseContent();
- if (menu == null) return webResponse.Error("娌℃湁鑾峰彇鍒版彁浜ょ殑鍙傛暟");
- if (menu.MenuId > 0 && menu.MenuId == menu.ParentId) return webResponse.Error("鐖剁骇ID涓嶈兘鏄綋鍓嶈彍鍗曠殑ID");
- try
- {
- //webResponse = menu.ValidationEntity(x => new { x.MenuName, x.TableName });
- //if (!webResponse.Status) return webResponse;
- if (menu.TableName != "/" && menu.TableName != ".")
- {
- // 2022.03.26澧炵Щ鍔ㄧ鍔犺彍鍗曠被鍨嬪垽鏂�
- Sys_Menu sysMenu = BaseDal.QueryFirst(x => x.TableName == menu.TableName);
- if (sysMenu != null)
- {
- sysMenu.MenuType ??= 0;
- if (sysMenu.MenuType == menu.MenuType)
- {
- if ((menu.MenuId > 0 && sysMenu.MenuId != menu.MenuId)
- || menu.MenuId <= 0)
- {
- return webResponse.Error($"瑙嗗浘/琛ㄥ悕銆恵menu.TableName}銆戝凡琚叾浠栬彍鍗曚娇鐢�");
- }
- }
- }
- }
- bool _changed = false;
- if (menu.MenuId <= 0)
- {
- BaseDal.AddData(menu);
- }
- else
- {
- //2020.05.07鏂板绂佹閫夋嫨涓婄骇瑙掕壊涓鸿嚜宸�
- if (menu.MenuId == menu.ParentId)
- {
- return webResponse.Error($"鐖剁骇id涓嶈兘涓鸿嚜宸�");
- }
- if (BaseDal.QueryFirst(x => x.ParentId == menu.MenuId && menu.ParentId == x.MenuId) != null)
- {
- return webResponse.Error($"涓嶈兘閫夋嫨姝ょ埗绾d锛岄�夋嫨鐨勭埗绾d涓庡綋鍓嶈彍鍗曞舰鎴愪緷璧栧叧绯�");
- }
-
- _changed = BaseDal.QueryData(c => c.MenuId == menu.MenuId).Select(s => s.Auth).FirstOrDefault() != menu.Auth;
-
- BaseDal.UpdateData(menu);
- }
- webResponse.OK("淇濆瓨鎴愬姛", menu);
- }
- catch (Exception ex)
- {
- webResponse.Error(ex.Message);
- }
- return webResponse;
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_RoleService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_RoleService.cs"
deleted file mode 100644
index 60bad17..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_RoleService.cs"
+++ /dev/null
@@ -1,217 +0,0 @@
-锘縰sing AutoMapper;
-using Microsoft.AspNetCore.DataProtection.KeyManagement;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.HttpContextUser;
-using WIDESEA_DTO.System;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-using WIDESEA_Model.Models.System;
-using WIDESEA_Repository;
-
-namespace WIDESEA_Services
-{
- public class Sys_RoleService : ServiceBase<Sys_Role, ISys_RoleRepository>, ISys_RoleService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly ISys_MenuRepository _MenuRepository;
- private readonly ISys_MenuService _MenuService;
- private readonly ISys_RoleAuthRepository _RoleAuthRepository;
- private readonly IMapper _mapper;
- public Sys_RoleService(ISys_RoleRepository BaseDal, ISys_MenuRepository MenuRepository, ISys_MenuService MenuService, ISys_RoleAuthRepository roleAuthRepository, IUnitOfWorkManage unitOfWorkManage, IMapper mapper) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _MenuRepository = MenuRepository;
- _MenuService = MenuService;
- _RoleAuthRepository = roleAuthRepository;
- _mapper = mapper;
- }
-
- public List<RoleNodes> GetAllChildren(int roleId)
- {
- if (roleId <= 0) return new List<RoleNodes>() { };
- var roles = GetAllRoleId();
- if (App.User.IsRoleIdSuperAdmin(roleId)) return roles;
-
- var list = GetChildren(roles, roleId);
- return list;
- }
-
- public List<RoleNodes> GetAllRoleId()
- {
- List<RoleNodes> roles = BaseDal.QueryData().Select(s => new RoleNodes() { Id = s.RoleId, ParentId = s.ParentId, RoleName = s.RoleName }).ToList();
-
- return roles;
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈夊瓙鑺傜偣
- /// </summary>
- /// <param name="roleId"></param>
- private List<RoleNodes> GetChildren(List<RoleNodes> roles, int roleId)
- {
- List<RoleNodes> rolesChildren = roles.Where(x => x.Id == roleId).Distinct().ToList();
-
- for (int i = 0; i < rolesChildren.Count; i++)
- {
- RoleNodes node = rolesChildren[i];
- var children = roles.Where(x => x.ParentId == node.Id && !rolesChildren.Any(c => c.Id == x.Id)).Distinct().ToList();
- rolesChildren.AddRange(children);
- }
- return rolesChildren;
- }
-
- /// <summary>
- /// 缂栬緫鏉冮檺鏃惰幏鍙栧綋鍓嶇敤鎴蜂笅鐨勬墍鏈夎鑹蹭笌褰撳墠鐢ㄦ埛鐨勮彍鍗曟潈闄�
- /// </summary>
- /// <returns></returns>
- public WebResponseContent GetCurrentTreePermission()
- {
- WebResponseContent content = GetCurrentUserTreePermission();
- int roleId = App.User.RoleId;
- return WebResponseContent.Instance.OK(null, new
- {
- tree = content.Data,
- roles = GetAllChildren(roleId)
- });
- }
-
- /// <summary>
- /// 缂栬緫鏉冮檺鏃讹紝鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈夎彍鍗曟潈闄�
- /// </summary>
- /// <returns></returns>
- public WebResponseContent GetCurrentUserTreePermission()
- {
- return GetUserTreePermission(App.User.RoleId);
- }
-
- /// <summary>
- /// 缂栬緫鏉冮檺鏃讹紝鑾峰彇鎸囧畾瑙掕壊鐨勬墍鏈夎彍鍗曟潈闄�
- /// </summary>
- /// <param name="roleId"></param>
- /// <returns></returns>
- public WebResponseContent GetUserTreePermission(int roleId)
- {
- if (!App.User.IsRoleIdSuperAdmin(roleId) && App.User.RoleId != roleId)
- {
- if (!GetAllChildren(App.User.RoleId).Exists(x => x.Id == roleId))
- {
- return WebResponseContent.Instance.Error("娌℃湁鏉冮檺鑾峰彇姝よ鑹茬殑鏉冮檺淇℃伅");
- }
- }
- //鑾峰彇鐢ㄦ埛鏉冮檺
- List<Permissions> permissions = _MenuRepository.GetPermissions(roleId);
- //鏉冮檺鐢ㄦ埛鏉冮檺鏌ヨ鎵�鏈夌殑鑿滃崟淇℃伅
- List<MenuDTO> menus = _MenuService.GetUserMenuList(roleId);
- //鑾峰彇褰撳墠鐢ㄦ埛鏉冮檺濡�:(Add,Search)瀵瑰簲鐨勬樉绀烘枃鏈俊鎭:Add锛氭坊鍔狅紝Search:鏌ヨ
- var data = menus.Select(x => new
- {
- Id = x.MenuId,
- Pid = x.ParentId,
- Text = x.MenuName,
- IsApp = x.MenuType == 1,
- Actions = _MenuService.GetActions(x.MenuId, x.Actions, permissions, roleId)
- });
- return WebResponseContent.Instance.OK(null, data);
- }
-
- /// <summary>
- /// 淇濆瓨瑙掕壊鏉冮檺
- /// </summary>
- /// <param name="userPermissions"></param>
- /// <param name="roleId"></param>
- /// <returns></returns>
- public WebResponseContent SavePermission(List<UserPermissionDTO> userPermissions, int roleId)
- {
- WebResponseContent content = new WebResponseContent();
- string message = "";
- try
- {
- UserInfo user = App.User.GetCurrentUserInfo();
- if (!GetAllChildren(user.RoleId).Exists(x => x.Id == roleId))
- return WebResponseContent.Instance.Error("娌℃湁鏉冮檺淇敼姝よ鑹茬殑鏉冮檺淇℃伅");
- //褰撳墠鐢ㄦ埛鐨勬潈闄�
- List<Permissions> permissions = _MenuRepository.GetPermissions(App.User.RoleId);
-
- List<int> originalMeunIds = new List<int>();
- //琚垎閰嶈鑹茬殑鏉冮檺
- List<Sys_RoleAuth> roleAuths = _RoleAuthRepository.QueryData(x => x.RoleId == roleId);
- List<Sys_RoleAuth> updateAuths = new List<Sys_RoleAuth>();
- foreach (UserPermissionDTO x in userPermissions)
- {
- Permissions per = permissions.Where(p => p.MenuId == x.Id).FirstOrDefault();
- //涓嶈兘鍒嗛厤瓒呰繃褰撳墠鐢ㄦ埛鐨勬潈闄�
- if (per == null) continue;
- //per.UserAuthArr.Contains(a.Value)鏍￠獙鏉冮檺鑼冨洿
- string[] arr = x.Actions == null || x.Actions.Count == 0
- ? new string[0]
- : x.Actions.Where(a => per.UserAuthArr.Contains(a.Value))
- .Select(s => s.Value).ToArray();
-
- //濡傛灉褰撳墠鏉冮檺娌℃湁鍒嗛厤杩囷紝璁剧疆Auth_Id榛樿涓�0锛岃〃绀烘柊澧炵殑鏉冮檺
- var auth = roleAuths.Where(r => r.MenuId == x.Id).Select(s => new { s.AuthId, s.AuthValue, s.MenuId }).FirstOrDefault();
- string newAuthValue = string.Join(",", arr);
- //鏉冮檺娌℃湁鍙戠敓鍙樺寲鍒欎笉澶勭悊
- if (auth == null || auth.AuthValue != newAuthValue)
- {
- updateAuths.Add(new Sys_RoleAuth()
- {
- RoleId = roleId,
- MenuId = x.Id,
- AuthValue = string.Join(",", arr),
- AuthId = auth == null ? 0 : auth.AuthId,
- ModifyDate = DateTime.Now,
- Modifier = user.UserName,
- CreateDate = DateTime.Now,
- Creater = user.UserName
- });
- }
- else
- {
- originalMeunIds.Add(auth.MenuId);
- }
-
- }
- //鏇存柊鏉冮檺
- _RoleAuthRepository.UpdateData(updateAuths);
- //鏂板鐨勬潈闄�
- _RoleAuthRepository.AddData(updateAuths);
-
- //鑾峰彇鏉冮檺鍙栨秷鐨勬潈闄�
- int[] authIds = roleAuths.Where(x => userPermissions.Select(u => u.Id)
- .ToList().Contains(x.MenuId) || originalMeunIds.Contains(x.MenuId))
- .Select(s => s.AuthId)
- .ToArray();
- List<Sys_RoleAuth> delAuths = roleAuths.Where(x => x.AuthValue != "" && !authIds.Contains(x.AuthId)).ToList();
- delAuths.ForEach(x =>
- {
- x.AuthValue = "";
- });
- //灏嗗彇娑堢殑鏉冮檺璁剧疆涓�""
- _RoleAuthRepository.UpdateData(delAuths);
-
- int addCount = updateAuths.Where(x => x.AuthId <= 0).Count();
- int updateCount = updateAuths.Where(x => x.AuthId > 0).Count();
-
- string _version = DateTime.Now.ToString("yyyyMMddHHMMssfff");
-
-
- content.OK($"淇濆瓨鎴愬姛锛氭柊澧炲姞閰嶈彍鍗曟潈闄恵addCount}鏉�,鏇存柊鑿滃崟{updateCount}鏉�,鍒犻櫎鏉冮檺{delAuths.Count()}鏉�");
- }
- catch (Exception ex)
- {
- message = "寮傚父淇℃伅锛�" + ex.Message + ex.StackTrace + ",";
- }
-
- return content;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_TenantService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_TenantService.cs"
deleted file mode 100644
index f6bf57a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_TenantService.cs"
+++ /dev/null
@@ -1,80 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.AOP;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Seed;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Sys_TenantService : ServiceBase<Sys_Tenant, ISys_TenantRepository>, ISys_TenantService
- {
- private IUnitOfWorkManage _unitOfWorkManage;
- public Sys_TenantService(ISys_TenantRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- public WebResponseContent InitTenantInfo(string tenantName, int tenantType)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Sys_Tenant tenant = new Sys_Tenant()
- {
- ConnectionString = TenantConst.DBConStr,
- DbType = 1,
- Status = 1,
- TenantName = tenantName,
- TenantType = tenantType,
- CreateDate = DateTime.Now,
- Creater = "1111"
- };
-
- int tenantId = BaseDal.Db.Insertable(tenant).ExecuteReturnIdentity();
-
- tenant = BaseDal.QueryFirst(x => x.TenantId == tenantId);
-
- tenant.ConnectionString = string.Format(TenantConst.DBConStr, ".", "Tenant_WMSDB_" + tenantId, "sa", "P@ssw0rd").EncryptDES(AppSecret.DB);
-
- BaseDal.UpdateData(tenant);
-
- InitTenantDb(tenant);
- content = WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- content = WebResponseContent.Instance.Error(ex.Message);
- }
- return content;
- }
-
- public void InitTenantDb(Sys_Tenant tenant)
- {
- string conStr = tenant.ConnectionString.DecryptDES(AppSecret.DB);
-
- ConnectionConfig connectionConfig = new ConnectionConfig()
- {
- ConfigId = tenant.TenantId,
- ConnectionString = conStr,
- DbType = (DbType)tenant.DbType,
- IsAutoCloseConnection = true,
- AopEvents = new AopEvents()
- {
- DataExecuting = SqlSugarAop.DataExecuting
- }
- };
- DBSeed.InitTenantSeedAsync(Db.AsTenant(), connectionConfig);
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_TestService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_TestService.cs"
deleted file mode 100644
index 408ea58..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_TestService.cs"
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IRepository;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Services
-{
- public class Sys_TestService : ServiceBase<Sys_Test, ISys_TestRepository>, ISys_TestService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Sys_TestService(ISys_TestRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- public WebResponseContent TranTest()
- {
- Sys_Test sys_Test = BaseDal.QueryFirst(x => true);
- sys_Test.TestContent = "TranTest";
- _unitOfWorkManage.BeginTran();
-
- BaseDal.UpdateData(sys_Test);
-
- _unitOfWorkManage.CommitTran();
-
- return WebResponseContent.Instance.OK();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_UserService.cs"
deleted file mode 100644
index 4c1a228..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_UserService.cs"
+++ /dev/null
@@ -1,169 +0,0 @@
-锘縰sing WIDESEA_Core.Authorization;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.HttpContextUser;
-using WIDESEA_IServices;
-using WIDESEA_Model;
-using WIDESEA_Model.Models;
-using WIDESEA_IRepository;
-using WIDESEA_Core.BaseRepository;
-using System.Net;
-
-namespace WIDESEA_Services
-{
- public class Sys_UserService : ServiceBase<Sys_User, ISys_UserRepository>, ISys_UserService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage) : base(repository)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- public WebResponseContent Login(LoginInfo loginInfo)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- //BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
-
- string msg = string.Empty;
-
- #region 涓存椂浣跨敤
- try
- {
- loginInfo.Password = loginInfo.Password.EncryptDES(AppSecret.User);
- }
- catch
- {
-
- }
- #endregion
-
- UserInfo user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
- if (user != null)
- {
- string token = JwtHelper.IssueJwt(new TokenModelJwt()
- {
- UserId = user.UserId,
- RoleId = user.RoleId,
- });
-
- content = WebResponseContent.Instance.OK(data: new { token, userName = user.UserTrueName, img = user.HeadImageUrl });
- }
- else
- {
- content = WebResponseContent.Instance.Error("璐﹀彿鎴栧瘑鐮侀敊璇�");
- }
- }
- catch (Exception ex)
- {
- content = WebResponseContent.Instance.Error(ex.Message);
- }
-
- return content;
- }
-
- public override WebResponseContent UpdateData(SaveModel saveModel)
- {
- UpdateIgnoreColOnExecute = x =>
- {
- return new List<string>
- {
- nameof(Sys_User.UserPwd),
- nameof(Sys_User.SystemType),
- nameof(Sys_User.TenantId)
- };
- };
- return base.UpdateData(saveModel);
- }
-
- public override WebResponseContent AddData(SaveModel saveModel)
- {
- string pwd = "123456";
- string uesrName = saveModel.MainData[nameof(Sys_User.UserName).FirstLetterToLower()].ToString();
- saveModel.MainData[nameof(Sys_User.UserPwd).FirstLetterToLower()] = pwd.EncryptDES(AppSecret.User);
-
- WebResponseContent content = base.AddData(saveModel);
- if (content.Status)
- {
- return WebResponseContent.Instance.OK($"鐢ㄦ埛鏂板缓鎴愬姛.甯愬彿{uesrName}瀵嗙爜{pwd}");
- }
- else
- {
- return content;
- }
- }
-
- /// <summary>
- /// 涓汉涓績鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
- /// </summary>
- /// <returns></returns>
- public WebResponseContent GetCurrentUserInfo()
- {
- var data = BaseDal.QueryFirst(x => x.User_Id == App.User.UserId, s => new
- {
- s.UserName,
- s.UserTrueName,
- s.Address,
- s.PhoneNo,
- s.Email,
- s.Remark,
- s.Gender,
- s.RoleName,
- s.HeadImageUrl,
- s.CreateDate
- });
- return WebResponseContent.Instance.OK(null, data);
- }
-
- /// <summary>
- /// 淇敼瀵嗙爜
- /// </summary>
- /// <param name="parameters"></param>
- /// <returns></returns>
- public WebResponseContent ModifyPwd(string oldPwd, string newPwd)
- {
- WebResponseContent content = WebResponseContent.Instance;
- oldPwd = oldPwd?.Trim();
- newPwd = newPwd?.Trim();
- string message = "";
- try
- {
- if (string.IsNullOrEmpty(oldPwd)) return WebResponseContent.Instance.Error("鏃у瘑鐮佷笉鑳戒负绌�");
- if (string.IsNullOrEmpty(newPwd)) return WebResponseContent.Instance.Error("鏂板瘑鐮佷笉鑳戒负绌�");
- if (newPwd.Length < 6) return WebResponseContent.Instance.Error("瀵嗙爜涓嶈兘灏戜簬6浣�");
-
- int userId = App.User.UserId;
- string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == userId, s => s.UserPwd);
-
- string _oldPwd = oldPwd.EncryptDES(AppSecret.User);
- if (_oldPwd != userCurrentPwd) return WebResponseContent.Instance.Error("鏃у瘑鐮佷笉姝ｇ‘");
-
- string _newPwd = newPwd.EncryptDES(AppSecret.User);
- if (userCurrentPwd == _newPwd) return WebResponseContent.Instance.Error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
-
-
- BaseDal.UpdateData(new Sys_User
- {
- User_Id = userId,
- UserPwd = _newPwd,
- LastModifyPwdDate = DateTime.Now
- }, new List<string>
- {
- nameof(Sys_User.LastModifyPwdDate),
- nameof(Sys_User.UserPwd)
- });
-
- content = WebResponseContent.Instance.OK("瀵嗙爜淇敼鎴愬姛");
- }
- catch (Exception ex)
- {
- message = ex.Message;
- content = WebResponseContent.Instance.Error("鏈嶅姟鍣ㄤ簡鐐归棶棰�,璇风◢鍚庡啀璇�");
- }
- return content;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/WIDESEA_Services.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/WIDESEA_Services.csproj"
deleted file mode 100644
index 4944b62..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/WIDESEA_Services.csproj"
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <WarningLevel>0</WarningLevel>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <WarningLevel>0</WarningLevel>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\LogLibrary\LogLibrary.csproj" />
- <ProjectReference Include="..\WIDESEA_IBusinessesRepository\WIDESEA_IBusinessesRepository.csproj" />
- <ProjectReference Include="..\WIDESEA_IBusinessServices\WIDESEA_IBusinessServices.csproj" />
- <ProjectReference Include="..\WIDESEA_IServices\WIDESEA_IServices.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Debug/net6.0/WIDESEA_Services.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Debug/net6.0/WIDESEA_Services.assets.cache"
deleted file mode 100644
index dd195b3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Debug/net6.0/WIDESEA_Services.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.dgspec.json"
deleted file mode 100644
index 84a7c41..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,685 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "projectName": "LogLibrary",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "projectName": "WIDESEA_DTO",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "projectName": "WIDESEA_IBusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "projectName": "WIDESEA_IBusinessServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "projectName": "WIDESEA_IRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "projectName": "WIDESEA_IServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "projectName": "WIDESEA_Repository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "projectName": "WIDESEA_Services",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/WIDESEA_Services.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/project.assets.json"
deleted file mode 100644
index 1809774..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/project.assets.json"
+++ /dev/null
@@ -1,266 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "LogLibrary/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/LogLibrary.dll": {}
- },
- "runtime": {
- "bin/placeholder/LogLibrary.dll": {}
- }
- },
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- }
- },
- "WIDESEA_IBusinessesRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Core": "1.0.1",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IBusinessesRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IBusinessesRepository.dll": {}
- }
- },
- "WIDESEA_IBusinessServices/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Core": "1.0.1",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IBusinessServices.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IBusinessServices.dll": {}
- }
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_DTO": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- }
- },
- "WIDESEA_IServices/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Repository": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IServices.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IServices.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- },
- "WIDESEA_Repository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_IRepository": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Repository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Repository.dll": {}
- }
- }
- }
- },
- "libraries": {
- "LogLibrary/1.0.0": {
- "type": "project",
- "path": "../LogLibrary/LogLibrary.csproj",
- "msbuildProject": "../LogLibrary/LogLibrary.csproj"
- },
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_DTO/WIDESEA_DTO.csproj",
- "msbuildProject": "../WIDESEA_DTO/WIDESEA_DTO.csproj"
- },
- "WIDESEA_IBusinessesRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj",
- "msbuildProject": "../WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj"
- },
- "WIDESEA_IBusinessServices/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj",
- "msbuildProject": "../WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj"
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj",
- "msbuildProject": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj"
- },
- "WIDESEA_IServices/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IServices/WIDESEA_IServices.csproj",
- "msbuildProject": "../WIDESEA_IServices/WIDESEA_IServices.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- },
- "WIDESEA_Repository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Repository/WIDESEA_Repository.csproj",
- "msbuildProject": "../WIDESEA_Repository/WIDESEA_Repository.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "LogLibrary >= 1.0.0",
- "WIDESEA_IBusinessServices >= 1.0.0",
- "WIDESEA_IBusinessesRepository >= 1.0.0",
- "WIDESEA_IServices >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "projectName": "WIDESEA_Services",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/project.nuget.cache"
deleted file mode 100644
index d60ec3a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "gvZtd4BjtSPVnl0jZWb8jxOFBp8FWN/tcdyRBcdtfrPApiQzT+OAU+DwMN6wH/6B+3sHUSkWgxT6tNLUHNQMYw==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/GlobalUsing.cs"
deleted file mode 100644
index 4373fac..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/GlobalUsing.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縢lobal using WIDESEA_Core.BaseRepository;
-global using WIDESEA_IStorageOutBasicRepository;
-global using WIDESEA_Model.Models;
-global using WIDESEA_Common;
-global using WIDESEA_Common.Location;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/Location/Dt_LocationRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/Location/Dt_LocationRepository.cs"
deleted file mode 100644
index ee516ec..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/Location/Dt_LocationRepository.cs"
+++ /dev/null
@@ -1,8 +0,0 @@
-锘縩amespace WIDESEA_StorageOutBasicRepository;
-
-public class Dt_LocationRepository : RepositoryBase<Dt_LocationInfo>, IDt_LocationRepository
-{
- public Dt_LocationRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/Stock/Dt_BillGroupStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/Stock/Dt_BillGroupStockRepository.cs"
deleted file mode 100644
index 0868d73..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/Stock/Dt_BillGroupStockRepository.cs"
+++ /dev/null
@@ -1,38 +0,0 @@
-锘縩amespace WIDESEA_StorageOutBasicRepository;
-
-public class Dt_BillGroupStockRepository : RepositoryBase<Dt_BillGroupStock>, IDt_BillGroupStockRepository
-{
- public Dt_BillGroupStockRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 鑾峰彇鍑哄簱搴撳瓨
- /// </summary>
- /// <returns></returns>
- public List<Dt_BillGroupStock> GetOutboundStockList()
- {
- var stocks = Db.Queryable<Dt_BillGroupStock>()
- .Includes(x => x.LocationInfo)
- .Where(x => x.LocationInfo.IsLocked == false && x.LocationInfo.Status == LocationStateConst.LocationState_Stored)
- .Includes(x => x.StockDetailList)
- .Where(x => x.State == OrderStatusConst.Pending.ToString()).ToList();
- return stocks;
- }
-
- public bool UpdateNavStock(List<Dt_BillGroupStock> stocks)
- {
- return Db.UpdateNav(stocks)
- .Include(x => x.LocationInfo)
- .Include(x => x.StockDetailList)
- .ExecuteCommand();
- }
-
- public bool UpdateNavStock(Dt_BillGroupStock stock)
- {
- return Db.UpdateNav(stock)
- .Include(x => x.LocationInfo)
- .Include(x => x.StockDetailList)
- .ExecuteCommand();
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/WIDESEA_StorageOutBasicRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/WIDESEA_StorageOutBasicRepository.csproj"
deleted file mode 100644
index 00f57cb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicRepository/WIDESEA_StorageOutBasicRepository.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IStorageOutBasicRepository\WIDESEA_IStorageOutBasicRepository.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/GlobalUsing.cs"
deleted file mode 100644
index 5ab2c04..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/GlobalUsing.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縢lobal using AutoMapper;
-global using System.Threading.Tasks;
-global using WIDESEA_Common;
-global using WIDESEA_Common.Location;
-global using WIDESEA_Core;
-global using WIDESEA_Core.BaseRepository;
-global using WIDESEA_Core.BaseServices;
-global using WIDESEA_Core.Helper;
-global using WIDESEA_IStorageOutBasicRepository;
-global using WIDESEA_IStorageOutBasicServices;
-global using WIDESEA_Model.Models;
-global using WIDESEA_IStorageOutOrderRepository;
-global using WIDESEA_IStorageOutOrderServices;
-global using WIDESEA_IStorageOutTaskRepository;
-global using WIDESEA_IStorageOutTaskServices;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/Location/Dt_LocationService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/Location/Dt_LocationService.cs"
deleted file mode 100644
index cfc8a30..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/Location/Dt_LocationService.cs"
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縩amespace WIDESEA_StorageOutBasicServices;
-
-public class Dt_LocationService : ServiceBase<Dt_LocationInfo, IDt_LocationRepository>, IDt_LocationService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderService _outOrderService;
- private readonly IDt_TaskService _taskService;
- private readonly IDt_BillGroupStockService _BillGroupStockService;
-
- public Dt_LocationService(IDt_LocationRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService,
- IDt_TaskService taskService,
- IDt_BillGroupStockService billGroupStockService) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderService = outOrderService;
- _taskService = taskService;
- _BillGroupStockService = billGroupStockService;
- }
-
- /// <summary>
- /// 妫�鏌ュ苟鐢熸垚绉诲簱浠诲姟鎴栬繑鍥炲嚭搴撲换鍔�
- /// </summary>
- /// <param name="locationID">搴撲綅ID</param>
- /// <returns>浠诲姟瀵硅薄</returns>
- public virtual async Task<Dt_Task> TransferCheck(string locationID)
- {
- try
- {
- // 鑾峰彇鎸囧畾搴撲綅鐨勪换鍔�
- var outboundTask = await _taskService.GetByLocation(locationID);
- if (outboundTask == null)
- return null;
-
- // 妫�鏌ユ槸鍚﹂渶瑕佽繘琛岀Щ搴�
- if (CheckForInternalTransfer(locationID))
- {
- // 璁＄畻瀵瑰簲浣嶇疆鐨勭浉瀵瑰簱浣� 锛堝鏁拌鐨勪笅涓�琛屾垨鑰呭伓鏁拌鐨勪笂涓�琛岋級
- var newLocationID = GetRelativeLocationID(locationID);
-
- // 鑾峰彇鏂扮殑搴撲綅鐨勪换鍔�
- var internalTransferTask = await _taskService.GetByLocation(newLocationID);
-
- // 濡傛灉鏂扮殑搴撲綅娌℃湁鎵惧埌瀵瑰簲鐨勪换鍔�
- if (internalTransferTask == null)
- {
- return await HandleNoTaskAtLocation(locationID, newLocationID, outboundTask);
- }
-
- // 鐩存帴杩斿洖涓�娣变綅鍑哄簱浠诲姟
- return internalTransferTask;
- }
-
- // 杩斿洖褰撳墠搴撲綅鐨勫嚭搴撲换鍔�
- return outboundTask;
- }
- catch (Exception)
- {
- return null;
- }
- }
-
- #region 鍐呴儴鏂规硶
-
- /// <summary>
- /// 璁＄畻鐩稿鐨勫簱浣岻D
- /// </summary>
- /// <param name="locationID">褰撳墠搴撲綅ID</param>
- /// <returns>鐩稿鐨勫簱浣岻D</returns>
- private string GetRelativeLocationID(string locationID)
- {
- string[] parts = locationID.Split('-');
- int line = int.Parse(parts[0]);
-
- // 璁＄畻鐩稿鐨勮揣浣嶈鍊硷紝濂囨暟琛岀殑涓嬩竴琛屾垨鑰呭伓鏁拌鐨勪笂涓�琛�
- int relativeLine = line % 2 == 1 ? line + 1 : line - 1;
-
- // 鏋勫缓鏂扮殑搴撲綅ID
- string[] newLocationParts = new string[] { relativeLine.ToString().PadLeft(3, '0'), parts[1], parts[2] };
- return string.Join("-", newLocationParts);
- }
-
- /// <summary>
- /// 澶勭悊娌℃湁浠诲姟鐨勫簱浣嶆儏鍐�
- /// </summary>
- /// <param name="originalLocationID">鍘熷搴撲綅ID</param>
- /// <param name="newLocationID">鏂扮殑搴撲綅ID</param>
- /// <param name="outboundTask">鍑哄簱浠诲姟</param>
- /// <returns>鐢熸垚鐨勭Щ搴撲换鍔℃垨鍘熷鍑哄簱浠诲姟</returns>
- private async Task<Dt_Task> HandleNoTaskAtLocation(string originalLocationID, string newLocationID, Dt_Task outboundTask)
- {
- // 鍒ゆ柇璇ヤ綅缃槸鍚︽湁搴撳瓨
- var stockInfo = await _BillGroupStockService.GetStocks(locationID: newLocationID);
-
- if (stockInfo == null)
- {
- // 濡傛灉娌℃湁搴撳瓨锛岀洿鎺ヨ繑鍥炲綋鍓嶅嚭搴撲换鍔�
- return outboundTask;
- }
- else
- {
- // 濡傛灉鏈夊簱瀛橈紝鐢熸垚绉诲簱浠诲姟
- var emptyLocation = GetTransferLocationEmpty(outboundTask.Roadway);
-
- Dt_Task newTransferTask = new Dt_Task()
- {
- CreateDate = DateTime.Now,
- Creater = "System",
- CurrentAddress = originalLocationID,
- Grade = 99,
- MaterialNo = stockInfo.MaterialNo,
- NextAddress = emptyLocation.LocationID,
- PalletCode = stockInfo.PalletCode,
- Remark = "绉诲簱",
- Roadway = stockInfo.LocationInfo.Roadway,
- SourceAddress = originalLocationID,
- TaskNum = 0,
- TargetAddress = emptyLocation.LocationID,
- TaskState = TaskStateConst.PendingDispatch.ToString(),
- TaskType = TaskTypeConst.InternalTransfer.ToString(),
- };
-
- return await _taskService.Create(newTransferTask);
- }
- }
-
- /// <summary>
- /// 鏍规嵁璐т綅妫�鏌ヤ竴娣变綅鏄惁闇�瑕佺Щ搴�
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <returns>鏄惁闇�瑕佺Щ搴�</returns>
- private bool CheckForInternalTransfer(string locationID)
- {
- // 鏍规嵁 "-" 鎴彇瀛楃涓插苟鑾峰彇绗竴浣嶆暟瀛�
- string[] parts = locationID.Split('-');
- if (parts.Length > 0 && int.TryParse(parts[0], out int row))
- {
- // 鑾峰彇浜屾繁浣嶇殑琛屽彿鍒楄〃锛岃〃绀洪渶瑕佺Щ搴�
- List<int> transfertRows = AppSettings.app("TransfertRows").Split(',').ToList().ConvertAll(x => int.Parse(x));
- // 鍒ゆ柇琛屽彿鏄惁鍦ㄧ洰鏍囪鍙峰垪琛ㄤ腑
- return transfertRows.Contains(row);
- }
- return false;
- }
-
- /// <summary>
- /// 鏍规嵁宸烽亾鑾峰彇浜屾繁浣嶇殑绌哄簱浣�
- /// </summary>
- /// <param name="roadway">宸烽亾</param>
- /// <returns>璐т綅瀵硅薄</returns>
- private Dt_LocationInfo GetTransferLocationEmpty(string roadway)
- {
- return Db.Queryable<Dt_LocationInfo>()
- .Where(x => x.Status == LocationStateConst.LocationState_Empty)
- .Where(x => x.Depth == 2.ToString())
- .Where(x => x.Roadway == roadway)
- .First();
- }
-
- #endregion 鍐呴儴鏂规硶
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/Stock/Dt_BillGroupStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/Stock/Dt_BillGroupStockService.cs"
deleted file mode 100644
index a09aea0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/Stock/Dt_BillGroupStockService.cs"
+++ /dev/null
@@ -1,289 +0,0 @@
-锘縩amespace WIDESEA_StorageOutBasicServices;
-
-public class Dt_BillGroupStockService : ServiceBase<Dt_BillGroupStock, IDt_BillGroupStockRepository>, IDt_BillGroupStockService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderService _outOrderService;
- private readonly IDt_TaskService _taskService;
- private readonly IDt_OutOrderAndStockRepository _OutOrderAndStockRepository;
- private readonly IDt_OutOrderAndStock_HtyService _OutOrderAndStock_HtyService;
- private readonly IDt_Task_HtyService _Task_HtyService;
- private readonly IMapper _mapper;
-
- public Dt_BillGroupStockService(IDt_BillGroupStockRepository baseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService,
- IDt_TaskService taskService,
- IDt_OutOrderAndStockRepository outOrderAndStockRepository,
- IMapper mapper,
- IDt_OutOrderAndStock_HtyService outOrderAndStock_HtyService,
- IDt_Task_HtyService task_HtyService) : base(baseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderService = outOrderService;
- _taskService = taskService;
- _OutOrderAndStockRepository = outOrderAndStockRepository;
- _mapper = mapper;
- _OutOrderAndStock_HtyService = outOrderAndStock_HtyService;
- _Task_HtyService = task_HtyService;
- }
-
- #region 澶栭儴鎺ュ彛
-
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇搴撳瓨
- /// </summary>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="materialNo">鐗╂枡缂栧彿</param>
- /// <returns>鐗瑰畾搴撳瓨</returns>
- public async Task<Dt_BillGroupStock> GetStocks(string palletCode = null, string locationID = null, string materialNo = null)
- {
- return await Db.Queryable<Dt_BillGroupStock>()
- .WhereIF(palletCode != null, x => x.PalletCode == palletCode)
- .WhereIF(locationID != null, x => x.LocationCode == locationID)
- .WhereIF(materialNo != null, x => x.MaterialNo == materialNo)
- .Includes(x => x.LocationInfo)
- .Includes(x => x.StockDetailList)
- .FirstAsync();
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈夊彲鍑哄簱搴撳瓨锛屼笉鍖呮嫭宸茬粡鍑哄簱鐨勬垨宸茬粡鍒嗛厤鐨勩��
- /// </summary>
- /// <returns>鍑哄簱搴撳瓨鍒楄〃</returns>
- public async Task<WebResponseContent> GetOutboundStock()
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- #region 鍓嶆湡娌℃暟鎹复鏃跺紑鍙戜娇鐢紝鍚庢湡鏇存崲鏍规嵁璁㈠崟杩涜绛涢�夊簱瀛�
-
- // 鑾峰彇鎵�鏈夊彲鍑哄簱搴撳瓨
- var stocks = BaseDal.GetOutboundStockList();
-
- // 鑾峰彇璁㈠崟
- var order = GetOrder("2");
-
- // 妫�鏌ヨ鍗曟槸鍚﹁幏鍙栨垚鍔�
- if (order == null)
- {
- return content.Error("鑾峰彇璁㈠崟澶辫触");
- }
- // 鑾峰彇璁㈠崟涓殑绗竴涓墿鏂欏彿
- var materialNo = order.OrderDetailList.MaterialId;
-
- // 绛涢�夊苟鎺掑簭搴撳瓨
- var filteredStocks = stocks.Where(x => x.MaterialNo == materialNo.ToString())
- .OrderBy(x => x.CreateDate)
- .ToList();
-
- #endregion 鍓嶆湡娌℃暟鎹复鏃跺紑鍙戜娇鐢紝鍚庢湡鏇存崲鏍规嵁璁㈠崟杩涜绛涢�夊簱瀛�
-
- // 鍒涘缓浠诲姟鍒楄〃
- var (tasks, updateOrder) = CreateTasks(order, filteredStocks);
-
- // 鏇存柊搴撳瓨鐘舵��
- var stockList = UpdateStocks(filteredStocks, updateOrder);
-
- // 鍒涘缓璁㈠崟搴撳瓨鍒楄〃
- var orderStocks = CreateOrderStock(filteredStocks, updateOrder, tasks);
-
- // 寮�濮嬩簨鍔�
- _unitOfWorkManage.BeginTran();
-
- // 鏇存柊搴撳瓨
- var isStockUpdated = BaseDal.UpdateNavStock(stockList);
-
- // 鏇存柊璁㈠崟
- var isOrderUpdated = await _outOrderService.OutOrderUpdated(updateOrder);
-
- //娣诲姞璁㈠崟搴撳瓨
- var isOrderStockCread = _OutOrderAndStockRepository.AddData(orderStocks) > 0;
-
- // 鍒涘缓浠诲姟
- var isTaskCreated = await _taskService.Create(tasks);
-
- // 鎻愪氦鎴栧洖婊氫簨鍔�
- if (isStockUpdated && isTaskCreated && isOrderUpdated && isOrderStockCread)
- {
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- }
-
- return content.OK(data: stocks);
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error(ex.Message);
- }
- }
-
- #endregion 澶栭儴鎺ュ彛
-
- #region 鍐呴儴璋冪敤鏂规硶
-
- /// <summary>
- /// 鏇存柊搴撳瓨闆嗗悎
- /// </summary>
- /// <param name="stocks">搴撳瓨闆嗗悎</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool UpdateNavStock(List<Dt_BillGroupStock> stocks)
- {
- return BaseDal.UpdateNavStock(stocks);
- }
-
- /// <summary>
- /// 鏇存柊鍗曚釜搴撳瓨
- /// </summary>
- /// <param name="stocks">搴撳瓨</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool UpdateNavStock(Dt_BillGroupStock stocks)
- {
- return BaseDal.UpdateNavStock(stocks);
- }
-
- #endregion 鍐呴儴璋冪敤鏂规硶
-
- #region private鍐呴儴鏂规硶
-
- /// <summary>
- /// 鏍规嵁璁㈠崟鍙疯幏鍙栬鍗�
- /// </summary>
- /// <param name="orderNumber">璁㈠崟鍙�</param>
- /// <returns>璁㈠崟瀵硅薄</returns>
- private Dt_OutOrder GetOrder(string orderNumber)
- {
- // 鑾峰彇璁㈠崟淇℃伅
- var content = _outOrderService.GetOutOrderByNumber(orderNumber);
-
- // 妫�鏌ヨ鍗曟槸鍚﹁幏鍙栨垚鍔�
- if (!content.Status)
- {
- return null;
- }
-
- // 鍙嶅簭鍒楀寲璁㈠崟瀵硅薄
- return (Dt_OutOrder)content.Data;
- }
-
- /// <summary>
- /// 鍒涘缓浠诲姟鍒楄〃
- /// </summary>
- /// <param name="order">璁㈠崟瀵硅薄</param>
- /// <param name="filteredStocks">绛涢�夊悗鐨勫簱瀛樺垪琛�</param>
- /// <returns>浠诲姟鍒楄〃</returns>
- private (List<Dt_Task>, Dt_OutOrder orderDetail) CreateTasks(Dt_OutOrder order, List<Dt_BillGroupStock> filteredStocks)
- {
- var tasks = new List<Dt_Task>();
-
- foreach (var stock in filteredStocks)
- {
- // 濡傛灉宸插垎閰嶆暟閲忚揪鍒板嚭搴撴暟閲忥紝鍋滄鍒嗛厤
- if (order.OrderDetailList.AllocatedQuantity >= order.OrderDetailList.OutboundQuantity)
- break;
-
- // 濡傛灉鎵樼洏浠诲姟宸插瓨鍦紝璺宠繃
- if (_taskService.IsExist(stock.PalletCode))
- continue;
-
- // 鍒涘缓浠诲姟
- tasks.Add(new Dt_Task
- {
- CreateDate = DateTime.Now, // 鍒涘缓鏃堕棿
- Creater = "System", // 鍒涘缓浜�
- CurrentAddress = stock.LocationCode, //褰撳墠浣嶇疆
- Dispatchertime = DateTime.Now, //璋冨害鏃堕棿锛堜换鍔′笅鍙戞椂闂达級
- Grade = 1, // 绛夌骇
- InboundNo = stock.InboundNo, //鍗曟嵁缂栧彿
- MaterialNo = stock.MaterialNo, // 鐗╂枡鍙�
- NextAddress = stock.LocationCode, // 涓嬩竴浣嶇疆
- PalletCode = stock.PalletCode, //鎵樼洏鍙�
- Remark = stock.Remark, //澶囨敞
- Roadway = stock.Remark, //宸烽亾
- SourceAddress = stock.LocationCode, //鏉ユ簮浣嶇疆
- TargetAddress = order.OrderDetailList.Remarks, //鐩爣鍦板潃
- TaskNum = 1001, //浠诲姟鍙�
- TaskState = TaskStateConst.PendingDispatch.ToString(), //浠诲姟鐘舵��
- TaskType = TaskTypeConst.WholeOutbound.ToString(), //浠诲姟绫诲瀷
- });
-
- // 鏇存柊宸插垎閰嶆暟閲�
- order.OrderDetailList.AllocatedQuantity++;
- }
-
- return (tasks, order);
- }
-
- /// <summary>
- /// 鏇存柊搴撳瓨鐘舵��
- /// </summary>
- /// <param name="filteredStocks">绛涢�夊悗鐨勫簱瀛樺垪琛�</param>
- /// <param name="order">璁㈠崟瀵硅薄</param>
- /// <returns>鏇存柊鍚庣殑搴撳瓨鍒楄〃</returns>
- private List<Dt_BillGroupStock> UpdateStocks(List<Dt_BillGroupStock> filteredStocks, Dt_OutOrder order)
- {
- var updatedStocks = new List<Dt_BillGroupStock>();
- var orderDetail = order.OrderDetailList;
- int index = 0;
-
- foreach (var stock in filteredStocks)
- {
- // 濡傛灉宸插垎閰嶆暟閲忚揪鍒板嚭搴撴暟閲忥紝鍋滄鍒嗛厤
- if (index >= orderDetail.OutboundQuantity)
- {
- break;
- }
-
- // 鏇存柊搴撳瓨鐘舵��
- stock.LocationInfo.IsLocked = true;
- stock.LocationInfo.Status = 0;
- stock.State = "3";
- updatedStocks.Add(stock);
- }
-
- return updatedStocks;
- }
-
- /// <summary>
- /// 鍒涘缓璁㈠崟搴撳瓨鍒楄〃
- /// </summary>
- /// <param name="stock">绛涢�夊悗鐨勫簱瀛樺垪琛�</param>
- /// <param name="order">璁㈠崟瀵硅薄</param>
- /// <param name="task">浠诲姟鍒楄〃</param>
- /// <returns>璁㈠崟搴撳瓨鍒楄〃</returns>
- private List<Dt_OutOrderAndStock> CreateOrderStock(List<Dt_BillGroupStock> stock, Dt_OutOrder order, List<Dt_Task> task)
- {
- var orderStocks = new List<Dt_OutOrderAndStock>();
- for (int i = 0; i < task.Count; i++)
- {
- orderStocks.Add(new Dt_OutOrderAndStock()
- {
- AllocatedQuantity = order.OrderDetailList.AllocatedQuantity,
- MaterialNo = stock[i].MaterialNo,
- MaterialName = order.OrderDetailList.MaterialName,
- OrderNumber = order.OrderNumber,
- OutboundQuantity = order.OrderDetailList.OutboundQuantity,
- PalletCode = stock[i].PalletCode,
- PalletQuantity = stock[i].StockDetailList.PalletQuantity,
- State = stock[i].State,
- BatchNumber = order.OrderDetailList.BatchNumber,
- CompletedQuantity = order.OrderDetailList.CompletedQuantity,
- Creater = "System",
- CreateDate = DateTime.Now,
- GroupId = stock[i].GroupId,
- GroupDetailId = stock[i].StockDetailList.GroupDetailId,
- LocationCode = stock[i].LocationInfo.LocationID,
- OutOrderDetailId = order.OrderDetailList.Id,
- OutOrderId = order.Id,
- });
- }
- return orderStocks;
- }
-
- #endregion private鍐呴儴鏂规硶
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/WIDESEA_StorageOutBasicService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/WIDESEA_StorageOutBasicService.csproj"
deleted file mode 100644
index 803f614..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutBasicServices/WIDESEA_StorageOutBasicService.csproj"
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IStorageOutBasicService\WIDESEA_IStorageOutBasicService.csproj" />
- <ProjectReference Include="..\WIDESEA_IStorageOutOrderService\WIDESEA_IStorageOutOrderService.csproj" />
- <ProjectReference Include="..\WIDESEA_IStorageOutTaskService\WIDESEA_IStorageOutTaskService.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/GlobalUsing.cs"
deleted file mode 100644
index db797a1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/GlobalUsing.cs"
+++ /dev/null
@@ -1,2 +0,0 @@
-锘縢lobal using WIDESEA_Core.BaseRepository;
-global using WIDESEA_Model.Models;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderAndStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderAndStockRepository.cs"
deleted file mode 100644
index f1a834e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderAndStockRepository.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderRepository;
-
-public interface IDt_OutOrderAndStockRepository : IRepository<Dt_OutOrderAndStock>
-{
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇鍑哄簱鐗╂枡淇℃伅
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="orderNum">鍑哄簱璁㈠崟</param>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <returns>鍑哄簱鐗╂枡淇℃伅</returns>
- Task<Dt_OutOrderAndStock> GetOrderAndStock(string locationID = null, string orderNum = null, string palletCode = null);
-
- /// <summary>
- /// 瀵艰埅鍒犻櫎
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool DeleteNavOrderStock(Dt_OutOrderAndStock stock);
-
- /// <summary>
- /// 瀵艰埅鏇存柊
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool UpdateNavOrderStock(Dt_OutOrderAndStock stock);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderAndStock_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderAndStock_HtyRepository.cs"
deleted file mode 100644
index 3a9aea6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderAndStock_HtyRepository.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderRepository;
-
-public interface IDt_OutOrderAndStock_HtyRepository : IRepository<Dt_OutOrderAndStock_Hty>
-{
- /// <summary>
- /// 瀵艰埅娣诲姞锛堟坊鍔犲簱瀛樹富浠庡巻鍙诧紝璁㈠崟涓讳粠鍘嗗彶锛�
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅鍘嗗彶</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- bool InsertNav(Dt_OutOrderAndStock_Hty stock);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderDtailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderDtailRepository.cs"
deleted file mode 100644
index 3ee62e2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderDtailRepository.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderRepository;
-
-public interface IDt_OutOrderDtailRepository : IRepository<Dt_OutOrderDetail>
-{
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderProductionDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderProductionDetailRepository.cs"
deleted file mode 100644
index 2625074..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderProductionDetailRepository.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderRepository;
-
-public interface IDt_OutOrderProductionDetailRepository : IRepository<Dt_OutOrderProductionDetail>
-{
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderProductionRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderProductionRepository.cs"
deleted file mode 100644
index 921971c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderProductionRepository.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderRepository;
-
-public interface IDt_OutOrderProductionRepository : IRepository<Dt_OutOrderProduction>
-{
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="production">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- int InsertOrderProduction(Dt_OutOrderProduction production);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderRepository.cs"
deleted file mode 100644
index 075c9bb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderRepository.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderRepository;
-
-public interface IDt_OutOrderRepository : IRepository<Dt_OutOrder>
-{
- /// <summary>
- /// 淇敼鍑哄簱璁㈠崟锛堝鑸慨鏀癸級
- /// </summary>
- /// <param name="outOrder"></param>
- /// <returns>鏄惁鎴愬姛</returns>
- Task<bool> OutOrderUpdated(Dt_OutOrder outOrder);
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderTransferDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderTransferDetailRepository.cs"
deleted file mode 100644
index e5e7ded..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderTransferDetailRepository.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderRepository;
-
-public interface IDt_OutOrderTransferDetailRepository : IRepository<Dt_OutOrderTransferDetail>
-{
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderTransferRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderTransferRepository.cs"
deleted file mode 100644
index 0bddca4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/OutboundOrder/IDt_OutOrderTransferRepository.cs"
+++ /dev/null
@@ -1,5 +0,0 @@
-锘縩amespace WIDESEA_IStorageOutOrderRepository;
-
-public interface IDt_OutOrderTransferRepository : IRepository<Dt_OutOrderTransfer>
-{
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/WIDESEA_IStorageOutOrderRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/WIDESEA_IStorageOutOrderRepository.csproj"
deleted file mode 100644
index 8b9ba57..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutIRepository/WIDESEA_IStorageOutOrderRepository.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘�<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_DTO\WIDESEA_DTO.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/GlobalUsing.cs"
deleted file mode 100644
index cdbc65c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/GlobalUsing.cs"
+++ /dev/null
@@ -1,3 +0,0 @@
-锘縢lobal using WIDESEA_Core.BaseRepository;
-global using WIDESEA_IStorageOutOrderRepository;
-global using WIDESEA_Model.Models;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderAndStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderAndStockRepository.cs"
deleted file mode 100644
index a548985..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderAndStockRepository.cs"
+++ /dev/null
@@ -1,59 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderRepository;
-
-public class Dt_OutOrderAndStockRepository : RepositoryBase<Dt_OutOrderAndStock>, IDt_OutOrderAndStockRepository
-{
- public Dt_OutOrderAndStockRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇鍑哄簱鐗╂枡淇℃伅
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="orderNum">鍑哄簱璁㈠崟</param>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <returns>鍑哄簱鐗╂枡淇℃伅</returns>
- public async Task<Dt_OutOrderAndStock> GetOrderAndStock(string locationID = null, string orderNum = null, string palletCode = null)
- {
- return await Db.Queryable<Dt_OutOrderAndStock>()
- .Includes(x => x.OrderList)
- .Includes(x => x.StockList)
- .Includes(x => x.OrderDetailList)
- .Includes(x => x.StockDetailList)
- .Includes(x => x.LocationList)
- .WhereIF(locationID != null, x => x.LocationCode == locationID)
- .WhereIF(orderNum != null, x => x.OrderNumber == orderNum)
- .WhereIF(palletCode != null, x => x.PalletCode == palletCode)
- .FirstAsync();
- }
-
- /// <summary>
- /// 瀵艰埅鍒犻櫎
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool DeleteNavOrderStock(Dt_OutOrderAndStock stock)
- {
- return Db.DeleteNav<Dt_OutOrderAndStock>(x => x.Id == stock.Id)
- .Include(x => x.OrderDetailList)
- .Include(x => x.OrderList)
- .Include(x => x.StockDetailList)
- .Include(x => x.StockList)
- .ExecuteCommand();
- }
-
- /// <summary>
- /// 瀵艰埅鏇存柊
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool UpdateNavOrderStock(Dt_OutOrderAndStock stock)
- {
- return Db.UpdateNav(stock)
- .Include(x => x.OrderDetailList)
- .Include(x => x.OrderList)
- .Include(x => x.StockDetailList)
- .Include(x => x.StockList)
- .ExecuteCommand();
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderAndStock_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderAndStock_HtyRepository.cs"
deleted file mode 100644
index 4896967..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderAndStock_HtyRepository.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderRepository;
-
-public class Dt_OutOrderAndStock_HtyRepository : RepositoryBase<Dt_OutOrderAndStock_Hty>, IDt_OutOrderAndStock_HtyRepository
-{
- public Dt_OutOrderAndStock_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 瀵艰埅娣诲姞锛堟坊鍔犲簱瀛樹富浠庡巻鍙诧紝璁㈠崟涓讳粠鍘嗗彶锛�
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅鍘嗗彶</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool InsertNav(Dt_OutOrderAndStock_Hty stock)
- {
- return Db.InsertNav(stock)
- .Include(x => x.OrderList)
- .Include(x => x.OrderDetailList)
- .Include(x => x.StockList)
- .Include(x => x.StockDetailList)
- .ExecuteCommand();
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderDtailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderDtailRepository.cs"
deleted file mode 100644
index 99d27bd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderDtailRepository.cs"
+++ /dev/null
@@ -1,8 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderRepository;
-
-public class Dt_OutOrderDtailRepository : RepositoryBase<Dt_OutOrderDetail>, IDt_OutOrderDtailRepository
-{
- public Dt_OutOrderDtailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderProductionDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderProductionDetailRepository.cs"
deleted file mode 100644
index 4c6e9c8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderProductionDetailRepository.cs"
+++ /dev/null
@@ -1,8 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderRepository;
-
-public class Dt_OutOrderProductionDetailRepository : RepositoryBase<Dt_OutOrderProductionDetail>, IDt_OutOrderProductionDetailRepository
-{
- public Dt_OutOrderProductionDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderProductionRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderProductionRepository.cs"
deleted file mode 100644
index 981365f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderProductionRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderRepository;
-
-public class Dt_OutOrderProductionRepository : RepositoryBase<Dt_OutOrderProduction>, IDt_OutOrderProductionRepository
-{
- public Dt_OutOrderProductionRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="production">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- public int InsertOrderProduction(Dt_OutOrderProduction production)
- {
- return Db.Insertable(production).ExecuteReturnIdentity();
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderRepository.cs"
deleted file mode 100644
index a12a44a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderRepository.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderRepository;
-
-public class Dt_OutOrderRepository : RepositoryBase<Dt_OutOrder>, IDt_OutOrderRepository
-{
- public Dt_OutOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- /// <summary>
- /// 淇敼鍑哄簱璁㈠崟锛堝鑸慨鏀癸級
- /// </summary>
- /// <param name="outOrder"></param>
- /// <returns>鏄惁鎴愬姛</returns>
- public async Task<bool> OutOrderUpdated(Dt_OutOrder outOrder)
- {
- return await Db.UpdateNav(outOrder)
- .Include(x => x.OrderDetailList)
- .ExecuteCommandAsync();
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderTransferDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderTransferDetailRepository.cs"
deleted file mode 100644
index 01c4b84..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderTransferDetailRepository.cs"
+++ /dev/null
@@ -1,8 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderRepository;
-
-public class Dt_OutOrderTransferDetailRepository : RepositoryBase<Dt_OutOrderTransferDetail>, IDt_OutOrderTransferDetailRepository
-{
- public Dt_OutOrderTransferDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderTransferRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderTransferRepository.cs"
deleted file mode 100644
index f41f099..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/OutboundOrder/Dt_OutOrderTransferRepository.cs"
+++ /dev/null
@@ -1,8 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderRepository;
-
-public class Dt_OutOrderTransferRepository : RepositoryBase<Dt_OutOrderTransfer>, IDt_OutOrderTransferRepository
-{
- public Dt_OutOrderTransferRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/WIDESEA_StorageOutOrderRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/WIDESEA_StorageOutOrderRepository.csproj"
deleted file mode 100644
index ef6b8e4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/WIDESEA_StorageOutOrderRepository.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_StorageOutIRepository\WIDESEA_IStorageOutOrderRepository.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/GlobalUsing.cs"
deleted file mode 100644
index e21433c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/GlobalUsing.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縢lobal using AutoMapper;
-global using System.Threading.Tasks;
-global using WIDESEA_Common;
-global using WIDESEA_Common.Location;
-global using WIDESEA_Core;
-global using WIDESEA_Core.BaseRepository;
-global using WIDESEA_Core.BaseServices;
-global using WIDESEA_Core.Helper;
-global using WIDESEA_IStorageOutOrderRepository;
-global using WIDESEA_IStorageOutOrderServices;
-global using WIDESEA_Model.Models;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderAndStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderAndStockService.cs"
deleted file mode 100644
index 8a86f76..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderAndStockService.cs"
+++ /dev/null
@@ -1,44 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderServices;
-
-public class Dt_OutOrderAndStockService : ServiceBase<Dt_OutOrderAndStock, IDt_OutOrderAndStockRepository>, IDt_OutOrderAndStockService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderAndStockService(IDt_OutOrderAndStockRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鏍规嵁鐗瑰畾鏉′欢鑾峰彇鍑哄簱鐗╂枡淇℃伅
- /// </summary>
- /// <param name="locationID">璐т綅ID</param>
- /// <param name="orderNum">鍑哄簱璁㈠崟</param>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <returns>鍑哄簱鐗╂枡淇℃伅</returns>
- public async Task<Dt_OutOrderAndStock> GetOrderAndStock(string locationID = null, string orderNum = null, string palletCode = null)
- {
- return await BaseDal.GetOrderAndStock(locationID, orderNum, palletCode);
- }
-
- /// <summary>
- /// 瀵艰埅鍒犻櫎
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool DeleteNavOrderStock(Dt_OutOrderAndStock stock)
- {
- return BaseDal.DeleteNavOrderStock(stock);
- }
-
- /// <summary>
- /// 瀵艰埅鏇存柊
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool UpdateNavOrderStock(Dt_OutOrderAndStock stock)
- {
- return BaseDal.UpdateNavOrderStock(stock);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderAndStock_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderAndStock_HtyService.cs"
deleted file mode 100644
index c6d6197..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderAndStock_HtyService.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderServices;
-
-public class Dt_OutOrderAndStock_HtyService : ServiceBase<Dt_OutOrderAndStock_Hty, IDt_OutOrderAndStock_HtyRepository>, IDt_OutOrderAndStock_HtyService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderAndStock_HtyService(IDt_OutOrderAndStock_HtyRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 瀵艰埅娣诲姞锛堟坊鍔犲簱瀛樹富浠庡巻鍙诧紝璁㈠崟涓讳粠鍘嗗彶锛�
- /// </summary>
- /// <param name="stock">鍑哄簱鐗╂枡淇℃伅鍘嗗彶</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool InsertNav(Dt_OutOrderAndStock_Hty stock)
- {
- return BaseDal.InsertNav(stock);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderDtailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderDtailService.cs"
deleted file mode 100644
index 9de222c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderDtailService.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderServices;
-
-public class Dt_OutOrderDtailService : ServiceBase<Dt_OutOrderDetail, IDt_OutOrderDtailRepository>, IDt_OutOrderDtailService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderDtailService(IDt_OutOrderDtailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderProductionDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderProductionDetailService.cs"
deleted file mode 100644
index a8dedfa..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderProductionDetailService.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderServices;
-
-public class Dt_OutOrderProductionDetailService : ServiceBase<Dt_OutOrderProductionDetail, IDt_OutOrderProductionDetailRepository>, IDt_OutOrderProductionDetailService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderProductionDetailService(IDt_OutOrderProductionDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="productionDetail">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- public int AddOrderProductionDetail(Dt_OutOrderProductionDetail productionDetail)
- {
- return BaseDal.AddData(productionDetail);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderProductionService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderProductionService.cs"
deleted file mode 100644
index 450ef3a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderProductionService.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderServices;
-
-public class Dt_OutOrderProductionService : ServiceBase<Dt_OutOrderProduction, IDt_OutOrderProductionRepository>, IDt_OutOrderProductionService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderProductionService(IDt_OutOrderProductionRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-
- /// <summary>
- /// 鎻掑叆鏁版嵁杩斿洖涓婚敭
- /// </summary>
- /// <param name="production">瀹炰綋鏁版嵁</param>
- /// <returns>涓婚敭ID</returns>
- public int AddOrderProduction(Dt_OutOrderProduction production)
- {
- return BaseDal.AddData(production);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderService.cs"
deleted file mode 100644
index 551b0a2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderService.cs"
+++ /dev/null
@@ -1,350 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderServices;
-
-public class Dt_OutOrderService : ServiceBase<Dt_OutOrder, IDt_OutOrderRepository>, IDt_OutOrderService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderProductionService _outOrderProductionService;
- private readonly IDt_OutOrderProductionDetailService _outOrderProductionDetailService;
- private readonly IDt_OutOrderDtailService _outOrderDtailService;
- private readonly IDt_OutOrderTransferRepository _OutOrderTransferRepository;
- private readonly IDt_OutOrderTransferDetailRepository _OutOrderTransferDetailRepository;
-
- public Dt_OutOrderService(IDt_OutOrderRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderProductionService outOrderProductionService,
- IDt_OutOrderProductionDetailService outOrderProductionDetailService,
- IDt_OutOrderDtailService outOrderDtailService,
- IDt_OutOrderTransferDetailRepository outOrderTransferDetailRepository,
- IDt_OutOrderTransferRepository outOrderTransferRepository) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderProductionService = outOrderProductionService;
- _outOrderProductionDetailService = outOrderProductionDetailService;
- _outOrderDtailService = outOrderDtailService;
- _OutOrderTransferDetailRepository = outOrderTransferDetailRepository;
- _OutOrderTransferRepository = outOrderTransferRepository;
- }
-
- /// <summary>
- /// 娣诲姞鐢熶骇鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- public WebResponseContent AddOutOrderProduction(SaveModel model)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- // 1. 鏋勫缓鐢熶骇鍑哄簱鍗曞璞�
- var production = CreateProductionOrder(model.MainData);
-
- // 2. 鏋勫缓鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛�
- var productionDetails = CreateProductionDetails(model.DetailData);
-
- // 3. 鏋勫缓绯荤粺鍑哄簱鍗曞璞�
- var order = CreateSystemOrder(production);
-
- // 4. 鏋勫缓绯荤粺鍑哄簱鍗曟槑缁嗗垪琛�
- var orderDetails = CreateSystemOrderDetails(productionDetails);
-
- // 寮�鍚簨鍔�
- _unitOfWorkManage.BeginTran();
- // 5. 娣诲姞鐢熶骇鍑哄簱鍗曞苟鑾峰彇涓婚敭ID
- var productionId = _outOrderProductionService.AddOrderProduction(production);
-
- // 6. 鐢熶骇鍑哄簱鍗曟槑缁嗙粦瀹氫富琛↖D
- productionDetails.ForEach(item => { item.ProductionOutOrderId = productionId; });
-
- // 7. 娣诲姞鐢熶骇鍑哄簱鍗曟槑缁�
- var detailAddResult = _outOrderProductionDetailService.AddData(productionDetails);
-
- // 8. 绯荤粺鍑哄簱鍗曠粦瀹氱敓浜у嚭搴撳崟ID
- order.UpperOutOrderId = productionId;
-
- // 9. 娣诲姞绯荤粺鍑哄簱鍗曞苟鑾峰彇涓婚敭ID
- var orderId = BaseDal.AddData(order);
-
- // 10 . 绯荤粺鍑哄簱鍗曟槑缁嗙粦瀹氫富琛↖D
- orderDetails.ForEach(item => { item.OutOrderId = orderId; });
-
- // 11. 娣诲姞绯荤粺鍑哄簱鍗曟槑缁嗗苟杩斿洖缁撴灉
- content = _outOrderDtailService.AddData(orderDetails);
- if (content.Status && productionId > 0 && detailAddResult.Status && orderId > 0)
- _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
- else
- throw new Exception("鍑哄簱鍗曟坊鍔犲け璐�");
-
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran(); // 鍥炴粴浜嬪姟
- return content.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 娣诲姞璋冩嫧鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- public WebResponseContent AddOutOrderTransfer(SaveModel model)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- // 1. 鏋勫缓璋冩嫧鍑哄簱鍗曞璞�
- var transfer = CreateTransferOrder(model.MainData);
-
- // 2. 鏋勫缓璋冩嫧鍑哄簱鍗曟槑缁嗗垪琛�
- var transferDetail = CreateTransferDetails(model.DetailData);
-
- // 3. 鏋勫缓绯荤粺鍑哄簱鍗曞璞�
- var order = CreateSystemOrder(transfer);
-
- // 4. 鏋勫缓绯荤粺鍑哄簱鍗曟槑缁嗗垪琛�
- var orderDetails = CreateSystemOrderDetails(transferDetail);
-
- // 娣诲姞浜嬪姟
- _unitOfWorkManage.BeginTran();
-
- // 5. 娣诲姞璋冩嫧鍑哄簱鍗曞苟鑾峰彇涓婚敭ID
- var transferId = _OutOrderTransferRepository.AddData(transfer);
-
- // 6. 璋冩嫧鍑哄簱鍗曟槑缁嗙粦瀹氫富琛↖D
- transferDetail.ForEach(item => { item.TransferOutOrderId = transferId; });
-
- // 7. 娣诲姞鐢熶骇鍑哄簱鍗曟槑缁�
- var detailAddResult = _OutOrderTransferDetailRepository.AddData(transferDetail);
-
- // 8. 绯荤粺鍑哄簱鍗曠粦瀹氳皟鎷ㄥ嚭搴撳崟ID
- order.UpperOutOrderId = transferId;
-
- // 9. 娣诲姞绯荤粺鍑哄簱鍗曞苟鑾峰彇涓婚敭ID
- var orderId = BaseDal.AddData(order);
-
- // 10 . 绯荤粺鍑哄簱鍗曟槑缁嗙粦瀹氫富琛↖D
- orderDetails.ForEach(item => { item.OutOrderId = orderId; });
-
- // 11. 娣诲姞绯荤粺鍑哄簱鍗曟槑缁嗗苟杩斿洖缁撴灉
- content = _outOrderDtailService.AddData(orderDetails);
- if (content.Status && transferId > 0 && detailAddResult > 0 && orderId > 0)
- _unitOfWorkManage.CommitTran(); // 鎻愪氦浜嬪姟
- else
- throw new Exception("鍑哄簱鍗曟坊鍔犲け璐�");
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran(); // 鍥炴粴浜嬪姟
- return content.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鏍规嵁鍑哄簱鍗曞彿鏌ヨ鍑哄簱璁㈠崟
- /// </summary>
- /// <param name="orderNumber">鍑哄簱鍗曞彿</param>
- /// <returns>鍑哄簱璁㈠崟</returns>
- public WebResponseContent GetOutOrderByNumber(string orderNumber)
- {
- WebResponseContent content = new WebResponseContent();
- var order = Db.Queryable<Dt_OutOrder>()
- .Includes(x => x.OrderDetailList)
- .Where(x => x.OrderNumber == orderNumber).First();
- if (order == null)
- content.Error($"璁㈠崟缂栧彿{orderNumber}鏌ヨ涓虹┖");
- else
- content.OK("鏌ヨ鎴愬姛", order);
- return content;
- }
-
- /// <summary>
- /// 淇敼鍑哄簱璁㈠崟锛堝鑸慨鏀癸級
- /// </summary>
- /// <param name="outOrder"></param>
- /// <returns>鏄惁鎴愬姛</returns>
- public async Task<bool> OutOrderUpdated(Dt_OutOrder outOrder)
- {
- return await BaseDal.OutOrderUpdated(outOrder);
- }
-
- #region 绉佹湁鏂规硶
-
- #region 鐢熶骇鍑哄簱鍗�
-
- /// <summary>
- /// 鏍规嵁涓绘暟鎹瀯寤虹敓浜у嚭搴撳崟瀵硅薄銆�
- /// </summary>
- private Dt_OutOrderProduction CreateProductionOrder(Dictionary<string, object> mainData)
- {
- return new Dt_OutOrderProduction
- {
- OrderNumber = mainData.GetValueOrDefault("OrderNumber")?.ToString(),
- WarehouseId = mainData.GetValueOrDefault("WarehouseId")?.ObjToInt() ?? 0,
- Status = mainData.GetValueOrDefault("Status")?.ToString(),
- Remarks = mainData.GetValueOrDefault("Remarks")?.ToString(),
- Creater = mainData.GetValueOrDefault("Creater")?.ToString(),
- CreateDate = mainData.GetValueOrDefault("CreateDate")?.ObjToDate() ?? DateTime.Now,
- OrderDate = mainData.GetValueOrDefault("OrderDate")?.ObjToDate() ?? DateTime.Now,
- };
- }
-
- /// <summary>
- /// 鏍规嵁鏄庣粏鏁版嵁鍜岀敓浜у嚭搴撳崟ID鏋勫缓鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛ㄣ��
- /// </summary>
- private List<Dt_OutOrderProductionDetail> CreateProductionDetails(List<Dictionary<string, object>> detailData)
- {
- var details = new List<Dt_OutOrderProductionDetail>();
- foreach (var item in detailData)
- {
- var detail = new Dt_OutOrderProductionDetail
- {
- MaterialId = item.GetValueOrDefault("MaterialId")?.ObjToInt() ?? 0,
- Quantity = item.GetValueOrDefault("Quantity")?.ObjToInt() ?? 0,
- UnitPrice = item.GetValueOrDefault("UnitPrice")?.ObjToDecimal(),
- TotalPrice = item.GetValueOrDefault("TotalPrice")?.ObjToDecimal(),
- Remarks = item.GetValueOrDefault("Remarks")?.ToString(),
- CreateDate = item.GetValueOrDefault("CreateDate")?.ObjToDate() ?? DateTime.Now,
- Creater = item.GetValueOrDefault("Creater")?.ToString(),
- BatchNumber = item.GetValueOrDefault("BatchNumber")?.ToString(),
- };
- details.Add(detail);
- }
- return details;
- }
-
- /// <summary>
- /// 鏍规嵁鐢熶骇鍑哄簱鍗曞璞″拰鐢熶骇鍑哄簱鍗旾D鏋勫缓绯荤粺鍑哄簱鍗曞璞°��
- /// </summary>
- private Dt_OutOrder CreateSystemOrder(Dt_OutOrderProduction production)
- {
- return new Dt_OutOrder
- {
- Status = production.Status,
- CreateDate = DateTime.Now,
- Creater = production.Creater,
- OrderDate = DateTime.Now,
- OrderNumber = production.OrderNumber,
- Remarks = production.Remarks,
- WarehouseId = production.WarehouseId,
- };
- }
-
- /// <summary>
- /// 鏍规嵁鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛ㄥ拰绯荤粺鍑哄簱鍗旾D鏋勫缓绯荤粺鍑哄簱鍗曟槑缁嗗垪琛ㄣ��
- /// </summary>
- private List<Dt_OutOrderDetail> CreateSystemOrderDetails(List<Dt_OutOrderProductionDetail> productionDetails)
- {
- var orderDetails = new List<Dt_OutOrderDetail>();
- foreach (var item in productionDetails)
- {
- var detail = new Dt_OutOrderDetail
- {
- AllocatedQuantity = 0,
- BatchNumber = item.BatchNumber,
- CompletedQuantity = 0,
- CreateDate = item.CreateDate,
- Creater = item.Creater,
- MaterialId = item.MaterialId,
- OutboundQuantity = item.Quantity,
- Remarks = item.Remarks,
- MaterialName = item.Remarks // 鐗╂枡鍚嶇О
- };
- orderDetails.Add(detail);
- }
- return orderDetails;
- }
-
- #endregion 鐢熶骇鍑哄簱鍗�
-
- #region 璋冩嫧鍑哄簱鍗�
-
- /// <summary>
- /// 鏍规嵁涓绘暟鎹瀯寤虹敓浜у嚭搴撳崟瀵硅薄銆�
- /// </summary>
- private Dt_OutOrderTransfer CreateTransferOrder(Dictionary<string, object> mainData)
- {
- return new Dt_OutOrderTransfer
- {
- OrderNumber = mainData.GetValueOrDefault("OrderNumber")?.ToString(),
- SourceWarehouseId = mainData.GetValueOrDefault("SourceWarehouseId")?.ObjToInt() ?? 0,
- DestinationWarehouseId = mainData.GetValueOrDefault("WarehouseId")?.ObjToInt() ?? 0,
- Status = mainData.GetValueOrDefault("Status")?.ToString(),
- Remarks = mainData.GetValueOrDefault("Remarks")?.ToString(),
- Creater = mainData.GetValueOrDefault("Creater")?.ToString(),
- CreateDate = mainData.GetValueOrDefault("CreateDate")?.ObjToDate() ?? DateTime.Now,
- OrderDate = mainData.GetValueOrDefault("OrderDate")?.ObjToDate() ?? DateTime.Now,
- };
- }
-
- /// <summary>
- /// 鏍规嵁鏄庣粏鏁版嵁鍜岀敓浜у嚭搴撳崟ID鏋勫缓鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛ㄣ��
- /// </summary>
- private List<Dt_OutOrderTransferDetail> CreateTransferDetails(List<Dictionary<string, object>> detailData)
- {
- var details = new List<Dt_OutOrderTransferDetail>();
- foreach (var item in detailData)
- {
- var detail = new Dt_OutOrderTransferDetail
- {
- MaterialId = item.GetValueOrDefault("MaterialId")?.ObjToInt() ?? 0,
- Quantity = item.GetValueOrDefault("Quantity")?.ObjToInt() ?? 0,
- UnitPrice = item.GetValueOrDefault("UnitPrice")?.ObjToDecimal(),
- TotalPrice = item.GetValueOrDefault("TotalPrice")?.ObjToDecimal(),
- Remarks = item.GetValueOrDefault("Remarks")?.ToString(),
- CreateDate = item.GetValueOrDefault("CreateDate")?.ObjToDate() ?? DateTime.Now,
- Creater = item.GetValueOrDefault("Creater")?.ToString(),
- BatchNumber = item.GetValueOrDefault("BatchNumber")?.ToString(),
- };
- details.Add(detail);
- }
- return details;
- }
-
- /// <summary>
- /// 鏍规嵁鐢熶骇鍑哄簱鍗曞璞″拰鐢熶骇鍑哄簱鍗旾D鏋勫缓绯荤粺鍑哄簱鍗曞璞°��
- /// </summary>
- private Dt_OutOrder CreateSystemOrder(Dt_OutOrderTransfer transfer)
- {
- return new Dt_OutOrder
- {
- Status = transfer.Status,
- CreateDate = DateTime.Now,
- Creater = transfer.Creater,
- OrderDate = DateTime.Now,
- OrderNumber = transfer.OrderNumber,
- Remarks = transfer.Remarks,
- WarehouseId = transfer.SourceWarehouseId,
- };
- }
-
- /// <summary>
- /// 鏍规嵁鐢熶骇鍑哄簱鍗曟槑缁嗗垪琛ㄥ拰绯荤粺鍑哄簱鍗旾D鏋勫缓绯荤粺鍑哄簱鍗曟槑缁嗗垪琛ㄣ��
- /// </summary>
- private List<Dt_OutOrderDetail> CreateSystemOrderDetails(List<Dt_OutOrderTransferDetail> transferDetails)
- {
- var orderDetails = new List<Dt_OutOrderDetail>();
- foreach (var item in transferDetails)
- {
- var detail = new Dt_OutOrderDetail
- {
- AllocatedQuantity = 0,
- BatchNumber = item.BatchNumber,
- CompletedQuantity = 0,
- CreateDate = item.CreateDate,
- Creater = item.Creater,
- MaterialId = item.MaterialId,
- OutboundQuantity = item.Quantity,
- Remarks = item.Remarks,
- MaterialName = item.Remarks // 鐗╂枡鍚嶇О
- };
- orderDetails.Add(detail);
- }
- return orderDetails;
- }
-
- #endregion 璋冩嫧鍑哄簱鍗�
-
- #endregion 绉佹湁鏂规硶
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderTransferDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderTransferDetailService.cs"
deleted file mode 100644
index 357877c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderTransferDetailService.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderServices;
-
-public class Dt_OutOrderTransferDetailService : ServiceBase<Dt_OutOrderTransferDetail, IDt_OutOrderTransferDetailRepository>, IDt_OutOrderTransferDetailService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderTransferDetailService(IDt_OutOrderTransferDetailRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderTransferService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderTransferService.cs"
deleted file mode 100644
index c15cb50..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/OutboundOrder/Dt_OutOrderTransferService.cs"
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縩amespace WIDESEA_StorageOutOrderServices;
-
-public class Dt_OutOrderTransferService : ServiceBase<Dt_OutOrderTransfer, IDt_OutOrderTransferRepository>, IDt_OutOrderTransferService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
-
- public Dt_OutOrderTransferService(IDt_OutOrderTransferRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/WIDESEA_StorageOutOrderService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/WIDESEA_StorageOutOrderService.csproj"
deleted file mode 100644
index e942bda..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/WIDESEA_StorageOutOrderService.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IStorageOutOrderService\WIDESEA_IStorageOutOrderService.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/Dt_TaskRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/Dt_TaskRepository.cs"
deleted file mode 100644
index e5ddb10..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/Dt_TaskRepository.cs"
+++ /dev/null
@@ -1,71 +0,0 @@
-锘縰sing WIDESEA_IStorageOutTaskRepository;
-
-namespace WIDESEA_StorageOutTaskRepository
-{
- public class Dt_TaskRepository : RepositoryBase<Dt_Task>, IDt_TaskRepository
- {
- public Dt_TaskRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- public async Task<Dt_Task> Create(Dt_Task model)
- {
- return await Db.Insertable(model).ExecuteReturnEntityAsync();
- }
-
- public async Task<bool> Create(List<Dt_Task> models)
- {
- var num = Db.Insertable(models).ExecuteCommand();
- if (num == models.Count)
- return await Task.FromResult(true);
- else
- return await Task.FromResult(false);
- }
-
- public async Task<bool> Delete(int id)
- {
- return await Db.Deleteable<Dt_Task>().In(id).ExecuteCommandHasChangeAsync();
- }
-
- public async Task<bool> Delete(List<int> ids)
- {
- return await Db.Deleteable<Dt_Task>().In(ids.ToArray()).ExecuteCommandHasChangeAsync();
- }
-
- public async Task<Dt_Task> GetById(int id)
- {
- return await Db.Queryable<Dt_Task>().InSingleAsync(id);
- }
-
- public async Task<List<Dt_Task>> GetList()
- {
- return await Db.Queryable<Dt_Task>().ToListAsync();
- }
-
- public async Task<List<Dt_Task>> GetListByOutOrder(int outOrderId)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.InboundNo == outOrderId.ToString()).ToListAsync();
- }
-
- public async Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.InboundNo == outOrderId.ToString())
- .Where(x => x.TaskState == status.ToString()).ToListAsync();
- }
-
- public async Task<List<Dt_Task>> GetListByStatus(int status)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.TaskState == status.ToString()).ToListAsync();
- }
-
- public async Task<bool> Update(Dt_Task model)
- {
- return await Db.Updateable(model).ExecuteCommandHasChangeAsync();
- }
-
- public async Task<bool> Update(List<Dt_Task> models)
- {
- return await Db.Updateable(models).ExecuteCommandHasChangeAsync();
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/Dt_Task_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/Dt_Task_HtyRepository.cs"
deleted file mode 100644
index ece38a2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/Dt_Task_HtyRepository.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing WIDESEA_IStorageOutTaskRepository;
-
-namespace WIDESEA_StorageOutTaskRepository
-{
- public class Dt_Task_HtyRepository : RepositoryBase<Dt_Task_Hty>, IDt_Task_HtyRepository
- {
- public Dt_Task_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- public bool InsertTask(Dt_Task_Hty task)
- {
- return Db.Insertable(task).ExecuteCommand() > 0;
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/GlobalUsing.cs"
deleted file mode 100644
index 1e77085..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/GlobalUsing.cs"
+++ /dev/null
@@ -1,3 +0,0 @@
-锘縢lobal using WIDESEA_Core.BaseRepository;
-global using WIDESEA_IStorageOutTaskRepository;
-global using WIDESEA_Model.Models;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/WIDESEA_StorageOutTaskRepository.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/WIDESEA_StorageOutTaskRepository.csproj"
deleted file mode 100644
index af12b4d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskRepository/WIDESEA_StorageOutTaskRepository.csproj"
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IStorageOutTaskRepository\WIDESEA_IStorageOutTaskRepository.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/GlobalUsing.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/GlobalUsing.cs"
deleted file mode 100644
index 13f3cdd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/GlobalUsing.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縢lobal using AutoMapper;
-global using System.Threading.Tasks;
-global using WIDESEA_Common;
-global using WIDESEA_Common.Location;
-global using WIDESEA_Core;
-global using WIDESEA_Core.BaseRepository;
-global using WIDESEA_Core.BaseServices;
-global using WIDESEA_Core.Helper;
-global using WIDESEA_IStorageOutTaskRepository;
-global using WIDESEA_IStorageOutTaskServices;
-global using WIDESEA_IStorageOutBasicRepository;
-global using WIDESEA_IStorageOutBasicServices;
-global using WIDESEA_IStorageOutOrderRepository;
-global using WIDESEA_IStorageOutOrderServices;
-global using WIDESEA_Model.Models;
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/Task/Dt_TaskService.cs"
deleted file mode 100644
index d9d57bc..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/Task/Dt_TaskService.cs"
+++ /dev/null
@@ -1,457 +0,0 @@
-锘縩amespace WIDESEA_StorageOutTaskServices;
-
-public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderService _outOrderService;
- private readonly IDt_BillGroupStockService _BillGroupStockService;
- private readonly IDt_Task_HtyService _Task_HtyService;
- private readonly IDt_OutOrderAndStockRepository _OutOrderAndStockRepository;
- private readonly IDt_OutOrderAndStock_HtyService _OutOrderAndStock_HtyService;
- private readonly IMapper _mapper;
-
- public Dt_TaskService(IDt_TaskRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService,
- IDt_BillGroupStockService billGroupStockService,
- IDt_OutOrderAndStockRepository dt_OutOrderAndStockRepository,
- IDt_OutOrderAndStock_HtyService dt_OutOrderAndStock_HtyService,
- IDt_Task_HtyService task_HtyService,
- IMapper mapper) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderService = outOrderService;
- _BillGroupStockService = billGroupStockService;
- _OutOrderAndStockRepository = dt_OutOrderAndStockRepository;
- _OutOrderAndStock_HtyService = dt_OutOrderAndStock_HtyService;
- _Task_HtyService = task_HtyService;
- _mapper = mapper;
- }
-
- #region 澶栭儴鎺ュ彛鏂规硶
-
- /// <summary>
- /// 鍫嗗灈鏈轰换鍔″畬鎴�
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> CompleteStackTaskAsync(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- // 鎻愬彇骞堕獙璇佷富鏁版嵁
- var barCode = saveModel.MainData.GetValueOrDefault("barCode")?.ToString();
- var taskNum = saveModel.MainData.GetValueOrDefault("taskNum")?.ObjToInt() ?? 0;
- var target = saveModel.MainData.GetValueOrDefault("target")?.ToString();
-
- // 鑾峰彇浠诲姟鍜屽簱瀛樹俊鎭�
- var task = await GetByTaskNum(taskNum);
- if (task == null)
- {
- return content.Error("浠诲姟涓嶅瓨鍦�");
- }
-
- var stock = await _BillGroupStockService.GetStocks(palletCode: barCode);
- if (stock == null)
- {
- return content.Error("搴撳瓨涓嶅瓨鍦�");
- }
-
- // 鏇存柊搴撳瓨鐘舵��
- stock.LocationCode = null;
- stock.LocationInfo.Status = LocationStateConst.LocationState_Empty;
-
- // 鏇存柊浠诲姟鐘舵��
- task.TaskState = TaskStateConst.StackerCompleted.ToString();
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = target;
- task.TargetAddress = target;
-
- // 浜嬪姟澶勭悊
- _unitOfWorkManage.BeginTran();
- var isStockUpdated = _BillGroupStockService.UpdateNavStock(stock);
- var isTaskUpdated = await Update(task);
-
- if (isStockUpdated && isTaskUpdated)
- {
- _unitOfWorkManage.CommitTran();
- return content.OK("浠诲姟瀹屾垚鎴愬姛");
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("浠诲姟鎴栧簱瀛樻洿鏂板け璐�");
- }
- }
- catch (Exception err)
- {
- Console.WriteLine(err.Message);
- return content.Error(err.Message);
- }
- }
-
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> CompleteTaskAsync(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
-
- try
- {
- // 鎻愬彇浠诲姟鏁版嵁
- var barCode = saveModel.MainData.GetValueOrDefault("barCode")?.ToString();
- var taskNum = saveModel.MainData.GetValueOrDefault("taskNum")?.ObjToInt() ?? 0;
-
- // 楠岃瘉浠诲姟鏄惁瀛樺湪
- var task = await GetByTaskNum(taskNum);
- if (task == null)
- {
- return content.Error("浠诲姟涓嶅瓨鍦�");
- }
-
- // 楠岃瘉搴撳瓨鏄惁瀛樺湪
- var stock = await _BillGroupStockService.GetStocks(palletCode: barCode);
- if (stock == null)
- {
- return content.Error("搴撳瓨涓嶅瓨鍦�");
- }
-
- // 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樹俊鎭�
- var orderStock = await UpdateOrderAndStockAsync(stock, barCode);
-
- // 妫�鏌ヨ鍗曟槸鍚﹀畬鎴愬苟澶勭悊鍚庣画鎿嶄綔
- if (IsOrderComplete(orderStock))
- {
- // 澶勭悊宸插畬鎴愯鍗�
- await ProcessCompletedOrderAsync(orderStock, task);
- }
- else
- {
- // 澶勭悊鏈畬鎴愯鍗�
- await ProcessUpdateOrderAsync(orderStock, task);
- }
-
- content.OK("浠诲姟瀹屾垚");
- }
- catch (Exception err)
- {
- // 璁板綍寮傚父淇℃伅
- Console.WriteLine(err.Message.ToString());
- content.Error("浠诲姟瀹屾垚澶辫触");
- }
-
- return content;
- }
-
- #endregion 澶栭儴鎺ュ彛鏂规硶
-
- #region 鍐呴儴璋冪敤鏂规硶
-
- /// <summary>
- /// 鍒涘缓涓�涓柊鐨勪换鍔�
- /// </summary>
- /// <param name="model">浠诲姟妯″瀷</param>
- /// <returns>鍒涘缓鐨勪换鍔�</returns>
- public async Task<Dt_Task> Create(Dt_Task model)
- {
- return await BaseDal.Create(model);
- }
-
- /// <summary>
- /// 鎵归噺鍒涘缓浠诲姟
- /// </summary>
- /// <param name="models">浠诲姟妯″瀷鍒楄〃</param>
- /// <returns>鏄惁鍒涘缓鎴愬姛</returns>
- public async Task<bool> Create(List<Dt_Task> models)
- {
- return await BaseDal.Create(models);
- }
-
- /// <summary>
- /// 鍒犻櫎涓�涓换鍔�
- /// </summary>
- /// <param name="id">浠诲姟ID</param>
- /// <returns>鏄惁鍒犻櫎鎴愬姛</returns>
- public async Task<bool> Delete(int id)
- {
- return await BaseDal.Delete(id);
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎浠诲姟
- /// </summary>
- /// <param name="ids">浠诲姟ID鍒楄〃</param>
- /// <returns>鏄惁鍒犻櫎鎴愬姛</returns>
- public async Task<bool> Delete(List<int> ids)
- {
- return await BaseDal.Delete(ids);
- }
-
- /// <summary>
- /// 閫氳繃ID鑾峰彇浠诲姟
- /// </summary>
- /// <param name="id">浠诲姟ID</param>
- /// <returns>浠诲姟妯″瀷</returns>
- public async Task<Dt_Task> GetById(int id)
- {
- return await BaseDal.GetById(id);
- }
-
- /// <summary>
- /// 鑾峰彇鎵�鏈変换鍔″垪琛�
- /// </summary>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- public async Task<List<Dt_Task>> GetList()
- {
- return await BaseDal.GetList();
- }
-
- /// <summary>
- /// 鏍规嵁鍑哄簱璁㈠崟ID鑾峰彇浠诲姟鍒楄〃
- /// </summary>
- /// <param name="outOrderId">鍑哄簱璁㈠崟ID</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- public async Task<List<Dt_Task>> GetListByOutOrder(int outOrderId)
- {
- return await BaseDal.GetListByOutOrder(outOrderId);
- }
-
- /// <summary>
- /// 鏍规嵁鍑哄簱璁㈠崟ID鍜岀姸鎬佽幏鍙栦换鍔″垪琛�
- /// </summary>
- /// <param name="outOrderId">鍑哄簱璁㈠崟ID</param>
- /// <param name="status">浠诲姟鐘舵��</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- public async Task<List<Dt_Task>> GetListByOutOrderAndStatus(int outOrderId, int status)
- {
- return await BaseDal.GetListByOutOrderAndStatus(outOrderId, status);
- }
-
- /// <summary>
- /// 鏍规嵁鐘舵�佽幏鍙栦换鍔″垪琛�
- /// </summary>
- /// <param name="status">浠诲姟鐘舵��</param>
- /// <returns>浠诲姟妯″瀷鍒楄〃</returns>
- public async Task<List<Dt_Task>> GetListByStatus(int status)
- {
- return await BaseDal.GetListByStatus(status);
- }
-
- /// <summary>
- /// 鏇存柊涓�涓换鍔�
- /// </summary>
- /// <param name="model">浠诲姟妯″瀷</param>
- /// <returns>鏄惁鏇存柊鎴愬姛</returns>
- public async Task<bool> Update(Dt_Task model)
- {
- return await BaseDal.Update(model);
- }
-
- /// <summary>
- /// 鎵归噺鏇存柊浠诲姟
- /// </summary>
- /// <param name="models">浠诲姟妯″瀷鍒楄〃</param>
- /// <returns>鏄惁鏇存柊鎴愬姛</returns>
- public async Task<bool> Update(List<Dt_Task> models)
- {
- return await BaseDal.Update(models);
- }
-
- /// <summary>
- /// 妫�鏌ヤ换鍔℃槸鍚﹀瓨鍦�
- /// </summary>
- /// <param name="palletCode">鎵樼洏缂栫爜</param>
- /// <returns>浠诲姟鏄惁瀛樺湪</returns>
- public bool IsExist(string palletCode)
- {
- return Db.Queryable<Dt_Task>().Any(x => x.PalletCode == palletCode);
- }
-
- /// <summary>
- /// 鏍规嵁璐т綅ID鑾峰彇浠诲姟
- /// </summary>
- /// <param name="locationID"></param>
- /// <returns></returns>
- public async Task<Dt_Task> GetByLocation(string locationID)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.SourceAddress == locationID).FirstAsync();
- }
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔�
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- public async Task<Dt_Task> GetByTaskNum(int taskNum)
- {
- return await Db.Queryable<Dt_Task>().Where(x => x.TaskNum == taskNum).FirstAsync();
- }
-
- #endregion 鍐呴儴璋冪敤鏂规硶
-
- #region private 鍐呴儴鏂规硶
-
- /// <summary>
- /// 鏇存柊鍑哄簱璁㈠崟鍜屽簱瀛樹俊鎭�
- /// </summary>
- /// <param name="stock">搴撳瓨瀹炰緥</param>
- /// <param name="barCode">鏉＄爜</param>
- /// <returns>鏇存柊鍚庣殑璁㈠崟鍜屽簱瀛樹俊鎭�</returns>
- private async Task<Dt_OutOrderAndStock> UpdateOrderAndStockAsync(Dt_BillGroupStock stock, string barCode)
- {
- var orderStock = await _OutOrderAndStockRepository.GetOrderAndStock(palletCode: barCode);
-
- orderStock.CompletedQuantity += stock.StockDetailList.PalletQuantity.Value;
- orderStock.OrderDetailList.CompletedQuantity += stock.StockDetailList.PalletQuantity.Value;
-
- return orderStock;
- }
-
- /// <summary>
- /// 鍒ゆ柇璁㈠崟鏄惁瀹屾垚
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <returns>鏄惁瀹屾垚</returns>
- private bool IsOrderComplete(Dt_OutOrderAndStock orderStock)
- {
- return orderStock.CompletedQuantity == orderStock.OutboundQuantity;
- }
-
- /// <summary>
- /// 澶勭悊宸插畬鎴愮殑璁㈠崟
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <param name="task">浠诲姟鏁版嵁</param>
- /// <returns>寮傛浠诲姟</returns>
- private async Task ProcessCompletedOrderAsync(Dt_OutOrderAndStock orderStock, Dt_Task task)
- {
- // 鍒涘缓鍘嗗彶璁㈠崟璁板綍
- var stockHty = CreateHistoricalOrder(orderStock);
-
- // 鍒涘缓鑾峰彇鍘嗗彶浠诲姟
- var taskHty = CreateHistoricalTask(task);
-
- _unitOfWorkManage.BeginTran();
-
- try
- {
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = _Task_HtyService.InsertTask(taskHty);
-
- // 鍒犻櫎浠诲姟鏁版嵁
- var isTaskDelete = await Delete(task.TaskId);
-
- // 鎻掑叆鍘嗗彶璁㈠崟
- var isStockInsert = _OutOrderAndStock_HtyService.InsertNav(stockHty);
-
- // 鍒犻櫎鍘熻鍗�
- var isOrderStockDelete = _OutOrderAndStockRepository.DeleteNavOrderStock(orderStock);
-
- if (isStockInsert && isOrderStockDelete && isTaskHtyAdd && isTaskDelete)
- {
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- }
- }
- catch
- {
- _unitOfWorkManage.RollbackTran();
- throw; // 閲嶆柊鎶涘嚭寮傚父浠ヤ緵澶栭儴鎹曡幏
- }
- }
-
- /// <summary>
- /// 澶勭悊鏈畬鎴愯鍗�
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <param name="task">浠诲姟鏁版嵁</param>
- /// <returns>寮傛浠诲姟</returns>
- private async Task ProcessUpdateOrderAsync(Dt_OutOrderAndStock orderStock, Dt_Task task)
- {
- // 鍒涘缓鑾峰彇鍘嗗彶浠诲姟
- var taskHty = CreateHistoricalTask(task);
-
- _unitOfWorkManage.BeginTran();
- try
- {
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = _Task_HtyService.InsertTask(taskHty);
-
- // 鍒犻櫎浠诲姟鏁版嵁
- var isTaskDelete = await Delete(task.TaskId);
-
- // 鏇存柊璁㈠崟涓庡簱瀛�
- var isOrderUpdated = _OutOrderAndStockRepository.UpdateNavOrderStock(orderStock);
- if (isTaskDelete && isTaskHtyAdd && isOrderUpdated)
- {
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- _unitOfWorkManage.RollbackTran();
- }
- }
- catch (Exception err)
- {
- Console.WriteLine(err.Message.ToString());
- _unitOfWorkManage.RollbackTran();
- throw; // 閲嶆柊鎶涘嚭寮傚父浠ヤ緵澶栭儴鎹曡幏
- }
- }
-
- /// <summary>
- /// 鍒涘缓鍘嗗彶璁㈠崟璁板綍
- /// </summary>
- /// <param name="orderStock">璁㈠崟鍜屽簱瀛樹俊鎭�</param>
- /// <returns>鍘嗗彶璁㈠崟璁板綍</returns>
- private Dt_OutOrderAndStock_Hty CreateHistoricalOrder(Dt_OutOrderAndStock orderStock)
- {
- var stockHty = _mapper.Map<Dt_OutOrderAndStock_Hty>(orderStock);
-
- stockHty.StockDetailList.FinishTime = DateTime.Now;
- stockHty.StockDetailList.OperateType = "Finish";
- stockHty.StockDetailList.SourceId = orderStock.StockDetailList.GroupDetailId;
- stockHty.StockDetailList.GroupDetailId = 0;
-
- stockHty.StockList.FinishTime = DateTime.Now;
- stockHty.StockList.OperateType = "Finish";
- stockHty.StockList.SourceId = orderStock.StockList.GroupId;
- stockHty.StockList.GroupId = 0;
-
- stockHty.OrderDetailList.FinishTime = DateTime.Now;
- stockHty.OrderDetailList.OperateType = "Finish";
- stockHty.OrderDetailList.SourceId = orderStock.OrderDetailList.Id;
- stockHty.OrderDetailList.Id = 0;
-
- stockHty.OrderList.FinishTime = DateTime.Now;
- stockHty.OrderList.OperateType = "Finish";
- stockHty.OrderList.SourceId = orderStock.OrderList.Id;
- stockHty.OrderList.Id = 0;
-
- return stockHty;
- }
-
- private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
- {
- // 鏇存柊浠诲姟鐘舵��
- task.TaskState = TaskStateConst.TaskCompleted.ToString();
- task.CurrentAddress = task.NextAddress;
-
- // 鍒涘缓鍘嗗彶浠诲姟
- var taskHty = _mapper.Map<Dt_Task_Hty>(task);
- taskHty.FinishTime = DateTime.Now;
- taskHty.OperateType = "Finish";
- taskHty.SourceId = task.TaskId;
- taskHty.TaskState = TaskStateConst.TaskCompleted.ToString();
- return taskHty;
- }
-
- #endregion private 鍐呴儴鏂规硶
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/Task/Dt_Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/Task/Dt_Task_HtyService.cs"
deleted file mode 100644
index ba70c64..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/Task/Dt_Task_HtyService.cs"
+++ /dev/null
@@ -1,25 +0,0 @@
-锘縩amespace WIDESEA_StorageOutTaskServices;
-
-public class Dt_Task_HtyService : ServiceBase<Dt_Task_Hty, IDt_Task_HtyRepository>, IDt_Task_HtyService
-{
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OutOrderService _outOrderService;
-
- public Dt_Task_HtyService(IDt_Task_HtyRepository BaseDal,
- IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _outOrderService = outOrderService;
- }
-
- /// <summary>
- /// 娣诲姞鍘嗗彶浠诲姟
- /// </summary>
- /// <param name="task">鍘嗗彶浠诲姟Model</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool InsertTask(Dt_Task_Hty task)
- {
- return BaseDal.InsertTask(task);
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/WIDESEA_StorageOutTaskService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/WIDESEA_StorageOutTaskService.csproj"
deleted file mode 100644
index 803f614..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutTaskServices/WIDESEA_StorageOutTaskService.csproj"
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_IStorageOutBasicService\WIDESEA_IStorageOutBasicService.csproj" />
- <ProjectReference Include="..\WIDESEA_IStorageOutOrderService\WIDESEA_IStorageOutOrderService.csproj" />
- <ProjectReference Include="..\WIDESEA_IStorageOutTaskService\WIDESEA_IStorageOutTaskService.csproj" />
- </ItemGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/WIDESEA_Tasks.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/WIDESEA_Tasks.csproj"
deleted file mode 100644
index 132c02c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/WIDESEA_Tasks.csproj"
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Debug/net6.0/WIDESEA_Tasks.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Debug/net6.0/WIDESEA_Tasks.assets.cache"
deleted file mode 100644
index 4fb62af..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Debug/net6.0/WIDESEA_Tasks.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.dgspec.json"
deleted file mode 100644
index 65d9095..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\WIDESEA_Tasks.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\WIDESEA_Tasks.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\WIDESEA_Tasks.csproj",
- "projectName": "WIDESEA_Tasks",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\WIDESEA_Tasks.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/project.assets.json"
deleted file mode 100644
index ed8aff6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/project.assets.json"
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {}
- },
- "libraries": {},
- "projectFileDependencyGroups": {
- "net6.0": []
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\WIDESEA_Tasks.csproj",
- "projectName": "WIDESEA_Tasks",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\WIDESEA_Tasks.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/project.nuget.cache"
deleted file mode 100644
index 8be88e6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "mjsUat6YIW5NQJ+By0YvsrQADPx0E872J93U51uaVXAIRzONpiq6LFAfJgz86Lrpj2pDalpwMbY7emEh6TVYiQ==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Tasks\\WIDESEA_Tasks.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln"
deleted file mode 100644
index de69dfe..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln"
+++ /dev/null
@@ -1,259 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.9.34701.34
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_WMSServer", "WIDESEA_WMSServer\WIDESEA_WMSServer.csproj", "{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_Core", "WIDESEA_Core\WIDESEA_Core.csproj", "{111BD7AA-9749-4506-9772-79F9EF14754C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_Common", "WIDESEA_Common\WIDESEA_Common.csproj", "{AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_Model", "WIDESEA_Model\WIDESEA_Model.csproj", "{00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IRepository", "WIDESEA_IRepository\WIDESEA_IRepository.csproj", "{B5C7DC02-077C-4255-A369-600D033A4C23}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_Repository", "WIDESEA_Repository\WIDESEA_Repository.csproj", "{41C50E65-7C73-4BD0-9773-2A74F1587EE2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IServices", "WIDESEA_IServices\WIDESEA_IServices.csproj", "{1C8F84A9-7812-4435-B833-FF26A9A3DD4C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_Services", "WIDESEA_Services\WIDESEA_Services.csproj", "{F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_Tasks", "WIDESEA_Tasks\WIDESEA_Tasks.csproj", "{3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Service", "Service", "{60DE2920-37C6-4C2B-A053-6B1B2DAF047A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Repository", "Repository", "{56D014A3-EB8D-4EF5-A751-3BAA084519D0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_DTO", "WIDESEA_DTO\WIDESEA_DTO.csproj", "{929DF936-042C-4EEC-8722-A831FC2F0AEA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogLibrary", "LogLibrary\LogLibrary.csproj", "{992DA9CB-143C-426B-B27D-E4DA3B863A99}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System", "System", "{0E8B689E-6CB1-4061-996B-6C0AEEE460FB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System", "System", "{F0C20E6F-9F0A-4448-BE21-159B443641FA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "business", "business", "{7E58F650-2FBF-4C4D-8E42-B4E13283A11D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IBusinessesRepository", "WIDESEA_IBusinessesRepository\WIDESEA_IBusinessesRepository.csproj", "{FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_BusinessesRepository", "WIDESEA_BusinessesRepository\WIDESEA_BusinessesRepository.csproj", "{3DF4C096-7431-4484-BE38-28FAD8CA1540}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "business", "business", "{095528F2-9D66-4578-9F0D-8AAFD3F84C2F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IBusinessServices", "WIDESEA_IBusinessServices\WIDESEA_IBusinessServices.csproj", "{1E26EB6C-4AD1-4140-83FE-777218EE9DF5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_BusinessServices", "WIDESEA_BusinessServices\WIDESEA_BusinessServices.csproj", "{BA78CC65-6D17-4C76-8285-DC6B6165DA17}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|x86 = Debug|x86
- Dev|Any CPU = Dev|Any CPU
- Dev|x86 = Dev|x86
- Release|Any CPU = Release|Any CPU
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Debug|x86.ActiveCfg = Debug|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Debug|x86.Build.0 = Debug|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Dev|x86.ActiveCfg = Debug|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Dev|x86.Build.0 = Debug|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Release|Any CPU.Build.0 = Release|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Release|x86.ActiveCfg = Release|Any CPU
- {D81A65B5-47D1-40C1-8FDE-7D24FF003F51}.Release|x86.Build.0 = Release|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Debug|x86.Build.0 = Debug|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Dev|x86.ActiveCfg = Debug|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Dev|x86.Build.0 = Debug|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Release|Any CPU.Build.0 = Release|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Release|x86.ActiveCfg = Release|Any CPU
- {111BD7AA-9749-4506-9772-79F9EF14754C}.Release|x86.Build.0 = Release|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Debug|x86.ActiveCfg = Debug|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Debug|x86.Build.0 = Debug|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Dev|x86.ActiveCfg = Debug|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Dev|x86.Build.0 = Debug|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Release|Any CPU.Build.0 = Release|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Release|x86.ActiveCfg = Release|Any CPU
- {AF8F3D65-1D75-4B8F-AFD9-4150E591C44D}.Release|x86.Build.0 = Release|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Debug|x86.ActiveCfg = Debug|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Debug|x86.Build.0 = Debug|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Dev|x86.ActiveCfg = Debug|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Dev|x86.Build.0 = Debug|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Release|Any CPU.Build.0 = Release|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Release|x86.ActiveCfg = Release|Any CPU
- {00CE9885-9F24-4B6C-A7E8-0DE8C9ED7128}.Release|x86.Build.0 = Release|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Debug|x86.Build.0 = Debug|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Dev|x86.ActiveCfg = Debug|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Dev|x86.Build.0 = Debug|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Release|Any CPU.Build.0 = Release|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Release|x86.ActiveCfg = Release|Any CPU
- {B5C7DC02-077C-4255-A369-600D033A4C23}.Release|x86.Build.0 = Release|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Debug|x86.ActiveCfg = Debug|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Debug|x86.Build.0 = Debug|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Dev|x86.ActiveCfg = Debug|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Dev|x86.Build.0 = Debug|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Release|Any CPU.Build.0 = Release|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Release|x86.ActiveCfg = Release|Any CPU
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2}.Release|x86.Build.0 = Release|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Debug|x86.Build.0 = Debug|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Dev|x86.ActiveCfg = Debug|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Dev|x86.Build.0 = Debug|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Release|Any CPU.Build.0 = Release|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Release|x86.ActiveCfg = Release|Any CPU
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C}.Release|x86.Build.0 = Release|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Debug|x86.Build.0 = Debug|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Dev|x86.ActiveCfg = Debug|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Dev|x86.Build.0 = Debug|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Release|Any CPU.Build.0 = Release|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Release|x86.ActiveCfg = Release|Any CPU
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583}.Release|x86.Build.0 = Release|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Debug|x86.Build.0 = Debug|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Dev|x86.ActiveCfg = Debug|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Dev|x86.Build.0 = Debug|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Release|Any CPU.Build.0 = Release|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Release|x86.ActiveCfg = Release|Any CPU
- {3BDEBC2A-BDE6-439B-B0E4-DB8AC7709FF1}.Release|x86.Build.0 = Release|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Debug|x86.Build.0 = Debug|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Dev|x86.ActiveCfg = Debug|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Dev|x86.Build.0 = Debug|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Release|Any CPU.Build.0 = Release|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Release|x86.ActiveCfg = Release|Any CPU
- {929DF936-042C-4EEC-8722-A831FC2F0AEA}.Release|x86.Build.0 = Release|Any CPU
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Debug|x86.ActiveCfg = Debug|x86
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Debug|x86.Build.0 = Debug|x86
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Dev|Any CPU.ActiveCfg = Dev|Any CPU
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Dev|Any CPU.Build.0 = Dev|Any CPU
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Dev|x86.ActiveCfg = Dev|x86
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Dev|x86.Build.0 = Dev|x86
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Release|Any CPU.Build.0 = Release|Any CPU
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Release|x86.ActiveCfg = Release|x86
- {992DA9CB-143C-426B-B27D-E4DA3B863A99}.Release|x86.Build.0 = Release|x86
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Debug|x86.Build.0 = Debug|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Dev|x86.ActiveCfg = Debug|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Dev|x86.Build.0 = Debug|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Release|Any CPU.Build.0 = Release|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Release|x86.ActiveCfg = Release|Any CPU
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1}.Release|x86.Build.0 = Release|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Debug|x86.Build.0 = Debug|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Dev|x86.ActiveCfg = Debug|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Dev|x86.Build.0 = Debug|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Release|Any CPU.Build.0 = Release|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Release|x86.ActiveCfg = Release|Any CPU
- {3DF4C096-7431-4484-BE38-28FAD8CA1540}.Release|x86.Build.0 = Release|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Debug|x86.Build.0 = Debug|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Dev|x86.ActiveCfg = Debug|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Dev|x86.Build.0 = Debug|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Release|Any CPU.Build.0 = Release|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Release|x86.ActiveCfg = Release|Any CPU
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5}.Release|x86.Build.0 = Release|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Debug|x86.ActiveCfg = Debug|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Debug|x86.Build.0 = Debug|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Dev|x86.ActiveCfg = Debug|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Dev|x86.Build.0 = Debug|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Release|Any CPU.Build.0 = Release|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Release|x86.ActiveCfg = Release|Any CPU
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {B5C7DC02-077C-4255-A369-600D033A4C23} = {0E8B689E-6CB1-4061-996B-6C0AEEE460FB}
- {41C50E65-7C73-4BD0-9773-2A74F1587EE2} = {0E8B689E-6CB1-4061-996B-6C0AEEE460FB}
- {1C8F84A9-7812-4435-B833-FF26A9A3DD4C} = {F0C20E6F-9F0A-4448-BE21-159B443641FA}
- {F512AFDB-D45D-4979-BC8C-0BA7FBE8F583} = {F0C20E6F-9F0A-4448-BE21-159B443641FA}
- {0E8B689E-6CB1-4061-996B-6C0AEEE460FB} = {56D014A3-EB8D-4EF5-A751-3BAA084519D0}
- {F0C20E6F-9F0A-4448-BE21-159B443641FA} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
- {7E58F650-2FBF-4C4D-8E42-B4E13283A11D} = {56D014A3-EB8D-4EF5-A751-3BAA084519D0}
- {FBC88231-BC8E-4AA8-BD60-0A13FE463EF1} = {7E58F650-2FBF-4C4D-8E42-B4E13283A11D}
- {3DF4C096-7431-4484-BE38-28FAD8CA1540} = {7E58F650-2FBF-4C4D-8E42-B4E13283A11D}
- {095528F2-9D66-4578-9F0D-8AAFD3F84C2F} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
- {1E26EB6C-4AD1-4140-83FE-777218EE9DF5} = {095528F2-9D66-4578-9F0D-8AAFD3F84C2F}
- {BA78CC65-6D17-4C76-8285-DC6B6165DA17} = {095528F2-9D66-4578-9F0D-8AAFD3F84C2F}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {599A7267-7402-4143-84AE-9B407FC2BB69}
- EndGlobalSection
-EndGlobal
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/.config/dotnet-tools.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/.config/dotnet-tools.json"
deleted file mode 100644
index b99844e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/.config/dotnet-tools.json"
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "version": 1,
- "isRoot": true,
- "tools": {
- "dotnet-ef": {
- "version": "8.0.6",
- "commands": [
- "dotnet-ef"
- ]
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/BasicController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/BasicController.cs"
deleted file mode 100644
index abfbaa7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/BasicController.cs"
+++ /dev/null
@@ -1,13 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- [Route("api/basic")]
- [ApiController]
- public class BasicController : ControllerBase
- {
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationController.cs"
deleted file mode 100644
index a2fab07..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationController.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IServices;
-using WIDESEA_IServices.System;
-using WIDESEA_Model.Models;
-using WIDESEA_Services;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- [Route("api/[controller]")]
- [ApiController]
- public class LocationController : ApiBaseController<IDt_LocationService, Dt_LocationInfo>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
-
- public LocationController(IDt_LocationService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_BillGroupStockController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_BillGroupStockController.cs"
deleted file mode 100644
index 5031bb4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_BillGroupStockController.cs"
+++ /dev/null
@@ -1,45 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_BillGroupStock")]
- [ApiController]
- public class Dt_BillGroupStockController : ApiBaseController<IDt_BillGroupStockService, Dt_BillGroupStock>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_BillGroupStockController(IDt_BillGroupStockService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- /// <summary>
- /// PDA缁勭洏纭,璁板綍缁勭洏淇℃伅锛屼繚瀛樺埌锛氫富琛� Dt_BillGroupStock,鏄庣粏琛� Dt_BillGroupStockDetail
- /// </summary>
- /// <param name="dt_BillGroupStock">缁勭洏淇℃伅</param>
- /// <returns></returns>
- [HttpPost, Route("PDAGroupPlateConfirm"), AllowAnonymous]
- public WebResponseContent PDAGroupPlateConfirm(Dt_BillGroupStock dt_BillGroupStock)
- {
- return Service.PDAGroupPlateConfirm(dt_BillGroupStock);
- }
-
- /// <summary>
- /// PDA缁勭洏鎾ら攢纭,瑙ｇ粦鎵樼洏鐮佸拰鐗╂枡鐮�
- /// 1,鏍规嵁鎵樼洏鐮佹煡璇㈢粍鐩樹俊鎭� 2锛屽綋搴撳瓨鐘舵�佷负鈥滅粍鐩樻殏瀛樷�濇椂鍙互鎾ら攢 3锛屾挙閿�鍚�,淇敼搴撳瓨鐘舵�佷负"缁勭洏鎾ら攢"
- /// </summary>
- /// <param name="plateCode">鎵樼洏鍙�</param>
- /// <returns></returns>
- [HttpPost, Route("PDAGroupPlateRevoke"), AllowAnonymous]
- public WebResponseContent PDAGroupPlateRevoke(string plateCode)
- {
- return Service.PDAGroupPlateRevoke(plateCode);
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_BillGroupStockDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_BillGroupStockDetailController.cs"
deleted file mode 100644
index cb0d9d2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_BillGroupStockDetailController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_BillGroupStockDetail")]
- [ApiController]
- public class Dt_BillGroupStockDetailController : ApiBaseController<IDt_BillGroupStockDetailService, Dt_BillGroupStockDetail>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_BillGroupStockDetailController(IDt_BillGroupStockDetailService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderController.cs"
deleted file mode 100644
index 001a07c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderController.cs"
+++ /dev/null
@@ -1,69 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_InboundOrder")]
- [ApiController]
- public class Dt_InboundOrderController : ApiBaseController<IDt_InboundOrderService, Dt_InboundOrder>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_InboundOrderController(IDt_InboundOrderService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
- /// <summary>
- /// 鍚屾鍏ュ簱鍘熷鍗曟嵁鍒版湰绯荤粺鍏ュ簱鍗曡〃
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("GetInboundOrderFromOrigin"), AllowAnonymous]
- public async Task<WebResponseContent> GetInboundOrderFromOrigin()
- {
- //鍚屾鐢熶骇鍏ュ簱鍗�
- await Service.GetInboundOrderFromProductionOrigin();
- //鍚屾閲囪喘鍏ュ簱鍗�
- await Service.GetInboundOrderFromPurchaseOrigin();
- return WebResponseContent.Instance.OK();
- }
-
- /// 浜х敓鍏ュ簱浠诲姟 鍒嗛厤宸烽亾
- /// 1,鏍规嵁鐗╂枡灞炴�ф寚瀹氬簱鍖�
- /// 2,鏌ヨ婊¤冻鏉′欢鐨勭┖闂茶揣浣嶇殑宸烽亾锛氱┖闂茶揣浣嶅崰姣� 鐗╂枡搴撳瓨鍗犳瘮
- /// </summary>
- /// <param name="plateCode">鎵樼洏鏉＄爜</param>
- /// <param name="SourceAddress">璧峰鍦板潃</param>
- /// <returns></returns>
- [HttpPost, Route("GenerateInboundTask")]
- public WebResponseContent GenerateInboundTask(string plateCode, string SourceAddress)
- {
- return Service.GenerateInboundTask(plateCode, SourceAddress);
- }
-
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙疯幏鍙栬揣浣嶅彿
- /// </summary>
- /// <param name="taskNo">浠诲姟鍙�</param>
- /// <returns></returns>
- [HttpPost, Route("GetInboundLocation")]
- public WebResponseContent GetInboundLocation(int taskNum)
- {
- return Service.GetInboundLocation(taskNum);
- }
-
-
- /// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚澶勭悊
- /// </summary>
- /// <returns></returns>
- public WebResponseContent FinishInboundTask(int taskNum)
- {
- return Service.FinishInboundTask(taskNum);
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderDetailController.cs"
deleted file mode 100644
index 8f68629..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderDetailController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_InboundOrderDetail")]
- [ApiController]
- public class Dt_InboundOrderDetailController : ApiBaseController<IDt_InboundOrderDetailService, Dt_InboundOrderDetail>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_InboundOrderDetailController(IDt_InboundOrderDetailService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderProductionController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderProductionController.cs"
deleted file mode 100644
index 7e29544..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderProductionController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_InboundOrderProduction")]
- [ApiController]
- public class Dt_InboundOrderProductionController : ApiBaseController<IDt_InboundOrderProductionService, Dt_InboundOrderProduction>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_InboundOrderProductionController(IDt_InboundOrderProductionService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderProductionDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderProductionDetailController.cs"
deleted file mode 100644
index 6137db0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderProductionDetailController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_InboundOrderProductionDetail")]
- [ApiController]
- public class Dt_InboundOrderProductionDetailController : ApiBaseController<IDt_InboundOrderProductionDetailService, Dt_InboundOrderProductionDetail>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_InboundOrderProductionDetailController(IDt_InboundOrderProductionDetailService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderPurchaseController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderPurchaseController.cs"
deleted file mode 100644
index 9ab7b40..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderPurchaseController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_InboundOrderPurchase")]
- [ApiController]
- public class Dt_InboundOrderPurchaseController : ApiBaseController<IDt_InboundOrderPurchaseService, Dt_InboundOrderPurchase>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_InboundOrderPurchaseController(IDt_InboundOrderPurchaseService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderPurchaseDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderPurchaseDetailController.cs"
deleted file mode 100644
index d6dcc73..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_InboundOrderPurchaseDetailController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_InboundOrderPurchaseDetail")]
- [ApiController]
- public class Dt_InboundOrderPurchaseDetailController : ApiBaseController<IDt_InboundOrderPurchaseDetailService, Dt_InboundOrderPurchaseDetail>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_InboundOrderPurchaseDetailController(IDt_InboundOrderPurchaseDetailService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_LocationController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_LocationController.cs"
deleted file mode 100644
index eb6a7f6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_LocationController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_LocationInfo")]
- [ApiController]
- public class Dt_LocationInfoController : ApiBaseController<IDt_LocationInfoService, Dt_LocationInfo>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_LocationInfoController(IDt_LocationInfoService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_MaterielAttributeController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_MaterielAttributeController.cs"
deleted file mode 100644
index 57990d6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_MaterielAttributeController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_MaterielAttribute")]
- [ApiController]
- public class Dt_MaterielAttributeController : ApiBaseController<IDt_MaterielAttributeService, Dt_MaterielAttribute>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_MaterielAttributeController(IDt_MaterielAttributeService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_MaterielInfoController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_MaterielInfoController.cs"
deleted file mode 100644
index 1a24fa6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_MaterielInfoController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_MaterielInfo")]
- [ApiController]
- public class Dt_MaterielInfoController : ApiBaseController<IDt_MaterielInfoService, Dt_MaterielInfo>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_MaterielInfoController(IDt_MaterielInfoService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_TaskController.cs"
deleted file mode 100644
index 9476bc8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_TaskController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_Task")]
- [ApiController]
- public class Dt_TaskController : ApiBaseController<IDt_TaskService, Dt_Task>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_TaskController(IDt_TaskService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_TaskExecuteDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_TaskExecuteDetailController.cs"
deleted file mode 100644
index 1c4b500..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_TaskExecuteDetailController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_TaskExecuteDetail")]
- [ApiController]
- public class Dt_TaskExecuteDetailController : ApiBaseController<IDt_TaskExecuteDetailService, Dt_TaskExecuteDetail>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_TaskExecuteDetailController(IDt_TaskExecuteDetailService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_UnitInfoController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_UnitInfoController.cs"
deleted file mode 100644
index da2e531..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dt_UnitInfoController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_BusinessServices;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBusinessServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Dt_UnitInfo")]
- [ApiController]
- public class Dt_UnitInfoController : ApiBaseController<IDt_UnitInfoService, Dt_UnitInfo>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_UnitInfoController(IDt_UnitInfoService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/OutboundOrder/Dt_OutOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/OutboundOrder/Dt_OutOrderController.cs"
deleted file mode 100644
index e2914e6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/OutboundOrder/Dt_OutOrderController.cs"
+++ /dev/null
@@ -1,43 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.OutboundOrder
-{
- [Route("api/[controller]")]
- [ApiController]
- public class Dt_OutOrderController : ApiBaseController<IDt_OutOrderService, Dt_OutOrder>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Dt_OutOrderController(IDt_OutOrderService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- /// <summary>
- /// 娣诲姞鐢熶骇鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- [HttpPost, Route("AddOutOrderProduction"), AllowAnonymous]
- public WebResponseContent AddOutOrderProduction([FromBody] SaveModel saveModel)
- {
- return Service.AddOutOrderProduction(saveModel);
- }
-
- /// <summary>
- /// 娣诲姞璋冩嫧鍑哄簱鍗�
- /// </summary>
- /// <param name="model">鍑哄簱鏁版嵁</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- [HttpPost, Route("AddOutOrderTransfer"), AllowAnonymous]
- public WebResponseContent AddOutOrderTransfer([FromBody] SaveModel saveModel)
- {
- return Service.AddOutOrderTransfer(saveModel);
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
deleted file mode 100644
index af87a98..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_Core.Helper;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Sys_Dictionary")]
- [ApiController]
- public class Sys_DictionaryController : ApiBaseController<ISys_DictionaryService, Sys_Dictionary>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Sys_DictionaryController(ISys_DictionaryService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- [HttpPost, Route("GetVueDictionary"), AllowAnonymous]
- public IActionResult GetVueDictionary([FromBody] string[] dicNos)
- {
- return Content(Service.GetVueDictionary(dicNos).Serialize());
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_MenuController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_MenuController.cs"
deleted file mode 100644
index bd85036..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_MenuController.cs"
+++ /dev/null
@@ -1,50 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers
-{
- [Route("api/Menu")]
- [ApiController]
- public class Sys_MenuController : ApiBaseController<ISys_MenuService, Sys_Menu>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Sys_MenuController(ISys_MenuService menuService, IHttpContextAccessor httpContextAccessor) : base(menuService)
- {
- _httpContextAccessor = httpContextAccessor;
- }
- [HttpGet, HttpPost, Route("getTreeMenu")]
- public IActionResult GetTreeMenu()
- {
- return Json(Service.GetCurrentMenuActionList());
- }
-
- [HttpPost, Route("getMenu")]
- public IActionResult GetMenu()
- {
- return Json(Service.GetMenu());
- }
-
- [HttpPost, Route("getTreeItem")]
- public async Task<IActionResult> GetTreeItem(int menuId)
- {
- return Json(Service.GetTreeItem(menuId));
- }
-
- [HttpPost, Route("save")]
- public ActionResult Save([FromBody] Sys_Menu menu)
- {
- if (App.User.IsSuperAdmin)
- {
- return Json(Service.Save(menu));
- }
- else
- {
- return Json(WebResponseContent.Instance.Error("浠呴檺瓒呯骇绠＄悊鍛樹慨鏀规暟鎹�"));
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
deleted file mode 100644
index cd3cd9f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
+++ /dev/null
@@ -1,64 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_DTO.System;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-using WIDESEA_Model.Models.System;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/Sys_Role")]
- [ApiController]
- public class Sys_RoleController : ApiBaseController<ISys_RoleService, Sys_Role>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Sys_RoleController(ISys_RoleService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- [HttpPost, Route("getUserChildRoles")]
- public IActionResult GetUserChildRoles()
- {
- int roleId = App.User.RoleId;
- var data = Service.GetAllChildren(roleId);
-
- if (App.User.IsSuperAdmin)
- {
- return Json(WebResponseContent.Instance.OK(null, data));
- }
- //涓嶆槸瓒呯骇绠＄悊锛屽皢鑷繁鐨勮鑹叉煡鍑烘潵锛屽湪鏍戝舰鑿滃崟涓婁綔涓烘牴鑺傜偣
- var self = data.Where(x => x.Id == roleId)
- .Select(s => new RoleNodes()
- {
- Id = s.Id,
- ParentId = 0,//灏嗚嚜宸辩殑瑙掕壊浣滀负root鑺傜偣
- RoleName = s.RoleName
- }).ToList();
- data.AddRange(self);
- return Json(WebResponseContent.Instance.OK(null, data));
- }
-
- [HttpPost, Route("getCurrentTreePermission")]
- public IActionResult GetCurrentTreePermission()
- {
- return Json(Service.GetCurrentTreePermission());
- }
-
- [HttpPost, Route("getUserTreePermission")]
- public IActionResult GetUserTreePermission(int roleId)
- {
- return Json(Service.GetUserTreePermission(roleId));
- }
-
- [HttpPost, Route("savePermission")]
- public IActionResult SavePermission([FromBody] List<UserPermissionDTO> userPermissions, int roleId)
- {
- return Json(Service.SavePermission(userPermissions, roleId));
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TenantController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TenantController.cs"
deleted file mode 100644
index a662a90..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TenantController.cs"
+++ /dev/null
@@ -1,33 +0,0 @@
-锘�
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.HttpContextUser;
-using WIDESEA_IServices;
-using WIDESEA_Model;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers
-{
- [Route("api/tenant")]
- [ApiController]
- public class Sys_TenantController : ApiBaseController<ISys_TenantService, Sys_Tenant>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
-
- public Sys_TenantController(ISys_TenantService tenantService, IHttpContextAccessor httpContextAccessor) : base(tenantService)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- [HttpGet, Route("initTenantInfo"), AllowAnonymous]
- public WebResponseContent InitTenantInfo(string tenantName, int tenantType)
- {
- return Service.InitTenantInfo(tenantName, tenantType);
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TestController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TestController.cs"
deleted file mode 100644
index 01a2e79..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TestController.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.System
-{
- [Route("api/test")]
- [ApiController]
- public class Sys_TestController : ApiBaseController<ISys_TestService, Sys_Test>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public Sys_TestController(ISys_TestService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- [HttpGet, Route("TranTest"), AllowAnonymous]
- public WebResponseContent TranTest()
- {
- return Service.TranTest();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
deleted file mode 100644
index dc3ea2f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
+++ /dev/null
@@ -1,67 +0,0 @@
-锘�
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Memory;
-using StackExchange.Profiling;
-using WIDESEA_Core;
-using WIDESEA_Core.Authorization;
-using WIDESEA_Core.BaseController;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.HttpContextUser;
-using WIDESEA_Core.Utilities;
-using WIDESEA_IServices;
-using WIDESEA_Model;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers
-{
- [Route("api/User")]
- [ApiController]
- public class Sys_UserController : ApiBaseController<ISys_UserService, Sys_User>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
-
- public Sys_UserController(ISys_UserService userService, IHttpContextAccessor httpContextAccessor) : base(userService)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- [HttpPost, Route("login"), AllowAnonymous]
- public IActionResult Login([FromBody] LoginInfo loginInfo)
- {
- return Json(Service.Login(loginInfo));
- }
- [HttpPost, Route("getCurrentUserInfo")]
- public WebResponseContent GetCurrentUser()
- {
- return Service.GetCurrentUserInfo();
- }
-
- [HttpPost, Route("modifyPwd")]
- public IActionResult ModifyPwd(string oldPwd, string newPwd)
- {
- return Json( Service.ModifyPwd(oldPwd, newPwd));
- }
-
- [HttpGet, Route("getVierificationCode"), AllowAnonymous]
- public IActionResult GetVierificationCode()
- {
- //var html = MiniProfiler.Current.RenderIncludes(_httpContextAccessor.HttpContext);
- string code = "1234" /*VierificationCode.RandomText()*/;
- var data = new
- {
- img = VierificationCode.CreateBase64Imgage(code),
- uuid = Guid.NewGuid()
- };
-
- return Json(data);
- }
- [HttpGet, Route("SerializeJwt"), AllowAnonymous]
- public WebResponseContent SerializeJwt(string code)
- {
- return WebResponseContent.Instance.OK(data: JwtHelper.SerializeJwt(code));
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutoMapperConfig.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutoMapperConfig.cs"
deleted file mode 100644
index 2892fb3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutoMapperConfig.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing AutoMapper;
-
-namespace WIDESEA_WMSServer.Filter
-{
- /// <summary>
- /// 闈欐�佸叏灞� AutoMapper 閰嶇疆鏂囦欢
- /// </summary>
- public class AutoMapperConfig
- {
- public static MapperConfiguration RegisterMappings()
- {
- return new MapperConfiguration(cfg =>
- {
- cfg.AddProfile(new CustomProfile());
- });
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutoMapperSetup.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutoMapperSetup.cs"
deleted file mode 100644
index 0e51421..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutoMapperSetup.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縩amespace WIDESEA_WMSServer.Filter
-{
- /// <summary>
- /// Automapper 鍚姩鏈嶅姟
- /// </summary>
- public static class AutoMapperSetup
- {
- public static void AddAutoMapperSetup(this IServiceCollection services)
- {
- if (services == null) throw new ArgumentNullException(nameof(services));
-
- services.AddAutoMapper(typeof(AutoMapperConfig));
- AutoMapperConfig.RegisterMappings();
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutofacPropertityModuleReg.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutofacPropertityModuleReg.cs"
deleted file mode 100644
index f10530b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/AutofacPropertityModuleReg.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing Autofac;
-using Microsoft.AspNetCore.Mvc;
-
-namespace WIDESEA_WMSServer.Filter
-{
- public class AutofacPropertityModuleReg : Autofac.Module
- {
- protected override void Load(ContainerBuilder builder)
- {
- var controllerBaseType = typeof(ControllerBase);
- builder.RegisterAssemblyTypes(typeof(Program).Assembly)
- .Where(t => controllerBaseType.IsAssignableFrom(t) && t != controllerBaseType)
- .PropertiesAutowired();
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/CustomProfile.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/CustomProfile.cs"
deleted file mode 100644
index 544748b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Filter/CustomProfile.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing AutoMapper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_DTO.System;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Filter
-{
- public class CustomProfile : Profile
- {
- /// <summary>
- /// 閰嶇疆鏋勯�犲嚱鏁帮紝鐢ㄦ潵鍒涘缓鍏崇郴鏄犲皠
- /// </summary>
- public CustomProfile()
- {
- CreateMap<Sys_Menu, MenuDTO>();
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
deleted file mode 100644
index d9ee764..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
+++ /dev/null
@@ -1,140 +0,0 @@
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Extensions;
-using WIDESEA_Core.Middlewares;
-using System.Reflection;
-using WIDESEA_Core.Filter;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
-using Newtonsoft.Json;
-using System.Text;
-using Microsoft.AspNetCore.Mvc.Controllers;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using Autofac.Extensions.DependencyInjection;
-using Autofac;
-using WIDESEA_WMSServer.Filter;
-using WIDESEA_Core.Authorization;
-using WIDESEA_Core.Core;
-
-var builder = WebApplication.CreateBuilder(args);
-
-builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory()).ConfigureContainer<ContainerBuilder>(builder =>
-{
- builder.RegisterModule(new AutofacModuleRegister());//带有接口层的服务注入
- builder.RegisterModule<AutofacPropertityModuleReg>();//
-}).ConfigureAppConfiguration((hostingContext, config) =>
-{
- hostingContext.Configuration.ConfigureApplication();
- config.Sources.Clear();
- config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: false);
-}); ;
-builder.ConfigureApplication();
-
-// 2、配置服务
-builder.Services.AddSingleton(new AppSettings(builder.Configuration));//注册
-builder.Services.AddAllOptionRegister();//读取配置文件
-builder.Services.AddMemoryCacheSetup();//缓存
-builder.Services.AddSqlsugarSetup();//SqlSugar 启动服务
-builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
-builder.Services.AddDbSetup();//Db 启动服务
-
-//todo 初始化模型验证配置
-//builder.Services.UseMethodsModelParameters().UseMethodsGeneralParameters();
-//builder.Services.AddSingleton<IObjectModelValidator>(new NullObjectModelValidator());
-
-builder.Services.AddAutoMapperSetup();
-
-builder.Services.AddCorsSetup();
-builder.Services.AddMiniProfilerSetup();
-
-builder.Services.AddSwaggerSetup();
-
-builder.Services.AddJobSetup();//任务调度 启动服务
-
-builder.Services.AddHttpContextSetup();
-
-//todo
-builder.Services.AddMvc(options =>
-{
- options.Filters.Add(typeof(ApiAuthorizeFilter));
- //options.Filters.Add(typeof(ActionExecuteFilter));
- // options.SuppressAsyncSuffixInActionNames = false;
-});
-
-builder.Services.AddAuthorizationSetup();
-
-builder.Services.AddIpPolicyRateLimitSetup(builder.Configuration);//IPLimit限流 启动服务
-
-builder.Services.AddScoped<UseServiceDIAttribute>();
-
-//builder.Services.AddDistributedMemoryCache();
-builder.Services.AddSession();
-
-builder.Services.AddHttpClient();
-
-builder.Services.AddControllers(o =>
-{
- o.Filters.Add(typeof(GlobalExceptionsFilter));//全局异常
- //todo
- //o.Conventions.Insert(0, new GlobalRoutePrefixFilter(new RouteAttribute(RoutePrefix.Name)));//路由
-})
-.AddNewtonsoftJson(options =>
-{
- options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Serialize;
- //options.SerializerSettings.ContractResolver = new DefaultContractResolver();
- options.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver();
- options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
- options.SerializerSettings.NullValueHandling = NullValueHandling.Include;
- options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Local;
- options.SerializerSettings.Converters.Add(new StringEnumConverter());
-});
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-
-builder.Services.Replace(ServiceDescriptor.Transient<IControllerActivator, ServiceBasedControllerActivator>());
-Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-
-
-var app = builder.Build();
-
-// 3、配置中间件
-app.UseMiniProfiler();//性能分析器
-app.ConfigureApplication();//配置文件
-app.UseApplicationSetup();//启动配置
-app.UseSession();
-if (app.Environment.IsDevelopment())
-{
- //todo
- //app.UseSwaggerAuthorized();
- app.UseSwaggerMiddle(() => Assembly.GetExecutingAssembly().GetManifestResourceStream("WIDESEA_WMSServer.index.html"));
-}//判断是否需要打开swagger
-
-app.UseIpLimitMiddle();
-app.UseApiLogMiddleware();
-//todo
-//app.UseRecordAccessLogsMiddle();
-
-app.UseCors(AppSettings.app(new string[] { "Cors", "PolicyName" }));
-
-//DefaultFilesOptions defaultFilesOptions = new DefaultFilesOptions();
-//defaultFilesOptions.DefaultFileNames.Clear();
-//defaultFilesOptions.DefaultFileNames.Add("index.html");
-//app.UseDefaultFiles(defaultFilesOptions);
-app.UseStaticFiles();
-app.UseCookiePolicy();
-app.UseStatusCodePages();
-
-app.UseRouting();
-
-
-app.UseAuthentication();
-app.UseAuthorization();
-
-
-
-app.MapControllers();
-
-app.Run();
-
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile.pubxml" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile.pubxml"
deleted file mode 100644
index 0c9d861..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile.pubxml"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
- <PropertyGroup>
- <DeleteExistingFiles>true</DeleteExistingFiles>
- <ExcludeApp_Data>false</ExcludeApp_Data>
- <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
- <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
- <LastUsedPlatform>Any CPU</LastUsedPlatform>
- <PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
- <WebPublishMethod>FileSystem</WebPublishMethod>
- <_TargetId>Folder</_TargetId>
- <SiteUrlToLaunchAfterPublish />
- <TargetFramework>net6.0</TargetFramework>
- <ProjectGuid>d81a65b5-47d1-40c1-8fde-7d24ff003f51</ProjectGuid>
- <SelfContained>false</SelfContained>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/launchSettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/launchSettings.json"
deleted file mode 100644
index 16b63a2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/launchSettings.json"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縶
- "$schema": "https://json.schemastore.org/launchsettings.json",
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:39740",
- "sslPort": 0
- }
- },
- "profiles": {
- "WIDESEA_WMSServer": {
- "commandName": "Project",
- "dotnetRunMessages": true,
- "launchBrowser": true,
- //"launchUrl": "swagger",
- "applicationUrl": "http://localhost:5230",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
- "IIS Express": {
- "commandName": "IISExpress",
- "launchBrowser": true,
- //"launchUrl": "swagger",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
deleted file mode 100644
index a067e0e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
+++ /dev/null
@@ -1,30 +0,0 @@
-锘�<Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <Nullable>enable</Nullable>
- <ImplicitUsings>enable</ImplicitUsings>
- </PropertyGroup>
-
- <ItemGroup>
- <Content Remove="wwwroot\WIDESEA_DB.DBSeed.Json\Sys_Tenant.tsv" />
- </ItemGroup>
-
- <ItemGroup>
- <None Include="wwwroot\WIDESEA_DB.DBSeed.Json\Sys_Tenant.tsv" />
- <None Include="wwwroot\WIDESEA_DB.DBSeed.Json\Sys_User.tsv" />
- </ItemGroup>
-
- <ItemGroup>
- <None Remove="index.html" />
- </ItemGroup>
-
- <ItemGroup>
- <EmbeddedResource Include="index.html" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\WIDESEA_BusinessServices\WIDESEA_BusinessServices.csproj" />
- <ProjectReference Include="..\WIDESEA_Services\WIDESEA_Services.csproj" />
- </ItemGroup>
-</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.Development.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.Development.json"
deleted file mode 100644
index 0c208ae..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.Development.json"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
deleted file mode 100644
index 904788f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- },
- "AllowedHosts": "*",
-
- "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
- //杩炴帴瀛楃涓�
- //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=Tenant_WMSDB_Main;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-
- //璺ㄥ煙
- "Cors": {
- "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
- "EnableAllIPs": true, //褰撲负true鏃讹紝寮�鏀炬墍鏈塈P鍧囧彲璁块棶銆�
- // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
- // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
- "IPs": "http://127.0.0.1:8080,http://localhost:8080"
- },
- "ApiName": "WIDESEA",
- "ExpMinutes": 120,
-
- // 闇�瑕佺Щ搴撶殑琛�
- "TransfertRows":"1,4,5,8"
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/index.html" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/index.html"
deleted file mode 100644
index 4a30502..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/index.html"
+++ /dev/null
@@ -1,124 +0,0 @@
-锘�
-<!--1銆佺増鏈彿瑕佷笌nuget鍖呬竴鑷达紱2銆乮d涓嶈兘涓虹┖-->
-<script async="async" id="mini-profiler" src="/profiler/includes.min.js?v=4.3.8+1120572909" data-version="4.3.8+1120572909" data-path="/profiler/" data-current-id="0d7e468e-0bb5-4c81-90fc-91fd1543640a" data-ids="0d7e468e-0bb5-4c81-90fc-91fd1543640a" data-position="Left" data-scheme="Light" data-authorized="true" data-children="true" data-max-traces="15" data-toggle-shortcut="Alt+P" data-trivial-milliseconds="2.0" data-ignored-duplicate-execute-types="Open,OpenAsync,Close,CloseAsync"></script>
-
-<!-- HTML for static distribution bundle build -->
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <!--鏋侀�熸ā寮�-->
- <meta name="renderer" content="webkit" />
- <meta name="force-rendering" content="webkit" />
- <title>%(DocumentTitle)</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" type="text/css" href="./swagger-ui.css">
- <link rel="icon" type="image/png" href="./logo/favicon-32x32.png" sizes="32x32" />
- <script src="js/jquery-3.3.1.min.js"></script>
- <style>
-
- html {
- box-sizing: border-box;
- overflow-y: scroll;
- }
-
- *,
- *:before,
- *:after {
- box-sizing: inherit;
- }
-
- body {
- margin: 0;
- background: #fafafa;
- }
-
- .qqgroup {
- position: absolute;
- top: 67px;
- right: 10px;
- }
-
- .info {
- float: left;
- }
-
- .download-contents {
- display: none;
- }
- </style>
- %(HeadContent)
-</head>
-<body>
- <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
- <defs>
- <symbol viewBox="0 0 20 20" id="unlocked">
- <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
- </symbol>
- <symbol viewBox="0 0 20 20" id="locked">
- <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z" />
- </symbol>
- <symbol viewBox="0 0 20 20" id="close">
- <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z" />
- </symbol>
- <symbol viewBox="0 0 20 20" id="large-arrow">
- <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z" />
- </symbol>
- <symbol viewBox="0 0 20 20" id="large-arrow-down">
- <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z" />
- </symbol>
-
- <symbol viewBox="0 0 24 24" id="jump-to">
- <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z" />
- </symbol>
- <symbol viewBox="0 0 24 24" id="expand">
- <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z" />
- </symbol>
- </defs>
- </svg>
- <div id="swagger-ui"></div>
- <div id="footer" style="text-align: center;margin-bottom: 10px;">
- Copyright 漏 2024-2030 WIDESEA.Core
-
- <br><span id="poweredby">Powered by .NET 6.0.28</span>
- </div>
- <!-- Workaround for https://github.com/swagger-api/swagger-editor/issues/1371 -->
- <script>
- if (window.navigator.userAgent.indexOf("Edge") > -1) {
- console.log("Removing native Edge fetch in favor of swagger-ui's polyfill")
- window.fetch = undefined;
- }
- </script>
- <script src="./swagger-ui-bundle.js"></script>
- <script src="./swagger-ui-standalone-preset.js"></script>
- <script>
- var int = null;
- window.onload = function () {
- var configObject = JSON.parse('%(ConfigObject)');
- var oauthConfigObject = JSON.parse('%(OAuthConfigObject)');
-
- // Apply mandatory parameters
- configObject.dom_id = "#swagger-ui";
- configObject.presets = [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset];
- configObject.layout = "StandaloneLayout";
-
- // If oauth2RedirectUrl isn't specified, use the built-in default
- if (!configObject.hasOwnProperty("oauth2RedirectUrl"))
- configObject.oauth2RedirectUrl = window.location.href.replace("index.html", "oauth2-redirect.html");
-
- // Build a system
- const ui = SwaggerUIBundle(configObject);
-
- // Apply OAuth config
- ui.initOAuth(oauthConfigObject);
-
- $(".link img").attr("src", "./logo/favicon-32x32.png");
-
- $('#swagger-ui').after("<div class='qqgroup'><img src='https://img.neters.club/doc/wechatgongzhonghao.png' alt='QQ浜岀淮鐮�' style='width: 150px;'><div style=\"color: #4990e2;\"><a href=\"../allservices\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\">1銆佹煡鐪嬫墍鏈変緷璧栨敞鍐岀殑鏈嶅姟</a><br><a href=\"../ui\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\">2銆佹煡鐪嬪墠绔厤濂楅〉闈�</a></div></div><div style='clear: both;'></div>");
-
- }
-
-
- </script>
-</body>
-</html>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.assets.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.assets.cache"
deleted file mode 100644
index 2812e15..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.assets.cache"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.dgspec.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.dgspec.json"
deleted file mode 100644
index 62ac3d6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.dgspec.json"
+++ /dev/null
@@ -1,889 +0,0 @@
-{
- "format": 1,
- "restore": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj": {}
- },
- "projects": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "projectName": "LogLibrary",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "projectName": "WIDESEA_BusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj",
- "projectName": "WIDESEA_BusinessServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessesRepository\\WIDESEA_BusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "projectName": "WIDESEA_Common",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "version": "1.0.1",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "projectName": "WIDESEA_Core",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "projectName": "WIDESEA_DTO",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "projectName": "WIDESEA_IBusinessesRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "projectName": "WIDESEA_IBusinessServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "projectName": "WIDESEA_IRepository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_DTO\\WIDESEA_DTO.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "projectName": "WIDESEA_IServices",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "projectName": "WIDESEA_Model",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\WIDESEA_Model.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Model\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Common\\WIDESEA_Common.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Core\\WIDESEA_Core.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "projectName": "WIDESEA_Repository",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\WIDESEA_Repository.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Repository\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IRepository\\WIDESEA_IRepository.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "projectName": "WIDESEA_Services",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\LogLibrary\\LogLibrary.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessesRepository\\WIDESEA_IBusinessesRepository.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IBusinessServices\\WIDESEA_IBusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_IServices\\WIDESEA_IServices.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj",
- "projectName": "WIDESEA_WMSServer",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.g.props" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.g.props"
deleted file mode 100644
index 48d5ac4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.g.props"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
- <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
- <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
- <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
- </PropertyGroup>
- <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files (x86)\Microsoft\Xamarin\NuGet\" />
- </ItemGroup>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.g.targets" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.g.targets"
deleted file mode 100644
index 53cfaa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/WIDESEA_WMSServer.csproj.nuget.g.targets"
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/project.assets.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/project.assets.json"
deleted file mode 100644
index 392b53b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/project.assets.json"
+++ /dev/null
@@ -1,321 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {
- "LogLibrary/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/LogLibrary.dll": {}
- },
- "runtime": {
- "bin/placeholder/LogLibrary.dll": {}
- }
- },
- "WIDESEA_BusinessesRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_IBusinessesRepository": "1.0.0",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_BusinessesRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_BusinessesRepository.dll": {}
- }
- },
- "WIDESEA_BusinessServices/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_BusinessesRepository": "1.0.0",
- "WIDESEA_Core": "1.0.1",
- "WIDESEA_IBusinessServices": "1.0.0",
- "WIDESEA_IBusinessesRepository": "1.0.0",
- "WIDESEA_Model": "1.0.0",
- "WIDESEA_Services": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_BusinessServices.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_BusinessServices.dll": {}
- }
- },
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Common.dll": {}
- }
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "compile": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Core.dll": {}
- }
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_DTO.dll": {}
- }
- },
- "WIDESEA_IBusinessesRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Core": "1.0.1",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IBusinessesRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IBusinessesRepository.dll": {}
- }
- },
- "WIDESEA_IBusinessServices/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Core": "1.0.1",
- "WIDESEA_Model": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IBusinessServices.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IBusinessServices.dll": {}
- }
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_DTO": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IRepository.dll": {}
- }
- },
- "WIDESEA_IServices/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Repository": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_IServices.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_IServices.dll": {}
- }
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_Common": "1.0.0",
- "WIDESEA_Core": "1.0.1"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Model.dll": {}
- }
- },
- "WIDESEA_Repository/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "WIDESEA_IRepository": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Repository.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Repository.dll": {}
- }
- },
- "WIDESEA_Services/1.0.0": {
- "type": "project",
- "framework": ".NETCoreApp,Version=v6.0",
- "dependencies": {
- "LogLibrary": "1.0.0",
- "WIDESEA_IBusinessServices": "1.0.0",
- "WIDESEA_IBusinessesRepository": "1.0.0",
- "WIDESEA_IServices": "1.0.0"
- },
- "compile": {
- "bin/placeholder/WIDESEA_Services.dll": {}
- },
- "runtime": {
- "bin/placeholder/WIDESEA_Services.dll": {}
- }
- }
- }
- },
- "libraries": {
- "LogLibrary/1.0.0": {
- "type": "project",
- "path": "../LogLibrary/LogLibrary.csproj",
- "msbuildProject": "../LogLibrary/LogLibrary.csproj"
- },
- "WIDESEA_BusinessesRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_BusinessesRepository/WIDESEA_BusinessesRepository.csproj",
- "msbuildProject": "../WIDESEA_BusinessesRepository/WIDESEA_BusinessesRepository.csproj"
- },
- "WIDESEA_BusinessServices/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_BusinessServices/WIDESEA_BusinessServices.csproj",
- "msbuildProject": "../WIDESEA_BusinessServices/WIDESEA_BusinessServices.csproj"
- },
- "WIDESEA_Common/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Common/WIDESEA_Common.csproj",
- "msbuildProject": "../WIDESEA_Common/WIDESEA_Common.csproj"
- },
- "WIDESEA_Core/1.0.1": {
- "type": "project",
- "path": "../WIDESEA_Core/WIDESEA_Core.csproj",
- "msbuildProject": "../WIDESEA_Core/WIDESEA_Core.csproj"
- },
- "WIDESEA_DTO/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_DTO/WIDESEA_DTO.csproj",
- "msbuildProject": "../WIDESEA_DTO/WIDESEA_DTO.csproj"
- },
- "WIDESEA_IBusinessesRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj",
- "msbuildProject": "../WIDESEA_IBusinessesRepository/WIDESEA_IBusinessesRepository.csproj"
- },
- "WIDESEA_IBusinessServices/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj",
- "msbuildProject": "../WIDESEA_IBusinessServices/WIDESEA_IBusinessServices.csproj"
- },
- "WIDESEA_IRepository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj",
- "msbuildProject": "../WIDESEA_IRepository/WIDESEA_IRepository.csproj"
- },
- "WIDESEA_IServices/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_IServices/WIDESEA_IServices.csproj",
- "msbuildProject": "../WIDESEA_IServices/WIDESEA_IServices.csproj"
- },
- "WIDESEA_Model/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Model/WIDESEA_Model.csproj",
- "msbuildProject": "../WIDESEA_Model/WIDESEA_Model.csproj"
- },
- "WIDESEA_Repository/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Repository/WIDESEA_Repository.csproj",
- "msbuildProject": "../WIDESEA_Repository/WIDESEA_Repository.csproj"
- },
- "WIDESEA_Services/1.0.0": {
- "type": "project",
- "path": "../WIDESEA_Services/WIDESEA_Services.csproj",
- "msbuildProject": "../WIDESEA_Services/WIDESEA_Services.csproj"
- }
- },
- "projectFileDependencyGroups": {
- "net6.0": [
- "WIDESEA_BusinessServices >= 1.0.0",
- "WIDESEA_Services >= 1.0.0"
- ]
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {},
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {},
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj",
- "projectName": "WIDESEA_WMSServer",
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\obj\\",
- "projectStyle": "PackageReference",
- "fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\"
- ],
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 18.1.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\DevExpress 18.1\\Components\\System\\Components\\Packages": {},
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_BusinessServices\\WIDESEA_BusinessServices.csproj"
- },
- "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj": {
- "projectPath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_Services\\WIDESEA_Services.csproj"
- }
- }
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/project.nuget.cache" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/project.nuget.cache"
deleted file mode 100644
index db9700f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/project.nuget.cache"
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "aNMYq475Ox5RXcJanUYwlAOYOhrgKdH88V0sJv4mbDNLMN6Uk/KFNOhMcc/OrYIGwlfwuejUEFWLwAL7CAQ8Eg==",
- "success": true,
- "projectFilePath": "F:\\Git椤圭洰\\Infrastructure\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv"
deleted file mode 100644
index 2efa8fb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv"
+++ /dev/null
@@ -1,146 +0,0 @@
-[
- {
- "MenuName": "鐢ㄦ埛绠＄悊",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"}]",
- "Icon": "el-icon-user",
- "Description": null,
- "Enable": 1,
- "TableName": "/",
- "ParentId": 0,
- "Url": null,
- "OrderNo": 4000,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "MenuName": "鐢ㄦ埛绠＄悊",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"鏂板缓\",\"value\":\"Add\"},{\"text\":\"鍒犻櫎\",\"value\":\"Delete\"},{\"text\":\"缂栬緫\",\"value\":\"Update\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
- "Icon": null,
- "Description": null,
- "Enable": 1,
- "TableName": "Sys_User",
- "ParentId": 1,
- "Url": "/Sys_User",
- "OrderNo": 2000,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "MenuName": "鏉冮檺绠＄悊",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"缂栬緫\",\"value\":\"Update\"}]",
- "Icon": "ivu-icon ivu-icon-ios-boat",
- "Description": null,
- "Enable": 1,
- "TableName": "/",
- "ParentId": 1,
- "Url": "/permission",
- "OrderNo": 1000,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "MenuName": "瑙掕壊绠＄悊",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"鏂板缓\",\"value\":\"Add\"},{\"text\":\"鍒犻櫎\",\"value\":\"Delete\"},{\"text\":\"缂栬緫\",\"value\":\"Update\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
- "Icon": null,
- "Description": null,
- "Enable": 1,
- "TableName": "Sys_Role",
- "ParentId": 1,
- "Url": "/Sys_Role",
- "OrderNo": 900,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "MenuName": "绯荤粺璁剧疆",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"}]",
- "Icon": "el-icon-setting",
- "Description": null,
- "Enable": 1,
- "TableName": "/",
- "ParentId": 0,
- "Url": "/",
- "OrderNo": 0,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "MenuName": "鑿滃崟璁剧疆",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
- "Icon": null,
- "Description": null,
- "Enable": 1,
- "TableName": "Sys_Menu",
- "ParentId": 5,
- "Url": "/sysmenu",
- "OrderNo": 10,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "MenuName": "涓嬫媺妗嗙粦瀹氳缃�",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"鏂板缓\",\"value\":\"Add\"},{\"text\":\"鍒犻櫎\",\"value\":\"Delete\"},{\"text\":\"缂栬緫\",\"value\":\"Update\"},{\"text\":\"瀵煎叆\",\"value\":\"Import\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
- "Icon": null,
- "Description": null,
- "Enable": 1,
- "TableName": "Sys_Dictionary",
- "ParentId": 5,
- "Url": "/Sys_Dictionary",
- "OrderNo": 10,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "MenuName": "鏃ュ織绠＄悊",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"}]",
- "Icon": "el-icon-date",
- "Description": null,
- "Enable": 1,
- "TableName": "/",
- "ParentId": 0,
- "Url": "/",
- "OrderNo": 500,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- },
- {
- "MenuName": "鎺ュ彛鏃ュ織",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"鍒犻櫎\",\"value\":\"Delete\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
- "Icon": null,
- "Description": null,
- "Enable": 1,
- "TableName": "Sys_Log",
- "ParentId": 8,
- "Url": "/Sys_Log/Manager",
- "OrderNo": 0,
- "MenuType": 99,
- "Creater": "admin",
- "CreateDate": null,
- "Modifier": null,
- "ModifyDate": null
- }
-]
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Tenant.tsv" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Tenant.tsv"
deleted file mode 100644
index 84c3e59..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Tenant.tsv"
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-
-]
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_User.tsv" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_User.tsv"
deleted file mode 100644
index 1fda989..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_User.tsv"
+++ /dev/null
@@ -1,26 +0,0 @@
-[
- {
- "UserName": "admin",
- "Role_Id": "1",
- "RoleName": "瓒呯骇绠＄悊鍛�",
- "PhoneNo": "",
- "Remark": "",
- "UserPwd": "j79rYYvCz4vdhcboB1Ausg==",
- "UserTrueName": "瓒呯骇绠＄悊鍛�",
- "DeptName": "",
- "Dept_Id": "0",
- "Email": "",
- "Enable": "1",
- "Gender": "1",
- "HeadImageUrl": "",
- "LastModifyPwdDate": "2024-04-16 19:58:55",
- "Address": "绯荤粺鏈嶅姟鍣�",
- "AuditDate": "2024-04-16 00:54:06",
- "AuditStatus": "1",
- "Auditor": "瓒呯骇绠＄悊鍛�",
- "Token": "",
- "SystemType": "1",
- "Creater": "绯荤粺",
- "TenantId": 0
- }
-]
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/css/style.css" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/css/style.css"
deleted file mode 100644
index f8fe18d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/css/style.css"
+++ /dev/null
@@ -1,132 +0,0 @@
-@charset "utf-8";
-::selection {
- background: #2D2F36;
-}
-::-webkit-selection {
- background: #2D2F36;
-}
-::-moz-selection {
- background: #2D2F36;
-}
-body {
- background: white;
- font-family: 'Inter UI', sans-serif;
- margin: 0;
- padding: 20px;
-}
-.page {
- background: #e2e2e5;
- display: flex;
- flex-direction: column;
- height: calc(100% - 40px);
- position: absolute;
- place-content: center;
- width: calc(100% - 40px);
-}
-@media (max-width: 767px) {
- .page {
- height: auto;
- margin-bottom: 20px;
- padding-bottom: 20px;
- }
-}
-.container {
- display: flex;
- height: 320px;
- margin: 0 auto;
- width: 640px;
-}
-@media (max-width: 767px) {
- .container {
- flex-direction: column;
- height: 630px;
- width: 320px;
- }
-}
-.left {
- background: white;
- height: calc(100% - 40px);
- top: 20px;
- position: relative;
- width: 50%;
-}
-@media (max-width: 767px) {
- .left {
- height: 100%;
- left: 20px;
- width: calc(100% - 40px);
- max-height: 270px;
- }
-}
-.login {
- font-size: 33px;
- font-weight: 900;
- margin: 50px 40px 40px;
-}
-.eula {
- color: #999;
- font-size: 14px;
- line-height: 1.5;
- margin: 40px;
-}
-.right {
- background: #474A59;
- box-shadow: 0px 0px 40px 16px rgba(0,0,0,0.22);
- color: #F1F1F2;
- position: relative;
- width: 50%;
-}
-@media (max-width: 767px) {
- .right {
- flex-shrink: 0;
- height: 100%;
- width: 100%;
- max-height: 350px;
- }
-}
-svg {
- position: absolute;
- width: 320px;
-}
-path {
- fill: none;
- stroke: url(#linearGradient);;
- stroke-width: 4;
- stroke-dasharray: 240 1386;
-}
-.form {
- margin: 40px;
- position: absolute;
-}
-label {
- color: #c2c2c5;
- display: block;
- font-size: 14px;
- height: 16px;
- margin-top: 20px;
- margin-bottom: 5px;
-}
-input {
- background: transparent;
- border: 0;
- color: #f2f2f2;
- font-size: 20px;
- height: 30px;
- line-height: 30px;
- outline: none !important;
- width: 100%;
-}
-input::-moz-focus-inner {
- border: 0;
-}
-#submit {
- color: #707075;
- margin-top: 40px;
- transition: color 300ms;
-}
-#submit:focus {
- color: #f2f2f2;
-}
-#submit:active {
- color: #d0d0d2;
-}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/js/anime.min.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/js/anime.min.js"
deleted file mode 100644
index c399324..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/js/anime.min.js"
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- 2017 Julian Garnier
- Released under the MIT license
-*/
-var $jscomp={scope:{}};$jscomp.defineProperty="function"==typeof Object.defineProperties?Object.defineProperty:function(e,r,p){if(p.get||p.set)throw new TypeError("ES3 does not support getters and setters.");e!=Array.prototype&&e!=Object.prototype&&(e[r]=p.value)};$jscomp.getGlobal=function(e){return"undefined"!=typeof window&&window===e?e:"undefined"!=typeof global&&null!=global?global:e};$jscomp.global=$jscomp.getGlobal(this);$jscomp.SYMBOL_PREFIX="jscomp_symbol_";
-$jscomp.initSymbol=function(){$jscomp.initSymbol=function(){};$jscomp.global.Symbol||($jscomp.global.Symbol=$jscomp.Symbol)};$jscomp.symbolCounter_=0;$jscomp.Symbol=function(e){return $jscomp.SYMBOL_PREFIX+(e||"")+$jscomp.symbolCounter_++};
-$jscomp.initSymbolIterator=function(){$jscomp.initSymbol();var e=$jscomp.global.Symbol.iterator;e||(e=$jscomp.global.Symbol.iterator=$jscomp.global.Symbol("iterator"));"function"!=typeof Array.prototype[e]&&$jscomp.defineProperty(Array.prototype,e,{configurable:!0,writable:!0,value:function(){return $jscomp.arrayIterator(this)}});$jscomp.initSymbolIterator=function(){}};$jscomp.arrayIterator=function(e){var r=0;return $jscomp.iteratorPrototype(function(){return r<e.length?{done:!1,value:e[r++]}:{done:!0}})};
-$jscomp.iteratorPrototype=function(e){$jscomp.initSymbolIterator();e={next:e};e[$jscomp.global.Symbol.iterator]=function(){return this};return e};$jscomp.array=$jscomp.array||{};$jscomp.iteratorFromArray=function(e,r){$jscomp.initSymbolIterator();e instanceof String&&(e+="");var p=0,m={next:function(){if(p<e.length){var u=p++;return{value:r(u,e[u]),done:!1}}m.next=function(){return{done:!0,value:void 0}};return m.next()}};m[Symbol.iterator]=function(){return m};return m};
-$jscomp.polyfill=function(e,r,p,m){if(r){p=$jscomp.global;e=e.split(".");for(m=0;m<e.length-1;m++){var u=e[m];u in p||(p[u]={});p=p[u]}e=e[e.length-1];m=p[e];r=r(m);r!=m&&null!=r&&$jscomp.defineProperty(p,e,{configurable:!0,writable:!0,value:r})}};$jscomp.polyfill("Array.prototype.keys",function(e){return e?e:function(){return $jscomp.iteratorFromArray(this,function(e){return e})}},"es6-impl","es3");var $jscomp$this=this;
-(function(e,r){"function"===typeof define&&define.amd?define([],r):"object"===typeof module&&module.exports?module.exports=r():e.anime=r()})(this,function(){function e(a){if(!h.col(a))try{return document.querySelectorAll(a)}catch(c){}}function r(a,c){for(var d=a.length,b=2<=arguments.length?arguments[1]:void 0,f=[],n=0;n<d;n++)if(n in a){var k=a[n];c.call(b,k,n,a)&&f.push(k)}return f}function p(a){return a.reduce(function(a,d){return a.concat(h.arr(d)?p(d):d)},[])}function m(a){if(h.arr(a))return a;
-h.str(a)&&(a=e(a)||a);return a instanceof NodeList||a instanceof HTMLCollection?[].slice.call(a):[a]}function u(a,c){return a.some(function(a){return a===c})}function C(a){var c={},d;for(d in a)c[d]=a[d];return c}function D(a,c){var d=C(a),b;for(b in a)d[b]=c.hasOwnProperty(b)?c[b]:a[b];return d}function z(a,c){var d=C(a),b;for(b in c)d[b]=h.und(a[b])?c[b]:a[b];return d}function T(a){a=a.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i,function(a,c,d,k){return c+c+d+d+k+k});var c=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(a);
-a=parseInt(c[1],16);var d=parseInt(c[2],16),c=parseInt(c[3],16);return"rgba("+a+","+d+","+c+",1)"}function U(a){function c(a,c,b){0>b&&(b+=1);1<b&&--b;return b<1/6?a+6*(c-a)*b:.5>b?c:b<2/3?a+(c-a)*(2/3-b)*6:a}var d=/hsl\((\d+),\s*([\d.]+)%,\s*([\d.]+)%\)/g.exec(a)||/hsla\((\d+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)/g.exec(a);a=parseInt(d[1])/360;var b=parseInt(d[2])/100,f=parseInt(d[3])/100,d=d[4]||1;if(0==b)f=b=a=f;else{var n=.5>f?f*(1+b):f+b-f*b,k=2*f-n,f=c(k,n,a+1/3),b=c(k,n,a);a=c(k,n,a-1/3)}return"rgba("+
-255*f+","+255*b+","+255*a+","+d+")"}function y(a){if(a=/([\+\-]?[0-9#\.]+)(%|px|pt|em|rem|in|cm|mm|ex|ch|pc|vw|vh|vmin|vmax|deg|rad|turn)?$/.exec(a))return a[2]}function V(a){if(-1<a.indexOf("translate")||"perspective"===a)return"px";if(-1<a.indexOf("rotate")||-1<a.indexOf("skew"))return"deg"}function I(a,c){return h.fnc(a)?a(c.target,c.id,c.total):a}function E(a,c){if(c in a.style)return getComputedStyle(a).getPropertyValue(c.replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase())||"0"}function J(a,c){if(h.dom(a)&&
-u(W,c))return"transform";if(h.dom(a)&&(a.getAttribute(c)||h.svg(a)&&a[c]))return"attribute";if(h.dom(a)&&"transform"!==c&&E(a,c))return"css";if(null!=a[c])return"object"}function X(a,c){var d=V(c),d=-1<c.indexOf("scale")?1:0+d;a=a.style.transform;if(!a)return d;for(var b=[],f=[],n=[],k=/(\w+)\((.+?)\)/g;b=k.exec(a);)f.push(b[1]),n.push(b[2]);a=r(n,function(a,b){return f[b]===c});return a.length?a[0]:d}function K(a,c){switch(J(a,c)){case "transform":return X(a,c);case "css":return E(a,c);case "attribute":return a.getAttribute(c)}return a[c]||
-0}function L(a,c){var d=/^(\*=|\+=|-=)/.exec(a);if(!d)return a;var b=y(a)||0;c=parseFloat(c);a=parseFloat(a.replace(d[0],""));switch(d[0][0]){case "+":return c+a+b;case "-":return c-a+b;case "*":return c*a+b}}function F(a,c){return Math.sqrt(Math.pow(c.x-a.x,2)+Math.pow(c.y-a.y,2))}function M(a){a=a.points;for(var c=0,d,b=0;b<a.numberOfItems;b++){var f=a.getItem(b);0<b&&(c+=F(d,f));d=f}return c}function N(a){if(a.getTotalLength)return a.getTotalLength();switch(a.tagName.toLowerCase()){case "circle":return 2*
-Math.PI*a.getAttribute("r");case "rect":return 2*a.getAttribute("width")+2*a.getAttribute("height");case "line":return F({x:a.getAttribute("x1"),y:a.getAttribute("y1")},{x:a.getAttribute("x2"),y:a.getAttribute("y2")});case "polyline":return M(a);case "polygon":var c=a.points;return M(a)+F(c.getItem(c.numberOfItems-1),c.getItem(0))}}function Y(a,c){function d(b){b=void 0===b?0:b;return a.el.getPointAtLength(1<=c+b?c+b:0)}var b=d(),f=d(-1),n=d(1);switch(a.property){case "x":return b.x;case "y":return b.y;
-case "angle":return 180*Math.atan2(n.y-f.y,n.x-f.x)/Math.PI}}function O(a,c){var d=/-?\d*\.?\d+/g,b;b=h.pth(a)?a.totalLength:a;if(h.col(b))if(h.rgb(b)){var f=/rgb\((\d+,\s*[\d]+,\s*[\d]+)\)/g.exec(b);b=f?"rgba("+f[1]+",1)":b}else b=h.hex(b)?T(b):h.hsl(b)?U(b):void 0;else f=(f=y(b))?b.substr(0,b.length-f.length):b,b=c&&!/\s/g.test(b)?f+c:f;b+="";return{original:b,numbers:b.match(d)?b.match(d).map(Number):[0],strings:h.str(a)||c?b.split(d):[]}}function P(a){a=a?p(h.arr(a)?a.map(m):m(a)):[];return r(a,
-function(a,d,b){return b.indexOf(a)===d})}function Z(a){var c=P(a);return c.map(function(a,b){return{target:a,id:b,total:c.length}})}function aa(a,c){var d=C(c);if(h.arr(a)){var b=a.length;2!==b||h.obj(a[0])?h.fnc(c.duration)||(d.duration=c.duration/b):a={value:a}}return m(a).map(function(a,b){b=b?0:c.delay;a=h.obj(a)&&!h.pth(a)?a:{value:a};h.und(a.delay)&&(a.delay=b);return a}).map(function(a){return z(a,d)})}function ba(a,c){var d={},b;for(b in a){var f=I(a[b],c);h.arr(f)&&(f=f.map(function(a){return I(a,
-c)}),1===f.length&&(f=f[0]));d[b]=f}d.duration=parseFloat(d.duration);d.delay=parseFloat(d.delay);return d}function ca(a){return h.arr(a)?A.apply(this,a):Q[a]}function da(a,c){var d;return a.tweens.map(function(b){b=ba(b,c);var f=b.value,e=K(c.target,a.name),k=d?d.to.original:e,k=h.arr(f)?f[0]:k,w=L(h.arr(f)?f[1]:f,k),e=y(w)||y(k)||y(e);b.from=O(k,e);b.to=O(w,e);b.start=d?d.end:a.offset;b.end=b.start+b.delay+b.duration;b.easing=ca(b.easing);b.elasticity=(1E3-Math.min(Math.max(b.elasticity,1),999))/
-1E3;b.isPath=h.pth(f);b.isColor=h.col(b.from.original);b.isColor&&(b.round=1);return d=b})}function ea(a,c){return r(p(a.map(function(a){return c.map(function(b){var c=J(a.target,b.name);if(c){var d=da(b,a);b={type:c,property:b.name,animatable:a,tweens:d,duration:d[d.length-1].end,delay:d[0].delay}}else b=void 0;return b})})),function(a){return!h.und(a)})}function R(a,c,d,b){var f="delay"===a;return c.length?(f?Math.min:Math.max).apply(Math,c.map(function(b){return b[a]})):f?b.delay:d.offset+b.delay+
-b.duration}function fa(a){var c=D(ga,a),d=D(S,a),b=Z(a.targets),f=[],e=z(c,d),k;for(k in a)e.hasOwnProperty(k)||"targets"===k||f.push({name:k,offset:e.offset,tweens:aa(a[k],d)});a=ea(b,f);return z(c,{children:[],animatables:b,animations:a,duration:R("duration",a,c,d),delay:R("delay",a,c,d)})}function q(a){function c(){return window.Promise&&new Promise(function(a){return p=a})}function d(a){return g.reversed?g.duration-a:a}function b(a){for(var b=0,c={},d=g.animations,f=d.length;b<f;){var e=d[b],
-k=e.animatable,h=e.tweens,n=h.length-1,l=h[n];n&&(l=r(h,function(b){return a<b.end})[0]||l);for(var h=Math.min(Math.max(a-l.start-l.delay,0),l.duration)/l.duration,w=isNaN(h)?1:l.easing(h,l.elasticity),h=l.to.strings,p=l.round,n=[],m=void 0,m=l.to.numbers.length,t=0;t<m;t++){var x=void 0,x=l.to.numbers[t],q=l.from.numbers[t],x=l.isPath?Y(l.value,w*x):q+w*(x-q);p&&(l.isColor&&2<t||(x=Math.round(x*p)/p));n.push(x)}if(l=h.length)for(m=h[0],w=0;w<l;w++)p=h[w+1],t=n[w],isNaN(t)||(m=p?m+(t+p):m+(t+" "));
-else m=n[0];ha[e.type](k.target,e.property,m,c,k.id);e.currentValue=m;b++}if(b=Object.keys(c).length)for(d=0;d<b;d++)H||(H=E(document.body,"transform")?"transform":"-webkit-transform"),g.animatables[d].target.style[H]=c[d].join(" ");g.currentTime=a;g.progress=a/g.duration*100}function f(a){if(g[a])g[a](g)}function e(){g.remaining&&!0!==g.remaining&&g.remaining--}function k(a){var k=g.duration,n=g.offset,w=n+g.delay,r=g.currentTime,x=g.reversed,q=d(a);if(g.children.length){var u=g.children,v=u.length;
-if(q>=g.currentTime)for(var G=0;G<v;G++)u[G].seek(q);else for(;v--;)u[v].seek(q)}if(q>=w||!k)g.began||(g.began=!0,f("begin")),f("run");if(q>n&&q<k)b(q);else if(q<=n&&0!==r&&(b(0),x&&e()),q>=k&&r!==k||!k)b(k),x||e();f("update");a>=k&&(g.remaining?(t=h,"alternate"===g.direction&&(g.reversed=!g.reversed)):(g.pause(),g.completed||(g.completed=!0,f("complete"),"Promise"in window&&(p(),m=c()))),l=0)}a=void 0===a?{}:a;var h,t,l=0,p=null,m=c(),g=fa(a);g.reset=function(){var a=g.direction,c=g.loop;g.currentTime=
-0;g.progress=0;g.paused=!0;g.began=!1;g.completed=!1;g.reversed="reverse"===a;g.remaining="alternate"===a&&1===c?2:c;b(0);for(a=g.children.length;a--;)g.children[a].reset()};g.tick=function(a){h=a;t||(t=h);k((l+h-t)*q.speed)};g.seek=function(a){k(d(a))};g.pause=function(){var a=v.indexOf(g);-1<a&&v.splice(a,1);g.paused=!0};g.play=function(){g.paused&&(g.paused=!1,t=0,l=d(g.currentTime),v.push(g),B||ia())};g.reverse=function(){g.reversed=!g.reversed;t=0;l=d(g.currentTime)};g.restart=function(){g.pause();
-g.reset();g.play()};g.finished=m;g.reset();g.autoplay&&g.play();return g}var ga={update:void 0,begin:void 0,run:void 0,complete:void 0,loop:1,direction:"normal",autoplay:!0,offset:0},S={duration:1E3,delay:0,easing:"easeOutElastic",elasticity:500,round:0},W="translateX translateY translateZ rotate rotateX rotateY rotateZ scale scaleX scaleY scaleZ skewX skewY perspective".split(" "),H,h={arr:function(a){return Array.isArray(a)},obj:function(a){return-1<Object.prototype.toString.call(a).indexOf("Object")},
-pth:function(a){return h.obj(a)&&a.hasOwnProperty("totalLength")},svg:function(a){return a instanceof SVGElement},dom:function(a){return a.nodeType||h.svg(a)},str:function(a){return"string"===typeof a},fnc:function(a){return"function"===typeof a},und:function(a){return"undefined"===typeof a},hex:function(a){return/(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(a)},rgb:function(a){return/^rgb/.test(a)},hsl:function(a){return/^hsl/.test(a)},col:function(a){return h.hex(a)||h.rgb(a)||h.hsl(a)}},A=function(){function a(a,
-d,b){return(((1-3*b+3*d)*a+(3*b-6*d))*a+3*d)*a}return function(c,d,b,f){if(0<=c&&1>=c&&0<=b&&1>=b){var e=new Float32Array(11);if(c!==d||b!==f)for(var k=0;11>k;++k)e[k]=a(.1*k,c,b);return function(k){if(c===d&&b===f)return k;if(0===k)return 0;if(1===k)return 1;for(var h=0,l=1;10!==l&&e[l]<=k;++l)h+=.1;--l;var l=h+(k-e[l])/(e[l+1]-e[l])*.1,n=3*(1-3*b+3*c)*l*l+2*(3*b-6*c)*l+3*c;if(.001<=n){for(h=0;4>h;++h){n=3*(1-3*b+3*c)*l*l+2*(3*b-6*c)*l+3*c;if(0===n)break;var m=a(l,c,b)-k,l=l-m/n}k=l}else if(0===
-n)k=l;else{var l=h,h=h+.1,g=0;do m=l+(h-l)/2,n=a(m,c,b)-k,0<n?h=m:l=m;while(1e-7<Math.abs(n)&&10>++g);k=m}return a(k,d,f)}}}}(),Q=function(){function a(a,b){return 0===a||1===a?a:-Math.pow(2,10*(a-1))*Math.sin(2*(a-1-b/(2*Math.PI)*Math.asin(1))*Math.PI/b)}var c="Quad Cubic Quart Quint Sine Expo Circ Back Elastic".split(" "),d={In:[[.55,.085,.68,.53],[.55,.055,.675,.19],[.895,.03,.685,.22],[.755,.05,.855,.06],[.47,0,.745,.715],[.95,.05,.795,.035],[.6,.04,.98,.335],[.6,-.28,.735,.045],a],Out:[[.25,
-.46,.45,.94],[.215,.61,.355,1],[.165,.84,.44,1],[.23,1,.32,1],[.39,.575,.565,1],[.19,1,.22,1],[.075,.82,.165,1],[.175,.885,.32,1.275],function(b,c){return 1-a(1-b,c)}],InOut:[[.455,.03,.515,.955],[.645,.045,.355,1],[.77,0,.175,1],[.86,0,.07,1],[.445,.05,.55,.95],[1,0,0,1],[.785,.135,.15,.86],[.68,-.55,.265,1.55],function(b,c){return.5>b?a(2*b,c)/2:1-a(-2*b+2,c)/2}]},b={linear:A(.25,.25,.75,.75)},f={},e;for(e in d)f.type=e,d[f.type].forEach(function(a){return function(d,f){b["ease"+a.type+c[f]]=h.fnc(d)?
-d:A.apply($jscomp$this,d)}}(f)),f={type:f.type};return b}(),ha={css:function(a,c,d){return a.style[c]=d},attribute:function(a,c,d){return a.setAttribute(c,d)},object:function(a,c,d){return a[c]=d},transform:function(a,c,d,b,f){b[f]||(b[f]=[]);b[f].push(c+"("+d+")")}},v=[],B=0,ia=function(){function a(){B=requestAnimationFrame(c)}function c(c){var b=v.length;if(b){for(var d=0;d<b;)v[d]&&v[d].tick(c),d++;a()}else cancelAnimationFrame(B),B=0}return a}();q.version="2.2.0";q.speed=1;q.running=v;q.remove=
-function(a){a=P(a);for(var c=v.length;c--;)for(var d=v[c],b=d.animations,f=b.length;f--;)u(a,b[f].animatable.target)&&(b.splice(f,1),b.length||d.pause())};q.getValue=K;q.path=function(a,c){var d=h.str(a)?e(a)[0]:a,b=c||100;return function(a){return{el:d,property:a,totalLength:N(d)*(b/100)}}};q.setDashoffset=function(a){var c=N(a);a.setAttribute("stroke-dasharray",c);return c};q.bezier=A;q.easings=Q;q.timeline=function(a){var c=q(a);c.pause();c.duration=0;c.add=function(d){c.children.forEach(function(a){a.began=
-!0;a.completed=!0});m(d).forEach(function(b){var d=z(b,D(S,a||{}));d.targets=d.targets||a.targets;b=c.duration;var e=d.offset;d.autoplay=!1;d.direction=c.direction;d.offset=h.und(e)?b:L(e,b);c.began=!0;c.completed=!0;c.seek(d.offset);d=q(d);d.began=!0;d.completed=!0;d.duration>b&&(c.duration=d.duration);c.children.push(d)});c.seek(0);c.reset();c.autoplay&&c.restart();return c};return c};q.random=function(a,c){return Math.floor(Math.random()*(c-a+1))+a};return q});
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/swg-login.html" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/swg-login.html"
deleted file mode 100644
index f1340e9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/swg-login.html"
+++ /dev/null
@@ -1,130 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8" />
- <title>鐧诲綍 - 鎺ュ彛鏂囨。</title>
- <!--<script src="http://code.jquery.com/jquery-1.8.3.min.js"></script>-->
- <script src="js/jquery-1.8.3.min.js"></script>
- <link type="text/css" href="css/style.css" rel="stylesheet" />
- <script src="js/anime.min.js"></script>
-
-</head>
-<body>
- <div class="page">
- <div class="container">
- <div class="left">
- <div></div>
-
- <div class="login"><img src="/logo.jpg.jpg" height="30" alt="Alternate Text" /> 鎺ュ彛鏂囨。</div>
- <div class="eula">娆㈣繋浣跨敤锛�</div>
- <!--<div class="eula">鐢ㄦ埛鍚嶏細admin锛屽瘑鐮侊細admin</div>-->
- </div>
- <div class="right">
- <svg viewBox="0 0 320 300">
- <defs>
- <linearGradient inkscape:collect="always"
- id="linearGradient"
- x1="13"
- y1="193.49992"
- x2="307"
- y2="193.49992"
- gradientUnits="userSpaceOnUse">
- <stop style="stop-color:#ff00ff;"
- offset="0"
- id="stop876" />
- <stop style="stop-color:#ff0000;"
- offset="1"
- id="stop878" />
- </linearGradient>
- </defs>
- <path d="m 40,120.00016 239.99984,-3.2e-4 c 0,0 24.99263,0.79932 25.00016,35.00016 0.008,34.20084 -25.00016,35 -25.00016,35 h -239.99984 c 0,-0.0205 -25,4.01348 -25,38.5 0,34.48652 25,38.5 25,38.5 h 215 c 0,0 20,-0.99604 20,-25 0,-24.00396 -20,-25 -20,-25 h -190 c 0,0 -20,1.71033 -20,25 0,24.00396 20,25 20,25 h 168.57143" />
- </svg>
- <div class="form">
- <label for="email">鐢ㄦ埛鍚�</label>
- <input type="email" id="email">
- <label for="password">瀵嗙爜</label>
- <input type="password" id="password">
- <input type="submit" id="submit" onclick="submit()" value="鐧� 褰�">
- </div>
- </div>
- </div>
- </div>
-
- <script>
- var current = null;
- document.querySelector('#email').addEventListener('focus', function (e) {
- if (current) current.pause();
- current = anime({
- targets: 'path',
- strokeDashoffset: {
- value: 0,
- duration: 700,
- easing: 'easeOutQuart'
- },
- strokeDasharray: {
- value: '240 1386',
- duration: 700,
- easing: 'easeOutQuart'
- }
- });
- });
- document.querySelector('#password').addEventListener('focus', function (e) {
- if (current) current.pause();
- current = anime({
- targets: 'path',
- strokeDashoffset: {
- value: -336,
- duration: 700,
- easing: 'easeOutQuart'
- },
- strokeDasharray: {
- value: '240 1386',
- duration: 700,
- easing: 'easeOutQuart'
- }
- });
- });
- document.querySelector('#submit').addEventListener('focus', function (e) {
- if (current) current.pause();
- current = anime({
- targets: 'path',
- strokeDashoffset: {
- value: -730,
- duration: 700,
- easing: 'easeOutQuart'
- },
- strokeDasharray: {
- value: '530 1386',
- duration: 700,
- easing: 'easeOutQuart'
- }
- });
- });
- function submit() {
- let postdata = {
- "name": $("#email").val(),
- "pwd": $("#password").val(),
- };
- if (!(postdata.name && postdata.pwd)) {
- alert('鍙傛暟涓嶆纭�');
- return
- }
- $.ajax({
- url: "/api/User/swgLogin",
- type: "POST",
- contentType: "application/json; charset=utf-8",
- data: JSON.stringify(postdata),
- dataType: 'json',
- success: function (data) {
- if (data?.result) {
- window.location.href = "/index.html";
- } else {
- alert('鍙傛暟涓嶆纭�');
- }
- }
- });
- }
- </script>
-
-</body>
-</html>
\ No newline at end of file
--
Gitblit v1.9.3