From 39e49bdfab3d77951f2a9b22f84a22d7980de8b7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 22 四月 2021 15:54:33 +0800
Subject: [PATCH] 1、新增物品类型表可维护物品类型2、新增物品的出入库操作 无需进行走申请流程3、部分查询条件优化

---
 java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
index d5bf2e0..c5812b7 100644
--- a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
@@ -21,6 +21,11 @@
     public static final String RES_ORDER_TYPE_OUT = "20000"; //鍑哄簱
     public static final String STATE_WAIT_DEAL = "1000"; // 绛夊緟澶勭悊
     public static final String STATE_DEALING = "1001"; // 瀹℃牳涓�
+    public static final String STATE_AUDITED = "1002"; // 宸插鏍�
+    public static final String STATE_END = "1003"; // 瀹岀粨
+    public static final String STATE_NOT_PASS = "1004"; // 鏈�氳繃
+    public static final String WAREHOUSING_TYPE_DIRECT = "10000"; // 鐩存帴鍏ュ簱/鍑哄簱
+    public static final String WAREHOUSING_TYPE_APPLY = "20000"; // 閲囪喘鐢宠鍏ュ簱/鍑哄簱
 
     private String resOrderType;
     private String description;
@@ -46,6 +51,9 @@
     private String staffName;
     private String staffTel;
     private String startUserId;
+    private String warehousingWay;
+    private String createUserId;
+    private String createUserName;
 
     public String getResOrderType() {
         return resOrderType;
@@ -241,4 +249,27 @@
         this.startUserId = startUserId;
     }
 
+    public String getWarehousingWay() {
+        return warehousingWay;
+    }
+
+    public void setWarehousingWay(String warehousingWay) {
+        this.warehousingWay = warehousingWay;
+    }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
 }

--
Gitblit v1.8.0