Merge branch 'dev' into pre-production

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

@@ -1167,6 +1167,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		IPage<DistributionStockArticleEntity> stockArticleEntityList = baseMapper.selectAllDistributionOrder(page, stockArticleEntity);
 		List<DistributionStockArticleVO> stockArticleVOS = DistributionStockArticleNewWrapper.build().listVO(stockArticleEntityList.getRecords());
+		for (DistributionStockArticleVO stockArticleVO : stockArticleVOS) {
+			if (IsOrNoConstant.no.getValue().equals(stockArticleVO.getIsZero())){
+				stockArticleVO.setReservationNum(stockArticleVO.getHandQuantity());
+			}else {
+				List<DistributionParcelNumberVO> distributionParcelNumberVOS = distributionParcelNumberMapper.selectZeroPackage(stockArticleVO.getId());
+//				零担查询当前操作计划可用数量
+				int reservationNum = distributionParcelNumberVOS.stream().mapToInt(DistributionParcelNumberVO::getHandQuantity).sum() - distributionParcelNumberVOS.stream().mapToInt(DistributionParcelNumberVO::getDeliveryQuantity).sum();
+				stockArticleVO.setReservationNum(reservationNum);
+
+			}
+		}
 		IPage<DistributionStockArticleVO> distributionStockArticleEntityIPage = page.setRecords(stockArticleVOS);
 		return distributionStockArticleEntityIPage;
 	}

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

@@ -1721,13 +1721,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	public IPage<DistrilbutionBillLadingVO> pageList(IPage<Object> page, Map<String, Object> distrilbutionBillLading) {
 		DistrilbutionBillLadingDTO distrilbutionBillLadingDTO = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingDTO.class);
 		//获取当前登录人仓库
-		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWarehouseList();
-		List<Long> collect = myWatchWarehouse.stream()
+		List<BasicdataWarehouseEntity> warehouseList = basicdataWarehouseClient.getMyWarehouseList();
+		List<Long> collect = warehouseList.stream()
 			.map(BasicdataWarehouseEntity::getId)
 			.collect(Collectors.toList());
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		distrilbutionBillLadingDTO.setWarehouseIdList(collect);
-		if (Func.isNotEmpty(myWatchWarehouse)){
+		if (Func.isNotEmpty(myCurrentWarehouse)){
 			distrilbutionBillLadingDTO.setWarehouseIdList(null);
 			distrilbutionBillLadingDTO.setWarehouseId(myCurrentWarehouse.getId());
 		}

blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/OrderPackageDTO.java

@@ -37,4 +37,8 @@ public class OrderPackageDTO extends ZbOrderPackageEntity {
 	@ApiModelProperty("包件物料清单")
 	private List<PackageInfoDTO> items;
 
+	@Override
+	public String toString() {
+		return super.toString();
+	}
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/PackageInfoDTO.java

@@ -31,4 +31,8 @@ import lombok.EqualsAndHashCode;
 public class PackageInfoDTO extends ZbPackageInfoEntity {
 	private static final long serialVersionUID = 1L;
 
+	@Override
+	public String toString() {
+		return "PackageInfoDTO{}"+super.toString();
+	}
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/ZBReceiptDTO.java

@@ -37,4 +37,8 @@ public class ZBReceiptDTO extends ZbReceiptEntity {
 	@ApiModelProperty("派车单订单列表")
 	private List<OrderPackageDTO> details;
 
+	@Override
+	public String toString() {
+		return super.toString();
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/TaskQueryDataExcel.java

@@ -15,6 +15,7 @@ import java.io.Serializable;
 public class TaskQueryDataExcel  implements Serializable {
 
 
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 订单自编号