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

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java

@@ -896,9 +896,12 @@ public class MesExtEnumUtil {
             shape = JsonFormat.Shape.OBJECT
     )
     public static enum SHIPPING_GROUP_ROUND_METHOD {
-        GENERATE_BY_ORDER(10, "按订单生成"),
-        ADJUST_BY_WINDOW_TIME(20, "按窗口时间调整"),
-        ROUND_ACCORDING_TO_PARTS(30, "按零件园整");
+        ADJUST_BY_WINDOW_TIME(10, "按窗口时间圆整"),
+        GENERATE_BY_ORDER(20, "按包装圆整"),
+        ROUND_ACCORDING_TO_PARTS(30, "按零件圆整"),
+        ROUND_ACCORDING_TO_ORDER(30, "按订单生成"),
+        ROUND_ACCORDING_TO_PACK_PARTS(30, "按包装零件切换圆整"),
+        CUST_ORDER_IMPORT(30, "客户订单导入专用");
 
         private int value;
         private String description;