Merge pull request 'fix(service): 代码提交' (#3) from dev into pre-production

Reviewed-on: #3

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

@@ -31,12 +31,29 @@ import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionParcelListDTO;
 import com.logpm.distribution.dto.app.StockupDTO;
-import com.logpm.distribution.entity.*;
+import com.logpm.distribution.entity.DistributionParcelDetailsEntity;
+import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.entity.DistributionParcelNumberEntity;
+import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.entity.DistributionStockListEntity;
+import com.logpm.distribution.entity.DistributionStockListInfoEntity;
+import com.logpm.distribution.entity.DistrilbutionBillPackageEntity;
 import com.logpm.distribution.excel.DistributionParcelListExcel;
 import com.logpm.distribution.mapper.DistributionParcelListMapper;
 import com.logpm.distribution.mapper.DistributionStockArticleMapper;
-import com.logpm.distribution.service.*;
+import com.logpm.distribution.service.IDistributionParcelDetailsService;
-import com.logpm.distribution.vo.*;
+import com.logpm.distribution.service.IDistributionParcelListService;
+import com.logpm.distribution.service.IDistributionParcelNumberService;
+import com.logpm.distribution.service.IDistributionReservationZeroPackageService;
+import com.logpm.distribution.service.IDistributionStockListInfoService;
+import com.logpm.distribution.service.IDistributionStockListService;
+import com.logpm.distribution.service.IDistrilbutionBillPackageService;
+import com.logpm.distribution.vo.DistributionParcelListBaseVO;
+import com.logpm.distribution.vo.DistributionParcelListNodeVO;
+import com.logpm.distribution.vo.DistributionParcelListVO;
+import com.logpm.distribution.vo.DistributionParcelListZeroVO;
+import com.logpm.distribution.vo.PackageStockupVO;
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
@@ -64,9 +81,19 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**