1

dengjunjie

2025-01-10 74572dab186ea53ba97323175e3a2ea46b1c3805

1

 代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f07d9c85-8401-4a80-82b3-e3d679447000.vsidx

Binary files differ

 代码管理/WMS/WIDESEA_WMSClient/public/webconfig.js

@@ -1,3 +1,3 @@
window.webConfig = {
    "webApiBaseUrl": "http://10.30.4.92:9283/"
    "webApiBaseUrl":"http://127.0.0.1:9293/" //"http://10.30.4.92:9283/"
}

 代码管理/WMS/WIDESEA_WMSClient/src/api/http.js

@@ -12,14 +12,14 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
    axios.defaults.baseURL = window.webConfig.webApiBaseUrl;;
    axios.defaults.baseURL = window.webConfig.webApiBaseUrl;
}
else if (process.env.NODE_ENV == 'debug') {
    axios.defaults.baseURL = 'http://127.0.0.1:8098/';
}

else if (process.env.NODE_ENV == 'production') {
    axios.defaults.baseURL = window.webConfig.webApiBaseUrl;;
    axios.defaults.baseURL = window.webConfig.webApiBaseUrl;
}
if (!axios.defaults.baseURL.endsWith('/')) {
    axios.defaults.baseURL+="/";

 代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue

@@ -73,6 +73,14 @@
        align: "left",
      },
      {
          field: "warehouseId",
          title: "浠撳簱",
          type: "string",
          width: 100,
          align: "left",
          bind: { key: "warehouses", data: [] },
      },
      {
        field: "locationCode",
        title: "璐т綅缂栧彿",
        type: "string",

 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b9c1ceb-8251-465b-9731-71c408afb4eb.vsidx

Binary files differ

 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/24d336e2-4ecf-49a4-b35f-69e0e3bc8d65.vsidx

Binary files differ

 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ae4399a-b674-44c1-b399-de956d3e1f8a.vsidx

Binary files differ

 代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e1bb71c7-585a-4025-8323-5e9cda935d44.vsidx

Binary files differ

 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs

@@ -18,6 +18,10 @@
        /// <summary>
        /// 璐т綅缂栧彿
        /// </summary>
        public int WarehouseId { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string LocationCode { get; set; }

        /// <summary>

 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs

@@ -81,6 +81,7 @@
            ISugarQueryable<StockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a)
                => new StockViewDTO
                {
                    WarehouseId=a.WarehouseId,
                    LocationCode = b.LocationCode,
                    Column = a.Column,
                    CreateDate = b.CreateDate,