diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java
index d52f1add..5f17c904 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java
@@ -182,7 +182,7 @@ public class WarehouseInventoryInquiryServiceImpl implements IWarehouseInventory
             Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();
 
             if (editStockNum > noOccupancyNum){
-                editStockNum = sharedAvailableStockNum;
+                editStockNum = noOccupancyNum;
                 fixedAvailableStockNum += editStockNum;
                 sharedAvailableStockNum = 0;
             }else {
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html
index 26f19fd5..43e0653f 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html
@@ -70,12 +70,9 @@
                 updateUrl: prefix + "/edit/{id}",
                 exportUrl: prefix + "/export",
                 modalName: "仓库库存查询",
-                height: $(window).height() - 20,
-                modalWidth: 1200,
-                // fixedColumns:true,
-                // fixedNumber: 1,
-                // fixedRightNumber: 1,
-                search: false,
+                fixedColumns: true, // 启用冻结列
+                fixedRightNumber: 1, // 冻结右列个数
+                sortable: true,
                 showExport: true,
                 columns: [
                     {checkbox: true},
@@ -117,12 +114,12 @@
 
 
                     {title: '报损数', field: 'reportDamageNum',},
-                    {title: '使用状态', field: 'materialUseStatus',
-                        formatter: function(value, row, index) {
-                           return $.table.selectDictLabel(materialUseStatusDatas, value);
-                        }
-                    },
-                    {title: '录入时间', field: 'createTime',visible: false},
+                    // {title: '使用状态', field: 'materialUseStatus',
+                    //     formatter: function(value, row, index) {
+                    //        return $.table.selectDictLabel(materialUseStatusDatas, value);
+                    //     }
+                    // },
+                    {title: '录入时间', field: 'createTime',sortable: true},
                     {title: '录入人', field: 'createBy',visible: false},
                     {title: '更新人', field: 'updateBy',},
                     {title: '上次更新时间', field: 'updateTime',},