|
|
@@ -2390,7 +2390,7 @@ public class WaybillOrderService {
|
|
|
if (CollectionUtils.isEmpty(nodes)) {
|
|
|
throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_NOT_FOUND, "运单接单不存在,wOrderIds:" + JSON.toJSONString(wOrderIds));
|
|
|
}
|
|
|
- Map<Long, List<KwtWaybillOrderNode>> nodeList = nodes.stream().collect(Collectors.groupingBy(KwtWaybillOrderNode::getWOrderId);
|
|
|
+ Map<Long, List<KwtWaybillOrderNode>> nodeMap = nodes.stream().collect(Collectors.groupingBy(KwtWaybillOrderNode::getWOrderId));
|
|
|
|
|
|
//组装参数
|
|
|
List<WaybillOrderRawOreReportResp> orderList = waybillOrderList.stream()
|
|
|
@@ -2413,29 +2413,6 @@ public class WaybillOrderService {
|
|
|
Map<String, KwtGatekeeperWaybillOrder> gatekeeperMap,
|
|
|
Map<Long, KwtForkliftWaybillOrder> forkliftMap,
|
|
|
Map<Long, List<KwtWaybillOrderNode>> nodeMap) {
|
|
|
- WaybillOrderRawOreReportResp waybillOrderRawOreReportResp = new WaybillOrderRawOreReportResp();
|
|
|
- waybillOrderRawOreReportResp.setSerialNumber();
|
|
|
- waybillOrderRawOreReportResp.setId(waybillOrder.getId());
|
|
|
- waybillOrderRawOreReportResp.setLogisticsNo();
|
|
|
- waybillOrderRawOreReportResp.setWaybillNo();
|
|
|
- waybillOrderRawOreReportResp.setDictId();
|
|
|
- waybillOrderRawOreReportResp.setGoodsName();
|
|
|
- waybillOrderRawOreReportResp.setTruckNo(waybillOrder.getTruckNo());
|
|
|
- waybillOrderRawOreReportResp.setAcceptTime();
|
|
|
- waybillOrderRawOreReportResp.setLoadTareAmount();
|
|
|
- waybillOrderRawOreReportResp.setLoadGrossAmount();
|
|
|
- waybillOrderRawOreReportResp.setLoadAmount(waybillOrder.getLoadAmount());
|
|
|
- waybillOrderRawOreReportResp.setLoadTareAmountTime();
|
|
|
- waybillOrderRawOreReportResp.setLoadGrossTime();
|
|
|
- waybillOrderRawOreReportResp.setLoadPerson();
|
|
|
- waybillOrderRawOreReportResp.setUnLoadTareAmount();
|
|
|
- waybillOrderRawOreReportResp.setUnLoadGrossAmount();
|
|
|
- waybillOrderRawOreReportResp.setUnLoadAmount(waybillOrder.getUnloadAmount());
|
|
|
- waybillOrderRawOreReportResp.setUnLoadTareAmountTime();
|
|
|
- waybillOrderRawOreReportResp.setUnLoadGrossTime();
|
|
|
- waybillOrderRawOreReportResp.setUnLoadPerson();
|
|
|
- return waybillOrderRawOreReportResp;
|
|
|
-
|
|
|
//订单
|
|
|
KwtLogisticsOrder logOrder = logOrderMap.getOrDefault(waybillOrder.getLOrderId(), new KwtLogisticsOrder());
|
|
|
//运单装货单
|