From ecb36e47993423a7570cf043293d0c5f2482f413 Mon Sep 17 00:00:00 2001
From: userName <userEmail>
Date: Sat, 11 Oct 2025 17:32:25 +0800
Subject: [PATCH] 2

---
 wms-vue/src/components/duochaxun/Kucunrizhi.vue  |  6 +++---
 .../components/duochaxun/Liaoxiangjiankong.vue   |  2 +-
 wms-vue/src/main.js                              |  4 ++--
 wms/src/main/resources/application.yml           | 16 ++++++++--------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/wms-vue/src/components/duochaxun/Kucunrizhi.vue b/wms-vue/src/components/duochaxun/Kucunrizhi.vue
index 582e01e..1b69aa1 100644
--- a/wms-vue/src/components/duochaxun/Kucunrizhi.vue
+++ b/wms-vue/src/components/duochaxun/Kucunrizhi.vue
@@ -292,7 +292,7 @@
       </el-table-column>
       <el-table-column
           label="LOC"
-          width="80">
+          width="100">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
             <span>{{ scope.row.PROP_C2 }}</span>
@@ -301,10 +301,10 @@
       </el-table-column>
       <el-table-column
           label="失效日期"
-          width="80">
+          width="100">
         <template slot-scope="scope">
           <div slot="reference" class="name-wrapper">
-            <span>{{ scope.row.PROP_D2 }}</span>
+            <span>{{ scope.row.PROP_D2!=null?new Date(scope.row.PROP_D2).toISOString().replace('T','').substring(0,10):scope.row.PROP_D2}}</span>
           </div>
         </template>
       </el-table-column>
diff --git a/wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue b/wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue
index 67180fb..9806c5a 100644
--- a/wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue
+++ b/wms-vue/src/components/duochaxun/Liaoxiangjiankong.vue
@@ -251,7 +251,7 @@ export default {
       // 计算满在库和空在库的合计
       let mzkSum = this.tableData.reduce((total, row) => total + (Number(row.mzk) || 0), 0);
       let kzkSum = this.tableData.reduce((total, row) => total + (Number(row.kzk) || 0), 0);
-      return 30500 - mzkSum - kzkSum;
+      return 30000 - mzkSum - kzkSum;
     },
 
   },
diff --git a/wms-vue/src/main.js b/wms-vue/src/main.js
index 7682e0e..2c49590 100644
--- a/wms-vue/src/main.js
+++ b/wms-vue/src/main.js
@@ -8,9 +8,9 @@ import VueRouter from "vue-router";
 import router from "@/router/router";
 import store from "@/store/store";
 Vue.prototype.$axios=axios;
-Vue.prototype.$httpUrl='http://127.0.0.1:8083';
+//Vue.prototype.$httpUrl='http://127.0.0.1:8083';
 //Vue.prototype.$httpUrl='http://192.68.2.88:8081';
-// Vue.prototype.$httpUrl='http://10.1.112.23:8083';
+Vue.prototype.$httpUrl='http://10.1.112.23:8083';
 Vue.config.productionTip = false;
 Vue.use(VueRouter)
 Vue.use(ElementUI,{size:'small'});
diff --git a/wms/src/main/resources/application.yml b/wms/src/main/resources/application.yml
index 73b26e3..00e8047 100644
--- a/wms/src/main/resources/application.yml
+++ b/wms/src/main/resources/application.yml
@@ -13,16 +13,16 @@ server:
 
 spring:
   datasource:
-#    url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
-    url: jdbc:sqlserver://192.168.56.133:1433;DatabaseName=LD_WMSDB
-#    url: jdbc:sqlserver://192.168.2.88:1433;DatabaseName=zwlgtest
+    url: jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB
+#    url: jdbc:sqlserver://192.168.56.133:1433;DatabaseName=LD_WMSDB
+#    url: jdbc:sqlserver://10.1.119.75:1433;DatabaseName=zwlgtest
     driver-class-name:  com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    username: wmsdb
-#    password: AmecDDbb32A
-    username: liu
-    password: 123456
+    username: wmsdb
+    password: AmecDDbb32A
+#    username: liu
+ #   password: 123456
 #    username: sa
-#    password: Amecadmin1!
+#    password: Amec8888!
     hikari:
       connection-timeout: 60000