Merge branch 'dev' into pre-production

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

@@ -95,6 +95,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 	private final IDistributionStockListInfoService distributionStockListInfoService;
 	private final IDistributionStockListService distributionStockListService;
+
 	private final IDistributionReservationZeroPackageService reservationZeroPackageService;
 
 	private final IDistrilbutionBillPackageService distrilbutionBillPackageService;
@@ -869,7 +870,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			distributionStockListService.updateById(listEntity);
 		} else {
 			log.info("###########distributionStockListEntity>>>>>>>>,{}",distributionStockListEntity);
-			distributionStockListService.save(distributionStockListEntity);
+//			distributionStockListService.save(distributionStockListEntity);
+			distributionStockListService.getBaseMapper().insert(distributionStockListEntity);
 		}
 //		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘
 //		distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息