Browse Source

时点库存查询调整为默认查询最新备份时间;库存事务查询语法错误修复

master
wanggang 1 year ago
parent
commit
1dbf249bb9
  1. 7
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/index.html
  2. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/backup.js
  3. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/vmi/log.js
  4. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

7
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/index.html

@ -4,9 +4,10 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"> <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Cache" content="no-cache" />
<meta http-equiv="Expires" content="0"> <meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" />
<base href="/" /> <base href="/" />
<style> <style>
@keyframes loading-rotate { @keyframes loading-rotate {

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/backup.js

@ -13,7 +13,7 @@ export default function () {
url: "settleaccount/vmi/snapshot", url: "settleaccount/vmi/snapshot",
value: "description", value: "description",
label: "name", label: "name",
//defaultSelected: true, defaultSelected: true,
clearable: false, clearable: false,
}, },
}, },

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/vmi/log.js

@ -2,6 +2,7 @@ import AppList from "../../../components/list/index.js";
import html from "html"; import html from "html";
import useConfig from "../../../models/vmi/log.js"; import useConfig from "../../../models/vmi/log.js";
import { ref, onMounted, onUnmounted } from "vue"; import { ref, onMounted, onUnmounted } from "vue";
import { useRoute } from "vue-router";
import { schemaToModel } from "../../utils/index.js"; import { schemaToModel } from "../../utils/index.js";
import AppForm from "../../../components/form/index.js"; import AppForm from "../../../components/form/index.js";
import AppTable from "../../components/table/index.js"; import AppTable from "../../components/table/index.js";
@ -31,6 +32,7 @@ export default {
</el-dialog> </el-dialog>
`, `,
setup() { setup() {
const route = useRoute();
const appListRef = ref(false); const appListRef = ref(false);
const loading = ref(false); const loading = ref(false);
const addDialogVisible = ref(false); const addDialogVisible = ref(false);

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

@ -324,7 +324,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
//生成 union all 的 SQL使用 FromSqlRaw 查询,如果没有分表则使用原始表 //生成 union all 的 SQL使用 FromSqlRaw 查询,如果没有分表则使用原始表
sql = $"select * from {tables.First()} WITH(NOLOCK)"; sql = $"select * from {tables.First()} WITH(NOLOCK)";
tables.Skip(1).ForEach(o => sql += $" union all select * from ${o} WITH(NOLOCK)"); tables.Skip(1).ForEach(o => sql += $" union all select * from {o} WITH(NOLOCK)");
} }
else else
{ {

Loading…
Cancel
Save