From a412102dd4a01c57cd8a239978426525135d6916 Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期三, 27 十一月 2024 10:14:09 +0800
Subject: [PATCH] 1

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs                  |    2 
 代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/c3887a9d-f738-4fa1-b9b8-dcb27de764cc.vsidx |    0 
 代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/05ffa60e-9142-41b3-9d1d-6208c682ca6c.vsidx |    0 
 代码管理/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js                                                    |   15 +++
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs                                |    5 
 代码管理/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue                                                      |  213 ++++++++++++++++++++++++++++++------------
 代码管理/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocol.vue                                            |    1 
 代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/71c48791-3b71-4064-86d1-e13fb205685c.vsidx |    0 
 代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/ba596010-9901-42ab-9692-7e16dab54f48.vsidx |    0 
 代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7a1458f8-0596-42c0-8957-d12b8cc9fbca.vsidx |    0 
 代码管理/WCS/WIDESEAWCS_Client/config/buttons.js                                                                 |    2 
 代码管理/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue                                                  |   31 ++----
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/VueDictionaryDTO.cs                                         |    4 
 代码管理/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue                                                |    1 
 14 files changed, 187 insertions(+), 87 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/config/buttons.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/config/buttons.js"
index 36389dc..5da342f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/config/buttons.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/config/buttons.js"
@@ -42,7 +42,7 @@
     }
 },
 {
-    name: "浠诲姟瀹屾垚",
+    name: "浠诲姟寮哄埗瀹屾垚",
     icon: '',
     class: '',
     value: 'TaskCompleted',
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
index 8a02afb..95a0325 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
@@ -19,6 +19,21 @@
         onInit() {
             // this.$Notice.success({ title: this.detailOptions.cnName + ',鏌ヨ缁撴灉', desc: '杩斿洖鐨勫璞★細' + JSON.stringify(data) });
 
+            var forceCompleteTaskButton = this.buttons.find((x) => x.value == "TaskCompleted");
+            if (forceCompleteTaskButton) {
+                forceCompleteTaskButton.onClick = () => {
+                    let rows = this.$refs.table.getSelected();
+                    if (rows.length == 0 || rows.length > 1) return this.$error("璇烽�夋嫨涓�琛屾暟鎹�");
+                    this.http
+                        .post("/api/Task/ForceCompleteTask?taskNum=" + rows[0].TaskNum, {}, true)
+                        .then((x) => {
+                            if (!x.status) return this.$message.error(x.message);
+                            this.options = x.data;
+                            console.log(this.options);
+                        });
+                }
+            }
+
             var previousButton = this.buttons.find((x) => x.value == "Previous");
             if (previousButton) previousButton.hidden = true;
             var nextButton = this.buttons.find((x) => x.value == "Next");
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue"
index 639d4de..75fca33 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue"
@@ -69,32 +69,23 @@
           required: true,
           field: "locationType",
           type: "select",
-          dataKey:"",
-          data:[
-            {key:1,value:'姝e父璐т綅'},
-            {key:2,value:'鏆傚瓨浣�'},
-            {key:3,value:'鎻愬崌鏈�'},
-            {key:4,value:'杈撻�佺嚎'},
-            {key:5,value:'缁勭珛鏈�'},
-          ]
+          dataKey: "locationTypeEnum",
+          data: [],
         },
-         {
+        {
           title: "绂佺敤鐘舵��",
           required: true,
           field: "enableStatus",
           type: "select",
-          dataKey:"",
-          data:[
-            {key:0,value:'姝e父'},
-            {key:1,value:'绂佺敤'},
-          ]
+          dataKey: "enableStatusEnum",
+          data: [],
         },
         {
           title: "鍖哄煙涓婚敭",
           required: true,
           field: "areaId",
           type: "string",
-          hidden:true,
+          hidden: true,
         },
         // {
         //   title: "宸烽亾缂栧彿",
@@ -118,7 +109,7 @@
           dataKey: "locationTypeEnum",
           data: [],
         },
-         {
+        {
           title: "璐т綅鐘舵��",
           field: "locationStatus",
           type: "selectList",
@@ -143,12 +134,12 @@
         title: "鍖哄煙涓婚敭",
         type: "string",
         width: 90,
-        hidden:true,
+        hidden: true,
         align: "left",
         bind: {
           key: "areainfo",
-          data: []
-        }
+          data: [],
+        },
       },
       {
         field: "locationCode",
@@ -209,7 +200,7 @@
         type: "string",
         width: 120,
         align: "left",
-        bind:{key: "locationTypeEnum", data: []}
+        bind: { key: "locationTypeEnum", data: [] },
       },
       {
         field: "locationStatus",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue"
index 6b86cae..830e93e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue"
@@ -131,6 +131,7 @@
         type: "string",
         width: 90,
         align: "left",
+        sort: true,
       },
       {
         field: "deviceName",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocol.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocol.vue"
index 6d3ea40..4a66911 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocol.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocol.vue"
@@ -120,6 +120,7 @@
         type: "string",
         width: 150,
         align: "left",
+        sort: true
       },
       {
         field: "deviceProDataBlock",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue"
index 9742628..9592d9b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue"
@@ -4,67 +4,156 @@
  *浠g爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠g爜鐢熸垚鍣ㄨ鐩�
  *涓氬姟璇峰湪@/extension/system/Sys_Log.js姝ゅ缂栧啓
  -->
-<template>
-    <view-grid ref="grid"
-               :columns="columns"
-               :detail="detail"
-               :editFormFields="editFormFields"
-               :editFormOptions="editFormOptions"
-               :searchFormFields="searchFormFields"
-               :searchFormOptions="searchFormOptions"
-               :table="table"
-               :extend="extend">
+ <template>
+    <view-grid
+      ref="grid"
+      :columns="columns"
+      :detail="detail"
+      :editFormFields="editFormFields"
+      :editFormOptions="editFormOptions"
+      :searchFormFields="searchFormFields"
+      :searchFormOptions="searchFormOptions"
+      :table="table"
+      :extend="extend"
+    >
     </view-grid>
-</template>
-<script>
-    import extend from "@/extension/system/Sys_Log.js";
-    import { ref, defineComponent } from "vue";
-    export default defineComponent({
-        setup() {
-            const table = ref({
-                key: 'Id',
-                footer: "Foots",
-                cnName: '绯荤粺鏃ュ織',
-                name: 'Sys_Log',
-                url: "/Sys_Log/",
-                sortName: "Id"
-            });
-            const editFormFields = ref({});
-            const editFormOptions = ref([]);
-            const searchFormFields = ref({"BeginDate":"","Url":"","LogType":[],"Success":[],"UserIP":"","ServiceIP":"","Role_Id":""});
-            const searchFormOptions = ref([[{"title":"璇锋眰鍦板潃","field":"Url","type":"text"},{"title":"鐢ㄦ埛IP","field":"UserIP","type":"text"},{"title":"鏈嶅姟鍣↖P","field":"ServiceIP","type":"text"}],[{"title":"寮�濮嬫椂闂�","field":"BeginDate","type":"datetime"},{"dataKey":"restatus","data":[],"title":"鍝嶅簲鐘舵��","field":"Success","type":"selectList"},{"dataKey":"roles","data":[],"title":"瑙掕壊ID","field":"Role_Id","type":"select"}],[{"dataKey":"log","data":[],"title":"鏃ュ織绫诲瀷","field":"LogType","colSize":12,"type":"checkbox"}]]);
-            const columns = ref([{field:'Id',title:'Id',type:'int',width:90,hidden:true,readonly:true,require:true,align:'left'},
-                       {field:'BeginDate',title:'寮�濮嬫椂闂�',type:'datetime',width:140,align:'left',sortable:true},
-                       {field:'UserName',title:'鐢ㄦ埛鍚嶇О',type:'string',width:90,align:'left'},
-                       {field:'Url',title:'璇锋眰鍦板潃',type:'string',width:110,align:'left'},
-                       {field:'LogType',title:'鏃ュ織绫诲瀷',type:'string',bind:{ key:'log',data:[]},width:80,align:'left'},
-                       {field:'Success',title:'鍝嶅簲鐘舵��',type:'int',bind:{ key:'restatus',data:[]},width:80,align:'left'},
-                       {field:'ElapsedTime',title:'鏃堕暱',type:'int',width:60,align:'left'},
-                       {field:'RequestParameter',title:'璇锋眰鍙傛暟',type:'string',width:70,align:'left'},
-                       {field:'ResponseParameter',title:'鍝嶅簲鍙傛暟',type:'string',width:70,align:'left'},
-                       {field:'ExceptionInfo',title:'寮傚父淇℃伅',type:'string',width:70,align:'left'},
-                       {field:'UserIP',title:'鐢ㄦ埛IP',type:'string',width:90,align:'left'},
-                       {field:'ServiceIP',title:'鏈嶅姟鍣↖P',type:'string',width:90,hidden:true,align:'left'},
-                       {field:'BrowserType',title:'娴忚鍣ㄧ被鍨�',type:'string',width:90,align:'left'},
-                       {field:'User_Id',title:'鐢ㄦ埛ID',type:'int',width:90,hidden:true,align:'left'},
-                       {field:'Role_Id',title:'瑙掕壊ID',type:'int',bind:{ key:'roles',data:[]},width:90,hidden:true,align:'left'},
-                       {field:'EndDate',title:'缁撴潫鏃堕棿',type:'datetime',width:150,hidden:true,align:'left',sortable:true}]);
-            const detail = ref({
-                cnName: "#detailCnName",
-                columns: [],
-                sortName: "",
-                key: ""
-            });
-            return {
-                table,
-                extend,
-                editFormFields,
-                editFormOptions,
-                searchFormFields,
-                searchFormOptions,
-                columns,
-                detail,
-            };
+  </template>
+  <script>
+  import extend from "@/extension/system/Sys_Log.js";
+  import { ref, defineComponent } from "vue";
+  export default defineComponent({
+    setup() {
+      const table = ref({
+        key: "Id",
+        footer: "Foots",
+        cnName: "绯荤粺鏃ュ織",
+        name: "Sys_Log",
+        url: "/Sys_Log/",
+        sortName: "Id",
+      });
+      const editFormFields = ref({});
+      const editFormOptions = ref([]);
+      const searchFormFields = ref({
+        BeginDate: "",
+        Url: "",
+        LogType: [],
+        Success: [],
+        UserIP: "",
+        ServiceIP: "",
+        Role_Id: "",
+      });
+      const searchFormOptions = ref([
+        [
+          { title: "璇锋眰鍦板潃", field: "url", type: "like" },
+          { title: "鐢ㄦ埛IP", field: "userIP", type: "like" },
+          { title: "寮�濮嬫椂闂�", field: "beginDate", type: "datetime" },
+        ],
+      ]);
+      const columns = ref([
+        {
+          field: "id",
+          title: "Id",
+          type: "int",
+          width: 90,
+          hidden: true,
+          readonly: true,
+          require: true,
+          align: "left",
         },
-    });
-</script>
+        {
+          field: "beginDate",
+          title: "寮�濮嬫椂闂�",
+          type: "datetime",
+          width: 140,
+          align: "left",
+          sortable: true,
+        },
+        {
+          field: "endDate",
+          title: "缁撴潫鏃堕棿",
+          type: "datetime",
+          width: 150,
+          hidden: true,
+          align: "left",
+          sortable: true,
+        },
+        {
+          field: "elapsedTime",
+          title: "鏃堕暱",
+          type: "int",
+          width: 60,
+          align: "left",
+        },
+        {
+          field: "userName",
+          title: "鐢ㄦ埛鍚嶇О",
+          type: "string",
+          width: 90,
+          align: "left",
+        },
+        {
+          field: "url",
+          title: "璇锋眰鍦板潃",
+          type: "string",
+          width: 110,
+          align: "left",
+        },
+        {
+          field: "success",
+          title: "鍝嶅簲鐘舵��",
+          type: "int",
+          bind: { key: "restatus", data: [] },
+          width: 80,
+          align: "left",
+          hidden: true
+        },
+        {
+          field: "requestParam",
+          title: "璇锋眰鍙傛暟",
+          type: "string",
+          width: 70,
+          align: "left",
+        },
+        {
+          field: "responseParam",
+          title: "鍝嶅簲鍙傛暟",
+          type: "string",
+          width: 70,
+          align: "left",
+        },
+        {
+          field: "userIP",
+          title: "鐢ㄦ埛IP",
+          type: "string",
+          width: 90,
+          align: "left",
+        },
+        {
+          field: "userId",
+          title: "鐢ㄦ埛ID",
+          type: "int",
+          width: 90,
+          hidden: true,
+          align: "left",
+        },
+      ]);
+      const detail = ref({
+        cnName: "#detailCnName",
+        columns: [],
+        sortName: "",
+        key: "",
+      });
+      return {
+        table,
+        extend,
+        editFormFields,
+        editFormOptions,
+        searchFormFields,
+        searchFormOptions,
+        columns,
+        detail,
+      };
+    },
+  });
+  </script>
+  
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/05ffa60e-9142-41b3-9d1d-6208c682ca6c.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/05ffa60e-9142-41b3-9d1d-6208c682ca6c.vsidx"
new file mode 100644
index 0000000..ea4c3e7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/05ffa60e-9142-41b3-9d1d-6208c682ca6c.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/71c48791-3b71-4064-86d1-e13fb205685c.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/71c48791-3b71-4064-86d1-e13fb205685c.vsidx"
new file mode 100644
index 0000000..7d67b1c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/71c48791-3b71-4064-86d1-e13fb205685c.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7a1458f8-0596-42c0-8957-d12b8cc9fbca.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7a1458f8-0596-42c0-8957-d12b8cc9fbca.vsidx"
new file mode 100644
index 0000000..d3a6800
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/7a1458f8-0596-42c0-8957-d12b8cc9fbca.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/ba596010-9901-42ab-9692-7e16dab54f48.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/ba596010-9901-42ab-9692-7e16dab54f48.vsidx"
new file mode 100644
index 0000000..aad9e2b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/ba596010-9901-42ab-9692-7e16dab54f48.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/c3887a9d-f738-4fa1-b9b8-dcb27de764cc.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/c3887a9d-f738-4fa1-b9b8-dcb27de764cc.vsidx"
new file mode 100644
index 0000000..b7f39d6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/c3887a9d-f738-4fa1-b9b8-dcb27de764cc.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/VueDictionaryDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/VueDictionaryDTO.cs"
index 419e3bf..0f4649c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/VueDictionaryDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/System/VueDictionaryDTO.cs"
@@ -12,6 +12,8 @@
 
         public string Config { get; set; }
 
-        public object Data {  get; set; }
+        public object Data { get; set; }
+
+        public bool SaveCache { get; set; } = true;
     }
 }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs"
index 66ef5dd..be0efdc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs"
@@ -89,7 +89,7 @@
                             if (vueDictionaryDTO != null)
                             {
                                 vueDictionaryDTOs.Add(vueDictionaryDTO);
-                                if (!_cacheService.Exists(item))
+                                if (!_cacheService.Exists(item) && vueDictionaryDTO.SaveCache)
                                 {
                                     _cacheService.Add(item, vueDictionaryDTO.Serialize());
                                 }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs"
index 70b9c49..8814ec7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs"
@@ -76,14 +76,15 @@
                         {
                             Config = v.Config,
                             DicNo = v.DicNo,
-                            Data = BaseDal.QueryDynamicDataBySql(v.DBSql)
+                            Data = BaseDal.QueryDynamicDataBySql(v.DBSql),
+                            SaveCache = false,
                         });
                     }
                 }
 
                 foreach (var item in selectDics)
                 {
-                    if (!_cacheService.Exists(item.DicNo))
+                    if (!_cacheService.Exists(item.DicNo) && item.SaveCache)
                     {
                         _cacheService.Add(item.DicNo, item.Serialize());
                     }

--
Gitblit v1.9.3