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

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

@@ -58,6 +58,7 @@ import com.logpm.oldproject.dto.SignPushDataContactDTO;
 import com.logpm.oldproject.dto.SignPushDataDTO;
 import com.logpm.oldproject.dto.SignPushDataUnitDTO;
 import com.logpm.oldproject.feign.IOldSignPushClient;
+import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import lombok.extern.log4j.Log4j2;
 import org.apache.logging.log4j.util.Strings;
@@ -183,6 +184,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	@Autowired
 	private IOldSignPushClient oldSystemDataPushClient;
 
+	@Autowired
+	private ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
+
 
 	@Override
 	public IPage<DistrilbutionBillLadingVO> selectDistrilbutionBillLadingPage(IPage<DistrilbutionBillLadingVO> page, DistrilbutionBillLadingVO distrilbutionBillLading) {
@@ -318,6 +322,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean ownSaveOrUpdate(DistrilbutionBillLadingDTO distrilbutionBillLading) {
 		Boolean las = false;
+		List<JSONObject> logs = new ArrayList<>();
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			log.error("自提操作未进行仓库选择");
+			return false;
+		}
 		if (ObjectUtils.isNotNull(distrilbutionBillLading.getId())) {
 			//判断是否已签收
 			DistrilbutionBillLadingEntity billLadingEntity = baseMapper.selectById(distrilbutionBillLading.getId());
@@ -329,7 +339,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			if (!distrilbutionBillLading.getBillPackageEntityList().isEmpty() || !distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()) {
 				//修改新增包件
 				//todo
-				updateBillPackeg(distrilbutionBillLading);
+				List<JSONObject> jsonObjects = updateBillPackeg(distrilbutionBillLading, myCurrentWarehouse,billLadingEntity.getPickupBatch());
+				if (!jsonObjects.isEmpty()) {
+					logs.addAll(jsonObjects);
+				}
 			}
 			//修改零担数据
 			updetaParcelNum(distrilbutionBillLading);
@@ -355,51 +368,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<DistributionDeliveryChargeEntity> list = distributionDeliveryChargeService.list(Wrappers.<DistributionDeliveryChargeEntity>query().lambda()
 				.eq(DistributionDeliveryChargeEntity::getBillLading, distrilbutionBillLading.getId())
 			);
-//			List<DistributionDeliveryChargeEntity> deliveryChargeEntities = new ArrayList<>();
-//			if (!list.isEmpty()) {
-//				list.forEach(i -> {
-//					String s = distrilbutionBillLading.getFei().get(i.getCost());
-//					if (StringUtils.isNotBlank(s)) {
-//							//修改
-//							DistributionDeliveryChargeEntity distributionDeliveryCharge = new DistributionDeliveryChargeEntity();
-//							distributionDeliveryCharge.setId(i.getId());
-//							distributionDeliveryCharge.setMoney(new BigDecimal(s));
-//							distributionDeliveryCharge.setCost(i.getCost());
-//						    deliveryChargeEntities.add(distributionDeliveryCharge);
-////							distributionDeliveryChargeService.updateById(distributionDeliveryCharge);
-//							distrilbutionBillLading.getFei().remove(i.getCost());
-//					} else {
-//						//删除
-//						distributionDeliveryChargeService.removeById(i.getId());
-//					}
-//				});
-//			}
-//			if (!deliveryChargeEntities.isEmpty()){
-//				distributionDeliveryChargeService.updateBatchById(deliveryChargeEntities);
-//			}
 			//修改订单数据
 			if (!distrilbutionBillLading.getStockArticleList().isEmpty()) {
-				boolean flag = handleOrder(distrilbutionBillLading);
-//					boolean order = getOrder(distrilbutionBillLading.getStockArticleList(), distrilbutionBillLading.getId());
+				List<JSONObject> jsonObjects = handleOrder(distrilbutionBillLading,billLadingEntity.getPickupBatch());
+				if (!jsonObjects.isEmpty()) {
+					logs.addAll(jsonObjects);
+				}
 				String orderIds = distrilbutionBillLading.getStockArticleList().stream().map(DistributionStockArticleEntity::getId).map(String::valueOf).collect(Collectors.joining(","));
 				distrilbutionBillLading.setStockArticleId(orderIds);
 				this.updateById(distrilbutionBillLading);
-
-				if (!flag) {
-					throw new ServiceException("修改失败！！");
-				}
 			}
-
-		/*	else{
-				updateOrder(distrilbutionBillLading);
-			}
-			if(distrilbutionBillLading.getStockArticleList().isEmpty() && distrilbutionBillLading.getStockDTOList().isEmpty()){
-				//取消全部订单
-				updateOrder(distrilbutionBillLading);
-				updateStockBill(distrilbutionBillLading);
-				//取消自提任务
-				baseMapper.deleteById(billLadingEntity.getId());
-			}*/
 			//修改库存品
 			if (!distrilbutionBillLading.getStockDTOList().isEmpty()) {
 				List<DistributionStockListDTO> stockDTOList = distrilbutionBillLading.getStockDTOList();
@@ -450,13 +428,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 									if (sum > 0) {
 										//存在备货
 										throw new RuntimeException("该库存品已备货无法减少");
-//										if (sum >= deliveryDetails.getQuantity()) {
-//											//满足备货或者备货数量超过
-//
-//										}else {
-//
-//
-//										}
 
 									} else {
 										//对于包件进行随机删除
@@ -566,97 +537,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 				}
 
-//				if (!listDetails.isEmpty()) {
-//					List<Long> ids = new ArrayList<>();
-//					//有
-//					//修改
-//					listDetails.forEach(i -> {
-//						boolean b = distrilbutionBillLading.getStockDTOList().stream().anyMatch(a -> i.getStockListId().equals(a.getId()));
-//						//查询是否存签收扫描数量
-//						List<DistributionStockEntity> list1 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
-//							.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLading.getId())
-//							.eq(DistributionStockEntity::getStockListId, i.getStockListId())
-//							.eq(DistributionStockEntity::getType, "2")
-//						);
-//						if (b) {
-//							//有
-//							Iterator<DistributionStockListDTO> iterator = distrilbutionBillLading.getStockDTOList().iterator();
-//							while (iterator.hasNext()) {
-//								DistributionStockListDTO next = iterator.next();
-//								if (i.getStockListId().equals(next.getId())) {
-//									DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity();
-//									deliveryDetails.setQuantity(next.getInventoryQuantity());
-//									deliveryDetails.setId(i.getId());
-//									distributionDeliveryDetailsService.updateById(deliveryDetails);
-//									Integer inventoryQuantity = next.getInventoryQuantity(); //修改数量
-//									Integer quantity = i.getQuantity();//原来的数量
-//									int num = 0;
-//
-//									if (inventoryQuantity > quantity) {
-//										num = inventoryQuantity - quantity; //多 添加了数量
-//										//修改库存占用数量
-//										distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), num, 1);
-//										//kk备货
-//										if ("20".equals(i.getConditions())) {
-//											//xiugai
-//											DistributionDeliveryDetailsEntity d = new DistributionDeliveryDetailsEntity();
-//											d.setId(i.getId());
-//											d.setConditions(BillLadingStatusConstant.daitihuo.getValue());
-//											d.setInventoryStatus("3");
-//											distributionDeliveryDetailsService.updateById(d);
-//										}
-//									} else if (inventoryQuantity < quantity) {
-//										num = quantity - inventoryQuantity; //少 减少了数量
-//										/*if(list1.size() < 1){
-//
-//										}else{
-//											//有备货
-//										}*/
-//
-//										if ("20".equals(i.getConditions())) {
-//											//todo 已完成
-//
-//										} else {
-//											//todo 未完成
-//											int size = list1.size(); //扫描的数量
-//											int i1 = quantity - size; //未扫的数量
-//											if (i1 > num) {
-//												//可以减少
-//												//修改库存占用数量
-//												distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), num, 2);
-//											} else {
-//												//todo 未扫小于减少
-//
-//											}
-//
-//										}
-//
-//									}
-//									iterator.remove();
-//								}
-//
-//							}
-//						} else {
-//
-//							if (list1.isEmpty()) {
-//								//取消库存占用数量
-//								distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), i.getQuantity(), 2);
-//							}
-//							//没有 删除
-//							ids.add(i.getId());
-//
-//						}
-//					});
-//					//删除没有的库存品
-//					if (!ids.isEmpty()) {
-//						ids.forEach(a -> {
-//							DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity();
-//							deliveryDetails.setId(a);
-//							deliveryDetails.setInventoryStatus("2");
-//							distributionDeliveryDetailsService.updateById(deliveryDetails);
-//						});
-//					}
-//				}
 			} else {
 				updateStockBill(distrilbutionBillLading);
 			}
@@ -666,11 +546,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//设置lockey
 			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)) {
 				throw new ServiceException("请勿重复提交！！！");
 			}
