From 36e7eed5fec38533b9ced6b976d8b9a81364f370 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 08 十月 2024 10:13:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx_basefun_提货单优化' into master-xlk-test
---
phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeDto.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 f98e459..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;
@@ -71,7 +79,10 @@
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 +92,11 @@
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