Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXi...

wanshenmean

7 小时以前 c9dcdd13e228f560f2123b2c9bf7386f33f1e688

Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

 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>


 Code/WCS/WIDESEAWCS_Client/public/webconfig.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
window.webConfig = {
    "webApiBaseUrl": "http://localhost:9292/",
    "webApiProduction":"http://192.168.60.30:9292/"
}

 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+="/";

 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",

 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

                    {