art: 物料台账-相关接口修改

zhangherong

2 天以前 b29a1cb6fbca3cf8cf1d307c4c519ae2047c9b18

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java

@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

@@ -59,21 +60,31 @@
   /**库存类型*/
   @Excel(name = "库存类型", width = 15)
    @ApiModelProperty(value = "库存类型")
    @Dict(dicCode = "material_inventory_category")
    private String inventoryCategory;
   /**数量*/
   @Excel(name = "数量", width = 15)
    @ApiModelProperty(value = "数量")
    private BigDecimal quantity;
   /**库存地ID*/
   @Excel(name = "库存地ID", width = 15)
   @Excel(name = "库存地", width = 15)
    @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
    @ApiModelProperty(value = "库存地ID")
    private String warehouseId;
    @TableField(exist = false)
    @ApiModelProperty(value = "库存地")
    private String warehouseName;
    private String warehouseId;
   /**库存状态*/
   @Excel(name = "库存状态", width = 15)
    @ApiModelProperty(value = "库存状态")
    @Dict(dicCode = "material_inventory_status")
    private String inventoryStatus;

    public LswMaterialInventory(){}

    public LswMaterialInventory(LswMaterialInbound inbound, String materialId, String inventoryCategory) {
        this.warehouseId = inbound.getWarehouseId();
        this.quantity = inbound.getQuantity();
        this.batchNumber = inbound.getBatchNumber();
        this.inventoryStatus = MaterialInventoryStatusEnum.NORMAL.name();
        this.inventoryCategory = inventoryCategory;
        this.materialId = materialId;
    }
}