From f62331cf962471b14a33a019665a600342c4c3d7 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 24 九月 2024 14:42:43 +0800
Subject: [PATCH] 提货单接口修改

---
 phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeDto.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeDto.java b/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeDto.java
index b7d7a6a..de40c96 100644
--- a/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeDto.java
+++ b/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeDto.java
@@ -27,10 +27,16 @@
     private String opShopId;
     /**澶囨敞淇℃伅*/
     private String remarks;
+    /**鍑哄簱鍒嗙被*/
+    private Integer type;
     /**搴撳瓨鏀瑰彉鏄庣粏*/
     List<StockChangeItemDto> stockItemList;
 
     /************************闈炲繀濉�******************************/
+    /**鍏宠仈鐨刬d,鍏ュ簱鍗曞叧鑱旂殑鍑哄簱鍗�*/
+    private String oldId;
+    /**鍏宠仈鐨勫崟鍙�,鍏ュ簱鍗曞叧鑱旂殑鍑哄簱鍗�*/
+    private String oldNumbers;
     /**鍑哄叆搴撲汉鏍囪瘑(鍛樺伐)*/
     private String opStockId;
     /**鍑哄叆搴撲汉鏍囪瘑(鍛樺伐)鍚�*/
@@ -57,6 +63,8 @@
     private String customerName;
     /**鍙戠エ鍙�*/
     private String bill;
+    /**閲戝崥鍑哄簱绫诲瀷(GoldOtherOutEnum浼燾ode)*/
+    private Integer goldOutType;
 
 
 
@@ -65,15 +73,16 @@
     /**鍏宠仈鐨勫叕鍏辩被鍨�-鍒掓墸姝e父鍑哄簱*/
     public static Integer COMMON_TYPE_BUCKLE = 1;
     /**鍏宠仈鐨勫叕鍏辩被鍨�-鍒掓墸淇敼鍑哄簱*/
-    public static Integer COMMON_TYPE_UPDATE_OUT = 1;
+    public static Integer COMMON_TYPE_UPDATE_OUT = 2;
 
     /**鍏宠仈鐨勫叕鍏辩被鍨�-鍒掓墸淇敼鍏ュ簱*/
-    public static Integer COMMON_TYPE_UPDATE_IN = 2;
-    /**鍏宠仈鐨勫叕鍏辩被鍨�-鍒掓墸浣滃簾鍏ュ簱*/
-    public static Integer COMMON_TYPE_BUCKLE_INVALID = 3;
+    public static Integer COMMON_TYPE_UPDATE_IN = 3;
     /**鍏宠仈鐨勫叕鍏辩被鍨�-鍟嗗搧閫�鍥炲叆搴�*/
     public static Integer COMMON_TYPE_GOODS_RETURN = 4;
-
+    /**鍏宠仈鐨勫叕鍏辩被鍨�-璋冩嫧/绉诲簱鍑哄簱*/
+    public static Integer COMMON_TYPE_MOVE_OUT = 5;
+    /**鍏宠仈鐨勫叕鍏辩被鍨�-璋冩嫧/绉诲簱鍏ュ簱*/
+    public static Integer COMMON_TYPE_MOVE_IN = 6;
 
     /**鍒涘缓浜虹被鍨�-绯荤粺*/
     public static Integer CREATE_TYPE_SYS = 0;
@@ -81,4 +90,13 @@
     public static Integer CREATE_TYPE_EMPLOYEE = 1;
     /**鍒涘缓浜虹被鍨�-鐢ㄦ埛*/
     public static Integer CREATE_TYPE_USER = 2;
+    /**鍒涘缓浜虹被鍨�-鍚庡彴绠$悊鍛�*/
+    public static Integer CREATE_TYPE_ADMIN = 3;
+
+    /**鍑哄簱鍒嗙被-鎻愯揣鍗�*/
+    public static Integer ORDER_CLASSIFY_PICK_UP = 0;
+    /**鍑哄簱鍒嗙被-鍒掓墸*/
+    public static Integer ORDER_CLASSIFY_GIVE = 1;
+    /**鍑哄簱鍒嗙被-鎵撶増*/
+    public static Integer ORDER_CLASSIFY_PRINTING = 2;
 }

--
Gitblit v1.8.0