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

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -401,9 +401,10 @@ public class KwfDriverService {
         }
         //查询当前物流企业自动派单且生效的物流合同
         KwcContractLogisticsDto logContractByEntId = remoteContractService.findLogContractByEntId(Long.valueOf(entId));
-        if (logContractByEntId == null) {
+        if (logContractByEntId == null || logContractByEntId.getSupEntId() == null) {
             return;
         }
+
         //司机评分
         KwfDriverScore driverScoreByEntIds = driverScoreRepository.findDriverScoreByEntIds(Long.valueOf(logContractByEntId.getSupEntId()), Long.valueOf(entId), Long.valueOf(driverId));
         if (driverScoreByEntIds == null) {

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -356,7 +356,7 @@ public class KwfTruckService {
     }
 
     /**
-     * 根据企业id和车辆id查询司机信息
+     * 根据企业id和车辆id查询绑定的司机信息
      *
      * @param truck
      * @param ents
@@ -368,6 +368,7 @@ public class KwfTruckService {
                 .eq(BaseModel::getDelFlag, 0)
                 .eq(KwfTruckReport::getTruckId, truckId)
                 .eq(KwfTruckReport::getEntId, entId)
+                .eq(KwfTruckReport::getStatus, 1)
                 .last("limit 1"));
         if (truckReport == null) {
             return new KwfDriver();

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -332,8 +332,8 @@ public class KwmAddressService {
         LambdaQueryWrapper<KwmAddress> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwmAddress::getDelFlag, Global.NO).
                 eq(KwmAddress::getStatus, Global.NO).
-                eq(KwmAddress::getEntId, LoginUserHolder.getEntId()).and(
-                        wp -> wp.eq(KwmAddress::getName, name).or().eq(KwmAddress::getDetailAddress, detailAddress)
+                eq(KwmAddress::getEntId, LoginUserHolder.getEntId())
+                .and(wp -> wp.eq(KwmAddress::getName, name)
                 );
         List<KwmAddress> kwmAddressList = kwmAddressMapper.selectList(wrapper);
         if (CollectionUtils.isNotEmpty(kwmAddressList) && Objects.isNull(id)) {

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -148,9 +148,9 @@ public class KwpGoodsService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void addShelves(AddGoodsParam param) {
-        if (nameDuplicationJudgment(param.getName(), param.getSupplyEntId(), null)) {
-            throw new BusinessException("已存在相同商品名称！");
-        }
+//        if (nameDuplicationJudgment(param.getName(), param.getSupplyEntId(), null)) {
+//            throw new BusinessException("已存在相同商品名称！");
+//        }
         //添加商品信息
         KwpGoods goods = BeanUtils.copyProperties(param, KwpGoods.class);
         AddressInfo address = param.getAddressInfo();

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/SysDictRepository.java

@@ -96,8 +96,7 @@ public class SysDictRepository extends ServiceImpl<SysDictDao, SysDict> {
         return list(Wrappers.<SysDict>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
                 .eq(BaseModel::getStatus,0)
-                .like (StringUtils.isNotBlank( keyword), SysDict::getLabel, keyword)
-                .last("limit 100"));
+                .like (StringUtils.isNotBlank( keyword), SysDict::getLabel, keyword));
     }
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/SysDictTypeRepository.java

@@ -73,8 +73,7 @@ public class SysDictTypeRepository extends ServiceImpl<SysDictTypeDao, SysDictTy
                 .eq(SysDictType::getStatus, 0)
                 .and(StringUtils.isNotBlank(keyword),w -> w.like(SysDictType::getName, keyword)
                         .or()
-                        .like(SysDictType::getType, keyword))
-                .last("LIMIT 100"));
+                        .like(SysDictType::getType, keyword)));
     }
 
     public List<SysDictType> queryByTypes(Set<String> types) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -290,13 +290,8 @@ public class WaybillOrderService {
                 .collect(Collectors.toMap(OrderDetailVo::getId, Function.identity(), (x, y) -> x));
 
         //查询字典
-        List<SysDictResDto> sysDictResDtos = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
-        if (CollectionUtils.isEmpty(sysDictResDtos)){
-            log.info("品名类型字典数据不存在，truckNo:{}", param.getTruckNo());
-            throw new BusinessPlatfromException(ErrorCodeEnum.DATA_NOT_EXIST, "品名类型字典数据不存在");
-        }
-        Map<String, SysDictResDto> dictValueAndDictResDtoMap = sysDictResDtos.stream()
-                .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity(), (x, y) -> x));
+        Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
+                Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
 
         //组装数据
         List<LogisticsOrderResp> ordderList = logOrderList.stream()
@@ -345,7 +340,7 @@ public class WaybillOrderService {
                                                      Map<Long, OrderDetailVo> tradeIdAndOrderDetailVoMap,
                                                      Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList ,
                                                      Map<Long, List<KwtWaybillOrderSubtask>> logisticsOrderIdAndSubtaskList,
-                                                     Map<String, SysDictResDto> dictValueAndDictResDtoMap) {
+                                                     Map<String, Map<String, String>> dictValueAndDictResDtoMap) {
         LogisticsOrderResp orderResp = new LogisticsOrderResp();
         orderResp.setLogisticsOrderId(Optional.ofNullable(order.getId()).map(String::valueOf).orElse(null));
         orderResp.setLogisticsOrderNo(order.getLOrderNo());
@@ -353,9 +348,10 @@ public class WaybillOrderService {
         KwtLogisticsOrderGoods orderGoods = logOrderIdAndGoodsMap.getOrDefault(order.getId(), new KwtLogisticsOrderGoods());
         KwpGoods goods = goodsIdAndGoodsMap.getOrDefault(orderGoods.getGoodsId(), new KwpGoods());
         if (Objects.nonNull(goods)){
-            SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(goods.getGoodsType(), new SysDictResDto());
-            orderResp.setGoodsId(String.valueOf(goods.getId()));
-            orderResp.setGoodsName(goods.getName()+ "/" +sysDictResDto.getLabel()+"/"+ goods.getSpec());
+            orderResp.setGoodsId(Optional.ofNullable(goods.getId()).map(String::valueOf).orElse(null));
+            Map<String, String> goodsTypeMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
+            Map<String, String> goodsSpecMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
+            orderResp.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));
         }
 
         //托运企业
@@ -700,15 +696,9 @@ public class WaybillOrderService {
                 Collectors.toMap(ticket -> ticket.getWOrderId() + "-" + ticket.getType(),
                         Function.identity(), (x, y) -> x));
 
-
         //查询字典
-        List<SysDictResDto> sysDictResDtos = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
-        if (CollectionUtils.isEmpty(sysDictResDtos)){
-            log.info("品名类型字典数据不存在，truckNo:{}", param.getTruckNo());
-            throw new BusinessPlatfromException(ErrorCodeEnum.DATA_NOT_EXIST, "品名类型字典数据不存在");
-        }
-        Map<String, SysDictResDto> dictValueAndDictResDtoMap = sysDictResDtos.stream()
-                .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity(), (x, y) -> x));
+        Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
+                Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
 
         List<WaybillOrderStatusResp> ordderList = records.stream().map(
                 billOrder -> {
@@ -738,7 +728,7 @@ public class WaybillOrderService {
                                                        Map<Long, OrderDetailVo> tradeIdAndOrderDetailVoMap,
                                                        Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList ,
                                                        Map<Long, List<KwtWaybillOrderSubtask>> logisticsOrderIdAndSubtaskList,
-                                                       Map<String, SysDictResDto> dictValueAndDictResDtoMap,
+                                                       Map<String, Map<String, String>> dictValueAndDictResDtoMap,
                                                        Map<Long, KwpGoods> goodsIdAndGoodsMap) {
         WaybillOrderStatusResp wbOrderResp = new WaybillOrderStatusResp();
         wbOrderResp.setId(wbOrder.getId());
@@ -768,9 +758,10 @@ public class WaybillOrderService {
         KwtLogisticsOrderGoods orderGoods = logOrderIdAndGoodsMap.getOrDefault(wbOrder.getLOrderId(), new KwtLogisticsOrderGoods());
         KwpGoods goods = goodsIdAndGoodsMap.getOrDefault(orderGoods.getGoodsId(), new KwpGoods());
         if (Objects.nonNull(goods)){
-            SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(goods.getGoodsType(), new SysDictResDto());
-            wbOrderResp.setGoodsId(Optional.ofNullable(orderGoods.getId()).map(String::valueOf).orElse(null));
-            wbOrderResp.setGoodsName(goods.getName()+ "/" +sysDictResDto.getLabel()+"/"+ goods.getSpec());
+            wbOrderResp.setGoodsId(Optional.ofNullable(goods.getId()).map(String::valueOf).orElse(null));
+            Map<String, String> goodsTypeMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
+            Map<String, String> goodsSpecMap= dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
+            wbOrderResp.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));
         }
 
         //装货地址