From 15e9d370a9bdf0582212fe2e24be8e9c9542d2c5 Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: Thu, 06 Jul 2023 13:32:15 +0800
Subject: [PATCH] 修改采购价格级联修改试剂价格

---
 src/main/java/com/nanometer/smartlab/entity/OpeApply.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 5 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..8365d57 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
@@ -2,6 +2,7 @@
 
 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;
@@ -67,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;
@@ -99,6 +104,9 @@
     private BigDecimal applyPrice;
     private int stockFlag;
     private String stockFlagValue;
+    //用于存放仓库 和仓库货柜的id
+    private String warehouseId;
+    private String warehouseContainerId;
 
     public String getStockFlagValue() {
         return stockFlagValue;
@@ -129,7 +137,7 @@
     }
 
     public void setApplyGoal(String applyGoal) {
-        this.applyGoal = applyGoal;
+        this.applyGoal = Validator.filter(applyGoal);
     }
 
     public String getId() {
@@ -153,7 +161,7 @@
     }
 
     public void setNum(Integer num) {
-        this.num = num;
+        this.num = Integer.parseInt(Validator.filter(num.toString()));
     }
 
     public String getApplyUserId() {
@@ -169,7 +177,7 @@
     }
 
     public void setObjective(String objective) {
-        this.objective = objective;
+        this.objective = Validator.filter(objective);
     }
 
     public Timestamp getCreateTime() {
@@ -207,7 +215,7 @@
         this.beforeApproveUserId=beforeApproveUserId;
     }
     public void setApproveUserId(String approveUserId) {
-        this.approveUserId = approveUserId;
+        this.approveUserId = Validator.filter(approveUserId);
     }
 
     public String getMemo() {
@@ -356,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;
@@ -382,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;
+    }
 }

--
Gitblit v1.9.2