Browse Source

[fix]仓库管理

库存查询前端页面:隐藏使用状态;显示录入时间;增加根据通过录入时间选择排序;去掉原来的高度和宽度;加上固定右边第一列;
修改后端修改可用库存方法:共享修改为固定,如果修改数量大于未占用则修改数量为为占用数量
dev
liuxiaoxu 2 months ago
parent
commit
81eefb4e93
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java
  2. 21
      ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html

2
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 {

21
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',},

Loading…
Cancel
Save