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/StockBackDto.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockBackDto.java b/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockBackDto.java
index 643da44..50e62c2 100644
--- a/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockBackDto.java
+++ b/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockBackDto.java
@@ -11,14 +11,37 @@
@Data
public class StockBackDto {
/************************蹇呭～******************************/
- /**鍑哄叆搴撳崟鐨勬爣璇�*/
+ /**鍑哄叆搴撳崟鐨勬爣璇�(涓庣紪鍙峰繀濉竴涓�)*/
private String commonId;
+ /**鍑哄叆搴撳崟缂栧彿(涓庢爣璇嗗繀濉竴涓�)*/
+ private String commonNo;
+ /**鎿嶄綔浜虹被鍨�(鍏蜂綋鐪嬪涓嬪父閲�)*/
+ private Integer opType;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String opId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String opName;
+ /**鎿嶄綔浜哄娉�*/
+ private String opRemark;
/************************闈炲繀濉�*************************/
/**绫诲瀷(鍏蜂綋鐪嬩笅闈㈢殑甯搁噺)*/
private Integer commonType;
+ /************************闈炲繀濉�******************************/
+ /**鎻愯揣鍗曠殑鏍囪瘑*/
+ private String id;
+
+ /**鎿嶄綔浜虹被鍨�-绯荤粺*/
+ public static Integer OP_TYPE_SYS = 0;
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static Integer OP_TYPE_EMPLOYEE = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
+ public static Integer OP_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static Integer OP_TYPE_ADMIN = 3;
+
/**绫诲瀷锛氬嚭搴撳崟閫�鍥�*/
public static Integer COMMON_TYPE_OUT = 0;
/**绫诲瀷锛氬叆搴撳崟閫�鍥�*/
--
Gitblit v1.8.0