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

# Conflicts:
#	sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryLogisticListResp.java

@@ -1,10 +1,8 @@
 package com.sckw.contract.model.vo.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sckw.core.web.request.PageReq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -1467,14 +1467,14 @@ public class KwcContractLogisticsService {
                             (x, y) -> x));
         }
         //查询字典
-        List<SysDictResDto> sysDictResDtos = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
-        Map<String, SysDictResDto> dictValueAndDictResDtoMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(sysDictResDtos)){
-            //字典value映射字典
-            dictValueAndDictResDtoMap = sysDictResDtos.stream()
-                    .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity()));
-
-        }
+        Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+//        Map<String, SysDictResDto> dictValueAndDictResDtoMap = new HashMap<>();
+//        if (CollectionUtils.isNotEmpty(sysDictResDtos)){
+//            //字典value映射字典
+//            dictValueAndDictResDtoMap = sysDictResDtos.stream()
+//                    .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity()));
+//
+//        }
 
         return getQueryLogisticDetailResp(logistics, contractUniTypeAndUnitMap, kwcContractLogisticsGoods,dictValueAndDictResDtoMap);
 
@@ -1484,7 +1484,7 @@ public class KwcContractLogisticsService {
     private QueryLogisticDetailResp getQueryLogisticDetailResp(KwcContractLogistics logistics,
                                                                Map<String, KwcContractLogisticsUnit> contractUniTypeAndUnitMap,
                                                                List<KwcContractLogisticsGoods> kwcContractLogisticsGoods,
-                                                               Map<String, SysDictResDto> dictValueAndDictResDtoMap) {
+                                                               Map<String, Map<String, String>> dictValueAndDictResDtoMap) {
         QueryLogisticDetailResp queryLogisticListResp = new QueryLogisticDetailResp();
         queryLogisticListResp.setId(logistics.getId());
         queryLogisticListResp.setPid(logistics.getContractPid());
@@ -1547,12 +1547,14 @@ public class KwcContractLogisticsService {
 
     private static QueryLogisticDetailResp.TradeGoodsInfo getTradeGoodsInfo(KwcContractLogisticsGoods x,
                                                                             Map<Long, KwpGoods> kwpGoodsMap,
-                                                                            Map<String, SysDictResDto> dictValueAndDictResDtoMap) {
+                                                                            Map<String, Map<String, String>> dictValueAndDictResDtoMap) {
         QueryLogisticDetailResp.TradeGoodsInfo tradeGoodsInfo = new QueryLogisticDetailResp.TradeGoodsInfo();
         tradeGoodsInfo.setGoodsId(x.getGoodsId());
         KwpGoods kwpGoods = kwpGoodsMap.getOrDefault(x.getGoodsId(), new KwpGoods());
-        SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
-        tradeGoodsInfo.setGoodsName(kwpGoods.getName()+"/"+sysDictResDto.getLabel()+"/"+kwpGoods.getSpec());
+       // SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
+        Map<String, String> goodTypeMap = dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
+        Map<String, String> goodSpecMap = dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), new HashMap<>());
+        tradeGoodsInfo.setGoodsName(kwpGoods.getName()+"/"+goodTypeMap.getOrDefault(kwpGoods.getGoodsType(),"")+"/"+goodSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
         tradeGoodsInfo.setAmount(x.getAmount());
         tradeGoodsInfo.setAmountUnit(x.getUnit());
         tradeGoodsInfo.setPrice(x.getPrice());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1450,15 +1450,7 @@ public class KwcContractTradeService {
         }
 
         //查询字典
-        List<SysDictResDto> sysDictResDtos = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
-        Map<String, SysDictResDto> dictValueAndDictResDtoMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(sysDictResDtos)) {
-            //字典value映射字典
-            dictValueAndDictResDtoMap = sysDictResDtos.stream()
-                    .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity()));
-
-        }
-
+        Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
 
         ContractDetailResp contractDetailResp = new ContractDetailResp();
         contractDetailResp.setId(kwcContractTrade.getId());
