|
|
@@ -290,14 +290,14 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
//查询该订单的出库单制作日期
|
|
|
- try {
|
|
|
- List<String> easPrimaryIds = tmstruckLeaveFactoryResultMapper.getEasPrimaryIds(orderNumber);
|
|
|
- Map<String, Object> easPrimaryMap = new HashMap<>();
|
|
|
- easPrimaryMap.put("easPrimaryList",easPrimaryIds);
|
|
|
- amsFeign.getMakeOrderDate(easPrimaryMap);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+// try {
|
|
|
+// List<String> easPrimaryIds = tmstruckLeaveFactoryResultMapper.getEasPrimaryIds(orderNumber);
|
|
|
+// Map<String, Object> easPrimaryMap = new HashMap<>();
|
|
|
+// easPrimaryMap.put("easPrimaryList",easPrimaryIds);
|
|
|
+// amsFeign.getMakeOrderDate(easPrimaryMap);
|
|
|
+// } catch (Exception e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// }
|
|
|
//判断该订单是不是异地库
|
|
|
try {
|
|
|
String addressPlace = tmstruckLeaveFactoryResultMapper.getAddressPlace(orderId);
|
|
|
@@ -325,6 +325,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
temp.put("resultOutGateTime",format.format((Date)(temp.get("outGateTime"))));
|
|
|
temp.put("orderIssueTime",format.format((Date)(temp.get("orderIssueTime"))));
|
|
|
temp.remove("outGateTime");
|
|
|
+ temp.put("orderWagonNo",temp.get("capacityNo"));
|
|
|
}
|
|
|
//发送时间
|
|
|
details.put("sendTime",format.format(new Date()));
|
