|
@@ -136,7 +136,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
|
|
|
Page<StockWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
|
|
|
List<StockWaitVo> records = page.getRecords();
|
|
|
- if(ObjectUtil.isEmpty(records)){
|
|
|
+ if (ObjectUtil.isEmpty(records)) {
|
|
|
return page;
|
|
|
}
|
|
|
|
|
@@ -174,9 +174,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
|
|
|
json.put("receiptWarehouseName", warehousesMap.get(json.getLong("receiptWarehouseId")));
|
|
|
|
|
|
//重新赋值物流信息
|
|
|
- json.put("logisticsCompanyName",logisticsCompanyMap.get(stockWaitVo.getLogisticsCompanyCode()));
|
|
|
- json.put("logisticsCompanyCode",stockWaitVo.getLogisticsCompanyCode());
|
|
|
- json.put("code",stockWaitVo.getLogisticsCode());
|
|
|
+ stockWaitVo.setLogisticsCompanyName(logisticsCompanyMap.get(stockWaitVo.getLogisticsCompanyCode()));
|
|
|
+ json.put("logisticsCompanyName", stockWaitVo.getLogisticsCompanyName());
|
|
|
+ json.put("logisticsCompanyCode", stockWaitVo.getLogisticsCompanyCode());
|
|
|
+ json.put("code", stockWaitVo.getLogisticsCode());
|
|
|
|
|
|
stockWaitVo.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
|
|
|
}
|