1、4.2接口调整；

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrderAddress.java

@@ -82,7 +82,7 @@ public class KwtWaybillOrderAddress implements Serializable {
     private String lat;
 
     /**
-     * 纬度
+     * 经度
      */
     private String lng;
 

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.constant.Global;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -154,6 +155,16 @@ public class WaybillSubtaskDetailVo {
      */
     private Double deficitPrice;
 
+    /**
+     * 合理损耗
+     */
+    private BigDecimal loss;
+
+    /**
+     * 合理损耗单位(‰/kG)
+     */
+    private String lossUnitLabe;
+
     /**
      * 地址信息
      */

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

@@ -16,6 +16,10 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class WaybillTicketVO {
+    /**
+     * 单位
+     */
+    private String unitLabe;
     /**
      * 装载图片
      */

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

@@ -979,7 +979,7 @@ public class KwtTransportCommonService {
             put("upperlOrderId", orderId);
             put("passStatus", Global.NUMERICAL_ONE);
         }};
-        WaybillCountVo waybillOrderCount = waybillOrderMapper.findWaybillOrderCount(map);
+        //WaybillCountVo waybillOrderCount = waybillOrderMapper.findWaybillOrderCount(map);
         OrderFinishVO orderFinishVO = new OrderFinishVO();
         List<OrderGoodsLoadingVo> assistUnit = new ArrayList<>();
         //单位

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

@@ -297,6 +297,7 @@ public class KwtWaybillOrderTicketService {
             unload.setAmount(unloadAmount);
             load.setMain(subtask.getUnit().equals(goodsUnit.getUnit()));
 
+            waybillTicket.setUnitLabe(unitMap.get(goodsUnit.getUnit()));
             waybillTicket.setLoadUrl(loadUrls);
             waybillTicket.setLoadTime(unloadDate.get().getOperateTime());
             waybillTicket.setLoadWeight(loadAmount);

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

@@ -375,6 +375,9 @@ public class KwtWaybillOrderV1Service {
         //单位
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.UNIT_TYPE.getType()));
         Map<String, String> unitMap = CollectionUtils.isNotEmpty(dict) ? dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>(NumberConstant.SIXTEEN);
+        //合理损耗单位
+        Map<String, Map<String, String>> dictLoss = remoteSystemService.queryDictByType(List.of(DictTypeEnum.TAX_RATE_TYPE.getType()));
+        Map<String, String> lossMap = CollectionUtils.isNotEmpty(dictLoss) ? dictLoss.get(DictTypeEnum.TAX_RATE_TYPE.getType()) : new HashMap<>(NumberConstant.SIXTEEN);
 
         //物流订单
         KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
@@ -406,6 +409,7 @@ public class KwtWaybillOrderV1Service {
             addressData.put("amount", ticket != null ? ticket.getAmount() : null);
             addressData.put("urls", ticket != null ? ticket.getUrls() : null);
             addressData.put("operateTime", ticket != null ? DateUtils.format(address.getPlanTime(), DateUtils.FORMAT11) : null);
+            addressData.put("operateStatus", ticket != null);
             addressList.add(addressData);
         }
 
@@ -415,6 +419,8 @@ public class KwtWaybillOrderV1Service {
         BeanUtils.copyPropertiesValue(subtask, waybillDetail);
         waybillDetail.setWOrderId(waybillOrder.getId());
         waybillDetail.setLOrderNo(logisticsOrder.getLOrderNo());
+        waybillDetail.setLoss(logisticsOrder.getLoss());
+        waybillDetail.setLossUnitLabe(lossMap.get(waybillDetail.getUnit()));
         waybillDetail.setWSubtaskId(subtask.getId());
         waybillDetail.setStatusLabel(CarWaybillEnum.getName(waybillOrder.getStatus()));
         waybillDetail.setUnitLabel(unitMap.get(waybillDetail.getUnit()));
@@ -584,6 +590,8 @@ public class KwtWaybillOrderV1Service {
                 trackData.put("addressName", address.getName());
                 trackData.put("addressCityName", address.getCityName());
                 trackData.put("addressDetail", address.getDetailAddress());
+                trackData.put("lat", address.getLat());
+                trackData.put("lng", address.getLng());
                 trackList.add(trackData);
             }
         }
@@ -2219,7 +2227,6 @@ public class KwtWaybillOrderV1Service {
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.UNIT_TYPE.getType()));
         Map<String, String> unitMap = CollectionUtils.isNotEmpty(dict) ? dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>(NumberConstant.SIXTEEN);
 
-
         /*数据处理*/
         List<Map<String, Object>> trackList = new ArrayList<>();
         //运单状态(待接单、待出车、出车)