update 补充接口返回数据

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

@@ -80,6 +80,11 @@ public class WayBillDetailDTO{
      */
     private String type;
 
+    /**
+     * 运单类型-字符
+     */
+    private String typeLabel;
+
     /**
      * 计划开始时间
      */

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

@@ -23,16 +23,36 @@ public class WaybillBoardListVO {
      */
     private String wOrderNo;
 
+    /**
+     * 运单状态
+     */
+    private String status;
+
+    /**
+     * 运单状态-字符
+     */
+    private String statusLabel;
+
     /**
      * 商品名称
      */
     private String goodsName;
 
+    /**
+     * 装货地点名称
+     */
+    private String loadName;
+
     /**
      * 装货地点
      */
     private String loadDetailAddress;
 
+    /**
+     * 卸货地点名称
+     */
+    private String unloadName;
+
     /**
      * 卸货地点
      */

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

@@ -105,6 +105,7 @@ public class WaybillManagementService {
             wayBillDetailDTO.setLOrderNo(info.getLOrderNo());
             wayBillDetailDTO.setEntrustAmount(String.valueOf(info.getEntrustAmount()));
             wayBillDetailDTO.setType(String.valueOf(info.getType()));
+            wayBillDetailDTO.setTypeLabel(info.getType().equals(NumberConstant.ONE) ? "趟次" : "循环");
             wayBillDetailDTO.setStartTime(DateUtil.getDateTime(info.getStartTime()));
             wayBillDetailDTO.setEndTime(DateUtil.getDateTime(info.getEndTime()));
             wayBillDetailDTO.setCreateBy(info.getCreateByName());
@@ -147,6 +148,9 @@ public class WaybillManagementService {
             waybillTicketVO.setUnloadTime(DateUtil.getDateTime(info.getUnloadTime()));
             waybillTicketVO.setUnloadWeight(String.valueOf(info.getUnloadAmount()));
             waybillTicketVO.setUnloadUrl(String.valueOf(info.getUnloadUrls()));
+//            waybillBoardListVO.setLoadUrls(sckwWaybillOrder.getLoadUrls() != null ? FileUtils.getOSSAddressPrefix() + sckwWaybillOrder.getLoadUrls() : null);
+//            waybillBoardListVO.setUnloadUrls(sckwWaybillOrder.getUnloadUrls() != null ? FileUtils.getOSSAddressPrefix() + sckwWaybillOrder.getUnloadUrls() : null);
+
         }
         List<Integer> statuses = initWaybillIndexStatus();
         // 初始化各状态
@@ -233,8 +237,12 @@ public class WaybillManagementService {
             WaybillBoardListVO waybillBoardListVO = new WaybillBoardListVO();
             waybillBoardListVO.setWOrderId(String.valueOf(sckwWaybillOrder.getWOrderId()));
             waybillBoardListVO.setWOrderNo(String.valueOf(sckwWaybillOrder.getWOrderNo()));
+            waybillBoardListVO.setStatus(String.valueOf(sckwWaybillOrder.getStatus()));
+            waybillBoardListVO.setStatusLabel(CarWaybillEnum.getName(sckwWaybillOrder.getStatus()));
             waybillBoardListVO.setGoodsName(String.valueOf(sckwWaybillOrder.getGoodsName()));
+            waybillBoardListVO.setLoadName(sckwWaybillOrder.getLoadName());
             waybillBoardListVO.setLoadDetailAddress(String.valueOf(sckwWaybillOrder.getLoadDetailAddress()));
+            waybillBoardListVO.setUnloadName(sckwWaybillOrder.getUnloadName());
             waybillBoardListVO.setUnloadDetailAddress(String.valueOf(sckwWaybillOrder.getUnloadDetailAddress()));
             waybillBoardListVO.setStartTime(DateUtil.getDateTime(sckwWaybillOrder.getStartTime()));
             waybillBoardListVO.setEndTime(DateUtil.getDateTime(sckwWaybillOrder.getEndTime()));