Merge remote-tracking branch 'origin/dev' into dev

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/warehouseFactory/WarehouseFactoryOperationTypeEnum.java

@@ -0,0 +1,59 @@
+package com.zt.plat.module.erp.enums.warehouseFactory;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 仓库工厂关系-库位绑定ERP库位操作类型(字典: WAREHOUSE_OPERATION)
+ * 枚举(字典: WAREHOUSE_OPERATION)
+ *
+ */
+public enum WarehouseFactoryOperationTypeEnum {
+    OUT("SHIPPING","出库"),
+    INTO("RECEIVING","入库"),
+    MOVE("MOVE","移库"),
+    ;
+
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    WarehouseFactoryOperationTypeEnum(String code, String name){
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static WarehouseFactoryOperationTypeEnum getEnumByCode(String code){
+        for (WarehouseFactoryOperationTypeEnum e : WarehouseFactoryOperationTypeEnum.values()) {
+            if (e.getCode().equals(code)) {
+                return e;
+            }
+        }
+        return OUT;
+    }
+
+    public static WarehouseFactoryOperationTypeEnum getEnumByName(String name){
+        if (StringUtils.isEmpty(name)) return OUT;
+        for (WarehouseFactoryOperationTypeEnum e : WarehouseFactoryOperationTypeEnum.values()) {
+            if (name.equals(e.getName())) {
+                return e;
+            }
+        }
+        return OUT;
+    }
+
+}

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/WarehouseFactoryDO.java

@@ -40,12 +40,12 @@ public class WarehouseFactoryDO extends BusinessBaseDO {
     @TableField("CPN_ID_CST")
     private String companyIdCustom;
     /**
-    * 操作类型
+    * 操作类型(字典: WAREHOUSE_OPERATION)
     */
     @TableField("OPTN_TP")
     private String operationType;
     /**
-    * 业务类型
+    * 业务类型(字典: SPLY_BSN_TP)
     */
     @TableField("MMSI_TP")
     private String mmsiType;