@@ -706,7 +581,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 			String format = dateFormat.format(new Date());
 			distrilbutionBillLading.setPickupBatch("ZT" + format);//批次号
-			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 			if (ObjectUtils.isNull(myCurrentWarehouse)) {
 				throw new ServiceException("请选择仓库在操作！！！");
 			}
@@ -755,6 +629,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 										//进行包件的预约状态修改
 										packageEntityList.add(aaa);
 										packageIds.add(aaa.getParceListId());
+										String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"计划自提,操作方式:新增订单勾选包件,自提批次号:"+distrilbutionBillLading.getPickupBatch();
+										JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distrilbutionBillPackageEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode());
+										logs.add(js);
 									}
 								} else {
 									//没有进行包件的勾选，默认添加所有可用包件至计划下
@@ -779,6 +656,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 											billPackageEntity.setPacketBarCode(parcelListEntity.getOrderPackageCode());
 											packageEntityList.add(billPackageEntity);
 											packageIds.add(parcelListEntity.getId());
+											String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"计划自提,操作方式:新增订单系统默认可用包件,自提批次号:"+distrilbutionBillLading.getPickupBatch();
+											JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode());
+											logs.add(js);
 										}
 									} else {
 										log.error("#####################自提计划订单无可用包件:{}", s);
@@ -808,6 +688,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 										billPackageEntity.setPacketBarCode(parcelListEntity.getOrderPackageCode());
 										packageEntityList.add(billPackageEntity);
 										packageIds.add(parcelListEntity.getId());
+										String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"计划自提,操作方式:新增订单系统默认可用包件,自提批次号:"+distrilbutionBillLading.getPickupBatch();
+										JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode());
+										logs.add(js);
 									}
 								} else {
 									log.error("#####################自提计划订单无可用包件:{}", s);
@@ -963,7 +846,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 
 		}
