From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 22 二月 2021 10:34:59 +0800
Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序

---
 src/main/java/com/nanometer/smartlab/entity/OpeApply.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
index c35ed83..e2eba2e 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
+++ b/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;

--
Gitblit v1.9.2