Merge branch 'dev' into test

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -79,7 +79,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空
 			advanceEntity.setType(FactoryConstant.PIANO);
 			advanceEntity.setTotal(panFactoryOrder.getTotalQuantity()); //订单总数据
-			advanceEntity.setMctsTruck(StringUtil.isBlank(panFactoryOrder.getDeliveryNumber())?"":panFactoryOrder.getDeliveryNumber()); //车次
+			advanceEntity.setMctsTruck(StringUtil.isBlank(panFactoryOrder.getLoadingList())?"":panFactoryOrder.getLoadingList()); //车次
 			advanceEntity.setMtdsNo("");// MTDS单号 可以为空
 			advanceEntity.setFirstPackName(""); //一级品类
 			advanceEntity.setFirstPackCode(""); //一级品类