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

1 year ago · 1dbf249bb9
4 changed files with 8 additions and 5 deletions
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/index.html
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/index.html
@ -4,9 +4,10 @@
 <head>
  <meta charset="utf-8" />
  <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="Pragma" content="no-cache">
-  <meta http-equiv="Expires" content="0">
+  <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+  <meta http-equiv="Cache" content="no-cache" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <meta http-equiv="Expires" content="0" />
  <base href="/" />
  <style>
    @keyframes loading-rotate {
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/backup.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/backup.js
@ -13,7 +13,7 @@ export default function () {
        url: "settleaccount/vmi/snapshot",
        value: "description",
        label: "name",
-        //defaultSelected: true,
+        defaultSelected: true,
        clearable: false,
      },
    },
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/vmi/log.js
+++ b/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 useConfig from "../../../models/vmi/log.js";
 import { ref, onMounted, onUnmounted } from "vue";
+import { useRoute } from "vue-router";
 import { schemaToModel } from "../../utils/index.js";
 import AppForm from "../../../components/form/index.js";
 import AppTable from "../../components/table/index.js";
@ -31,6 +32,7 @@ export default {
    </el-dialog>
  `,
  setup() {
+    const route = useRoute();
    const appListRef = ref(false);
    const loading = ref(false);
    const addDialogVisible = ref(false);
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
+++ b/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 查询，如果没有分表则使用原始表
                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
            {