Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-dependency-common

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -1208,7 +1208,8 @@ public class Constant {
     public enum IntoStatus {
         DAIRUKU("入库状态-待入库"),
         RUKUZHONG("入库状态-入库中"),
-        YIRUKU("入库状态-已入库");
+        YIRUKU("入库状态-已入库"),
+        ZUOFEI("入库状态-作废");
 
         private String name;
 

src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -81,7 +81,8 @@ public enum ErrorCodeEnum {
     SKU_IS_NOT_IN_INVENTORY(11101,"当前出库商品中在库存中不存在！"),
     CAN_OUTBOUND_QUANTITY_INSUFFICIENT(11102,"可出库数量不足！"),
 
-
+    NO_WAIT_INTO_RETURN(11104, "非出库中单据不能编辑"),
+    NO_WAIT_INTO_RETURN_CANCEL(11105, "已出库单据不能作废"),
 
     CUSTOMER_FOLLOW_MEASURE_STATUS_DONE(8007, "当前预约量尺已填写回执"),
     ;