|
|
|
@ -41,15 +41,20 @@ public class OldWaybillClient implements IOldWaybillClient {
|
|
|
|
|
@Override |
|
|
|
|
public R waybillDataHandler(String waybillId, String waybillNo) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
// 更加运单ID查询系统数据
|
|
|
|
|
log.info("##################pushOldSystemSignInfo: 请求老系统接口 start waybillId {},waybillNo {}", waybillId, waybillNo); |
|
|
|
|
|
|
|
|
|
WayBillEntity byWaybillId = wayBillService.getByWaybillId(Integer.parseInt(waybillId)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
log.info(">>>>>>>>>>>>>>>>> 运单信息 {}", byWaybillId); |
|
|
|
|
log.info(">>>>>>>>>>>>>>>>> 旧仓库ID 集合 {}", OldSystemDataPushConfig.getWarehourseIdList()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 需要验证当前需要开启的数据推送仓库
|
|
|
|
|
if(!OldSystemDataPushConfig.getWarehourseIdList().contains(byWaybillId.getWarehouseId()+"")){ |
|
|
|
|
// 需要验证当前需要开启的数据推送仓库 null+""
|
|
|
|
|
if (!OldSystemDataPushConfig.getWarehourseIdList().contains(byWaybillId.getWarehouseId() + "")) { |
|
|
|
|
log.info(">>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", byWaybillId.getWarehouseId()); |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
@ -72,17 +77,19 @@ public class OldWaybillClient implements IOldWaybillClient {
|
|
|
|
|
|
|
|
|
|
for (int i1 = 0; i1 < unitNos.size(); i1++) { |
|
|
|
|
String unitNo = unitNos.getString(i1); |
|
|
|
|
log.info(">>>>>>>> 保存开单推送的已入库包件 {} 保存到新系统",unitNo); |
|
|
|
|
|
|
|
|
|
String operationTime = DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss"); |
|
|
|
|
oldSystemWaybillClient.handleDataToPlatform(unitNo,operationTime); |
|
|
|
|
log.info(">>>>>>>> 保存开单推送的已入库包件 {} 保存到新系统", unitNo); |
|
|
|
|
String operationTime = DateUtil.format(new Date(), "yyyy-MM-dd hh:mm:ss"); |
|
|
|
|
oldSystemWaybillClient.handleDataToPlatform(unitNo, operationTime); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
// 请求失败
|
|
|
|
|
} |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error(">>>> 运单信息查询解析报错 ", e); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|