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

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderCirculateRepository.java

@@ -22,12 +22,11 @@ import java.util.Set;
  */
 @Repository
 public class KwtLogisticsOrderCirculateRepository extends ServiceImpl<KwtLogisticsOrderCirculateMapper, KwtLogisticsOrderCirculate> {
-    public IPage<KwtLogisticsOrderCirculate> queryByPage(int pageNum, int pageSize,String truckNo, Set<Long> entIds,
-                                                         Long logistOrderId) {
+    public IPage<KwtLogisticsOrderCirculate> queryByPage(int pageNum, int pageSize,String truckNo,
+                                                         Long logisticOrderId) {
         return page(new Page<>(pageNum, pageSize), Wrappers.<KwtLogisticsOrderCirculate>lambdaQuery()
                 .eq(KwtLogisticsOrderCirculate::getDelFlag,0)
-                .in(KwtLogisticsOrderCirculate::getEntId, entIds)
-                .eq(KwtLogisticsOrderCirculate::getLOrderId, logistOrderId)
+                .eq(KwtLogisticsOrderCirculate::getLOrderId, logisticOrderId)
                 .like(StringUtils.isNotBlank(truckNo),KwtLogisticsOrderCirculate::getTruckNo, truckNo)
                 .orderByDesc(KwtLogisticsOrderCirculate::getCreateTime)
                 .orderByDesc(KwtLogisticsOrderCirculate::getId));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -2819,9 +2819,9 @@ public class KwtLogisticsConsignmentService {
     public PageDataResult<CapacityVo> pageCapacity(CapacityReq req) {
         log.info("查询车辆列表请求：{}", JSON.toJSONString( req));
         Long logOrderId = Long.parseLong(req.getLogOrderId());
-        Set<Long> allEnt = getAllEnt(req.getEntId());
+        //Set<Long> allEnt = getAllEnt(req.getEntId());
         IPage<KwtLogisticsOrderCirculate> page = logisticsOrderCirculateRepository.queryByPage(req.getPageNum(),
-                req.getPageSize(), req.getTruckNo(),allEnt, logOrderId);
+                req.getPageSize(), req.getTruckNo(), logOrderId);
         List<KwtLogisticsOrderCirculate> records = page.getRecords();
 
         if (org.apache.commons.collections4.CollectionUtils.isEmpty( records)){

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -4322,6 +4322,7 @@ public class KwtWaybillOrderV1Service {
             vo.setLng(node.getLng());
             vo.setLat(node.getLat());
             vo.setHasWeighbridge(node.getWeighbridgeId() != null);
+            vo.setImageUrl(node.getWeighUrl());
 
             // 构建状态描述
             //KwtWaybillOrderSubtask subtask = subtaskMap.get(node.getWSubtaskId());