|
@@ -941,14 +941,14 @@ public class WaybillOrderService {
|
|
|
|
|
|
|
|
List<WaybillOrderStatusResp> ordderList = new ArrayList<>();
|
|
List<WaybillOrderStatusResp> ordderList = new ArrayList<>();
|
|
|
//1.查询正常流程物流运运单
|
|
//1.查询正常流程物流运运单
|
|
|
- if (CollectionUtils.isNotEmpty(typeOneList)) {
|
|
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(typeNullList)) {
|
|
|
List<WaybillOrderStatusResp> normalOrdderList = getWaybillOrderStatusResps(param, records, typeNullList,
|
|
List<WaybillOrderStatusResp> normalOrdderList = getWaybillOrderStatusResps(param, records, typeNullList,
|
|
|
orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.FALSE);
|
|
orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.FALSE);
|
|
|
ordderList.addAll(normalOrdderList);
|
|
ordderList.addAll(normalOrdderList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//2.查询原矿运输物流运运单
|
|
//2.查询原矿运输物流运运单
|
|
|
- if (CollectionUtils.isNotEmpty(ordderList)) {
|
|
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(typeOneList)) {
|
|
|
List<WaybillOrderStatusResp> rawOreOrdderList = getWaybillOrderStatusResps(param, records, typeOneList,
|
|
List<WaybillOrderStatusResp> rawOreOrdderList = getWaybillOrderStatusResps(param, records, typeOneList,
|
|
|
orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.TRUE);
|
|
orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.TRUE);
|
|
|
ordderList.addAll(rawOreOrdderList);
|
|
ordderList.addAll(rawOreOrdderList);
|