From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
index 74f0936..5c30aeb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -14,11 +14,13 @@
String[] getRealTimeInventory = new String[]{"/tms/zhyt/getRealTimeInventory", "銆怲MS銆戝疄鏃跺簱瀛樻煡璇�"};//TMS瀹炴椂搴撳瓨鏌ヨ鎺ュ彛鍦板潃
String[] getInboundOutbound = new String[]{"/tms/zhyt/getInboundOutbound", "銆怲MS銆戝嚭鍏ュ簱璁板綍鏌ヨ"};//TMS鍑哄叆搴撹褰曟煡璇㈡帴鍙ｅ湴鍧�
String[] getIntransitDetails = new String[]{"/tms/zhyt/getIntransitDetails", "銆怲MS銆戝湪閫旀槑缁嗗垪琛�"};//TMS鍦ㄩ�旀槑缁嗗垪琛ㄦ帴鍙ｅ湴鍧�
- String[] getOrderList = new String[]{"/tms/zhyt/getIntransitDetails", "銆怲MS銆戝悎鍚屽垪琛ㄦ煡璇�"};//TMS鍚堝悓鍒楄〃鏌ヨ鎺ュ彛鍦板潃
+ String[] getOrderList = new String[]{"/tms/zhyt/getOrderList", "銆怲MS銆戝悎鍚屽垪琛ㄦ煡璇�"};//TMS鍚堝悓鍒楄〃鏌ヨ鎺ュ彛鍦板潃
+ String[] getTotalAndReportVehicleQty = new String[]{"/tms/zhyt/getTotalAndReportVehicleQty", "銆怲MS銆戞煡璇�5涓巶鐨勮繍鍔涜祫婧愬埄鐢ㄦ儏鍐点��"};//鏌ヨ5涓巶鐨勮繍鍔涜祫婧愬埄鐢ㄦ儏鍐点��
String[] getElecByContractNumberList = new String[]{"/tms/zhyt/getElecByContractNumberList", "銆怲MS銆戝悎鍚屼笂閿佺姸鎬�"};//TMS鍚堝悓涓婇攣鐘舵�佹帴鍙ｅ湴鍧�
String[] getOrderDetailByContractNumber = new String[]{"/tms/zhyt/getOrderDetailByContractNumber", "銆怲MS銆戝悎鍚岃鎯�"};//TMS鍚堝悓璇︽儏鎺ュ彛鍦板潃
String[] getGis = new String[]{"/tms/zhyt/getGis", "銆怲MS銆戞牴鎹繍杈撳崟鍙锋煡璇is杞�"};//TMS鏍规嵁杩愯緭鍗曞彿鏌ヨgis杞ㄦ帴鍙ｅ湴鍧�
- String[] getOrderStatusByContractNumber = new String[]{";//", "銆怲MS銆戝崟鐢熷懡鍛ㄦ湡"};//3.8璁㈠崟鐢熷懡鍛ㄦ湡
+ String[] getOrderStatusByContractNumber = new String[]{"/tms/zhyt/getOrderStatusByContractNumber", "銆怲MS銆戝崟鐢熷懡鍛ㄦ湡"};//3.8璁㈠崟鐢熷懡鍛ㄦ湡
+ String[] getOutQtyAndVehicleQty = new String[]{"/tms/zhyt/getOutQtyAndVehicleQty", "銆怲MS銆戞寚瀹氭椂闂磋寖鍥村唴绱鍑哄簱閲�"};//3.8鎸囧畾鏃堕棿鑼冨洿鍐呯疮璁″嚭搴撻噺
}
public enum TopStatusLevel {
@@ -30,17 +32,17 @@
* 宸插埌璐�
* 宸插叆搴�
*/
- ddsc(0,"璁㈠崟鐢熸垚",new Integer[]{ChildStatusLevel.create.getKey()}),
- ydpzz (1,"杩愬崟閰嶈浇涓�",new Integer[]{ChildStatusLevel.ysdxc.getKey()
- ,ChildStatusLevel.ysdcx.getKey()
- ,ChildStatusLevel.shtg.getKey()
- ,ChildStatusLevel.shwtg.getKey()
- ,ChildStatusLevel.ysdcx.getKey()}),
- ckckz (2,"浠撳簱鍑哄簱涓�",new Integer[]{ChildStatusLevel.ddzhddzs.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;
@@ -78,6 +80,22 @@
this.chileIndexList = chileIndexList;
}
}
+ public interface StatusCode{
+ /**
+ * 1-鍑嗚繍璇�
+ * 2-鐢靛瓙閿佹苯杩�
+ * 3-鐢靛瓙閿侀潪姹借繍
+ * 4-GIS
+ * 5-APP
+ * 6-浜哄伐鏇存柊
+ */
+ int zyz =1;
+ int dzsqy =2;
+ int dzsfqy =3;
+ int gis =4;
+ int app =5;
+ int rggx =6;
+ }
public enum ChildStatusLevel {
/**
璁㈠崟鐢熸垚锛堝彂璐т粨搴撹仈绯荤數璇濓細0551-63451234锛� 0 璁㈠崟鐢熸垚锛堝彂璐т粨搴撹仈绯荤數璇濓細0551-63451234锛�
@@ -98,11 +116,11 @@
ysdcx(2, -2,1,"杩愯緭鍗曟挙閿�",null ),
shtg(3,-1, 1,"杩愯緭鍗曞鏍告湭閫氳繃",null ),
shwtg(4, 2,1,"杩愯緭鍗曞鏍搁�氳繃",null),
- ysdqr(5,6, 1,"杩愯緭鍗曠‘璁�",null ),
+ sqzyzwc(5,6, 1,"鐢宠鍑嗚繍璇佸畬鎴�","杞﹁締鍑嗚繍璇佺敵璇峰畬鎴�" ),
ddzhddzs(6,3,2,"鍒拌揪瑁呰揣鍦�-鐢靛瓙閿佹苯杩�","杞﹁締宸插埌杈捐璐у湴" ),
- clqddzs(7, null,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締瑁呰揣瀹屾垚锛岀數瀛愰攣宸蹭笂閿�" ),
- clqdapp(8, 4,3,"杞﹁締鍚繍-APP","杞﹁締杩愯緭涓�" ),
- ddzhd(9, 5,4,"鍒拌揪鍗歌揣鍦�-APP","杞﹁締宸插埌杈惧嵏璐у湴" ),
+ clqddzs(7, 4,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締瑁呰揣瀹屾垚锛岀數瀛愰攣宸蹭笂閿�" ),
+ clqdapp(8, 7,3,"杞﹁締鍚繍-APP","杞﹁締杩愯緭涓�" ),
+ ddzhd(9, 8,4,"鍒拌揪鍗歌揣鍦�-APP","杞﹁締宸插埌杈惧嵏璐у湴" ),
ddxhd(10, 5,5,"鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�","鐢靛瓙閿佸凡瑙ｉ攣锛岃繍杈撲换鍔″凡瀹屾垚" ),
;
@@ -129,9 +147,9 @@
}
return null;
}
- public static String getInfo(int key,String defualt) {
+ public static String getInfo(int orderStatus,String defualt) {
for (ChildStatusLevel c : ChildStatusLevel.values()) {
- if (c.getKey() == key) {
+ if (c.getOrderStatus() == orderStatus) {
return StringUtils.defaultString(c.getInfo(),StringUtils.defaultString(defualt,c.getName()));
}
}
--
Gitblit v1.9.3