From b374fdbe823df303b3551fe3939e9864a4c50abf Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 24 Jan 2024 15:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8F=96=E6=B6=88=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionDeliveryListMapper.xml |   1 +
 .../mapper/DistrilbutionBillLadingMapper.xml  |   5 +-
 .../IDistributionStockListService.java        |   6 +
 .../DistributionStockListServiceImpl.java     |  10 +
 .../DistrilbutionBillLadingServiceImpl.java   | 694 +++++++++---------
 5 files changed, 377 insertions(+), 339 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index dec1a0e52..99e77bbd2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -1171,6 +1171,7 @@
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id
         <where>
+            ldr.reservation_status != 40
             <if test="deliveryListId != null and deliveryListId != ''">
                 and lds.delivery_id = #{deliveryListId}
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 9e729dada..b6cb2d3fe 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -457,14 +457,15 @@
     </select>
     <select id="selectBillLadingPackage"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
-        SELECT ldpl.* FROM logpm_distrilbution_bill_package AS ldbp LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id WHERE bill_lading_id in
+        SELECT ldpl.* FROM logpm_distrilbution_bill_package AS ldbp LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id
+        WHERE packet_bar_status != '3' AND bill_lading_id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </select>
     <select id="selectBillLadingInventory"
             resultType="com.logpm.distribution.entity.DistributionDeliveryDetailsEntity">
-        SELECT * FROM logpm_distribution_addvalue_detail WHERE bill_lading_id IN
+        SELECT * FROM logpm_distribution_delivery_details WHERE inventory_status != '3' AND bill_lading_id IN
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java
index 8352d6588..2367447a3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java
@@ -182,6 +182,12 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 	 */
     List<DistributionMerchantStockListVO> getMerchantStockList(String materielCode);
 
+	/**
+	 * 维护库存品的占用数量
+	 * @param stockListId
+	 * @param quantity
+	 */
+    void updateInventoryQuantityOccupied(Long stockListId, Integer quantity);
 
 
 //	/**
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index 3604b42dc..67925bb55 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -704,6 +704,16 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 
 		return distributionMerchantStockListVOS;
 	}
+
+	@Override
+	@Transactional
+	public void updateInventoryQuantityOccupied(Long stockListId, Integer quantity) {
+		DistributionStockListEntity stockListEntity = this.getById(stockListId);
+		if (Func.isNotEmpty(stockListEntity)){
+			stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() - quantity);
+			this.updateById(stockListEntity);
+		}
+	}
 }
 
 //	@Override
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 93bdd4798..393b59ef0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -102,6 +102,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 	private final IDistributionBillLadingScanService distributionBillLadingScanService;
 
+
+
 	private final IDistrilbutionBillStockService distrilbutionBillStockService;
 
 	private final IDistributionStockupScanService distributionStockupScanService;
@@ -141,9 +143,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 	//修改自提单订单数据
 	@Transactional
