商品名称优化

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

@@ -4213,7 +4213,7 @@ public class KwtWaybillOrderV1Service {
 
             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.setGoodsName(goodsSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
         }
         waybillOrderResp.setTaskNum((Objects.nonNull(record.getEntrustAmount()) ?
                 record.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+record.getUnit());
@@ -4806,7 +4806,7 @@ public class KwtWaybillOrderV1Service {
             Map<String, String> goodsSpecMap = dictValueAndDictResDtoMap.getOrDefault(DictTypeEnum.GOODS_SPEC.getType(), Collections.emptyMap());
             String goodsType = goodsTypeMap.getOrDefault(kwpGoods.getGoodsType(), "");
             String goodsSpec = goodsSpecMap.getOrDefault(kwpGoods.getSpec(), "");
-            resp.setGoodsName(kwpGoods.getName() + "/" + goodsType + "/" + goodsSpec);
+            resp.setGoodsName(goodsSpec);
         }
 
         // 地址信息

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

@@ -397,7 +397,14 @@ public class ForkliftOrderService {
         forklift.setTruckType(forkliftOrder.getTruckType());
         forklift.setEntrustAmount(forkliftOrder.getEntrustAmount());
         forklift.setGoodsId(forkliftOrder.getGoodsId());
-        forklift.setGoodsName(forkliftOrder.getGoodsName());
+
+        // 商品名称
+        String goodsName = forkliftOrder.getGoodsName();
+        if (StringUtils.isNotBlank(goodsName)) {
+            int lastSlashIndex = goodsName.lastIndexOf("/");
+            String dictName = lastSlashIndex >= 0 ? goodsName.substring(lastSlashIndex + 1) : goodsName;
+            forklift.setGoodsName(dictName);
+        }
 
         //运单数据
         KwtWaybillOrder waybillOrder = waybillOrderMap.getOrDefault(forkliftOrder.getWOrderId(), new KwtWaybillOrder());

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

@@ -424,9 +424,16 @@ public class GatekeeperOrderService {
         gatekeeper.setWaybillAcceptTime(gatekeeperWaybillOrder.getWaybillAcceptTime());
         gatekeeper.setEntrustAmount(gatekeeperWaybillOrder.getEntrustAmount());
         gatekeeper.setGoodsId(gatekeeperWaybillOrder.getGoodsId());
-        gatekeeper.setGoodsName(gatekeeperWaybillOrder.getGoodsName());
         gatekeeper.setRemark(gatekeeperWaybillOrder.getRemark());
 
+        // 商品名称
+        String goodsName = gatekeeperWaybillOrder.getGoodsName();
+        if (StringUtils.isNotBlank(goodsName)) {
+            int lastSlashIndex = goodsName.lastIndexOf("/");
+            String dictName = lastSlashIndex >= 0 ? goodsName.substring(lastSlashIndex + 1) : goodsName;
+            gatekeeper.setGoodsName(dictName);
+        }
+
         //运单数据
         KwtWaybillOrder waybillOrder = waybillOrderMap.getOrDefault(gatekeeperWaybillOrder.getWOrderId(), new KwtWaybillOrder());
         gatekeeper.setTruckId(waybillOrder.getTruckId());

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

@@ -553,7 +553,7 @@ public class WaybillOrderService {
             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(), ""));
+            orderResp.setGoodsName(goodsSpecMap.getOrDefault(goods.getSpec(), ""));
         }
 
         //托运企业
@@ -629,7 +629,7 @@ public class WaybillOrderService {
             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(), ""));
+            orderResp.setGoodsName(goodsSpecMap.getOrDefault(goods.getSpec(), ""));
         }
 
         //供应企业
@@ -1139,7 +1139,7 @@ public class WaybillOrderService {
             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(), ""));
+            wbOrderResp.setGoodsName(goodsSpecMap.getOrDefault(goods.getSpec(), ""));
         }
 
         //装货地址