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

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

@@ -1818,8 +1818,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			hasOrderPackageCodeList.addAll(hasOrderPackageCodes);
 		});
 
+		List<TrunklineAdvanceDetailEntity> updateMaterialList = new ArrayList<>();
+
+
 		if(CollUtil.isNotEmpty(hasOrderPackageCodeList)){
-			List<TrunklineAdvanceDetailEntity> updateMaterialList = new ArrayList<>();
 			//把importStandardOuPaiDTOS转化成orderPackageCode为key的Map
 			Map<String, ImportStandardOuPaiDTO> importStandardOuPaiDTOMap = importStandardOuPaiDTOS.stream().collect(Collectors.toMap(ImportStandardOuPaiDTO::getOrderPackageCode, Function.identity(), (a, b) -> a));
 			List<TrunklineAdvanceDetailEntity> hasAdvanceDetailList = advanceDetailService.findListByOrderPackageCodeList(hasOrderPackageCodeList);