diff --git a/code/WebApp/vanilla/.vscode/settings.json b/code/WebApp/vanilla/.vscode/settings.json deleted file mode 100644 index b797f126..00000000 --- a/code/WebApp/vanilla/.vscode/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "search.exclude": { - "lib": true - }, - "editor.formatOnSave": true, - "liveServer.settings.port": 9527 -} diff --git a/code/WebApp/vanilla/resize-detector/index.js b/code/WebApp/vanilla/resize-detector/index.js deleted file mode 100644 index 8a112ae5..00000000 --- a/code/WebApp/vanilla/resize-detector/index.js +++ /dev/null @@ -1,314 +0,0 @@ -var raf = null; -function requestAnimationFrame (callback) { - if (!raf) { - raf = ( - window.requestAnimationFrame || - window.webkitRequestAnimationFrame || - window.mozRequestAnimationFrame || - function (callback) { - return setTimeout(callback, 16) - } - ).bind(window); - } - return raf(callback) -} - -var caf = null; -function cancelAnimationFrame (id) { - if (!caf) { - caf = ( - window.cancelAnimationFrame || - window.webkitCancelAnimationFrame || - window.mozCancelAnimationFrame || - function (id) { - clearTimeout(id); - } - ).bind(window); - } - - caf(id); -} - -function createStyles (styleText) { - var style = document.createElement('style'); - - if (style.styleSheet) { - style.styleSheet.cssText = styleText; - } else { - style.appendChild(document.createTextNode(styleText)); - } - (document.querySelector('head') || document.body).appendChild(style); - return style -} - -function createElement (tagName, props) { - if ( props === void 0 ) props = {}; - - var elem = document.createElement(tagName); - Object.keys(props).forEach(function (key) { - elem[key] = props[key]; - }); - return elem -} - -function getComputedStyle (elem, prop, pseudo) { - // for older versions of Firefox, `getComputedStyle` required - // the second argument and may return `null` for some elements - // when `display: none` - var computedStyle = window.getComputedStyle(elem, pseudo || null) || { - display: 'none' - }; - - return computedStyle[prop] -} - -function getRenderInfo (elem) { - if (!document.documentElement.contains(elem)) { - return { - detached: true, - rendered: false - } - } - - var current = elem; - while (current !== document) { - if (getComputedStyle(current, 'display') === 'none') { - return { - detached: false, - rendered: false - } - } - current = current.parentNode; - } - - return { - detached: false, - rendered: true - } -} - -var css_248z = ".resize-triggers{visibility:hidden;opacity:0;pointer-events:none}.resize-contract-trigger,.resize-contract-trigger:before,.resize-expand-trigger,.resize-triggers{content:\"\";position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}.resize-contract-trigger,.resize-expand-trigger{background:#eee;overflow:auto}.resize-contract-trigger:before{width:200%;height:200%}"; - -var total = 0; -var style = null; - -function addListener (elem, callback) { - if (!elem.__resize_mutation_handler__) { - elem.__resize_mutation_handler__ = handleMutation.bind(elem); - } - - var listeners = elem.__resize_listeners__; - - if (!listeners) { - elem.__resize_listeners__ = []; - if (window.ResizeObserver) { - var offsetWidth = elem.offsetWidth; - var offsetHeight = elem.offsetHeight; - var ro = new ResizeObserver(function () { - if (!elem.__resize_observer_triggered__) { - elem.__resize_observer_triggered__ = true; - if (elem.offsetWidth === offsetWidth && elem.offsetHeight === offsetHeight) { - return - } - } - runCallbacks(elem); - }); - - // initially display none won't trigger ResizeObserver callback - var ref = getRenderInfo(elem); - var detached = ref.detached; - var rendered = ref.rendered; - elem.__resize_observer_triggered__ = detached === false && rendered === false; - elem.__resize_observer__ = ro; - ro.observe(elem); - } else if (elem.attachEvent && elem.addEventListener) { - // targeting IE9/10 - elem.__resize_legacy_resize_handler__ = function handleLegacyResize () { - runCallbacks(elem); - }; - elem.attachEvent('onresize', elem.__resize_legacy_resize_handler__); - document.addEventListener('DOMSubtreeModified', elem.__resize_mutation_handler__); - } else { - if (!total) { - style = createStyles(css_248z); - } - initTriggers(elem); - - elem.__resize_rendered__ = getRenderInfo(elem).rendered; - if (window.MutationObserver) { - var mo = new MutationObserver(elem.__resize_mutation_handler__); - mo.observe(document, { - attributes: true, - childList: true, - characterData: true, - subtree: true - }); - elem.__resize_mutation_observer__ = mo; - } - } - } - - elem.__resize_listeners__.push(callback); - total++; -} - -function removeListener (elem, callback) { - var listeners = elem.__resize_listeners__; - if (!listeners) { - return - } - - if (callback) { - listeners.splice(listeners.indexOf(callback), 1); - } - - // no listeners exist, or removing all listeners - if (!listeners.length || !callback) { - // targeting IE9/10 - if (elem.detachEvent && elem.removeEventListener) { - elem.detachEvent('onresize', elem.__resize_legacy_resize_handler__); - document.removeEventListener('DOMSubtreeModified', elem.__resize_mutation_handler__); - return - } - - if (elem.__resize_observer__) { - elem.__resize_observer__.unobserve(elem); - elem.__resize_observer__.disconnect(); - elem.__resize_observer__ = null; - } else { - if (elem.__resize_mutation_observer__) { - elem.__resize_mutation_observer__.disconnect(); - elem.__resize_mutation_observer__ = null; - } - elem.removeEventListener('scroll', handleScroll); - elem.removeChild(elem.__resize_triggers__.triggers); - elem.__resize_triggers__ = null; - } - elem.__resize_listeners__ = null; - } - - if (!--total && style) { - style.parentNode.removeChild(style); - } -} - -function getUpdatedSize (elem) { - var ref = elem.__resize_last__; - var width = ref.width; - var height = ref.height; - var offsetWidth = elem.offsetWidth; - var offsetHeight = elem.offsetHeight; - if (offsetWidth !== width || offsetHeight !== height) { - return { - width: offsetWidth, - height: offsetHeight - } - } - return null -} - -function handleMutation () { - // `this` denotes the scrolling element - var ref = getRenderInfo(this); - var rendered = ref.rendered; - var detached = ref.detached; - if (rendered !== this.__resize_rendered__) { - if (!detached && this.__resize_triggers__) { - resetTriggers(this); - this.addEventListener('scroll', handleScroll, true); - } - this.__resize_rendered__ = rendered; - runCallbacks(this); - } -} - -function handleScroll () { - var this$1 = this; - - // `this` denotes the scrolling element - resetTriggers(this); - if (this.__resize_raf__) { - cancelAnimationFrame(this.__resize_raf__); - } - this.__resize_raf__ = requestAnimationFrame(function () { - var updated = getUpdatedSize(this$1); - if (updated) { - this$1.__resize_last__ = updated; - runCallbacks(this$1); - } - }); -} - -function runCallbacks (elem) { - if (!elem || !elem.__resize_listeners__) { - return - } - elem.__resize_listeners__.forEach(function (callback) { - callback.call(elem, elem); - }); -} - -function initTriggers (elem) { - var position = getComputedStyle(elem, 'position'); - if (!position || position === 'static') { - elem.style.position = 'relative'; - } - - elem.__resize_old_position__ = position; - elem.__resize_last__ = {}; - - var triggers = createElement('div', { - className: 'resize-triggers' - }); - var expand = createElement('div', { - className: 'resize-expand-trigger' - }); - var expandChild = createElement('div'); - var contract = createElement('div', { - className: 'resize-contract-trigger' - }); - expand.appendChild(expandChild); - triggers.appendChild(expand); - triggers.appendChild(contract); - elem.appendChild(triggers); - - elem.__resize_triggers__ = { - triggers: triggers, - expand: expand, - expandChild: expandChild, - contract: contract - }; - - resetTriggers(elem); - elem.addEventListener('scroll', handleScroll, true); - - elem.__resize_last__ = { - width: elem.offsetWidth, - height: elem.offsetHeight - }; -} - -function resetTriggers (elem) { - var ref = elem.__resize_triggers__; - var expand = ref.expand; - var expandChild = ref.expandChild; - var contract = ref.contract; - - // batch read - var csw = contract.scrollWidth; - var csh = contract.scrollHeight; - var eow = expand.offsetWidth; - var eoh = expand.offsetHeight; - var esw = expand.scrollWidth; - var esh = expand.scrollHeight; - - // batch write - contract.scrollLeft = csw; - contract.scrollTop = csh; - expandChild.style.width = eow + 1 + 'px'; - expandChild.style.height = eoh + 1 + 'px'; - expand.scrollLeft = esw; - expand.scrollTop = esh; -} - -export { addListener, removeListener }; diff --git a/code/WebApp/vanilla/router/routes.js b/code/WebApp/vanilla/router/routes.js deleted file mode 100644 index 6a2777dc..00000000 --- a/code/WebApp/vanilla/router/routes.js +++ /dev/null @@ -1,234 +0,0 @@ -export default [ - { - path: "home", - meta: { - type: "page", - title: "首页", - icon: "home", - public: true, - }, - }, - { - path: "base-data", - meta: { - type: "group", - title: "基础数据", - icon: "folder", - }, - children: [ - { - path: "user", - meta: { - type: "page", - title: "用户管理", - icon: "file", - permission: "AbpIdentity.Users", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "create", - meta: { - type: "button", - title: "新建", - icon: "file", - permission: "AbpIdentity.Users.Create", - isTop: true, - }, - }, - { - path: "update", - meta: { - type: "button", - title: "编辑", - icon: "file", - htmlClass: "el-button--primary", - permission: "AbpIdentity.Users.Update", - }, - }, - { - path: "delete", - meta: { - type: "button", - title: "删除", - icon: "file", - permission: "AbpIdentity.Users.Delete", - disabled: "o=>o.userName==='admin'", - }, - }, - { - path: "%s/reset-password", - meta: { - type: "button", - title: "重置密码", - icon: "file", - permission: "reset-password?", - method: "PUT", - }, - }, - ], - }, - // { - // path: "role", - // meta: { - // type: "page", - // title: "角色管理", - // icon: "file", - // permission: "AbpIdentity.Users", - // }, - // children: [ - // { - // path: "create", - // meta: { - // type: "button", - // title: "新建", - // icon: "file", - // permission: "AbpIdentity.Users.Create", - // isTop: true, - // }, - // }, - // { - // path: "update", - // meta: { - // type: "button", - // title: "编辑", - // icon: "file", - // htmlClass: "el-button--primary", - // permission: "AbpIdentity.Users.Update", - // disabled: `(o) => o.isStatic`, - // }, - // }, - // { - // path: "delete", - // meta: { - // type: "button", - // title: "删除", - // icon: "file", - // permission: "AbpIdentity.Users.Delete", - // disabled: `(o) => o.isStatic`, - // }, - // }, - // ], - // }, - { - path: "centralized-control", - meta: { - type: "page", - title: "期间设置", - icon: "file", - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "create", - meta: { - type: "button", - title: "新建", - icon: "file", - isTop: true, - }, - }, - { - path: "open-version", - meta: { - type: "button", - title: "启用", - icon: "file", - isTop: true, - }, - }, - { - path: "closed-version", - meta: { - type: "button", - title: "停用", - icon: "file", - isTop: true, - }, - }, - { - path: "delete", - meta: { - type: "button", - title: "删除", - icon: "file", - isTop: true, - }, - }, - ], - }, - }, - { - path: "code-setting", - meta: { - type: "page", - title: "通用代码", - icon: "file", - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "create", - meta: { - type: "button", - title: "新建", - icon: "file", - isTop: true, - }, - }, - { - path: "delete", - meta: { - type: "button", - title: "删除", - icon: "file", - isTop: true, - }, - }, - { - path: "import", - meta: { - type: "button", - title: "导入", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - }, - ], - }, -]; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitignore b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitignore index 4f109b79..3e06d4d3 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitignore +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitignore @@ -1,2 +1 @@ -wwwroot/files/ -appsettings.Development.json \ No newline at end of file +appsettings.Development.json diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Controllers/HomeController.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Controllers/HomeController.cs index c0c5eb77..98f7010f 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Controllers/HomeController.cs +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Controllers/HomeController.cs @@ -5,9 +5,10 @@ namespace Win.Sfs.SettleAccount.Controllers { public class HomeController : AbpController { + [ResponseCache(NoStore = true)] public ActionResult Index() { - return Redirect("~/swagger"); + return File("~/index.html", "text/html"); } } } diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs index 8daf20ee..3f07a301 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Server.Kestrel.Core; +using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using System.Text.RegularExpressions; @@ -14,7 +15,7 @@ namespace Win.Sfs.SettleAccount public void ConfigureServices(IServiceCollection services) { services.AddRouting(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer)); - services.AddMvc(options=>options.Conventions.Add(new RouteTokenTransformerConvention(new SlugifyParameterTransformer()))); + services.AddMvc(options => options.Conventions.Add(new RouteTokenTransformerConvention(new SlugifyParameterTransformer()))); services.AddApplication(); services.Configure(options => { @@ -31,6 +32,9 @@ namespace Win.Sfs.SettleAccount public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { + var contentTypeProvider = new FileExtensionContentTypeProvider(); + contentTypeProvider.Mappings.Add(".mjs", "text/javascript"); + app.UseStaticFiles(new StaticFileOptions { ContentTypeProvider = contentTypeProvider }); app.InitializeApplication(); } diff --git a/code/WebApp/vanilla/.eslintrc.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.eslintrc.json similarity index 100% rename from code/WebApp/vanilla/.eslintrc.json rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.eslintrc.json diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore new file mode 100644 index 00000000..816f02db --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore @@ -0,0 +1,3 @@ +files/ +btsecsummary/ +secsummary/ \ No newline at end of file diff --git a/code/WebApp/vanilla/.prettierrc.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.prettierrc.json similarity index 100% rename from code/WebApp/vanilla/.prettierrc.json rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.prettierrc.json diff --git a/code/WebApp/vanilla/.vscode/extensions.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.vscode/extensions.json similarity index 100% rename from code/WebApp/vanilla/.vscode/extensions.json rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.vscode/extensions.json diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.vscode/settings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.vscode/settings.json new file mode 100644 index 00000000..5beb57aa --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.vscode/settings.json @@ -0,0 +1,9 @@ +{ + "editor.formatOnSave": true, + "liveServer.settings.port": 9527, + "explorer.excludeGitIgnore": true, + "search.followSymlinks": false, + "search.exclude": { + "lib/**": true + } +} diff --git a/code/WebApp/vanilla/api/site.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js similarity index 100% rename from code/WebApp/vanilla/api/site.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js diff --git a/code/WebApp/vanilla/api/user.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/user.js similarity index 100% rename from code/WebApp/vanilla/api/user.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/user.js diff --git a/code/WebApp/vanilla/app.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/app.js similarity index 100% rename from code/WebApp/vanilla/app.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/app.js diff --git a/code/WebApp/vanilla/assets/docs/test.md b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/docs/test.md similarity index 100% rename from code/WebApp/vanilla/assets/docs/test.md rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/docs/test.md diff --git a/code/WebApp/vanilla/assets/icons/create.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/create.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/create.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/create.svg diff --git a/code/WebApp/vanilla/assets/icons/delete.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/delete.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/delete.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/delete.svg diff --git a/code/WebApp/vanilla/assets/icons/details.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/details.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/details.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/details.svg diff --git a/code/WebApp/vanilla/assets/icons/export.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/export.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/export.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/export.svg diff --git a/code/WebApp/vanilla/assets/icons/file.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/file.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/file.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/file.svg diff --git a/code/WebApp/vanilla/assets/icons/fold.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/fold.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/fold.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/fold.svg diff --git a/code/WebApp/vanilla/assets/icons/folder.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/folder.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/folder.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/folder.svg diff --git a/code/WebApp/vanilla/assets/icons/fullscreen-exit.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/fullscreen-exit.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/fullscreen-exit.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/fullscreen-exit.svg diff --git a/code/WebApp/vanilla/assets/icons/fullscreen.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/fullscreen.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/fullscreen.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/fullscreen.svg diff --git a/code/WebApp/vanilla/assets/icons/home.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/home.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/home.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/home.svg diff --git a/code/WebApp/vanilla/assets/icons/import.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/import.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/import.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/import.svg diff --git a/code/WebApp/vanilla/assets/icons/index.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/index.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/index.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/index.svg diff --git a/code/WebApp/vanilla/assets/icons/lang.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/lang.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/lang.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/lang.svg diff --git a/code/WebApp/vanilla/assets/icons/loading.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/loading.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/loading.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/loading.svg diff --git a/code/WebApp/vanilla/assets/icons/unfold.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/unfold.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/unfold.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/unfold.svg diff --git a/code/WebApp/vanilla/assets/icons/update.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/update.svg similarity index 100% rename from code/WebApp/vanilla/assets/icons/update.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/icons/update.svg diff --git a/code/WebApp/vanilla/assets/logo.svg b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/logo.svg similarity index 100% rename from code/WebApp/vanilla/assets/logo.svg rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/logo.svg diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip new file mode 100644 index 00000000..133bd501 Binary files /dev/null and b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip differ diff --git a/code/WebApp/vanilla/components/chart/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/chart/index.js similarity index 100% rename from code/WebApp/vanilla/components/chart/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/chart/index.js diff --git a/code/WebApp/vanilla/components/form/form-input.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js similarity index 100% rename from code/WebApp/vanilla/components/form/form-input.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js diff --git a/code/WebApp/vanilla/components/form/form-item.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-item.js similarity index 100% rename from code/WebApp/vanilla/components/form/form-item.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-item.js diff --git a/code/WebApp/vanilla/components/form/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/index.js similarity index 100% rename from code/WebApp/vanilla/components/form/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/index.js diff --git a/code/WebApp/vanilla/components/icon/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/icon/index.js similarity index 100% rename from code/WebApp/vanilla/components/icon/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/icon/index.js diff --git a/code/WebApp/vanilla/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js similarity index 100% rename from code/WebApp/vanilla/components/list/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js diff --git a/code/WebApp/vanilla/components/markdown/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/markdown/index.js similarity index 100% rename from code/WebApp/vanilla/components/markdown/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/markdown/index.js diff --git a/code/WebApp/vanilla/config/settings.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/config/settings.js similarity index 69% rename from code/WebApp/vanilla/config/settings.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/config/settings.js index 1a24e62a..f1273d22 100644 --- a/code/WebApp/vanilla/config/settings.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/config/settings.js @@ -1,5 +1,5 @@ export default { enableLocale: false, //baseURL: "http://dev.ccwin-in.com:10582/api", - baseURL: "http://localhost:44378/api", + baseURL: "/api", }; diff --git a/code/WebApp/vanilla/favicon.ico b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/favicon.ico similarity index 100% rename from code/WebApp/vanilla/favicon.ico rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/favicon.ico diff --git a/code/WebApp/vanilla/index.html b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/index.html similarity index 100% rename from code/WebApp/vanilla/index.html rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/index.html diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/jsconfig.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/jsconfig.json new file mode 100644 index 00000000..91d01b07 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/jsconfig.json @@ -0,0 +1,3 @@ +{ + "exclude": ["node_modules", "files", "btsecsummary", "secsummary"] +} diff --git a/code/WebApp/vanilla/layouts/footer.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/footer.js similarity index 100% rename from code/WebApp/vanilla/layouts/footer.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/footer.js diff --git a/code/WebApp/vanilla/layouts/header.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/header.js similarity index 100% rename from code/WebApp/vanilla/layouts/header.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/header.js diff --git a/code/WebApp/vanilla/layouts/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/index.js similarity index 100% rename from code/WebApp/vanilla/layouts/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/index.js diff --git a/code/WebApp/vanilla/layouts/locale.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/locale.js similarity index 100% rename from code/WebApp/vanilla/layouts/locale.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/locale.js diff --git a/code/WebApp/vanilla/layouts/logo.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/logo.js similarity index 100% rename from code/WebApp/vanilla/layouts/logo.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/logo.js diff --git a/code/WebApp/vanilla/layouts/menu-item.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/menu-item.js similarity index 100% rename from code/WebApp/vanilla/layouts/menu-item.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/menu-item.js diff --git a/code/WebApp/vanilla/layouts/menu.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/menu.js similarity index 100% rename from code/WebApp/vanilla/layouts/menu.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/menu.js diff --git a/code/WebApp/vanilla/layouts/tabs.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/tabs.js similarity index 100% rename from code/WebApp/vanilla/layouts/tabs.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/layouts/tabs.js diff --git a/code/WebApp/vanilla/lib/@element-plus/icons-vue/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@element-plus/icons-vue/index.js similarity index 100% rename from code/WebApp/vanilla/lib/@element-plus/icons-vue/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@element-plus/icons-vue/index.js diff --git a/code/WebApp/vanilla/lib/@microsoft/signalr/signalr.esm.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@microsoft/signalr/signalr.esm.js similarity index 100% rename from code/WebApp/vanilla/lib/@microsoft/signalr/signalr.esm.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@microsoft/signalr/signalr.esm.js diff --git a/code/WebApp/vanilla/lib/@vue-office/excel/index.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vue-office/excel/index.css similarity index 100% rename from code/WebApp/vanilla/lib/@vue-office/excel/index.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vue-office/excel/index.css diff --git a/code/WebApp/vanilla/lib/@vue-office/excel/vue-office-excel.mjs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vue-office/excel/vue-office-excel.mjs similarity index 100% rename from code/WebApp/vanilla/lib/@vue-office/excel/vue-office-excel.mjs rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vue-office/excel/vue-office-excel.mjs diff --git a/code/WebApp/vanilla/lib/@vue/devtools-api/shim.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vue/devtools-api/shim.js similarity index 100% rename from code/WebApp/vanilla/lib/@vue/devtools-api/shim.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vue/devtools-api/shim.js diff --git a/code/WebApp/vanilla/lib/@vueuse/core/index.mjs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vueuse/core/index.mjs similarity index 100% rename from code/WebApp/vanilla/lib/@vueuse/core/index.mjs rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vueuse/core/index.mjs diff --git a/code/WebApp/vanilla/lib/@vueuse/shared/index.mjs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vueuse/shared/index.mjs similarity index 100% rename from code/WebApp/vanilla/lib/@vueuse/shared/index.mjs rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/@vueuse/shared/index.mjs diff --git a/code/WebApp/vanilla/lib/async-validator/index.min.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/async-validator/index.min.js similarity index 100% rename from code/WebApp/vanilla/lib/async-validator/index.min.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/async-validator/index.min.js diff --git a/code/WebApp/vanilla/lib/better-mock/mock.browser.esm.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/better-mock/mock.browser.esm.js similarity index 100% rename from code/WebApp/vanilla/lib/better-mock/mock.browser.esm.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/better-mock/mock.browser.esm.js diff --git a/code/WebApp/vanilla/lib/detect-it/detect-it.esm.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/detect-it/detect-it.esm.js similarity index 100% rename from code/WebApp/vanilla/lib/detect-it/detect-it.esm.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/detect-it/detect-it.esm.js diff --git a/code/WebApp/vanilla/lib/echarts/echarts.esm.min.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/echarts/echarts.esm.min.js similarity index 100% rename from code/WebApp/vanilla/lib/echarts/echarts.esm.min.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/echarts/echarts.esm.min.js diff --git a/code/WebApp/vanilla/lib/element-plus/index.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/index.css similarity index 100% rename from code/WebApp/vanilla/lib/element-plus/index.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/index.css diff --git a/code/WebApp/vanilla/lib/element-plus/index.full.min.mjs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/index.full.min.mjs similarity index 100% rename from code/WebApp/vanilla/lib/element-plus/index.full.min.mjs rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/index.full.min.mjs diff --git a/code/WebApp/vanilla/lib/element-plus/index.full.mjs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/index.full.mjs similarity index 100% rename from code/WebApp/vanilla/lib/element-plus/index.full.mjs rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/index.full.mjs diff --git a/code/WebApp/vanilla/lib/element-plus/locale/en.min.mjs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/locale/en.min.mjs similarity index 100% rename from code/WebApp/vanilla/lib/element-plus/locale/en.min.mjs rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/locale/en.min.mjs diff --git a/code/WebApp/vanilla/lib/element-plus/locale/zh-cn.min.mjs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/locale/zh-cn.min.mjs similarity index 100% rename from code/WebApp/vanilla/lib/element-plus/locale/zh-cn.min.mjs rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/locale/zh-cn.min.mjs diff --git a/code/WebApp/vanilla/lib/element-plus/theme-chalk/dark/css-vars.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/theme-chalk/dark/css-vars.css similarity index 100% rename from code/WebApp/vanilla/lib/element-plus/theme-chalk/dark/css-vars.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/element-plus/theme-chalk/dark/css-vars.css diff --git a/code/WebApp/vanilla/lib/github-markdown-css/github-markdown.min.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/github-markdown-css/github-markdown.min.css similarity index 100% rename from code/WebApp/vanilla/lib/github-markdown-css/github-markdown.min.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/github-markdown-css/github-markdown.min.css diff --git a/code/WebApp/vanilla/lib/highlightjs/highlight.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/highlightjs/highlight.css similarity index 100% rename from code/WebApp/vanilla/lib/highlightjs/highlight.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/highlightjs/highlight.css diff --git a/code/WebApp/vanilla/lib/highlightjs/highlight.min.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/highlightjs/highlight.min.js similarity index 100% rename from code/WebApp/vanilla/lib/highlightjs/highlight.min.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/highlightjs/highlight.min.js diff --git a/code/WebApp/vanilla/lib/jwt-decode/jwt-decode.esm.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/jwt-decode/jwt-decode.esm.js similarity index 100% rename from code/WebApp/vanilla/lib/jwt-decode/jwt-decode.esm.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/jwt-decode/jwt-decode.esm.js diff --git a/code/WebApp/vanilla/lib/linq/linq.min.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/linq/linq.min.js similarity index 100% rename from code/WebApp/vanilla/lib/linq/linq.min.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/linq/linq.min.js diff --git a/code/WebApp/vanilla/lib/lodash/lodash.esm.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/lodash/lodash.esm.js similarity index 100% rename from code/WebApp/vanilla/lib/lodash/lodash.esm.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/lodash/lodash.esm.js diff --git a/code/WebApp/vanilla/lib/marked/marked.esm.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/marked/marked.esm.js similarity index 100% rename from code/WebApp/vanilla/lib/marked/marked.esm.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/marked/marked.esm.js diff --git a/code/WebApp/vanilla/lib/mermaid/mermaid.esm.min.mjs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/mermaid/mermaid.esm.min.mjs similarity index 100% rename from code/WebApp/vanilla/lib/mermaid/mermaid.esm.min.mjs rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/mermaid/mermaid.esm.min.mjs diff --git a/code/WebApp/vanilla/lib/nprogress/nprogress.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/nprogress/nprogress.css similarity index 100% rename from code/WebApp/vanilla/lib/nprogress/nprogress.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/nprogress/nprogress.css diff --git a/code/WebApp/vanilla/lib/nprogress/nprogress.vite-esm.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/nprogress/nprogress.vite-esm.js similarity index 100% rename from code/WebApp/vanilla/lib/nprogress/nprogress.vite-esm.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/nprogress/nprogress.vite-esm.js diff --git a/code/WebApp/vanilla/lib/pinia/pinia.esm-browser.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/pinia/pinia.esm-browser.js similarity index 100% rename from code/WebApp/vanilla/lib/pinia/pinia.esm-browser.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/pinia/pinia.esm-browser.js diff --git a/code/WebApp/vanilla/lib/pubsub-js/pubsub.esm.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/pubsub-js/pubsub.esm.js similarity index 100% rename from code/WebApp/vanilla/lib/pubsub-js/pubsub.esm.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/pubsub-js/pubsub.esm.js diff --git a/code/WebApp/vanilla/lib/qs/shim.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/qs/shim.js similarity index 100% rename from code/WebApp/vanilla/lib/qs/shim.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/qs/shim.js diff --git a/code/WebApp/vanilla/lib/resize-detector/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/resize-detector/index.js similarity index 100% rename from code/WebApp/vanilla/lib/resize-detector/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/resize-detector/index.js diff --git a/code/WebApp/vanilla/lib/tailwindcss/tailwind.min.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/tailwindcss/tailwind.min.css similarity index 100% rename from code/WebApp/vanilla/lib/tailwindcss/tailwind.min.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/tailwindcss/tailwind.min.css diff --git a/code/WebApp/vanilla/lib/vue-demi/shim.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue-demi/shim.js similarity index 100% rename from code/WebApp/vanilla/lib/vue-demi/shim.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue-demi/shim.js diff --git a/code/WebApp/vanilla/lib/vue-echarts/index.esm.min.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue-echarts/index.esm.min.js similarity index 100% rename from code/WebApp/vanilla/lib/vue-echarts/index.esm.min.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue-echarts/index.esm.min.js diff --git a/code/WebApp/vanilla/lib/vue-i18n/vue-i18n.esm-browser.prod.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue-i18n/vue-i18n.esm-browser.prod.js similarity index 100% rename from code/WebApp/vanilla/lib/vue-i18n/vue-i18n.esm-browser.prod.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue-i18n/vue-i18n.esm-browser.prod.js diff --git a/code/WebApp/vanilla/lib/vue-router/vue-router.esm-browser.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue-router/vue-router.esm-browser.js similarity index 100% rename from code/WebApp/vanilla/lib/vue-router/vue-router.esm-browser.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue-router/vue-router.esm-browser.js diff --git a/code/WebApp/vanilla/lib/vue/vue.esm-browser.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue/vue.esm-browser.js similarity index 100% rename from code/WebApp/vanilla/lib/vue/vue.esm-browser.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue/vue.esm-browser.js diff --git a/code/WebApp/vanilla/lib/vue/vue.esm-browser.prod.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue/vue.esm-browser.prod.js similarity index 100% rename from code/WebApp/vanilla/lib/vue/vue.esm-browser.prod.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/lib/vue/vue.esm-browser.prod.js diff --git a/code/WebApp/vanilla/locale/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/locale/index.js similarity index 100% rename from code/WebApp/vanilla/locale/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/locale/index.js diff --git a/code/WebApp/vanilla/main.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/main.css similarity index 100% rename from code/WebApp/vanilla/main.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/main.css diff --git a/code/WebApp/vanilla/main.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/main.js similarity index 100% rename from code/WebApp/vanilla/main.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/main.js diff --git a/code/WebApp/vanilla/mixins/style.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/mixins/style.js similarity index 100% rename from code/WebApp/vanilla/mixins/style.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/mixins/style.js diff --git a/code/WebApp/vanilla/models/centralized-control.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js similarity index 100% rename from code/WebApp/vanilla/models/centralized-control.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js diff --git a/code/WebApp/vanilla/models/code-setting.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/code-setting.js similarity index 100% rename from code/WebApp/vanilla/models/code-setting.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/code-setting.js diff --git a/code/WebApp/vanilla/models/login.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/login.js similarity index 100% rename from code/WebApp/vanilla/models/login.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/login.js diff --git a/code/WebApp/vanilla/models/role.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js similarity index 100% rename from code/WebApp/vanilla/models/role.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js diff --git a/code/WebApp/vanilla/models/user.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/user.js similarity index 100% rename from code/WebApp/vanilla/models/user.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/user.js diff --git a/code/WebApp/vanilla/request/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/request/index.js similarity index 100% rename from code/WebApp/vanilla/request/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/request/index.js diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-date.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-date.js new file mode 100644 index 00000000..65714041 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-date.js @@ -0,0 +1,473 @@ +export default [ + { + path: "base-data", + meta: { + type: "group", + title: "基础数据", + icon: "folder", + }, + children: [ + { + path: "user", + meta: { + type: "page", + title: "用户管理", + icon: "file", + permission: "AbpIdentity.Users", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "create", + meta: { + type: "button", + title: "新建", + icon: "file", + permission: "AbpIdentity.Users.Create", + isTop: true, + }, + }, + { + path: "update", + meta: { + type: "button", + title: "编辑", + icon: "file", + htmlClass: "el-button--primary", + permission: "AbpIdentity.Users.Update", + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + permission: "AbpIdentity.Users.Delete", + disabled: "o=>o.userName==='admin'", + }, + }, + { + path: "%s/reset-password", + meta: { + type: "button", + title: "重置密码", + icon: "file", + permission: "reset-password?", + method: "PUT", + }, + }, + ], + }, + // { + // path: "role", + // meta: { + // type: "page", + // title: "角色管理", + // icon: "file", + // permission: "AbpIdentity.Users", + // }, + // children: [ + // { + // path: "create", + // meta: { + // type: "button", + // title: "新建", + // icon: "file", + // permission: "AbpIdentity.Users.Create", + // isTop: true, + // }, + // }, + // { + // path: "update", + // meta: { + // type: "button", + // title: "编辑", + // icon: "file", + // htmlClass: "el-button--primary", + // permission: "AbpIdentity.Users.Update", + // disabled: `(o) => o.isStatic`, + // }, + // }, + // { + // path: "delete", + // meta: { + // type: "button", + // title: "删除", + // icon: "file", + // permission: "AbpIdentity.Users.Delete", + // disabled: `(o) => o.isStatic`, + // }, + // }, + // ], + // }, + { + path: "material", + meta: { + type: "page", + title: "物料主数据", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "query", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + }, + { + path: "centralized-control", + meta: { + type: "page", + title: "期间设置", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "create", + meta: { + type: "button", + title: "新建", + icon: "file", + isTop: true, + }, + }, + { + path: "open-version", + meta: { + type: "button", + title: "启用", + icon: "file", + isTop: true, + }, + }, + { + path: "closed-version", + meta: { + type: "button", + title: "停用", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + ], + }, + }, + { + path: "material-relationship", + meta: { + type: "page", + title: "客户零件关系", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + }, + { + path: "tb_re-parts-relationship_service", + meta: { + type: "page", + title: "客户替换件关系", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + }, + { + path: "code-setting", + meta: { + type: "page", + title: "通用代码", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "create", + meta: { + type: "button", + title: "新建", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + }, + { + path: "bom", + meta: { + type: "page", + title: "BOM结构", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + }, + { + path: "price-list-app-service-bj", + meta: { + type: "page", + title: "备件价格单", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + }, + { + path: "purchase_price_service", + meta: { + type: "page", + title: "采购价格单", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + }, + { + path: "price-list", + meta: { + type: "page", + title: "销售价格单", + icon: "file", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + }, + ], + }, +]; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js new file mode 100644 index 00000000..a47e2c0a --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js @@ -0,0 +1,77 @@ +export default [ + { + path: "jis-bbac", + meta: { + type: "group", + title: "JIS-BBAC", + icon: "folder", + }, + children: [ + { + path: "input", + meta: { + type: "group", + title: "数据输入", + icon: "folder", + }, + children: [ + { + path: "bbac_sa_service", + meta: { + type: "page", + title: "JIS结算数据", + icon: "file", + }, + }, + { + path: "bbac_se_detail", + meta: { + type: "page", + title: "JIS发运数据", + icon: "file", + }, + }, + { + path: "bbac_se_edi", + meta: { + type: "page", + title: "EDI数据", + icon: "file", + }, + }, + ], + }, + ], + + /* path: "business", + meta: { + type: "group", + title: "JIS-HBPO", + icon: "folder", + }, + path: "business", + meta: { + type: "group", + title: "直供件", + icon: "folder", + }, + path: "business", + meta: { + type: "group", + title: "备件", + icon: "folder", + }, + path: "business", + meta: { + type: "group", + title: "印度件", + icon: "folder", + }, + path: "business", + meta: { + type: "group", + title: "商务审核", + icon: "folder", + }, */ + }, +]; diff --git a/code/WebApp/vanilla/router/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js similarity index 100% rename from code/WebApp/vanilla/router/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js new file mode 100644 index 00000000..146ad045 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js @@ -0,0 +1,15 @@ +import baseDate from "./base-date.js"; +import business from "./business.js"; +export default [ + { + path: "home", + meta: { + type: "page", + title: "首页", + icon: "home", + public: true, + }, + }, + ...baseDate, + ...business, +]; diff --git a/code/WebApp/vanilla/signalr/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/signalr/index.js similarity index 100% rename from code/WebApp/vanilla/signalr/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/signalr/index.js diff --git a/code/WebApp/vanilla/store/app.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/store/app.js similarity index 100% rename from code/WebApp/vanilla/store/app.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/store/app.js diff --git a/code/WebApp/vanilla/store/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/store/index.js similarity index 100% rename from code/WebApp/vanilla/store/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/store/index.js diff --git a/code/WebApp/vanilla/styles/site.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css similarity index 100% rename from code/WebApp/vanilla/styles/site.css rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css diff --git a/code/WebApp/vanilla/utils/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/utils/index.js similarity index 100% rename from code/WebApp/vanilla/utils/index.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/utils/index.js diff --git a/code/WebApp/vanilla/utils/validation.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/utils/validation.js similarity index 100% rename from code/WebApp/vanilla/utils/validation.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/utils/validation.js diff --git a/code/WebApp/vanilla/views/403.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/403.js similarity index 100% rename from code/WebApp/vanilla/views/403.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/403.js diff --git a/code/WebApp/vanilla/views/404.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/404.js similarity index 100% rename from code/WebApp/vanilla/views/404.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/404.js diff --git a/code/WebApp/vanilla/views/base-data/centralized-control.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js similarity index 100% rename from code/WebApp/vanilla/views/base-data/centralized-control.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js diff --git a/code/WebApp/vanilla/views/base-data/code-setting.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/code-setting.js similarity index 100% rename from code/WebApp/vanilla/views/base-data/code-setting.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/code-setting.js diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/material.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/material.js new file mode 100644 index 00000000..338f7975 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/material.js @@ -0,0 +1,15 @@ +import AppList from "../../components/list/index.js"; +import html from "html"; +import useConfig from "../../models/material.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/WebApp/vanilla/views/base-data/role.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/role.js similarity index 100% rename from code/WebApp/vanilla/views/base-data/role.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/role.js diff --git a/code/WebApp/vanilla/views/base-data/user.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js similarity index 100% rename from code/WebApp/vanilla/views/base-data/user.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js diff --git a/code/WebApp/vanilla/views/home.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js similarity index 100% rename from code/WebApp/vanilla/views/home.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/home.js diff --git a/code/WebApp/vanilla/views/list.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/list.js similarity index 100% rename from code/WebApp/vanilla/views/list.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/list.js diff --git a/code/WebApp/vanilla/views/login.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/login.js similarity index 100% rename from code/WebApp/vanilla/views/login.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/login.js diff --git a/code/WebApp/vanilla/views/monitor.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/monitor.js similarity index 100% rename from code/WebApp/vanilla/views/monitor.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/monitor.js diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs index 269d3996..922f5de9 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs @@ -129,12 +129,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [Display(Name = "实际纸质发票号")] public string RealnvBillNum { get; set; } - [Display(Name = "系统生成发票号")] + + [Display(Name = "未税金额")] + public decimal Amt { get; set; } + [Display(Name = "税后金额")] public decimal TaxAmt { get; set; } [Display(Name = "发票分组号")] public string InvGroupNum { get; set; } [Display(Name = "发票号")] public string InvbillNum { get; set; } + [Display(Name = "发票分组状态")] + public int State { set; get; } + [Display(Name = "业务类别")] + public EnumBusinessType BusinessType { get; set; } + + } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index 4b420034..f16999ea 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -24,8 +24,6 @@ namespace Win.Sfs.SettleAccount.Bases { public abstract class BA_SERVICE:ApplicationService { - - private readonly INormalEfCoreRepository _repository; private readonly INormalEfCoreRepository _wRepository; private readonly INormalEfCoreRepository _sRepository; @@ -69,7 +67,7 @@ namespace Win.Sfs.SettleAccount.Bases { INVOICE_GRP_DETAIL_DTO _entity=new INVOICE_GRP_DETAIL_DTO(); - var m= await _mRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); + var m= await _mRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); var mdtos = ObjectMapper.Map, List>(m); var w=await _wRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); var wdtos = ObjectMapper.Map, List>(w); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs index c0d973bd..26f082fe 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs @@ -36,8 +36,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ protected BBAC_CAN_SA_SERVICE(INormalEfCoreRepository repository, IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(repository, excelImportService, detailRepository) { } - - [HttpPost] //[Route("generateinvoice")] public async override Task GenerateInvoice(BBAC_CAN_SA_REQ_DTO input) @@ -57,12 +55,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ string invoiceBillNum = Guid.NewGuid().ToString(); List invoiceGroupNumList = new List(); List List = new List(); - - decimal sum = _itm.Value;//初始价格 List luList= _ls.Where(p => p.GroupNum == _itm.Key).Select(p => p.LU).Distinct().ToList(); //初始LU种类 - - foreach (var _itm1 in _dic1) { if (_itm.Key == _itm1.Key) @@ -70,10 +64,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ continue; } var grouplist=_ls.Where(p => p.GroupNum == _itm1.Key).Select(p => p.LU).Distinct().ToList();//每项LU种类 - luList.AddRange(grouplist); luList = luList.Distinct().ToList(); - if (luList.Count > 20)//累加零件不超过20种 { continue; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs index fd424f27..f01a105e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Authorization; - using Microsoft.AspNetCore.Mvc; using SettleAccount.Domain.BQ; using System; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index c3e12303..9e3ef810 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -16,6 +16,7 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.SettleAccount.Entities.BQ.Managers; using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ @@ -28,6 +29,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ private readonly INormalEfCoreRepository _wRepository; private readonly INormalEfCoreRepository _sRepository; private readonly INormalEfCoreRepository _mRepository; + private readonly CAN_SA_MNG _pubMng; + private readonly CAN_SA_MNG _bbacMng; + private readonly CAN_SA_MNG _hbpoMng; + private readonly INV_MNG _invMng; //private readonly INormalEfCoreRepository _detailRepository; private readonly IExcelImportAppService _excelImportService; @@ -36,9 +41,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ INormalEfCoreRepository wRepository, INormalEfCoreRepository sRepository, INormalEfCoreRepository mRepository, - IExcelImportAppService excelImportService - //INormalEfCoreRepository detailRepository - + IExcelImportAppService excelImportService, + CAN_SA_MNG pubMng, + CAN_SA_MNG bbacMng, + CAN_SA_MNG hbpoMng, + INV_MNG invMng ) { _excelImportService = excelImportService; @@ -46,6 +53,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ _wRepository = wRepository; _mRepository = mRepository; _sRepository = sRepository; + _pubMng = pubMng; + _bbacMng = bbacMng; + _hbpoMng = hbpoMng; + _invMng = invMng; + + + } [HttpPost] public virtual async Task ApprovalPassed(INVOICE_GRP_REQ_DTO input) @@ -118,8 +132,29 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [HttpPost] public virtual async Task RejectAsync(INVOICE_GRP_REQ_DTO input) { + bool state = await _invMng.Reject(input.InvGroupNum); + if (state==true) + { + switch (input.BusinessType) + { + case EnumBusinessType.BeiJian: + await _pubMng.SetNewState(input.InvGroupNum); + break; + case EnumBusinessType.ZhiGongJian: + await _pubMng.SetNewState(input.InvGroupNum); + break; + case EnumBusinessType.YingDuJian: + await _pubMng.SetNewState(input.InvGroupNum); + break; + case EnumBusinessType.BBAC: + await _bbacMng.SetNewState(input.InvGroupNum); + break; + case EnumBusinessType.HBPO: + await _hbpoMng.SetNewState(input.InvGroupNum); + break; + } + } return string.Empty; - } [HttpPost] public virtual async Task Sync_QAD(INVOICE_GRP_REQ_DTO input) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs index 8c0eeb03..37c2c1c5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs @@ -42,30 +42,70 @@ namespace SettleAccount.Bases { [Display(Name = "期间")] - public int Version { get; set; } + public virtual int Version { get; set; } [Display(Name = "结算单据")] - public string BillNum { get; set; } = null!; + public virtual string BillNum { get; set; } = null!; [Display(Name = "关联结算单号")] - public string SettleBillNum { get; set; } = null!; + public virtual string SettleBillNum { get; set; } = null!; /// - /// 1、新建 2、已有出库3、已有扣减寄售库 + /// 可结算单状态 /// [Display(Name = "状态")] - public SettleBillState State { get; set; } + public virtual SettleBillState State { get; set; } /// /// 明细记录行数 /// [Display(Name = "发票分组号")] - public string InvGroupNum { get; set; } = null!; + public virtual string InvGroupNum { get; set; } = null!; } + public class PD_BASE_MAIN : FullAuditedAggregateRoot + { + + [Display(Name = "期间")] + public virtual int Version { get; set; } + + [Display(Name = "结算单据")] + public virtual string BillNum { get; set; } = null!; + [Display(Name = "关联结算单号")] + public virtual string SettleBillNum { get; set; } = null!; + + + /// + /// 可结算单状态 + /// + [Display(Name = "状态")] + public virtual SettleBillState State { get; set; } + + /// + /// 明细记录行数 + /// + [Display(Name = "发票分组号")] + public virtual string InvGroupNum { get; set; } = null!; + /// + /// 地点 + /// + [Display(Name = "地点")] + public virtual string Site { get; set; } + + } + + + + + + - public interface ISA_BASE : ISBASE + + + + + public interface ISA_BASE : ISBASE { /// /// 期间 @@ -368,6 +408,10 @@ namespace SettleAccount.Bases /// 結算分組號 /// public string GroupNum { get; set; } + /// + /// 关联结算单号 + /// + public string SettleBillNum { get; set; } //public SA_CAN_BASE(int version, decimal price, string billNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum) //{ @@ -425,7 +469,6 @@ namespace SettleAccount.Bases /// 結算分組號 /// public string GroupNum { get; set; } - //public SA_NOT_BASE(decimal price, int version, string settleBillNum, DateTime settleDate, string invGroupNum, string lU, string pN, string keyCode, decimal qty, string groupNum) //{ // Price = price; @@ -474,13 +517,6 @@ namespace SettleAccount.Bases /// public decimal Qty { get; set; } - - - - - - - } public class PD_BASE : FullAuditedAggregateRoot, ISBASE { @@ -531,7 +567,25 @@ namespace SettleAccount.Bases /// public string KeyCode { get; set; } - + /// + ///扩展字段1 + /// + public string Extend1 { get; set; } + /// + ///扩展字段2 + /// + public string Extend2 { get; set; } + /// + /// 键值字段3 + /// + public string Extend3 { get; set; } + /// + /// 键值字段4 + /// + public string Extend4 { get; set; } + + + } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/OrderNumberGenerator.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/OrderNumberGenerator.cs index 36133d65..b779209e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/OrderNumberGenerator.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/OrderNumberGenerator.cs @@ -19,7 +19,7 @@ namespace Win.Sfs.SettleAccount.Bases private static int sequence = 0; /// - /// 如无类别 + /// 生成单号 /// /// /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs index 0f19e727..ffddc130 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_CAN_SA.cs @@ -66,8 +66,8 @@ public class BBAC_CAN_SA_DETAIL: SA_CAN_BASE ///// //[Display(Name = "结算单号")] //public string BillNum { get; set; } = null!; - [Display(Name = "关联结算单号")] - public string SettleBillNum { get; set; } = null!; + //[Display(Name = "关联结算单号")] + //public string SettleBillNum { get; set; } = null!; ///// ///// 对应字段Material ///// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs new file mode 100644 index 00000000..0053f055 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD.cs @@ -0,0 +1,46 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; +using Win.Sfs.SettleAccount; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "BBAC待扣减")] +public class BBAC_PD : PD_BASE_MAIN +{ + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "结算单据")] + //public string BillNum { get; set; } = null!; + //[Display(Name = "关联结算单号")] + //public string SettleBillNum { get; set; } = null!; + ///// + ///// 1、新建 2、已有出库3、已有扣减寄售库 + ///// + //[Display(Name = "状态")] + //public SettleBillState State { get; set; } + ///// + ///// 明细记录行数 + ///// + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + public BBAC_PD() + { + + } + public BBAC_PD(Guid guid, int version, string billNum, string settleBillNum, SettleBillState state, string invGroupNum,string site) + { + Id = guid; + Version = version; + BillNum = billNum; + SettleBillNum = settleBillNum; + State = state; + InvGroupNum = invGroupNum; + Site = site; + } +} + + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs index 7084d90e..a2475713 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_PD_DETAIL.cs @@ -46,7 +46,12 @@ public class BBAC_PD_DETAIL:PD_BASE //[Display(Name = "结算分组")] //public string GroupNum { get; set; } = null!; - public BBAC_PD_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string rELU, string pN, string rEPN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string groupNum) + + + public BBAC_PD_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string rELU, string pN, string rEPN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string groupNum + ,string extend1,string extend2,string extend3,string extend4 + + ) { Id = guid; KeyCode = keyCode; @@ -62,6 +67,10 @@ public class BBAC_PD_DETAIL:PD_BASE InvGroupNum = invGroupNum; SettleDate = settleDate; GroupNum = groupNum; + Extend1 = extend1; + Extend2 = extend2; + Extend3 = extend3; + Extend4 = extend4; } public BBAC_PD_DETAIL() diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs index 6895afcc..864f8366 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_CAN_SA.cs @@ -68,8 +68,8 @@ public class HBPO_CAN_SA_DETAIL:SA_CAN_BASE ///// //[Display(Name = "结算单号")] //public string BillNum { get; set; } = null!; - [Display(Name = "关联结算单号")] - public string SettleBillNum { get; set; } = null!; + //[Display(Name = "关联结算单号")] + //public string SettleBillNum { get; set; } = null!; /// /// 对应字段PartNumber /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs new file mode 100644 index 00000000..7e9cc1fc --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_PD.cs @@ -0,0 +1,46 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; +using Win.Sfs.SettleAccount; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "HBPO待扣减")] +public class HBPO_PD : PD_BASE_MAIN +{ + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "结算单据")] + //public string BillNum { get; set; } = null!; + //[Display(Name = "关联结算单号")] + //public string SettleBillNum { get; set; } = null!; + ///// + ///// 1、新建 2、已有出库3、已有扣减寄售库 + ///// + //[Display(Name = "状态")] + //public SettleBillState State { get; set; } + ///// + ///// 明细记录行数 + ///// + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + public HBPO_PD() + { + + } + public HBPO_PD(Guid guid, int version, string billNum, string settleBillNum, SettleBillState state, string invGroupNum,string site) + { + Id = guid; + Version = version; + BillNum = billNum; + SettleBillNum = settleBillNum; + State = state; + InvGroupNum = invGroupNum; + Site = site; + } +} + + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs index ae79fb06..a35f3b82 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_GRP.cs @@ -32,7 +32,7 @@ public class INVOICE_GRP : FullAuditedAggregateRoot public EnumBusinessType BusinessType { get; set; } - [Display(Name = "业务类别")] + [Display(Name = "状态")] public InvoiceBillState State { get; set; } public INVOICE_GRP(Guid guid, string realnvBillNum, string invbillNum, decimal amt, decimal taxAmt, string invGroupNum, string fileName, EnumBusinessType businessType, InvoiceBillState state) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs new file mode 100644 index 00000000..72e4e8b0 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs @@ -0,0 +1,143 @@ +using EFCore.BulkExtensions; +using Hangfire.Annotations; +using SettleAccount.Bases; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp; +using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Services; +using Volo.Abp.Guids; +using Volo.Abp.ObjectMapping; +using Win.Sfs.SettleAccount.Bases.DomainServices; +using Win.Sfs.SettleAccount.Boms; +using Win.Sfs.SettleAccount.Entities.Materials; +using Win.Sfs.SettleAccount.MaterialRelationships; +using Win.Sfs.Shared.RepositoryBase; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Managers +{ + public class CAN_SA_MNG : DomainService + where TEntity : SA_CAN_BASE_MAIN + where TEntityDetail : SA_CAN_BASE + { + private readonly INormalEfCoreRepository _repository; + private readonly INormalEfCoreRepository _detailRepository; + public CAN_SA_MNG + ( + INormalEfCoreRepository repository, + INormalEfCoreRepository detailRepository + ) + { + _repository = repository; + _detailRepository = detailRepository; + } + public virtual async Task SetForwardState(TEntity p_entiy, SettleBillState state) + { + if (await SetForwardState(p_entiy.InvGroupNum, state) == true) + { + return true; + } + else + { + return false; + } + } + + + public virtual async Task SetForwardState(string p_billNum, SettleBillState state) + { + + var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList(); + + foreach(TEntity p_entiy in ls) + { + + switch (p_entiy.State) + { + case SettleBillState.财务已审核: + if (state == SettleBillState.商务已审核) + { + p_entiy.State = state; + } + else + { + throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); + } + break; + case SettleBillState.商务已审核: + if (state == SettleBillState.已开票) + { + p_entiy.State = state; + } + else + { + throw new BusinessException("8989", "当前状态不是【已开票】状态,无法设置成【商务已审核】"); + } + break; + case SettleBillState.已开票: + if (state == SettleBillState.未结状态) + { + p_entiy.State = state; + } + else + { + throw new BusinessException("8989", "当前状态不是【未结状态】状态,无法设置成【已开票】"); + } + break; + case SettleBillState.已扣减: + if (state == SettleBillState.财务已审核) + { + p_entiy.State = state; + } + else + { + throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); + } + break; + } + await _repository.UpdateAsync(p_entiy); + + } + + + return true; + } + + + public virtual async Task SetNewState(TEntity p_entiy) + { + p_entiy.State = SettleBillState.未结状态; + await _repository.UpdateAsync(p_entiy); + return true; + } + + public virtual async Task SetNewState(string billNUm) + { + + var ls=_repository.Where(p => p.InvGroupNum == billNUm).ToList(); + foreach (var l in ls) + { + l.State = SettleBillState.未结状态; + } + + await _repository.DbContext.BulkReadAsync(ls); + return true; + } + + } + +} + + + + + + + + + + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs new file mode 100644 index 00000000..19ae1fd2 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -0,0 +1,152 @@ +using EFCore.BulkExtensions; +using Microsoft.EntityFrameworkCore; +using NPOI.SS.Formula.Functions; +using SettleAccount.Bases; +using SettleAccount.Domain.BQ; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp; +using Volo.Abp.Domain.Services; +using Win.Sfs.Shared.RepositoryBase; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Managers +{ + public class INV_MNG:DomainService + { + //private readonly INormalEfCoreRepository _canRepository; + private readonly INormalEfCoreRepository _repository; + private readonly INormalEfCoreRepository _groupRepository; + private readonly INormalEfCoreRepository _detailRepository; + private readonly INormalEfCoreRepository _notRepository; + public INV_MNG + ( + //INormalEfCoreRepository canRepository, + INormalEfCoreRepository repository, + INormalEfCoreRepository groupRepository, + INormalEfCoreRepository detailRepository, + INormalEfCoreRepository notRepository + + ) + { + //_canRepository = canRepository; + _repository = repository; + _detailRepository = detailRepository; + _groupRepository = groupRepository; + _notRepository = notRepository; + } + public virtual async Task SetForwardState(INVOICE_GRP p_entiy, InvoiceBillState p_State) + { + var state = p_State; + switch (p_entiy.State) + { + case InvoiceBillState.财务已审核: + if (state == InvoiceBillState.商务已审核) + { + p_entiy.State = state; + } + else + { + throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); + } + break; + case InvoiceBillState.商务已审核: + if (state == InvoiceBillState.已开票) + { + p_entiy.State = state; + } + else + { + throw new BusinessException("8989", "当前状态不是【已开票】状态,无法设置成【商务已审核】"); + } + break; + case InvoiceBillState.已扣减: + if (state == InvoiceBillState.财务已审核) + { + p_entiy.State = state; + } + else + { + throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); + } + break; + } + await _repository.UpdateAsync(p_entiy); + return true; + } + + public virtual async Task GetEntityByBillNum(string p_billNum) + { + return await _repository.Where(p => p.InvGroupNum == p_billNum).FirstOrDefaultAsync(); + } + + + + public virtual async Task Reject(INVOICE_GRP p_entity) + { + + if (await Reject(p_entity.InvGroupNum)) + + return true; + else + return false; + + + } + + public virtual async Task Reject(string billNum) + { + + var _ls=await _repository.Where(p => p.InvGroupNum == billNum).ToListAsync(); + + if (_ls != null && _ls.Count > 0) + { + foreach (var p_entity in _ls) + { + if (p_entity.State == InvoiceBillState.财务已审核 + || p_entity.State == InvoiceBillState.已开票 || p_entity.State == InvoiceBillState.商务已审核) + { + var entList = _repository.Where(p => p.InvGroupNum == p_entity.InvGroupNum).ToList(); + var groupList = _groupRepository.Where(p => p.InvGroupNum == p_entity.InvGroupNum).ToList(); + var notList = _notRepository.Where(p => p.InvGroupNum == p_entity.InvGroupNum).ToList(); + var detailList = _detailRepository.Where(p => p.InvGroupNum == p_entity.InvGroupNum).ToList(); + //var canList = _canRepository.Where(p => p.InvGroupNum == p_entity.InvGroupNum).ToList(); + //foreach (var itm in canList) + //{ + // itm.State = SettleBillState.未结状态; + //} + await _repository.DbContext.BulkDeleteAsync(entList); + await _repository.DbContext.BulkDeleteAsync(groupList); + await _repository.DbContext.BulkDeleteAsync(notList); + await _repository.DbContext.BulkDeleteAsync(detailList); + //await _repository.DbContext.BulkUpdateAsync(canList); + + + + } + if (p_entity.State == InvoiceBillState.已扣减) + { + + } + } + + } + else + { + + } + + + + + return true; + + + } + + + + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/NOT_SA_MNG.cs new file mode 100644 index 00000000..83a6b7b7 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/NOT_SA_MNG.cs @@ -0,0 +1,81 @@ +using SettleAccount.Bases; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Domain.Services; +using Volo.Abp; +using Win.Sfs.Shared.RepositoryBase; +using Win.Sfs.SettleAccount.Bases; +using EFCore.BulkExtensions; + +namespace Win.Sfs.SettleAccount.Entities.BQ.Managers +{ + /// + /// 不能結算管理 + /// + /// + /// + /// + public class NOT_SA_MNG : DomainService + where TEntity : SA_CAN_BASE_MAIN, new() + where TEntityDetail : SA_CAN_BASE, new() + where TNOTDetail : SA_NOT_BASE + { + private readonly INormalEfCoreRepository _repository; + private readonly INormalEfCoreRepository _detailRepository; + private readonly INormalEfCoreRepository _notRepository; + public NOT_SA_MNG + ( + INormalEfCoreRepository repository, + INormalEfCoreRepository detailRepository, + INormalEfCoreRepository notRepository + ) + { + _repository = repository; + _detailRepository = detailRepository; + _notRepository = notRepository; + } + public virtual async Task GenerateSettlementOrder(List p_list, Action> p_action = null) + { + + var billNumber = OrderNumberGenerator.GenerateOrderNumber("N"); + var _entity = new TEntity(); + _entity.BillNum = billNumber; + _entity.InvGroupNum = billNumber; + _entity.Version = DateTime.Now.Year + DateTime.Now.Month; + _entity.State = SettleBillState.未结状态; + _entity.SettleBillNum = string.Empty; + var _entityList = new List(); + foreach (var itm in p_list) + { + var _detailEntity = new TEntityDetail(); + { + _detailEntity.SettleBillNum = itm.SettleBillNum; + _detailEntity.BillNum = billNumber; + _detailEntity.InvGroupNum = billNumber; + _detailEntity.LU = itm.LU; + _detailEntity.PN = itm.PN; + _detailEntity.GroupNum = itm.GroupNum; + _detailEntity.KeyCode = itm.KeyCode; + _detailEntity.Price = itm.Price; + _detailEntity.Version = itm.Version; + }; + _entityList.Add(_detailEntity); + } + if (_entityList.Count > 0) + { + p_action(_entityList);//对不一样类型结算数据进行处理 + } + await _notRepository.DbContext.BulkDeleteAsync(p_list); + await _repository.DbContext.BulkInsertAsync(new List() { _entity }); + await _repository.DbContext.BulkInsertAsync(_entityList); + + + return true; + } + + + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs index 58c1ff96..e6f27e44 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs @@ -63,8 +63,8 @@ public class PUB_CAN_SA_DETAIL : SA_CAN_BASE //[Display(Name = "结算单号")] //public string BillNum { get; set; } = null!; - [Display(Name = "关联结算单号")] - public string SettleBillNum { get; set; } = null!; + //[Display(Name = "关联结算单号")] + //public string SettleBillNum { get; set; } = null!; /// /// 对应字段PartNumber diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs new file mode 100644 index 00000000..b6b9478d --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_PD.cs @@ -0,0 +1,46 @@ +using SettleAccount.Bases; +using System; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Domain.Entities.Auditing; +using Win.Sfs.SettleAccount; + +namespace SettleAccount.Domain.BQ; +[Display(Name = "PUB待扣减")] +public class PUB_PD : PD_BASE_MAIN +{ + + //[Display(Name = "期间")] + //public int Version { get; set; } + + //[Display(Name = "结算单据")] + //public string BillNum { get; set; } = null!; + //[Display(Name = "关联结算单号")] + //public string SettleBillNum { get; set; } = null!; + ///// + ///// 1、新建 2、已有出库3、已有扣减寄售库 + ///// + //[Display(Name = "状态")] + //public SettleBillState State { get; set; } + ///// + ///// 明细记录行数 + ///// + //[Display(Name = "发票分组号")] + //public string InvGroupNum { get; set; } = null!; + public PUB_PD() + { + + } + public PUB_PD(Guid guid, int version, string billNum, string settleBillNum, SettleBillState state, string invGroupNum,string site) + { + Id = guid; + Version = version; + BillNum = billNum; + SettleBillNum = settleBillNum; + State = state; + InvGroupNum = invGroupNum; + Site = site; + } +} + + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/CAN_SA_MNG.cs deleted file mode 100644 index c2dd1f15..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/CAN_SA_MNG.cs +++ /dev/null @@ -1,97 +0,0 @@ -using Hangfire.Annotations; -using SettleAccount.Bases; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Domain.Entities; -using Volo.Abp.Domain.Services; -using Volo.Abp.Guids; -using Volo.Abp.ObjectMapping; -using Win.Sfs.SettleAccount.Bases.DomainServices; -using Win.Sfs.SettleAccount.Boms; -using Win.Sfs.SettleAccount.Entities.Materials; -using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.Shared.RepositoryBase; - -namespace Win.Sfs.SettleAccount.Entities.Managers -{ - public class CAN_SA_MNG : DomainService - where TEntity : SA_CAN_BASE_MAIN - where TEntityDetail : SA_CAN_BASE - { - private readonly INormalEfCoreRepository _repository; - private readonly INormalEfCoreRepository _detailRepository; - public CAN_SA_MNG - ( - INormalEfCoreRepository repository, - INormalEfCoreRepository detailRepository - ) - { - _repository= repository; - _detailRepository= detailRepository; - } - public virtual async Task SetState(TEntity p_entiy,SettleBillState state) - { - switch (p_entiy.State) - { - case SettleBillState.财务已审核: - if (state == SettleBillState.商务已审核) - { - p_entiy.State = state; - } - else - { - throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); - } - break; - case SettleBillState.商务已审核: - if (state == SettleBillState.已开票) - { - p_entiy.State = state; - } - else - { - throw new BusinessException("8989", "当前状态不是【已开票】状态,无法设置成【商务已审核】"); - } - break; - case SettleBillState.已开票: - if (state == SettleBillState.未结状态) - { - p_entiy.State = state; - } - else - { - throw new BusinessException("8989", "当前状态不是【未结状态】状态,无法设置成【已开票】"); - } - break; - case SettleBillState.已扣减: - if (state == SettleBillState.财务已审核) - { - p_entiy.State = state; - } - else - { - throw new BusinessException("8989", "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); - } - break; - } - await _repository.UpdateAsync(p_entiy); - return true; - } - - - } - - - - - - - - - - -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/NOT_SA_MNG.cs deleted file mode 100644 index 5b37ce06..00000000 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Managers/NOT_SA_MNG.cs +++ /dev/null @@ -1,42 +0,0 @@ -using SettleAccount.Bases; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.Domain.Services; -using Volo.Abp; -using Win.Sfs.Shared.RepositoryBase; - -namespace Win.Sfs.SettleAccount.Entities.Managers -{ - /// - /// 不能結算管理 - /// - /// - /// - /// - public class NOT_SA_MNG : DomainService - where TEntity : SA_CAN_BASE_MAIN - where TEntityDetail : SA_CAN_BASE - where TNOTDetail:SA_NOT_BASE - { - private readonly INormalEfCoreRepository _repository; - private readonly INormalEfCoreRepository _detailRepository; - public NOT_SA_MNG - ( - INormalEfCoreRepository repository, - INormalEfCoreRepository detailRepository - ) - { - _repository = repository; - _detailRepository = detailRepository; - } - public virtual async Task GenerateSettlementOrder(List p_list) - { - return true; - } - - - } -} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs index d231bb14..a0527952 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBillState.cs @@ -33,8 +33,8 @@ namespace Win.Sfs.SettleAccount public enum InvoiceBillState { - [Description("未结状态")] - 未结状态 = 0, + [Description("已开票")] + 已开票 = 1, [Description("商务已审核")] 商务已审核 = 2, [Description("财务已审核")] @@ -44,6 +44,22 @@ namespace Win.Sfs.SettleAccount } + public enum BusinessType + { + [Description("HBPO-JIS")] + HBPOJIS =1, + [Description("BBAC-JIS")] + BBACJIS =2, + [Description("JIT")] + JIT =3, + [Description("备件")] + 备件 =4, + [Description("印度件")] + 印度件 =5 + } + + + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs index f7115879..80143dd5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/EnumBusinessType.cs @@ -35,6 +35,21 @@ namespace Win.Sfs.SettleAccount ///印度件 /// [Display(Name = "印度件")] - YingDuJian = 4 + YingDuJian = 4, + + /// + /// + /// + [Display(Name = "HBPO-JIS")] + HBPO = 5, + + /// + ///印度件 + /// + [Display(Name = "BBAC-JIS")] + BBAC = 6 + + + } } diff --git a/docs/demo/src/WTA.Application/Identity/Identity.zip b/docs/demo/src/WTA.Application/Identity/Identity.zip deleted file mode 100644 index dcfbf86e..00000000 Binary files a/docs/demo/src/WTA.Application/Identity/Identity.zip and /dev/null differ diff --git a/docs/demo/src/WTA/Properties/PublishProfiles/FolderProfile.pubxml b/docs/demo/src/WTA/Properties/PublishProfiles/FolderProfile.pubxml index d9d050e3..80807721 100644 --- a/docs/demo/src/WTA/Properties/PublishProfiles/FolderProfile.pubxml +++ b/docs/demo/src/WTA/Properties/PublishProfiles/FolderProfile.pubxml @@ -15,7 +15,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_TargetId>Folder net7.0 - linux-x64 + win-x64 ffaca971-25fc-4652-a510-8bfc76e42d87 true