创建门卫，商品名称更新

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -3,6 +3,7 @@ package com.sckw.transport.handler;
 
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
+import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.constant.Global;
@@ -14,6 +15,7 @@ import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
 import com.sckw.order.api.model.OrderDetailVo;
 import com.sckw.order.api.model.UpdateActualAmountParam;
+import com.sckw.product.api.model.KwpGoods;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.param.OrderCirculateTakingQueryParam;
 import com.sckw.transport.model.param.OrderTakingResp;
@@ -172,12 +174,21 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
                 gatekeeper.setWOrderId(waybillOrder.getId());
                 gatekeeper.setWOrderNo(waybillOrder.getWOrderNo());
                 gatekeeper.setLOrderId(waybillOrder.getLOrderId());
+
+                //查询字典
+                Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
+                        Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+                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<>());
+
                 // 查询商品信息
                 KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
-                if (orderGoods != null) {
-                    gatekeeper.setGoodsId(orderGoods.getGoodsId());
-                    gatekeeper.setGoodsName(orderGoods.getGoodsName());
+                KwpGoods goods = goodsInfoService.getGoodsById(orderGoods.getGoodsId());
+                if (goods != null) {
+                    gatekeeper.setGoodsId(goods.getId());
+                    gatekeeper.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));
                 }
+
                 gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
                 gatekeeper.setType(GatekeeperTypeEnum.LOADING.getCode());
                 gatekeeper.setStatus(GatekeeperStatusEnum.PENDING_ENTRY.getCode());

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.sckw.contract.api.RemoteContractService;
+import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.constant.Global;
@@ -22,6 +23,7 @@ import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.OrderUnitInfoDetailVO;
 import com.sckw.product.api.dubbo.GoodsInfoService;
+import com.sckw.product.api.model.KwpGoods;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.enuma.WeighbridgeTypeEnum;
@@ -974,12 +976,21 @@ public class GatekeeperOrderService {
             gatekeeper.setWOrderId(waybillOrder.getId());
             gatekeeper.setWOrderNo(waybillOrder.getWOrderNo());
             gatekeeper.setLOrderId(waybillOrder.getLOrderId());
+
+            //查询字典
+            Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
+                    Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
+            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<>());
+
             // 查询商品信息
             KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsRepository.queryByLogOrderId(waybillOrder.getLOrderId());
-            if (orderGoods != null) {
-                gatekeeper.setGoodsId(orderGoods.getGoodsId());
-                gatekeeper.setGoodsName(orderGoods.getGoodsName());
+            KwpGoods goods = goodsInfoService.getGoodsById(orderGoods.getGoodsId());
+            if (goods != null) {
+                gatekeeper.setGoodsId(goods.getId());
+                gatekeeper.setGoodsName(goods.getName()+"/"+goodsTypeMap.getOrDefault(goods.getGoodsType(),"")+"/"+goodsSpecMap.getOrDefault(goods.getSpec(), ""));
             }
+
             gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
             gatekeeper.setType(GatekeeperTypeEnum.UNLOADING.getCode());
             gatekeeper.setStatus(GatekeeperStatusEnum.PENDING_ENTRY.getCode());