Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -2929,7 +2929,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			distributionParcelListVO.setWaybillNumber(trunklineAdvanceDetailEntity.getWaybillNo());
 			distributionParcelListVO.setOrderCode(trunklineAdvanceDetailEntity.getOrderCode());
 			distributionParcelListVO.setOrderPackageCode(trunklineAdvanceDetailEntity.getOrderPackageCode());
-			distributionParcelListVO.setWarehouse(trunklineAdvanceDetailEntity.getWarehouseName());
+			distributionParcelListVO.setWarehouse(trunklineAdvanceDetailEntity.getNowWarehouseName());
 			distributionParcelListVO.setOrderPackageStatusName(OrderPackageStatusConstant.weiruku.getName());
 			distributionParcelListVO.setFirsts(trunklineAdvanceDetailEntity.getFirstPackName());
 			distributionParcelListVO.setSecond(trunklineAdvanceDetailEntity.getSecondPackName());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -993,6 +993,7 @@
     <select id="exportCarsPageList" resultType="com.logpm.trunkline.excel.TrunklineCarsLoadExcel">
         select ltcl.id id,
         ltcl.cars_no carsNo,
+        ltcl.cars_line_name carsLineName,
         ltcl.plan_loading_number planLoadingNumber,
         ltcl.real_loading_number realLoadingNumber,
         ltcl.stock_number stockCarsNum,

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -10427,7 +10427,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		loadCarsDTO.setArriveTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getArriveTimeStartStr()));
 		loadCarsDTO.setArriveTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getArriveTimeEndStr()));
 
-		List<TrunklineCarsLoadExcel> pageList = baseMapper.exportCarsPageList(loadCarsDTO);
+			List<TrunklineCarsLoadExcel> pageList = baseMapper.exportCarsPageList(loadCarsDTO);
 		return pageList;
 	}