库房状态管理

lyfO_o

2022-02-28 b6576a4db959d2551e343a8bb0045aa67387aacc

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

@@ -2,10 +2,12 @@

import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.util.Validator;

import java.io.Serializable;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*;

/**
 * Created by johnny on 17/11/23.
@@ -66,10 +68,14 @@
    private SysReagent reagent;

    private String applyUserName;
    private String applyUserProject;
    private String applyUserDepartment;

    private String approveUserName;

    private String secondUserName;

    private ApplyStatus orderStatus;

    public String getSecondUserName() {
        return secondUserName;
@@ -84,6 +90,7 @@
    private String articleNumber;
    private String startReagentCode;
    private String endReagentCode;
    private List<String> reagentCodeList;
    private String houseId;
    private String containerId;
    private String placeId;
@@ -97,6 +104,9 @@
    private BigDecimal applyPrice;
    private int stockFlag;
    private String stockFlagValue;
    //用于存放仓库 和仓库货柜的id
    private String warehouseId;
    private String warehouseContainerId;

    public String getStockFlagValue() {
        return stockFlagValue;
@@ -127,7 +137,7 @@
    }

    public void setApplyGoal(String applyGoal) {
        this.applyGoal = applyGoal;
        this.applyGoal = Validator.filter(applyGoal);
    }

    public String getId() {
@@ -151,7 +161,7 @@
    }

    public void setNum(Integer num) {
        this.num = num;
        this.num = Integer.parseInt(Validator.filter(num.toString()));
    }

    public String getApplyUserId() {
@@ -167,7 +177,7 @@
    }

    public void setObjective(String objective) {
        this.objective = objective;
        this.objective = Validator.filter(objective);
    }

    public Timestamp getCreateTime() {
@@ -205,7 +215,7 @@
        this.beforeApproveUserId=beforeApproveUserId;
    }
    public void setApproveUserId(String approveUserId) {
        this.approveUserId = approveUserId;
        this.approveUserId = Validator.filter(approveUserId);
    }

    public String getMemo() {
@@ -328,9 +338,15 @@
      this.projectId = projectId;
   }

    public List<String> getReagentCodeList() {
        return reagentCodeList;
    }

    public void setReagentCodeList(List<String> reagentCodeList) {
        this.reagentCodeList = reagentCodeList;
    }

   public String getProjectOwner() {
    public String getProjectOwner() {
      return projectOwner;
   }

@@ -348,7 +364,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;
@@ -374,4 +406,29 @@
        sb.append('}');
        return sb.toString();
    }


    public ApplyStatus getOrderStatus() {
        return orderStatus;
    }

    public void setOrderStatus(ApplyStatus orderStatus) {
        this.orderStatus = orderStatus;
    }

    public String getApplyUserProject() {
        return applyUserProject;
    }

    public void setApplyUserProject(String applyUserProject) {
        this.applyUserProject = applyUserProject;
    }

    public String getApplyUserDepartment() {
        return applyUserDepartment;
    }

    public void setApplyUserDepartment(String applyUserDepartment) {
        this.applyUserDepartment = applyUserDepartment;
    }
}