-
 		//添加库存品信息
 
 		//添加费用
@@ -984,6 +866,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			});
 			distributionDeliveryChargeService.saveBatch(listEntity);
 		}
+		if (!logs.isEmpty()) {
+			trunklinePackageTrackLogClient.addPackageTrackLog(logs);
+		}
 		return true;
 	}
 
@@ -1620,9 +1505,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	 *
 	 * @return
 	 */
-	public Boolean updateBillPackeg(DistrilbutionBillLadingDTO distrilbutionBillLading) {
+	public List<JSONObject> updateBillPackeg(DistrilbutionBillLadingDTO distrilbutionBillLading,BasicdataWarehouseEntity warehouse,String pickupBatch) {
 		List<Long> packageIds = new ArrayList<>();
 		List<Long> finalPackageIds = packageIds;
+		List<JSONObject> aaa = new ArrayList<>();
 		distrilbutionBillLading.getBillPackageEntityList().stream().collect(Collectors.groupingBy(DistrilbutionBillPackageEntity::getStockArticleId))
 			.forEach((k, v) -> {
 				List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
@@ -1660,6 +1546,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						billPackageEntity.setBillType("1");
 						packageEntityList.add(billPackageEntity);
 						finalPackageIds.add(i.getParceListId());
+						String content = "包件在"+warehouse.getName()+"由"+AuthUtil.getNickName()+"计划自提,操作方式:勾选包件,自提批次号:"+pickupBatch;
+						JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), billPackageEntity.getPacketBarCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode());
+						aaa.add(js);
 					});
 					distrilbutionBillPackageService.saveBatch(packageEntityList);
 					List<Long> collect = packageEntityList.stream().map(i -> i.getParceListId()).collect(Collectors.toList());
@@ -1682,6 +1571,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				.in("id", collect)
 				.set("order_package_reservation_status", OrderPackageReservationStatusConstant.daiyuyue.getValue())
 			);
+			List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(collect);
+			for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
+				String content = "包件在"+warehouse.getName()+"由"+AuthUtil.getNickName()+"取消计划自提,操作方式:订单取消勾选包件,自提批次号:"+pickupBatch;
+				JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), distributionParcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode());
+				aaa.add(js);
+			}
 			packageIds.addAll(collect);
 			if (!update) {
 				throw new ServiceException("修改失败！！！");
@@ -1710,7 +1605,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				throw new ServiceException("修改失败！！！");
 			}
 		}
-		return true;
+		return aaa;
 	}
 
 
@@ -1826,11 +1721,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	}
 
 	@Transactional
