update 增加返回运单相关单位

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -600,6 +600,13 @@ public class KwTransportService {
             vo.setStatus(waybillOrder.getStatus() == null ?
                     null : String.valueOf(waybillOrder.getStatus()));
             vo.setStatusLabel(CarWaybillEnum.getName(waybillOrder.getStatus()));
+            // 托量单位
+            vo.setUnit(waybillOrder.getUnit() == null ? null : waybillOrder.getUnit());
+            if(waybillOrder.getUnit() != null) {
+                Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
+                SysDictResDto sysDict = unitType.get(waybillOrder.getUnit());
+                vo.setUnitLabel(sysDict.getLabel());
+            }
             vo.setSendCarTime(waybillOrder.getCreateTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getCreateTime()));
             vo.setStartTime(waybillOrder.getStartTime() == null ?

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/CarWaybillVo.java

@@ -52,6 +52,16 @@ public class CarWaybillVo implements Serializable {
      */
     private String typeLabel;
 
+    /**
+     * 托量单位
+     */
+    private String unit;
+
+    /**
+     * 托量单位字符
+     */
+    private String unitLabel;
+
     /**
      * 运单状态
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WayBillDetailDTO.java

@@ -88,6 +88,16 @@ public class WayBillDetailDTO{
      */
     private String typeLabel;
 
+    /**
+     * 运单量单位
+     */
+    private String unit;
+
+    /**
+     * 运单量单位字符
+     */
+    private String unitLabel;
+
     /**
      * 计划开始时间
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillBoardListVO.java

@@ -37,6 +37,17 @@ public class WaybillBoardListVO {
      */
     private String statusLabel;
 
+
+    /**
+     * 运单单位
+     */
+    private String unit;
+
+    /**
+     * 运单单位-字符
+     */
+    private String unitLabel;
+
     /**
      * 商品名称
      */

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

@@ -141,6 +141,13 @@ public class WaybillManagementService {
                 }
             }
             wayBillDetailDTO.setCheckFirmName(info.getCheckFirmName());
+            // 运输量单位
+            wayBillDetailDTO.setUnit(info.getUnit() == null ? null : info.getUnit());
+            if(info.getUnit() != null) {
+                Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
+                SysDictResDto sysDict = unitType.get(info.getUnit());
+                wayBillDetailDTO.setUnitLabel(sysDict.getLabel());
+            }
             // 派车人信息
             UserCacheResDto createUser = remoteSystemService.queryUserCacheById(info.getCreateBy());
             if (!ObjectUtils.isEmpty(createUser)) {
@@ -440,7 +447,13 @@ public class WaybillManagementService {
                 statusVOS2.add(temp);
             });
             waybillBoardListVO.setTracks(statusVOS2);
-
+            // 运单量单位
+            waybillBoardListVO.setUnit(sckwWaybillOrder.getUnit());
+            if(sckwWaybillOrder.getUnit() != null) {
+                Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
+                SysDictResDto sysDict = unitType.get(sckwWaybillOrder.getUnit());
+                waybillBoardListVO.setUnitLabel(sysDict.getLabel());
+            }
             // 运单进度
             List<KwtWaybillOrderTrack> kwtWaybillOrderTracks = kwtWaybillOrderTrackMapper
                     .selectList(new LambdaQueryWrapper<KwtWaybillOrderTrack>()