@@ -1472,9 +1464,8 @@ public class KwcContractTradeService {
         //标地信息
         if (CollectionUtils.isNotEmpty(tradeGoods)) {
             Map<Long, KwpGoods> finalGoodsIdAndGoodsMap = goodsIdAndGoodsMap;
-            Map<String, SysDictResDto> finalDictValueAndDictResDtoMap = dictValueAndDictResDtoMap;
             List<ContractDetailResp.TradeGoodsInfo> tradeGoodsInfos = tradeGoods.stream()
-                    .map(t -> getTradeGoodsInfo(t, finalGoodsIdAndGoodsMap, finalDictValueAndDictResDtoMap))
+                    .map(t -> getTradeGoodsInfo(t, finalGoodsIdAndGoodsMap, dictValueAndDictResDtoMap))
                     .collect(Collectors.toList());
             contractDetailResp.setGoodsInfo(tradeGoodsInfos);
         }
@@ -1488,12 +1479,13 @@ public class KwcContractTradeService {
 
     private static ContractDetailResp.TradeGoodsInfo getTradeGoodsInfo(KwcContractTradeGoods t,
                                                                        Map<Long, KwpGoods> finalGoodsIdAndGoodsMap,
-                                                                       Map<String, SysDictResDto> dictValueAndDictResDtoMap) {
+                                                                       Map<String, Map<String, String>> dictValueAndDictResDtoMap) {
         ContractDetailResp.TradeGoodsInfo tradeGoodsInfo = new ContractDetailResp.TradeGoodsInfo();
         tradeGoodsInfo.setGoodsId(t.getGoodsId());
         KwpGoods goods = finalGoodsIdAndGoodsMap.getOrDefault(t.getGoodsId(), new KwpGoods());
-        SysDictResDto dictResDto = dictValueAndDictResDtoMap.getOrDefault(goods.getGoodsType(), new SysDictResDto());
-        tradeGoodsInfo.setGoodsName(goods.getName() + "/" + dictResDto.getLabel() + "/" + goods.getSpec());
+        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<>());
+        tradeGoodsInfo.setGoodsName(goods.getName() + "/" + goodsTypeMap.getOrDefault(goods.getGoodsType(), "") + "/" + goodsSpecMap.getOrDefault(goods.getSpec(), ""));
         tradeGoodsInfo.setAmount(t.getAmount());
         tradeGoodsInfo.setPrice(t.getPrice());
         tradeGoodsInfo.setUnit(DictEnum.getLabel(DictTypeEnum.UNIT_TYPE.getType(), t.getUnit()));

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -1944,7 +1944,7 @@ public class KwoTradeOrderService {
         kwoTradeOrderGoods.setGoodsId(tradeOrderParam.getGoodsId());
         kwoTradeOrderGoods.setGoodsType(goodsById.getGoodsType());
         kwoTradeOrderGoods.setSkuId(goodsInfoDto.getSkuId());
-        kwoTradeOrderGoods.setUnit(goodsInfoDto.getUnit());
+        kwoTradeOrderGoods.setUnit(goodsById.getUnit());
         kwoTradeOrderGoods.setUnitPrice(goodsInfoDto.getPrice());
         kwoTradeOrderGoods.setPriceRangeId(0L);//
         kwoTradeOrderGoods.setGoodsName(goodsById.getName());
@@ -2081,7 +2081,7 @@ public class KwoTradeOrderService {
         if (Objects.isNull(goodsInfoDto)) {
             throw new BusinessException("当前贸易订单不存在交易商品");
         }
-        order.setUnit(goodsInfoDto.getUnit());
+        order.setUnit(goodsById.getUnit());
         order.setPickupType(String.valueOf(tradeContractResDto.getConsignment()));//来源于合同约束的托运方式
         order.setDeliveryType("");
         order.setTrading(String.valueOf(tradeContractResDto.getSigningWay()));//签约方式
@@ -2171,6 +2171,23 @@ public class KwoTradeOrderService {
             kwoTradeOrderTrackService.insert(kwoTradeOrderTrack);
             return true;
         }
+        TradeContractResDto tradeContractResDto = remoteContractService.queryTradeContract(tradeOrderAuditParam.getTradeContractId(), byOrderId.getGoodsId());
+        if (Objects.isNull(tradeContractResDto)) {
+            throw new BusinessException("贸易合同不存在");
+        }
+        Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.UNIT_TYPE.getType()));
+        List<LogisticsEntDtoVO> validContractLog = new ArrayList<>();
+        List<LogisticsEntDto> logisticsContractId = new ArrayList<>();
+        if (Objects.equals(DispatchWayEnums.AUTO_DISPATCH.getCode(), tradeContractResDto.getDispatchWay())) {
+            //自动派单校验： 判断当前有无包含该商品的有效自动派车物流合同
+            validContractLog = checkAutoContractLogOrder(unitMap, byOrderId, tradeContractResDto);
+        } else {
+            logisticsContractId = tradeOrderAuditParam.getLogisticsContractList();
+            if (Objects.equals(tradeContractResDto.getConsignment(), 2) && CollUtil.isEmpty(logisticsContractId)) {
+                throw new BusinessException("卖方托运时，物流合同不能为空");
+            }
+        }
+
         KwoTradeOrderTrack kwoTradeOrderTrack = new KwoTradeOrderTrack();
         kwoTradeOrderTrack.setTOrderId(kwoTradeOrder.getId());
         kwoTradeOrderTrack.setTOrderNo(kwoTradeOrder.getTOrderNo());
@@ -2360,6 +2377,8 @@ public class KwoTradeOrderService {
         addLogisticOrderParam.setGoodsType(byOrderId.getGoodsType());
         addLogisticOrderParam.setGoodsPrice(byOrderId.getUnitPrice());
         Map<String, String> map = dict.get(DictTypeEnum.UNIT_TYPE.getType());
+        log.info("map {}", map);
+        log.info("byOrderId {}", JSONObject.toJSONString(byOrderId));
         if (CollUtil.isNotEmpty(map)) {
             addLogisticOrderParam.setGoodsUnit(map.get(byOrderId.getUnit()));
         }

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

@@ -2292,14 +2292,14 @@ public class KwtLogisticsConsignmentService {
         Map<Long, KwtLogisticsOrderContract> logOrderIdAndContractMap = getLongKwtLogisticsOrderContractMap(logOrderIdList);
 
         //查询字典
-        List<SysDictResDto> sysDictResDtos = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
-        Map<String, SysDictResDto> dictValueAndDictResDtoMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(sysDictResDtos)){
-            //字典value映射字典
-            dictValueAndDictResDtoMap = sysDictResDtos.stream()
-                    .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity()));
-
-        }
+        Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+//        Map<String, SysDictResDto> dictValueAndDictResDtoMap = new HashMap<>();
+//        if (CollectionUtils.isNotEmpty(sysDictResDtos)){
+//            //字典value映射字典
+//            dictValueAndDictResDtoMap = sysDictResDtos.stream()
+//                    .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity()));
+//
+//        }
 
         Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList = records.stream()
                 .collect(Collectors.groupingBy(KwtLogisticsOrder::getTOrderId));
@@ -2317,14 +2317,12 @@ public class KwtLogisticsConsignmentService {
         Map<Long, KwpGoods> finalGoodsIdAndGoodsMap = goodsIdAndGoodsMap;
         Map<String, KwtLogisticsOrderAddress> finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap = logisticsOrderIdAndUnitTypeKeyAndAddressMap;
         Map<Long, KwtLogisticsOrderContract> finalLogOrderIdAndContractMap = logOrderIdAndContractMap;
-
-        Map<String, SysDictResDto> finalDictValueAndDictResDtoMap = dictValueAndDictResDtoMap;
         Map<Long, OrderDetailVo> finalTradeIdAndOrderDetailVoMap = tradeIdAndOrderDetailVoMap;
         Map<Long, List<KwtWaybillOrderSubtask>> finalLogOrderIdAndSubtaskMap = logOrderIdAndSubtaskMap;
         List<LogisticsOrderResp> resps = records.stream()
                 .map(x ->getLogisticsOrderResp(x, finalLogOrderIdAndUnitTypeKeyAndUnitMap, finalLogIdAndGoodsMap
                         , finalGoodsIdAndGoodsMap, finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap, finalLogOrderIdAndContractMap,
-                        finalDictValueAndDictResDtoMap, finalTradeIdAndOrderDetailVoMap, tradeIdAndLogOrderList, finalLogOrderIdAndSubtaskMap))
+                         dictValueAndDictResDtoMap, finalTradeIdAndOrderDetailVoMap, tradeIdAndLogOrderList, finalLogOrderIdAndSubtaskMap))
                 .collect(Collectors.toList());
         if(org.apache.commons.lang3.StringUtils.isNotBlank(req.getConsignCompanyId())){
             resps = resps.stream()
@@ -2450,7 +2448,7 @@ public class KwtLogisticsConsignmentService {
                                                             Map<Long, KwpGoods> finalGoodsIdAndGoodsMap,
                                                             Map<String, KwtLogisticsOrderAddress> finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap,
                                                             Map<Long, KwtLogisticsOrderContract> finalLogOrderIdAndContractMap,
-                                                            Map<String, SysDictResDto> dictValueAndDictResDtoMap,
+                                                            Map<String, Map<String, String>> dictValueAndDictResDtoMap,
                                                             Map<Long, OrderDetailVo> tradeIdAndOrderDetailVoMap,
                                                             Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList,
                                                             Map<Long, List<KwtWaybillOrderSubtask>> logisticsOrderIdAndSubtaskList) {
@@ -2472,8 +2470,9 @@ public class KwtLogisticsConsignmentService {
         String  priceUnit = kwpGoods.getPriceUnit();
         if (Objects.nonNull(kwpGoods)){
             logisticsOrderResp.setGoodsId(String.valueOf(goods.getGoodsId()));
-            SysDictResDto dictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
-            logisticsOrderResp.setGoodsName(kwpGoods.getName()+"/"+dictResDto.getLabel()+"/"+kwpGoods.getSpec());
+            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<>());
+            logisticsOrderResp.setGoodsName(kwpGoods.getName()+"/"+goodsTypeMap.getOrDefault(kwpGoods.getGoodsType(), "")+"/"+goodsSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
         }
         logisticsOrderResp.setTransportPrice((Objects.nonNull(kwtLogisticsOrder.getPrice()) ? kwtLogisticsOrder.getPrice().setScale(2,
                 RoundingMode.HALF_UP).toPlainString() : "0.00" ) +priceUnit);
@@ -2595,10 +2594,13 @@ public class KwtLogisticsConsignmentService {
         List<KwtLogisticsOrder> logOrderList = logisticsOrderRepository.queryByTradeOrderId(logisticsOrder.getTOrderId());
         //查询贸易订单
         OrderDetailVo orderDetailVo = tradeOrderInfoService.queryByTradeOrderId(logisticsOrder.getTOrderId());
+        //查询字典
+        Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+
 
         //获取返回信息
         return getLogisticsOrderDetailResp(orderContract,tradeContractResDto, logOrderIdUnitTypeKeyAndUnitMap, logisticsOrder, kwpGoods,
-                logOrderIdAndUnitTypeKeyAndAddressMap, waybillOrderSubtasks, logOrderList,orderDetailVo);
+                logOrderIdAndUnitTypeKeyAndAddressMap, waybillOrderSubtasks, logOrderList,orderDetailVo,dictValueAndDictResDtoMap);
 
     }
 
@@ -2611,7 +2613,8 @@ public class KwtLogisticsConsignmentService {
                                                                         Map<String, KwtLogisticsOrderAddress> logOrderIdAndUnitTypeKeyAndAddressMap,
                                                                         List<KwtWaybillOrderSubtask> waybillOrderSubtasks,
                                                                         List<KwtLogisticsOrder> logOrderList,
-                                                                        OrderDetailVo orderDetailVo ) {
+                                                                        OrderDetailVo orderDetailVo,
+                                                                        Map<String, Map<String, String>> dictValueAndDictResDtoMap) {
         LogisticsOrderDetailResp logisticsOrderDetailResp = new LogisticsOrderDetailResp();
         //设置合同信息
         setContractInfo(orderContract, tradeContractResDto,logisticsOrderDetailResp);
@@ -2619,7 +2622,7 @@ public class KwtLogisticsConsignmentService {
         setUnitInfo(logOrderIdUnitTypeKeyAndUnitMap, logisticsOrder, logisticsOrderDetailResp);
 
         //设置贸易信息
-        setGoodsInfo(kwpGoods, logisticsOrder, logisticsOrderDetailResp,orderDetailVo);
+        setGoodsInfo(kwpGoods, logisticsOrder, logisticsOrderDetailResp,orderDetailVo,dictValueAndDictResDtoMap);
 
         //设置装卸货地址信息
         setAddressInfo(logOrderIdAndUnitTypeKeyAndAddressMap, logisticsOrder, logisticsOrderDetailResp);
@@ -2761,11 +2764,14 @@ public class KwtLogisticsConsignmentService {
 
     private static void setGoodsInfo(KwpGoods kwpGoods, KwtLogisticsOrder logisticsOrder,
                                      LogisticsOrderDetailResp logisticsOrderDetailResp,
-                                     OrderDetailVo orderDetailVo) {
+                                     OrderDetailVo orderDetailVo,
+                                     Map<String, Map<String, String>> dictValueAndDictResDtoMap) {
         LogisticsOrderDetailResp.GoodsInfoVO goodsInfoVO = new LogisticsOrderDetailResp.GoodsInfoVO();
         String priceUnit = "";
         if (Objects.nonNull(kwpGoods)){
-            goodsInfoVO.setGoodsName(kwpGoods.getName());
+            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<>());
+            goodsInfoVO.setGoodsName(kwpGoods.getName()+ "/" +goodsTypeMap.getOrDefault(kwpGoods.getGoodsType(),"")+"/"+ goodsSpecMap.getOrDefault(kwpGoods.getSpec(),""));
             priceUnit = kwpGoods.getPriceUnit();
         }
         goodsInfoVO.setUnitPrice((Objects.nonNull(logisticsOrder.getPrice())? logisticsOrder.getPrice().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00")+logisticsOrder.getUnit());

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

@@ -3072,24 +3072,17 @@ public class KwtWaybillOrderV1Service {
                                                                                                                                                         k2) -> k1));
         }
         //查询字典
-        List<SysDictResDto> sysDictResDtos = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
-        Map<String, SysDictResDto> dictValueAndDictResDtoMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(sysDictResDtos)){
-            //字典value映射字典
-            dictValueAndDictResDtoMap = sysDictResDtos.stream()
-                    .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity()));
+        Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
 
-        }
 
         Map<String, KwtWaybillOrderAddress> finalSubOrderIdAddressTypeKeyAndAddressMap = subOrderIdAddressTypeKeyAndAddressMap;
         Map<Long, KwtLogisticsOrderGoods> finalLogOrderIdAndGoodsIdMap = logOrderIdAndGoodsIdMap;
         Map<Long, KwtLogisticsOrder> finalLogIdAndOrderMap = logIdAndOrderMap;
-        Map<String, SysDictResDto> finalDictValueAndDictResDtoMap = dictValueAndDictResDtoMap;
         List<WaybillOrderResp> resps = records.stream()
                 .map(record -> getWaybillOrderResp(record, waybillOrderIdAndBillOrderMap,
                         logOrderIdUnitTypeKeyAndUnitMap, finalLogOrderIdAndGoodsIdMap,
                         kwpGoodsMap, finalSubOrderIdAddressTypeKeyAndAddressMap,  waybillOrderNodeMap,
-                        finalLogIdAndOrderMap, finalDictValueAndDictResDtoMap, wOrderIdAndOffsiteNodeMap))
+                        finalLogIdAndOrderMap, dictValueAndDictResDtoMap, wOrderIdAndOffsiteNodeMap))
                 .collect(Collectors.toList());
 
         return PageDataResult.of(page,resps);