-	private boolean handleOrder(DistrilbutionBillLadingDTO distrilbutionBillLading) {
+	private List<JSONObject> handleOrder(DistrilbutionBillLadingDTO distrilbutionBillLading,String pickupBatch) {
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(myCurrentWarehouse)) {
-			return false;
+			throw new RuntimeException("未授权!!!");
 		}
+		List<JSONObject> aaa = new ArrayList<>();
 		List<DistributionStockArticleEntity> stockArticleList = distrilbutionBillLading.getStockArticleList();
 		//查询此自提单已经存在的包件信息
 		List<DistrilbutionBillStockEntity> entityList = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
@@ -1879,38 +1775,28 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				if (Func.isEmpty(stockArticleEntity)) {
 					//订单数据错误
 					log.error(">>>>>>>>>>>>>>>>>>>>>自提取消订单错误stockArticleEntityId:{}", distrilbutionBillStock.getStockArticleId());
-					return false;
 				}
 				//查询是取消零担还是取消订制品
 				if (IsOrNoConstant.no.getValue().equals(stockArticleEntity.getIsZero())) {
-					distrilbutionBillPackageService.update(Wrappers.<DistrilbutionBillPackageEntity>update()
-						.eq("stock_article_id", distrilbutionBillStock.getStockArticleId())
-						.eq("bill_lading_id", distrilbutionBillStock.getBillLadingId())
-						.set("packet_bar_status", ReservationPackageStatusConstant.quxiao.getValue())
+					List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
+						.eq(DistrilbutionBillPackageEntity::getBillLadingId, distrilbutionBillLading.getId())
+						.eq(DistrilbutionBillPackageEntity::getStockArticleId, distrilbutionBillStock.getStockArticleId())
+						.ne(DistrilbutionBillPackageEntity::getPacketBarStatus, "2")
 					);
+
+					if (!list.isEmpty()) {
+						for (DistrilbutionBillPackageEntity billPackageEntity : list) {
+							String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"取消计划自提,操作方式:移除订单,自提批次号:"+pickupBatch;
+							JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), billPackageEntity.getPacketBarCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode());
+							aaa.add(js);
+
+							billPackageEntity.setPacketBarStatus(2);
+							distrilbutionBillPackageService.updateById(billPackageEntity);
+						}
+					}
+
+
 				}
-//				else if (IsOrNoConstant.yes.getValue().equals(stockArticleEntity.getIsZero())){
-//					//维护零担品类的数量
-//					//查询零担信息
-//					List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = distributionZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
-//						.eq(DistributionReservationZeroPackageEntity::getReservationId, distrilbutionBillStock.getBillLadingId())
-//						.eq(DistributionReservationZeroPackageEntity::getStockArticleId, distrilbutionBillStock.getStockArticleId())
-//						.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
-//					);
-//					if (!reservationZeroPackageEntities.isEmpty()){
-//						List<Long> collect = reservationZeroPackageEntities.stream().map(DistributionReservationZeroPackageEntity::getParcelListId).collect(Collectors.toList());
-//						distributionZeroPackageService.recoverZeroPackage(distrilbutionBillStock.getBillLadingId(),collect);
-//						distributionZeroPackageService.update(Wrappers.<DistributionReservationZeroPackageEntity>update().lambda()
-//							.eq(DistributionReservationZeroPackageEntity::getReservationId,distrilbutionBillStock.getBillLadingId())
-//							.eq(DistributionReservationZeroPackageEntity::getStockArticleId,distrilbutionBillStock.getStockArticleId())
-//							.set(DistributionReservationZeroPackageEntity::getZeroPackageStatus,ReservationPackageStatusConstant.quxiao.getValue())
-//							.set(DistributionReservationZeroPackageEntity::getQuantity,0)
-//						);
-//					}
-//				}else {
-//					log.error(">>>>>>>>>>>>>>>>>>>>>自提取消订单错误stockArticleEntityId:{}",distrilbutionBillStock.getStockArticleId());
-//					return false;
-//				}
 				distrilbutionBillStock.setOrderStatus("2");
 				distrilbutionBillStockService.updateById(distrilbutionBillStock);
 				orderCodes.add(stockArticleEntity.getOrderCode());
@@ -1928,7 +1814,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			for (Long orderId : orderIds) {
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(orderId);
 				if (Func.isEmpty(stockArticleEntity)) {
-					return false;
+					throw new RuntimeException("查询订单信息失败");
 				}
 				if (IsOrNoConstant.no.getValue().equals(stockArticleEntity.getIsZero())) {
 					//定制品
@@ -1954,7 +1840,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					}
 				} else {
 					log.info("####################3订单缺失IsZero字段:{}", stockArticleEntity.getId());
-					return false;
+					throw new RuntimeException(stockArticleEntity.getOrderCode()+"订单数据异常");
 				}
 				DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO();
 				distrilbutionBillStock.setBillLadingId(distrilbutionBillLading.getId());
