Merge branch 'pre-production'

blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java

@@ -39,5 +39,9 @@ public class PushData implements Serializable {
 	 * 目的仓
 	 */
 	private String destinationWarehouse;
+	/**
+	 * 目的仓
+	 */
+	private String waybillStartWarehouse;
 
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -898,7 +898,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		if (user == null) {
 			throw new ServiceException("用户信息获取失败");
 		}
-		String roleName = user.getRoleName();
+		List<String> roleList = Arrays.asList(user.getRoleName().split(","));
 		String tenantId = user.getTenantId();
 
 		// 查询 状态条件
@@ -911,29 +911,30 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		if (Func.isEmpty(myCurrentWarehouse)) {
 			log.warn(">>>>myCurrentWarehouse  {}", myCurrentWarehouse);
 		}
-
-		Optional<DictBiz> matchingDictBiz = warehouseType.stream()
-			.filter(i -> i.getDictValue().equals(roleName))
-			.findFirst();
-
-		Object workOrderStatus = aftersalesWorkOrder.get("workOrderStatus");
-		if (matchingDictBiz.isPresent()) {
-			String dictValue = matchingDictBiz.get().getDictKey();
-			switch (dictValue) {
-				case "1": // 客服经理
-					updateWorkOrderForManager(aftersalesWorkOrder, workOrderStatus);
-					break;
-				case "2": // 营业部客服
-					updateWorkOrderForSales(aftersalesWorkOrder, workOrderStatus);
-					break;
-				case "3": // 职能客服
-					updateWorkOrderForFunctional(aftersalesWorkOrder, workOrderStatus, user.getUserId());
-					break;
+		if (!roleList.isEmpty()) {
+			Optional<DictBiz> matchingDictBiz = warehouseType.stream()
+				.filter(i -> roleList.contains(i.getDictValue()))
+				.findFirst();
+			Object workOrderStatus = aftersalesWorkOrder.get("workOrderStatus");
+			if (matchingDictBiz.isPresent()) {
+				String dictValue = matchingDictBiz.get().getDictKey();
+				switch (dictValue) {
+					case "1": // 客服经理
+						updateWorkOrderForManager(aftersalesWorkOrder, workOrderStatus);
+						break;
+					case "2": // 营业部客服
+						updateWorkOrderForSales(aftersalesWorkOrder, workOrderStatus);
+						break;
+					case "3": // 职能客服
+						updateWorkOrderForFunctional(aftersalesWorkOrder, workOrderStatus, user.getUserId());
+						break;
+				}
+			} else {
+				updateWorkOrderForOthers(aftersalesWorkOrder, workOrderStatus);
 			}
-		} else {
-			updateWorkOrderForOthers(aftersalesWorkOrder, workOrderStatus);
+		}else {
+			throw new CustomerException("当前登录人无工单操作权限!!!");
 		}
-
 		AftersalesWorkOrderEntity workOrderEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesWorkOrder), AftersalesWorkOrderEntity.class);
 		IPage<AftersalesWorkOrderEntity> iPage = baseMapper.pageListOwn(page, workOrderEntity);
 		if (iPage.getRecords().isEmpty()) {

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -477,7 +477,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String warehouseAddress = "";
 		if (CollUtil.isNotEmpty(brands)) {
 			// 按品牌分组
-			Map<String, List<LoadScanBrandDTO>> brandMap = brands.stream().collect(Collectors.groupingBy(LoadScanBrandDTO::getBrand));
+			Map<String, List<LoadScanBrandDTO>> brandMap = brands.stream().filter(b -> StringUtil.isNotBlank(b.getBrand())).collect(Collectors.groupingBy(LoadScanBrandDTO::getBrand));
 			for (Map.Entry<String, List<LoadScanBrandDTO>> entry : brandMap.entrySet()) {
 				List<LoadScanBrandDTO> value = entry.getValue();
 				LoadScanBrandDTO brand = value.get(0);
@@ -9523,6 +9523,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
                                 .packageCode(orderPackageCode)
                                 .warehouseName(warehouseName)
 								.destinationWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getAcceptWarehouseName():"")
+								.waybillStartWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getSendWarehouseName():"")
                                 .orderCode(orderCode)
                                 .build()))
 						.build();
@@ -10209,6 +10210,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							.packageCode(orderPackageCode)
 							.warehouseName(warehouseName)
 							.destinationWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getAcceptWarehouseName():"")
+							.waybillStartWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getSendWarehouseName():"")
 							.orderCode(orderCode)
 							.build()))
 						.build();