@@ -3323,7 +3316,7 @@ public class KwtWaybillOrderV1Service {
                                                         Map<String, KwtWaybillOrderAddress> finalSubOrderIdAddressTypeKeyAndAddressMap,
                                                         Map<String, KwtWaybillOrderNode> waybillOrderNodeMap,
                                                         Map<Long, KwtLogisticsOrder> finalLogIdAndOrderMap,
-                                                        Map<String, SysDictResDto> dictValueAndDictResDtoMap,
+                                                        Map<String, Map<String, String>> dictValueAndDictResDtoMap,
                                                         Map<Long, KwtWaybillOrderNode> wOrderIdAndOffsiteNodeMap) {
         WaybillOrderResp waybillOrderResp = new WaybillOrderResp();
         KwtWaybillOrder billOrder = finalWaybillOrderIdAndBillOrderMap.getOrDefault(record.getWOrderId(),
@@ -3351,8 +3344,10 @@ public class KwtWaybillOrderV1Service {
                 new KwtLogisticsOrderGoods());
         KwpGoods kwpGoods = kwpGoodsMap.get(goods.getGoodsId());
         if (Objects.nonNull(kwpGoods)){
-            SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
-            waybillOrderResp.setGoodsName(kwpGoods.getName()+"/"+sysDictResDto.getLabel()+"/"+kwpGoods.getSpec());
+
+            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<>());
+            waybillOrderResp.setGoodsName(kwpGoods.getName()+"/"+goodsTypeMap.getOrDefault(kwpGoods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
         }
         waybillOrderResp.setTaskNum((Objects.nonNull(record.getEntrustAmount()) ?
                 record.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+record.getUnit());
@@ -3499,14 +3494,8 @@ public class KwtWaybillOrderV1Service {
                 Collectors.toMap(ticket -> ticket.getWOrderId() + "-" + ticket.getType(),
                         Function.identity(), (x, y) -> x));
         //查询字典
-        List<SysDictResDto> sysDictResDtos = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
-        Map<String, SysDictResDto> dictValueAndDictResDtoMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(sysDictResDtos)){
-            //字典value映射字典
-            dictValueAndDictResDtoMap = sysDictResDtos.stream()
-                    .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity()));
+        Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
 
-        }
 
         return getWaybillOrderDetailResp( subtask,billOrder, logOrder, truck, fleet, goods,
                 keyAndAddressMap,kwpGoods,logisticsOrderUnitMap,nodeList,userCacheResDto,billOrders,ticketMap,dictValueAndDictResDtoMap,tradeContractUnitDtos);
@@ -3525,7 +3514,7 @@ public class KwtWaybillOrderV1Service {
                                                                      UserCacheResDto userCacheResDto,
                                                                      List<KwtWaybillOrder> billOrders,
                                                                      Map<String, KwtWaybillOrderTicket> ticketMap,
-                                                                     Map<String, SysDictResDto> dictValueAndDictResDtoMap,
+                                                                     Map<String, Map<String, String>> dictValueAndDictResDtoMap ,
                                                                      List<TradeContractUnitDto> tradeContractUnitDtos ) {
         WaybillOrderDetailResp waybillOrderDetailResp = new WaybillOrderDetailResp();
         waybillOrderDetailResp.setWaybillOrderId(String.valueOf(billOrder.getId()));
@@ -3541,8 +3530,9 @@ public class KwtWaybillOrderV1Service {
         waybillOrderDetailResp.setDriverPhone(billOrder.getDriverPhone());
         waybillOrderDetailResp.setDriverIdCard(billOrder.getDriverIdcard());
         if (Objects.nonNull(kwpGoods)){
-            SysDictResDto sysDictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
-            waybillOrderDetailResp.setGoodsName(kwpGoods.getName()+ "/" +sysDictResDto.getLabel()+"/"+ kwpGoods.getSpec());
+            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<>());
+            waybillOrderDetailResp.setGoodsName(kwpGoods.getName()+ "/" +goodsTypeMap.getOrDefault(kwpGoods.getGoodsType(),"")+"/"+ goodsSpecMap.getOrDefault(kwpGoods.getSpec(),""));
         }
         KwtWaybillOrderAddress loadAdd = keyAndAddressMap.getOrDefault(billOrder.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new KwtWaybillOrderAddress());
         waybillOrderDetailResp.setLoadAddress(loadAdd.getCityName()+loadAdd.getDetailAddress());