@@ -1975,6 +1861,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yichuku.getValue())
 					.ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue())
 				);
+
 				if (!Func.isEmpty(parcelListEntities)) {
 					parcelListEntities.forEach(p -> {
 						DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
@@ -1986,6 +1873,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						billPackageEntity.setPacketNumber(p.getQuantity());
 						billPackageEntity.setPacketBarCode(p.getOrderPackageCode());
 						packageEntityList.add(billPackageEntity);
+						String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"计划自提,操作方式:新增订单系统默认可用包件,自提批次号:"+pickupBatch;
+						JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), billPackageEntity.getPacketBarCode(), content, WorkNodeEnums.PLAN_BILLOFLADING.getCode());
+						aaa.add(js);
 					});
 					//修改包件数量为预约状态
 					List<Long> collect = parcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
@@ -1995,7 +1885,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					);
 				} else {
 					log.error("#########################无可用包件orderIds:{}", addOrderIds);
-					return false;
+					throw new RuntimeException(addOrderIds+"无可用包件");
 				}
 			}
 			List<DistributionReservationZeroPackageEntity> zeroPackageEntities = new ArrayList<>();
@@ -2007,7 +1897,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				);
 				if (Func.isEmpty(parcelNumberEntityList)) {
 					log.error("#########################无可用包件orderIds:{}", zeroOrderIds);
-					return false;
+					throw new RuntimeException(zeroOrderIds+"无可用包件");
 				}
 				parcelNumberEntityList.forEach(zp -> {
 					//查询包件
@@ -2028,13 +1918,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.set("order_package_reservation_status", OrderPackageReservationStatusConstant.daiyuyue.getValue())
 				);
 			}
-
-
-//			if (!zeroPackageEntities.isEmpty()){
-//				distributionZeroPackageService.saveBatch(zeroPackageEntities);
-//			}
-
-
 		}
 		if (!packageEntityList.isEmpty()) {
 			distrilbutionBillPackageService.saveBatch(packageEntityList);
@@ -2047,15 +1930,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			String collect = orderCodes.stream().distinct().collect(Collectors.joining(","));
 			distributionStockArticleService.maintenanceOrderInfo(collect, myCurrentWarehouse.getId());
 		}
-//		DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = new DistrilbutionBillLadingEntity();
-//		distrilbutionBillLadingEntity.setId(distrilbutionBillLading.getId());
-//		String stockArticleIds = stockArticleList.stream().map(DistributionStockArticleEntity::getId).map(String::valueOf).collect(Collectors.joining(","));
-//		log.error("##################自提单发生修改,stockArticleIds:{}",stockArticleIds);
-//		distrilbutionBillLadingEntity.setStockArticleId(stockArticleIds);
-//		this.updateById(distrilbutionBillLadingEntity);
 
-
-		return true;
+		return aaa;
 	}
 
 	/**
@@ -4167,4 +4043,24 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	}
 
 
+	private JSONObject handleLogJSONObject(BasicdataWarehouseEntity warehouse,BladeUser user,String orderPackageCode,String content,Integer node) {
+		JSONObject trunklinePackageTrackLog = new JSONObject();
+		trunklinePackageTrackLog.put("tenantId",user.getTenantId());
+		trunklinePackageTrackLog.put("createTime",new Date());
+		trunklinePackageTrackLog.put("createUser",user.getUserId());
+		trunklinePackageTrackLog.put("updateUser",user.getUserId());
+		trunklinePackageTrackLog.put("updateTime",new Date());
+		trunklinePackageTrackLog.put("isDeleted",0);
+		trunklinePackageTrackLog.put("status",1);
+		trunklinePackageTrackLog.put("createDept",warehouse.getDepartment());
+		trunklinePackageTrackLog.put("orderPackageCode",orderPackageCode);
+		trunklinePackageTrackLog.put("warehouseId",warehouse.getId());
+		trunklinePackageTrackLog.put("warehouseName",warehouse.getName());
+		trunklinePackageTrackLog.put("workNode",node);
+		trunklinePackageTrackLog.put("content",content);
+		trunklinePackageTrackLog.put("operator",user.getNickName());
+		return trunklinePackageTrackLog;
+	}
+
+
 }