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

@@ -14,11 +14,16 @@
        String[] getRealTimeInventory = new String[]{"/tms/zhyt/getRealTimeInventory",  "【TMS】实时库存查询"};//TMS实时库存查询接口地址
        String[] getInboundOutbound = new String[]{"/tms/zhyt/getInboundOutbound",  "【TMS】出入库记录查询"};//TMS出入库记录查询接口地址
        String[] getIntransitDetails = new String[]{"/tms/zhyt/getIntransitDetails",  "【TMS】在途明细列表"};//TMS在途明细列表接口地址
        String[] getOrderList = new String[]{"/tms/zhyt/getIntransitDetails",  "【TMS】合同列表查询"};//TMS合同列表查询接口地址
        String[] getOrderList = new String[]{"/tms/zhyt/getOrderList",  "【TMS】合同列表查询"};//TMS合同列表查询接口地址
        String[] getTotalAndReportVehicleQty = new String[]{"/tms/zhyt/getTotalAndReportVehicleQty",  "【TMS】查询5个厂的运力资源利用情况。"};//查询5个厂的运力资源利用情况。
        String[] getElecByContractNumberList = new String[]{"/tms/zhyt/getElecByContractNumberList",  "【TMS】合同上锁状态"};//TMS合同上锁状态接口地址
        String[] getOrderDetailByContractNumber = new String[]{"/tms/zhyt/getOrderDetailByContractNumber",  "【TMS】合同详情"};//TMS合同详情接口地址
        String[] getGis = new String[]{"/tms/zhyt/getGis",  "【TMS】根据运输单号查询gis轨"};//TMS根据运输单号查询gis轨接口地址
        String[] getOrderStatusByContractNumber = new String[]{";//",  "【TMS】单生命周期"};//3.8订单生命周期
        String[] getOrderStatusByContractNumber = new String[]{"/tms/zhyt/getOrderStatusByContractNumber",  "【TMS】单生命周期"};//3.8订单生命周期
        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 {
@@ -30,17 +35,17 @@
         * 已到货
         * 已入库
         */
        ddsc(0,"订单生成",new Integer[]{ChildStatusLevel.create.getKey()}),
        ydpzz (1,"运单配载中",new Integer[]{ChildStatusLevel.ysdxc.getKey()
                ,ChildStatusLevel.ysdcx.getKey()
                ,ChildStatusLevel.shtg.getKey()
                ,ChildStatusLevel.shwtg.getKey()}),
        ckckz (2,"仓库出库中",new Integer[]{ChildStatusLevel.ddzhddzs.getKey()
                ,ChildStatusLevel.sqzyzwc.getKey()
                ,ChildStatusLevel.clqddzs.getKey()}),
        clysz(3, "车辆运输中",new Integer[]{ChildStatusLevel.clqdapp.getKey()}),
        ydh(4,"已到货",new Integer[]{ChildStatusLevel.ddzhd.getKey()}),
        yrk (5,"已入库",new Integer[]{ChildStatusLevel.ddxhd.getKey()});
        ddsc(0,"订单生成",new Integer[]{ChildStatusLevel.create.getOrderStatus()}),
        ydpzz (1,"运单配载中",new Integer[]{ChildStatusLevel.ysdxc.getOrderStatus()
                ,ChildStatusLevel.ysdcx.getOrderStatus()
                ,ChildStatusLevel.shtg.getOrderStatus()
                ,ChildStatusLevel.shwtg.getOrderStatus()}),
        ckckz (2,"仓库出库中",new Integer[]{ChildStatusLevel.ddzhddzs.getOrderStatus()
                ,ChildStatusLevel.sqzyzwc.getOrderStatus()
                ,ChildStatusLevel.clqddzs.getOrderStatus()}),
        clysz(3, "车辆运输中",new Integer[]{ChildStatusLevel.clqdapp.getOrderStatus()}),
        ydh(4,"已到货",new Integer[]{ChildStatusLevel.ddzhd.getOrderStatus()}),
        yrk (5,"已入库",new Integer[]{ChildStatusLevel.ddxhd.getOrderStatus()});

        // 成员变量
        private int key;
@@ -53,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;
        }
@@ -137,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;