|
@@ -282,14 +282,20 @@ public class PushShippingDetailsJob implements Job {
|
|
|
syShippingOrderItemService.updateSrmPushState(errList);
|
|
|
}
|
|
|
if (reqVoList.size()>0){
|
|
|
- ReqShippingOrderVO reqVo = new ReqShippingOrderVO();
|
|
|
- reqVo.setVerifyToken(srmAccessToken);
|
|
|
- reqVo.setItemList(reqVoList);
|
|
|
- log.info("推送托书数据:{}", JSONObject.toJSONString(reqVo));
|
|
|
- List<RespUpdateVO> respUpdateVOList = JSONArray.parseArray(HttpHelper.httpJsonPost(dxpDataPlan.getItemIp(), JSONObject.toJSONString(reqVo), null),
|
|
|
- RespUpdateVO.class);
|
|
|
- log.info("推送托书数据返回:{}", JSONArray.toJSONString(respUpdateVOList));
|
|
|
- syShippingOrderItemService.updateSrmPushState(respUpdateVOList);
|
|
|
+ // 每个托书分开推
|
|
|
+ List<String> tsCodeList = reqVoList.stream().map(x->x.getVbillcode()).distinct().collect(Collectors.toList());
|
|
|
+ for (String tsCode : tsCodeList){
|
|
|
+ List<ReqShippingOrderItemVO> billList = reqVoList.stream().filter(x->x.getVbillcode().equals(tsCode)).collect(Collectors.toList());
|
|
|
+ ReqShippingOrderVO reqVo = new ReqShippingOrderVO();
|
|
|
+ reqVo.setVerifyToken(srmAccessToken);
|
|
|
+ reqVo.setItemList(billList);
|
|
|
+ log.info("推送托书数据:{}", JSONObject.toJSONString(reqVo));
|
|
|
+ List<RespUpdateVO> respUpdateVOList = JSONArray.parseArray(HttpHelper.httpJsonPost(dxpDataPlan.getItemIp(), JSONObject.toJSONString(reqVo), null),
|
|
|
+ RespUpdateVO.class);
|
|
|
+ log.info("推送托书数据返回:{}", JSONArray.toJSONString(respUpdateVOList));
|
|
|
+ syShippingOrderItemService.updateSrmPushState(respUpdateVOList);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
// if (reqQuantityList.size()>0){
|
|
|
// ReqSyShippingDetailsVO reqVo = new ReqSyShippingDetailsVO();
|