运输服务-托运订单-查看订单详情

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/StringConstant.java

@@ -1,5 +1,7 @@
 package com.sckw.core.common.enums;
 
+import java.time.format.DateTimeFormatter;
+
 /**
  * @description:    定义字符串常量
  * @author: LengFaQiang
@@ -17,12 +19,16 @@ public final class StringConstant {
     public static final String HTTPS_STRING = "https";
     public static final String B = "B";
     public static final String KB = "KB";
+
     public static final String MB = "MB";
     public static final String G = "G";
     public static final String GB = "GB";
-
+    public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    public static final String DEF_DATE_FORMAT = "yyyy-MM-dd";
+    public static final DateTimeFormatter YYYY_MM_DD_HH_MM_SS = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    public static final DateTimeFormatter YYYY_MM_DD = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    public static final DateTimeFormatter HH_MM_SS = DateTimeFormatter.ofPattern("HH:mm:ss");
     public static final String DATE_YYYYMMDD = "yyyyMMdd";
-
     public static final String ENCODING_UTF_EIGHT = "UTF-8";
     public static final String ENCODING_UTF_SIXTEEN = "UTF-16";
     public static final String ENCODING_GBK = "GBK";

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -39,7 +39,7 @@ public class KwTransportController {
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/selectList", method = RequestMethod.POST)
     public HttpResult acceptCarriageOrderList(@Validated @RequestBody ConsignOrderQuery query) {
         HttpResult httpResult = new HttpResult();
         try {
@@ -57,7 +57,7 @@ public class KwTransportController {
      * @param query
      * @return
      */
