Merge remote-tracking branch 'origin/master'

jiangping

2024-10-16 b27b54d5dda5a2525a17d8d134a2a93c2ba09893

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -122,7 +122,7 @@
    public static final String HK_NGINX_URL = "HK_NGINX_URL";
    public static final String PLATFORM_BOOKING_TIPS = "PLATFORM_BOOKING_TIPS";
    public static final String PLATFORM_GUIDEMAP = "PLATFORM_GUIDEMAP";
    public static final String WSM_PARAM ="WSM_PARAM" ;
    public static final String WMS_PARAM ="WMS_PARAM" ;
    public static final String WMS_INBOUND_PLATFROM_URL ="WMS_INBOUND_PLATFROM_URL" ;
    public static final String WMS_GET_INVENTORYLIST_URL ="WMS_GET_INVENTORYLIST_URL" ;
    public static final String WMS_OUTBOUND_PLATFROM_URL ="WMS_OUTBOUND_PLATFROM_URL" ;
@@ -674,7 +674,8 @@

    public  enum PlatformWarnEvent {
        STOP_TIMEOUT(0, "停靠超时","${carCode}月台停靠超时" ),
        STOP_ERROR(1, "停靠错误","${carCode}月台停靠错误" );
        STOP_ERROR(1, "停靠错误","${carCode}月台停靠错误" ),
        WORK_TIMEOUT(2, "作业超时","${carCode}作业超时" );

        // 成员变量
        private int key;
@@ -799,6 +800,7 @@
        WORKING(3, "作业中","${param} ${param2} 作业中" ),
        WRONG_IN(4, "错误停靠","${param} ${param2} 当前车辆错误停靠，请尽快驶离" ),
        TIMEOUT_IN(5, "超时停靠","${param} ${param2} 当前车辆超时停靠，请尽快驶离" ),
        TIMEOUT_WORK(6, "作业超时","${param} ${param2} 当前车辆作业超时" ),
        ;

        // 成员变量
@@ -851,12 +853,14 @@
     2. 作业完成：皖A12345作业完成，请尽快驶离
     3. 错误停靠：皖A12345月台停靠错误，请尽快驶离
     4. 超时停靠：皖A12345月台停靠超时，请尽快驶离请尽快驶离
     5. 作业超时：皖A12345月台停靠超时，请尽快驶离请尽快驶离
     */
    public  enum PlatformBroadcastContent {
        CALLING(1, "叫号中","${param}请前往${param2}等待作业"),
        DONE(2, "作业完成","${param}作业完成，请尽快驶离" ),
        WRONG_IN(3, "错误停靠","${param}月台停靠错误，请尽快驶离" ),
        TIMEOUT_IN(4, "超时停靠","${param}月台停靠超时，请尽快驶离请尽快驶离" ),
        TIMEOUT_WORK(5, "作业超时","${param}作业超时" ),
        ;

        // 成员变量