库存信息页面韩式 查询修改 导出修改
This commit is contained in:
liuhanqing
@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 手动分配库存对象 view_hand_allot_stock
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-09-16
|
||||
*/
|
||||
@@ -134,11 +134,11 @@ public class ViewHandAllotStock extends BaseEntity
|
||||
|
||||
/** 净重 */
|
||||
@Excel(name = "净重")
|
||||
private BigDecimal netWeight;
|
||||
private String netWeight;
|
||||
|
||||
/** 毛重 */
|
||||
@Excel(name = "毛重")
|
||||
private BigDecimal grossWeight;
|
||||
private String grossWeight;
|
||||
|
||||
/** 分销 */
|
||||
@Excel(name = "分销")
|
||||
@@ -164,372 +164,372 @@ public class ViewHandAllotStock extends BaseEntity
|
||||
@Excel(name = "货位名称")
|
||||
private String cargoSpaceName;
|
||||
|
||||
public void setStockId(String stockId)
|
||||
public void setStockId(String stockId)
|
||||
{
|
||||
this.stockId = stockId;
|
||||
}
|
||||
|
||||
public String getStockId()
|
||||
public String getStockId()
|
||||
{
|
||||
return stockId;
|
||||
}
|
||||
|
||||
public void setCargoSpaceId(String cargoSpaceId)
|
||||
public void setCargoSpaceId(String cargoSpaceId)
|
||||
{
|
||||
this.cargoSpaceId = cargoSpaceId;
|
||||
}
|
||||
|
||||
public String getCargoSpaceId()
|
||||
public String getCargoSpaceId()
|
||||
{
|
||||
return cargoSpaceId;
|
||||
}
|
||||
|
||||
public void setStockStatus(String stockStatus)
|
||||
public void setStockStatus(String stockStatus)
|
||||
{
|
||||
this.stockStatus = stockStatus;
|
||||
}
|
||||
|
||||
public String getStockStatus()
|
||||
public String getStockStatus()
|
||||
{
|
||||
return stockStatus;
|
||||
}
|
||||
|
||||
public void setProductStatus(String productStatus)
|
||||
public void setProductStatus(String productStatus)
|
||||
{
|
||||
this.productStatus = productStatus;
|
||||
}
|
||||
|
||||
public String getProductStatus()
|
||||
public String getProductStatus()
|
||||
{
|
||||
return productStatus;
|
||||
}
|
||||
|
||||
public void setLotNo(String lotNo)
|
||||
public void setLotNo(String lotNo)
|
||||
{
|
||||
this.lotNo = lotNo;
|
||||
}
|
||||
|
||||
public String getLotNo()
|
||||
public String getLotNo()
|
||||
{
|
||||
return lotNo;
|
||||
}
|
||||
|
||||
public void setInDate(String inDate)
|
||||
public void setInDate(String inDate)
|
||||
{
|
||||
this.inDate = inDate;
|
||||
}
|
||||
|
||||
public String getInDate()
|
||||
public String getInDate()
|
||||
{
|
||||
return inDate;
|
||||
}
|
||||
|
||||
public void setBackDate(String backDate)
|
||||
public void setBackDate(String backDate)
|
||||
{
|
||||
this.backDate = backDate;
|
||||
}
|
||||
|
||||
public String getBackDate()
|
||||
public String getBackDate()
|
||||
{
|
||||
return backDate;
|
||||
}
|
||||
|
||||
public void setProductGuid(String productGuid)
|
||||
public void setProductGuid(String productGuid)
|
||||
{
|
||||
this.productGuid = productGuid;
|
||||
}
|
||||
|
||||
public String getProductGuid()
|
||||
public String getProductGuid()
|
||||
{
|
||||
return productGuid;
|
||||
}
|
||||
|
||||
public void setQuantity(BigDecimal quantity)
|
||||
public void setQuantity(BigDecimal quantity)
|
||||
{
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public BigDecimal getQuantity()
|
||||
public BigDecimal getQuantity()
|
||||
{
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setJobId(String jobId)
|
||||
public void setJobId(String jobId)
|
||||
{
|
||||
this.jobId = jobId;
|
||||
}
|
||||
|
||||
public String getJobId()
|
||||
public String getJobId()
|
||||
{
|
||||
return jobId;
|
||||
}
|
||||
|
||||
public void setTrayCode(String trayCode)
|
||||
public void setTrayCode(String trayCode)
|
||||
{
|
||||
this.trayCode = trayCode;
|
||||
}
|
||||
|
||||
public String getTrayCode()
|
||||
public String getTrayCode()
|
||||
{
|
||||
return trayCode;
|
||||
}
|
||||
|
||||
public void setOutQuantity(String outQuantity)
|
||||
public void setOutQuantity(String outQuantity)
|
||||
{
|
||||
this.outQuantity = outQuantity;
|
||||
}
|
||||
|
||||
public String getOutQuantity()
|
||||
public String getOutQuantity()
|
||||
{
|
||||
return outQuantity;
|
||||
}
|
||||
|
||||
public void setStockinDetailId(String stockinDetailId)
|
||||
public void setStockinDetailId(String stockinDetailId)
|
||||
{
|
||||
this.stockinDetailId = stockinDetailId;
|
||||
}
|
||||
|
||||
public String getStockinDetailId()
|
||||
public String getStockinDetailId()
|
||||
{
|
||||
return stockinDetailId;
|
||||
}
|
||||
|
||||
public void setStockinId(String stockinId)
|
||||
public void setStockinId(String stockinId)
|
||||
{
|
||||
this.stockinId = stockinId;
|
||||
}
|
||||
|
||||
public String getStockinId()
|
||||
public String getStockinId()
|
||||
{
|
||||
return stockinId;
|
||||
}
|
||||
|
||||
public void setInType(String inType)
|
||||
public void setInType(String inType)
|
||||
{
|
||||
this.inType = inType;
|
||||
}
|
||||
|
||||
public String getInType()
|
||||
public String getInType()
|
||||
{
|
||||
return inType;
|
||||
}
|
||||
|
||||
public void setInClassId(String inClassId)
|
||||
public void setInClassId(String inClassId)
|
||||
{
|
||||
this.inClassId = inClassId;
|
||||
}
|
||||
|
||||
public String getInClassId()
|
||||
public String getInClassId()
|
||||
{
|
||||
return inClassId;
|
||||
}
|
||||
|
||||
public void setWarehouseId(String warehouseId)
|
||||
public void setWarehouseId(String warehouseId)
|
||||
{
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getWarehouseId()
|
||||
public String getWarehouseId()
|
||||
{
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setStackingId(String stackingId)
|
||||
public void setStackingId(String stackingId)
|
||||
{
|
||||
this.stackingId = stackingId;
|
||||
}
|
||||
|
||||
public String getStackingId()
|
||||
public String getStackingId()
|
||||
{
|
||||
return stackingId;
|
||||
}
|
||||
|
||||
public void setSpare1(String spare1)
|
||||
public void setSpare1(String spare1)
|
||||
{
|
||||
this.spare1 = spare1;
|
||||
}
|
||||
|
||||
public String getSpare1()
|
||||
public String getSpare1()
|
||||
{
|
||||
return spare1;
|
||||
}
|
||||
|
||||
public void setSpare2(String spare2)
|
||||
public void setSpare2(String spare2)
|
||||
{
|
||||
this.spare2 = spare2;
|
||||
}
|
||||
|
||||
public String getSpare2()
|
||||
public String getSpare2()
|
||||
{
|
||||
return spare2;
|
||||
}
|
||||
|
||||
public void setSpare3(String spare3)
|
||||
public void setSpare3(String spare3)
|
||||
{
|
||||
this.spare3 = spare3;
|
||||
}
|
||||
|
||||
public String getSpare3()
|
||||
public String getSpare3()
|
||||
{
|
||||
return spare3;
|
||||
}
|
||||
|
||||
public void setSpare4(String spare4)
|
||||
public void setSpare4(String spare4)
|
||||
{
|
||||
this.spare4 = spare4;
|
||||
}
|
||||
|
||||
public String getSpare4()
|
||||
public String getSpare4()
|
||||
{
|
||||
return spare4;
|
||||
}
|
||||
|
||||
public void setSpare5(String spare5)
|
||||
public void setSpare5(String spare5)
|
||||
{
|
||||
this.spare5 = spare5;
|
||||
}
|
||||
|
||||
public String getSpare5()
|
||||
public String getSpare5()
|
||||
{
|
||||
return spare5;
|
||||
}
|
||||
|
||||
public void setSpare6(String spare6)
|
||||
public void setSpare6(String spare6)
|
||||
{
|
||||
this.spare6 = spare6;
|
||||
}
|
||||
|
||||
public String getSpare6()
|
||||
public String getSpare6()
|
||||
{
|
||||
return spare6;
|
||||
}
|
||||
|
||||
public void setProductId(String productId)
|
||||
public void setProductId(String productId)
|
||||
{
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductId()
|
||||
public String getProductId()
|
||||
{
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductName(String productName)
|
||||
public void setProductName(String productName)
|
||||
{
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public String getProductName()
|
||||
public String getProductName()
|
||||
{
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setVoltage(String voltage)
|
||||
public void setVoltage(String voltage)
|
||||
{
|
||||
this.voltage = voltage;
|
||||
}
|
||||
|
||||
public String getVoltage()
|
||||
public String getVoltage()
|
||||
{
|
||||
return voltage;
|
||||
}
|
||||
|
||||
public void setPower(String power)
|
||||
public void setPower(String power)
|
||||
{
|
||||
this.power = power;
|
||||
}
|
||||
|
||||
public String getPower()
|
||||
public String getPower()
|
||||
{
|
||||
return power;
|
||||
}
|
||||
|
||||
public void setPhase(String phase)
|
||||
public void setPhase(String phase)
|
||||
{
|
||||
this.phase = phase;
|
||||
}
|
||||
|
||||
public String getPhase()
|
||||
public String getPhase()
|
||||
{
|
||||
return phase;
|
||||
}
|
||||
|
||||
public void setNetWeight(BigDecimal netWeight)
|
||||
public void setNetWeight(String netWeight)
|
||||
{
|
||||
this.netWeight = netWeight;
|
||||
}
|
||||
|
||||
public BigDecimal getNetWeight()
|
||||
public String getNetWeight()
|
||||
{
|
||||
return netWeight;
|
||||
}
|
||||
|
||||
public void setGrossWeight(BigDecimal grossWeight)
|
||||
public void setGrossWeight(String grossWeight)
|
||||
{
|
||||
this.grossWeight = grossWeight;
|
||||
}
|
||||
|
||||
public BigDecimal getGrossWeight()
|
||||
public String getGrossWeight()
|
||||
{
|
||||
return grossWeight;
|
||||
}
|
||||
|
||||
public void setDistribution(String distribution)
|
||||
public void setDistribution(String distribution)
|
||||
{
|
||||
this.distribution = distribution;
|
||||
}
|
||||
|
||||
public String getDistribution()
|
||||
public String getDistribution()
|
||||
{
|
||||
return distribution;
|
||||
}
|
||||
|
||||
public void setModel(String model)
|
||||
public void setModel(String model)
|
||||
{
|
||||
this.model = model;
|
||||
}
|
||||
|
||||
public String getModel()
|
||||
public String getModel()
|
||||
{
|
||||
return model;
|
||||
}
|
||||
|
||||
public void setOrderId(String orderId)
|
||||
public void setOrderId(String orderId)
|
||||
{
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public String getOrderId()
|
||||
public String getOrderId()
|
||||
{
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setSpare7(String spare7)
|
||||
public void setSpare7(String spare7)
|
||||
{
|
||||
this.spare7 = spare7;
|
||||
}
|
||||
|
||||
public String getSpare7()
|
||||
public String getSpare7()
|
||||
{
|
||||
return spare7;
|
||||
}
|
||||
|
||||
public void setSpare8(String spare8)
|
||||
public void setSpare8(String spare8)
|
||||
{
|
||||
this.spare8 = spare8;
|
||||
}
|
||||
|
||||
public String getSpare8()
|
||||
public String getSpare8()
|
||||
{
|
||||
return spare8;
|
||||
}
|
||||
|
||||
public void setCargoSpaceName(String cargoSpaceName)
|
||||
public void setCargoSpaceName(String cargoSpaceName)
|
||||
{
|
||||
this.cargoSpaceName = cargoSpaceName;
|
||||
}
|
||||
|
||||
public String getCargoSpaceName()
|
||||
public String getCargoSpaceName()
|
||||
{
|
||||
return cargoSpaceName;
|
||||
}
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
package com.ruoyi.stock.stock.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.annotation.Excels;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import org.springframework.ai.tool.annotation.ToolParam;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -24,164 +20,201 @@ import java.util.List;
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@ToString
|
||||
public class BasStock extends BaseEntity
|
||||
{
|
||||
public class BasStock extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 库存id */
|
||||
@Excel(name = "${stock.BasStock.stockId}")
|
||||
/**
|
||||
* 库存id
|
||||
*/
|
||||
@Excel(name = "库存id",sort=1)
|
||||
private String stockId;
|
||||
|
||||
/** 货位id */
|
||||
@Excel(name = "${stock.BasStock.cargoSpaceId}")
|
||||
/**
|
||||
* 货位id
|
||||
*/
|
||||
@Excel(name = "库位编码",sort=4)
|
||||
private String cargoSpaceId;
|
||||
/** 货位名称 */
|
||||
@Excel(name = "${stock.BasStock.cargoSpaceName}")
|
||||
/**
|
||||
* 货位名称
|
||||
*/
|
||||
private String cargoSpaceName;
|
||||
|
||||
/** 库存状态 */
|
||||
@Excel(name = "${stock.BasStock.stockStatus}", dictType = "stock_status")
|
||||
/**
|
||||
* 库存状态
|
||||
*/
|
||||
@Excel(name = "库存状态",sort=2,dictType = "stock_status")
|
||||
private String stockStatus;
|
||||
//货位库存状态
|
||||
@Excel(name = "${stock.BasStock.cargoSpaceStockStatus}", dictType = "cargo_space_status")
|
||||
private String cargoSpaceStockStatus;
|
||||
//货位是否锁定
|
||||
@Excel(name = "${stock.BasStock.cargoSpaceStatus}", dictType = "cargo_space_lock_status")
|
||||
private String cargoSpaceStatus;
|
||||
|
||||
/** 物料状态 */
|
||||
@Excel(name = "${stock.BasStock.productStatus}", dictType = "product_status")
|
||||
/**
|
||||
* 物料状态
|
||||
*/
|
||||
private String productStatus;
|
||||
|
||||
//额外字段
|
||||
@Excels({
|
||||
@Excel(name = "${stock.BasStock.productId}", targetAttr = "productId"),// 物料编码
|
||||
@Excel(name = "${stock.BasStock.materialDesc}", targetAttr = "materialDesc"),// 物料描述
|
||||
@Excel(name = "${stock.BasStock.englishDesc}", targetAttr = "englishDesc"),//物料英文描述
|
||||
@Excel(name = "${stock.BasStock.netWeight}", targetAttr = "netWeight"),//净重
|
||||
@Excel(name = "${stock.BasStock.length}",targetAttr = "length"),//长度
|
||||
@Excel(name = "${stock.BasStock.width}",targetAttr = "width"),//宽度
|
||||
@Excel(name = "${stock.BasStock.height}",targetAttr = "height"),//高度
|
||||
@Excel(name = "${stock.BasStock.volume}",targetAttr = "volume")//体积
|
||||
})
|
||||
private ExtraField extraField;
|
||||
|
||||
/** 物料编码 */
|
||||
// @Excel(name = "${stock.BasStock.productId}")
|
||||
/**
|
||||
* 物料编码
|
||||
*/
|
||||
@Excel(name = "物料编码",sort=6)
|
||||
private String productId;
|
||||
|
||||
//物料描述
|
||||
// @Excel(name = "${stock.BasStock.materialDesc}")
|
||||
private String materialDesc;
|
||||
|
||||
//物料英文描述
|
||||
// @Excel(name = "${stock.BasStock.englishDesc}")
|
||||
@Excel(name = "产品状态",sort=13,dictType = "product_type")
|
||||
private String spare1;
|
||||
|
||||
//净重
|
||||
// @Excel(name = "${stock.BasStock.netWeight}")
|
||||
private String spare2;
|
||||
|
||||
//长度
|
||||
// @Excel(name = "${stock.BasStock.length}")
|
||||
@Excel(name = "台次",sort=17)
|
||||
private String spare5;
|
||||
|
||||
//宽度
|
||||
// @Excel(name = "${stock.BasStock.width}")
|
||||
@Excel(name = "金额",sort=12)
|
||||
private String spare6;
|
||||
|
||||
//高度
|
||||
// @Excel(name = "${stock.BasStock.height}")
|
||||
@Excel(name = "盘点标识",sort=29,dictType = "check_flag")
|
||||
private String spare7;
|
||||
|
||||
//体积
|
||||
// @Excel(name = "${stock.BasStock.volume}")
|
||||
@Excel(name = "质量",sort=19,dictType = "quality_type")
|
||||
private String spare8;
|
||||
|
||||
private String voltage;
|
||||
@Excel(name = "件次",sort=18)
|
||||
private String power;
|
||||
private String phase;
|
||||
private String netWeight;
|
||||
private String grossWeight;
|
||||
private String distribution;
|
||||
private String model;
|
||||
@Excel(name = "合同号",sort=16)
|
||||
private String orderId;
|
||||
|
||||
/** 库存数量 */
|
||||
@Excel(name = "${stock.BasStock.quantity}")
|
||||
/**
|
||||
* 库存数量
|
||||
*/
|
||||
@Excel(name = "库存数量",sort=10)
|
||||
private String quantity;
|
||||
|
||||
/** 作业ID */
|
||||
@Excel(name = "${stock.BasStock.jobId}")
|
||||
/**
|
||||
* 作业ID
|
||||
*/
|
||||
private String jobId;
|
||||
|
||||
/** 托盘条码 */
|
||||
@Excel(name = "${stock.BasStock.trayCode}")
|
||||
/**
|
||||
* 托盘条码
|
||||
*/
|
||||
@Excel(name = "托盘",sort=5)
|
||||
private String trayCode;
|
||||
|
||||
/** 入库主单 */
|
||||
@Excel(name = "${stock.BasStock.stockinId}")
|
||||
/**
|
||||
* 入库主单
|
||||
*/
|
||||
@Excel(name = "入库单号",sort=21)
|
||||
private String stockinId;
|
||||
|
||||
/** 入库子单id */
|
||||
@Excel(name = "${stock.BasStock.stockinDetailId}")
|
||||
/**
|
||||
* 入库子单id
|
||||
*/
|
||||
private String stockinDetailId;
|
||||
|
||||
/** 入库类型 */
|
||||
@Excel(name = "${stock.BasStock.inType}")
|
||||
/**
|
||||
* 入库类型
|
||||
*/
|
||||
private String inType;
|
||||
|
||||
/** 仓库名称 */
|
||||
@Excel(name = "${stock.BasStock.warehouseName}")
|
||||
/**
|
||||
* 仓库名称
|
||||
*/
|
||||
@Excel(name = "仓库",sort=26)
|
||||
private String warehouseName;
|
||||
|
||||
/** 入库时间 */
|
||||
@Excel(name = "${stock.BasStock.inDate}")
|
||||
/**
|
||||
* 入库时间
|
||||
*/
|
||||
@Excel(name = "首次入库时间",sort=27)
|
||||
private String inDate;
|
||||
private String inDateStart;
|
||||
private String inDateEnd;
|
||||
|
||||
/** 批次号 */
|
||||
// @Excel(name = "${stock.BasStock.lotNo}")
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
private String lotNo;
|
||||
|
||||
/** 回流时间 */
|
||||
// @Excel(name = "${stock.BasStock.backDate}")
|
||||
@Excel(name = "盘点时间",sort=30)
|
||||
private String backDate;
|
||||
|
||||
/** 物料GUID */
|
||||
// @Excel(name = "${stock.BasStock.productGuid}")
|
||||
/**
|
||||
* 物料GUID
|
||||
*/
|
||||
private String productGuid;
|
||||
|
||||
/** 出库数量 */
|
||||
// @Excel(name = "${stock.BasStock.outQuantity}")
|
||||
/**
|
||||
* 出库数量
|
||||
*/
|
||||
private String outQuantity;
|
||||
|
||||
/** 入库班组ID */
|
||||
// @Excel(name = "${stock.BasStock.inClassId}")
|
||||
/**
|
||||
* 入库班组ID
|
||||
*/
|
||||
private String inClassId;
|
||||
|
||||
/** 仓库 */
|
||||
// @Excel(name = "${stock.BasStock.warehouseId}")
|
||||
/**
|
||||
* 仓库
|
||||
*/
|
||||
@Excel(name = "仓库编码",sort=24)
|
||||
private String warehouseId;
|
||||
|
||||
private String roadwayId;
|
||||
private String theFloor;
|
||||
private String thePlatoon;
|
||||
private String theColumn;
|
||||
|
||||
/** 垛型ID */
|
||||
// @Excel(name = "${stock.BasStock.stackingId}")
|
||||
|
||||
/**
|
||||
* 垛型ID
|
||||
*/
|
||||
@Excel(name = "最后出库时间",sort=28)
|
||||
private String stackingId;
|
||||
|
||||
/** 备用字段3 */
|
||||
// @Excel(name = "${stock.BasStock.spare3}")
|
||||
/**
|
||||
* 备用字段3
|
||||
*/
|
||||
@Excel(name = "套账",sort=3,dictType = "account_type" )
|
||||
private String spare3;
|
||||
|
||||
/** 备用字段4 */
|
||||
// @Excel(name = "${stock.BasStock.spare4}")
|
||||
|
||||
private String spare4;
|
||||
|
||||
|
||||
//物料名称
|
||||
// @Excel(name = "物料名称")
|
||||
@Excel(name = "产品名称",sort=7)
|
||||
private String productName;
|
||||
|
||||
private List<String> typeData;
|
||||
|
||||
|
||||
//供应商ID
|
||||
@Excel(name = "供应商",sort=22)
|
||||
private String supplierId;
|
||||
//供应商名称
|
||||
@Excel(name = "供应商名称",sort=23)
|
||||
private String supplierName;
|
||||
//产品状态
|
||||
private String productType;
|
||||
//库外
|
||||
private String outside;
|
||||
//规格
|
||||
@Excel(name = "规格",sort=8)
|
||||
private String spec;
|
||||
//常用编码
|
||||
@Excel(name = "常用编码",sort=20)
|
||||
private String parentId;
|
||||
//单价
|
||||
@Excel(name = "单价",sort=11)
|
||||
private String price;
|
||||
//单位
|
||||
@Excel(name = "单位",sort=14)
|
||||
private String unit;
|
||||
//图号
|
||||
@Excel(name = "图号",sort=15)
|
||||
private String cargoNo;
|
||||
@Excel(name = "备注",sort=31)
|
||||
private String remark;
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="inType" column="in_type" />
|
||||
<result property="inClassId" column="in_class_id" />
|
||||
<result property="warehouseId" column="warehouse_id" />
|
||||
<result property="warehouseName" column="warehouse_name" />
|
||||
<result property="stackingId" column="stacking_id" />
|
||||
<result property="spare1" column="spare1" />
|
||||
<result property="spare2" column="spare2" />
|
||||
@@ -29,6 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="spare4" column="spare4" />
|
||||
<result property="spare5" column="spare5" />
|
||||
<result property="spare6" column="spare6" />
|
||||
<result property="spare7" column="spare7" />
|
||||
<result property="spare8" column="spare8" />
|
||||
<result property="voltage" column="voltage" />
|
||||
<result property="power" column="power" />
|
||||
<result property="phase" column="phase" />
|
||||
@@ -43,31 +46,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="cargoSpaceName" column="cargo_space_name" />
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="productName" column="product_name" />
|
||||
<association property="extraField" javaType="ExtraField">
|
||||
<result property="spec" column="spec" />
|
||||
<result property="price" column="price" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="cargoNo" column="cargo_no" />
|
||||
<result property="parentId" column="parent_id" />
|
||||
<result property="supplierName" column="supplier_name" />
|
||||
<result property="supplierId" column="supplier_no" />
|
||||
<result property="remark" column="remark" />
|
||||
<!--<association property="extraField" javaType="ExtraField">
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="materialDesc" column="product_name" />
|
||||
<result property="englishDesc" column="englishDesc" />
|
||||
<result property="length" column="length" />
|
||||
<result property="width" column="width" />
|
||||
<result property="height" column="height" />
|
||||
<result property="volume" column="volume" />
|
||||
<result property="netWeight" column="netWeight" />
|
||||
</association>
|
||||
</association>-->
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBasStockVo">
|
||||
select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date,
|
||||
bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity,
|
||||
bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id,
|
||||
bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 ,
|
||||
bs.voltage,bs.power,bs.phase,bs.net_weight,bs.gross_weight,bs.distribution,bs.model,bs.order_id,
|
||||
bs.product_name,bp.spare1 as englishDesc,
|
||||
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,bs.product_id,
|
||||
bcs.locked,bcs.cargo_space_name,bcs.status as cargoSpaceStockStatus
|
||||
select bs.spare3, --账套
|
||||
bs.cargo_space_id, --库位编码
|
||||
bs.tray_code, --托盘
|
||||
bs.product_id, --产品编码
|
||||
bs.product_name,--产品名称
|
||||
bp.spec, -- 规格
|
||||
bs.quantity, -- 数量
|
||||
bs.spare6, -- 金额
|
||||
bp.price, --单价
|
||||
bp.spare1, --产品状态
|
||||
bp.unit, -- 单位
|
||||
bp.cargo_no, --图号
|
||||
bs.order_id, --合同号
|
||||
bs.spare5, --台次
|
||||
bs.power, --件次
|
||||
bs.spare8, --质量
|
||||
bp.parent_id, --常用编码
|
||||
bs.stockin_id, --入库单号
|
||||
bs2.supplier_name, --供应商名称
|
||||
bs2.supplier_no, --供应商编号
|
||||
bw.warehouse_id, --仓库编码
|
||||
bw.warehouse_name, --仓库名称
|
||||
bs.in_date, --入库时间
|
||||
bs.stacking_id, --出库时间
|
||||
bs.spare7, --盘点标识
|
||||
bs.back_date, --盘点时间
|
||||
bp.remark, --备注
|
||||
bs.stock_id, --库存编码
|
||||
bs.stock_status, --库存状态
|
||||
bs.lot_no --批次号
|
||||
from bas_stock bs
|
||||
left join bas_product bp on bs.product_id = bp.product_id
|
||||
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
|
||||
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
|
||||
left join bas_product bp on bs.product_id = bp.product_id
|
||||
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
|
||||
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
|
||||
left join bas_supplier bs2 on bs.phase = bs2.supplier_no
|
||||
</sql>
|
||||
|
||||
<select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
|
||||
@@ -109,6 +136,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="orderId != null and orderId != ''"> and bs.order_id = #{orderId}</if>
|
||||
<if test="productId != null and productId != ''"> and bs.product_id = #{productId}</if>
|
||||
<if test="cargoSpaceStockStatus != null and cargoSpaceStockStatus != ''"> and bcs.status = #{cargoSpaceStockStatus}</if>
|
||||
<if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
|
||||
<if test="theFloor != null and theFloor != ''"> and bcs.the_floor = #{theFloor}</if>
|
||||
<if test="thePlatoon != null and thePlatoon != ''"> and bcs.the_platoon = #{thePlatoon}</if>
|
||||
<if test="theColumn != null and theColumn != ''"> and bcs.the_column = #{theColumn}</if>
|
||||
<if test="spec != null and spec != ''"> and bp.spec = #{spec}</if>
|
||||
<if test="parentId != null and parentId != ''"> and bp.parent_id = #{parentId}</if>
|
||||
<if test="supplierId != null and supplierId != ''"> and bs2.supplier_no = #{supplierId}</if>
|
||||
<if test="supplierName != null and supplierName != ''"> and bs2.supplier_name = #{supplierName}</if>
|
||||
<if test="price != null and price != ''"> and bp.price = #{price}</if>
|
||||
<if test="inDateStart != null and inDateStart != ''"> and bs.in_date >= #{inDateStart}</if>
|
||||
<if test="inDateEnd != null and inDateEnd != ''"> and bs.in_date <= #{inDateEnd}</if>
|
||||
<if test="productType != null and productType != ''"> and bp.spare1 = #{productType}</if>
|
||||
|
||||
|
||||
</where>
|
||||
</select>
|
||||
|
||||
@@ -10,68 +10,7 @@ import lombok.NoArgsConstructor;
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ExtraField {
|
||||
@Excel(name = "序号")
|
||||
private String seqNo;
|
||||
|
||||
@Excel(name = "子件")
|
||||
private String subItem;
|
||||
|
||||
@Excel(name = "物料编码")
|
||||
@NotEmpty(message = "物料GUID不能为空")
|
||||
private String productId;
|
||||
|
||||
@Excel(name = "物料描述")
|
||||
private String materialDesc;
|
||||
|
||||
@Excel(name = "英文描述")
|
||||
private String englishDesc;
|
||||
|
||||
@Excel(name = "数量")
|
||||
@NotEmpty(message = "物料数量不能为空")
|
||||
private String quantity;
|
||||
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
@Excel(name = "单件净重Unit Net Weight")
|
||||
private String unitNetWeight;
|
||||
|
||||
@Excel(name = "总净重Total Net Weight")
|
||||
private String totalNetWeight;
|
||||
|
||||
@Excel(name = "箱号Carton NO.")
|
||||
private String cartonNo;
|
||||
|
||||
@Excel(name = "包装方式")
|
||||
private String packingMethod;
|
||||
|
||||
@Excel(name = "长(MM)")
|
||||
private String length;
|
||||
|
||||
@Excel(name = "宽(MM)")
|
||||
private String width;
|
||||
|
||||
@Excel(name = "高(MM)")
|
||||
private String height;
|
||||
|
||||
@Excel(name = "体积m³")
|
||||
private String volume;
|
||||
|
||||
@Excel(name = "净重(KG)NET WEIGHT")
|
||||
private String netWeight;
|
||||
|
||||
@Excel(name = "毛重(KG)GROSS WEIGHT")
|
||||
private String grossWeight;
|
||||
|
||||
@Excel(name = "单价")
|
||||
private String unitPrice;
|
||||
|
||||
@Excel(name = "总价")
|
||||
private String totalPrice;
|
||||
|
||||
@Excel(name = "备注")
|
||||
private String remark;
|
||||
|
||||
@Excel(name = "批次号")
|
||||
private String lotNo;
|
||||
private String spec;
|
||||
private String parentId;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import request from '@/utils/request'
|
||||
// 查询库存信息列表
|
||||
export function listManagement(query) {
|
||||
return request({
|
||||
url: '/out/handAllotStock/list',
|
||||
url: '/stock/management/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
|
||||
@@ -313,7 +313,7 @@ export default {
|
||||
created() {
|
||||
// 获取字典数据后，设置默认值
|
||||
this.getList()
|
||||
//this.getWarehouseList()
|
||||
this.getWarehouseList()
|
||||
},
|
||||
methods: {
|
||||
/** 获取仓库列表 */
|
||||
|
||||
@@ -1,55 +1,221 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="库存ID" prop="stockId"><!-- 库存id -->
|
||||
<el-input
|
||||
v-model="queryParams.stockId"
|
||||
placeholder="请输入库存ID"
|
||||
<el-form-item label="仓库" prop="warehouseId"><!--仓库-->
|
||||
<el-select
|
||||
v-model="queryParams.warehouseId"
|
||||
placeholder="请选择仓库"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货位编码" prop="cargoSpaceId"><!-- 货位id -->
|
||||
<el-input
|
||||
v-model="queryParams.cargoSpaceId"
|
||||
placeholder="请输入货位编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货位名称" prop="cargoSpaceName"><!-- 货位id -->
|
||||
<el-input
|
||||
v-model="queryParams.cargoSpaceName"
|
||||
placeholder="请输入货位名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="库存状态" prop="stockStatus"><!-- 库存状态 -->
|
||||
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
|
||||
@change="handleQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.stock_status"
|
||||
v-for="item in warehouseOptions"
|
||||
:key="item.warehouseId"
|
||||
:label="item.warehouseName"
|
||||
:value="item.warehouseId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="巷道" prop="roadwayId">
|
||||
<el-input
|
||||
v-model="queryParams.roadwayId"
|
||||
placeholder="请输入巷道"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="层" prop="theFloor">
|
||||
<el-input
|
||||
v-model="queryParams.theFloor"
|
||||
placeholder="请输入层"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="排" prop="thePlatoon">
|
||||
<el-input
|
||||
v-model="queryParams.thePlatoon"
|
||||
placeholder="请输入排"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="列" prop="theColumn">
|
||||
<el-input
|
||||
v-model="queryParams.theColumn"
|
||||
placeholder="请输入列"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料编码" prop="productId">
|
||||
<el-input
|
||||
v-model="queryParams.productId"
|
||||
placeholder="请输入物料编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="spec">
|
||||
<el-input
|
||||
v-model="queryParams.spec"
|
||||
placeholder="请输入规格型号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="常用编码" prop="parentId">
|
||||
<el-input
|
||||
v-model="queryParams.parentId"
|
||||
placeholder="请输入常用编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="供应代号" prop="supplierId">
|
||||
<el-input
|
||||
v-model="queryParams.supplierId"
|
||||
placeholder="请输入供应商代号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="供应名称" prop="supplierName">
|
||||
<el-input
|
||||
v-model="queryParams.supplierName"
|
||||
placeholder="请输入供应商名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料名称" prop="productName">
|
||||
<el-input
|
||||
v-model="queryParams.productName"
|
||||
placeholder="请输入物料名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="入库单号" prop="stockinId">
|
||||
<el-input
|
||||
v-model="queryParams.stockinId"
|
||||
placeholder="请输入入库单号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单价" prop="price">
|
||||
<el-input
|
||||
v-model="queryParams.price"
|
||||
placeholder="请输入单价"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="托盘号" prop="trayCode">
|
||||
<el-input
|
||||
v-model="queryParams.trayCode"
|
||||
placeholder="请输入托盘号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同号" prop="orderId">
|
||||
<el-input
|
||||
v-model="queryParams.orderId"
|
||||
placeholder="请输入合同号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="用途" prop="spare4">
|
||||
<el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.purpose_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="入库时间" prop="startDate"><!– 入库时间 –>
|
||||
<el-form-item label="起始时间" prop="inDateStart">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.inDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择入库时间">
|
||||
v-model="queryParams.inDateStart"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择起始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>-->
|
||||
|
||||
|
||||
<el-form-item label="物料名称" prop="productName"><!-- 物料描述 -->
|
||||
</el-form-item>
|
||||
<el-form-item label="截止日期" prop="inDateEnd">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.inDateEnd"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择截止时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="周转类型" prop="voltage">
|
||||
<el-select v-model="queryParams.voltage" placeholder="请选择周转类型" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.turnover_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="来源" prop="spare1">
|
||||
<el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.origin_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="套账" prop="spare3">
|
||||
<el-select v-model="queryParams.spare3" placeholder="请选择套账" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.account_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="形态类型" prop="productType">
|
||||
<el-select v-model="queryParams.productType" placeholder="请选择形态类型" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.product_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="台次" prop="spare5">
|
||||
<el-input
|
||||
v-model="queryParams.productName"
|
||||
placeholder="请输入物料名称"
|
||||
v-model="queryParams.spare5"
|
||||
placeholder="请输入台次"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="件次" prop="power">
|
||||
<el-input
|
||||
v-model="queryParams.power"
|
||||
placeholder="请输入件次"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="库外" prop="outside">
|
||||
<el-input
|
||||
v-model="queryParams.outside"
|
||||
placeholder="请输入库外"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
@@ -101,36 +267,54 @@
|
||||
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
|
||||
<el-table-column type="selection" align="center" />
|
||||
<el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
|
||||
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
|
||||
<el-table-column label="库存状态" align="center" prop="stockStatus" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料编码" align="center" prop="productId" />
|
||||
<el-table-column label="物料名称" align="center" prop="productName" width="160"/>
|
||||
<el-table-column label="批次号" align="center" prop="lotNo" />
|
||||
<el-table-column label="订单号" align="center" prop="orderId" width="160"/>
|
||||
<el-table-column label="入库时间" align="center" prop="inDate" width="160"/>
|
||||
<el-table-column label="数量" align="center" prop="quantity" />
|
||||
<el-table-column label="作业编码" align="center" prop="jobId" width="160"/>
|
||||
<el-table-column label="出库数量" align="center" prop="outQuantity" />
|
||||
<el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160"/>
|
||||
<el-table-column label="套账" align="center" prop="spare3">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="库位编码" align="center" prop="cargoSpaceId" width="160"/>
|
||||
<el-table-column label="托盘" align="center" prop="trayCode"/>
|
||||
<el-table-column label="产品编码" align="center" prop="productId"/>
|
||||
<el-table-column label="产品名称" align="center" prop="productName" width="160" />
|
||||
<el-table-column label="规格" align="center" prop="spec" width="160"/>
|
||||
<el-table-column label="数量" align="center" prop="quantity"/>
|
||||
<el-table-column label="单价" align="center" prop="price"/>
|
||||
<el-table-column label="金额" align="center" prop="spare6"/>
|
||||
<el-table-column label="产品状态" align="center" prop="spare1">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.product_type" :value="scope.row.spare1"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" prop="unit"/>
|
||||
<el-table-column label="图号" align="center" prop="cargoNo"/>
|
||||
<el-table-column label="合同号" align="center" prop="orderId"/>
|
||||
<el-table-column label="台次" align="center" prop="spare5"/>
|
||||
<el-table-column label="件次" align="center" prop="power"/>
|
||||
<el-table-column label="质量" align="center" prop="spare8">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="常用编码" align="center" prop="parentId"/>
|
||||
<el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
|
||||
<!-- <el-table-column label="入库类型" align="center" prop="inType" />-->
|
||||
<!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
|
||||
<el-table-column label="规格" align="center" prop="spare1" />
|
||||
<el-table-column label="单位" align="center" prop="spare3" />
|
||||
<el-table-column label="型号" align="center" prop="spare4" />
|
||||
<el-table-column label="颜色" align="center" prop="spare5" />
|
||||
<el-table-column label="序列号" align="center" prop="spare6" />
|
||||
<el-table-column label="电压" align="center" prop="voltage" />
|
||||
<el-table-column label="功率" align="center" prop="power" />
|
||||
<el-table-column label="相位" align="center" prop="phase" />
|
||||
<el-table-column label="净重" align="center" prop="netWeight" />
|
||||
<el-table-column label="毛重" align="center" prop="grossWeight" />
|
||||
<el-table-column label="分销" align="center" prop="distribution" />
|
||||
<el-table-column label="机型" align="center" prop="model" />
|
||||
<el-table-column label="供应商编码" align="center" prop="supplierId" width="160"/>
|
||||
<el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
|
||||
<el-table-column label="仓库编码" align="center" prop="warehouseId"/>
|
||||
<el-table-column label="仓库名称" align="center" prop="warehouseName"/>
|
||||
<el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
|
||||
<el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
|
||||
<el-table-column label="盘点标识" align="center" prop="spare7">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.check_flag" :value="scope.row.spare7"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>
|
||||
<el-table-column label="备注" align="center" prop="remark"/>
|
||||
<el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@@ -342,13 +526,14 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
|
||||
import {addManagement, delManagement, getManagement, listManagement, updateManagement} from "@/api/stock/management"
|
||||
import {listWarehouse} from "@/api/bas/warehouse"
|
||||
import { listBasProduct } from "@/api/bas/BasProduct"
|
||||
import { listCargoSpace } from "@/api/bas/cargoSpace"
|
||||
import {listBasProduct} from "@/api/bas/BasProduct"
|
||||
import {listCargoSpace} from "@/api/bas/cargoSpace"
|
||||
|
||||
export default {
|
||||
name: "Management",
|
||||
dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
|
||||
dicts: ['product_status','check_flag', 'stock_status','cargo_space_status','cargo_space_lock_status','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
@@ -399,7 +584,8 @@ export default {
|
||||
spare3: null,
|
||||
spare4: null,
|
||||
spare5: null,
|
||||
spare6: null
|
||||
spare6: null,
|
||||
theFloor: null,
|
||||
},
|
||||
queryWarehouse: {
|
||||
pageNum:1,
|
||||
|
||||
Reference in New Issue
Block a user