diff --git a/code/src/Modules/新版JIT或JIS系统服务端/.gitattributes b/code/src/Modules/新版JIT或JIS系统服务端/.gitattributes
deleted file mode 100644
index c941e526..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-**/wwwroot/libs/** linguist-vendored
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/.gitignore b/code/src/Modules/新版JIT或JIS系统服务端/.gitignore
deleted file mode 100644
index 0378c610..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/.gitignore
+++ /dev/null
@@ -1,262 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# NewJit
-src/WY.NewJit.Web/Logs/*
-src/WY.NewJit.Web.Host/Logs/*
-src/WY.NewJit.IdentityServer/Logs/*
-src/WY.NewJit.HttpApi.Host/Logs/*
-src/WY.NewJit.HttpApi.HostWithIds/Logs/*
-src/WY.NewJit.DbMigrator/Logs/*
-src/WY.NewJit.Blazor.Server/Logs/*
-src/WY.NewJit.Blazor.Server.Tiered/Logs/*
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/.prettierrc b/code/src/Modules/新版JIT或JIS系统服务端/.prettierrc
deleted file mode 100644
index 56af76bd..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/.prettierrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "singleQuote": true,
- "useTabs": false,
- "tabWidth": 4
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/NuGet.Config b/code/src/Modules/新版JIT或JIS系统服务端/NuGet.Config
deleted file mode 100644
index be8a1ece..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/NuGet.Config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln b/code/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln
deleted file mode 100644
index dcb86ad1..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln
+++ /dev/null
@@ -1,137 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29020.237
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.Domain", "src\WY.NewJit.Domain\WY.NewJit.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.Application", "src\WY.NewJit.Application\WY.NewJit.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.EntityFrameworkCore", "src\WY.NewJit.EntityFrameworkCore\WY.NewJit.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.Web", "src\WY.NewJit.Web\WY.NewJit.Web.csproj", "{068855E8-9240-4F1A-910B-CF825794513B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.Application.Tests", "test\WY.NewJit.Application.Tests\WY.NewJit.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.Web.Tests", "test\WY.NewJit.Web.Tests\WY.NewJit.Web.Tests.csproj", "{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.EntityFrameworkCore.DbMigrations", "src\WY.NewJit.EntityFrameworkCore.DbMigrations\WY.NewJit.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.Domain.Shared", "src\WY.NewJit.Domain.Shared\WY.NewJit.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.Application.Contracts", "src\WY.NewJit.Application.Contracts\WY.NewJit.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.HttpApi", "src\WY.NewJit.HttpApi\WY.NewJit.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.HttpApi.Client", "src\WY.NewJit.HttpApi.Client\WY.NewJit.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.EntityFrameworkCore.Tests", "test\WY.NewJit.EntityFrameworkCore.Tests\WY.NewJit.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.TestBase", "test\WY.NewJit.TestBase\WY.NewJit.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.Domain.Tests", "test\WY.NewJit.Domain.Tests\WY.NewJit.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.HttpApi.Client.ConsoleTestApp", "test\WY.NewJit.HttpApi.Client.ConsoleTestApp\WY.NewJit.HttpApi.Client.ConsoleTestApp.csproj", "{EF480016-9127-4916-8735-D2466BDBC582}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WY.NewJit.DbMigrator", "src\WY.NewJit.DbMigrator\WY.NewJit.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Release|Any CPU.Build.0 = Release|Any CPU
- {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Release|Any CPU.Build.0 = Release|Any CPU
- {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Release|Any CPU.Build.0 = Release|Any CPU
- {068855E8-9240-4F1A-910B-CF825794513B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {068855E8-9240-4F1A-910B-CF825794513B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {068855E8-9240-4F1A-910B-CF825794513B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {068855E8-9240-4F1A-910B-CF825794513B}.Release|Any CPU.Build.0 = Release|Any CPU
- {50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.Build.0 = Release|Any CPU
- {5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Release|Any CPU.Build.0 = Release|Any CPU
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.Build.0 = Release|Any CPU
- {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.Build.0 = Release|Any CPU
- {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.Build.0 = Release|Any CPU
- {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Release|Any CPU.Build.0 = Release|Any CPU
- {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Release|Any CPU.Build.0 = Release|Any CPU
- {1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}.Release|Any CPU.Build.0 = Release|Any CPU
- {91853F21-9CD9-4132-BC29-A7D5D84FFFE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {91853F21-9CD9-4132-BC29-A7D5D84FFFE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {91853F21-9CD9-4132-BC29-A7D5D84FFFE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {91853F21-9CD9-4132-BC29-A7D5D84FFFE7}.Release|Any CPU.Build.0 = Release|Any CPU
- {E512F4D9-9375-480F-A2F6-A46509F9D824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E512F4D9-9375-480F-A2F6-A46509F9D824}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E512F4D9-9375-480F-A2F6-A46509F9D824}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E512F4D9-9375-480F-A2F6-A46509F9D824}.Release|Any CPU.Build.0 = Release|Any CPU
- {EF480016-9127-4916-8735-D2466BDBC582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EF480016-9127-4916-8735-D2466BDBC582}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EF480016-9127-4916-8735-D2466BDBC582}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EF480016-9127-4916-8735-D2466BDBC582}.Release|Any CPU.Build.0 = Release|Any CPU
- {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {1A94A50E-06DC-43C1-80B5-B662820EC3EB} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {068855E8-9240-4F1A-910B-CF825794513B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
- {5F1B28C6-8D0C-4155-92D0-252F7EA5F674} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
- {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- {1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
- {91853F21-9CD9-4132-BC29-A7D5D84FFFE7} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
- {E512F4D9-9375-480F-A2F6-A46509F9D824} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
- {EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
- {AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}
- EndGlobalSection
-EndGlobal
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln.DotSettings b/code/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln.DotSettings
deleted file mode 100644
index cb0b2c91..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/WY.NewJit.sln.DotSettings
+++ /dev/null
@@ -1,23 +0,0 @@
-
- True
- WARNING
- WARNING
- WARNING
- WARNING
- WARNING
- WARNING
- WARNING
- WARNING
- Required
- Required
- Required
- Required
- False
- True
- False
- False
- True
- False
- False
- SQL
-
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/common.props b/code/src/Modules/新版JIT或JIS系统服务端/common.props
deleted file mode 100644
index fbef8836..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/common.props
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- latest
- 1.0.0
- $(NoWarn);CS1591;CS0436
- app
-
-
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/BookDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/BookDto.cs
deleted file mode 100644
index 3f00d796..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/BookDto.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.Books
-{
- public class BookDto : EntityDto
- {
- public string Name { get; set; }
-
- public BookType Type { get; set; }
-
- public DateTime PublishDate { get; set; }
-
- public float Price { get; set; }
- }
-}
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/CreateUpdateBookDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/CreateUpdateBookDto.cs
deleted file mode 100644
index eeddd536..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/CreateUpdateBookDto.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace WY.NewJit.Books
-{
- public class CreateUpdateBookDto
- {
- [Required]
- [StringLength(128)]
- public string Name { get; set; }
-
- [Required]
- public BookType Type { get; set; } = BookType.Undefined;
-
- [Required]
- [DataType(DataType.Date)]
- public DateTime PublishDate { get; set; } = DateTime.Now;
-
- [Required]
- public float Price { get; set; }
- }
-}
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/IBookAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/IBookAppService.cs
deleted file mode 100644
index 699ccd9e..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Books/IBookAppService.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-namespace WY.NewJit.Books
-{
- public interface IBookAppService :
- ICrudAppService< //定义了常见的CRUD方法:GetAsync,GetListAsync,CreateAsync,UpdateAsync和DeleteAsync
- BookDto, //Used to show books
- Guid, //Primary key of the book entity
- PagedAndSortedResultRequestDto, //Used for paging/sorting
- CreateUpdateBookDto> //Used to create/update a book
- {
-
- }
-}
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErp2PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErp2PartDto.cs
deleted file mode 100644
index ca66cb78..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErp2PartDto.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class AssemblyCfgErp2PartDto : EntityDto
- {
- ///
- /// Erp总成ID
- ///
- public Guid ErpAssemblyId { get; set; }
-
- ///
- /// 零件ID
- ///
- public Guid PartId { get; set; }
-
- ///
- /// 客户零件代码
- ///
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- public double? PartNum { get; set; }
-
- ///
- /// 是否Key件
- ///
- public bool IsKey { get; set; }
-
- }
-}
-
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErpDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErpDto.cs
deleted file mode 100644
index 8e2f0c4c..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErpDto.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// ERP总成
- ///
- [ExcelExporter(Name = "总成信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class AssemblyCfgErpDto : EntityDto
- {
- ///
- /// ERP总成编码
- ///
- [ExporterHeader(DisplayName = "ERP总成编码")]
- [ImporterHeader(Name = "ERP总成编码")]
- public string ErpAssemblyCode { get; set; }
-
- ///
- /// ERP总成名称
- ///
- [ExporterHeader(DisplayName = "ERP总成名称")]
- [ImporterHeader(Name = "ERP总成名称")]
- public string ErpAssemblyName { get; set; }
-
- ///
- /// ERP总成版本
- ///
- [ExporterHeader(DisplayName = "ERP总成版本")]
- [ImporterHeader(Name = "ERP总成版本")]
- public int ErpAssemblyVersion { get; set; }
-
- ///
- /// 车型
- ///
- [ExporterHeader(DisplayName = "车型")]
- [ImporterHeader(Name = "车型")]
- public virtual string VehicleModel { get; set; }
-
-
- public List Details { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgPartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgPartDto.cs
deleted file mode 100644
index 54fc4f4b..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgPartDto.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 总成和零件关系表
- ///
- [ExcelExporter(Name = "ERP总成-结算件子表", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class AssemblyCfgPartDto : EntityDto
- {
- ///
- /// 客户零件代码
- ///
- [ExporterHeader(DisplayName = "客户零件代码")]
- [ImporterHeader(Name = "客户零件代码")]
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [ExporterHeader(DisplayName = "客户零件数量")]
- [ImporterHeader(Name = "客户零件数量")]
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
-
- ///
- /// 是否Key件
- ///
- public bool IsKey { get; set; }
-
- }
-}
-
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgVehicle2PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgVehicle2PartDto.cs
deleted file mode 100644
index a7856ce5..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgVehicle2PartDto.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class AssemblyCfgVehicle2PartDto : EntityDto
- {
- ///
- /// 整车总成ID
- ///
- public Guid VehicleAssemblyId { get; set; }
-
- ///
- /// 零件ID
- ///
- public Guid PartId { get; set; }
-
- ///
- /// 客户零件代码
- ///
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- public double? PartNum { get; set; }
-
- ///
- /// 是否Key件
- ///
- public bool IsKey { get; set; }
-
- }
-}
-
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/CreateUpdateAssemblyCfgErpDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/CreateUpdateAssemblyCfgErpDto.cs
deleted file mode 100644
index dbd7cf60..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/CreateUpdateAssemblyCfgErpDto.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class CreateUpdateAssemblyCfgErpDto
- {
- ///
- /// ERP总成编码
- ///
- [Required]
- [StringLength(20)]
- public string ErpAssemblyCode { get; set; }
-
- ///
- /// ERP总成名称
- ///
- [StringLength(50)]
- public string ErpAssemblyName { get; set; }
-
- ///
- /// 车型
- ///
- [StringLength(20)]
- public virtual string VehicleModel { get; set; }
-
-
- ///
- /// 是否覆盖上一个版本
- ///
- public bool IsCover { get; set; }
-
- ///
- /// 上一个版本的ERP总成ID
- ///
- public Guid? PreviousVersionId { get; set; }
-
- public List Details { get; set; }
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/CreateUpdateAssemblyCfgPartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/CreateUpdateAssemblyCfgPartDto.cs
deleted file mode 100644
index 00254097..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/CreateUpdateAssemblyCfgPartDto.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class CreateUpdateAssemblyCfgPartDto
- {
- ///
- /// 客户零件代码
- ///
- [Required]
- [StringLength(100)]
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [Required]
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- [StringLength(200)]
- public string Description { get; set; }
-
- ///
- /// 是否Key件
- ///
- public bool IsKey { get; set; }
-
- }
-
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/QueryAssemblyCfgErpDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/QueryAssemblyCfgErpDto.cs
deleted file mode 100644
index ab72e9fb..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/QueryAssemblyCfgErpDto.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class QueryAssemblyCfgErpDto : PagedAndSortedBase
- {
- ///
- /// ERP总成编码
- ///
- public string ErpAssemblyCode { get; set; }
-
- ///
- /// 总成名称
- ///
- public string ErpAssemblyName { get; set; }
-
- ///
- /// 车型代码
- ///
- public string VehicleModelCode { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgErpAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgErpAppService.cs
deleted file mode 100644
index 59b71b41..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgErpAppService.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-namespace WY.NewJit.MsgBaseData
-{
- public interface IAssemblyCfgErpAppService : IApplicationService
- {
- #region 总成和产品关系
- ///
- /// 根据筛选条件获取分页实体列表
- ///
- /// 主键
- /// 返回符合条件的排序分页列表
- Task> GetErpAssemblyListAsync(QueryAssemblyCfgErpDto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetErpAssemblyAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateErpAssemblyAsync(CreateUpdateAssemblyCfgErpDto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdateErpAssemblyAsync(Guid id, CreateUpdateAssemblyCfgErpDto input);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteErpAssemblyAsync(string id);
-
- ///
- /// 导出ERP总成
- ///
- ///
- ///
- Task> ExportErpAssemblyAsync(QueryAssemblyCfgErpDto input);
-
- ///
- /// 校验ERP总成
- ///
- ///
- ///
- //Task CheckErpAssembly(CreateUpdateAssemblyCfgErpDto input);
-
- ///
- /// 系统初始化时使用,去掉重复的ERP总成
- ///
- ///
- ///
- Task RemoveRepeatErpAssembly(int takeCount);
-
-
- #endregion
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgPartAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgPartAppService.cs
deleted file mode 100644
index 64c053b9..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgPartAppService.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- public interface IAssemblyCfgPartAppService
- {
- #region 产品和零件关系
-
- /// 取实体列表
- ///
- /// 主键
- /// 返回符合条件的排序分页列表
- Task> GetPartListAsync(Guid assemblyProductID);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetPartAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreatePartAsync(CreateUpdateAssemblyCfgPartDto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdatePartAsync(Guid id, CreateUpdateAssemblyCfgPartDto input);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeletePartAsync(string id);
-
- #endregion
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgVehicleAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgVehicleAppService.cs
deleted file mode 100644
index 88371890..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Interfaces/IAssemblyCfgVehicleAppService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WY.NewJit.MsgBaseData.AssemblyCfgs
-{
- public interface IAssemblyCfgVehicleAppService
- {
- ///
- /// 根据整车总成Id取Erp总成列表
- /// W
- /// 整车总成Id
- /// Erp总成列表
- Task> GetErpAssemblyListAsync(Guid vehicleAssemblyId);
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/Dics/Dtos/DicItemDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/Dics/Dtos/DicItemDto.cs
deleted file mode 100644
index 00c8ae95..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/Dics/Dtos/DicItemDto.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 通用字典信息DTO
- ///
- [Serializable]
- public class DicItemDto : EntityDto
- {
- ///
- /// 字典类别代码
- ///
- public string DicTypeCode { get; set; }
-
- ///
- /// 字典项代码
- ///
- public string DicItemCode { get; set; }
-
- ///
- /// 字典项名称
- ///
- public string DicItemName { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/Dics/Interfaces/IDicAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/Dics/Interfaces/IDicAppService.cs
deleted file mode 100644
index 51efc245..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/Dics/Interfaces/IDicAppService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- public interface IDicAppService
- {
- #region 接口方法
-
- /// 根据字典类型名称取通用字典信息列表
- ///
- /// 字典类型名称
- /// 返回符合条件字典信息列表
- Task> GetDicListAsync(string dicTypeName);
-
- #endregion
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/CreateUpdateExcludePartCfgDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/CreateUpdateExcludePartCfgDto.cs
deleted file mode 100644
index 64e51ed9..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/CreateUpdateExcludePartCfgDto.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class CreateUpdateExcludePartCfgDto
- {
- ///
- /// 车型代码
- ///
- [Required]
- [StringLength(20)]
- public string VehicleModelCode { get; set; }
- ///
- /// 客户零件号
- ///
- [Required]
- [StringLength(100)]
- public string PartCode { get; set; }
-
- ///
- /// 排除原因
- ///
- [Required]
- [StringLength(200)]
- public string ExcludeReason { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/ExcludePartCfgDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/ExcludePartCfgDto.cs
deleted file mode 100644
index bd172067..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/ExcludePartCfgDto.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "零件信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class ExcludePartCfgDto : EntityDto
- {
- ///
- /// 车型代码
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
- ///
- /// 客户零件号
- ///
- [ExporterHeader(DisplayName = "客户零件号")]
- [ImporterHeader(Name = "客户零件号")]
- public string PartCode { get; set; }
-
- ///
- /// 排除原因
- ///
- [ExporterHeader(DisplayName = "排除原因")]
- [ImporterHeader(Name = "排除原因")]
- public string ExcludeReason { get; set; }
-
- ///
- /// 车型名称
- ///
- [ExporterHeader(DisplayName = "车型名称")]
- [ImporterHeader(Name = "车型名称")]
- public string VehicleModelName { get; set; }
- ///
- /// 客户零件名称
- ///
- [ExporterHeader(DisplayName = "客户零件名称")]
- [ImporterHeader(Name = "客户零件名称")]
- public string PartName { get; set; }
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/QueryExcludePartCfgDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/QueryExcludePartCfgDto.cs
deleted file mode 100644
index 1cb0b3b0..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Dtos/QueryExcludePartCfgDto.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class QueryExcludePartCfgDto : PagedAndSortedBase//: PagedAndSortedResultRequestDto
- {
- ///
- /// 车型代码
- ///
- public string VehicleModelCode { get; set; }
- ///
- /// 客户零件号
- ///
- public string PartCode { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Interfaces/IExcludePartCfgAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Interfaces/IExcludePartCfgAppService.cs
deleted file mode 100644
index f40dfd47..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/ExcludePartCfgs/Interfaces/IExcludePartCfgAppService.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- public interface IExcludePartCfgAppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryExcludePartCfgDto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateAsync(CreateUpdateExcludePartCfgDto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdateAsync(Guid id, CreateUpdateExcludePartCfgDto input);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryExcludePartCfgDto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/CreateUpdateLogRemindDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/CreateUpdateLogRemindDto.cs
deleted file mode 100644
index fa929533..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/CreateUpdateLogRemindDto.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class CreateUpdateLogRemindDto
- {
-
- ///
- /// 日志类别(1 报文传输异常、2 报文转换异常、3 报文解析、校验异常)
- ///
- [Required]
- public LogTypeEnum LogType { get; set; }
-
- ///
- /// 日志标题
- ///
- [Required]
- [StringLength(200)]
- public string LogTitle { get; set; }
-
- ///
- /// 日志描述
- ///
- [Required]
- [StringLength(4000)]
- public string LogDesc { get; set; }
-
- ///
- /// 严重程度(1 轻微 2 一般、3 严重)
- ///
- [Required]
- public SeriousLevelEnum SeriousLevel { get; set; }
-
- ///
- /// 日志状态
- ///
- [Required]
- public virtual LogStatusEnum LogStatus { get; set; }
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/LogRemindDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/LogRemindDto.cs
deleted file mode 100644
index fcd83c48..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/LogRemindDto.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "日志提醒", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class LogRemindDto: AuditedEntityDto
- {
- ///
- /// 日志类别(1 报文传输异常、2 报文转换异常、3 报文解析、校验异常)
- ///
- [ExporterHeader(DisplayName = "日志类别")]
- [ImporterHeader(Name = "日志类别")]
- public LogTypeEnum LogType { get; set; }
-
- ///
- /// 日志标题
- ///
- [ExporterHeader(DisplayName = "日志标题")]
- [ImporterHeader(Name = "日志标题")]
- public string LogTitle { get; set; }
-
- ///
- /// 日志描述
- ///
- [ExporterHeader(DisplayName = "日志描述")]
- [ImporterHeader(Name = "日志描述")]
- public string LogDesc { get; set; }
-
- ///
- /// 严重程度(1 轻微 2 一般、3 严重)
- ///
- [ExporterHeader(DisplayName = "严重程度")]
- [ImporterHeader(Name = "严重程度")]
- public SeriousLevelEnum SeriousLevel { get; set; }
-
- ///
- /// 日志状态
- ///
- [ExporterHeader(DisplayName = "日志状态")]
- [ImporterHeader(Name = "日志状态")]
- public virtual LogStatusEnum LogStatus { get; set; }
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/QueryLogRemindDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/QueryLogRemindDto.cs
deleted file mode 100644
index e56308e6..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Dtos/QueryLogRemindDto.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class QueryLogRemindDto : PagedAndSortedBase
- {
- ///
- /// 日志类别(1 报文传输异常、2 报文转换异常、3 报文解析、校验异常)
- ///
- public LogTypeEnum LogType { get; set; }
-
- ///
- /// 日志标题
- ///
- public string LogTitle { get; set; }
-
- ///
- /// 严重程度(1 轻微 2 一般、3 严重)
- ///
- public SeriousLevelEnum SeriousLevel { get; set; }
-
- ///
- /// 日志状态 0 1 2
- ///
- public LogStatusEnum LogStatus { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Interfaces/ILogRemindAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Interfaces/ILogRemindAppService.cs
deleted file mode 100644
index f176c666..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/LogReminds/Interfaces/ILogRemindAppService.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- public interface ILogRemindAppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryLogRemindDto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateAsync(CreateUpdateLogRemindDto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdateAsync(Guid id, CreateUpdateLogRemindDto input);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryLogRemindDto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
-
- ///
- /// 执行处理
- ///
- /// 主键
- /// 执行成功返回真
- Task DoProcessAsync(Guid id);
-
- ///
- /// 执行忽略
- ///
- /// 主键
- /// 执行成功返回真
- Task DoIgnoreAsync(Guid id);
-
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/CreateUpdatePartCfgDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/CreateUpdatePartCfgDto.cs
deleted file mode 100644
index 85628e1f..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/CreateUpdatePartCfgDto.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class CreateUpdatePartCfgDto
- {
- ///
- /// 零件编码
- ///
- [Required]
- [StringLength(100)]
- public string PartCode { get; set; }
- ///
- /// 零件名称
- ///
- [Required]
- [StringLength(200)]
- public string PartName { get; set; }
- ///
- /// 零件类型(取通用字典)
- ///
- [StringLength(10)]
- public string PartType { get; set; }
-
- ///
- /// 零件子类型(取通用字典)
- ///
- public virtual string PartChildType { get; set; }
-
- ///
- /// 描述
- ///
- [StringLength(200)]
- public string Description { get; set; }
-
- #region 派格扩展
- ///
- /// 门板代号
- ///
- public string DoorPlankCode { get; set; }
-
- ///
- /// SAP物料号
- ///
- public string SAPMaterialNum { get; set; }
-
- ///
- /// 物料描述(大小量纲、物料描述字段值同时存在时,优先显示大小量纲)
- ///
- public string MaterialDescription { get; set; }
-
- ///
- /// 大小量纲(大小量纲、物料描述字段值同时存在时,优先显示大小量纲)
- ///
- public string DaXiaoLiangGang { get; set; }
- #endregion
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/PartCfgDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/PartCfgDto.cs
deleted file mode 100644
index acd31947..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/PartCfgDto.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "零件信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class PartCfgDto: AuditedEntityDto
- {
- ///
- /// 零件编码
- ///
- [ExporterHeader(DisplayName = "零件编码")]
- [ImporterHeader(Name = "零件编码")]
- public string PartCode { get; set; }
- ///
- /// 零件名称
- ///
- [ExporterHeader(DisplayName = "零件名称")]
- [ImporterHeader(Name = "零件名称")]
- public string PartName { get; set; }
- ///
- /// 零件类型(取通用字典)
- ///
- [ExporterHeader(DisplayName = "零件类型")]
- [ImporterHeader(Name = "零件类型")]
- public string PartType { get; set; }
-
- ///
- /// 零件子类型(取通用字典)
- ///
- [ExporterHeader(DisplayName = "零件子类型")]
- [ImporterHeader(Name = "零件子类型")]
- public virtual string PartChildType { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
-
- #region 派格扩展
- ///
- /// 门板代号
- ///
- public string DoorPlankCode { get; set; }
-
- ///
- /// SAP物料号
- ///
- public string SAPMaterialNum { get; set; }
-
- ///
- /// 物料描述(大小量纲、物料描述字段值同时存在时,优先显示大小量纲)
- ///
- public string MaterialDescription { get; set; }
-
- ///
- /// 大小量纲(大小量纲、物料描述字段值同时存在时,优先显示大小量纲)
- ///
- public string DaXiaoLiangGang { get; set; }
- #endregion
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/QueryPartCfgDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/QueryPartCfgDto.cs
deleted file mode 100644
index dbc2ee8c..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Dtos/QueryPartCfgDto.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class QueryPartCfgDto : PagedAndSortedBase
- {
- ///
- /// 零件编码
- ///
- public string PartCode { get; set; }
- ///
- /// 零件名称
- ///
- public string PartName { get; set; }
- ///
- /// 零件类型(取通用字典)
- ///
- public string PartType { get; set; }
-
- ///
- /// 零件子类型(取通用字典)
- ///
- public string PartChildType { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Interfaces/IPartCfgAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Interfaces/IPartCfgAppService.cs
deleted file mode 100644
index ac7b80bf..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartCfgs/Interfaces/IPartCfgAppService.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- public interface IPartCfgAppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryPartCfgDto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateAsync(CreateUpdatePartCfgDto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdateAsync(Guid id, CreateUpdatePartCfgDto input);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryPartCfgDto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/CreateUpdatePartSwitchDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/CreateUpdatePartSwitchDto.cs
deleted file mode 100644
index e94a74fb..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/CreateUpdatePartSwitchDto.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class CreateUpdatePartSwitchDto
- {
- ///
- /// 零件编码
- ///
- [Required]
- [StringLength(100)]
- public virtual string SourcePartCode { get; set; }
- ///
- /// 切换为零件编码
- ///
- [Required]
- [StringLength(100)]
- public virtual string TargetPartCode { get; set; }
- ///
- /// 生效开始时间
- ///
- public virtual DateTime? ActiveBeginTime { get; set; }
- ///
- /// 生效结束时间
- ///
- public virtual DateTime? ActiveEndTime { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/PartSwitchDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/PartSwitchDto.cs
deleted file mode 100644
index 72ca77d1..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/PartSwitchDto.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "零件信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class PartSwitchDto: AuditedEntityDto
- {
- ///
- /// 零件编码
- ///
- [ExporterHeader(DisplayName = "零件编码")]
- [ImporterHeader(Name = "零件编码")]
- public virtual string SourcePartCode { get; set; }
- ///
- /// 零件名称
- ///
- [ExporterHeader(DisplayName = "零件名称")]
- [ImporterHeader(Name = "零件名称")]
- public virtual string SourcePartName { get; set; }
- ///
- /// 切换为零件编码
- ///
- [ExporterHeader(DisplayName = "切换为零件编码")]
- [ImporterHeader(Name = "切换为零件编码")]
- public virtual string TargetPartCode { get; set; }
- ///
- /// 切换为零件名称
- ///
- [ExporterHeader(DisplayName = "切换为零件名称")]
- [ImporterHeader(Name = "切换为零件名称")]
- public virtual string TargetPartName { get; set; }
-
- ///
- /// 生效开始时间
- ///
- [ExporterHeader(DisplayName = "生效开始时间")]
- [ImporterHeader(Name = "生效开始时间")]
- public virtual DateTime? ActiveBeginTime { get; set; }
- ///
- /// 生效结束时间
- ///
- [ExporterHeader(DisplayName = "生效结束时间")]
- [ImporterHeader(Name = "生效结束时间")]
- public virtual DateTime? ActiveEndTime { get; set; }
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/QueryPartSwitchDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/QueryPartSwitchDto.cs
deleted file mode 100644
index 3a6ba21e..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Dtos/QueryPartSwitchDto.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgBaseData
-{
- [Serializable]
- public class QueryPartSwitchDto : PagedAndSortedBase
- {
- ///
- /// 零件编码
- ///
- public virtual string SourcePartCode { get; set; }
- ///
- /// 零件名称
- ///
- public virtual string SourcePartName { get; set; }
- ///
- /// 切换为零件编码
- ///
- public virtual string TargetPartCode { get; set; }
- ///
- /// 切换为零件名称
- ///
- public virtual string TargetPartName { get; set; }
- ///
- /// 是否有效
- ///
- public virtual bool? IsValid { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Interfaces/IPartSwitchAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Interfaces/IPartSwitchAppService.cs
deleted file mode 100644
index 4a9146b9..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/PartSwitchs/Interfaces/IPartSwitchAppService.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgBaseData
-{
- public interface IPartSwitchAppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryPartSwitchDto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateAsync(CreateUpdatePartSwitchDto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdateAsync(Guid id, CreateUpdatePartSwitchDto input);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryPartSwitchDto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/BillM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/BillM100Dto.cs
deleted file mode 100644
index 00785127..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/BillM100Dto.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "M100单据", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class BillM100Dto: AuditedEntityDto
- {
- ///
- /// 流水号#
- ///
- [ExporterHeader(DisplayName = "流水号")]
- [ImporterHeader(Name = "流水号")]
- public int? SerialNum { get; set; }
-
- ///
- /// 大众顺序号
- ///
- [ExporterHeader(DisplayName = "大众顺序号")]
- [ImporterHeader(Name = "大众顺序号")]
- public int? HostSN { get; set; }
-
- ///
- /// KNR
- ///
- [ExporterHeader(DisplayName = "KNR")]
- [ImporterHeader(Name = "KNR")]
- public string KNR { get; set; }
-
- ///
- /// 底牌号#
- ///
- [ExporterHeader(DisplayName = "底牌号")]
- [ImporterHeader(Name = "底牌号")]
- public string VIN { get; set; }
-
- ///
- /// 总成ID
- ///
- [ExporterHeader(DisplayName = "总成ID")]
- [ImporterHeader(Name = "总成ID")]
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间
- ///
- [ExporterHeader(DisplayName = "上线时间")]
- [ImporterHeader(Name = "上线时间")]
- public DateTime? OnlineTime { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- [ExporterHeader(DisplayName = " 生产线")]
- [ImporterHeader(Name = " 生产线")]
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- [ExporterHeader(DisplayName = "版本")]
- [ImporterHeader(Name = "版本")]
- public string Version { get; set; }
-
- ///
- /// 接收时间
- ///
- [ExporterHeader(DisplayName = "接收时间")]
- [ImporterHeader(Name = "接收时间")]
- public DateTime? ReceiveTime { get; set; }
-
- ///
- /// 单据状态(0 空;1 未匹配;2 已匹配;3 已发布;-1 预批量)
- ///
- [ExporterHeader(DisplayName = "单据状态")]
- [ImporterHeader(Name = "单据状态")]
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
-
- ///
- /// 涂装重复单据包含的零件列表
- ///
- public List BillM100Parts { get; set; }
-
- ///
- /// 手工操作类型:0 none,1 手工添加,2 手工修改
- ///
- [ExporterHeader(DisplayName = "手工操作类型")]
- [ImporterHeader(Name = "手工操作类型")]
- public ManualOperationTypeEnum OperationType { get; set; }
-
- ///
- /// 手工操作员
- ///
- [ExporterHeader(DisplayName = "手工操作员")]
- [ImporterHeader(Name = "手工操作员")]
- public string Operator { get; set; }
-
- ///
- /// 手工操作日期
- ///
- [ExporterHeader(DisplayName = "手工操作日期")]
- [ImporterHeader(Name = "手工操作日期")]
- public DateTime? OperationTime { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/BillM100PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/BillM100PartDto.cs
deleted file mode 100644
index 52f94516..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/BillM100PartDto.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "M100单据包含的零件信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class BillM100PartDto : EntityDto
- {
- ///
- /// 客户零件代码
- ///
- [ExporterHeader(DisplayName = "客户零件代码")]
- [ImporterHeader(Name = "客户零件代码")]
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [ExporterHeader(DisplayName = "客户零件数量")]
- [ImporterHeader(Name = "客户零件数量")]
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateBillM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateBillM100Dto.cs
deleted file mode 100644
index 825fa942..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateBillM100Dto.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class CreateUpdateBillM100Dto
- {
-
- ///
- /// 流水号#
- ///
- public int? SerialNum { get; set; }
-
- ///
- /// 大众顺序号
- ///
- [Required]
- public int? HostSN { get; set; }
-
- ///
- /// KNR
- ///
- [Required]
- [StringLength(100)]
- public string KNR { get; set; }
-
- ///
- /// 底牌号#
- ///
- [Required]
- [StringLength(100)]
- public string VIN { get; set; }
-
- ///
- /// 总成ID
- ///
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间
- ///
- [Required]
- public DateTime? OnlineTime { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- [Required]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
-
- ///
- /// 接收时间
- ///
- [Required]
- public DateTime? ReceiveTime { get; set; }
-
- ///
- /// 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
- ///
- [Required]
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- [Required]
- [StringLength(200)]
- public string Description { get; set; }
-
- ///
- /// 涂装重复单据包含的零件列表
- ///
- public virtual List BillM100Parts { get; set; }
-
- ///
- /// 手工操作类型:0 none,1 手工添加,2 手工修改
- ///
- public ManualOperationTypeEnum OperationType { get; set; }
-
- ///
- /// 手工操作员
- ///
- public string Operator { get; set; }
-
- ///
- /// 手工操作日期
- ///
- public DateTime? OperationTime { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateBillM100PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateBillM100PartDto.cs
deleted file mode 100644
index dd196dd2..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateBillM100PartDto.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class CreateUpdateBillM100PartDto
- {
- ///
- /// 客户零件代码
- ///
- [Required]
- [StringLength(100)]
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [Required]
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- [StringLength(200)]
- public string Description { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateNewM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateNewM100Dto.cs
deleted file mode 100644
index 6fbd0179..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/CreateUpdateNewM100Dto.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using WY.NewJit.MsgBaseData;
-
-namespace WY.NewJit.MsgCheck
-{
- public class CreateUpdateNewM100Dto
- {
- public CreateUpdateBillM100Dto M100Bill { get; set; }
-
- public List ErpAssemblyList { get; set; }
-
- public CreateUpdateNewM100Dto()
- {
- ErpAssemblyList = new List();
- }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/MenBanPrintInfo.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/MenBanPrintInfo.cs
deleted file mode 100644
index b53d4710..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/MenBanPrintInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WY.NewJit.MsgCheck
-{
- public class MenBanPrintInfo
- {
- public PrintTypeEnum PrintType { get; set; }
- }
-
- public enum PrintTypeEnum
- {
- 初次打印,
- 重新打印,
- 补打
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/NewM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/NewM100Dto.cs
deleted file mode 100644
index d68f1c8b..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/NewM100Dto.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using WY.NewJit.MsgBaseData;
-
-namespace WY.NewJit.MsgCheck
-{
- public class NewM100Dto
- {
- public BillM100Dto M100Bill { get; set; }
-
- public List ErpAssemblyList { get; set; }
-
- public NewM100Dto()
- {
- ErpAssemblyList = new List();
- }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/QueryBillM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/QueryBillM100Dto.cs
deleted file mode 100644
index e0c68b9f..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/QueryBillM100Dto.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class QueryBillM100Dto : PagedAndSortedBase
- {
- ///
- /// 流水号起
- ///
- public int? SerialNumBegin { get; set; }
-
- ///
- /// 流水号止
- ///
- public int? SerialNumEnd { get; set; }
-
- ///
- /// 大众顺序号起
- ///
- public int? HostSNBegin { get; set; }
-
- ///
- /// 大众顺序号止
- ///
- public int? HostSNEnd { get; set; }
-
- ///
- /// KNR起
- ///
- public string KNRBegin { get; set; }
-
- ///
- /// KNR止
- ///
- public string KNREnd { get; set; }
-
- ///
- /// 底牌号起
- ///
- public string VINBegin { get; set; }
-
- ///
- /// 底牌号止
- ///
- public string VINEnd { get; set; }
-
- ///
- /// 总成ID
- ///
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间起
- ///
- public DateTime? OnlineTimeBegin { get; set; }
-
- ///
- /// 上线时间止
- ///
- public DateTime? OnlineTimeEnd { get; set; }
-
-
- ///
- /// 车型代码(取通用字典)
- ///
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
-
- ///
- /// 接收时间起
- ///
- public DateTime? ReceiveTimeBegin { get; set; }
-
- ///
- /// 接收时间止
- ///
- public DateTime? ReceiveTimeEnd { get; set; }
-
- ///
- /// 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
- ///
- public BillStatusEnum? BillStatus { get; set; }
-
- ///
- /// 是否单据维护
- ///
- public bool? IsBillMaintenance { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/ResultBillM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/ResultBillM100Dto.cs
deleted file mode 100644
index caccb29a..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/ResultBillM100Dto.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "M100单据查询结果", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class ResultBillM100Dto : EntityDto
- {
- ///
- /// 流水号#
- ///
- [ExporterHeader(DisplayName = "流水号")]
- [ImporterHeader(Name = "流水号")]
- public int? SerialNum { get; set; }
-
- ///
- /// 大众顺序号
- ///
- [ExporterHeader(DisplayName = "大众顺序号")]
- [ImporterHeader(Name = "大众顺序号")]
- public int? HostSN { get; set; }
-
- ///
- /// KNR
- ///
- [ExporterHeader(DisplayName = "KNR")]
- [ImporterHeader(Name = "KNR")]
- public string KNR { get; set; }
-
- ///
- /// 底牌号#
- ///
- [ExporterHeader(DisplayName = "底牌号")]
- [ImporterHeader(Name = "底牌号")]
- public string VIN { get; set; }
-
- ///
- /// 总成ID
- ///
- [ExporterHeader(DisplayName = "总成ID")]
- [ImporterHeader(Name = "总成ID")]
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间
- ///
- [ExporterHeader(DisplayName = "上线时间")]
- [ImporterHeader(Name = "上线时间")]
- public DateTime? OnlineTime { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- [ExporterHeader(DisplayName = "版本")]
- [ImporterHeader(Name = "版本")]
- public string Version { get; set; }
-
- ///
- /// 接收时间
- ///
- [ExporterHeader(DisplayName = "接收时间")]
- [ImporterHeader(Name = "接收时间")]
- public DateTime? ReceiveTime { get; set; }
-
- ///
- /// 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】
- ///
- [ExporterHeader(DisplayName = "单据状态")]
- [ImporterHeader(Name = "单据状态")]
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
-
- /////
- ///// 涂装重复单据包含的零件列表
- /////
- //public List M100BillParts { get; set; }
-
- ///
- /// 总成名称
- ///
- [ExporterHeader(DisplayName = "总成名称")]
- [ImporterHeader(Name = "总成名称")]
- public string AssemblyName { get; set; }
-
- ///
- /// 车型名称(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型名称")]
- [ImporterHeader(Name = "车型名称")]
- public string VehicleModelName { get; set; }
-
- ///
- /// R100总成名称
- ///
- [ExporterHeader(DisplayName = "R100总成名称")]
- [ImporterHeader(Name = "R100总成名称")]
- public string R100AssemblyName { get; set; }
-
- ///
- /// R100上线时间
- ///
- [ExporterHeader(DisplayName = "R100上线时间")]
- [ImporterHeader(Name = "R100上线时间")]
- public DateTime? R100OnlineTime { get; set; }
-
- ///
- /// 打印时间
- ///
- [ExporterHeader(DisplayName = "打印时间")]
- [ImporterHeader(Name = "打印时间")]
- public virtual DateTime? PrintTime { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/ZhuHuBanPrintInfo.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/ZhuHuBanPrintInfo.cs
deleted file mode 100644
index f078c1a1..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Dtos/ZhuHuBanPrintInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WY.NewJit.MsgCheck
-{
- public class ZhuHuBanPrintInfo
- {
- public PrintTypeEnum PrintType { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/IBillM100AppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/IBillM100AppService.cs
deleted file mode 100644
index b5b89e71..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/IBillM100AppService.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- public interface IBillM100AppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryBillM100Dto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateAsync(CreateUpdateBillM100Dto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdateAsync(Guid id, CreateUpdateBillM100Dto input);
-
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryBillM100Dto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
-
- ///
- /// 打印门板
- ///
- ///
- /// 执行成功返回真
- Task PrintMenBan(MenBanPrintInfo input);
-
- ///
- /// 打印柱护板
- ///
- ///
- /// 执行成功返回真
- Task PrintZhuHuBan(ZhuHuBanPrintInfo input);
-
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/INewM100AppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/INewM100AppService.cs
deleted file mode 100644
index 36ad309a..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillM100s/Interfaces/INewM100AppService.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.MsgBaseData;
-
-namespace WY.NewJit.MsgCheck
-{
- public interface INewM100AppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryBillM100Dto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateAsync(CreateUpdateNewM100Dto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdateAsync(Guid id, CreateUpdateNewM100Dto input);
-
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryBillM100Dto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
-
- ///
- /// 根据KNR取ERP总成列表
- ///
- ///
- ///
- Task> GetErpAssemblyListAsync(string knr);
-
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/BillR100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/BillR100Dto.cs
deleted file mode 100644
index f5c408bd..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/BillR100Dto.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "R100单据", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class BillR100Dto: AuditedEntityDto
- {
- ///
- /// 大众顺序号
- ///
- [ExporterHeader(DisplayName = "大众顺序号")]
- [ImporterHeader(Name = "大众顺序号")]
- public int? HostSN { get; set; }
-
- ///
- /// KNR
- ///
- [ExporterHeader(DisplayName = "KNR")]
- [ImporterHeader(Name = "KNR")]
- public string KNR { get; set; }
-
- ///
- /// 总成ID
- ///
- [ExporterHeader(DisplayName = "总成ID")]
- [ImporterHeader(Name = "总成ID")]
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间
- ///
- [ExporterHeader(DisplayName = "上线时间")]
- [ImporterHeader(Name = "上线时间")]
- public DateTime? OnlineTime { get; set; }
-
- ///
- /// 接收时间
- ///
- [ExporterHeader(DisplayName = "接收时间")]
- [ImporterHeader(Name = "接收时间")]
- public DateTime? ReceiveTime { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- [ExporterHeader(DisplayName = " 生产线")]
- [ImporterHeader(Name = " 生产线")]
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- [ExporterHeader(DisplayName = "版本")]
- [ImporterHeader(Name = "版本")]
- public string Version { get; set; }
-
-
- ///
- /// 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
- ///
- [ExporterHeader(DisplayName = "单据状态")]
- [ImporterHeader(Name = "单据状态")]
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
-
- ///
- /// 焊装重复单据包含的零件列表
- ///
- public List BillR100Parts { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/BillR100PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/BillR100PartDto.cs
deleted file mode 100644
index 3991afad..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/BillR100PartDto.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "R100单据包含的零件信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class BillR100PartDto : EntityDto
- {
- ///
- /// 客户零件代码
- ///
- [ExporterHeader(DisplayName = "客户零件代码")]
- [ImporterHeader(Name = "客户零件代码")]
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [ExporterHeader(DisplayName = "客户零件数量")]
- [ImporterHeader(Name = "客户零件数量")]
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/CreateUpdateBillR100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/CreateUpdateBillR100Dto.cs
deleted file mode 100644
index 27caec81..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/CreateUpdateBillR100Dto.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class CreateUpdateBillR100Dto
- {
-
- ///
- /// 大众顺序号
- ///
- [Required]
- public int? HostSN { get; set; }
-
- ///
- /// KNR
- ///
- [Required]
- [StringLength(100)]
- public string KNR { get; set; }
-
- ///
- /// 总成ID
- ///
- [Required]
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间
- ///
- [Required]
- public DateTime? OnlineTime { get; set; }
-
- ///
- /// 接收时间
- ///
- [Required]
- public DateTime? ReceiveTime { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- [Required]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
-
-
- ///
- /// 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
- ///
- [Required]
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- [Required]
- [StringLength(200)]
- public string Description { get; set; }
-
- ///
- /// 焊装重复单据包含的零件列表
- ///
- public List BillR100Parts { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/CreateUpdateBillR100PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/CreateUpdateBillR100PartDto.cs
deleted file mode 100644
index 47475688..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/CreateUpdateBillR100PartDto.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class CreateUpdateBillR100PartDto
- {
- ///
- /// 客户零件代码
- ///
- [Required]
- [StringLength(100)]
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [Required]
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- [StringLength(200)]
- public string Description { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/QueryBillR100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/QueryBillR100Dto.cs
deleted file mode 100644
index 3011906f..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/QueryBillR100Dto.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class QueryBillR100Dto : PagedAndSortedBase
- {
- ///
- /// 大众顺序号起
- ///
- public int? HostSNBegin { get; set; }
-
- ///
- /// 大众顺序号止
- ///
- public int? HostSNEnd { get; set; }
-
- ///
- /// KNR起
- ///
- public string KNRBegin { get; set; }
-
- ///
- /// KNR止
- ///
- public string KNREnd { get; set; }
- ///
- /// 总成ID
- ///
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间起
- ///
- public DateTime? OnlineTimeBegin { get; set; }
-
- ///
- /// 上线时间止
- ///
- public DateTime? OnlineTimeEnd { get; set; }
-
- ///
- /// 接收时间起
- ///
- public DateTime? ReceiveTimeBegin { get; set; }
-
- ///
- /// 接收时间止
- ///
- public DateTime? ReceiveTimeEnd { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
-
- ///
- /// 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
- ///
- public BillStatusEnum? BillStatus { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/ResultBillR100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/ResultBillR100Dto.cs
deleted file mode 100644
index b9559fc0..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Dtos/ResultBillR100Dto.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "R100单据查询结果", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class ResultBillR100Dto : EntityDto
- {
- ///
- /// KNR
- ///
- [ExporterHeader(DisplayName = "KNR")]
- [ImporterHeader(Name = "KNR")]
- public string KNR { get; set; }
-
- ///
- /// 一个或多个ERP总成编码(逗号分隔)
- ///
- [ExporterHeader(DisplayName = "总成编码")]
- [ImporterHeader(Name = "总成编码")]
- public string ErpAssemblyCode { get; set; }
-
- ///
- /// 一个或多个ERP总成名称(逗号分隔)
- ///
- [ExporterHeader(DisplayName = "总成名称")]
- [ImporterHeader(Name = "总成名称")]
- public string ErpAssemblyName { get; set; }
-
- ///
- /// ERP总成数量
- ///
- [ExporterHeader(DisplayName = "总成数量")]
- [ImporterHeader(Name = "总成数量")]
- public int ErpAssemblyNum { get; set; }
-
- ///
- /// 大众顺序号
- ///
- [ExporterHeader(DisplayName = "大众顺序号")]
- [ImporterHeader(Name = "大众顺序号")]
- public int? HostSN { get; set; }
-
- ///
- /// 上线时间
- ///
- [ExporterHeader(DisplayName = "上线时间")]
- [ImporterHeader(Name = "上线时间")]
- public DateTime? OnlineTime { get; set; }
-
- ///
- /// 接收时间
- ///
- [ExporterHeader(DisplayName = "接收时间")]
- [ImporterHeader(Name = "接收时间")]
- public DateTime? ReceiveTime { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- [ExporterHeader(DisplayName = "生产线")]
- [ImporterHeader(Name = "生产线")]
- public virtual string ProductLine { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 版本
- ///
- [ExporterHeader(DisplayName = "版本")]
- [ImporterHeader(Name = "版本")]
- public string Version { get; set; }
-
- ///
- /// 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】
- ///
- [ExporterHeader(DisplayName = "单据状态")]
- [ImporterHeader(Name = "单据状态")]
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
-
- ///
- /// 总成名称
- ///
- public string AssemblyName { get; set; }
-
- ///
- /// 车型名称(取通用字典)
- ///
- public string VehicleModelName { get; set; }
-
- ///
- /// 总成ID
- ///
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 打印时间
- ///
- [ExporterHeader(DisplayName = "打印时间")]
- [ImporterHeader(Name = "打印时间")]
- public virtual DateTime? PrintTime { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Interfaces/IBillR100AppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Interfaces/IBillR100AppService.cs
deleted file mode 100644
index 25984b0e..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/BillR100s/Interfaces/IBillR100AppService.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- public interface IBillR100AppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryBillR100Dto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateAsync(CreateUpdateBillR100Dto input);
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- Task UpdateAsync(Guid id, CreateUpdateBillR100Dto input);
-
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryBillR100Dto input);
-
- ///
- /// 导出包含ERP总成编码的信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportErpAssemblyCodeAsync(QueryBillR100Dto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/IR100M100CompareAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/IR100M100CompareAppService.cs
deleted file mode 100644
index a199ce7e..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/IR100M100CompareAppService.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- public interface IR100M100CompareAppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryCompareDto input);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryCompareDto input);
-
-
-
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/QueryCompareDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/QueryCompareDto.cs
deleted file mode 100644
index 9d47fcc7..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/QueryCompareDto.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class QueryCompareDto : PagedAndSortedBase
- {
- ///
- /// 流水号起
- ///
- public int? SerialNumBegin { get; set; }
-
- ///
- /// 流水号止
- ///
- public int? SerialNumEnd { get; set; }
-
- ///
- /// 大众顺序号起
- ///
- public int? HostSNBegin { get; set; }
-
- ///
- /// 大众顺序号止
- ///
- public int? HostSNEnd { get; set; }
-
- ///
- /// KNR起
- ///
- public string KNRBegin { get; set; }
-
- ///
- /// KNR止
- ///
- public string KNREnd { get; set; }
-
- ///
- /// 底牌号起
- ///
- public string VINBegin { get; set; }
-
- ///
- /// 底牌号止
- ///
- public string VINEnd { get; set; }
-
- ///
- /// 总成ID
- ///
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间起
- ///
- public DateTime? OnlineTimeBegin { get; set; }
-
- ///
- /// 上线时间止
- ///
- public DateTime? OnlineTimeEnd { get; set; }
-
-
- ///
- /// 车型代码(取通用字典)
- ///
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
-
- ///
- /// 接收时间起
- ///
- public DateTime? ReceiveTimeBegin { get; set; }
-
- ///
- /// 接收时间止
- ///
- public DateTime? ReceiveTimeEnd { get; set; }
-
- ///
- /// 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
- ///
- public BillStatusEnum? BillStatus { get; set; }
-
- ///
- /// 是否单据维护
- ///
- public bool? IsBillMaintenance { get; set; }
-
- ///
- /// 有焊装无总装
- ///
- public bool HasR100NotHasM100 { get; set; }
-
- ///
- /// 有焊装有总装
- ///
- public bool HasR100HasM100 { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/ResultCompareDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/ResultCompareDto.cs
deleted file mode 100644
index 732c3e84..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/R100M100Compares/ResultCompareDto.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "焊装总装对比", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class ResultCompareDto : EntityDto
- {
- ///
- /// 大众顺序号
- ///
- [ExporterHeader(DisplayName = "大众顺序号")]
- [ImporterHeader(Name = "大众顺序号")]
- public int? HostSN { get; set; }
-
- ///
- /// KNR
- ///
- [ExporterHeader(DisplayName = "KNR")]
- [ImporterHeader(Name = "KNR")]
- public string KNR { get; set; }
-
- ///
- /// R100单据状态
- ///
- [ExporterHeader(DisplayName = "R100单据状态")]
- [ImporterHeader(Name = "R100单据状态")]
- public string R100BillStatus { get; set; }
-
- ///
- /// R100上线时间
- ///
- [ExporterHeader(DisplayName = "R100上线时间")]
- [ImporterHeader(Name = "R100上线时间")]
- public DateTime? R100OnlineTime { get; set; }
-
- ///
- /// R100接收时间
- ///
- [ExporterHeader(DisplayName = "R100接收时间")]
- [ImporterHeader(Name = "R100接收时间")]
- public DateTime? R100ReceiveTime { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 版本
- ///
- [ExporterHeader(DisplayName = "版本")]
- [ImporterHeader(Name = "版本")]
- public string Version { get; set; }
-
- //---------------------------M100
- ///
- /// 流水号#
- ///
- [ExporterHeader(DisplayName = "流水号")]
- [ImporterHeader(Name = "流水号")]
- public int? SerialNum { get; set; }
-
- ///
- /// 底牌号#
- ///
- [ExporterHeader(DisplayName = "底牌号")]
- [ImporterHeader(Name = "底牌号")]
- public string VIN { get; set; }
-
- ///
- /// M100上线时间
- ///
- [ExporterHeader(DisplayName = "M100上线时间")]
- [ImporterHeader(Name = "M100上线时间")]
- public DateTime? M100OnlineTime { get; set; }
-
- ///
- /// M100接收时间
- ///
- [ExporterHeader(DisplayName = "M100接收时间")]
- [ImporterHeader(Name = "M100接收时间")]
- public DateTime? M100ReceiveTime { get; set; }
-
- ///
- /// M100单据状态【0 空;1 未匹配;2 已匹配;3 已发布】
- ///
- [ExporterHeader(DisplayName = "M100单据状态")]
- [ImporterHeader(Name = "M100单据状态")]
- public BillStatusEnum M100BillStatus { get; set; }
-
- ///
- /// R100一个或多个ERP总成编码(逗号分隔)
- ///
- [ExporterHeader(DisplayName = "R100总成编码")]
- [ImporterHeader(Name = "R100总成编码")]
- public string R100ErpAssemblyCode { get; set; }
-
- ///
- /// R100一个或多个ERP总成名称(逗号分隔)
- ///
- [ExporterHeader(DisplayName = "R100总成名称")]
- [ImporterHeader(Name = "R100总成名称")]
- public string R100ErpAssemblyName { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/CreateUpdateRepeatM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/CreateUpdateRepeatM100Dto.cs
deleted file mode 100644
index 9f5005af..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/CreateUpdateRepeatM100Dto.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 涂装重复单据
- ///
- [Serializable]
- public class CreateUpdateRepeatM100Dto
- {
- ///
- /// 报文接收ID,对应报文接收表主键
- ///
- public Guid MessageFileReceiveID { get; set; }
-
- ///
- /// 流水号#
- ///
- public int? SerialNum { get; set; }
-
- ///
- /// 大众顺序号
- ///
- public int? HostSN { get; set; }
- ///
- /// KNR
- ///
- public string KNR { get; set; }
-
- ///
- /// 底牌号#
- ///
- public string VIN { get; set; }
- ///
- /// 总成ID
- ///
- public Guid? AssemblyID { get; set; }
- ///
- /// 上线时间
- ///
- public DateTime? OnlineTime { get; set; }
- ///
- /// 接收时间
- ///
- public DateTime? ReceiveTime { get; set; }
- ///
- /// 车型代码(取通用字典)
- ///
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
- ///
- /// 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】【暂不用所以不用枚举】
- ///
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- public virtual string Description { get; set; }
-
- ///
- /// 涂装重复单据包含的零件列表
- ///
- public virtual List M100RepeatParts { get; set; }
-
- public CreateUpdateRepeatM100Dto()
- { }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/CreateUpdateRepeatM100PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/CreateUpdateRepeatM100PartDto.cs
deleted file mode 100644
index 630b0632..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/CreateUpdateRepeatM100PartDto.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Entities.Auditing;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 涂装重复单据和零件关系表
- ///
- [Serializable]
- public class CreateUpdateRepeatM100PartDto
- {
- ///
- /// 客户零件代码
- ///
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- public string Description { get; set; }
-
- public CreateUpdateRepeatM100PartDto()
- { }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/QueryRepeatM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/QueryRepeatM100Dto.cs
deleted file mode 100644
index 6faf13f8..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/QueryRepeatM100Dto.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class QueryRepeatM100Dto : PagedAndSortedBase
- {
- ///
- /// 大众顺序号起
- ///
- public int? HostSNBegin { get; set; }
-
- ///
- /// 大众顺序号止
- ///
- public int? HostSNEnd { get; set; }
-
- ///
- /// KNR起
- ///
- public string KNRBegin { get; set; }
-
- ///
- /// KNR止
- ///
- public string KNREnd { get; set; }
-
- ///
- /// 底牌号起
- ///
- public string VINBegin { get; set; }
-
- ///
- /// 底牌号止
- ///
- public string VINEnd { get; set; }
-
- ///
- /// 总成ID
- ///
- //public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间起
- ///
- public DateTime? OnlineTimeBegin { get; set; }
-
- ///
- /// 上线时间止
- ///
- public DateTime? OnlineTimeEnd { get; set; }
-
-
- ///
- /// 车型代码(取通用字典)
- ///
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
-
- ///
- /// 接收时间起
- ///
- public DateTime? ReceiveTimeBegin { get; set; }
-
- ///
- /// 接收时间止
- ///
- public DateTime? ReceiveTimeEnd { get; set; }
-
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/RepeatM100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/RepeatM100Dto.cs
deleted file mode 100644
index 18112e99..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/RepeatM100Dto.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "M100重复报文", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class RepeatM100Dto: AuditedEntityDto
- {
- ///
- /// 流水号#
- ///
- [ExporterHeader(DisplayName = "流水号")]
- [ImporterHeader(Name = "流水号")]
- public int? SerialNum { get; set; }
-
- ///
- /// 大众顺序号
- ///
- [ExporterHeader(DisplayName = "大众顺序号")]
- [ImporterHeader(Name = "大众顺序号")]
- public int? HostSN { get; set; }
- ///
- /// KNR
- ///
- [ExporterHeader(DisplayName = "KNR")]
- [ImporterHeader(Name = "KNR")]
- public string KNR { get; set; }
-
- ///
- /// 底牌号#
- ///
- [ExporterHeader(DisplayName = "底牌号")]
- [ImporterHeader(Name = "底牌号")]
- public string VIN { get; set; }
- ///
- /// 总成ID
- ///
- [ExporterHeader(DisplayName = "总成ID")]
- [ImporterHeader(Name = "总成ID")]
- public Guid? AssemblyID { get; set; }
- ///
- /// 上线时间
- ///
- [ExporterHeader(DisplayName = "上线时间")]
- [ImporterHeader(Name = "上线时间")]
- public DateTime? OnlineTime { get; set; }
- ///
- /// 接收时间
- ///
- [ExporterHeader(DisplayName = "接收时间")]
- [ImporterHeader(Name = "接收时间")]
- public DateTime? ReceiveTime { get; set; }
- ///
- /// 车型代码(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- [ExporterHeader(DisplayName = "生产线")]
- [ImporterHeader(Name = "生产线")]
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- [ExporterHeader(DisplayName = "版本")]
- [ImporterHeader(Name = "版本")]
- public string Version { get; set; }
- ///
- /// 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】【暂不用所以不用枚举】
- ///
- [ExporterHeader(DisplayName = "单据状态")]
- [ImporterHeader(Name = "单据状态")]
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
-
- ///
- /// 涂装重复单据包含的零件列表
- ///
- public List M100RepeatParts { get; set; }
-
- ///
- /// 总成名称
- ///
- [ExporterHeader(DisplayName = "总成名称")]
- [ImporterHeader(Name = "总成名称")]
- public string AssemblyName { get; set; }
-
- ///
- /// 车型名称(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型名称")]
- [ImporterHeader(Name = "车型名称")]
- public string VehicleModelName { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/RepeatM100PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/RepeatM100PartDto.cs
deleted file mode 100644
index 21e91b32..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Dtos/RepeatM100PartDto.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "M100重复报文包含的零件信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class RepeatM100PartDto : EntityDto
- {
- ///
- /// 客户零件代码
- ///
- [ExporterHeader(DisplayName = "客户零件代码")]
- [ImporterHeader(Name = "客户零件代码")]
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [ExporterHeader(DisplayName = "客户零件数量")]
- [ImporterHeader(Name = "客户零件数量")]
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Interfaces/IRepeatM100AppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Interfaces/IRepeatM100AppService.cs
deleted file mode 100644
index cd2b65b6..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/Interfaces/IRepeatM100AppService.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- public interface IRepeatM100AppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryRepeatM100Dto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- Task> CreateAsync(CreateUpdateRepeatM100Dto input);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryRepeatM100Dto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/IRepeatR100AppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/IRepeatR100AppService.cs
deleted file mode 100644
index ada884b4..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/IRepeatR100AppService.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- public interface IRepeatR100AppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryRepeatR100Dto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryRepeatR100Dto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/QueryRepeatR100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/QueryRepeatR100Dto.cs
deleted file mode 100644
index b9c6a008..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/QueryRepeatR100Dto.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgCheck
-{
- [Serializable]
- public class QueryRepeatR100Dto : PagedAndSortedBase
- {
-
- ///
- /// 大众顺序号起
- ///
- public int? HostSNBegin { get; set; }
-
- ///
- /// 大众顺序号止
- ///
- public int? HostSNEnd { get; set; }
-
- ///
- /// KNR起
- ///
- public string KNRBegin { get; set; }
-
- ///
- /// KNR止
- ///
- public string KNREnd { get; set; }
-
- ///
- /// 总成ID
- ///
- //public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间起
- ///
- public DateTime? OnlineTimeBegin { get; set; }
-
- ///
- /// 上线时间止
- ///
- public DateTime? OnlineTimeEnd { get; set; }
-
-
- ///
- /// 车型代码(取通用字典)
- ///
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
-
- ///
- /// 接收时间起
- ///
- public DateTime? ReceiveTimeBegin { get; set; }
-
- ///
- /// 接收时间止
- ///
- public DateTime? ReceiveTimeEnd { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/RepeatR100Dto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/RepeatR100Dto.cs
deleted file mode 100644
index 42a6b567..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/RepeatR100Dto.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "R100重复报文", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class RepeatR100Dto: AuditedEntityDto
- {
-
- ///
- /// 大众顺序号
- ///
- [ExporterHeader(DisplayName = "大众顺序号")]
- [ImporterHeader(Name = "大众顺序号")]
- public int? HostSN { get; set; }
- ///
- /// KNR
- ///
- [ExporterHeader(DisplayName = "KNR")]
- [ImporterHeader(Name = "KNR")]
- public string KNR { get; set; }
-
- ///
- /// 总成ID
- ///
- [ExporterHeader(DisplayName = "总成ID")]
- [ImporterHeader(Name = "总成ID")]
- public Guid? AssemblyID { get; set; }
- ///
- /// 上线时间
- ///
- [ExporterHeader(DisplayName = "上线时间")]
- [ImporterHeader(Name = "上线时间")]
- public DateTime? OnlineTime { get; set; }
- ///
- /// 接收时间
- ///
- [ExporterHeader(DisplayName = "接收时间")]
- [ImporterHeader(Name = "接收时间")]
- public DateTime? ReceiveTime { get; set; }
- ///
- /// 车型代码(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- [ExporterHeader(DisplayName = "版本")]
- [ImporterHeader(Name = "版本")]
- public string Version { get; set; }
- ///
- /// 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】【暂不用所以不用枚举】
- ///
- [ExporterHeader(DisplayName = "单据状态")]
- [ImporterHeader(Name = "单据状态")]
- public BillStatusEnum BillStatus { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
-
- ///
- /// 涂装重复单据包含的零件列表
- ///
- public List R100RepeatParts { get; set; }
-
- ///
- /// 总成名称
- ///
- [ExporterHeader(DisplayName = "总成名称")]
- [ImporterHeader(Name = "总成名称")]
- public string AssemblyName { get; set; }
-
- ///
- /// 车型名称(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型名称")]
- [ImporterHeader(Name = "车型名称")]
- public string VehicleModelName { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/RepeatR100PartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/RepeatR100PartDto.cs
deleted file mode 100644
index 0bf3947e..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/RepeatMessages/R100Repeat/RepeatR100PartDto.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "R100重复报文包含的零件信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class RepeatR100PartDto : EntityDto
- {
- ///
- /// 客户零件代码
- ///
- [ExporterHeader(DisplayName = "客户零件代码")]
- [ImporterHeader(Name = "客户零件代码")]
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [ExporterHeader(DisplayName = "客户零件数量")]
- [ImporterHeader(Name = "客户零件数量")]
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- [ExporterHeader(DisplayName = "描述")]
- [ImporterHeader(Name = "描述")]
- public string Description { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/AddAssemblyCfgDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/AddAssemblyCfgDto.cs
deleted file mode 100644
index d21be548..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/AddAssemblyCfgDto.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using WY.NewJit.MsgBaseData;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- [Serializable]
- public class AddAssemblyCfgDto
- {
- ///
- /// 单据ID
- ///
- public Guid BillID { get; set; }
-
- ///
- /// 扫描点:R100 M100
- ///
- public string ScanPoint { get; set; }
-
- public List ErpAssemblyCfgList { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/BatchParseParam.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/BatchParseParam.cs
deleted file mode 100644
index f19337d9..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/BatchParseParam.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- public class BatchParseParam
- {
- public int TakeCount { get; set; }
-
- public DateTime? BeginDate { get; set; }
-
- public DateTime? EndDate { get; set; }
- }
-
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/QueryBillInfoDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/QueryBillInfoDto.cs
deleted file mode 100644
index 50e9e111..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/QueryBillInfoDto.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- [Serializable]
- public class QueryBillInfoDto
- {
- ///
- /// 单据ID
- ///
- public Guid BillID { get; set; }
-
- ///
- /// 扫描点:R100 M100
- ///
- public string ScanPoint { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/QueryUnknownAssemblyDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/QueryUnknownAssemblyDto.cs
deleted file mode 100644
index 1513ccfa..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/QueryUnknownAssemblyDto.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- [Serializable]
- public class QueryUnknownAssemblyDto : PagedAndSortedBase
- {
- ///
- /// 扫描点:R100 M100
- ///
- public string ScanPoint { get; set; }
-
-
- ///
- /// 大众顺序号起
- ///
- public int? HostSNBegin { get; set; }
-
- ///
- /// 大众顺序号止
- ///
- public int? HostSNEnd { get; set; }
-
- ///
- /// KNR起
- ///
- public string KNRBegin { get; set; }
-
- ///
- /// KNR止
- ///
- public string KNREnd { get; set; }
-
- ///
- /// 底牌号起
- ///
- public string VINBegin { get; set; }
-
- ///
- /// 底牌号止
- ///
- public string VINEnd { get; set; }
-
- ///
- /// 总成ID
- ///
- public Guid? AssemblyID { get; set; }
-
- ///
- /// 上线时间起
- ///
- public DateTime? OnlineTimeBegin { get; set; }
-
- ///
- /// 上线时间止
- ///
- public DateTime? OnlineTimeEnd { get; set; }
-
-
- ///
- /// 车型代码(取通用字典)
- ///
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 版本
- ///
- public string Version { get; set; }
-
- /////
- ///// 接收时间起
- /////
- //public DateTime? ReceiveTimeBegin { get; set; }
-
- /////
- ///// 接收时间止
- /////
- //public DateTime? ReceiveTimeEnd { get; set; }
-
- /////
- ///// 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
- /////
- //public BillStatusEnum? BillStatus { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/ResultUnknownAssemblyDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/ResultUnknownAssemblyDto.cs
deleted file mode 100644
index 276540ec..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/ResultUnknownAssemblyDto.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "未知总成", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class ResultUnknownAssemblyDto : EntityDto
- {
-
- ///
- /// 大众顺序号
- ///
- [ExporterHeader(DisplayName = "大众顺序号")]
- [ImporterHeader(Name = "大众顺序号")]
- public int? HostSN { get; set; }
- ///
- /// KNR
- ///
- [ExporterHeader(DisplayName = "KNR")]
- [ImporterHeader(Name = "KNR")]
- public string KNR { get; set; }
-
- ///
- /// 底牌号#
- ///
- [ExporterHeader(DisplayName = "底牌号")]
- [ImporterHeader(Name = "底牌号")]
- public string VIN { get; set; }
-
- ///
- /// 车型代码(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型代码")]
- [ImporterHeader(Name = "车型代码")]
- public string VehicleModelCode { get; set; }
-
- ///
- /// 生产线(派格按生产线分类)
- ///
- public virtual string ProductLine { get; set; }
-
- ///
- /// 车型名称(取通用字典)
- ///
- [ExporterHeader(DisplayName = "车型名称")]
- [ImporterHeader(Name = "车型名称")]
- public string VehicleModelName { get; set; }
-
- ///
- /// 扫描点
- ///
- [ExporterHeader(DisplayName = "扫描点")]
- [ImporterHeader(Name = "扫描点")]
- public string ScanPoint { get; set; }
-
- ///
- /// 上线时间
- ///
- [ExporterHeader(DisplayName = "上线时间")]
- [ImporterHeader(Name = "上线时间")]
- public DateTime? OnlineTime { get; set; }
-
- ///
- /// 版本
- ///
- [ExporterHeader(DisplayName = "版本")]
- [ImporterHeader(Name = "版本")]
- public string Version { get; set; }
-
- ///
- /// 总成名称
- ///
- [ExporterHeader(DisplayName = "总成名称")]
- [ImporterHeader(Name = "总成名称")]
- public string AssemblyName { get; set; }
-
- ///
- /// 客户零件数量
- ///
- [ExporterHeader(DisplayName = "客户零件数量")]
- [ImporterHeader(Name = "客户零件数量")]
- public double? PartNum { get; set; }
-
- ///
- /// 文件名
- ///
- [ExporterHeader(DisplayName = "文件名")]
- [ImporterHeader(Name = "文件名")]
- public string FileName { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/ToParseInParam.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/ToParseInParam.cs
deleted file mode 100644
index d01004ac..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/ToParseInParam.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- [Serializable]
- public class ToParseInParam
- {
- ///
- /// 是否选中全部
- ///
- public bool IsSelectAll { get; set; }
-
- ///
- /// 部分选中列表
- ///
- public List UnknownAssemblyIdList { get; set; }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/UnknownAssemblyDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/UnknownAssemblyDto.cs
deleted file mode 100644
index 376de455..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/UnknownAssemblyDto.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "M100重复报文", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class UnknownAssemblyDto: AuditedEntityDto
- {
- ///
- /// 单据ID
- ///
- public Guid BillID { get; set; }
-
- ///
- /// 扫描点:R100 M100
- ///
- public string ScanPoint { get; set; }
-
- ///
- /// 客户零件数量
- ///
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- public string Description { get; set; }
-
- ///
- /// 未知总成包含的零件列表
- ///
- public List UnknownAssemblyParts { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/UnknownAssemblyPartDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/UnknownAssemblyPartDto.cs
deleted file mode 100644
index 6db047dd..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Dtos/UnknownAssemblyPartDto.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- ///
- /// 零件查询结果DTO
- ///
- [ExcelExporter(Name = "M100重复报文包含的零件信息", AutoFitAllColumn = true, MaxRowNumberOnASheet = 1000)] //一个Sheet最大允许的行数,设置了之后将输出多个Sheet
- [Serializable]
- public class UnknownAssemblyPartDto : EntityDto
- {
- ///
- /// 客户零件代码
- ///
- public string PartCode { get; set; }
-
- ///
- /// 客户零件数量
- ///
- public double? PartNum { get; set; }
-
- ///
- /// 描述
- ///
- public string Description { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Interfaces/IUnknownAssemblyAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Interfaces/IUnknownAssemblyAppService.cs
deleted file mode 100644
index 62a62e6c..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgCheck/UnknownAssemblys/Interfaces/IUnknownAssemblyAppService.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgCheck.UnknownAssemblys
-{
- public interface IUnknownAssemblyAppService
- {
- #region 接口方法
-
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- Task> GetListAsync(QueryUnknownAssemblyDto input);
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- Task> GetAsync(Guid id);
-
- ///
- /// 删除实体
- ///
- /// 删除主键
- /// 执行成功返回真
- Task DeleteAsync(string id);
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- Task> ExportAsync(QueryUnknownAssemblyDto input);
-
- ///
- /// 导入信息
- ///
- /// 导入文件流
- /// 执行成功返回真
- Task ImportAsync(Byte[] input);
-
- ///
- /// 添加总成:根据未知总成中的结算件生成新的总成【客户端自己构造】
- ///
- /// 总成、分总成、零件三级关系实体
- /// 执行成功返回真
- Task AddAssemblyAsync(AddAssemblyCfgDto input);
-
- ///
- /// 重新解析
- ///
- /// 总成、分总成、零件三级关系实体
- /// 执行成功返回真
- Task ToParseAsync(ToParseInParam input);
-
- ///
- /// 系统初始化时使用,批量解析
- ///
- ///
- ///
- ObjectResultDto BatchParseAsync(BatchParseParam input);
-
- ///
- /// 根据vin从天合mes系统中取erp总成编码列表
- ///
- ///
- ///
- Task>> GetErpAssemblyCodeByMesAsync(string vin);
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgConversion/IMsgConversionAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgConversion/IMsgConversionAppService.cs
deleted file mode 100644
index 55dad2fa..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgConversion/IMsgConversionAppService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WY.NewJit.MsgConversion
-{
- public interface IMsgConversionAppService
- {
- ///
- /// 报文转换
- ///
- ///
- void DoConversionMessage(Guid messageReceiveId);
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/IMsgTransmissionAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/IMsgTransmissionAppService.cs
deleted file mode 100644
index de49b53e..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/IMsgTransmissionAppService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgTransmission
-{
- public interface IMsgTransmissionAppService
- {
- #region 接口方法
- ObjectResultDto TransmissionMessageAsync(TransmissionParamDto input);
- #endregion
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TianHe/AssemblySyncEto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TianHe/AssemblySyncEto.cs
deleted file mode 100644
index f490db28..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TianHe/AssemblySyncEto.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.EventBus;
-using WY.NewJit.MsgBaseData;
-
-namespace WY.NewJit.MsgTransmission.TianHe
-{
- [EventName("WY.NewJit.SettleAccountFis.AssemblySync")]
- public class AssemblySyncEto
- {
- public AssemblySyncOperationTypeEnum OperationType { get; set; }
-
- public List AssemblyCfgList { get; set; }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TianHe/AssemblySyncOperationType.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TianHe/AssemblySyncOperationType.cs
deleted file mode 100644
index 2a82392e..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TianHe/AssemblySyncOperationType.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-
-namespace WY.NewJit.MsgTransmission.TianHe
-{
- public enum AssemblySyncOperationTypeEnum
- {
- [Description("添加")]
- Add,
- [Description("修改")]
- Update,
- [Description("删除")]
- Delete
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TransmissionParamDto.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TransmissionParamDto.cs
deleted file mode 100644
index 86e97c04..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgTransmission/TransmissionParamDto.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Application.Dtos;
-
-namespace WY.NewJit.MsgTransmission
-{
- public class TransmissionParamDto : EntityDto
- {
- private int _takeRecordCount = 2;
-
- ///
- /// 读取记录数
- ///
- public int TakeRecordCount
- {
- get
- {
- return _takeRecordCount;
- }
- set
- {
- _takeRecordCount = value;
- }
- }
-
- public TransmissionParamDto(int takeRecordCount)
- {
- _takeRecordCount = takeRecordCount;
- }
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/NewJitApplicationContractsModule.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/NewJitApplicationContractsModule.cs
deleted file mode 100644
index 4569d870..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/NewJitApplicationContractsModule.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Volo.Abp.Account;
-using Volo.Abp.FeatureManagement;
-using Volo.Abp.Identity;
-using Volo.Abp.Modularity;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.PermissionManagement;
-using Volo.Abp.SettingManagement;
-using Volo.Abp.TenantManagement;
-
-namespace WY.NewJit
-{
- [DependsOn(
- typeof(NewJitDomainSharedModule),
- typeof(AbpAccountApplicationContractsModule),
- typeof(AbpFeatureManagementApplicationContractsModule),
- typeof(AbpIdentityApplicationContractsModule),
- typeof(AbpPermissionManagementApplicationContractsModule),
- typeof(AbpSettingManagementApplicationContractsModule),
- typeof(AbpTenantManagementApplicationContractsModule),
- typeof(AbpObjectExtendingModule)
- )]
- public class NewJitApplicationContractsModule : AbpModule
- {
- public override void PreConfigureServices(ServiceConfigurationContext context)
- {
- NewJitDtoExtensions.Configure();
- }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/NewJitDtoExtensions.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/NewJitDtoExtensions.cs
deleted file mode 100644
index c4d8ffbe..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/NewJitDtoExtensions.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Volo.Abp.Identity;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.Threading;
-
-namespace WY.NewJit
-{
- public static class NewJitDtoExtensions
- {
- private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
-
- public static void Configure()
- {
- OneTimeRunner.Run(() =>
- {
- /* You can add extension properties to DTOs
- * defined in the depended modules.
- *
- * Example:
- *
- * ObjectExtensionManager.Instance
- * .AddOrUpdateProperty("Title");
- *
- * See the documentation for more:
- * https://docs.abp.io/en/abp/latest/Object-Extensions
- */
- });
- }
- }
-}
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Permissions/NewJitPermissionDefinitionProvider.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Permissions/NewJitPermissionDefinitionProvider.cs
deleted file mode 100644
index dfa569eb..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Permissions/NewJitPermissionDefinitionProvider.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using WY.NewJit.Localization;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Localization;
-
-namespace WY.NewJit.Permissions
-{
- public class NewJitPermissionDefinitionProvider : PermissionDefinitionProvider
- {
- public override void Define(IPermissionDefinitionContext context)
- {
- var myGroup = context.AddGroup(NewJitPermissions.GroupName);
-
- //Define your own permissions here. Example:
- //myGroup.AddPermission(NewJitPermissions.MyPermission1, L("Permission:MyPermission1"));
- }
-
- private static LocalizableString L(string name)
- {
- return LocalizableString.Create(name);
- }
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Permissions/NewJitPermissions.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Permissions/NewJitPermissions.cs
deleted file mode 100644
index 8e576ed6..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/Permissions/NewJitPermissions.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace WY.NewJit.Permissions
-{
- public static class NewJitPermissions
- {
- public const string GroupName = "NewJit";
-
- //Add your own permission names. Example:
- //public const string MyPermission1 = GroupName + ".MyPermission1";
- }
-}
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj
deleted file mode 100644
index e072ea9a..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- netstandard2.0
- WY.NewJit
-
-
-
- D:\~LYF\~源码\新版JIT或JIS系统\src\Modules\新版JIT或JIS系统服务端\src\WY.NewJit.Application.Contracts\WY.NewJit.Application.Contracts.xml
- 0
-
-
-
- D:\~LYF\~源码\新版JIT或JIS系统\src\Modules\新版JIT或JIS系统服务端\src\WY.NewJit.Application.Contracts\WY.NewJit.Application.Contracts.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml
deleted file mode 100644
index a53039c3..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml
+++ /dev/null
@@ -1,2567 +0,0 @@
-
-
-
- WY.NewJit.Application.Contracts
-
-
-
-
- Erp总成ID
-
-
-
-
- 零件ID
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 是否Key件
-
-
-
-
- ERP总成
-
-
-
-
- ERP总成编码
-
-
-
-
- ERP总成名称
-
-
-
-
- ERP总成版本
-
-
-
-
- 车型
-
-
-
-
- 总成和零件关系表
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 是否Key件
-
-
-
-
- 整车总成ID
-
-
-
-
- 零件ID
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 是否Key件
-
-
-
-
- ERP总成编码
-
-
-
-
- ERP总成名称
-
-
-
-
- 车型
-
-
-
-
- 是否覆盖上一个版本
-
-
-
-
- 上一个版本的ERP总成ID
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 是否Key件
-
-
-
-
- ERP总成编码
-
-
-
-
- 总成名称
-
-
-
-
- 车型代码
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 根据筛选条件获取分页实体列表
-
- 主键
- 返回符合条件的排序分页列表
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出ERP总成
-
-
-
-
-
-
- 系统初始化时使用,去掉重复的ERP总成
-
-
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 根据整车总成Id取Erp总成列表
- W
- 整车总成Id
- Erp总成列表
-
-
-
- 通用字典信息DTO
-
-
-
-
- 字典类别代码
-
-
-
-
- 字典项代码
-
-
-
-
- 字典项名称
-
-
-
-
-
- 车型代码
-
-
-
-
- 客户零件号
-
-
-
-
- 排除原因
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 车型代码
-
-
-
-
- 客户零件号
-
-
-
-
- 排除原因
-
-
-
-
- 车型名称
-
-
-
-
- 客户零件名称
-
-
-
-
- 车型代码
-
-
-
-
- 客户零件号
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
- 日志类别(1 报文传输异常、2 报文转换异常、3 报文解析、校验异常)
-
-
-
-
- 日志标题
-
-
-
-
- 日志描述
-
-
-
-
- 严重程度(1 轻微 2 一般、3 严重)
-
-
-
-
- 日志状态
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 日志类别(1 报文传输异常、2 报文转换异常、3 报文解析、校验异常)
-
-
-
-
- 日志标题
-
-
-
-
- 日志描述
-
-
-
-
- 严重程度(1 轻微 2 一般、3 严重)
-
-
-
-
- 日志状态
-
-
-
-
- 日志类别(1 报文传输异常、2 报文转换异常、3 报文解析、校验异常)
-
-
-
-
- 日志标题
-
-
-
-
- 严重程度(1 轻微 2 一般、3 严重)
-
-
-
-
- 日志状态 0 1 2
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
- 执行处理
-
- 主键
- 执行成功返回真
-
-
-
- 执行忽略
-
- 主键
- 执行成功返回真
-
-
-
- 零件编码
-
-
-
-
- 零件名称
-
-
-
-
- 零件类型(取通用字典)
-
-
-
-
- 零件子类型(取通用字典)
-
-
-
-
- 描述
-
-
-
-
- 门板代号
-
-
-
-
- SAP物料号
-
-
-
-
- 物料描述(大小量纲、物料描述字段值同时存在时,优先显示大小量纲)
-
-
-
-
- 大小量纲(大小量纲、物料描述字段值同时存在时,优先显示大小量纲)
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 零件编码
-
-
-
-
- 零件名称
-
-
-
-
- 零件类型(取通用字典)
-
-
-
-
- 零件子类型(取通用字典)
-
-
-
-
- 描述
-
-
-
-
- 门板代号
-
-
-
-
- SAP物料号
-
-
-
-
- 物料描述(大小量纲、物料描述字段值同时存在时,优先显示大小量纲)
-
-
-
-
- 大小量纲(大小量纲、物料描述字段值同时存在时,优先显示大小量纲)
-
-
-
-
- 零件编码
-
-
-
-
- 零件名称
-
-
-
-
- 零件类型(取通用字典)
-
-
-
-
- 零件子类型(取通用字典)
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
- 零件编码
-
-
-
-
- 切换为零件编码
-
-
-
-
- 生效开始时间
-
-
-
-
- 生效结束时间
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 零件编码
-
-
-
-
- 零件名称
-
-
-
-
- 切换为零件编码
-
-
-
-
- 切换为零件名称
-
-
-
-
- 生效开始时间
-
-
-
-
- 生效结束时间
-
-
-
-
- 零件编码
-
-
-
-
- 零件名称
-
-
-
-
- 切换为零件编码
-
-
-
-
- 切换为零件名称
-
-
-
-
- 是否有效
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
- 零件查询结果DTO
-
-
-
-
- 流水号#
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 底牌号#
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 接收时间
-
-
-
-
- 单据状态(0 空;1 未匹配;2 已匹配;3 已发布;-1 预批量)
-
-
-
-
- 描述
-
-
-
-
- 涂装重复单据包含的零件列表
-
-
-
-
- 手工操作类型:0 none,1 手工添加,2 手工修改
-
-
-
-
- 手工操作员
-
-
-
-
- 手工操作日期
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 流水号#
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 底牌号#
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 接收时间
-
-
-
-
- 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
-
-
-
-
- 描述
-
-
-
-
- 涂装重复单据包含的零件列表
-
-
-
-
- 手工操作类型:0 none,1 手工添加,2 手工修改
-
-
-
-
- 手工操作员
-
-
-
-
- 手工操作日期
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 流水号起
-
-
-
-
- 流水号止
-
-
-
-
- 大众顺序号起
-
-
-
-
- 大众顺序号止
-
-
-
-
- KNR起
-
-
-
-
- KNR止
-
-
-
-
- 底牌号起
-
-
-
-
- 底牌号止
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间起
-
-
-
-
- 上线时间止
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 接收时间起
-
-
-
-
- 接收时间止
-
-
-
-
- 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
-
-
-
-
- 是否单据维护
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 流水号#
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 底牌号#
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 接收时间
-
-
-
-
- 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】
-
-
-
-
- 描述
-
-
-
-
- 总成名称
-
-
-
-
- 车型名称(取通用字典)
-
-
-
-
- R100总成名称
-
-
-
-
- R100上线时间
-
-
-
-
- 打印时间
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
- 打印门板
-
-
- 执行成功返回真
-
-
-
- 打印柱护板
-
-
- 执行成功返回真
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
- 根据KNR取ERP总成列表
-
-
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间
-
-
-
-
- 接收时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
-
-
-
-
- 描述
-
-
-
-
- 焊装重复单据包含的零件列表
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间
-
-
-
-
- 接收时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
-
-
-
-
- 描述
-
-
-
-
- 焊装重复单据包含的零件列表
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 大众顺序号起
-
-
-
-
- 大众顺序号止
-
-
-
-
- KNR起
-
-
-
-
- KNR止
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间起
-
-
-
-
- 上线时间止
-
-
-
-
- 接收时间起
-
-
-
-
- 接收时间止
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- KNR
-
-
-
-
- 一个或多个ERP总成编码(逗号分隔)
-
-
-
-
- 一个或多个ERP总成名称(逗号分隔)
-
-
-
-
- ERP总成数量
-
-
-
-
- 大众顺序号
-
-
-
-
- 上线时间
-
-
-
-
- 接收时间
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 版本
-
-
-
-
- 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】
-
-
-
-
- 描述
-
-
-
-
- 总成名称
-
-
-
-
- 车型名称(取通用字典)
-
-
-
-
- 总成ID
-
-
-
-
- 打印时间
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 修改实体
-
- 更新主键
- 修改内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导出包含ERP总成编码的信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 流水号起
-
-
-
-
- 流水号止
-
-
-
-
- 大众顺序号起
-
-
-
-
- 大众顺序号止
-
-
-
-
- KNR起
-
-
-
-
- KNR止
-
-
-
-
- 底牌号起
-
-
-
-
- 底牌号止
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间起
-
-
-
-
- 上线时间止
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 接收时间起
-
-
-
-
- 接收时间止
-
-
-
-
- 单据状态(0 空;1 未匹配;2 已匹配;3 已发布)
-
-
-
-
- 是否单据维护
-
-
-
-
- 有焊装无总装
-
-
-
-
- 有焊装有总装
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- R100单据状态
-
-
-
-
- R100上线时间
-
-
-
-
- R100接收时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 版本
-
-
-
-
- 流水号#
-
-
-
-
- 底牌号#
-
-
-
-
- M100上线时间
-
-
-
-
- M100接收时间
-
-
-
-
- M100单据状态【0 空;1 未匹配;2 已匹配;3 已发布】
-
-
-
-
- R100一个或多个ERP总成编码(逗号分隔)
-
-
-
-
- R100一个或多个ERP总成名称(逗号分隔)
-
-
-
-
- 涂装重复单据
-
-
-
-
- 报文接收ID,对应报文接收表主键
-
-
-
-
- 流水号#
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 底牌号#
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间
-
-
-
-
- 接收时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】【暂不用所以不用枚举】
-
-
-
-
- 描述
-
-
-
-
- 涂装重复单据包含的零件列表
-
-
-
-
- 涂装重复单据和零件关系表
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 大众顺序号起
-
-
-
-
- 大众顺序号止
-
-
-
-
- KNR起
-
-
-
-
- KNR止
-
-
-
-
- 底牌号起
-
-
-
-
- 底牌号止
-
-
-
-
- 上线时间起
-
-
-
-
- 上线时间止
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 接收时间起
-
-
-
-
- 接收时间止
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 流水号#
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 底牌号#
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间
-
-
-
-
- 接收时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】【暂不用所以不用枚举】
-
-
-
-
- 描述
-
-
-
-
- 涂装重复单据包含的零件列表
-
-
-
-
- 总成名称
-
-
-
-
- 车型名称(取通用字典)
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 添加实体
-
- 添加内容
- 执行成功返回真
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
- 大众顺序号起
-
-
-
-
- 大众顺序号止
-
-
-
-
- KNR起
-
-
-
-
- KNR止
-
-
-
-
- 上线时间起
-
-
-
-
- 上线时间止
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 接收时间起
-
-
-
-
- 接收时间止
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间
-
-
-
-
- 接收时间
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 单据状态【0 空;1 未匹配;2 已匹配;3 已发布】【暂不用所以不用枚举】
-
-
-
-
- 描述
-
-
-
-
- 涂装重复单据包含的零件列表
-
-
-
-
- 总成名称
-
-
-
-
- 车型名称(取通用字典)
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 单据ID
-
-
-
-
- 扫描点:R100 M100
-
-
-
-
- 单据ID
-
-
-
-
- 扫描点:R100 M100
-
-
-
-
- 扫描点:R100 M100
-
-
-
-
- 大众顺序号起
-
-
-
-
- 大众顺序号止
-
-
-
-
- KNR起
-
-
-
-
- KNR止
-
-
-
-
- 底牌号起
-
-
-
-
- 底牌号止
-
-
-
-
- 总成ID
-
-
-
-
- 上线时间起
-
-
-
-
- 上线时间止
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 版本
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 大众顺序号
-
-
-
-
- KNR
-
-
-
-
- 底牌号#
-
-
-
-
- 车型代码(取通用字典)
-
-
-
-
- 生产线(派格按生产线分类)
-
-
-
-
- 车型名称(取通用字典)
-
-
-
-
- 扫描点
-
-
-
-
- 上线时间
-
-
-
-
- 版本
-
-
-
-
- 总成名称
-
-
-
-
- 客户零件数量
-
-
-
-
- 文件名
-
-
-
-
- 是否选中全部
-
-
-
-
- 部分选中列表
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 单据ID
-
-
-
-
- 扫描点:R100 M100
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
- 未知总成包含的零件列表
-
-
-
-
- 零件查询结果DTO
-
-
-
-
- 客户零件代码
-
-
-
-
- 客户零件数量
-
-
-
-
- 描述
-
-
-
-
-
- 按主键获取唯一实体
-
- 主键
- 实体信息
-
-
-
- 删除实体
-
- 删除主键
- 执行成功返回真
-
-
-
- 导出信息
-
- 导出查询条件
- 执行成功返回真
-
-
-
- 导入信息
-
- 导入文件流
- 执行成功返回真
-
-
-
- 添加总成:根据未知总成中的结算件生成新的总成【客户端自己构造】
-
- 总成、分总成、零件三级关系实体
- 执行成功返回真
-
-
-
- 重新解析
-
- 总成、分总成、零件三级关系实体
- 执行成功返回真
-
-
-
- 系统初始化时使用,批量解析
-
-
-
-
-
-
- 根据vin从天合mes系统中取erp总成编码列表
-
-
-
-
-
-
- 报文转换
-
-
-
-
-
- 读取记录数
-
-
-
-
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/Books/BookAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/Books/BookAppService.cs
deleted file mode 100644
index 11f249e2..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/Books/BookAppService.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-using WY.NewJit.Books;
-
-namespace Acme.BookStore.Books
-{
- ///
- /// BookAppService使用IObjectMapper将Book对象转换为BookDto对象, 将CreateUpdateBookDto对象转换为Book对象
- ///
- public class BookAppService :
- CrudAppService<
- Book, //The Book entity
- BookDto, //Used to show books
- Guid, //Primary key of the book entity
- PagedAndSortedResultRequestDto, //Used for paging/sorting
- CreateUpdateBookDto>, //Used to create/update a book
- IBookAppService //implement the IBookAppService
- {
- public BookAppService(IRepository repository)
- : base(repository)
- {
-
- }
- }
-}
\ No newline at end of file
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgErpAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgErpAppService.cs
deleted file mode 100644
index b589f59a..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgErpAppService.cs
+++ /dev/null
@@ -1,461 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Microsoft.AspNetCore.Mvc;
-using WY.NewJit.Common;
-using WY.NewJit.EntityFrameworkCore;
-using Shouldly;
-using Volo.Abp.BlobStoring;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 总成配置应用服务实现
- ///
- [Route("api/newjit/assembly-cfg-erp")]
- [ApiExplorerSettings(GroupName = SwaggerGroupConsts.基础数据)]
- public class AssemblyCfgErpAppService : ApplicationService, IAssemblyCfgErpAppService
- {
- ///
- /// ERP总成仓储
- ///
- private readonly IRepository _assemblyCfgErpRepository;
-
- ///
- /// 结算件仓储
- ///
- private readonly IRepository _assemblyCfgPartRepos;
-
- ///
- /// 日志
- ///
- private ILogger _logger;
-
- ///
- /// Dapper仓储
- ///
- private readonly NewJitDapperRepository _newJitDapperRepository;
-
- ///
- /// BLOB存储
- ///
- private readonly IBlobContainer _blobContainer;
-
- ///
- /// 总成领域服务
- ///
- private readonly AssemblyDomainService _assemblyDomainService;
-
- ///
- /// 错误信息前缀
- ///
- private string _errorMessagePrefix
- {
- get
- {
- return System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name + ".";
- }
- }
-
- ///
- /// 构造函数
- ///
- public AssemblyCfgErpAppService(
- IRepository assemblyCfgErpRepository,
- ILogger logger,
- NewJitDapperRepository newJitDapperRepository,
- IRepository assemblyCfgPartRepos,
- IBlobContainer blobContainer,
- AssemblyDomainService assemblyDomainService
- )
- {
- _assemblyCfgErpRepository = assemblyCfgErpRepository;
- _logger = logger;
- _newJitDapperRepository = newJitDapperRepository;
- _assemblyCfgPartRepos = assemblyCfgPartRepos;
- _blobContainer = blobContainer;
- _assemblyDomainService = assemblyDomainService;
- }
-
- #region 私有方法
- ///
- /// 根据筛选条件获取实体列表
- ///
- private async Task> QueryByConditionAsync(QueryAssemblyCfgErpDto input, PagedAndSortedBase page)
- {
- PagedResultDto ret = new PagedResultDto();
-
- string sqlCnt = @"
-select * from
-(
- select count(*) as cnt
- from FisAssemblyCfgErp a
- where IsDeleted <> 1 and PreviousVersionId is null {0}
-) t
-";
-
- string sql = @"
-select * from
-(
- select ROW_NUMBER() OVER(order by a.[CreationTime]) as row_number,
- a.*
- from FisAssemblyCfgErp a
- where IsDeleted <> 1 and PreviousVersionId is null {0}
-) t where row_number between {1} and {2}
-";
- string where = "";
- if (!string.IsNullOrEmpty(input.ErpAssemblyName))
- {
- where += string.Format(" and a.ErpAssemblyName like '%{0}%'", input.ErpAssemblyName);
- }
- if (!string.IsNullOrEmpty(input.ErpAssemblyCode))
- {
- where += string.Format(" and a.ErpAssemblyCode like '%{0}%'", input.ErpAssemblyCode);
- }
- if (!string.IsNullOrEmpty(input.VehicleModelCode))
- {
- where += string.Format(" and a.VehicleModel = '{0}'", input.VehicleModelCode);
- }
- sqlCnt = string.Format(sqlCnt, where);
- ret.TotalCount = await _newJitDapperRepository.GetSingleBySqlAsync(sqlCnt);
-
- //计算分页
- int fromRec = page.SkipCount + 1;
- int ToRec = page.SkipCount + page.MaxResultCount;
- sql = string.Format(sql, where, fromRec, ToRec);
- var lst = await _newJitDapperRepository.GetListBySqlAsync(sql);
- ret.Items = lst;
- return ret;
- }
-
- ///
- /// 两个集合比较
- ///
- ///
- ///
- ///
- private bool CompareTwoCollection(List sourceLst, List targetLst)
- {
- if (sourceLst == null || targetLst == null || sourceLst.Count == 0 || targetLst.Count == 0)
- {
- return false;
- }
- if (sourceLst.Count != targetLst.Count)
- {
- return false;
- }
- //将目标对象转换成和源对象一样的类型 AssemblyCfgErp2PartDto to BillM100Part
- var srcOrdLst = sourceLst.OrderBy(itm => itm.PartCode).ThenBy(itm => itm.PartNum).ToList();
- var tarOrdLst = targetLst.OrderBy(itm => itm.PartCode).ThenBy(itm => itm.PartNum).ToList();
-
- bool isEqual = srcOrdLst.SequenceEqual(tarOrdLst, new AssemblyCfgPartListEquality());
- return isEqual;
- }
-
- #endregion
-
-
- #region 公共方法
-
- ///
- /// 根据筛选条件获取分页实体列表
- ///
- ///
- ///
- [HttpGet]
- [UnitOfWork(false)]
- [Route("list")]
- public virtual async Task> GetErpAssemblyListAsync(QueryAssemblyCfgErpDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "GetErpAssemblyListAsync 进入");
- try
- {
- PagedResultDto ret = await QueryByConditionAsync(input, (PagedAndSortedBase)input);
- return ret;
- }
- catch (Exception ex)
- {
- string errMsg = _errorMessagePrefix + "GetErpAssemblyListAsync 执行出错:" + ex;
- _logger.LogError(errMsg);
- return new PagedResultDto(0, new List());
- }
- }
-
- ///
- /// 按主键获取唯一实体
- ///
- ///
- ///
- [HttpGet]
- [Route("{id}")]//obj/
- public virtual async Task> GetErpAssemblyAsync(Guid id)
- {
- _logger.LogDebug(_errorMessagePrefix + "GetAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- AssemblyCfgErp sourceObj = await _assemblyCfgErpRepository.GetAsync(id);
- AssemblyCfgErpDto targetObj = ObjectMapper.Map(sourceObj);
- ret.Item = targetObj;
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "GetAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 添加实体
- ///
- ///
- ///
- [HttpPost]
- [UnitOfWork]
- [Route("")]//create
- public virtual async Task> CreateErpAssemblyAsync(CreateUpdateAssemblyCfgErpDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "CreateAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- int maxVer = _assemblyCfgErpRepository.Any() ? _assemblyCfgErpRepository.Max(itm => itm.ErpAssemblyVersion) : 0;
-
- AssemblyCfgErp obj = ObjectMapper.Map(input);
- obj.SetErpAssemblyVersion(++maxVer);
- foreach (var childObj in obj.Details)
- {
- childObj.SetId(GuidGenerator.Create());
- }
-
- AssemblyCfgErp obj2 = await _assemblyCfgErpRepository.InsertAsync(obj);
- ret.Item = obj2.Id; //返回添加对象的主键
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "CreateAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 修改实体
- ///
- ///
- ///
- ///
- [HttpPut]
- [UnitOfWork]
- [Route("{id}")]//update/
- public virtual async Task UpdateErpAssemblyAsync(Guid id, CreateUpdateAssemblyCfgErpDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "UpdateAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- AssemblyCfgErp targetObj = await _assemblyCfgErpRepository.GetAsync(id);
- await _assemblyCfgPartRepos.DeleteManyAsync(targetObj.Details); //先删除子实体列表
- ObjectMapper.Map(input, targetObj);
- await _assemblyCfgErpRepository.UpdateAsync(targetObj);
- await _assemblyCfgPartRepos.InsertManyAsync(targetObj.Details); //再添加子实体列表
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "UpdateAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 删除实体
- ///
- ///
- ///
- [UnitOfWork]
- [HttpDelete]
- [Route("{id}")]//delete/
- public virtual async Task DeleteErpAssemblyAsync(string id)
- {
- _logger.LogDebug(_errorMessagePrefix + "DeleteAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- List idLst = ServerHelper.GetGuidListByStr(id);
- foreach (Guid item in idLst)
- {
- var sourceObj = await _assemblyCfgErpRepository.GetAsync(item);
- if (sourceObj != null)
- {
- await _assemblyCfgPartRepos.DeleteManyAsync(sourceObj.Details);
- await _assemblyCfgErpRepository.DeleteAsync(item);
- }
- }
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "DeleteAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 导出信息
- ///
- /// 导出查询条件
- /// 执行成功返回真
- [UnitOfWork(false)]
- [HttpPost]
- [Route("export")]
- public virtual async Task> ExportErpAssemblyAsync(QueryAssemblyCfgErpDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "ExportErpAssemblyAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- input.SkipCount = 0;
- input.MaxResultCount = 50000;
- PagedResultDto query = await QueryByConditionAsync(input, (PagedAndSortedBase)input);
- List items = query.Items.ToList();
- //将实体列表转换成excel文件流
- IExporter exporter = new ExcelExporter();
- byte[] byteArr = await exporter.ExportAsByteArray(items);
- byteArr.ShouldNotBeNull();
- //将excel文件流保存到服务器端文件系统
- string fileName = string.Format("ERP总成配置_{0}.xlsx", Guid.NewGuid().ToString());
- await _blobContainer.SaveAsync(fileName, byteArr);
-
- ret.Item = fileName;
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "ExportErpAssemblyAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 校验ERP总成:是否版本覆盖
- ///
- ///
- ///
- //[UnitOfWork]
- //[HttpPost]
- //[Route("check")]
- //public virtual async Task CheckErpAssembly(CreateUpdateAssemblyCfgErpDto input)
- //{
- // _logger.LogDebug(_errorMessagePrefix + "CheckErpAssembly 进入");
-
- // ObjectResultDto ret = new ObjectResultDto();
- // if (input.IsCover == true && input.PreviousVersionId != null)
- // {
- // Guid gu = (Guid)input.PreviousVersionId;
- // await _assemblyCfgErpRepository.GetAsync(gu);
- // }
- // else
- // {
- // Guid gu = (Guid)input.PreviousVersionId;
- // await _assemblyCfgErpRepository.GetAsync(gu);
- // }
- // _logger.LogDebug(_errorMessagePrefix + "CheckErpAssembly 完成");
-
- // return ret;
- //}
-
- ///
- /// 系统初始化时使用,去掉重复的ERP总成
- ///
- ///
- ///
- [HttpPost]
- [Route("remove-repeat")]
- public virtual async Task RemoveRepeatErpAssembly(int takeCount)
- {
- _logger.LogDebug(_errorMessagePrefix + "RemoveRepeatErpAssembly 进入");
-
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- await _newJitDapperRepository.ExecuteSqlAsync("update FisAssemblyCfgErp set PreviousVersionId = null", null, true);
-
- //取Erp总成
- List allLst = await _assemblyCfgErpRepository.GetListAsync(true);
-
- List ordLst = allLst.OrderByDescending(itm => itm.ErpAssemblyVersion).ToList();
-
- foreach (AssemblyCfgErp ordItm in ordLst)
- {
- var filterLst = allLst.Where(itm => itm.ErpAssemblyVersion < ordItm.ErpAssemblyVersion);
- foreach (AssemblyCfgErp filterItm in filterLst)
- {
- //if (filterItm.PreviousVersionId != null)
- //{
- // continue;
- //}
- bool isSame = CompareTwoCollection(ordItm.Details, filterItm.Details);
- if (isSame)
- {
- await _assemblyDomainService.UpdatePreviousVersionId(filterItm.Id, ordItm.Id); //更新历史数据PreviousVersionId字段
- }
- }
- }
-
- _logger.LogDebug(_errorMessagePrefix + "RemoveRepeatErpAssembly 完成");
-
- ret.Status = true;
- return ret;
-
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "RemoveRepeatErpAssembly 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 同步ERP总成(从结算系统)(天合版本)
- ///
- ///
- ///
- [HttpPost]
- [Route("sync-erp-assembly")]
- public virtual void SyncErpAssemblyAsync(int takeRecordCount)
- {
- _assemblyDomainService.SyncErpAssemblyAsync(takeRecordCount).GetAwaiter().GetResult();
- RemoveRepeatErpAssembly(takeRecordCount).GetAwaiter().GetResult();
- }
-
- #endregion
-
-
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgPartAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgPartAppService.cs
deleted file mode 100644
index f0f574fb..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgPartAppService.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 总成配置应用服务实现
- ///
- [Route("api/newjit/assembly-cfg-part")]
- [ApiExplorerSettings(GroupName = SwaggerGroupConsts.基础数据)]
- public class AssemblyCfgPartAppService : ApplicationService, IAssemblyCfgPartAppService
- {
- ///
- /// 仓储
- ///
- private readonly IRepository _assemblyCfgPartRepository;
-
- ///
- /// 日志
- ///
- private ILogger _logger;
-
- ///
- /// 错误信息前缀
- ///
- private string _errorMessagePrefix
- {
- get
- {
- return System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name + ".";
- }
- }
-
- ///
- /// 构造函数
- ///
- public AssemblyCfgPartAppService(
- IRepository assemblyCfgPartRepository,
- ILogger logger
- )
- {
- _assemblyCfgPartRepository = assemblyCfgPartRepository;
- _logger = logger;
- }
-
- #region 公共方法
-
- ///
- /// 根据ID获取实体列表
- ///
- /// Erp总成Id
- ///
- [HttpGet]
- [UnitOfWork(false)]
- [Route("list")]
- public virtual async Task> GetPartListAsync(Guid erpAssemblyId)
- {
- _logger.LogDebug(_errorMessagePrefix + "GetListAsync 进入");
- try
- {
- var query = _assemblyCfgPartRepository.Where(itm => itm.Id != Guid.Empty);
- List lst = await query.ToListAsync();
-
- List items =
- ObjectMapper.Map, List>(lst);
-
- return new ListResultDto(items);
- }
- catch (Exception ex)
- {
- string errMsg = _errorMessagePrefix + "GetListAsync 执行出错:" + ex;
- _logger.LogError(errMsg);
- return new ListResultDto(new List());
- }
- }
-
- ///
- /// 按主键获取唯一实体
- ///
- ///
- ///
- [HttpGet]
- [Route("{id}")]//obj/
- public virtual async Task> GetPartAsync(Guid id)
- {
- _logger.LogDebug(_errorMessagePrefix + "GetAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- AssemblyCfgPart sourceObj = await _assemblyCfgPartRepository.GetAsync(id);
- AssemblyCfgPartDto targetObj = ObjectMapper.Map(sourceObj);
- ret.Item = targetObj;
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "GetAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 添加实体
- ///
- ///
- ///
- [HttpPost]
- [UnitOfWork]
- [Route("")]//create
- public virtual async Task> CreatePartAsync(CreateUpdateAssemblyCfgPartDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "CreateAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- AssemblyCfgPart obj = ObjectMapper.Map(input);
- AssemblyCfgPart obj2 = await _assemblyCfgPartRepository.InsertAsync(obj);
- ret.Item = obj2.Id; //返回添加对象的主键
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "CreateAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 修改实体
- ///
- ///
- ///
- ///
- [HttpPut]
- [UnitOfWork]
- [Route("{id}")]//update/
- public virtual async Task UpdatePartAsync(Guid id, CreateUpdateAssemblyCfgPartDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "UpdateAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- AssemblyCfgPart targetObj = await _assemblyCfgPartRepository.GetAsync(id);
- ObjectMapper.Map(input, targetObj);
- await _assemblyCfgPartRepository.UpdateAsync(targetObj);
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "UpdateAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 删除实体
- ///
- ///
- ///
- [UnitOfWork]
- [HttpDelete]
- [Route("{id}")]//delete/
- public virtual async Task DeletePartAsync(string id)
- {
- _logger.LogDebug(_errorMessagePrefix + "DeleteAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- List idLst = ServerHelper.GetGuidListByStr(id);
- await _assemblyCfgPartRepository.DeleteManyAsync(idLst, true);
-
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "DeleteAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
- #endregion
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgVehicleAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgVehicleAppService.cs
deleted file mode 100644
index 71dbb37c..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgVehicleAppService.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Microsoft.AspNetCore.Mvc;
-using WY.NewJit.Common;
-using WY.NewJit.EntityFrameworkCore;
-using Shouldly;
-using Volo.Abp.BlobStoring;
-
-namespace WY.NewJit.MsgBaseData.AssemblyCfgs
-{
- ///
- /// 总成配置应用服务实现
- ///
- [Route("api/newjit/assembly-cfg-vehicle")]
- [ApiExplorerSettings(GroupName = SwaggerGroupConsts.基础数据)]
- public class AssemblyCfgVehicleAppService : ApplicationService, IAssemblyCfgVehicleAppService
- {
- ///
- /// ERP总成仓储
- ///
- private readonly IRepository _assemblyCfgErpRepository;
-
- ///
- /// 结算件仓储
- ///
- private readonly IRepository _assemblyCfgPartRepos;
-
- ///
- /// 日志
- ///
- private ILogger _logger;
-
- ///
- /// Dapper仓储
- ///
- private readonly NewJitDapperRepository _newJitDapperRepository;
-
- ///
- /// BLOB存储
- ///
- private readonly IBlobContainer _blobContainer;
-
- ///
- /// 整车总成配置仓库
- ///
- private readonly IRepository _assemblyCfgVehicleRepository;
-
- ///
- /// Erp总成应用服务
- ///
- private readonly AssemblyCfgErpAppService _assemblyCfgErpAppService;
-
- ///
- /// 错误信息前缀
- ///
- private string _errorMessagePrefix
- {
- get
- {
- return System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name + ".";
- }
- }
-
- ///
- /// 构造函数
- ///
- public AssemblyCfgVehicleAppService(
- IRepository assemblyCfgProductRepository,
- ILogger logger,
- NewJitDapperRepository newJitDapperRepository,
- IRepository assemblyCfgPartRepos,
- IBlobContainer blobContainer,
- IRepository assemblyCfgVehicleRepository,
- AssemblyCfgErpAppService assemblyCfgErpAppService
- )
- {
- _assemblyCfgErpRepository = assemblyCfgProductRepository;
- _logger = logger;
- _newJitDapperRepository = newJitDapperRepository;
- _assemblyCfgPartRepos = assemblyCfgPartRepos;
- _blobContainer = blobContainer;
- _assemblyCfgVehicleRepository = assemblyCfgVehicleRepository;
- _assemblyCfgErpAppService = assemblyCfgErpAppService;
- }
-
- #region 公共方法
-
- ///
- /// 根据Id获取实体列表
- ///
- /// 整车总成ID
- /// Erp总成实体列表
- [HttpGet]
- [UnitOfWork(false)]
- [Route("list")]
- public virtual async Task> GetErpAssemblyListAsync(Guid vehicleAssemblyId)
- {
- _logger.LogDebug(_errorMessagePrefix + "GetErpAssemblyListAsync 进入");
- List ret = new List();
- try
- {
- AssemblyCfgVehicle vobj = await _assemblyCfgVehicleRepository.GetAsync(vehicleAssemblyId);
- if (vobj != null && vobj.AssemblyCfgVehicleChilds != null && vobj.AssemblyCfgVehicleChilds.Count > 0)
- {
- List vehicleChildLst = vobj.AssemblyCfgVehicleChilds;
-
- foreach (AssemblyCfgVehicleChild vehicleChildItem in vehicleChildLst)
- {
- ObjectResultDto erpAssemblyObj = await _assemblyCfgErpAppService.GetErpAssemblyAsync(vehicleChildItem.ErpAssemblyId);
- ret.Add(erpAssemblyObj.Item);
- }
- return ret;
- }
- else
- {
- return new List();
- }
- }
- catch (Exception ex)
- {
- string errMsg = _errorMessagePrefix + "GetErpAssemblyListAsync 执行出错:" + ex;
- _logger.LogError(errMsg);
- return new List();
- }
- }
- #endregion
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/Dics/DicAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/Dics/DicAppService.cs
deleted file mode 100644
index b7a8fce0..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/Dics/DicAppService.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Volo.Abp.Domain.Repositories.Dapper;
-using WY.NewJit.EntityFrameworkCore;
-using Microsoft.AspNetCore.Mvc;
-using WY.NewJit.Common;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 通用字典应用服务实现
- ///
- [Route("api/newjit/dic")]
- [ApiExplorerSettings(GroupName = SwaggerGroupConsts.基础数据)]
- public class DicAppService : ApplicationService, IDicAppService
- {
- ///
- /// 字典领域服务
- ///
- private readonly DicDomainService _dicDomainService;
-
- ///
- /// 日志
- ///
- private ILogger _logger;
-
- ///
- /// 错误信息前缀
- ///
- private string _errorMessagePrefix
- {
- get
- {
- return System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name + ".";
- }
- }
-
- ///
- /// 构造函数
- ///
- public DicAppService(
- DicDomainService dicDomainService,
- ILogger logger
- )
- {
- _dicDomainService = dicDomainService;
- _logger = logger;
- }
-
-
- #region 公共方法
-
- ///
- /// 根据字典类型名称取通用字典信息列表
- ///
- /// 字典类型名称
- /// 返回符合条件字典信息列表
- [HttpGet]
- [UnitOfWork(false)]
- [Route("list")]
- public virtual async Task> GetDicListAsync(string dicTypeName)
- {
- _logger.LogDebug(_errorMessagePrefix + "GetDicListAsync 进入");
- try
- {
- List lst = _dicDomainService.GetDicItems(dicTypeName);
-
- List items =
- ObjectMapper.Map, List>(lst);
-
- return new ListResultDto(items);
- }
- catch (Exception ex)
- {
- string errMsg = _errorMessagePrefix + "GetDicListAsync 执行出错:" + ex;
- _logger.LogError(errMsg);
- return new ListResultDto(new List());
- }
- }
- #endregion
-
- }
-}
diff --git a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/ExcludePartCfgs/ExcludePartCfgAppService.cs b/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/ExcludePartCfgs/ExcludePartCfgAppService.cs
deleted file mode 100644
index 9c6130a2..00000000
--- a/code/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/ExcludePartCfgs/ExcludePartCfgAppService.cs
+++ /dev/null
@@ -1,370 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using WY.NewJit.EntityFrameworkCore;
-using WY.NewJit.Common;
-using Shouldly;
-using Volo.Abp.BlobStoring;
-
-namespace WY.NewJit.MsgBaseData
-{
- ///
- /// 排除零件配置服务实现
- ///
- [Route("api/newjit/exclude-part-cfg")]
- [ApiExplorerSettings(GroupName = SwaggerGroupConsts.基础数据)]
- public class ExcludePartCfgAppService : ApplicationService, IExcludePartCfgAppService
- {
- ///
- /// 仓储
- ///
- private readonly IRepository _excludePartCfgRepository;
-
-
- ///
- /// 日志
- ///
- private ILogger _logger;
-
- ///
- /// 通用字典领域服务
- ///
- private DicDomainService _dicDomainSrv;
-
- ///
- /// 零件仓储
- ///
- private readonly IRepository _partCfgRepository;
-
- ///
- /// Dapper仓储
- ///
- private readonly NewJitDapperRepository _newJitDapperRepository;
- ///
- /// BLOB存储
- ///
- private readonly IBlobContainer _blobContainer;
-
- ///
- /// 错误信息前缀
- ///
- private string _errorMessagePrefix
- {
- get
- {
- return System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name + ".";
- }
- }
-
- ///
- /// 构造函数
- ///
- public ExcludePartCfgAppService(
- IRepository excludePartCfgRepository,
- ILogger logger,
- DicDomainService dicDomainSrv,
- IRepository partCfgRepository,
- NewJitDapperRepository newJitDapperRepository,
- IBlobContainer blobContainer
- )
- {
- _excludePartCfgRepository = excludePartCfgRepository;
- _logger = logger;
- _dicDomainSrv = dicDomainSrv;
- _partCfgRepository = partCfgRepository;
- _newJitDapperRepository = newJitDapperRepository;
- _blobContainer = blobContainer;
- }
-
- #region 私有方法
- ///
- /// 根据筛选条件获取实体列表
- ///
- private async Task> QueryByConditionAsync(QueryExcludePartCfgDto input, PagedAndSortedBase page)
- {
- PagedResultDto ret = new PagedResultDto();
-
- string sqlCnt = @"
-with d as
-(
- select * from FisDicItem where DicTypeCode in (select DicTypeCode from FisDicType where DicTypeName = '车型')
-)
-select * from
-(
- select count(*) as cnt
- from FisExcludePartCfg e
- left join d on e.VehicleModelCode = d.DicItemCode
- left join FisPartCfg p on e.PartCode = p.PartCode
- where e.IsDeleted <> 1 {0}
-) t
-";
- string sql = @"
-with d as
-(
- select * from FisDicItem where DicTypeCode in (select DicTypeCode from FisDicType where DicTypeName = '车型')
-)
-select * from
-(
- select ROW_NUMBER() OVER({3}) as row_number,
- e.*, d.DicItemName as VehicleModelName, p.PartName
- from FisExcludePartCfg e
- left join d on e.VehicleModelCode = d.DicItemCode
- left join FisPartCfg p on e.PartCode = p.PartCode
- where e.IsDeleted <> 1 {0}
-) t where row_number between {1} and {2}
-";
- string where = "";
- if (!string.IsNullOrEmpty(input.VehicleModelCode))
- {
- where += string.Format(" and VehicleModelCode like '%{0}%'", input.VehicleModelCode);
- }
- if (!string.IsNullOrEmpty(input.PartCode))
- {
- where += string.Format(" and e.PartCode like '%{0}%'", input.PartCode);
- }
- #region 排序
- string order = "order by e.VehicleModelCode, e.PartCode";
- if (string.IsNullOrEmpty(page.Sorting) == false)
- {
- string[] arr = page.Sorting.Split(" ");
- if (arr.Length == 2)
- {
- string sortField = "";
- string sortType = "";
- if (arr[0].EquaIgnoreCase("PartCode"))
- {
- sortField = "e." + arr[0];
- }
- else
- {
- sortField = arr[0];
- }
- if (arr[1] == "ascending")
- {
- sortType = "asc";
- }
- else if (arr[1] == "descending")
- {
- sortType = "desc";
- }
- order = $"order by {sortField} {sortType}";
- }
- }
- #endregion
- sqlCnt = string.Format(sqlCnt, where);
- ret.TotalCount = await _newJitDapperRepository.GetSingleBySqlAsync(sqlCnt);
-
- //计算分页
- int fromRec = page.SkipCount + 1;
- int ToRec = page.SkipCount + page.MaxResultCount;
- sql = string.Format(sql, where, fromRec, ToRec, order);
- var lst = await _newJitDapperRepository.GetListBySqlAsync(sql);
- ret.Items = lst;
- return ret;
- }
- #endregion
-
- #region 公共方法
-
- ///
- /// 根据筛选条件获取分页实体列表
- ///
- /// 输入查询条件
- /// 输入分页条件
- /// 返回符合条件的排序分页列表
- [HttpGet]
- [UnitOfWork(false)]
- [Route("list")]
- public virtual async Task> GetListAsync(QueryExcludePartCfgDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "GetListAsync 进入");
- try
- {
- PagedResultDto ret = await QueryByConditionAsync(input, (PagedAndSortedBase)input);
- return ret;
- }
- catch (Exception ex)
- {
- string errMsg = _errorMessagePrefix + "GetListAsync 执行出错:" + ex;
- _logger.LogError(errMsg);
- return new PagedResultDto(0, new List());
- }
- }
-
- ///
- /// 按主键获取唯一实体
- ///
- /// 主键
- /// 实体信息
- [HttpGet]
- [Route("{id}")]//obj/
- public virtual async Task> GetAsync(Guid id)
- {
- _logger.LogDebug(_errorMessagePrefix + "GetAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- ExcludePartCfg sourceObj = await _excludePartCfgRepository.GetAsync(id);
- ExcludePartCfgDto targetObj = ObjectMapper.Map(sourceObj);
- ret.Item = targetObj;
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "GetAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 添加实体
- ///
- /// 添加内容
- /// 执行成功返回真
- [HttpPost]
- [UnitOfWork]
- [Route("")]//create
- public virtual async Task> CreateAsync(CreateUpdateExcludePartCfgDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "CreateAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- ExcludePartCfg obj = ObjectMapper.Map(input);
- ExcludePartCfg obj2 = await _excludePartCfgRepository.InsertAsync(obj);
- ret.Item = obj2.Id; //返回添加对象的主键
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "CreateAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///
- /// 修改实体
- ///
- /// 更新主键
- /// 修改内容
- /// 执行成功返回真
- [HttpPut]
- [UnitOfWork]
- [Route("{id}")]//update/
- public virtual async Task UpdateAsync(Guid id, CreateUpdateExcludePartCfgDto input)
- {
- _logger.LogDebug(_errorMessagePrefix + "UpdateAsync 进入");
- ObjectResultDto ret = new ObjectResultDto();
- try
- {
- ExcludePartCfg targetObj = await _excludePartCfgRepository.GetAsync(id);
- ObjectMapper.Map(input, targetObj);
- await _excludePartCfgRepository.UpdateAsync(targetObj);
- return ret;
- }
- catch (Exception ex)
- {
- ret.Status = false;
- ret.Message = _errorMessagePrefix + "UpdateAsync 执行出错:" + ex;
- _logger.LogError(ret.Message);
- return ret;
- }
- }
-
- ///