-	public void updateOrder(DistrilbutionBillLadingDTO distrilbutionBillLading){
+	public void updateOrder(DistrilbutionBillLadingDTO distrilbutionBillLading) {
 		DistrilbutionBillLadingEntity billLadingEntity = baseMapper.selectById(distrilbutionBillLading.getId());
-		if(ObjectUtils.isNotNull(billLadingEntity) && "20".equals(billLadingEntity.getConditions())){
+		if (ObjectUtils.isNotNull(billLadingEntity) && "20".equals(billLadingEntity.getConditions())) {
 			throw new ServiceException("已提货，暂不支持取消订单！！");
 		}
 		//查询全部订单
@@ -157,10 +159,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			.apply("packet_bar_status in ( 1, 3)")
 		);
 		List<Long> orderList = new ArrayList<>();
-		 List<Long> packageList = new ArrayList<>();
-		if(!list.isEmpty()){
-			list.forEach(i ->{
-				if("2".equals(i.getConditions())){
+		List<Long> packageList = new ArrayList<>();
+		if (!list.isEmpty()) {
+			list.forEach(i -> {
+				if ("2".equals(i.getConditions())) {
 					throw new ServiceException("包含已提货的订单,不能取消全部订单");
 				}
 				//取消订单预约信息
@@ -168,88 +170,89 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				List<Long> collect = listPackage.stream().filter(a -> a.getStockArticleId().equals(i.getStockArticleId())).map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList());
 				packageList.addAll(collect);
 			});
-			try{
+			try {
 				//修改订单状态
-				if(!orderList.isEmpty()){
+				if (!orderList.isEmpty()) {
 					LambdaUpdateWrapper<DistributionStockArticleEntity> updateWrapper = new LambdaUpdateWrapper<>();
-					updateWrapper.in(DistributionStockArticleEntity::getId,orderList);
-					updateWrapper.set(DistributionStockArticleEntity::getReservationStatus,OrderReservationStatusConstant.bufenyuyue.getValue());
+					updateWrapper.in(DistributionStockArticleEntity::getId, orderList);
+					updateWrapper.set(DistributionStockArticleEntity::getReservationStatus, OrderReservationStatusConstant.bufenyuyue.getValue());
 					distributionStockArticleService.update(updateWrapper);
 					LambdaUpdateWrapper<DistrilbutionBillStockEntity> updateWrapper1 = new LambdaUpdateWrapper<>();
-					updateWrapper1.in(DistrilbutionBillStockEntity::getStockArticleId,orderList);
-					updateWrapper1.set(DistrilbutionBillStockEntity::getOrderStatus,"3");
+					updateWrapper1.in(DistrilbutionBillStockEntity::getStockArticleId, orderList);
+					updateWrapper1.set(DistrilbutionBillStockEntity::getOrderStatus, "3");
 					distrilbutionBillStockService.update(updateWrapper1);
 				}
 				//修改包件预约状态
-				if(!packageList.isEmpty()){
+				if (!packageList.isEmpty()) {
 					LambdaUpdateWrapper<DistributionParcelListEntity> updateWrapper = new LambdaUpdateWrapper<>();
-					updateWrapper.in(DistributionParcelListEntity::getId,packageList);
-					updateWrapper.set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue());
+					updateWrapper.in(DistributionParcelListEntity::getId, packageList);
+					updateWrapper.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue());
 					distributionParcelListService.update(updateWrapper);
 					LambdaUpdateWrapper<DistrilbutionBillPackageEntity> updateWrapper1 = new LambdaUpdateWrapper<>();
-					updateWrapper1.in(DistrilbutionBillPackageEntity::getParceListId,packageList);
-					updateWrapper1.set(DistrilbutionBillPackageEntity::getPacketBarStatus,"2");
+					updateWrapper1.in(DistrilbutionBillPackageEntity::getParceListId, packageList);
+					updateWrapper1.set(DistrilbutionBillPackageEntity::getPacketBarStatus, "2");
 					distrilbutionBillPackageService.update(updateWrapper1);
 				}
-			}catch (Exception e){
-				log.error("自提取消订单报错！{}",e.getMessage());
+			} catch (Exception e) {
+				log.error("自提取消订单报错！{}", e.getMessage());
 				throw new ServiceException("系统异常！！");
 			}
 
 		}
 	}
+
 	//判断有没有库存品数据
-	private void updateStockBill(DistrilbutionBillLadingDTO distrilbutionBillLading){
+	private void updateStockBill(DistrilbutionBillLadingDTO distrilbutionBillLading) {
 		List<DistributionDeliveryDetailsEntity> list = distributionDeliveryDetailsService.list(Wrappers.<DistributionDeliveryDetailsEntity>query().lambda()
 			.eq(DistributionDeliveryDetailsEntity::getBillLadingId, distrilbutionBillLading.getId())
 			.apply("inventory_status in ( 1 , 2)")
 		);
 		List<DistributionStockListEntity> stockEntityList = new ArrayList<>();
 		List<Long> dd = new ArrayList<>();
-		if(!list.isEmpty()){
-			list.forEach(i ->{
-				if("2".equals(i.getConditions())){
+		if (!list.isEmpty()) {
+			list.forEach(i -> {
+				if ("2".equals(i.getConditions())) {
 					throw new ServiceException("包含已提货的库存品，无法取消！！！");
 				}
-				if("1".equals(i.getStockStatus())){
+				if ("1".equals(i.getStockStatus())) {
 					DistributionStockListEntity stockEntity = new DistributionStockListEntity();
 					stockEntity.setId(i.getStockListId());
 					stockEntity.setQuantityStock(i.getQuantity());
 					stockEntityList.add(stockEntity);
 					dd.add(i.getId());
-				}else{
+				} else {
 					throw new ServiceException("包含已备货的库存品，无法取消！！！");
 				}
 			});
 			try {
-				if(!dd.isEmpty()){
+				if (!dd.isEmpty()) {
 					//取消预约记录
 					LambdaUpdateWrapper<DistributionDeliveryDetailsEntity> updateWrapper = new LambdaUpdateWrapper<>();
-					updateWrapper.in(DistributionDeliveryDetailsEntity::getId,dd);
-					updateWrapper.set(DistributionDeliveryDetailsEntity::getInventoryStatus,"3");
+					updateWrapper.in(DistributionDeliveryDetailsEntity::getId, dd);
+					updateWrapper.set(DistributionDeliveryDetailsEntity::getInventoryStatus, "3");
 					distributionDeliveryDetailsService.update(updateWrapper);
 				}
 				//修改库存品数据
-				if(!stockEntityList.isEmpty()){
-					stockEntityList.forEach( i ->{
+				if (!stockEntityList.isEmpty()) {
+					stockEntityList.forEach(i -> {
 						DistributionStockListEntity byId = distributionStockListService.getById(i.getId());
 						DistributionStockListEntity updateWrapper = new DistributionStockListEntity();
 						updateWrapper.setId(i.getId());
-						updateWrapper.setQuantityStock(i.getQuantityStock()+byId.getQuantityStock());
+						updateWrapper.setQuantityStock(i.getQuantityStock() + byId.getQuantityStock());
 						distributionStockListService.updateById(updateWrapper);
 					});
 				}
-			}catch (Exception e){
-				log.error("取消库存品报错！！{}",e.getMessage());
+			} catch (Exception e) {
+				log.error("取消库存品报错！！{}", e.getMessage());
 				throw new ServiceException("系统异常！！");
 			}
 		}
 	}
 
 
-
 	/**
 	 * 提货单 新增或修改
+	 *
 	 * @param distrilbutionBillLading
 	 * @return
 	 */
@@ -260,13 +263,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		if (ObjectUtils.isNotNull(distrilbutionBillLading.getId())) {
 			//判断是否已签收
 			DistrilbutionBillLadingEntity billLadingEntity = baseMapper.selectById(distrilbutionBillLading.getId());
-			if(ObjectUtils.isNotNull(billLadingEntity) && billLadingEntity.getConditions().equals(BillLadingStatusConstant.yiqianshou.getValue())){
+			if (ObjectUtils.isNotNull(billLadingEntity) && billLadingEntity.getConditions().equals(BillLadingStatusConstant.yiqianshou.getValue())) {
 				throw new ServiceException("已签收，无法修改计划！！！");
 			}
 			las = true;
 			//修改
 			this.updateById(distrilbutionBillLading);
-			if(!distrilbutionBillLading.getBillPackageEntityList().isEmpty() || !distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){
+			if (!distrilbutionBillLading.getBillPackageEntityList().isEmpty() || !distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()) {
 				//修改新增包件
 				//todo
 				updateBillPackeg(distrilbutionBillLading);
@@ -285,7 +288,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						addPrint(distrilbutionBillLading);
 					}
 				}
-			}else{
+			} else {
 				//操作图片
 				if (!distrilbutionBillLading.getPrintList().isEmpty()) {
 					addPrint(distrilbutionBillLading);
@@ -425,39 +428,39 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						});
 					}
 				}
-			}else{
+			} else {
 				updateStockBill(distrilbutionBillLading);
 			}
 		} else {
 			//设置lockey
-			String lockKey ="lock:" + distrilbutionBillLading.getStockArticleId();
+			String lockKey = "lock:" + distrilbutionBillLading.getStockArticleId();
 			log.info("#################ownSaveOrUpdate：获取redisson对象开始");
 //			RLock lock = redisson.getLock(lockKey);
 //			if(lock.isLocked()){
 //				throw new ServiceException("请勿重复提交！！！");
 //			}
 //			lock.lock(5, TimeUnit.SECONDS);
-			if(redis.exists(lockKey)){
+			if (redis.exists(lockKey)) {
 				throw new ServiceException("请勿重复提交！！！");
 			}
-			redis.setEx(lockKey,distrilbutionBillLading.getStockArticleId(),5L);
+			redis.setEx(lockKey, distrilbutionBillLading.getStockArticleId(), 5L);
 			List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
-					.eq(!distrilbutionBillLading.getStockArticleId().contains(","),DistrilbutionBillStockEntity::getStockArticleId, distrilbutionBillLading.getStockArticleId())
-					.in(distrilbutionBillLading.getStockArticleId().contains(","),DistrilbutionBillStockEntity::getStockArticleId, distrilbutionBillLading.getStockArticleId().split(","))
+				.eq(!distrilbutionBillLading.getStockArticleId().contains(","), DistrilbutionBillStockEntity::getStockArticleId, distrilbutionBillLading.getStockArticleId())
+				.in(distrilbutionBillLading.getStockArticleId().contains(","), DistrilbutionBillStockEntity::getStockArticleId, distrilbutionBillLading.getStockArticleId().split(","))
 			);
-			if(!list.isEmpty()){
+			if (!list.isEmpty()) {
 				for (DistrilbutionBillStockEntity i : list) {
 					DistributionStockArticleEntity byId = distributionStockArticleService.getById(i.getStockArticleId());
-					if(byId.getStockupStatus().equals(OrderReservationStatusConstant.daiyuyue.getValue())){
+					if (byId.getStockupStatus().equals(OrderReservationStatusConstant.daiyuyue.getValue())) {
 						break;
 					}
 
 					List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 						.eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId()));
 					int sum = list1.stream().filter(ii -> ii.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.daiyuyue.getValue())).collect(Collectors.toList()).stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
-					if(sum == 0){
-						log.debug("####{}当前订单备货包件为空，无法创建任务！",byId.getOrderCode());
-						throw new ServiceException(byId.getOrderCode()+"当前订单备货包件为空，无法创建任务！");
+					if (sum == 0) {
+						log.debug("####{}当前订单备货包件为空，无法创建任务！", byId.getOrderCode());
+						throw new ServiceException(byId.getOrderCode() + "当前订单备货包件为空，无法创建任务！");
 					}
 				}
 
@@ -467,9 +470,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distrilbutionBillLading.setStockupCode(distributionReservationService.bianMa());
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 			String format = dateFormat.format(new Date());
-			distrilbutionBillLading.setPickupBatch("ZT"+format);//批次号
+			distrilbutionBillLading.setPickupBatch("ZT" + format);//批次号
 			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
-			if(ObjectUtils.isNull(myCurrentWarehouse)){
+			if (ObjectUtils.isNull(myCurrentWarehouse)) {
 				throw new ServiceException("请选择仓库在操作！！！");
 			}
 			distrilbutionBillLading.setWarehouseId(myCurrentWarehouse.getId());
@@ -492,13 +495,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					distrilbutionBillStock.setOrderStatus("1");
 					distrilbutionBillStockService.save(distrilbutionBillStock);
 					List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
-					if(ObjectUtils.isNotNull(distrilbutionBillLading.getBillPackageEntityList())){
+					if (ObjectUtils.isNotNull(distrilbutionBillLading.getBillPackageEntityList())) {
 						//添加自提包件信息
 //						List<DistrilbutionBillPackageEntity> collect = new ArrayList<>();
 						List<DistrilbutionBillPackageEntity> collect = distrilbutionBillLading.getBillPackageEntityList().stream().filter(qqq -> qqq.getStockArticleId().toString().equals(s)).collect(Collectors.toList());
-						if(!collect.isEmpty()){
+						if (!collect.isEmpty()) {
 							//有包件
-							collect.stream().forEach(ss ->{
+							collect.stream().forEach(ss -> {
 								DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
 								billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
 								billPackageEntity.setPacketBarCode(ss.getPacketBarCode());
@@ -515,25 +518,25 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 							//判断是否全部修改
 							int i = byId.getHandQuantity() - collect.size();
-							if(i > 0){
+							if (i > 0) {
 								//部分
 								distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
 							}
-						}else{
+						} else {
 							//没有包件 查询包件信息
 							List<DistrilbutionBillPackageEntity> packageEntityList1 = billPackInfo(s, distrilbutionBillLading.getId(), parcelLisList, byId);
-							if(packageEntityList1.isEmpty()){
-								throw new ServiceException(byId.getOrderCode()+"没有可用包件信息！");
+							if (packageEntityList1.isEmpty()) {
+								throw new ServiceException(byId.getOrderCode() + "没有可用包件信息！");
 							}
 							packageEntityList.addAll(packageEntityList1);
 
 //							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 						}
-					}else{
+					} else {
 						//没有包件 查询包件信息
-						List<DistrilbutionBillPackageEntity> packageEntityList1 = billPackInfo(s,distrilbutionBillLading.getId(),parcelLisList,byId);
-						if(packageEntityList1.isEmpty()){
-							throw new ServiceException(byId.getOrderCode()+"没有可用包件信息！");
+						List<DistrilbutionBillPackageEntity> packageEntityList1 = billPackInfo(s, distrilbutionBillLading.getId(), parcelLisList, byId);
+						if (packageEntityList1.isEmpty()) {
+							throw new ServiceException(byId.getOrderCode() + "没有可用包件信息！");
 						}
 						packageEntityList.addAll(packageEntityList1);
 
@@ -541,11 +544,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					}
 
 //					int i1 = byId.getHandQuantity() + byId.getSigninQuantity(); //总数
-					if(byId.getCompleteSet()==2){
+					if (byId.getCompleteSet() == 2) {
 						//全部
 						distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 
-					}else{
+					} else {
 						//部分
 						distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
 					}
@@ -554,15 +557,15 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					List<DistributionParcelNumberEntity> parcelNumberList = distributionParcelNumberService.list(Wrappers.<DistributionParcelNumberEntity>query().lambda()
 						.eq(DistributionParcelNumberEntity::getStockArticleId, s)
 					);
-					if(!parcelNumberList.isEmpty()){
+					if (!parcelNumberList.isEmpty()) {
 						//零担
 						int handQuantity = parcelNumberList.stream().mapToInt(DistributionParcelNumberEntity::getHandQuantity).sum(); //在库总数量
 						int sum = parcelNumberList.stream().mapToInt(DistributionParcelNumberEntity::getDeliveryQuantity).sum(); //配送数量
 						int i = handQuantity - sum;
-						if(i > 0){
+						if (i > 0) {
 							//部分
 							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
-						}else if(i == 0){
+						} else if (i == 0) {
 							//全部
 							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 						}
@@ -623,8 +626,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 	@Override
 	public boolean signImages(DistrilbutionBillLadingDTO distrilbutionBillLading) {
-
-
 		//修改图片
 		List<DistributionPrintEntity> printEntityList = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId()));
 		if (!printEntityList.isEmpty()) {
@@ -637,7 +638,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					addPrint(distrilbutionBillLading);
 				}
 			}
-		}else{
+		} else {
 			//操作图片
 			if (!distrilbutionBillLading.getPrintList().isEmpty()) {
 				addPrint(distrilbutionBillLading);
@@ -651,85 +652,101 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		String method = "##########类DistrilbutionBillLadingServiceImpl执行方法cancelBillLoding,";
 		List<Long> ids = Func.toLongList(",", billLodingIds);
 		List<DistrilbutionBillLadingEntity> distrilbutionBillLadingEntities = this.listByIds(ids);
-		if (Func.isEmpty(distrilbutionBillLadingEntities)){
-			log.error(method+"查询自提单信息失败:{}",billLodingIds);
+		if (Func.isEmpty(distrilbutionBillLadingEntities)) {
+			log.error(method + "查询自提单信息失败:{}", billLodingIds);
 			return R.fail("服务器正忙，请联系管理员!!!");
 		}
 		String errorBillLading = distrilbutionBillLadingEntities.stream().filter(f -> !f.getConditions().equals(BillLadingStatusConstant.daitihuo.getValue())).map(DistrilbutionBillLadingEntity::getPickupBatch).collect(Collectors.joining(","));
-		if (Func.isNotEmpty(errorBillLading)){
-			log.error(method+"存在已提货或签收自提单:{}",errorBillLading);
-			return R.fail(errorBillLading+"已提货或已签收!!!");
+		if (Func.isNotEmpty(errorBillLading)) {
+			log.error(method + "存在已提货或签收自提单:{}", errorBillLading);
+			return R.fail(errorBillLading + "已提货或已签收!!!");
 		}
 		//查询是否存在自提扫描的有效包件
 		List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 			.in(DistributionBillLadingScanEntity::getBillLadingId, ids)
 		);
-		if (Func.isNotEmpty(ladingScanEntities)){
-			log.error(method+"取消自提单存在自提扫描数据:{}",errorBillLading);
-			return R.fail(errorBillLading+"已提货或已签收!!!");
+		if (Func.isNotEmpty(ladingScanEntities)) {
+			log.error(method + "取消自提单存在自提扫描数据:{}", errorBillLading);
+			return R.fail(errorBillLading + "已提货或已签收!!!");
 		}
 		//满足进行取消自提，进行自提单的资源释放
 		//直接对配送的包件和库存品进行取消
 		Integer a = this.cancelBillLodingPackage(ids);
-
-
-
-		return R.status(true);
+		switch (a) {
+			case 0:
+				//进行自提单的取消
+				this.removeBatchByIds(ids);
+				return R.status(true);
+			case 1:
+				return R.fail("未授权!!!");
+			case 2:
+				return R.fail("存在签收包件");
+		}
+		return R.status(false);
 	}
 
+	@Transactional
 	private Integer cancelBillLodingPackage(List<Long> ids) {
 		String method = "##########类DistrilbutionBillLadingServiceImpl执行方法cancelBillLoding,";
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
-		if (Func.isEmpty(myCurrentWarehouse)){
+		if (Func.isEmpty(myCurrentWarehouse)) {
 			//未授权
 			return 1;
 		}
 		//查询关联包件进行状态恢复
 		List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectBillLadingPackage(ids);
-		if (Func.isNotEmpty(distributionParcelListEntities)){
+		if (Func.isNotEmpty(distributionParcelListEntities)) {
 			List<DistributionParcelListEntity> signingPakcage = distributionParcelListEntities.stream().filter(f -> f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).collect(Collectors.toList());
-			if (Func.isEmpty(signingPakcage)){
+			if (Func.isNotEmpty(signingPakcage)) {
 				//存在签收包件
-				return 3;
+				return 2;
 			}
+			//取消包件
+			UpdateWrapper<DistrilbutionBillPackageEntity> updateWrapper = new UpdateWrapper<>();
+			updateWrapper.lambda()
+				.in(DistrilbutionBillPackageEntity::getBillLadingId,ids)
+				.set(DistrilbutionBillPackageEntity::getPacketBarStatus,"3")
+			;
+			distrilbutionBillPackageService.update(updateWrapper);
+
+			//取消订单
+			UpdateWrapper<DistrilbutionBillStockEntity> orderUpdateWrapper = new UpdateWrapper<>();
+			orderUpdateWrapper.lambda()
+				.in(DistrilbutionBillStockEntity::getBillLadingId,ids)
+				.set(DistrilbutionBillStockEntity::getOrderStatus,"3")
+			;
+			distrilbutionBillStockService.update(orderUpdateWrapper);
+
 			List<Long> packageIds = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 			//将这些包件还原成可操作状态
 			Integer num = distributionParcelListService.restorePakcageByIds(packageIds);
 			//维护订单状态
 			String orderCodes = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).distinct().collect(Collectors.joining(","));
-			distributionStockArticleService.maintenanceOrderInfo(orderCodes,myCurrentWarehouse.getId());
-		}else {
-			log.error(method+"查询无包件信息:{}",ids);
-			//自提无包件信息
-			return 2;
+			distributionStockArticleService.maintenanceOrderInfo(orderCodes, myCurrentWarehouse.getId());
 		}
 		//取消库存品
 		//查询自提库存品信息
 		List<DistributionDeliveryDetailsEntity> distributionStockListEntities = baseMapper.selectBillLadingInventory(ids);
-		if (Func.isNotEmpty(distributionStockListEntities)){
+		if (Func.isNotEmpty(distributionStockListEntities)) {
 			//已经备货的库存品  存在库存品包件
-			distributionStockListEntities.forEach(ddd->{
-				//进行库存品包件取消
-				if (ddd.getStockStatus().equals("3")){
-					disStockListDetailService.cancelInventoryPackageByReservationIdAnStockListId(ddd.getStockListId(),ddd.getBillLadingId());
-				}
+			distributionStockListEntities.forEach(ddd -> {
 				//恢复库存品数量
-
-
+				distributionStockListService.updateInventoryQuantityOccupied(ddd.getStockListId(),ddd.getQuantity());
+					//进行库存品包件取消
+					if (ddd.getStockStatus().equals("3")) {
+						disStockListDetailService.cancelInventoryPackageByReservationIdAnStockListId(ddd.getStockListId(), ddd.getBillLadingId());
+					}
 
 				}
 			);
 
 
-
-
-
 			//对所有的库存品相关进行取消标识
 			UpdateWrapper<DistributionDeliveryDetailsEntity> updateWrapper = new UpdateWrapper<>();
 			updateWrapper.lambda()
-				.set(DistributionDeliveryDetailsEntity::getConditions,3)
-				.set(DistributionDeliveryDetailsEntity::getQuantity,0)
-				.in(DistributionDeliveryDetailsEntity::getBillLadingId,ids);
+				.set(DistributionDeliveryDetailsEntity::getInventoryStatus, 3)
+				.set(DistributionDeliveryDetailsEntity::getQuantity, 0)
+				.in(DistributionDeliveryDetailsEntity::getBillLadingId, ids);
 			distributionDeliveryDetailsService.update(updateWrapper);
 		}
 		return 0;
@@ -737,40 +754,41 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 	/**
 	 * 自提没有包件信息添加包件
+	 *
 	 * @param stockArticleId
 	 * @param billId
 	 * @param parcelLisList
 	 * @param byId
 	 * @return
 	 */
-	public List<DistrilbutionBillPackageEntity> billPackInfo(String stockArticleId,Long billId,List<DistributionParcelListDTO> parcelLisList,DistributionStockArticleEntity byId){
+	public List<DistrilbutionBillPackageEntity> billPackInfo(String stockArticleId, Long billId, List<DistributionParcelListDTO> parcelLisList, DistributionStockArticleEntity byId) {
 		List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
 		//没有包件 查询待预约包件信息
 		List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 			.eq(DistributionParcelListEntity::getStockArticleId, stockArticleId)
 			.eq(DistributionParcelListEntity::getConditions, 1)
-			.eq(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue())
+			.eq(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
 		);
 		List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
 			.eq(DistrilbutionBillPackageEntity::getBillLadingId, billId)
 			.apply("packet_bar_status in ( 1 , 3 )")
 		);
-		if(!list1.isEmpty()){
-			list1.forEach(ss ->{
+		if (!list1.isEmpty()) {
+			list1.forEach(ss -> {
 				Optional<DistrilbutionBillPackageEntity> first1 = list.stream().filter(q -> q.getParceListId().equals(ss.getId())).findFirst();
-				if(!first1.isPresent()){
+				if (!first1.isPresent()) {
 					DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
 					billPackageEntity.setBillLadingId(billId);
 					billPackageEntity.setPacketBarCode(ss.getOrderPackageCode());
 					billPackageEntity.setPacketBarStatus(1);
 					billPackageEntity.setParceListId(ss.getId());
 					billPackageEntity.setStockArticleId(ss.getStockArticleId());
-					if(byId.getIsZero().equals("1")){
+					if (byId.getIsZero().equals("1")) {
 						//零担
 						Optional<DistributionParcelListDTO> first = parcelLisList.stream().filter(i -> i.getStockArticleId().equals(ss.getStockArticleId()) && i.getId().equals(ss.getId())).findFirst();
 						billPackageEntity.setBillType("2");
 						billPackageEntity.setPacketNumber(first.get().getQuantity());
-					}else{
+					} else {
 						billPackageEntity.setBillType("1");
 						billPackageEntity.setPacketNumber(ss.getQuantity());
 					}
@@ -786,29 +804,29 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	}
 
 
-
 	/**
 	 * 添加提货包件数据
+	 *
 	 * @return
 	 */
-	public Boolean updateBillPackeg(DistrilbutionBillLadingDTO distrilbutionBillLading){
-		 distrilbutionBillLading.getBillPackageEntityList().stream().collect(Collectors.groupingBy(DistrilbutionBillPackageEntity::getStockArticleId))
-			.forEach((k,v) ->{
+	public Boolean updateBillPackeg(DistrilbutionBillLadingDTO distrilbutionBillLading) {
+		distrilbutionBillLading.getBillPackageEntityList().stream().collect(Collectors.groupingBy(DistrilbutionBillPackageEntity::getStockArticleId))
+			.forEach((k, v) -> {
 				List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
 					.eq(DistrilbutionBillPackageEntity::getBillLadingId, distrilbutionBillLading.getId())
 					.eq(DistrilbutionBillPackageEntity::getStockArticleId, k)
 				);
 				//没有数据
-				if(list.isEmpty()){
+				if (list.isEmpty()) {
 					throw new ServiceException("没有包件数据！");
 				}
 				List<Long> sc = new ArrayList<>();
 				Iterator<DistrilbutionBillPackageEntity> iterator = v.iterator();
-				list.stream().forEach( i ->{
+				list.stream().forEach(i -> {
 					Boolean cz = false;
-					while (iterator.hasNext()){
+					while (iterator.hasNext()) {
 						DistrilbutionBillPackageEntity next = iterator.next();
-						if(i.getParceListId().equals(next.getParceListId())){
+						if (i.getParceListId().equals(next.getParceListId())) {
 							//存在
 							iterator.remove();
 						}
@@ -817,11 +835,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 				});
 				//新增包件
-				if(!v.isEmpty()){
+				if (!v.isEmpty()) {
 					List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
-					v.stream().forEach(i ->{
+					v.stream().forEach(i -> {
 						DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
-						BeanUtils.copyProperties(i,billPackageEntity);
+						BeanUtils.copyProperties(i, billPackageEntity);
 						billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
 						billPackageEntity.setPacketNumber(1);
 						billPackageEntity.setPacketBarStatus(1);
@@ -832,24 +850,24 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					List<Long> collect = packageEntityList.stream().map(i -> i.getParceListId()).collect(Collectors.toList());
 					//修改包件状态
 					distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update()
-						.in("id",collect)
+						.in("id", collect)
 						.set("order_package_reservation_status", OrderPackageReservationStatusConstant.yiyueyue.getValue())
 					);
 				}
 
 			});
 		//删除包件
-		if(!distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){
+		if (!distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()) {
 			List<Long> collect = distrilbutionBillLading.getUnBillPackageEntityList().stream().map(e -> e.getParceListId()).collect(Collectors.toList());
 			boolean update = distrilbutionBillPackageService.update(Wrappers.<DistrilbutionBillPackageEntity>update()
 				.in("parce_list_id", collect)
 				.set("packet_bar_status", 2));
 			//修改包件状态
 			distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update()
-				.in("id",collect)
+				.in("id", collect)
 				.set("order_package_reservation_status", OrderPackageReservationStatusConstant.daiyuyue.getValue())
 			);
-			if(!update){
+			if (!update) {
 				throw new ServiceException("修改失败！！！");
 			}
 		}
@@ -857,42 +875,42 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	}
 
 
-
 	/**
 	 * 修改零担
+	 *
 	 * @param distrilbutionBillLadingDTO
 	 * @return
 	 */
-	public int updetaParcelNum(DistrilbutionBillLadingDTO distrilbutionBillLadingDTO){
+	public int updetaParcelNum(DistrilbutionBillLadingDTO distrilbutionBillLadingDTO) {
 		List<DistributionReservationZeroPackageEntity> list = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
 			.eq(DistributionReservationZeroPackageEntity::getReservationId, distrilbutionBillLadingDTO.getId())
 		); //数据库的品分类数据
 		List<DistributionParcelListDTO> parcelLisList = distrilbutionBillLadingDTO.getParcelLisList();//品类信息
-		if(!list.isEmpty()){
+		if (!list.isEmpty()) {
 			List<Long> longs = new ArrayList<>();
 			//存在的
-			list.forEach(i ->{
+			list.forEach(i -> {
 				boolean b = parcelLisList.stream().anyMatch(ii -> ii.getId().equals(i.getParcelListId()));
-				if(b){
+				if (b) {
 					//有数据
 					Iterator<DistributionParcelListDTO> iterator = parcelLisList.iterator();
-					while (iterator.hasNext()){
+					while (iterator.hasNext()) {
 						DistributionParcelListDTO next = iterator.next();
-						if(next.getId().equals(i.getParcelListId())){
-							if(i.getRealityQuantity() > 0){
+						if (next.getId().equals(i.getParcelListId())) {
+							if (i.getRealityQuantity() > 0) {
 								throw new ServiceException("已备货无法修改备货数量！");
 							}
 							//获取修改的数量
 							Integer quantity = i.getQuantity();//原预约数量
 							Integer quantity1 = next.getQuantity();//改变的数量
 							int i1 = quantity - quantity1;
-							if(i1 > 0 ){
+							if (i1 > 0) {
 								//减少了
-								distributionParcelNumberService.updateBillNum(i.getParcelListId(),i1,1);
-							}else if(i1 < 0){
+								distributionParcelNumberService.updateBillNum(i.getParcelListId(), i1, 1);
+							} else if (i1 < 0) {
 								//增加了
-								distributionParcelNumberService.updateBillNum(i.getParcelListId(),i1,2);
-							}else {
+								distributionParcelNumberService.updateBillNum(i.getParcelListId(), i1, 2);
+							} else {
 								//不做操作！
 								continue;
 							}
@@ -904,18 +922,18 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							iterator.remove();
 						}
 					}
-				}else{
+				} else {
 					//不存在
 					longs.add(i.getId());
 
 				}
 			});
-			if(!longs.isEmpty()){
+			if (!longs.isEmpty()) {
 				distributionZeroPackageService.deleteLogic(longs);
 			}
 			// TODo 添加新的品类
 			List<DistributionReservationZeroPackageEntity> packageEntityList = new ArrayList<>();
-			parcelLisList.forEach( w ->{
+			parcelLisList.forEach(w -> {
 				DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity();
 				zeroPackageEntity.setParcelListId(w.getId());
 				zeroPackageEntity.setStockArticleId(w.getStockArticleId());
@@ -927,19 +945,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				zeroPackageEntity.setRealityQuantity(0);
 				packageEntityList.add(zeroPackageEntity);
 			});
-			if(!packageEntityList.isEmpty()){ distributionZeroPackageService.saveBatch(packageEntityList); }
+			if (!packageEntityList.isEmpty()) {
+				distributionZeroPackageService.saveBatch(packageEntityList);
+			}
 
-		}else{
-		     log.warn("没有品类数据");
-		     return 0;
+		} else {
+			log.warn("没有品类数据");
+			return 0;
 		}
 
 		return 1;
 	}
 
 
-
-
 	/**
 	 * 修改操作订单数据
 	 *
@@ -981,7 +999,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		//删除提货订单状态
 		deList.forEach(i -> {
 			//查询数据是否已备货
-			if ("10".equals(i.getConditions()) ) {
+			if ("10".equals(i.getConditions())) {
 				//未
 				List<DistributionStockEntity> list1 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda().eq(DistributionStockEntity::getStockArticle, i.getStockArticleId()));
 				if (list1.isEmpty()) {
@@ -996,14 +1014,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				distrilbutionBillStockService.updateById(i);
 				//取消预约包件信息
 				distrilbutionBillPackageService.update(Wrappers.<DistrilbutionBillPackageEntity>update()
-					.eq("bill_lading_id",id)
-					.eq("stock_article_id",i.getStockArticleId())
+					.eq("bill_lading_id", id)
+					.eq("stock_article_id", i.getStockArticleId())
 					.apply("packet_bar_status in ( 1 , 3 )")
-					.set("packet_bar_status",2)
+					.set("packet_bar_status", 2)
 				);
 				//还原预约包件信息
 				distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update()
-					.eq("stock_article_id",i.getStockArticleId())
+					.eq("stock_article_id", i.getStockArticleId())
 					.set("order_package_reservation_status", OrderPackageReservationStatusConstant.daiyuyue.getValue())
 				);
 				//修改订单数据
@@ -1031,33 +1049,33 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//添加包件信息
 
 			//没有包件 查询包件信息
-			List<DistrilbutionBillPackageEntity> packageEntityList1 = billPackInfo(String.valueOf(i.getId()),id,null,i);
-			if(packageEntityList1.isEmpty()){
-				throw new ServiceException(i.getOrderCode()+"没有可用包件信息！");
+			List<DistrilbutionBillPackageEntity> packageEntityList1 = billPackInfo(String.valueOf(i.getId()), id, null, i);
+			if (packageEntityList1.isEmpty()) {
+				throw new ServiceException(i.getOrderCode() + "没有可用包件信息！");
 			}
 			packageEntityList.addAll(packageEntityList1);
 			stringBuff.add(String.valueOf(i.getId()));
 		});
 		//添加包件信息
-		if(!packageEntityList.isEmpty()){
+		if (!packageEntityList.isEmpty()) {
 			distrilbutionBillPackageService.saveBatch(packageEntityList);
 		}
 		distrilbutionBillStockService.saveBatch(list1);
-		if(ObjectUtils.isNotNull(stringBuff) || ObjectUtils.isNotNull(sStock)){
+		if (ObjectUtils.isNotNull(stringBuff) || ObjectUtils.isNotNull(sStock)) {
 			//修改订单状态
 			DistrilbutionBillLadingEntity billLadingEntity = baseMapper.selectById(id);
 			DistrilbutionBillLadingEntity distrilbutionBillLading = new DistrilbutionBillLadingEntity();
 			distrilbutionBillLading.setId(billLadingEntity.getId());
-			List<String> list2 =new ArrayList<>( Arrays.asList(billLadingEntity.getStockArticleId().split(",")));
+			List<String> list2 = new ArrayList<>(Arrays.asList(billLadingEntity.getStockArticleId().split(",")));
 			StringBuffer s = new StringBuffer();
-			if(ObjectUtils.isNotNull(sStock)){
+			if (ObjectUtils.isNotNull(sStock)) {
 				list2.removeAll(sStock);
 			}
 			String join = String.join(",", list2);
 			s.append(join);
-			if(ObjectUtils.isNotNull(stringBuff)){
+			if (ObjectUtils.isNotNull(stringBuff)) {
 				String join1 = String.join(",", stringBuff);
-				s.append(","+join1);
+				s.append("," + join1);
 			}
 			distrilbutionBillLading.setStockArticleId(s.toString());
 			baseMapper.updateById(distrilbutionBillLading);
@@ -1097,9 +1115,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count();
 			int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count();
 			int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count();
-			if(count1 >= 1 && count >= 1 && count2 >= 1){
+			if (count1 >= 1 && count >= 1 && count2 >= 1) {
 				i.setPrintState(true);
-			}else{
+			} else {
 				i.setPrintState(false);
 			}
 		});
@@ -1112,13 +1130,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 		// 获取当前登录的仓库信息
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-		if(ObjectUtils.isNull(myCurrentWarehouse)){
+		if (ObjectUtils.isNull(myCurrentWarehouse)) {
 			throw new ServiceException("没有仓库信息！");
 		}
 		// 用户勾选数据的ids
 		Object ids = param.get("ids");
 		List<String> idArr = null;
-		if (null != ids && !ids.toString().equals("")){
+		if (null != ids && !ids.toString().equals("")) {
 			idArr = Arrays.asList(param.get("ids").toString().split(","));
 		}
 
@@ -1128,7 +1146,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		list.forEach(s -> {
 			DistrilbutionBillLadingExcel excel = new DistrilbutionBillLadingExcel();
 			s.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, s.getCertificateTypeName()));
-			BeanUtil.copyProperties(s,excel);
+			BeanUtil.copyProperties(s, excel);
 
 			listExcel.add(excel);
 		});
@@ -1169,11 +1187,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	public IPage<DistrilbutionBillLadingAppVO> pageListApp(IPage<Object> page, BillLadingAppDTO billLadingAppDTO) {
 		//查询仓库信息
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
-		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
+		if (ObjectUtils.isNotNull(myCurrentWarehouse)) {
 			billLadingAppDTO.setWarehouseId(myCurrentWarehouse.getId()); //仓库ID
-			if(ObjectUtils.isNotNull(billLadingAppDTO.getPickUpTimeStart()) && ObjectUtils.isNotNull(billLadingAppDTO.getPickUpTimeEnd())){
-				billLadingAppDTO.setPickUpTimeStart(billLadingAppDTO.getPickUpTimeStart()+" 00:00:00");
-				billLadingAppDTO.setPickUpTimeEnd(billLadingAppDTO.getPickUpTimeEnd()+" 23:59:59");
+			if (ObjectUtils.isNotNull(billLadingAppDTO.getPickUpTimeStart()) && ObjectUtils.isNotNull(billLadingAppDTO.getPickUpTimeEnd())) {
+				billLadingAppDTO.setPickUpTimeStart(billLadingAppDTO.getPickUpTimeStart() + " 00:00:00");
+				billLadingAppDTO.setPickUpTimeEnd(billLadingAppDTO.getPickUpTimeEnd() + " 23:59:59");
 			}
 			//查询自提数据
 			IPage<DistrilbutionBillLadingAppVO> pageList = baseMapper.pageListApp(page, billLadingAppDTO);
@@ -1193,7 +1211,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
 					.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "2")
 				);
-				if(!list1.isEmpty()){
+				if (!list1.isEmpty()) {
 					//有零担
 					int sum = list1.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
 					planNum = planNum + sum;
@@ -1211,8 +1229,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					queryWrapper.isNotNull("order_package_code");
 //					List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
 					List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
-						.eq(DistrilbutionBillPackageEntity::getBillLadingId,vo.getBillLadingId())
-						.eq(DistrilbutionBillPackageEntity::getStockArticleId,s)
+						.eq(DistrilbutionBillPackageEntity::getBillLadingId, vo.getBillLadingId())
+						.eq(DistrilbutionBillPackageEntity::getStockArticleId, s)
 						.apply("packet_bar_status in (1,3)")
 					);
 					int pn = list.size(); //包件数量
@@ -1222,7 +1240,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					qw.eq("stock_article_id", Long.parseLong(s))
 						.eq("is_deleted", 0);
 					List<DistributionBillLadingScanEntity> ls = distributionBillLadingScanService.list(qw);
-					if(!ls.isEmpty()){
+					if (!ls.isEmpty()) {
 						int sum = ls.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
 						signedNum = signedNum + sum;
 					}
@@ -1246,7 +1264,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			pageList.setRecords(records);
 
 			return pageList;
-		}else{
+		} else {
 			log.warn("#####仓库信息数据未查询处理");
 			return null;
 		}
@@ -1275,7 +1293,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
 			.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3")
 		);
-		if(!listZero.isEmpty()){
+		if (!listZero.isEmpty()) {
 			int sum = listZero.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
 			planNum += sum;
 		}
@@ -1300,7 +1318,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 			List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
 			int pn = 0;
-			if( !list.isEmpty() && ObjectUtils.isNotNull(list.get(0))){
+			if (!list.isEmpty() && ObjectUtils.isNotNull(list.get(0))) {
 				vo.setOrderSelfNumbering(list.get(0).getOrderCode());
 				pn = list.size();
 				vo.setPlanNum(pn);
@@ -1310,7 +1328,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			QueryWrapper<DistributionBillLadingScanEntity> qw = new QueryWrapper<>();
 			qw.eq("stock_article_id", Long.parseLong(s))
 				.eq("is_deleted", 0);
-			qw.eq("bill_lading_id",main.getBillLadingId());
+			qw.eq("bill_lading_id", main.getBillLadingId());
 			List<DistributionBillLadingScanEntity> ls = distributionBillLadingScanService.list(qw);
 			int sn = ls.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
 			vo.setSignedNum(sn);
@@ -1327,7 +1345,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				vo.setOrderStatusStr("未扫");
 			}
 			//不添加订单数
-			if(list.isEmpty()|| !list.isEmpty() && ObjectUtils.isNull(list.get(0))){
+			if (list.isEmpty() || !list.isEmpty() && ObjectUtils.isNull(list.get(0))) {
 				continue;
 			}
 			//0 全部  1	齐套 2部分扫 3未扫
@@ -1371,9 +1389,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 //		planNum += list.stream().mapToInt(DistributionDeliveryDetailsEntity::getQuantity).sum();
 		DistrilbutionAppBillLadingOrderMainVO mainVO = new DistrilbutionAppBillLadingOrderMainVO();
 		mainVO.setOrderNum(orderNum);
-		if(!list.isEmpty()){
+		if (!list.isEmpty()) {
 			mainVO.setInventoryNub(list.stream().mapToInt(DistributionDeliveryDetailsEntity::getQuantity).sum());
-		}else{
+		} else {
 			mainVO.setInventoryNub(0);
 		}
 		mainVO.setPlanNum(planNum);//自提件数
@@ -1405,7 +1423,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
 			.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3")
 		);
-		if(!list1.isEmpty()){
+		if (!list1.isEmpty()) {
 			int sum = list1.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
 			planNum += sum;
 		}
@@ -1418,7 +1436,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 
 			//查询所有的包件列表并且附带状态
-			List<DistrilbutionAppBillLadingDetailVO> details = baseMapper.selectDetailList(Long.parseLong(s), scanStatus, orderSelfNumbering,billLadingId);
+			List<DistrilbutionAppBillLadingDetailVO> details = baseMapper.selectDetailList(Long.parseLong(s), scanStatus, orderSelfNumbering, billLadingId);
 			for (DistrilbutionAppBillLadingDetailVO detailVO : details) {
 				Integer ss = detailVO.getScanStatus();
 				Integer errorStatus = detailVO.getErrorStatus();
@@ -1442,8 +1460,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			queryWrapper.isNotNull("order_package_code");
 //			List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
 			List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
-				.eq(DistrilbutionBillPackageEntity::getBillLadingId,billLadingId)
-				.eq(DistrilbutionBillPackageEntity::getStockArticleId,s)
+				.eq(DistrilbutionBillPackageEntity::getBillLadingId, billLadingId)
+				.eq(DistrilbutionBillPackageEntity::getStockArticleId, s)
 				.apply("packet_bar_status in (1,3)")
 			);
 			int pn = list.size();
@@ -1453,7 +1471,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			qw.eq("stock_article_id", Long.parseLong(s))
 				.eq("is_deleted", 0);
 			List<DistributionBillLadingScanEntity> ls = distributionBillLadingScanService.list(qw);
-			if(!ls.isEmpty()){
+			if (!ls.isEmpty()) {
 				int sum = ls.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
 				signedNum = signedNum + sum;
 				if (pn == sum) {
@@ -1682,12 +1700,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			return Resp.scanFail("3000", "参数不完整！！");
 		} else {
 			DistrilbutionBillLadingEntity billLadingEntity1 = baseMapper.selectById((Serializable) billLadingId);
-			if(ObjectUtils.isNotNull(billLadingEntity1) && "20".equals(billLadingEntity1.getConditions())){
-				return  Resp.scanFail("提货任务已完成！", "提货任务已完成！");
+			if (ObjectUtils.isNotNull(billLadingEntity1) && "20".equals(billLadingEntity1.getConditions())) {
+				return Resp.scanFail("提货任务已完成！", "提货任务已完成！");
 			}
 			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
-			if(ObjectUtils.isNull(myCurrentWarehouse)){
-				return Resp.scanFail("请选择仓库！","请选择仓库！");
+			if (ObjectUtils.isNull(myCurrentWarehouse)) {
+				return Resp.scanFail("请选择仓库！", "请选择仓库！");
 			}
 			//查询是否签收
 			List<DistributionBillLadingScanEntity> list3 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
@@ -1696,7 +1714,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				.eq(DistributionBillLadingScanEntity::getPacketBarCode, coding)
 			);
 			if (!list3.isEmpty()) {
-				return  Resp.scanFail("该包件已签收！", "该包件已签收！");
+				return Resp.scanFail("该包件已签收！", "该包件已签收！");
 			}
 
 			//添加扫描记录
@@ -1718,8 +1736,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						//修改完成状态
 						distributionAsyncService.getInventoryOrderSelfPickup(inventoryAppVO.getLdddId());
 					}
-					if(list.size() > inventoryAppVO.getQuantity()){
-						return  Resp.scanFail("已完成！", "已完成！！");
+					if (list.size() > inventoryAppVO.getQuantity()) {
+						return Resp.scanFail("已完成！", "已完成！！");
 					}
 					//修改库存品签收
 					distributionAsyncService.getInventorySelfPickup(inventoryAppVO.getStockArticleId());
@@ -1728,7 +1746,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					distributionBillLadingScan.setQuantity(1);
 					distributionBillLadingScanService.save(distributionBillLadingScan);
 				} else {
-					return  Resp.scanFail("包件信息不存在", "包件信息不存在");
+					return Resp.scanFail("包件信息不存在", "包件信息不存在");
 				}
 			} else {
 
@@ -1737,20 +1755,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.eq(DistributionParcelListEntity::getOrderPackageCode, coding)
 					.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
 				);
-				if(list4.isEmpty()){
+				if (list4.isEmpty()) {
 					return Resp.scanFail(PdaAudioLingoStatus.baojianbucunzai.getName(), PdaAudioLingoStatus.baojianbucunzai.getName());
 				}
 
 				DistrilbutionBillStockEntity one2 = distrilbutionBillStockService.getOne(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
 					.eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId)
-						.apply("order_status in (1 , 2)")
+					.apply("order_status in (1 , 2)")
 					.eq(DistrilbutionBillStockEntity::getStockArticleId, list4.get(0).getStockArticleId())
 				);
-				if(ObjectUtils.isNull(one2)){
-					return Resp.scanFail("不在本次自提计划！","不在本次自提计划！");
+				if (ObjectUtils.isNull(one2)) {
+					return Resp.scanFail("不在本次自提计划！", "不在本次自提计划！");
 				}
-				if("20".equals(one2.getConditions())){
-					return Resp.scanFail("当前提货任务，"+list4.get(0).getOrderCode()+"已齐套！","当前提货任务，"+list4.get(0).getOrderCode()+"已齐套！");
+				if ("20".equals(one2.getConditions())) {
+					return Resp.scanFail("当前提货任务，" + list4.get(0).getOrderCode() + "已齐套！", "当前提货任务，" + list4.get(0).getOrderCode() + "已齐套！");
 				}
 
 				//查询订单存在吗
@@ -1758,7 +1776,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId)
 				);
 				if (list.isEmpty()) {
-					return  Resp.scanFail("当前提货任务，订单不存在！", "当前提货任务，订单不存在！");
+					return Resp.scanFail("当前提货任务，订单不存在！", "当前提货任务，订单不存在！");
 				} else {
 					AtomicBoolean n = new AtomicBoolean(false);
 					list.forEach(so -> {
@@ -1784,7 +1802,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 								DistrilbutionBillStockEntity one1 = distrilbutionBillStockService.getOne(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
 									.eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId)
 									.eq(DistrilbutionBillStockEntity::getStockArticleId, one.getId())
-									.eq(DistrilbutionBillStockEntity::getConditions,BillLadingStatusConstant.daitihuo.getValue() )
+									.eq(DistrilbutionBillStockEntity::getConditions, BillLadingStatusConstant.daitihuo.getValue())
 								);
 								//修改订单状态
 								distributionAsyncService.getOrderSelfPickup(list1.get(0).getId());
@@ -1792,12 +1810,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 								distributionAsyncService.getBillStock(one1.getId());
 							}
 							//修改在库数量
-							if(ObjectUtils.isNotNull( one.getHandQuantity()) && one.getHandQuantity() > 0){
+							if (ObjectUtils.isNotNull(one.getHandQuantity()) && one.getHandQuantity() > 0) {
 								int i = one.getHandQuantity() - 1;
 								int i2 = ObjectUtils.isNull(one.getSigninQuantity()) ? 1 : one.getSigninQuantity() + 1;
 								distributionStockArticleService.update(Wrappers.<DistributionStockArticleEntity>update()
-									.eq("id",one.getId())
-									.set("hand_quantity",i)
+									.eq("id", one.getId())
+									.set("hand_quantity", i)
 									.set("signin_quantity", i2)
 								);
 							}
@@ -1810,10 +1828,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							distributionBillLadingScan.setQuantity(1);
 							distributionBillLadingScan.setBillLadingId(Long.parseLong((String) billLadingId));
 							//包件解脱
-							try{
-								warehouseUpdownTypeClient.downPackageOrDelTray((String) coding,myCurrentWarehouse.getId());
-							}catch (Exception e){
-								log.info("自提签收包件解托报错："+e.getMessage());
+							try {
+								warehouseUpdownTypeClient.downPackageOrDelTray((String) coding, myCurrentWarehouse.getId());
+							} catch (Exception e) {
+								log.info("自提签收包件解托报错：" + e.getMessage());
 							}
 
 						}
@@ -1822,13 +1840,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					if (n.get()) {
 						distributionBillLadingScanService.save(distributionBillLadingScan);
 					} else {
-						return  Resp.scanFail("当前订单，包件不存在！！", "当前订单，包件不存在！！");
+						return Resp.scanFail("当前订单，包件不存在！！", "当前订单，包件不存在！！");
 					}
 				}
 
 			}
 			//判断当前自提任务完成没有
-			String a= String.valueOf(billLadingId);
+			String a = String.valueOf(billLadingId);
 			distributionAsyncService.getStockUPstate(Long.parseLong(a));
 
 
@@ -1842,8 +1860,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				billLadingEntity.setConditions("20");
 				baseMapper.updateById(billLadingEntity);
 			}*/
-			log.info(coding+" > > 签收成功!!");
-			return  Resp.scanSuccess( "签收成功","");
+			log.info(coding + " > > 签收成功!!");
+			return Resp.scanSuccess("签收成功", "");
 		}
 	}
 
@@ -1910,13 +1928,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<DistributionPrintEntity> list1 = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
 				.eq(DistributionPrintEntity::getBillLadingId, s)
 			);
-			if(list1.isEmpty()){
+			if (list1.isEmpty()) {
 				throw new ServiceException("请上传签收图片！！");
 			}
 			int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count();
 			int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count();
 			int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count();
-			if(count1 < 1 || count < 1 || count2 < 1){
+			if (count1 < 1 || count < 1 || count2 < 1) {
 				throw new ServiceException("请上传完整签收图片！！");
 			}
 			//修改提货状态
@@ -1926,8 +1944,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			this.updateById(billLadingEntity);
 			//修改订单状态
 			List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
-				.eq(DistrilbutionBillStockEntity::getBillLadingId, s)
-				.apply("order_status in ( 1 , 2)")
+					.eq(DistrilbutionBillStockEntity::getBillLadingId, s)
+					.apply("order_status in ( 1 , 2)")
 //				.or(ew -> ew.eq(DistrilbutionBillStockEntity::getBillLadingId, s).apply(DistrilbutionBillStockEntity::getOrderStatus, "2"))
 			);
 			if (!list.isEmpty()) {
@@ -1939,14 +1957,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						.eq(DistributionParcelListEntity::getStockArticleId, li.getStockArticleId())
 						.apply("order_package_status != 70 ")
 					);
-					if(list2.isEmpty()){
+					if (list2.isEmpty()) {
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue());
-					}else{
+					} else {
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
 					}
 					//回退包件数据
 					Integer i1 = updatePack(li.getStockArticleId(), Long.valueOf(s));
-					if(i1 > 0){
+					if (i1 > 0) {
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
 					}
 					distributionStockArticleService.updateById(stockArticleEntity);
@@ -1958,45 +1976,43 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		}
 		return true;
 	}
-/**
- * 处理提货库存品签收
- */
-   public void updateStock(String billId){
-	   List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
-		   .eq(DisStockListDetailEntity::getReservationId, billId));
-	   if(ObjectUtils.isNotNull(list)){
-		   //处理库存
-		   List<DistributionBillLadingScanEntity> scanEntityList = new ArrayList<>();
-		  list.stream().filter(i -> i.getStockSignfoStatus().equals("10")).forEach( i ->{
-			  //添加自提库存品记录
-			  DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
-			  billLadingScan.setMaterialType("1");
-			  billLadingScan.setScanType(2);
-			  billLadingScan.setBillLadingId(Long.valueOf(billId));
-			  billLadingScan.setQuantity(1);
-			  billLadingScan.setStockListId(i.getStockListId());
-			  billLadingScan.setPacketBarCode(i.getStockPackageCode());
-			  scanEntityList.add(billLadingScan);
-		  });
-		   if(!scanEntityList.isEmpty()){
-			   distributionBillLadingScanService.saveBatch(scanEntityList);
-		   }
-
-
 
+	/**
+	 * 处理提货库存品签收
+	 */
+	public void updateStock(String billId) {
+		List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
+			.eq(DisStockListDetailEntity::getReservationId, billId));
+		if (ObjectUtils.isNotNull(list)) {
+			//处理库存
+			List<DistributionBillLadingScanEntity> scanEntityList = new ArrayList<>();
+			list.stream().filter(i -> i.getStockSignfoStatus().equals("10")).forEach(i -> {
+				//添加自提库存品记录
+				DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
+				billLadingScan.setMaterialType("1");
+				billLadingScan.setScanType(2);
+				billLadingScan.setBillLadingId(Long.valueOf(billId));
+				billLadingScan.setQuantity(1);
+				billLadingScan.setStockListId(i.getStockListId());
+				billLadingScan.setPacketBarCode(i.getStockPackageCode());
+				scanEntityList.add(billLadingScan);
+			});
+			if (!scanEntityList.isEmpty()) {
+				distributionBillLadingScanService.saveBatch(scanEntityList);
+			}
 
-	   }
 
+		}
 
-   }
 
+	}
 
 
 	/**
 	 * 修改包件签收状态
 	 */
 	@Transactional(rollbackFor = Exception.class)
-	public Integer updatePack(Long  ids,Long billId){
+	public Integer updatePack(Long ids, Long billId) {
 
 		List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
 			.eq(DistrilbutionBillPackageEntity::getBillLadingId, billId)
@@ -2004,17 +2020,17 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		);
 		List<DistributionBillLadingScanEntity> scanEntityList = new ArrayList<>();
 		AtomicReference<Integer> num = new AtomicReference<>(0);
-		if(ObjectUtils.isNotNull(list) && !list.isEmpty()){
+		if (ObjectUtils.isNotNull(list) && !list.isEmpty()) {
 			//签收记录
 			List<DistributionBillLadingScanEntity> list1 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 				.eq(DistributionBillLadingScanEntity::getBillLadingId, billId)
 			);
 			//去除签收的包件
 			Iterator<DistrilbutionBillPackageEntity> iterator = list.iterator();
-			while (iterator.hasNext()){
+			while (iterator.hasNext()) {
 				DistrilbutionBillPackageEntity next = iterator.next();
 				boolean b = list1.stream().anyMatch(q -> q.getParcelListId().equals(next.getParceListId()));
-				if(b){
+				if (b) {
 					//删除包件
 					iterator.remove();
 				}
@@ -2036,7 +2052,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 //				scanEntityList.add(billLadingScan);
 //			});
 			//回退包件信息
-			list.stream().forEach(i ->{
+			list.stream().forEach(i -> {
 				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 				parcelListEntity.setId(i.getParceListId());
 				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
@@ -2045,7 +2061,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			});
 
 
-
 //			if(!scanEntityList.isEmpty()){
 //				distributionBillLadingScanService.saveBatch(scanEntityList);
 //			}
@@ -2054,13 +2069,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	}
 
 
-
-
 	@Override
 	public DistrilbutionBillLadingVO listNum(Map<String, Object> distrilbutionBillLading) {
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-			distrilbutionBillLading.put("warehouse_id",myCurrentWarehouse.getId());
+		if (ObjectUtils.isNotNull(myCurrentWarehouse)) {
+			distrilbutionBillLading.put("warehouse_id", myCurrentWarehouse.getId());
 		}
 		DistrilbutionBillLadingDTO billLadingEntity = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingDTO.class);
 
@@ -2078,11 +2091,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	@Override
 	public List<DistrilbutionBillLadingViewVO> getViewDetailOwn(String id) {
 		List<DistrilbutionBillLadingViewVO> viewDetailOwn = baseMapper.getViewDetailOwn(id);
-		viewDetailOwn.forEach(i ->{
+		viewDetailOwn.forEach(i -> {
 			List<DistributionPrintEntity> list = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
 				.eq(DistributionPrintEntity::getBillLadingId, id)
 			);
-			if(!viewDetailOwn.isEmpty()){
+			if (!viewDetailOwn.isEmpty()) {
 				i.setPrintList(list);
 			}
 		});
@@ -2095,14 +2108,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		List<DistributionParcelListDTO> list = new ArrayList<>();
 		boolean isZeroType = false;
 //		distrilbutionBillLading.setZeroType("1");
-		if(distrilbutionBillLading.getZeroType().equals("2")){
+		if (distrilbutionBillLading.getZeroType().equals("2")) {
 			list = distrilbutionBillLading.getParcelLisList();
 			distrilbutionBillLading.setParcelLisList(null);
 			isZeroType = true;
 		}
 		this.save(distrilbutionBillLading);
-		if(isZeroType){
-			if(list.isEmpty()){
+		if (isZeroType) {
+			if (list.isEmpty()) {
 				throw new ServiceException("类型数据未填写！！！");
 			}
 			List<DistributionReservationZeroPackageEntity> zeroPackageEntityList = new ArrayList<>();
@@ -2110,7 +2123,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			AtomicInteger nu = new AtomicInteger();
 			//是 添加物料信息
 			list.forEach(i -> {
-				if(i.getQuantity() != 0){
+				if (i.getQuantity() != 0) {
 					DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity();
 					zeroPackageEntity.setQuantity(i.getQuantity());
 					zeroPackageEntity.setReservationId(distrilbutionBillLading.getId());
@@ -2126,31 +2139,31 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 					int i1 = one.getDeliveryQuantity() + i.getQuantity();
 					//全部数据不能大于预约数
-					if(ObjectUtils.isNotNull(one) && i1 <= one.getHandQuantity() ) {
+					if (ObjectUtils.isNotNull(one) && i1 <= one.getHandQuantity()) {
 						nu.addAndGet(i.getQuantity());
 						DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity();
 						parcelNumberEntity.setId(one.getId());
-						parcelNumberEntity.setDeliveryQuantity(one.getDeliveryQuantity()+i.getQuantity());
+						parcelNumberEntity.setDeliveryQuantity(one.getDeliveryQuantity() + i.getQuantity());
 						parcelNumberEntity.setHandQuantity(byId.getHandQuantity());
 						parcelNumberEntityList.add(parcelNumberEntity);
 						zeroPackageEntity.setParcelListId(one.getParcelListId());
 						zeroPackageEntityList.add(zeroPackageEntity);
-					}else{
+					} else {
 						throw new ServiceException("配送数量大于在库数量！！");
 					}
 
 				}
 			});
-			if(!parcelNumberEntityList.isEmpty()){
-				parcelNumberEntityList.forEach( p ->{
-					if(nu.get() <= p.getHandQuantity()){
+			if (!parcelNumberEntityList.isEmpty()) {
+				parcelNumberEntityList.forEach(p -> {
+					if (nu.get() <= p.getHandQuantity()) {
 						p.setHandQuantity(null);
 						distributionParcelNumberService.updateById(p);
-					}else{
+					} else {
 						throw new ServiceException("预约数量大于在库数量！！");
 					}
 				});
-			}else{
+			} else {
 				throw new ServiceException("数据异常，请联系管理员！！");
 			}
 			distributionZeroPackageService.saveBatch(zeroPackageEntityList);
@@ -2192,10 +2205,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 
 //		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByDepartment(AuthUtil.getDeptId());
-		if (ObjectUtils.isNotNull(myCurrentWarehouse)){
+		if (ObjectUtils.isNotNull(myCurrentWarehouse)) {
 			distributionStockupEntity.setWarehouseId(myCurrentWarehouse.getId());
-		}else{
-			throw  new ServiceException("仓库信息未读取到，请选择仓库后在操作！");
+		} else {
+			throw new ServiceException("仓库信息未读取到，请选择仓库后在操作！");
 		}
 		//todo  库位 获取自提任务的ID 查询下面的订单 包件 库存品信息 的货位信息
 //		distributionStockupEntity.setStockipAllocation();
@@ -2207,15 +2220,15 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	@Override
 	public IPage<DistrilbutionBillLadingVO> billStockList(IPage<DistrilbutionBillLadingVO> page, Map<String, Object> distrilbutionBillLading) {
 
-		List<DistrilbutionBillLadingVO> result =baseMapper.selectBillStockList(page,distrilbutionBillLading);
+		List<DistrilbutionBillLadingVO> result = baseMapper.selectBillStockList(page, distrilbutionBillLading);
 		for (DistrilbutionBillLadingVO distrilbutionBillLadingVO : result) {
 			List<DistributionDeliveryChargeEntity> list = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
 				.eq(DistributionDeliveryChargeEntity::getBillLading, distrilbutionBillLadingVO.getId())
 			);
 			distrilbutionBillLadingVO.setList(list);
-			distrilbutionBillLadingVO.setConditionName(DictBizCache.getValue(DictBizConstant.BILL_CONDITIONS_STATUS,distrilbutionBillLadingVO.getConditions()));
-			distrilbutionBillLadingVO.setNotificationStatusName(DictBizCache.getValue(DictBizConstant.BILL_NOTIFICATION_STATUS,distrilbutionBillLadingVO.getNotificationStatus()));
-			distrilbutionBillLadingVO.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE,distrilbutionBillLadingVO.getCertificateType()));
+			distrilbutionBillLadingVO.setConditionName(DictBizCache.getValue(DictBizConstant.BILL_CONDITIONS_STATUS, distrilbutionBillLadingVO.getConditions()));
+			distrilbutionBillLadingVO.setNotificationStatusName(DictBizCache.getValue(DictBizConstant.BILL_NOTIFICATION_STATUS, distrilbutionBillLadingVO.getNotificationStatus()));
+			distrilbutionBillLadingVO.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, distrilbutionBillLadingVO.getCertificateType()));
 		}
 		page.setRecords(result);
 		return page;
@@ -2223,6 +2236,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 	/**
 	 * 零担的包件物料数据查询
+	 *
 	 * @param billLadingAppDTO
 	 * @return
 	 */
@@ -2234,12 +2248,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3")
 		);
 		List<DistrilbutionAppBillLadingZeroVO> parcelListEntityList = new ArrayList<>();
-		if(!list.isEmpty()){
-			list.forEach( i -> {
+		if (!list.isEmpty()) {
+			list.forEach(i -> {
 				//查询品类信息
 				DistributionParcelListEntity byId = distributionParcelListService.getById(i.getParcelListId());
 				DistrilbutionAppBillLadingZeroVO billLadingZeroVO = new DistrilbutionAppBillLadingZeroVO();
-				BeanUtils.copyProperties(byId,billLadingZeroVO);
+				BeanUtils.copyProperties(byId, billLadingZeroVO);
 				billLadingZeroVO.setReservationQuantity(i.getQuantity());
 				billLadingZeroVO.setRealityQuantity(i.getRealityQuantity());
 				//查询是否已经签收过
@@ -2248,7 +2262,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.eq(DistributionBillLadingScanEntity::getParcelListId, i.getParcelListId())
 					.eq(DistributionBillLadingScanEntity::getStockArticleId, byId.getStockArticleId())
 				);
-				if(ObjectUtils.isNotNull(one)){
+				if (ObjectUtils.isNotNull(one)) {
 					billLadingZeroVO.setSignforQuantity(one.getQuantity());
 				}
 
@@ -2260,23 +2274,24 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 	/**
 	 * 零担批量签收
+	 *
 	 * @param billLadingAppDTO
 	 * @return
 	 */
 	@Override
 	public R zeroBill(BillLadingAppDTO billLadingAppDTO) {
 		//设置lockey
-		String lockKey ="lock:" + billLadingAppDTO.getBillLadingId();
+		String lockKey = "lock:" + billLadingAppDTO.getBillLadingId();
 		log.info("#################zeroBill：获取redisson对象开始");
 //		RLock lock = redisson.getLock(lockKey);
 //		if(lock.isLocked()){
 //			throw new ServiceException("请勿重复提交！！！");
 //		}
 //		lock.lock(5, TimeUnit.SECONDS);
-		if(redis.exists(lockKey)){
+		if (redis.exists(lockKey)) {
 			throw new ServiceException("请勿重复提交！！！");
 		}
-		redis.setEx(lockKey,billLadingAppDTO.getBillLadingId(),5L);
+		redis.setEx(lockKey, billLadingAppDTO.getBillLadingId(), 5L);
 		List<DistributionReservationZeroPackageEntity> list = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
 			.eq(DistributionReservationZeroPackageEntity::getReservationId, billLadingAppDTO.getBillLadingId())
 			.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
@@ -2303,18 +2318,18 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		//查询
 		//修改签收状态
 		billLadingAppDTO.getList().stream().collect(Collectors.groupingBy(DistrilbutionAppBillLadingZeroVO::getStockArticleId))
-			.forEach((k,v) ->{
-				v.forEach(i ->{
+			.forEach((k, v) -> {
+				v.forEach(i -> {
 					//修改包件签收状态
 					DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 					//判断是否大于总件数的数量
 					DistributionParcelListEntity byId = distributionParcelListService.getById(i.getId());
-					if(i.getQuantity() > byId.getQuantity()){
+					if (i.getQuantity() > byId.getQuantity()) {
 						throw new ServiceException("签收数量大于订单数量！！");
-					}else if(i.getQuantity().equals(byId.getQuantity())){
+					} else if (i.getQuantity().equals(byId.getQuantity())) {
 						parcelListEntity.setId(byId.getId());
 						parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
-					}else{
+					} else {
 						parcelListEntity.setId(byId.getId());
 						parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.bufenqianshou.getValue());
 					}
@@ -2331,21 +2346,22 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				});
 				int sum = v.stream().mapToInt(DistrilbutionAppBillLadingZeroVO::getQuantity).sum(); //填写的签收数量
 				//修改订单签收钻状态
-				updateStockArticle(sum,k);
+				updateStockArticle(sum, k);
 				//修改提货订单状态
-				updateBillStock(sum,list,k,billLadingAppDTO.getBillLadingId());
+				updateBillStock(sum, list, k, billLadingAppDTO.getBillLadingId());
 			});
-		if(!billLadingScanList.isEmpty()){
+		if (!billLadingScanList.isEmpty()) {
 			distributionBillLadingScanService.saveBatch(billLadingScanList);
 			distributionAsyncService.getStockUPstate(billLadingAppDTO.getBillLadingId());
-			return Resp.scanSuccess("签收成功！","签收成功！");
+			return Resp.scanSuccess("签收成功！", "签收成功！");
 		}
 
-		return Resp.scanSuccess("签收失败！","签收失败！");
+		return Resp.scanSuccess("签收失败！", "签收失败！");
 	}
 
 	/**
 	 * 查询订单信息
+	 *
 	 * @param billLadingAppDTO
 	 * @return
 	 */
@@ -2359,14 +2375,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			.in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3")
 		);
 		List<DistrilbutionAppBillLadingZeroOrderVO> billLadingZeroOrderVOS = new ArrayList<>();
-		if(!list.isEmpty()){
+		if (!list.isEmpty()) {
 			list.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getStockArticleId)).
-				forEach((k,v) ->{
+				forEach((k, v) -> {
 					int sum = v.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
 					int sum1 = v.stream().mapToInt(DistributionReservationZeroPackageEntity::getRealityQuantity).sum();
 					DistributionStockArticleEntity byId = distributionStockArticleService.getById(k);
 					DistrilbutionAppBillLadingZeroOrderVO zeroOrderVO = new DistrilbutionAppBillLadingZeroOrderVO();
-					BeanUtils.copyProperties(byId,zeroOrderVO);
+					BeanUtils.copyProperties(byId, zeroOrderVO);
 					zeroOrderVO.setReservationQuantity(sum);
 					zeroOrderVO.setRealityQuantity(sum1);
 					//查询签收订单数量
@@ -2375,7 +2391,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						.eq(DistributionBillLadingScanEntity::getStockArticleId, k)
 						.eq(DistributionBillLadingScanEntity::getParcelListId, k)
 					);
-					if(!list1.isEmpty()){
+					if (!list1.isEmpty()) {
 						zeroOrderVO.setSignforQuantity(list1.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum());
 					}
 					billLadingZeroOrderVOS.add(zeroOrderVO);
@@ -2387,6 +2403,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 	/**
 	 * 零担单个签收
+	 *
 	 * @param billLadingAppDTO
 	 * @return
 	 */
@@ -2395,17 +2412,17 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	public R zeroBillPack(BillLadingAppDTO billLadingAppDTO) {
 		DistrilbutionAppBillLadingZeroVO i = billLadingAppDTO.getBillLadingZeroVO();
 
-		String lockKey ="lock:" + i.getStockArticleId() +i.getId();
+		String lockKey = "lock:" + i.getStockArticleId() + i.getId();
 		log.info("#################zeroBillPack：获取redisson对象开始");
 //		RLock lock = redisson.getLock(lockKey);
 //		if(lock.isLocked()){
 //			throw new ServiceException("请勿重复提交！！！");
 //		}
 //		lock.lock(5, TimeUnit.SECONDS);
-		if(redis.exists(lockKey)){
+		if (redis.exists(lockKey)) {
 			throw new ServiceException("请勿重复提交！！！");
 		}
-		redis.setEx(lockKey,i.getStockArticleId() +i.getId(),5L);
+		redis.setEx(lockKey, i.getStockArticleId() + i.getId(), 5L);
 		List<DistributionReservationZeroPackageEntity> list = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
 			.eq(DistributionReservationZeroPackageEntity::getReservationId, billLadingAppDTO.getBillLadingId())
 			.eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0)
@@ -2418,28 +2435,28 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			.eq(DistrilbutionBillStockEntity::getStockArticleId, i.getStockArticleId())
 			.eq(DistrilbutionBillStockEntity::getConditions, "20")
 		);
-		if(ObjectUtils.isNotNull(one)){
-			return Resp.scanFail("已签收！","已签收！");
+		if (ObjectUtils.isNotNull(one)) {
+			return Resp.scanFail("已签收！", "已签收！");
 		}
 		//查询这个物料有没有签收
 		DistributionBillLadingScanEntity one1 = distributionBillLadingScanService.getOne(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 			.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())
 			.eq(DistributionBillLadingScanEntity::getParcelListId, i.getId())
 		);
-		if(ObjectUtils.isNotNull(one1)){
-			return Resp.scanFail("当前物料已签收！","当前物料已签收！");
+		if (ObjectUtils.isNotNull(one1)) {
+			return Resp.scanFail("当前物料已签收！", "当前物料已签收！");
 		}
 
 		//修改包件签收状态
 		DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 		//判断是否大于总件数的数量
 		DistributionParcelListEntity byId = distributionParcelListService.getById(i.getId());
-		if(i.getQuantity() > byId.getQuantity()){
+		if (i.getQuantity() > byId.getQuantity()) {
 			throw new ServiceException("签收数量大于订单数量！！");
-		}else if(i.getQuantity().equals(byId.getQuantity())){
+		} else if (i.getQuantity().equals(byId.getQuantity())) {
 			parcelListEntity.setId(byId.getId());
 			parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
-		}else{
+		} else {
 			parcelListEntity.setId(byId.getId());
 			parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.bufenqianshou.getValue());
 		}
@@ -2452,7 +2469,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		billLadingScan.setBillLadingId(billLadingAppDTO.getBillLadingId());
 		billLadingScan.setMaterialType("3");
 		billLadingScan.setQuantity(i.getQuantity());
-	    //获取全部订单的全部预约数量
+		//获取全部订单的全部预约数量
 //		int sum = list.stream().filter(z -> z.getStockArticleId().equals(i.getStockArticleId())).collect(Collectors.toList()).stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
 		//获取已签收数量
 		List<DistributionBillLadingScanEntity> list1 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
@@ -2460,21 +2477,22 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			.eq(DistributionBillLadingScanEntity::getStockArticleId, i.getStockArticleId())
 			.eq(DistributionBillLadingScanEntity::getScanType, "2")
 		);
-		if(!list1.isEmpty()){
+		if (!list1.isEmpty()) {
 			int sum1 = list1.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
 			//修改提货订单状态
-			updateBillStock(sum1+i.getQuantity(),list,i.getStockArticleId(),billLadingAppDTO.getBillLadingId());
+			updateBillStock(sum1 + i.getQuantity(), list, i.getStockArticleId(), billLadingAppDTO.getBillLadingId());
 		}
 
 		//添加签收记录
 		distributionBillLadingScanService.save(billLadingScan);
 		//修改提货状态
 		distributionAsyncService.getStockUPstate(billLadingAppDTO.getBillLadingId());
-		return Resp.scanSuccess("签收成功！","签收成功！");
+		return Resp.scanSuccess("签收成功！", "签收成功！");
 	}
 
 	/**
 	 * 添加自提图片
+	 *
 	 * @param billLadingAppDTO
 	 * @return
 	 */
@@ -2488,22 +2506,22 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		List<BillLadingAppDTO.Print> aid = billLadingAppDTO.getPrintList().stream().filter(i -> ObjectUtils.isNull(i.getId())).collect(Collectors.toList());//添加的图片
 		List<BillLadingAppDTO.Print> uid = billLadingAppDTO.getPrintList().stream().filter(i -> ObjectUtils.isNotNull(i.getId())).collect(Collectors.toList()); //保存的图片
 		//添加图片
-			//处理不需要的图片
-		while (distributionPrintEntityListIterator.hasNext()){
+		//处理不需要的图片
+		while (distributionPrintEntityListIterator.hasNext()) {
 			for (BillLadingAppDTO.Print q : uid) {
 				DistributionPrintEntity next = distributionPrintEntityListIterator.next();
-				if(q.getId().toString().equals(next.getId().toString())){
+				if (q.getId().toString().equals(next.getId().toString())) {
 					distributionPrintEntityListIterator.remove();
 				}
 
 			}
 		}
 		//清除需要删除的图片
-		if(!printEntityList.isEmpty()){
+		if (!printEntityList.isEmpty()) {
 			List<Long> collect = printEntityList.stream().map(DistributionPrintEntity::getId).collect(Collectors.toList());
 			distributionPrintService.deleteLogic(collect);
 		}
-		if(!aid.isEmpty()){
+		if (!aid.isEmpty()) {
 			//新增
 			List<DistributionPrintEntity> list2 = new ArrayList<>();
 			aid.forEach(print -> {
@@ -2515,7 +2533,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				list2.add(distributionPrintEntity);
 			});
 			distributionPrintService.saveBatch(list2);
-			if(ObjectUtils.isNotNull(billLadingAppDTO.getRemark())){
+			if (ObjectUtils.isNotNull(billLadingAppDTO.getRemark())) {
 				DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity();
 				billLadingEntity.setId(billLadingAppDTO.getBillLadingId());
 				billLadingEntity.setRemark(billLadingAppDTO.getRemark());
@@ -2523,11 +2541,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 			return R.status(true);
 		}
-		     return R.status(false);
+		return R.status(false);
 	}
 
 	/**
 	 * 查询自提签收图片
+	 *
 	 * @param billLadingAppDTO
 	 * @return
 	 */
@@ -2537,10 +2556,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		List<DistributionPrintEntity> list = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
 			.eq(DistributionPrintEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())
 		);
-		Map<String,Object> map = new HashMap<>();
-		if(!list.isEmpty()){
+		Map<String, Object> map = new HashMap<>();
+		if (!list.isEmpty()) {
 			List<BillLadingAppDTO.Print> list1 = new ArrayList<>();
-			list.forEach(i ->{
+			list.forEach(i -> {
 				BillLadingAppDTO.Print print = new BillLadingAppDTO.Print();
 				print.setId(i.getId());
 				print.setUrl(i.getSite());
@@ -2548,30 +2567,31 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				print.setState(String.valueOf(i.getGenre()));
 				list1.add(print);
 			});
-			map.put("list",list1);
+			map.put("list", list1);
 			//查询提货备注
 			DistrilbutionBillLadingEntity billLadingEntity = baseMapper.selectById(billLadingAppDTO.getBillLadingId());
-			map.put("remark",billLadingEntity.getRemark());
+			map.put("remark", billLadingEntity.getRemark());
 			return R.data(map);
 		}
-		map.put("list",null);
-		map.put("remark",null);
+		map.put("list", null);
+		map.put("remark", null);
 		return R.data(map);
 	}
 
 
 	/**
 	 * 修改订单状态
+	 *
 	 * @return
 	 */
-	public Boolean updateStockArticle(Integer sum ,Long stockArticleId){
+	public Boolean updateStockArticle(Integer sum, Long stockArticleId) {
 
 		DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
 		//查询 订单数量
 		DistributionStockArticleEntity byId = distributionStockArticleService.getById(stockArticleId);
-		if(sum.equals(byId.getTotalNumber())){
+		if (sum.equals(byId.getTotalNumber())) {
 			stockArticleEntity.setOrderReceiveStatus(OrderStatusConstant.bufenqianshou.getValue());
-		}else{
+		} else {
 			stockArticleEntity.setOrderReceiveStatus(OrderStatusConstant.qianshou.getValue());
 		}
 		//修改订单状态
@@ -2582,14 +2602,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	/**
 	 * 修改提货订单状态
 	 */
-	public Boolean updateBillStock(Integer sum,List<DistributionReservationZeroPackageEntity> list,Long stockArticleId,Long billLadingId){
+	public Boolean updateBillStock(Integer sum, List<DistributionReservationZeroPackageEntity> list, Long stockArticleId, Long billLadingId) {
 		int sum1 = list.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getStockArticleId)).get(stockArticleId).stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
-		if(sum >= sum1){
+		if (sum >= sum1) {
 			//修改提货提货状态
-			return	distrilbutionBillStockService.update(Wrappers.<DistrilbutionBillStockEntity>update()
-				.eq("bill_lading_id",billLadingId)
-				.eq("stock_article_id",stockArticleId)
-				.set("conditions",2)
+			return distrilbutionBillStockService.update(Wrappers.<DistrilbutionBillStockEntity>update()
+				.eq("bill_lading_id", billLadingId)
+				.eq("stock_article_id", stockArticleId)
+				.set("conditions", 2)
 			);
 		}
 		return false;