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

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -320,7 +320,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
 
     @Override
     public List<TradeContractUnitDto> queryContractUnitByContractId(Long contractId) {
-        List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByContractId(contractId);
+        List<KwcContractTradeUnit> units = kwcContractTradeUnitRepository.queryByContractId(contractId);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty( units)){
             return List.of();
         }
@@ -329,7 +329,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
             tradeContractUnitDto.setUnitType(String.valueOf(unit.getUnitType()));
             tradeContractUnitDto.setEntId(unit.getEntId());
             tradeContractUnitDto.setFirmName(unit.getFirmName());
-            tradeContractUnitDto.setContactsId(unit.getContactsId());
+            tradeContractUnitDto.setContactsId(unit.getContractId());
             tradeContractUnitDto.setContacts(unit.getContacts());
             tradeContractUnitDto.setPhone(unit.getPhone());
             return tradeContractUnitDto;

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

@@ -2977,7 +2977,7 @@ public class KwtWaybillOrderV1Service {
         //物流订单号集合
         Set<Long> logOrderIds = getLogOrderIds(req);
         boolean b1 = !org.apache.commons.lang3.StringUtils.isAllBlank(req.getLogisticsOrderNo(), req.getGoodsName(),
-                req.getCarrierId(), req.getConsignorId()) || !Objects.nonNull(LoginUserHolder.getEntId());
+                req.getCarrierId(), req.getConsignorId(),req.getLogisticsOrderId()) || !Objects.nonNull(LoginUserHolder.getEntId());
         if(org.apache.commons.collections4.CollectionUtils.isEmpty(logOrderIds) && b1){
             return PageDataResult.empty(req.getPageNum(), req.getPageSize());
         }
@@ -3257,6 +3257,12 @@ public class KwtWaybillOrderV1Service {
                     .collect(Collectors.toSet()));
         }
 
+        if (StringUtils.isNotBlank(req.getLogisticsOrderId())  && CollectionUtils.isNotEmpty(logOrderIds)){
+            logOrderIds =logOrderIds.stream()
+                    .filter(x->Objects.equals(x,Long.parseLong(req.getLogisticsOrderId())))
+                    .collect(Collectors.toSet());
+        }
+
         return logOrderIds;
     }
 
@@ -3555,7 +3561,7 @@ public class KwtWaybillOrderV1Service {
         waybillOrderDetailResp.setTransEntName(transEnt.getFirmName());
         waybillOrderDetailResp.setCarrierEntName(carrierEnt.getFirmName());
         Optional<TradeContractUnitDto> first = tradeContractUnitDtos.stream()
-                .filter(x -> org.apache.commons.lang3.StringUtils.equals(x.getUnitType(), String.valueOf(CooperateTypeEnum.PURCHASER.getCode())))
+                .filter(x -> org.apache.commons.lang3.StringUtils.equals(x.getUnitType(), String.valueOf(CooperateTypeEnum.SUPPLIER.getCode())))
                 .findFirst();
         first.ifPresent(x->{
             waybillOrderDetailResp.setSupplyEntName(x.getFirmName());