From 7a91150efbb08fbc6f900316c9a4d176e8c7ddbd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 30 四月 2021 13:57:10 +0800
Subject: [PATCH] 优化合同支付功能

---
 java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 41 insertions(+), 7 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 7c5797f..c7dd326 100755
--- a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
@@ -19,9 +19,13 @@
 
     public static final String RES_ORDER_TYPE_ENTER = "10000"; //閲囪喘鍏ュ簱
     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;
@@ -36,11 +40,8 @@
     private String endUserName;
     private String endUserTel;
     private List<PurchaseApplyDetailVo> purchaseApplyDetailVo;
-
     private String createTime;
-
     private String statusCd = "0";
-
     private String currentUserId;
     private String processInstanceId;
     private String taskId;
@@ -50,9 +51,10 @@
     private String staffName;
     private String staffTel;
     private String startUserId;
-
-
-
+    private String warehousingWay;
+    private String createUserId;
+    private String createUserName;
+    private String price;
 
     public String getResOrderType() {
         return resOrderType;
@@ -247,4 +249,36 @@
     public void setStartUserId(String startUserId) {
         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;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
 }

--
Gitblit v1.8.0