自提列表BUG修复

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

@@ -138,20 +138,26 @@ public class DistrilbutionBillLadingController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distrilbutionBillLading")
 	public R<IPage<DistrilbutionBillLadingVO>> listOwn(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query) {
-		IPage<DistrilbutionBillLadingVO> pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading);
-		List<DistrilbutionBillLadingVO> records = pages.getRecords();
-		records.forEach( i ->{
-			i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
-			i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
-			//查询图片数据
-			// 遍历BillLadingStatusConstant的所有枚举值
-			Arrays.stream(BillLadingStatusConstant.values())
-				.filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤
-				.findFirst() // 找到第一个匹配的枚举值
-				.ifPresent(ii -> i.setConditionName(ii.getName())); // 修改属性值（如果有匹配的枚举值）
-
-		});
-		return R.data(pages);
+		try {
+			IPage<DistrilbutionBillLadingVO> pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading);
+			List<DistrilbutionBillLadingVO> records = pages.getRecords();
+			records.forEach( i ->{
+				i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
+				i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
+				//查询图片数据
+				// 遍历BillLadingStatusConstant的所有枚举值
+				Arrays.stream(BillLadingStatusConstant.values())
+					.filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤
+					.findFirst() // 找到第一个匹配的枚举值
+					.ifPresent(ii -> i.setConditionName(ii.getName())); // 修改属性值（如果有匹配的枚举值）
+
+			});
+			return R.data(pages);
+		}catch (Exception e){
+			log.error(e.getMessage(), e);
+		}
+		return R.data(null);
+
 	}
 
 	/**

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

@@ -180,6 +180,15 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper<DistrilbutionB
 	 */
 	List<SignPushDataUnitDTO> selectPushOldInventorySigning(@Param("id")Long billId);
 
+	/**
+	 * 查询视图
+	 * @param page
+	 * @param distrilbutionBillLadingDTO
+	 * @param collect
+	 * @return
+	 */
+	IPage<DistrilbutionBillLadingVO> getAllBillLadingByView(IPage<Object> page,@Param("param") DistrilbutionBillLadingDTO distrilbutionBillLadingDTO, List<Long> collect);
+
 //	Page<DistrilbutionBillLadingAppVO> getInventoryPage(IPage<Object> page, DistrilbutionBillLadingEntity distrilbutionBillLadingEntity);
 
 }

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

@@ -985,6 +985,9 @@
         GROUP BY
         ldsld.id
     </select>
+    <select id="getAllBillLadingByView" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
+        SELECT * FROM bill_lading_view
+    </select>
 
 
 </mapper>

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

@@ -2353,18 +2353,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 		List<Long> collect = null;
 
-
+		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = null;
 		if (Func.isNotEmpty(myCurrentWarehouse)) {
 			collect = new ArrayList<>();
 			collect.add(myCurrentWarehouse.getId());
+			 distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
+
 		} else {
+			distrilbutionBillLadingVOIPage = baseMapper.getAllBillLadingByView(page, distrilbutionBillLadingDTO, collect);
 			collect = warehouseList.stream()
 				.map(BasicdataWarehouseEntity::getId)
 				.collect(Collectors.toList());
 		}
 
 
-		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
 		List<DistrilbutionBillLadingVO> records = distrilbutionBillLadingVOIPage.getRecords();
 
 		// 获取所有的提货单ID
@@ -2403,8 +2405,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		records.forEach(i -> {
 			if (groupedEntities != null) {
 				List<DistributionDeliveryChargeEntity> list = groupedEntities.get(i.getId());
-				list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost())));
-				i.setList(list);
+				if (!Func.isEmpty(groupedEntities.get(i.getId()))){
+					list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost())));
+					i.setList(list);
+				}
+
 			}
 			if (groupDistributionPrintEntityEntities != null) {
 				List<DistributionPrintEntity> list1 = groupDistributionPrintEntityEntities.get(i.getId());