-    @RequestMapping(value = "/statistics", method = RequestMethod.GET)
+    @RequestMapping(value = "/statistics", method = RequestMethod.POST)
     public HttpResult statistics(@Validated @RequestBody ConsignOrderQuery query) {
         try {
             return transportService.statistics(query);
@@ -73,7 +73,7 @@ public class KwTransportController {
      * @param query 查询参数
      * @return
      */
-    @RequestMapping(value = "/export", method = RequestMethod.GET)
+    @RequestMapping(value = "/export", method = RequestMethod.POST)
     public HttpResult export(@Validated @RequestBody ConsignOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
         List<ConsignOrderVo> list = transportService.export(query);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -6,7 +6,7 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.easyexcel.RequestHolder;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
-import com.sckw.transport.model.vo.ConsignOrderVo;
+import com.sckw.transport.model.vo.ConsignOrderVO;
 import com.sckw.transport.service.AcceptCarriageOrderService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -71,7 +71,7 @@ public class AcceptCarriageOrderController {
         HttpServletResponse response = RequestHolder.getResponse();
         List list = acceptCarriageOrderService.export(query);
         if (CollectionUtils.isNotEmpty(list)){
-            ExcelUtil.download(response, ConsignOrderVo.class, list);
+            ExcelUtil.download(response, ConsignOrderVO.class, list);
             return HttpResult.ok();
         }
         return HttpResult.error("没有可导出的数据");

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ConsignOrderController.java

@@ -2,7 +2,7 @@ package com.sckw.transport.controller;
 
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.transport.model.dto.OrderDto;
+import com.sckw.transport.model.dto.OrderDTO;
 import com.sckw.transport.service.ConsignOrderService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -28,30 +28,32 @@ public class ConsignOrderController {
     ConsignOrderService consignOrderService;
     /**
      * 托运订单获取车辆运单
+     *
      * @param orderDto
      * @return
      */
-    @RequestMapping(value = "/getCarWaybillByOrder",method = RequestMethod.GET)
-    public HttpResult getCarWaybillByOrder( @Validated  @RequestBody OrderDto orderDto){
+    @RequestMapping(value = "/getCarWaybillByOrder", method = RequestMethod.POST)
+    public HttpResult getCarWaybillByOrder(@Validated @RequestBody OrderDTO orderDto) {
         try {
             return consignOrderService.getCarWaybillByOrder(orderDto);
         } catch (Exception e) {
-            log.error("托运订单获取车辆运单失败:订单id {},error {} ",orderDto.getId(), e.getMessage(), e);
+            log.error("托运订单获取车辆运单失败:订单id {},error {} ", orderDto.getId(), e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
 
     /**
      * 托运订单获取车辆信息
+     *
      * @param orderDto
      * @return
      */
-    @RequestMapping(value = "/getCarListByOrder",method = RequestMethod.GET)
-    public HttpResult getCarListByOrder(@Validated  @RequestBody OrderDto orderDto){
+    @RequestMapping(value = "/getCarListByOrder", method = RequestMethod.POST)
+    public HttpResult getCarListByOrder(@Validated @RequestBody OrderDTO orderDto) {
         try {
             return consignOrderService.getCarListByOrder(orderDto);
         } catch (Exception e) {
-            log.error("托运订单获取车辆运单失败:订单id {},error {} ",orderDto.getId(), e.getMessage(), e);
+            log.error("托运订单获取车辆运单失败:订单id {},error {} ", orderDto.getId(), e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/TransportCommonController.java

@@ -0,0 +1,45 @@
+package com.sckw.transport.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.transport.model.dto.DocumentParamDTO;
+import com.sckw.transport.service.TransportCommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lfdc
+ * @description 运输服务公共接口调用查询Controller
+ * @date 2023-07-12 09:07:42
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/kwtTransport")
+public class TransportCommonController {
+    @Autowired
+    private TransportCommonService transportCommonService;
+
+    /**
+     * 获取订单详情-托运订单-承运订单
+     *
+     * @param dto
+     * @return
+     */
+    @RequestMapping(value = "/getOrderDetail", method = RequestMethod.POST)
+    public HttpResult getOrderDetail(@Validated @RequestBody DocumentParamDTO dto) {
+        log.info("获取订单详情参数:{}", JSONObject.toJSONString(dto));
+        try {
+            return transportCommonService.getOrderDetail(dto);
+        } catch (Exception e) {
+            log.error("获取订单详情失败:error {} ", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
+}

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

@@ -53,12 +53,12 @@ public class KwoTradeOrder extends BaseModel {
     private Long pickupType;
 
     /**
-     * 开始日期
+     * 计划开始日期
      */
     private LocalDateTime startTime;
 
     /**
-     * 结束日期
+     * 计划结束日期
      */
     private LocalDateTime endTime;
 

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

@@ -96,12 +96,12 @@ public class KwtLogisticsOrder implements Serializable {
     private String goodsPriceUnit;
 
     /**
-     * 开始日期
+     * 计划开始日期
      */
     private Date startTime;
 
     /**
-     * 结束日期
+     * 计划结束日期
      */
     private Date entTime;
 

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

@@ -36,6 +36,11 @@ public class KwtLogisticsOrderGoods implements Serializable {
      */
     private Long goodsId;
 
+    /**
+     * 货物名称
+     */
+    private String goodsName;
+
     /**
      * sku
      */

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

@@ -0,0 +1,27 @@
+package com.sckw.transport.model.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * @author lfdc
+ * @description 单据dto用于查询
+ * @date 2023-07-12 09:07:35
+ */
+@Data
+public class DocumentParamDTO {
+    /**
+     * 数据库主键id
+     */
+    @NotBlank(message = "id不能为空")
+    private String id;
+    /**
+     * 单据号
+     */
+    private String documentNo;
+    /**
+     * 单据类型(销售订单:0;采购订单:1;承运订单:3;托运订单:4)
+     */
+    @NotBlank(message = "单据类型不能为空")
+    private String documentType;
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/OrderDto.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/OrderDTO.java

@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class OrderDto {
+public class OrderDTO {
     @NotBlank(message = "单据编号不能为空")
     private String orderNo;
     @NotBlank(message = "数据id不能为空")

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/LogisticsConsignmentParam.java

@@ -1,10 +1,14 @@
 package com.sckw.transport.model.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * @author lfdc
@@ -149,13 +153,18 @@ public class LogisticsConsignmentParam {
      */
     private String priceType;
     /**
-     * 计划收货时间
+     * 计划卸货时间
      */
-    private String receiveGoodsDateTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private String receiveGoodsDateTime;
+    private Date receiveGoodsDateTime;
     /**
      * 计划发货时间
      */
-    private String shipmentsDateTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date shipmentsDateTime;
     /**
      * 税率
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/AcceptCarriageOrderVo.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/AcceptCarriageOrderVO.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @date 2023-06-27 10:06:30
  */
 @Data
-public class AcceptCarriageOrderVo {
+public class AcceptCarriageOrderVO {
     /**
      * 状态
      */
@@ -120,7 +120,7 @@ public class AcceptCarriageOrderVo {
      */
     private String plannedDate;
 
-    private List<CarWaybillVo> carWaybillList;
-    private List<ConsignmentVo> consignmentList;
+    private List<CarWaybillVO> carWaybillList;
+    private List<ConsignmentVO> consignmentList;
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarDataVo.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarDataVO.java

@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class CarDataVo {
+public class CarDataVO {
     /**
      * 司机姓名
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVo.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVO.java

@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-public class CarWaybillVo {
+public class CarWaybillVO {
     private String id;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ConsignOrderVo.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ConsignOrderVO.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 2023-07-07 09:07:06
  */
 @Data
-public class ConsignOrderVo extends PageResult implements Serializable {
+public class ConsignOrderVO extends PageResult implements Serializable {
     /**
      * 结算周期
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ConsignmentVo.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ConsignmentVO.java

@@ -8,7 +8,7 @@ import lombok.Data;
  * @date 2023-06-27 11:06:08
  */
 @Data
-public class ConsignmentVo {
+public class ConsignmentVO {
     /**
      * 状态
      */

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

@@ -0,0 +1,133 @@
+package com.sckw.transport.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author lfdc
+ * @description 订单详情vo
+ * @date 2023-07-12 09:07:57
+ */
+@Data
+public class OrderDetailVO {
+    private String id;
+    /**
+     * 计费方式
+     */
+    private String billingMode;
+    /**
+     * 承运单位
+     */
+    private String carrierCompany;
+    /**
+     * 承运联系人
+     */
+    private String carrierContacts;
+    /**
+     * 承运联系电话
+     */
+    private String carrierPhone;
+    /**
+     * 收款单位
+     */
+    private String collectionCompany;
+    /**
+     * 托运单位
+     */
+    private String consignCompany;
+    /**
+     * 托运联系人
+     */
+    private String consignContacts;
+    /**
+     * 托运联系电话
+     */
+    private String consignPhone;
+    /**
+     * 扣亏损值
+     */
+    private String deduct;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 合理亏损
+     */
+    private String loss;
+    /**
+     * 任务总量
+     */
+    private String number;
+    /**
+     * 订单金额
+     */
+    private String orderAmount;
+    /**
+     * 已履约量
+     */
+    private String performanceAmount;
+    /**
+     * 运价
+     */
+    private String price;
+    /**
+     * 计划结束时间
+     */
+    private String scheduleEndTime;
+    /**
+     * 计划开始时间
+     */
+    private String scheduleStartTime;
+    /**
+     * 结算周期
+     */
+    private String settlementCycle;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 合同id
+     */
+    private String contractId;
+    /**
+     * 合同名称
+     */
+    private String contractName;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
+    /**
+     * 装货地址
+     */
+    private String loadAddress;
+    /**
+     * 装货联系人
+     */
+    private String loadContacts;
+    /**
+     * 装货联系电话
+     */
+    private String loadPhone;
+    /**
+     * 装货详细地址
+     */
+    private String loadAddressDetail;
+    /**
+     * 装货详细地址
+     */
+    private String unloadAddress;
+    /**
+     * 卸货联系人
+     */
+    private String unloadContacts;
+    /**
+     * 卸货联系电话
+     */
+    private String unloadPhone;
+    /**
+     * 卸货详细地址
+     */
+    private String unloadAddressDetail;
+}

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

@@ -6,9 +6,9 @@ import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
-import com.sckw.transport.model.vo.AcceptCarriageOrderVo;
-import com.sckw.transport.model.vo.CarWaybillVo;
-import com.sckw.transport.model.vo.ConsignmentVo;
+import com.sckw.transport.model.vo.AcceptCarriageOrderVO;
+import com.sckw.transport.model.vo.CarWaybillVO;
+import com.sckw.transport.model.vo.ConsignmentVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -25,28 +25,20 @@ import java.util.List;
 public class AcceptCarriageOrderService {
 
     public HttpResult list(AcceptCarriageOrderQuery query) {
-        List<AcceptCarriageOrderVo> list=new ArrayList<>();
-        AcceptCarriageOrderVo acceptCarriageOrderVo = new AcceptCarriageOrderVo();
-        List<CarWaybillVo> carWaybillVoList = new ArrayList<>();
-        CarWaybillVo carWaybillVo=new CarWaybillVo();
-        carWaybillVoList.add(carWaybillVo);
-        List<ConsignmentVo> consignmentVos = new ArrayList<>();
-        ConsignmentVo consignmentVo=new ConsignmentVo();
-        consignmentVos.add(consignmentVo);
-        acceptCarriageOrderVo.setCarWaybillList(carWaybillVoList);
-        acceptCarriageOrderVo.setConsignmentList(consignmentVos);
+        List<AcceptCarriageOrderVO> list = new ArrayList<>();
+        AcceptCarriageOrderVO acceptCarriageOrderVo = new AcceptCarriageOrderVO();
+        List<CarWaybillVO> carWaybillVOList = new ArrayList<>();
+        CarWaybillVO carWaybillVo = new CarWaybillVO();
+        carWaybillVOList.add(carWaybillVo);
+        List<ConsignmentVO> consignmentVOS = new ArrayList<>();
+        ConsignmentVO consignmentVo = new ConsignmentVO();
+        consignmentVOS.add(consignmentVo);
+        acceptCarriageOrderVo.setCarWaybillList(carWaybillVOList);
+        acceptCarriageOrderVo.setConsignmentList(consignmentVOS);
         list.add(acceptCarriageOrderVo);
         PageHelper.startPage(query.getPage(), query.getPageSize());
         PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
         return HttpResult.ok(pageResult);
-//        Map<String,Object> map=new HashMap<>();
-//        map.put("data",pageResult);
-//        Map<String,Object> map1=new HashMap<>();
-//        map1.put("data1","1");
-//        map1.put("data12","12");
-//        map1.put("data13","13");
-//        map.put("statistics",map1);
-//        return HttpResult.ok(map);
     }
 
     public HttpResult count(AcceptCarriageOrderQuery query) {

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

@@ -10,11 +10,11 @@ import com.sckw.excel.utils.DateUtil;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
-import com.sckw.transport.model.dto.OrderDto;
+import com.sckw.transport.model.dto.OrderDTO;
 import com.sckw.transport.model.param.ConsignOrderQuery;
-import com.sckw.transport.model.vo.CarDataVo;
-import com.sckw.transport.model.vo.CarWaybillVo;
-import com.sckw.transport.model.vo.ConsignOrderVo;
+import com.sckw.transport.model.vo.CarDataVO;
+import com.sckw.transport.model.vo.CarWaybillVO;
+import com.sckw.transport.model.vo.ConsignOrderVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,12 +74,12 @@ public class ConsignOrderService {
         return null;
     }
 
-    public List<ConsignOrderVo> export(ConsignOrderQuery query) {
-        return new ArrayList<ConsignOrderVo>();
+    public List<ConsignOrderVO> export(ConsignOrderQuery query) {
+        return new ArrayList<ConsignOrderVO>();
     }
 
-    public HttpResult getCarWaybillByOrder(OrderDto orderDto) {
-        List<CarWaybillVo> returnList = new ArrayList<>();
+    public HttpResult getCarWaybillByOrder(OrderDTO orderDto) {
+        List<CarWaybillVO> returnList = new ArrayList<>();
         KwtLogisticsOrder order = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                 .eq(StringUtils.isNotBlank(orderDto.getId()), KwtLogisticsOrder::getId, Long.parseLong(orderDto.getId()))
                 .eq(StringUtils.isNotBlank(orderDto.getOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDto.getOrderNo())
@@ -92,7 +92,7 @@ public class ConsignOrderService {
                 .eq(KwtWaybillOrder::getEntId, LoginUserHolder.getEntId()));
         if (CollectionUtils.isNotEmpty(kwtWaybillOrders)) {
             for (KwtWaybillOrder kwtWaybillOrder : kwtWaybillOrders) {
-                CarWaybillVo carWaybillVo = new CarWaybillVo();
+                CarWaybillVO carWaybillVo = new CarWaybillVO();
                 KwtWaybillOrderTrack track = kwtWaybillOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTrack>()
                         .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTrack::getWOrderId, kwtWaybillOrder.getId()));
                 KwtWaybillOrderTicket loadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
@@ -150,17 +150,17 @@ public class ConsignOrderService {
         return HttpResult.ok(returnList);
     }
 
-    public HttpResult getCarListByOrder(OrderDto orderDto) {
+    public HttpResult getCarListByOrder(OrderDTO orderDto) {
         KwtWaybillOrder waybillOrder = kwtWaybillOrderMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrder>()
                 .eq(KwtWaybillOrder::getLOrderId, orderDto.getId())
                 .eq(KwtWaybillOrder::getEntId, LoginUserHolder.getEntId()));
         List<KwtLogisticsOrderCirculate> list = kwtLogisticsOrderCirculateMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderCirculate>()
                 .eq(KwtLogisticsOrderCirculate::getLOrderId, orderDto.getId())
                 .eq(KwtLogisticsOrderCirculate::getEntId, LoginUserHolder.getEntId()));
-        List<CarDataVo> carDataVos = new ArrayList<CarDataVo>();
+        List<CarDataVO> carDataVOS = new ArrayList<CarDataVO>();
         if (CollectionUtils.isNotEmpty(list)) {
             for (KwtLogisticsOrderCirculate circulate : list) {
-                CarDataVo carDataVo = new CarDataVo();
+                CarDataVO carDataVo = new CarDataVO();
                 //todo dubbo查询
 //                circulate.getDriverId() ;
 //                carDataVo.setDriverName();
@@ -169,9 +169,9 @@ public class ConsignOrderService {
 //                carDataVo.getLoadAmount();
                 carDataVo.setTruckNo(circulate.getTruckNo());
                 carDataVo.setWOrderNo(waybillOrder.getWOrderNo());
-                carDataVos.add(carDataVo);
+                carDataVOS.add(carDataVo);
             }
         }
-        return HttpResult.ok(carDataVos);
+        return HttpResult.ok(carDataVOS);
     }
 }

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

@@ -9,7 +9,6 @@ import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.DateUtil;
 import com.sckw.mongo.enums.BusinessTypeEnum;
 import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.stream.model.SckwBusSum;
@@ -107,7 +106,7 @@ public class LogisticsConsignmentService {
         insertLogisticsOrderUnit(bo, waybillNo, orderId);
         insertLogisticsOrderAddress(bo, waybillNo, orderId);
         insertLogisticsOrderTrack(bo, waybillNo, orderId);
-        sendMongoDB(waybillNo, orderId, bo,tradeOrder);
+        sendMongoDB(waybillNo, orderId, bo, tradeOrder);
 
     }
 
@@ -278,6 +277,7 @@ public class LogisticsConsignmentService {
         KwtLogisticsOrderGoods kwtLogisticsOrderGoods = new KwtLogisticsOrderGoods();
         kwtLogisticsOrderGoods.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwtLogisticsOrderGoods.setGoodsId(Long.parseLong(bo.getGoodsId()));
+        kwtLogisticsOrderGoods.setGoodsName(bo.getGoodsName());
         kwtLogisticsOrderGoods.setSkuId(StringUtils.isBlank(bo.getSkuId()) ? null : Long.parseLong(bo.getSkuId()));
         kwtLogisticsOrderGoods.setLOrderId(orderId);
         kwtLogisticsOrderGoods.setLOrderNo(waybillNo);
@@ -320,8 +320,8 @@ public class LogisticsConsignmentService {
         order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictEnum.PRICE_TYPE_0.getType(), bo.getGoodsPriceUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictEnum.PRICE_TYPE_0.getType(), bo.getGoodsPriceUnit()).getValue());
         order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
-        order.setStartTime(DateUtil.LocalDateTimeToDate(tradeOrder.getStartTime()));
-        order.setEntTime(DateUtil.LocalDateTimeToDate(tradeOrder.getEndTime()));
+        order.setStartTime(bo.getShipmentsDateTime());
+        order.setEntTime(bo.getReceiveGoodsDateTime());
         order.setRemark(bo.getRemark());
         order.setPayment(tradeOrder.getTrading());
         order.setTaxRate(new BigDecimal(bo.getTaxRate()));
@@ -351,7 +351,7 @@ public class LogisticsConsignmentService {
     }
 
     /**
-     * 物流订单-装修货地址
+     * 物流订单-装卸货地址
      *
      * @param bo
      * @param waybillNo

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

@@ -1,7 +1,19 @@
 package com.sckw.transport.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.utils.StringUtils;
+import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.excel.utils.DateUtil;
+import com.sckw.transport.dao.*;
+import com.sckw.transport.model.*;
+import com.sckw.transport.model.dto.DocumentParamDTO;
+import com.sckw.transport.model.vo.OrderDetailVO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,8 +25,33 @@ import org.springframework.stereotype.Service;
 @Service
 public class TransportCommonService {
 
+    @Autowired
+    public KwoTradeOrderMapper tradeOrderMapper;
+
+    @Autowired
+    public KwtLogisticsOrderGoodsMapper logisticsOrderGoodsMapper;
+
+    @Autowired
+    public KwtLogisticsOrderContractMapper logisticsOrderContractMapper;
+
+    @Autowired
+    public KwtLogisticsOrderMapper logisticsOrderMapper;
+
+    @Autowired
+    public KwoTradeOrderAddressMapper tradeOrderAddressMapper;
+
+    @Autowired
+    public KwtLogisticsOrderAddressMapper logisticsOrderAddressMapper;
+
+    @Autowired
+    public KwtLogisticsOrderTrackMapper logisticsOrderTrackMapper;
+
+    @Autowired
+    public KwtLogisticsOrderUnitMapper logisticsOrderUnitMapper;
+
     /**
      * 获取托运企业名称
+     *
      * @param param
      * @return
      */
@@ -24,6 +61,7 @@ public class TransportCommonService {
 
     /**
      * 获取车牌号
+     *
      * @param param
      * @return
      */
@@ -33,6 +71,7 @@ public class TransportCommonService {
 
     /**
      * 获取联系人
+     *
      * @param param
      * @return
      */
@@ -42,6 +81,7 @@ public class TransportCommonService {
 
     /**
      * 获取司机
+     *
      * @param param
      * @return
      */
@@ -49,4 +89,89 @@ public class TransportCommonService {
         return HttpResult.ok();
     }
 
+    public HttpResult getOrderDetail(DocumentParamDTO dto) {
+        HttpResult httpResult = new HttpResult();
+        httpResult.setCode(HttpStatus.SUCCESS_CODE);
+        if (String.valueOf(NumberConstant.FOUR).equals(dto.getDocumentType())) {
+            //托运订单
+            OrderDetailVO orderDetailVO = getOrderData(dto);
+            httpResult.setData(orderDetailVO);
+        } else if (String.valueOf(NumberConstant.THREE).equals(dto.getDocumentType())) {
+            //承运订单
+            OrderDetailVO orderDetailVO = getOrderData(dto);
+            httpResult.setData(orderDetailVO);
+        } else {
+            httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
+            httpResult.setMsg("单据类型错误");
+        }
+        return httpResult;
+    }
+
+    private OrderDetailVO getOrderData(DocumentParamDTO dto) {
+        KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
+                .eq(KwtLogisticsOrder::getId, dto.getId())
+                .eq(StringUtils.isNotBlank(dto.getDocumentNo()), KwtLogisticsOrder::getLOrderNo, dto.getDocumentNo())
+                .eq(KwtLogisticsOrder::getEntId, LoginUserHolder.getEntId()));
+        if (logisticsOrder == null) {
+            log.info("查无单据:{}", JSONObject.toJSONString(dto));
+            throw new RuntimeException("查无单据");
+
+        }
+        KwtLogisticsOrderContract contract = logisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
+                .eq(StringUtils.isNotBlank(dto.getId()), KwtLogisticsOrderContract::getLOrderId, dto.getId()));
+        KwtLogisticsOrderUnit unitOne = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
+                .eq(StringUtils.isNotBlank(dto.getId()), KwtLogisticsOrderUnit::getLOrderId, dto.getId())
+                .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.ONE));
+//                .eq(KwtLogisticsOrderUnit::getEntId, logisticsOrder.getEntId()));
+        KwtLogisticsOrderUnit unitTwo = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
+                .eq(StringUtils.isNotBlank(dto.getId()), KwtLogisticsOrderUnit::getLOrderId, dto.getId())
+                .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
+//                .eq(KwtLogisticsOrderUnit::getEntId, logisticsOrder.getEntId()));
+        KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                .eq(StringUtils.isNotBlank(dto.getId()), KwtLogisticsOrderAddress::getLOrderId, dto.getId())
+                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE));
+        KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                .eq(StringUtils.isNotBlank(dto.getId()), KwtLogisticsOrderAddress::getLOrderId, dto.getId())
+                .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO));
+        KwtLogisticsOrderGoods orderGoods = logisticsOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderGoods>()
+                .eq(StringUtils.isNotBlank(logisticsOrder.getId()), KwtLogisticsOrderGoods::getLOrderId, logisticsOrder.getId()));
+        OrderDetailVO orderDetailVO = new OrderDetailVO();
+        orderDetailVO.setId(String.valueOf(logisticsOrder.getId()));
+        if (contract != null) {
+            orderDetailVO.setContractId(contract.getContractId() == null ? null : String.valueOf(contract.getContractId()));
+            //todo 接口调用合同服务查询合同信息
+//            orderDetailVO.setContractName(contract.getContractId() == null ? null : String.valueOf(contract.getContractId()));
+//            orderDetailVO.setContractNo(contract.getContractId() == null ? null : String.valueOf(contract.getContractId()));
+        }
+        if (unitOne != null) {
+            orderDetailVO.setConsignCompany(unitOne.getFirmName());
+            orderDetailVO.setConsignContacts(unitOne.getContacts());
+            orderDetailVO.setConsignPhone(unitOne.getPhone());
+            orderDetailVO.setCollectionCompany(unitOne.getFirmName());
+        }
+        if (unitTwo != null) {
+            orderDetailVO.setCarrierCompany(unitTwo.getFirmName());
+            orderDetailVO.setCarrierContacts(unitTwo.getContacts());
+            orderDetailVO.setCarrierPhone(unitTwo.getPhone());
+        }
+        orderDetailVO.setGoodsName(orderGoods == null ? null : orderGoods.getGoodsName());
+        orderDetailVO.setNumber(logisticsOrder.getAmount() == null ? null : String.valueOf(logisticsOrder.getAmount()));
+        orderDetailVO.setPrice(logisticsOrder.getPrice() == null ? null : String.valueOf(logisticsOrder.getPrice()));
+        orderDetailVO.setLoss(logisticsOrder.getLoss() == null ? null : String.valueOf(logisticsOrder.getLoss()));
+        orderDetailVO.setDeduct(logisticsOrder.getGoodsPrice() == null ? null : String.valueOf(logisticsOrder.getGoodsPrice()));
+        orderDetailVO.setLoadAddress(loadOrderAddress.getName());
+        orderDetailVO.setLoadContacts(loadOrderAddress.getContacts());
+        orderDetailVO.setLoadPhone(loadOrderAddress.getPhone());
+        orderDetailVO.setLoadAddressDetail(loadOrderAddress.getDetailAddress());
+        orderDetailVO.setUnloadAddress(unloadOrderAddress.getName());
+        orderDetailVO.setUnloadContacts(unloadOrderAddress.getContacts());
+        orderDetailVO.setUnloadPhone(unloadOrderAddress.getPhone());
+        orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getDetailAddress());
+        orderDetailVO.setSettlementCycle(logisticsOrder.getSettlementCycle() == null ? null : String.valueOf(logisticsOrder.getSettlementCycle()));
+        orderDetailVO.setBillingMode(logisticsOrder.getBillingMode());
+        orderDetailVO.setScheduleStartTime(logisticsOrder.getStartTime() == null ? null : DateUtil.getDateTime(logisticsOrder.getStartTime()));
+        orderDetailVO.setScheduleEndTime(logisticsOrder.getEntTime() == null ? null : DateUtil.getDateTime(logisticsOrder.getEntTime()));
+        orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : String.valueOf(logisticsOrder.getLoadAmount()));
+        return orderDetailVO;
+    }
 }

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderGoodsMapper.xml

@@ -6,6 +6,7 @@
         <result column="l_order_id" jdbcType="BIGINT" property="lOrderId" />
         <result column="order_no" jdbcType="VARCHAR" property="lOrderNo" />
         <result column="goods_id" jdbcType="BIGINT" property="goodsId" />
+        <result column="goods_name" jdbcType="VARCHAR" property="goodsName" />
         <result column="sku_id" jdbcType="BIGINT" property="skuId" />
         <result column="remark" jdbcType="VARCHAR" property="remark" />
         <result column="status" jdbcType="INTEGER" property="status" />
@@ -17,7 +18,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         id, l_order_id, l_order_no, goods_id, sku_id, remark, `status`, create_by, create_time,
-    update_by, update_time, del_flag
+    update_by, update_time, del_flag,goods_name
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select