1.干线装车详情，卸车详情零担收货单位添加

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -287,5 +287,8 @@ public interface IDistributionParcelListClient {
 
 	@PostMapping(API_PREFIX + "/deleteListByParcelListIds")
 	void deleteListByParcelListIds(@RequestBody List<Long> deleteParcelListIds);
+
+	@GetMapping(API_PREFIX + "/findPackageGoodsListByWaybillNoAndWarehouseId")
+	List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(@RequestParam String waybillNo, @RequestParam Long warehouseId);
 }
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -592,4 +592,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		distributionParcelNumberService.deleteListByParcelListIds(deleteParcelListIds);
 	}
 
+	@Override
+	public List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(String waybillNo, Long warehouseId) {
+		return distributionParcelListService.findPackageGoodsListByWaybillNoAndWarehouseId(waybillNo,warehouseId);
+	}
+
 }

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

@@ -315,4 +315,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     Map<String, Object> findOrderInfoByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode, @Param("warehouseId") Long warehouseId);
 
     void deleteListByParcelListIds(@Param("parceListIds") List<Long> deleteParcelListIds);
+
+	List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(@Param("waybillNo") String waybillNo, @Param("warehouseId") Long warehouseId);
 }

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

@@ -1972,4 +1972,15 @@
         </foreach>
     </delete>
 
+    <select id="findPackageGoodsListByWaybillNoAndWarehouseId" resultType="com.alibaba.fastjson.JSONObject">
+        select ldpl.id packageId,
+               lwwd.product_id goodsId,
+               lwwd.product_name goodsName,
+               ldpl.quantity stockNum
+        from logpm_distribution_parcel_list ldpl
+        left join logpm_warehouse_waybill_detail lwwd on lwwd.id = ldpl.advance_id
+        where lwwd.waybill_no = #{waybillNo}
+        and ldpl.warehouse_id = #{warehouseId}
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@@ -288,4 +288,6 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	void updateEntityByOpenOrderByAdvanceIds(UpdateOrderDTO updateOrderDTO);
 
 	void deleteListByParcelListIds(List<Long> deleteParcelListIds);
+
+	List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(String waybillNo, Long warehouseId);
 }

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

@@ -1525,4 +1525,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	public void deleteListByParcelListIds(List<Long> deleteParcelListIds) {
 		baseMapper.deleteListByParcelListIds(deleteParcelListIds);
 	}
+
+	@Override
+	public List<JSONObject> findPackageGoodsListByWaybillNoAndWarehouseId(String waybillNo, Long warehouseId) {
+		return baseMapper.findPackageGoodsListByWaybillNoAndWarehouseId(waybillNo,warehouseId);
+	}
 }

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

@@ -8226,7 +8226,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			List<GoodsLoadingNumVO> loadingNumVOList = scanZeroDetailService.findGoodsLoadingNum(loadId,warehouseId,waybillNo,orderCode);
 			//把loadingNumVOList转化成以goodsId作为key的Map
 			Map<Long, GoodsLoadingNumVO> map = loadingNumVOList.stream().collect(Collectors.toMap(GoodsLoadingNumVO::getGoodsId, Function.identity()));
-			List<JSONObject> zeroPackageList = distributionParcelListClient.findPackageGoodsListByWaybillNo(waybillNo);
+			List<JSONObject> zeroPackageList = distributionParcelListClient.findPackageGoodsListByWaybillNoAndWarehouseId(waybillNo,warehouseId);
 			List<ZeroPackageVO> ls = new ArrayList<>();
 			zeroPackageList.forEach(jsonObject -> {
 				ZeroPackageVO javaObject = jsonObject.toJavaObject(ZeroPackageVO.class);