|
@@ -148,7 +148,7 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
|
|
//根据汽运订单查找分属于哪个异地库。
|
|
//根据汽运订单查找分属于哪个异地库。
|
|
String inwardWarehouse = omstrainOrderMapper.getInwardWarehouse(orderId);
|
|
String inwardWarehouse = omstrainOrderMapper.getInwardWarehouse(orderId);
|
|
if (inwardWarehouse!=null) {
|
|
if (inwardWarehouse!=null) {
|
|
- if (inwardWarehouse.equals("重庆金田库")) {
|
|
|
|
|
|
+ if (inwardWarehouse.contains("重庆金田")) {
|
|
for (Map<String,Object> jitianMap:data) {
|
|
for (Map<String,Object> jitianMap:data) {
|
|
Map<String, Object> orchardStorehouse = new HashMap<>();
|
|
Map<String, Object> orchardStorehouse = new HashMap<>();
|
|
List<Map<String, Object>> orchardStorehouseList = new ArrayList<>();
|
|
List<Map<String, Object>> orchardStorehouseList = new ArrayList<>();
|
|
@@ -171,7 +171,7 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
|
|
//调用果园库接口
|
|
//调用果园库接口
|
|
sendMesToGuoyuan(orchardStorehouse);
|
|
sendMesToGuoyuan(orchardStorehouse);
|
|
}
|
|
}
|
|
- } else if (inwardWarehouse.equals("成都城嘉库")) {
|
|
|
|
|
|
+ } else if (inwardWarehouse.contains("成都城嘉")) {
|
|
//调用城嘉库登录接口获取token
|
|
//调用城嘉库登录接口获取token
|
|
//调用城嘉库推送接口
|
|
//调用城嘉库推送接口
|
|
String token = DagonloginChenJiaku();
|
|
String token = DagonloginChenJiaku();
|