From 81eefb4e9353e2cf2cb2023a59844cc1b2365436 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 12 Dec 2024 08:43:53 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=89=8D=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2:=E9=9A=90=E8=97=8F=E4=BD=BF=E7=94=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=9B=E6=98=BE=E7=A4=BA=E5=BD=95=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=9B=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=9B=E5=8E=BB=E6=8E=89=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E9=AB=98=E5=BA=A6=E5=92=8C=E5=AE=BD=E5=BA=A6=EF=BC=9B?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=9B=BA=E5=AE=9A=E5=8F=B3=E8=BE=B9=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E5=88=97=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9A=E5=85=B1=E4=BA=AB=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=9B=BA=E5=AE=9A=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E9=87=8F=E5=A4=A7=E4=BA=8E=E6=9C=AA=E5=8D=A0?= =?UTF-8?q?=E7=94=A8=E5=88=99=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E4=B8=BA?= =?UTF-8?q?=E4=B8=BA=E5=8D=A0=E7=94=A8=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseInventoryInquiryServiceImpl.java | 2 +- .../inventoryInquiry/inventoryInquiry.html | 21 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) 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',},