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

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml

@@ -52,6 +52,7 @@
         from logpm_basicdata_tripartite_mall
         where tripartite_mall = #{name}
           and brand_name = #{brand}
+          and is_deleted = 0
           <if test="code != null and code != ''">
               and tripartite_coding = #{code}
           </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -377,17 +377,25 @@ public class DistributionStockArticleController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入distributionStockArticle")
 	public R updateBatchClient(@Valid @RequestBody DistributionStockArticleDTO distributionStockArticleDTO) {
+
+
+		// 获取勾选的需要修改的订单信息
+		List<Long> ids = distributionStockArticleDTO.getEntityList().stream().map(DistributionStockArticleEntity::getId).collect(Collectors.toList());
+		// 查询这个订单集合的预约状态
+		List<DistributionStockArticleEntity> realStockArticleList = distributionStockArticleService.listByIds(ids);
+
 		List<DistributionStockArticleEntity> entityList = distributionStockArticleDTO.getEntityList();
-		if (!entityList.isEmpty()) {
-			boolean flag = entityList.stream().anyMatch(a -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(a.getReservationStatus()));
+		if (!realStockArticleList.isEmpty()) {
+			boolean flag = realStockArticleList.stream().anyMatch(a -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(a.getReservationStatus()));
 			if (flag) {
-				String orderCode = entityList.stream().filter(f -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getReservationStatus())).map(DistributionStockArticleEntity::getOrderCode).distinct().collect(Collectors.joining(","));
+				String orderCode = realStockArticleList.stream().filter(f -> !OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getReservationStatus())).map(DistributionStockArticleEntity::getOrderCode).distinct().collect(Collectors.joining(","));
 				return R.fail(orderCode + "存在预约信息");
 			}
 		}
+
 		for (DistributionStockArticleEntity stockArticleEntity : entityList) {
 			Long id = stockArticleEntity.getId();
-			DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(id);
+			DistributionStockArticleEntity oldStockArticle =realStockArticleList.stream().filter(f -> f.getId().equals(id)).findFirst().orElse(null);
 			DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity();
 			BeanUtil.copy(oldStockArticle, newStockArticle);
 			String consigneePerson = stockArticleEntity.getConsigneePerson();

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

@@ -6065,29 +6065,29 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					return Resp.scanFail("此包件存在异常未处理", "此包件存在异常未处理");
 				}
 			}
-			//如果均不存在则就该判断该货物是否属于当前的配送任务，如果属于则是未装车，如果不属于则此码无效
-			List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectPackageListByDeliveryListId(deliveryListEntity.getId());
-			boolean flag = false;
-			if (Func.isNotEmpty(distributionParcelListEntities)) {
-				List<DistributionParcelListEntity> isHave = distributionParcelListEntities.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
-				if (Func.isNotEmpty(isHave)) {
-					flag = isHave.size() == 1;
-					//判断是否存在有待处理的异常
-				}
-			} else {
-				List<DisStockListDetailEntity> disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
-				if (Func.isNotEmpty(disStockListDetailEntities)) {
-					List<DisStockListDetailEntity> isHaveinven = disStockListDetailEntities.stream().filter(inven -> Func.isNotEmpty(inven.getStockPackageCode()) && inven.getStockPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
-					if (Func.isNotEmpty(isHaveinven)) {
-						flag = isHaveinven.size() == 1;
-					}
-				}
-			}
-
-			if (!flag) {
-				//存在该订制品或者库存品包件信息但是未进行装车操作
-				return Resp.scanFail("包件未装车", "包件未装车");
-			}
+//			//如果均不存在则就该判断该货物是否属于当前的配送任务，如果属于则是未装车，如果不属于则此码无效
+//			List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectPackageListByDeliveryListId(deliveryListEntity.getId());
+//			boolean flag = false;
+//			if (Func.isNotEmpty(distributionParcelListEntities)) {
+//				List<DistributionParcelListEntity> isHave = distributionParcelListEntities.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
+//				if (Func.isNotEmpty(isHave)) {
+//					flag = isHave.size() == 1;
+//					//判断是否存在有待处理的异常
+//				}
+//			} else {
+//				List<DisStockListDetailEntity> disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
+//				if (Func.isNotEmpty(disStockListDetailEntities)) {
+//					List<DisStockListDetailEntity> isHaveinven = disStockListDetailEntities.stream().filter(inven -> Func.isNotEmpty(inven.getStockPackageCode()) && inven.getStockPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
+//					if (Func.isNotEmpty(isHaveinven)) {
+//						flag = isHaveinven.size() == 1;
+//					}
+//				}
+//			}
+//
+//			if (!flag) {
+//				//存在该订制品或者库存品包件信息但是未进行装车操作
+//				return Resp.scanFail("包件未装车", "包件未装车");
+//			}
 		}
 		return R.data(retentionScanVos);
 	}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml

@@ -15,7 +15,7 @@
         select lta.*,
                lbc.client_name htMallName
         from logpm_trunkline_advance lta
-        left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name and lbtm.brand_name = lta.brand and IFNULL(lta.dealer_code,'') = IFNULL(lbtm.tripartite_coding,'')
+        left join logpm_basicdata_tripartite_mall lbtm on lbtm.tripartite_mall = lta.dealer_name and lbtm.brand_name = lta.brand and IFNULL(lta.dealer_code,'') = IFNULL(lbtm.tripartite_coding,'') and lbtm.is_deletd = 0
         left join logpm_basicdata_client lbc on lbc.id = lbtm.client_id
         where lta.is_deleted = 0
           and lta.waybill_status = 0

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

@@ -699,13 +699,16 @@ public class InComingServiceImpl implements IInComingService {
 
 			Set<Long> waybillIdSet = map.keySet();
 
-			List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet));
 
-			waybillEntityList.forEach(wb -> {
-				Integer totalCount = wb.getTotalCount();
-				Integer stockCount = wb.getStockCount();
-				openOrderAsyncService.saveLog(waybillEntity.getId(), waybillEntity.getWaybillNo(), "20", "已入库", "运单入库："+stockCount+"/"+totalCount+",入库类型：【"+IncomingTypeEnum.getValue(incomingType)+"】,入库时间："+ CommonUtil.dateToStringGeneral(new Date()), AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
-			});
+
+			if(CollUtil.isNotEmpty(waybillIdSet)){
+				List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet));
+				waybillEntityList.forEach(wb -> {
+					Integer totalCount = wb.getTotalCount();
+					Integer stockCount = wb.getStockCount();
+					openOrderAsyncService.saveLog(waybillEntity.getId(), waybillEntity.getWaybillNo(), "20", "已入库", "运单入库："+stockCount+"/"+totalCount+",入库类型：【"+IncomingTypeEnum.getValue(incomingType)+"】,入库时间："+ CommonUtil.dateToStringGeneral(new Date()), AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
+				});
+			}
 
 			//把waybillEntityList转化成id为key的Map
 //			Map<Long, WarehouseWaybillEntity> waybillEntityMap = waybillEntityList.stream().collect(Collectors.toMap(WarehouseWaybillEntity::getId, Function.identity()));

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

@@ -294,7 +294,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public R findOrderDetails(OrderDetailsDTO orderDetailsDTO) {
 
 		//判断orderDetailsDTO中的订单号 运单号 包件码 服务号 客户车次号至少有一个有值
-		if(StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && !StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())){
+		if(StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())){
 			return R.fail("订单号 运单号 包件码 服务号 客户车次号至少有一个有值");
 		}