|
@@ -147,16 +147,16 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
|
|
|
resultIdList.add(temp);
|
|
|
}
|
|
|
//新增完成,发送计量委托
|
|
|
-// if(resultIdList.size()==wagonNoList.size()){
|
|
|
-// Map<String, Object> map = new HashMap<>();
|
|
|
-// map.put("resultIdList",resultIdList);
|
|
|
-// int i = tmstrainMeasureCommissionService.batchSendMeasureCommission(map);
|
|
|
-// if(i==-1){
|
|
|
-// return i;
|
|
|
-// }
|
|
|
-// }else{
|
|
|
-// return -1;
|
|
|
-// }
|
|
|
+ if(resultIdList.size()==wagonNoList.size()){
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("resultIdList",resultIdList);
|
|
|
+ int i = tmstrainMeasureCommissionService.batchSendMeasureCommission(map);
|
|
|
+ if(i==-1){
|
|
|
+ return i;
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
return count;
|
|
|
}
|
|
|
|
|
@@ -430,13 +430,13 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
|
|
|
}
|
|
|
int count=0;
|
|
|
//发送计量委托
|
|
|
-// List<Map<String, Object>> resultIdList = new ArrayList<>();
|
|
|
-// Map<String, Object> map1 = new HashMap<>();
|
|
|
-// Map<String, Object> map2 = new HashMap<>();
|
|
|
-// map1.put("resultId",resultId);
|
|
|
-// resultIdList.add(map1);
|
|
|
-// map2.put("resultIdList",resultIdList);
|
|
|
-// count = tmstrainMeasureCommissionService.batchSendMeasureCommission(map2);
|
|
|
+ List<Map<String, Object>> resultIdList = new ArrayList<>();
|
|
|
+ Map<String, Object> map1 = new HashMap<>();
|
|
|
+ Map<String, Object> map2 = new HashMap<>();
|
|
|
+ map1.put("resultId",resultId);
|
|
|
+ resultIdList.add(map1);
|
|
|
+ map2.put("resultIdList",resultIdList);
|
|
|
+ count = tmstrainMeasureCommissionService.batchSendMeasureCommission(map2);
|
|
|
if(count<=0)
|
|
|
return -5;
|
|
|
//更新
|