From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
index 171657c..b960ff2 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
@@ -28,7 +28,8 @@
String[] getInboundOutbound = new String[]{"/tms/zhyt/getInboundOutbound", "銆怲MS銆戝嚭鍏ュ簱璁板綍鏌ヨ"};//TMS鍑哄叆搴撹褰曟煡璇㈡帴鍙ｅ湴鍧�
String[] getIntransitDetails = new String[]{"/tms/zhyt/getIntransitDetails", "銆怲MS銆戝湪閫旀槑缁嗗垪琛�"};//TMS鍦ㄩ�旀槑缁嗗垪琛ㄦ帴鍙ｅ湴鍧�
String[] getSevenArrivalStatus = new String[]{"/tms/zhyt/getSevenArrivalStatus", "銆怲MS銆戣繎7鏃ュ埌璐ф儏鍐�"};//TMS杩�7鏃ュ埌璐ф儏鍐垫帴鍙ｅ湴鍧�
- String[] getCurrentTransportationTask = new String[]{ "銆怲MS銆�/zhyt/getCurrentTransportationTask", "銆怲MS銆戝綋鍓嶈繍杈撲换鍔�"};//TMS褰撳墠杩愯緭浠诲姟鎺ュ彛鍦板潃
+ String[] getCurrentTransportationTask = new String[]{ "/tms/zhyt/getCurrentTransportationTask", "銆怲MS銆戝綋鍓嶈繍杈撲换鍔�"};//TMS褰撳墠杩愯緭浠诲姟鎺ュ彛鍦板潃
+ String[] getOutCapacity = new String[]{ "/tms/zhyt/getOutCapacity", "銆怲MS銆戝嚭搴撹兘鍔涙眹鎬绘帴鍙�"};//3.20TMS鍑哄簱鑳藉姏姹囨�绘帴鍙ｆ帴鍙ｅ湴鍧�
}
public enum TopStatusLevel {
@@ -41,11 +42,11 @@
* 宸插叆搴�
*/
ddsc(0,"璁㈠崟鐢熸垚",new Integer[]{ChildStatusLevel.create.getOrderStatus()
- ,ChildStatusLevel.kcbz.getOrderStatus()}),
+ }),
ydpzz (1,"杩愯緭浠诲姟鐢熸垚",new Integer[]{ChildStatusLevel.ysdxc.getOrderStatus()
,ChildStatusLevel.ysdcx.getOrderStatus()
,ChildStatusLevel.shtg.getOrderStatus()
- ,ChildStatusLevel.shwtg.getOrderStatus()}),
+ ,ChildStatusLevel.shwtg.getOrderStatus(),ChildStatusLevel.kcbz.getOrderStatus()}),
ckckz (2,"浠撳簱鍑哄簱",new Integer[]{ChildStatusLevel.ddzhddzs.getOrderStatus()
,ChildStatusLevel.sqzyzwc.getOrderStatus()
,ChildStatusLevel.clqddzs.getOrderStatus()}),
@@ -139,7 +140,7 @@
ddzhddzs(6,3,2,"鍒拌揪瑁呰揣鍦�-鐢靛瓙閿佹苯杩�","杞﹁締宸插埌杈捐璐у湴" ),
clqddzs(7, 4,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締宸插惎杩�" ),
clqdapp(8, 7,3,"杞﹁締鍚繍-APP","杞﹁締杩愯緭涓�" ),
- kcbz(11, 9,0,"寰呯敓浜�","褰撳墠璁㈠崟搴撳瓨涓嶈冻锛屽緟鐢熶骇" ),
+ kcbz(11, 9,1,"寰呯敓浜�","褰撳墠璁㈠崟搴撳瓨涓嶈冻锛屽緟鐢熶骇" ),
ddzhd(9, 8,4,"鍒拌揪鍗歌揣鍦�-APP","杞﹁締宸插埌杈惧嵏璐у湴" ),
ddxhd(10, 5,5,"鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�","鐢靛瓙閿佸凡瑙ｉ攣锛岃繍杈撲换鍔″凡瀹屾垚" ),
;
--
Gitblit v1.9.3