Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/ListToPageDataUntil.java

@@ -0,0 +1,87 @@
+package com.sckw.core.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author lfdc
+ * @description List分页工具类
+ * @date 2023-08-03 18:08:07
+ */
+public class ListToPageDataUntil {
+    /**
+     * 数据集合的分页方法，根据传入总共的数据跟页码，返回页码所需要显示多少条的数据
+     * <BR/>采用泛型的方法，即为，list中为什么类型的数据就返回什么类型的数据
+     *
+     * @param List 带有需要进行分页的数据集合
+     * @param page 第几页
+     * @param rows 显示多少条数据
+     * @return 进过分页之后返回的数据
+     */
+    public static <T> PageData<T> getListToPageData(Integer page, Integer rows, List<T> List) {
+        PageData<T> data = new PageData<>();
+        List<T> datepaging = datepaging(List, page, rows);
+        //第几页，1开始
+        data.setPage(page);
+        //每页显示的条数
+        data.setPageSize(rows);
+        //总页数
+        int size = List.size();
+        int totalPage = size / rows;
+        data.setPages(totalPage);
+        //总条数
+        data.setSize(size);
+        //每页的内容
+        data.setList(datepaging);
+        return data;
+    }
+
+    /**
+     * 数据集合的分页方法，根据传入总共的数据跟页码，返回页码所需要显示多少条的数据
+     * <BR/>采用泛型的方法，即为，list中为什么类型的数据就返回什么类型的数据
+     *
+     * @param list 带有需要进行分页的数据集合
+     * @param page 第几页
+     * @param rows 显示多少条数据
+     * @return 进过分页之后返回的数据
+     */
+    private static <T> List<T> datepaging(List<T> list, Integer page, Integer rows) {
+        /*
+         * 经过测试发现当page为0或者小于时，也就是第0页时，程序会报错，所以需要处理一下page的值
+         * 先进行空值的判断，避免程序出现null异常
+         * 当page的值小于等于0时，我们让它的值为1
+         */
+        //参数的校验 当传入过来的list集合为null时，先进行实例化
+        if (list == null) {
+            list = new ArrayList<T>();
+        }
+        //当传入过来的page为null时，先进行赋值操作
+        if ((Object) page == null) {
+            page = 1;
+        }
+        //当传入过来的rows为null时，先进行赋值操作
+        if ((Object) rows == null) {
+            rows = 1;
+        }
+        if (page <= 0) {
+            page = 1;
+        }
+        //记录一下数据一共有多少条
+        int totalitems = list.size();
+        //实例化一个接受分页处理之后的数据
+        List<T> afterList = new ArrayList<T>();
+        /*
+         * 进行分页处理,采用for循环的方式来进行处理
+         * 首先for循环中，i应该从哪里开始:i应该从 (当前是第几页 -1 乘以 条数) 开始
+         * 然后for循环应该到哪里结束，也就是i应该小于:判断(开始的索引+显示条数)是不是大于总条数，如果大于就是总条数，如果小于就是(开始的索引+显示条数)
+         * 然后让i++
+         */
+        for (int i = (page - 1) * rows; i < (((page - 1) * rows) + rows > totalitems ? totalitems : ((page - 1) * rows) + rows); i++) {
+            //然后将数据存入afterList中
+            afterList.add(list.get(i));
+        }
+        //然后将处理后的数据集合进行返回
+        return afterList;
+    }
+
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/PageData.java

@@ -0,0 +1,59 @@
+package com.sckw.core.utils;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lfdc
+ * @description
+ * @date 2023-08-03 18:08:09
+ */
+@Data
+public class PageData<T> {
+
+    /**
+     * 当前页
+     */
+    private int page;
+    /**
+     * 当前页的数量
+     */
+    private int pageSize;
+    /**
+     * 总条数
+     */
+    private int size;
+
+    /**
+     * 由于startRow和endRow不常用，这里说个具体的用法
+     * 可以在页面中"显示startRow到endRow 共size条数据"
+     * 当前页面第一个元素在数据库中的行号
+     */
+    private long startRow;
+    /**
+     * 当前页面最后一个元素在数据库中的行号
+     */
+    private long endRow;
+    /**
+     * 总页数
+     */
+    private int pages;
+    /**
+     * 前一页
+     */
+    private int prePage;
+    /**
+     * 下一页
+     */
+    private int nextPage;
+    /**
+     * 展示数据
+     */
+    private List list;
+
+    /**
+     * 是否为第一页
+     */
+    private boolean isFirstPage = false;
+}

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwLogisticsOrder.java

@@ -399,7 +399,7 @@ public class SckwLogisticsOrder {
      * 创建时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -416,7 +416,7 @@ public class SckwLogisticsOrder {
      * 更新时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**
@@ -442,6 +442,7 @@ public class SckwLogisticsOrder {
      * 计费方式
      */
     private String billingModeLabel;
+
     /**
      * 计划开始时间
      */
@@ -454,5 +455,4 @@ public class SckwLogisticsOrder {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
-
 }

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwWaybillOrder.java

@@ -1,11 +1,13 @@
 package com.sckw.mongo.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.math.BigDecimal;
 import java.util.Date;

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/TransportDubboService.java

@@ -2,9 +2,9 @@ package com.sckw.transport.api.dubbo;
 
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.api.model.dto.AddressResDTO;
-import com.sckw.transport.api.model.dto.vo.KwtLogisticsOrderVO;
-import com.sckw.transport.api.model.dto.vo.LogisticsOrderVO;
 import com.sckw.transport.api.model.param.LogisticsOrderParam;
+import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
+import com.sckw.transport.api.model.vo.LogisticsOrderVO;
 
 import java.util.List;
 import java.util.Map;

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/vo/LogisticsOrderDTO.java → sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/LogisticsOrderDTO.java

@@ -1,4 +1,4 @@
-package com.sckw.transport.api.model.dto.vo;
+package com.sckw.transport.api.model.dto;
 
 import lombok.Data;
 

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/vo/KwtLogisticsOrderVO.java → sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/vo/KwtLogisticsOrderVO.java

@@ -1,4 +1,4 @@
-package com.sckw.transport.api.model.dto.vo;
+package com.sckw.transport.api.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/vo/LogisticsOrderVO.java → sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/vo/LogisticsOrderVO.java

@@ -1,4 +1,4 @@
-package com.sckw.transport.api.model.dto.vo;
+package com.sckw.transport.api.model.vo;
 
 import lombok.Data;
 

sckw-modules/sckw-order/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_zk
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_zk
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/LedgerLogisticsDetailVo.java

@@ -1,7 +1,7 @@
 package com.sckw.payment.model.vo.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sckw.transport.api.model.dto.vo.LogisticsOrderVO;
+import com.sckw.transport.api.model.vo.LogisticsOrderVO;
 import lombok.Getter;
 import lombok.Setter;
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -29,8 +29,8 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.api.dubbo.TransportDubboService;
-import com.sckw.transport.api.model.dto.vo.KwtLogisticsOrderVO;
-import com.sckw.transport.api.model.dto.vo.LogisticsOrderVO;
+import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
+import com.sckw.transport.api.model.vo.LogisticsOrderVO;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

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

@@ -23,7 +23,7 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.api.dubbo.TransportDubboService;
-import com.sckw.transport.api.model.dto.vo.KwtLogisticsOrderVO;
+import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -428,12 +428,12 @@ public class KwTransportService {
         // 创建条件对象
         Criteria criteria = new Criteria();
         // 1. 全等于
-        criteria.and("entId").is(LoginUserHolder.getEntId());
-        criteria.and("_id").is(lOrderId);
-        criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
+//        criteria.and("entId").is(LoginUserHolder.getEntId());
+//        criteria.and("_id").is(lOrderId);
+//        criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         Query query1 = new Query(criteria);
         //多条件模糊查询
-        Criteria c1 = new Criteria().and("entId").is(LoginUserHolder.getEntId());
+        Criteria c1 = new Criteria().and("carrierEntId").is(LoginUserHolder.getEntId());
         Criteria c2 = new Criteria().and("_id").is(lOrderId);
         Criteria c3 = new Criteria().and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         criteria.orOperator(c1, c2, c3);
@@ -464,16 +464,16 @@ public class KwTransportService {
     public HttpResult getLogisticsOrderByContractId(ContractParam contractParam) {
         HttpResult result = new HttpResult();
         if (String.valueOf(NumberConstant.ONE).equals(contractParam.getContractType())) {
-            result = getLogisticsOrderContract(contractParam);
+            result = getLogisticsOrderContract(contractParam,"1");
         } else if (String.valueOf(NumberConstant.ONE).equals(contractParam.getContractType())) {
-            result = getLogisticsOrderContract(contractParam);
+            result = getLogisticsOrderContract(contractParam,"2");
         } else {
             return HttpResult.error("合同类型错误");
         }
         return result;
     }
 
-    private HttpResult getLogisticsOrderContract(ContractParam contractParam) {
+    private HttpResult getLogisticsOrderContract(ContractParam contractParam,String unitType) {
         String contractIds = contractParam.getContractIds();
         int page = contractParam.getPage();
         int pageSize = contractParam.getPageSize();
@@ -482,6 +482,12 @@ public class KwTransportService {
         //设置模糊查询匹配规则  忽略大小写
         // 创建条件对象
         Criteria criteria = new Criteria();
+        //判断承运还是托运企业
+        if (unitType.equals(NumberConstant.ONE)) {
+            criteria.and("checkEntId").is(LoginUserHolder.getEntId());
+        } else {
+            criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
+        }
         List<String> stringList = StringUtils.splitStrToList(contractIds, String.class);
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         Query query1 = new Query(criteria);
@@ -500,7 +506,7 @@ public class KwTransportService {
         // 12. 总记录数
         long total = mongoTemplate.count(query1, SckwLogisticsOrder.class);
         // 10. 分页
-        query1.with(PageRequest.of(page - 1, pageSize, Sort.by(Sort.Order.desc("createTime"))));
+        query1.with(PageRequest.of(page - 1, pageSize, Sort.by(Sort.Direction.DESC,"contractId","createTime")));
         // 执行查询
         List<SckwLogisticsOrder> list = mongoTemplate.find(query1, SckwLogisticsOrder.class);
         //字典等数据转换

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

@@ -30,11 +30,6 @@ public class CarWaybillVo implements Serializable {
     @JsonProperty(value="wOrderNo")
     private String wOrderNo;
 
-    /**
-     * 承运车队
-     */
-    private String firmName;
-
     /**
      * 车辆牌照
      */
@@ -60,6 +55,12 @@ public class CarWaybillVo implements Serializable {
      */
     private String  status;
 
+    /**
+     * 承运车队
+     */
+    private String firmName;
+
+
     /**
      * 派车时间
      */

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

@@ -104,6 +104,17 @@ public class KwtWaybillOrderController {
         return waybillOrderService.changeTruck(params);
     }
 
+    /**
+     * @param wOrderId
+     * @desc 变更车辆/司机查询
+     * @author zk
+     * @date 2023/8/2
+     **/
+    @GetMapping("/changeWaybillOrder")
+    public HttpResult changeWaybillOrder(@RequestParam("wOrderId") Long wOrderId){
+        return waybillOrderService.changeWaybillOrder(wOrderId);
+    }
+
     /**
      * 承运订单-更换司机
      * @param dto

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -2,8 +2,8 @@ package com.sckw.transport.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.transport.api.model.dto.AddressResDTO;
-import com.sckw.transport.api.model.dto.vo.LogisticsOrderDTO;
-import com.sckw.transport.api.model.dto.vo.LogisticsOrderVO;
+import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
+import com.sckw.transport.api.model.vo.LogisticsOrderVO;
 import com.sckw.transport.model.KwtLogisticsOrder;
 import com.sckw.transport.model.param.DriverParam;
 import com.sckw.transport.model.param.LogisticsOrderParam;

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

@@ -1,17 +1,13 @@
 package com.sckw.transport.model;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.sckw.core.model.base.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-
 /**
  * @author lfdc
  * @description 物流订单-循环派车车辆信息
@@ -20,7 +16,13 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class KwtLogisticsOrderCirculate extends BaseModel {
+public class KwtLogisticsOrderCirculate implements Serializable {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
 
     /**
      * 企业id
@@ -85,4 +87,42 @@ public class KwtLogisticsOrderCirculate extends BaseModel {
      */
     private BigDecimal entrustAmount;
 
+    /**
+     * 用户状态（0有效、1无效）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    @TableLogic("0")
+    private Integer delFlag;
+
+    private static final long serialVersionUID = 1L;
+
 }

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

@@ -1,8 +1,9 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.sckw.core.model.base.BaseModel;
 import lombok.Data;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -13,7 +14,12 @@ import java.util.Date;
  */
 @Data
 @TableName("kwt_waybill_order")
-public class KwtWaybillOrder extends BaseModel {
+public class KwtWaybillOrder implements Serializable {
+
+    /**
+     * 主键
+     */
+    private Long id;
 
     /**
      * 企业id
@@ -99,4 +105,42 @@ public class KwtWaybillOrder extends BaseModel {
      * 计划结束时间
      */
     private Date endTime;
+
+    /**
+     * 用户状态（待受理、待运输、运输中、已完成、已取消）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    @TableLogic("0")
+    private Integer delFlag;
+
+    private static final long serialVersionUID = 1L;
 }

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

@@ -2,9 +2,7 @@ package com.sckw.transport.model;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.sckw.core.model.base.BaseModel;
 import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,7 +13,12 @@ import java.util.Date;
  */
 @Data
 @TableName("kwt_waybill_order_address")
-public class KwtWaybillOrderAddress extends BaseModel {
+public class KwtWaybillOrderAddress implements Serializable {
+
+    /**
+     * 主键
+     */
+    private Long id;
 
     /**
      * 物流订单id
@@ -82,4 +85,41 @@ public class KwtWaybillOrderAddress extends BaseModel {
      */
     private Integer entryType;
 
+    /**
+     * 用户状态（0有效、1无效）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    @TableLogic("0")
+    private Integer delFlag;
+
+    private static final long serialVersionUID = 1L;
 }

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

@@ -1,8 +1,9 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.sckw.core.model.base.BaseModel;
 import lombok.Data;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -13,7 +14,12 @@ import java.util.Date;
  */
 @Data
 @TableName("kwt_waybill_order_ticket")
-public class KwtWaybillOrderTicket extends BaseModel {
+public class KwtWaybillOrderTicket implements Serializable {
+
+    /**
+     * 主键
+     */
+    private Long id;
 
     /**
      * 车辆运单id
@@ -50,4 +56,41 @@ public class KwtWaybillOrderTicket extends BaseModel {
      */
     private Date operateTime;
 
+    /**
+     * 用户状态（0有效、1无效）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    @TableLogic("0")
+    private Integer delFlag;
+
+    private static final long serialVersionUID = 1L;
 }

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

@@ -33,24 +33,24 @@ public class OperateSendCarDto {
 
     /**
      * 物流订单ID
-     */
+
     @JsonProperty("lOrderId")
     @NotNull(message = "物流订单ID不能为空")
-    private Long lOrderId;
+    private Long lOrderId;*/
 
     /**
      * 司机id
-     */
+
     @JsonProperty("driverId")
     @NotNull(message = "司机信息ID不能为空")
-    private Long driverId;
+    private Long driverId;*/
 
     /**
      * 车牌号
-     */
+
     @JsonProperty("truckId")
     @NotNull(message = "车辆信息ID不能为空")
-    private Long truckId;
+    private Long truckId;*/
 
     /**
      * 备注
@@ -61,7 +61,7 @@ public class OperateSendCarDto {
     /**
      * 操作时间
      */
-    @JsonProperty("time")
+    @JsonProperty("operateTime")
     @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "时间不能为空")

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

@@ -31,7 +31,7 @@ public class WaybillOrderTicketDto {
      * 磅单类型（1装货单/2卸货单）
      */
     @JsonProperty("type")
-    @NotNull(message = "磅单类型不能为空")
+    //@NotNull(message = "磅单类型不能为空")
     private Integer type;
 
     /**

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

@@ -2,7 +2,6 @@ package com.sckw.transport.model.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.stringtemplate.v4.ST;
 
 /**
  * @author JC
@@ -38,7 +37,7 @@ public class WaybillCarVO {
      */
     private String driverPhone;
     /**
-     * 挂车排
+     * 挂车牌
      */
     private String trailerNo;
 }

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

@@ -203,7 +203,7 @@ public class AcceptCarriageOrderService {
         } else if (NumberConstant.ZERO == status) {
             orderStatus = LogisticsOrderEnum.PENDING_ORDER.getCode();
         } else {
-            log.info("承运订单-分包托运 承运订单id:{}," +
+            log.info("承运订单-分包托运物流托运 承运订单id:{}," +
                             "承运订单编号:{},合同id:{},合同信息:{}",
                     bo.getLOrderId(), bo.getLOrderNo(),
                     bo.getContractId(), JSONObject.toJSONString(infoResDto));

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

@@ -17,7 +17,6 @@ import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.CompleteLogisticsOrderParam;
-import com.sckw.order.api.model.OrderDetailRes;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
@@ -34,6 +33,7 @@ import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
@@ -137,6 +137,53 @@ public class KwtWaybillOrderService {
         return waybillOrders;
     }
 
+    /**
+     * @param wOrderId
+     * @desc 变更车辆/司机查询
+     * @author zk
+     * @date 2023/8/2
+     **/
+    public HttpResult changeWaybillOrder(@RequestParam("wOrderId") Long wOrderId){
+        //车辆运单信息
+        KwtWaybillOrder waybillOrder = waybillOrderDao.selectById(wOrderId);
+        //循环派车信息
+        KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.selectById(wOrderId);
+        if (waybillOrder == null && circulate == null) {
+            return HttpResult.error("车辆运单不存在！");
+        }
+
+        Map<String, Object> result = new HashMap();
+        result.put("id", wOrderId);
+        result.put("wOrderId", wOrderId);
+        if (waybillOrder != null){
+            result.put("wOrderNo", waybillOrder.getWOrderNo());
+            result.put("status", waybillOrder.getStatus());
+            result.put("truckNo", waybillOrder.getTruckNo());
+            result.put("truckId", waybillOrder.getTruckId());
+
+            result.put("driverId", waybillOrder.getDriverId());
+            result.put("driverPhone", waybillOrder.getDriverPhone());
+            result.put("driverIdcard", waybillOrder.getDriverIdcard());
+            result.put("driverName", waybillOrder.getDriverName());
+        } else {
+            result.put("status", circulate.getStatus());
+            result.put("truckNo", circulate.getTruckNo());
+            result.put("truckId", circulate.getTruckId());
+            result.put("driverId", circulate.getDriverId());
+            result.put("driverPhone", circulate.getDriverPhone());
+            result.put("driverIdcard", circulate.getDriverIdcard());
+            result.put("driverName", circulate.getDriverName());
+        }
+
+        Object truckId = result.get("truckId");
+        if (truckId != null) {
+            RTruckVo truck = findTruck(Long.parseLong(String.valueOf(truckId)));
+            result.put("trailerNo", truck != null ? truck.getTrailerNo() : null);
+        }
+
+        return HttpResult.ok(result);
+    }
+
     /**
      * @param params
      * @desc 变更司机
@@ -917,8 +964,9 @@ public class KwtWaybillOrderService {
         /**循环派车**/
         if (params.getType() == Global.NUMERICAL_TWO) {
             /**1数据校验**/
-            KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(params.getLOrderId(),
-                    params.getTruckId(), params.getDriverId(), 0);
+            /*KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(params.getLOrderId(),
+                    params.getTruckId(), params.getDriverId(), 0);*/
+            KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.selectById(params.getWOrderId());
             if (circulate == null) {
                 return HttpResult.error("车辆循环运单不存在！");
             }
@@ -935,13 +983,13 @@ public class KwtWaybillOrderService {
 
             /**2获取基础信息**/
             //装货地址
-            KwtWaybillOrderAddress loadAddress = this.getAddress(params.getLOrderId(), Global.NUMERICAL_ONE);
+            KwtWaybillOrderAddress loadAddress = this.getAddress(circulate.getLOrderId(), Global.NUMERICAL_ONE);
             //卸货地址
-            KwtWaybillOrderAddress unloadAddress = this.getAddress(params.getLOrderId(), Global.NUMERICAL_TWO);
+            KwtWaybillOrderAddress unloadAddress = this.getAddress(circulate.getLOrderId(), Global.NUMERICAL_TWO);
             //KwtWaybillOrder数据组装
             KwtWaybillOrder waybillOrder = new KwtWaybillOrder();
             waybillOrder.setEntId(LoginUserHolder.getEntId());
-            waybillOrder.setLOrderId(params.getLOrderId());
+            waybillOrder.setLOrderId(circulate.getLOrderId());
             waybillOrder.setWOrderNo("xxxxxx");
             waybillOrder.setType(params.getType());
             waybillOrder.setStartTime(circulate.getStartTime());
@@ -1055,8 +1103,9 @@ public class KwtWaybillOrderService {
         /**循环派车**/
         if (params.getType() == Global.NUMERICAL_TWO) {
             /**1数据校验**/
-            KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(params.getLOrderId(),
-                    params.getTruckId(), params.getDriverId(), 0);
+            /*KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(params.getLOrderId(),
+                    params.getTruckId(), params.getDriverId(), 0);*/
+            KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.selectById(params.getWOrderId());
             if (circulate == null) {
                 return HttpResult.error("车辆循环运单不存在！");
             }
@@ -1719,6 +1768,16 @@ public class KwtWaybillOrderService {
         remoteFleetService.updateById(truck);
     }
 
+    /**
+     * @param truckId 车辆档案ID
+     * @desc 车辆信息
+     * @author zk
+     * @date 2023/8/3
+     **/
+    public RTruckVo findTruck(Long truckId) {
+        return remoteFleetService.findTruck(truckId);
+    }
+
     /** 当前物流订单是全量下游则只能全量可运、否则可委托量或全量
         校验上游是否全量，并获取全量跟节点物流订单或贸易订单(可委派量)
      1、派车、循环派车接单需校验贸易订单/物流订单是否委派完成；

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

@@ -1171,7 +1171,7 @@ public class LogisticsConsignmentService {
 //                        }
 //                    }
 //                }
-//                lllll(list);
+//                recursionLogisticsOrder(list);
 //            }
 ////
 ////            List<Long> collect = kwtLogisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.service;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,21 +15,25 @@ 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.mongo.enums.BusinessTypeEnum;
+import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
-import com.sckw.order.api.model.OrderDetailRes;
-import com.sckw.order.api.model.UpdateOrderAmountParam;
+import com.sckw.order.api.model.CreateOrCancelLogisticsOrderParam;
+import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
-import com.sckw.transport.api.model.dto.vo.LogisticsOrderDTO;
+import com.sckw.transport.api.model.dto.LogisticsOrderDTO;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.CancelOrderDTO;
 import com.sckw.transport.model.dto.DocumentParamDTO;
 import com.sckw.transport.model.param.LogisticsOrderParam;
 import com.sckw.transport.model.vo.OrderDetailVO;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -78,6 +83,9 @@ public class TransportCommonService {
     @Autowired
     public KwtWaybillOrderMapper waybillOrderMapper;
 
+    @Resource
+    private StreamBridge streamBridge;
+
     /**
      * 查看订单详情
      *
@@ -218,20 +226,35 @@ public class TransportCommonService {
             /**并不存在分包，撤销数据回归到贸易订单，[待接单状态]下才能撤销托运*/
             /**调用dubbo 修改数值*/
             Long tOrderId = logisticsOrder.getTOrderId();
-            OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(tOrderId);
-            UpdateOrderAmountParam param = new UpdateOrderAmountParam();
+            CreateOrCancelLogisticsOrderParam param = new CreateOrCancelLogisticsOrderParam();
+            param.setEntrustAmount(logisticsOrder.getAmount().negate());
+            param.setUpdateBy(LoginUserHolder.getUserId());
+            param.setUpdateByName(LoginUserHolder.getUserName());
             param.setTOrderId(tOrderId);
-            param.setActualAmount(orderDetailRes.getActualAmount().add(logisticsOrder.getLoadAmount()));
-            param.setEntrustAmount(orderDetailRes.getEntrustAmount().add(logisticsOrder.getEntrustAmount().subtract(logisticsOrder.getLoadAmount())));
-            tradeOrderInfoService.updateOrderAmount(param);
-            logisticsOrder.setDelFlag(1);
-            logisticsOrder.setUpdateTime(new Date());
-            logisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
+            HttpResult httpResult = tradeOrderInfoService.createOrCancelLogisticsOrder(param);
+            if (HttpStatus.SUCCESS_CODE != httpResult.getCode()) {
+                log.info("撤销托运错误:,请求参数:{},响应信息:{}",JSONObject.toJSONString(param),JSONObject.toJSONString(httpResult));
+            }
             logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
                     .eq(KwtLogisticsOrder::getId, logisticsOrder.getId())
-                    .set(KwtLogisticsOrder::getDelFlag, NumberConstant.ONE)
+                    .set(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.CANCEL_ORDER.getCode())
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
                     .set(KwtLogisticsOrder::getUpdateTime, new Date()));
+            //mongodb更新
+            SckwLogisticsOrder order = new SckwLogisticsOrder();
+            order.set_id(logisticsOrder.getId());
+            order.setLOrderId(logisticsOrder.getId());
+            order.setStatus(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
+            order.setUpdateTime(new Date());
+            order.setUpdateByName(LoginUserHolder.getUserName());
+            SckwBusSum busSum = new SckwBusSum();
+            //业务汇总类型
+            busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
+            //操作对象（1新增/2修改）
+            busSum.setMethod(NumberConstant.TWO);
+            //业务汇总数据对象
+            busSum.setObject(order);
+            streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
         } else {
             /**即代表存在分包,当次是属于被分包.需要将数据回归到上游数据。*/
             Long pid = logisticsOrder.getPid();
@@ -241,9 +264,9 @@ public class TransportCommonService {
             //上游分配量
             BigDecimal amount = logisticsOrder.getAmount();
             //已经完成的量
-            BigDecimal unloadAmount = logisticsOrder.getUnloadAmount();
+            BigDecimal loadAmount = logisticsOrder.getLoadAmount();
             //未完成的量
-            BigDecimal subtract = amount.subtract(unloadAmount);
+            BigDecimal subtract = amount.subtract(loadAmount);
             //.setScale(2,BigDecimal.ROUND_HALF_DOWN)
             BigDecimal add = order.getSubcontractAmount().add(subtract);
             logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
@@ -255,9 +278,38 @@ public class TransportCommonService {
             /**下游订单进行删除*/
             logisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()
                     .eq(KwtLogisticsOrder::getId, logisticsOrder.getId())
-                    .set(KwtLogisticsOrder::getDelFlag, NumberConstant.ONE)
+                    .set(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.CANCEL_ORDER.getCode())
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
                     .set(KwtLogisticsOrder::getUpdateTime, new Date()));
+            /**mongodb更新*/
+            SckwLogisticsOrder sckwLogisticsOrder = new SckwLogisticsOrder();
+            sckwLogisticsOrder.set_id(logisticsOrder.getId());
+            sckwLogisticsOrder.setLOrderId(logisticsOrder.getId());
+            sckwLogisticsOrder.setStatus(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
+            sckwLogisticsOrder.setUpdateTime(new Date());
+            sckwLogisticsOrder.setUpdateByName(LoginUserHolder.getUserName());
+            SckwBusSum busSum = new SckwBusSum();
+            //业务汇总类型
+            busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
+            //操作对象（1新增/2修改）
+            busSum.setMethod(NumberConstant.TWO);
+            //业务汇总数据对象
+            busSum.setObject(sckwLogisticsOrder);
+            streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
+            SckwLogisticsOrder logisticsOrder1 = new SckwLogisticsOrder();
+            logisticsOrder1.set_id(logisticsOrder.getId());
+            logisticsOrder1.setLOrderId(logisticsOrder.getId());
+            logisticsOrder1.setStatus(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
+            logisticsOrder1.setUpdateTime(new Date());
+            logisticsOrder1.setUpdateByName(LoginUserHolder.getUserName());
+            SckwBusSum busSum1 = new SckwBusSum();
+            //业务汇总类型
+            busSum1.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
+            //操作对象（1新增/2修改）
+            busSum1.setMethod(NumberConstant.TWO);
+            //业务汇总数据对象
+            busSum1.setObject(logisticsOrder);
+            streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
         }
         return result;
     }

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

@@ -13,7 +13,6 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.fleet.api.RemoteFleetService;
-import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TableTops;
 import com.sckw.system.api.RemoteSystemService;
@@ -93,11 +92,15 @@ public class WaybillManagementService {
         WaybillCarVO waybillCarVO = new WaybillCarVO();
         if(!ObjectUtils.isEmpty(info)) {
             // 基础信息
+            wayBillDetailDTO.setTruckId(info.getTruckId());
+            wayBillDetailDTO.setTruckNo(info.getTruckNo());
             wayBillDetailDTO.setDriverId(info.getDriverId());
             wayBillDetailDTO.setDriverName(info.getDriverName());
             wayBillDetailDTO.setDriverPhone(info.getDriverPhone());
             wayBillDetailDTO.setDriverId(info.getDriverId());
+            wayBillDetailDTO.setWOrderId(info.getWOrderId());
             wayBillDetailDTO.setWOrderNo(info.getWOrderNo());
+            wayBillDetailDTO.setLOrderId(info.getLOrderId());
             wayBillDetailDTO.setLOrderNo(info.getLOrderNo());
             wayBillDetailDTO.setEntrustAmount(String.valueOf(info.getEntrustAmount()));
             wayBillDetailDTO.setType(String.valueOf(info.getType()));
@@ -121,9 +124,12 @@ public class WaybillManagementService {
             if(!ObjectUtils.isEmpty(truckTypeString)) {
                 waybillCarVO.setType(truckTypeString.getLabel());
             }
+            waybillCarVO.setTruckId(String.valueOf(info.getTruckId()));
             waybillCarVO.setTruckNo(info.getTruckNo());
+            waybillCarVO.setType(info.getTruckType());
             waybillCarVO.setDriverName(info.getDriverName());
             waybillCarVO.setDriverPhone(info.getDriverPhone());
+            waybillCarVO.setDriverId(String.valueOf(info.getTruckId()));
             waybillCarVO.setTrailerNo(info.getTruckTrailerNo());
             // 票据
             waybillTicketVO.setLoadTime(DateUtil.getDateTime(info.getLoadTime()));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -14,9 +14,9 @@ import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.transport.api.dubbo.TransportDubboService;
 import com.sckw.transport.api.model.dto.AddressResDTO;
-import com.sckw.transport.api.model.dto.vo.KwtLogisticsOrderVO;
-import com.sckw.transport.api.model.dto.vo.LogisticsOrderVO;
 import com.sckw.transport.api.model.param.LogisticsOrderParam;
+import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
+import com.sckw.transport.api.model.vo.LogisticsOrderVO;
 import com.sckw.transport.dao.KwtLogisticsOrderGoodsMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderMapper;
 import com.sckw.transport.dao.KwtLogisticsOrderUnitMapper;

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

@@ -108,7 +108,7 @@
           AND b.del_flag = '0'
           AND a.t_order_id = #{id,jdbcType=VARCHAR}
     </select>
-    <select id="selectLogisticOrderData" resultType="com.sckw.transport.api.model.dto.vo.LogisticsOrderDTO">
+    <select id="selectLogisticOrderData" resultType="com.sckw.transport.api.model.dto.LogisticsOrderDTO">
         SELECT
         a.id as lOrderId,
         a.l_order_no as lOrderNO,
@@ -404,7 +404,7 @@
         GROUP BY b.truck_no
     </select>
 
-    <select id="selectLogisticOrderList" resultType="com.sckw.transport.api.model.dto.vo.LogisticsOrderVO">
+    <select id="selectLogisticOrderList" resultType="com.sckw.transport.api.model.vo.LogisticsOrderVO">
         SELECT
         a.id as lOrderId,
         a.l_order_no as lOrderNO,