Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -492,9 +492,9 @@ public class WmsEnumUtil {
         OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
         NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
         SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
-        NC_DISMANTLING_PICKING(160,"NC_DISMANTLING_PICKING","NC拆解领料"),
-        NC_DISMANTLING_RETREAT(170,"NC_DISMANTLING_RETREAT","NC拆解退料"),
-        LINE_EDGE_SCRAPPING_OUT(180,"LINE_EDGE_SCRAPPING_OUT","线边报废出库");
+        NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
+        NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
+        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库");
 
 
         private int value;
@@ -851,7 +851,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废");
+        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废");
 
         private int value;
         private String code;
@@ -896,10 +896,13 @@ public class WmsEnumUtil {
         }
 
         public static STOCK_SN_QC_STATUS codeOf(Integer value) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == value) {
-                    return values()[i];
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
                 }
             }
             return null;
@@ -919,7 +922,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        CS_ORDER_TYPE(int value,String description) {
+        CS_ORDER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -948,12 +951,12 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ORDER_STATUS {
-        CREATE(10,"CREATE", "创建"),
-        STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"),
-        IN_INVENTORY(30,"IN_INVENTORY", "盘点中"),
-        INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"),
-        THAWING(50,"THAWING", "已解冻"),
-        CLOSED(60, "CLOSED","已关闭");
+        CREATE(10, "CREATE", "创建"),
+        STARTING_INVENTORY(20, "STARTING_INVENTORY", "开启盘点"),
+        IN_INVENTORY(30, "IN_INVENTORY", "盘点中"),
+        INVENTORY_FINISH(40, "INVENTORY_FINISH", "盘点完成"),
+        THAWING(50, "THAWING", "已解冻"),
+        CLOSED(60, "CLOSED", "已关闭");
 
         private int value;
         private String code;
@@ -1725,7 +1728,7 @@ public class WmsEnumUtil {
         ZONE(20, "ZONE", "存储区对象"),
         LOCATE(30, "LOCATE", "库位对象"),
         MATERIAL(40, "MATERIAL", "物料对象"),
-        TRANS_TYPE(50,"TRANS_TYPE","交易代码对象");
+        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
 
         private String code;
         private String description;
@@ -2476,12 +2479,12 @@ public class WmsEnumUtil {
         }
     }
 
-  /**
+    /**
      * 物料类型（用于物料）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(1,"原材料"), PARTIALLY_PREPARED_PRODUCTS(2,"半成品"), FINISHED_PRODUCT(3,"成品");
+        RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品");
 
         private int value;
         private String description;