合并冲突

6 years ago · 54d3e351be
parent e5767574fe
commit 54d3e351be
1 changed files with 1 additions and 1 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -368,7 +368,7 @@ public class WmsEnumUtil {
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum PRODUCT_INSTOCK_STATUS {
-        CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错");
+        CREATE(10, "创建"), FINISH(20, "已处理"), FAIL(30, "处理出错"),CREATE_DOCMOVE(40, "生成移库单"),PULL_FAIL(50, "拉动出错");

        private int value;
        private String description;