|
|
@@ -37,6 +37,7 @@ import org.springframework.web.client.RestClientException;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
|
|
|
+import java.io.EOFException;
|
|
|
import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.sql.Wrapper;
|
|
|
@@ -141,12 +142,12 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
|
|
|
//根据汽运订单查找分属于哪个异地库。
|
|
|
String inwardWarehouse = omstrainOrderMapper.getInwardWarehouse(orderId);
|
|
|
if (inwardWarehouse!=null) {
|
|
|
- if (inwardWarehouse.equals("重庆金田库")) {
|
|
|
- for (Map<String,Object> jitianMap:data) {
|
|
|
+ if (inwardWarehouse.contains("重庆金田")) {
|
|
|
+ for (Map<String,Object> jintianMap:data) {
|
|
|
Map<String, Object> orchardStorehouse = new HashMap<>();
|
|
|
List<Map<String, Object>> orchardStorehouseList = new ArrayList<>();
|
|
|
- Object sendTime = jitianMap.get("sendTime");
|
|
|
- String transportType = (String) jitianMap.get("transportType");
|
|
|
+ Object sendTime = jintianMap.get("sendTime");
|
|
|
+ String transportType = (String) jintianMap.get("transportType");
|
|
|
//发送时间
|
|
|
orchardStorehouse.put("sendTime", sendTime);
|
|
|
//系统代码
|
|
|
@@ -156,21 +157,21 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
|
|
|
//运输方式
|
|
|
orchardStorehouse.put("transportType", transportType);
|
|
|
//去掉sendTime
|
|
|
- jitianMap.remove("sendTime");
|
|
|
- jitianMap.remove("transportType");
|
|
|
-
|
|
|
- orchardStorehouseList.add(jitianMap);
|
|
|
+ jintianMap.remove("sendTime");
|
|
|
+ jintianMap.remove("transportType");
|
|
|
+ orchardStorehouseList.add(jintianMap);
|
|
|
orchardStorehouse.put("details", orchardStorehouseList);
|
|
|
//调用果园库接口
|
|
|
sendMesToGuoyuan(orchardStorehouse);
|
|
|
}
|
|
|
- } else if (inwardWarehouse.equals("成都城嘉库")) {
|
|
|
+ } else if (inwardWarehouse.contains("成都城嘉")) {
|
|
|
//调用城嘉库登录接口获取token
|
|
|
//调用城嘉库推送接口
|
|
|
String token = DagonloginChenJiaku();
|
|
|
if (token != null) {
|
|
|
for (Map<String,Object> map1:data) {
|
|
|
map1.put("token", token);
|
|
|
+// map1.remove("materialFurnaceNumber");
|
|
|
sendMesToChengJia(map1);
|
|
|
}
|
|
|
} else {
|
zx