Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -174,7 +174,7 @@
                 and ldpl.stock_article_id like concat('%',#{param.stockArticleId},'%')
             </if>
             <if test="param.orderCode !='' and param.orderCode != null">
-                and ldpl.order_code like concat('%',#{param.orderCode},'%')
+                and ldpl.order_code like concat(#{param.orderCode},'%')
             </if>
             <if test="param.serviceNumber !='' and param.serviceNumber != null">
                 and ldpl.service_number like concat('%',#{param.serviceNumber},'%')

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

@@ -340,10 +340,36 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		distributionDeliveryListVO.setReservationList(customList);
 		//查询司机信息
 		if (Objects.equals(distributionDeliveryListVO.getKind(), "1")) {
-			DistributionDeliverySelfEntity deliverySelfServiceOne = distributionDeliverySelfService.getOne(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2));
+			List<DistributionDeliverySelfEntity> deliverySelfServices = distributionDeliverySelfService.list(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2));
-			distributionDeliveryListVO.setDriverName(deliverySelfServiceOne.getDriverName());
+
-			distributionDeliveryListVO.setDriverPhone(deliverySelfServiceOne.getDriverPhone());
+			if(!deliverySelfServices.isEmpty()){
-			distributionDeliveryListVO.setVehicleName(deliverySelfServiceOne.getVehicleNub());
+				StringBuffer sb1 = new StringBuffer();
+				StringBuffer sb2 = new StringBuffer();
+				StringBuffer sb3 = new StringBuffer();
+				deliverySelfServices.forEach(t->{
+					if(!sb1.toString().isEmpty()){
+						sb1.append("/");
+					}
+					sb1.append(t.getDriverName());
+
+					if(!sb2.toString().isEmpty()){
+						sb2.append("/");
+					}
+					sb2.append(t.getDriverPhone());
+
+
+					if(!sb3.toString().isEmpty()){
+						sb3.append("/");
+					}
+					sb3.append(t.getVehicleNub());
+				});
+
+				distributionDeliveryListVO.setDriverName(sb1.toString());
+				distributionDeliveryListVO.setDriverPhone(sb2.toString());
+				distributionDeliveryListVO.setVehicleName(sb3.toString());
+			}
+
+
 		} else {
 			DistributionDeliveryTripartiteEntity deliveryTripartiteEntity = distributionDeliveryTripartiteService.getOne(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distributionDeliveryListVO.getId()));
 			distributionDeliveryListVO.setDriverName(deliveryTripartiteEntity.getDriverName());

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

@@ -147,10 +147,18 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 	@Override
 	public IPage<DistributionParcelListVO> selectDistributionParcelListPage(IPage<DistributionParcelListVO> page, DistributionParcelListVO distributionParcelList) {
-		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
+		BasicdataWarehouseEntity myWatchWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
-		List<Long> collect = myWatchWarehouse.stream()
+		List<Long> collect = new ArrayList<>();
-			.map(BasicdataWarehouseEntity::getId)
+		if(ObjectUtils.isNull(myWatchWarehouse)){
-			.collect(Collectors.toList());
+			List<BasicdataWarehouseEntity> myWatchWarehouse1 = basicdataWarehouseClient.getMyWatchWarehouse();
+			myWatchWarehouse1.forEach(t->{
+				collect.add(t.getId());
+			});
+
+		}else{
+			collect.add(myWatchWarehouse.getId());
+		}
+
 		distributionParcelList.setWarehouseIdList(collect);
 		List<DistributionParcelListVO> distributionParcelListEntities = baseMapper.selectDistributionParcelListPage(page, distributionParcelList);
 		return page.setRecords(distributionParcelListEntities);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -306,7 +306,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 					parcelNumberEntity.setCreateUser(distributionStockArticleEntity.getCreateUser());
 					parcelNumberEntity.setUpdateUser(distributionStockArticleEntity.getCreateUser());
 					parcelNumberEntity.setCreateDept(distributionStockArticleEntity.getCreateDept());
-					parcelNumberEntity.setHandQuantity(0);
+					// 目前的解决方案
+					parcelNumberEntity.setHandQuantity(entity.getQuantity());
 					parcelNumberEntity.setQuantity(entity.getQuantity());
 					parcelNumberEntity.setDeliveryQuantity(0);
 					parcelNumberEntity.setSigninQuantity(0);