取消领用

gdg

2021-02-03 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73

 src/main/java/com/nanometer/smartlab/entity/OpeApply.java

@@ -99,6 +99,9 @@
    private BigDecimal applyPrice;
    private int stockFlag;
    private String stockFlagValue;
    //用于存放仓库 和仓库货柜的id
    private String warehouseId;
    private String warehouseContainerId;

    public String getStockFlagValue() {
        return stockFlagValue;
@@ -356,7 +359,23 @@
      this.ownerDepartment = ownerDepartment;
   }

   @Override
    public String getWarehouseId() {
        return warehouseId;
    }

    public void setWarehouseId(String warehouseId) {
        this.warehouseId = warehouseId;
    }

    public String getWarehouseContainerId() {
        return warehouseContainerId;
    }

    public void setWarehouseContainerId(String warehouseContainerId) {
        this.warehouseContainerId = warehouseContainerId;
    }

    @Override
   public int compareTo(OpeApply o) {
        if(this.projectOwner == null || o.getProjectOwner() == null){
            return 1;