查询统计与KPI仓库权限添加,库存汇总修改
This commit is contained in:
@@ -16,7 +16,7 @@ public class StockSummary extends BaseEntity
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 序号 */
|
||||
@Excel(name = "序号")
|
||||
// @Excel(name = "序号")
|
||||
private Long onlyIdentity;
|
||||
|
||||
/** 物料编码 */
|
||||
|
||||
@@ -2,6 +2,8 @@ package com.ruoyi.search.ViewFlatWarehouseInFlow.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
@@ -114,7 +116,7 @@ public class ViewFlatWarehouseInFlowController extends BaseController
|
||||
@GetMapping("/warehouseList")
|
||||
public TableDataInfo warehouseList()
|
||||
{
|
||||
startPage();
|
||||
// startPage();
|
||||
BasWarehouse basWarehouse = new BasWarehouse();
|
||||
basWarehouse.setWarehouseType("3");
|
||||
List<BasWarehouse> list = basWarehouseService.selectBasWarehouseList(basWarehouse);
|
||||
|
||||
@@ -20,6 +20,10 @@ public class ViewStockoutHistory extends BaseEntity
|
||||
@Excel(name = "出库单号")
|
||||
private String stockoutId;
|
||||
|
||||
/** 仓库ID */
|
||||
@Excel(name = "仓库ID")
|
||||
private String warehouseId;
|
||||
|
||||
/** 出库类型 */
|
||||
@Excel(name = "出库类型")
|
||||
private String outType;
|
||||
@@ -124,6 +128,14 @@ public class ViewStockoutHistory extends BaseEntity
|
||||
@Excel(name = "备注")
|
||||
private String remark;
|
||||
|
||||
public String getWarehouseId() {
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setWarehouseId(String warehouseId) {
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getPrice() {
|
||||
return price;
|
||||
}
|
||||
@@ -384,6 +396,7 @@ public class ViewStockoutHistory extends BaseEntity
|
||||
public String toString() {
|
||||
return "ViewStockoutHistory{" +
|
||||
"stockoutId='" + stockoutId + '\'' +
|
||||
", warehouseId='" + warehouseId + '\'' +
|
||||
", outType='" + outType + '\'' +
|
||||
", createDate='" + createDate + '\'' +
|
||||
", createManId='" + createManId + '\'' +
|
||||
|
||||
Reference in New Issue
Block a user