From c9dcdd13e228f560f2123b2c9bf7386f33f1e688 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 20 四月 2026 22:51:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WCS/WIDESEAWCS_Client/index.html | 1 +
Code/WCS/WIDESEAWCS_Client/src/api/http.js | 6 +++---
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dashboard/DashboardController.cs | 4 ++--
Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 9 +++++++++
Code/WCS/WIDESEAWCS_Client/public/webconfig.js | 4 ++++
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Client/index.html b/Code/WCS/WIDESEAWCS_Client/index.html
index 058a59f..0122172 100644
--- a/Code/WCS/WIDESEAWCS_Client/index.html
+++ b/Code/WCS/WIDESEAWCS_Client/index.html
@@ -16,6 +16,7 @@
<strong>We're sorry but WCS doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
+ <script src="/webconfig.js"></script>
<script type="module" src="/src/main.js"></script>
</body>
diff --git a/Code/WCS/WIDESEAWCS_Client/public/webconfig.js b/Code/WCS/WIDESEAWCS_Client/public/webconfig.js
new file mode 100644
index 0000000..b77a5bd
--- /dev/null
+++ b/Code/WCS/WIDESEAWCS_Client/public/webconfig.js
@@ -0,0 +1,4 @@
+window.webConfig = {
+ "webApiBaseUrl": "http://localhost:9292/",
+ "webApiProduction":"http://192.168.60.30:9292/"
+}
\ No newline at end of file
diff --git a/Code/WCS/WIDESEAWCS_Client/src/api/http.js b/Code/WCS/WIDESEAWCS_Client/src/api/http.js
index 714b153..0d7cc1f 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/api/http.js
+++ b/Code/WCS/WIDESEAWCS_Client/src/api/http.js
@@ -12,14 +12,14 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
- axios.defaults.baseURL = 'http://127.0.0.1:9292/';
+ axios.defaults.baseURL = window.webConfig.webApiBaseUrl;
}
else if (process.env.NODE_ENV == 'debug') {
- axios.defaults.baseURL = 'http://127.0.0.1:9292/';
+ axios.defaults.baseURL = window.webConfig.webApiBaseUrl;
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = 'http://192.168.60.30:9292/';
+ axios.defaults.baseURL = window.webConfig.webApiProduction;
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
index 10e9364..af7bbac 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
@@ -28,6 +28,7 @@
const TEXT = {
pageName: "搴撳瓨淇℃伅",
palletCode: "鎵樼洏缂栧彿",
+ stockStatus: "搴撳瓨鐘舵��",
locationCode: "璐т綅缂栧彿",
warehouse: "浠撳簱",
creator: "鍒涘缓浜�",
@@ -106,6 +107,14 @@
align: "left",
},
{
+ field: "stockStatus",
+ title: TEXT.stockStatus,
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "stockStatusEmun", data: [] },
+ },
+ {
field: "locationCode",
title: TEXT.locationCode,
type: "string",
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dashboard/DashboardController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dashboard/DashboardController.cs
index b80970b..f787d2a 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dashboard/DashboardController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dashboard/DashboardController.cs
@@ -348,8 +348,8 @@
var occupiedLocations = occupiedLocationGroups.FirstOrDefault(og => og.WarehouseId == w.WarehouseId)?.OccupiedLocations ?? 0;
var emptyLocations = totalLocations - occupiedLocations;
- var occupiedPercentage = totalLocations > 0 ? Math.Round((double)occupiedLocations / totalLocations * 100, 2) : 0.0;
- var emptyPercentage = totalLocations > 0 ? Math.Round((double)emptyLocations / totalLocations * 100, 2) : 0.0;
+ var occupiedPercentage = totalLocations > 0 ? Math.Round((double)occupiedLocations / totalLocations * 100, 0) : 0.0;
+ var emptyPercentage = totalLocations > 0 ? Math.Round((double)emptyLocations / totalLocations * 100, 0) : 0.0;
return new
{
--
Gitblit v1.9.3