Merge remote-tracking branch 'origin/master'

k94314517

2024-12-25 372871c9d42968a9caf69ca9a4e392f2d3eee865

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java

@@ -23,6 +23,7 @@
        String[] getOutQtyAndVehicleQty = new String[]{"/tms/zhyt/getOutQtyAndVehicleQty",  "【TMS】指定时间范围内累计出库量"};//3.8指定时间范围内累计出库量
        String[] getSevenArrivalStatusAndDetails = new String[]{"/tms/zhyt/getSevenArrivalStatusAndDetails",  "【TMS】近7日到货情况(含明细)"};//3.13近7日到货情况(含明细)
        String[] getNotFinishOrderList = new String[]{"/tms/zhyt/getNotFinishOrderList",  "【TMS】未完成订单"};//3.13未完成订单
        String[] getOutboundCapability = new String[]{"/tms/zhyt/getOutboundCapability",  "【TMS】出库能力统计"};//3.14出库能力统计
    }

    public  enum TopStatusLevel {
@@ -57,7 +58,17 @@
            this.chileIndexList = chileIndexList;
            this.name = name;
        }

        public static String getNameByKey(Integer key ) {
            if(key == null){
                return null;
            }
            for (TopStatusLevel c : TopStatusLevel.values()) {
                if (c.getKey() == key) {
                    return c.getName();
                }
            }
            return null;
        }
        public int getKey() {
            return key;
        }
@@ -141,7 +152,10 @@
            this.orderStatus = orderStatus;
            this.parentIndex = parentIndex;
        }
        public static Integer getParentIndexByStatus(int orderStatus) {
        public static Integer getParentIndexByStatus(Integer orderStatus) {
            if(orderStatus == null){
                return null;
            }
            for (ChildStatusLevel c : ChildStatusLevel.values()) {
                if (c.getOrderStatus() == orderStatus) {
                    return c.parentIndex;