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

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

@@ -152,153 +152,5 @@ public class AddLogisticOrderParam implements Serializable {
      */
     @NotBlank(message = "卸货详细地址不能为空")
     private String unLoadDetailAddress;
-    @Data
-    public static class LogisticInfo {
-        /**
-         * 合同id
-         */
-        @NotNull(message = "合同id不能为空")
-        private Long contractId;
 
-        /**
-         * 合同编号
-         */
-        @NotBlank(message = "合同编号不能为空")
-        private String contractNo;
-
-        /**
-         * 合同名称
-         */
-        @NotBlank(message = "合同名称不能为空")
-        private String contractName;
-        /**
-         * 承运单位ID
-         */
-        @NotBlank(message = "承运单位ID不能为空")
-        private Long acceptCompanyId;
-
-        /**
-         * 承运联系电话
-         */
-        @NotBlank(message = "承运联系电话不能为空")
-        private String acceptContactPhone;
-
-
-        /**
-         * 承运联系人
-         */
-        @NotBlank(message = "承运联系人id不能为空")
-        private String acceptContacts;
-
-        /**
-         * 承运联系人id
-         */
-        @NotBlank(message = "承运联系人id不能为空")
-        private Long acceptContactsId;
-
-        /**
-         * 承运单位
-         */
-        @NotBlank(message = "承运单位不能为空")
-        private String acceptCompany;
-        /**
-         * 运价
-         */
-        @NotNull(message = "运价不能为空")
-        private BigDecimal price;
-
-        /**
-         * 运价方式
-         */
-        @NotNull(message = "运价方式不能为空")
-        private Long priceType;
-
-
-        /**
-         * 计划卸货时间
-         */
-        @NotNull(message = "计划卸货时间不能为空")
-        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-        private LocalDate endTime;
-
-        /**
-         * 计划发货时间
-         */
-        @NotNull(message = "计划发货时间不能为空")
-        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-        private LocalDate startTime;
-
-
-
-        /**
-         * 卸货联系人
-         */
-        @NotBlank(message = "卸货联系人不能为空")
-        private String unloadContacts;
-
-        /**
-         * 卸货联系电话
-         */
-        @NotBlank(message = "卸货联系电话不能为空")
-        private String unloadPhone;
-
-        /**
-         * 卸货详细地址
-         */
-        @NotBlank(message = "卸货详细地址不能为空")
-        private String unloadDetailAddress;
-
-
-        /**
-         * 总量
-         */
-        @NotNull(message = "总量不能为空")
-
-        private BigDecimal amount;
-
-        /**
-         * 总量单位
-         */
-        @NotBlank(message = "总量单位不能为空")
-        private String amountUnit;
-
-        /**
-         * 合理损耗
-         */
-
-        private BigDecimal loss;
-        /**
-         * 支付方式
-         */
-        @NotNull(message = "支付方式不能为空")
-        private Long payment;
-
-
-        /**
-         * 签约方式
-         */
-        @NotNull(message = "签约方式不能为空")
-        private Integer signingWay;
-
-        /**
-         * 合理损耗单位
-         */
-        @NotBlank(message = "合理损耗单位不能为空")
-        private String lossUnit;
-        /**
-         * 计费方式
-         */
-        @NotNull(message = "计费方式不能为空")
-        private String billingMode;
-
-        /**
-         * 备注
-         */
-        private String remark;
-        /**
-         * 订单创建类型（1.贸易订单生成，2自建订单生成）
-         */
-        private Integer type;
-
-    }
 }

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

@@ -0,0 +1,163 @@
+package com.sckw.transport.api.model.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class LogisticInfo implements Serializable {
+        @Serial
+        private static final long serialVersionUID = 6392675032279000976L;
+        /**
+         * 合同id
+         */
+        @NotNull(message = "合同id不能为空")
+        private Long contractId;
+
+        /**
+         * 合同编号
+         */
+        @NotBlank(message = "合同编号不能为空")
+        private String contractNo;
+
+        /**
+         * 合同名称
+         */
+        @NotBlank(message = "合同名称不能为空")
+        private String contractName;
+        /**
+         * 承运单位ID
+         */
+        @NotBlank(message = "承运单位ID不能为空")
+        private Long acceptCompanyId;
+
+        /**
+         * 承运联系电话
+         */
+        @NotBlank(message = "承运联系电话不能为空")
+        private String acceptContactPhone;
+
+
+        /**
+         * 承运联系人
+         */
+        @NotBlank(message = "承运联系人id不能为空")
+        private String acceptContacts;
+
+        /**
+         * 承运联系人id
+         */
+        @NotBlank(message = "承运联系人id不能为空")
+        private Long acceptContactsId;
+
+        /**
+         * 承运单位
+         */
+        @NotBlank(message = "承运单位不能为空")
+        private String acceptCompany;
+        /**
+         * 运价
+         */
+        @NotNull(message = "运价不能为空")
+        private BigDecimal price;
+
+        /**
+         * 运价方式
+         */
+        @NotNull(message = "运价方式不能为空")
+        private Long priceType;
+
+
+        /**
+         * 计划卸货时间
+         */
+        @NotNull(message = "计划卸货时间不能为空")
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private LocalDate endTime;
+
+        /**
+         * 计划发货时间
+         */
+        @NotNull(message = "计划发货时间不能为空")
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private LocalDate startTime;
+
+
+
+        /**
+         * 卸货联系人
+         */
+        @NotBlank(message = "卸货联系人不能为空")
+        private String unloadContacts;
+
+        /**
+         * 卸货联系电话
+         */
+        @NotBlank(message = "卸货联系电话不能为空")
+        private String unloadPhone;
+
+        /**
+         * 卸货详细地址
+         */
+        @NotBlank(message = "卸货详细地址不能为空")
+        private String unloadDetailAddress;
+
+
+        /**
+         * 总量
+         */
+        @NotNull(message = "总量不能为空")
+
+        private BigDecimal amount;
+
+        /**
+         * 总量单位
+         */
+        @NotBlank(message = "总量单位不能为空")
+        private String amountUnit;
+
+        /**
+         * 合理损耗
+         */
+
+        private BigDecimal loss;
+        /**
+         * 支付方式
+         */
+        @NotNull(message = "支付方式不能为空")
+        private Long payment;
+
+
+        /**
+         * 签约方式
+         */
+        @NotNull(message = "签约方式不能为空")
+        private Integer signingWay;
+
+        /**
+         * 合理损耗单位
+         */
+        @NotBlank(message = "合理损耗单位不能为空")
+        private String lossUnit;
+        /**
+         * 计费方式
+         */
+        @NotNull(message = "计费方式不能为空")
+        private String billingMode;
+
+        /**
+         * 备注
+         */
+        private String remark;
+        /**
+         * 订单创建类型（1.贸易订单生成，2自建订单生成）
+         */
+        private Integer type;
+
+    }

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -64,6 +64,7 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.*;
 import com.sckw.transport.api.dubbo.TransportRemoteService;
 import com.sckw.transport.api.model.param.AddLogisticOrderParam;
+import com.sckw.transport.api.model.param.LogisticInfo;
 import com.sckw.transport.api.model.param.OrderFinishParam;
 import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
 import lombok.RequiredArgsConstructor;
@@ -2337,8 +2338,8 @@ public class KwoTradeOrderService {
         //下游新增物流订单
         AddLogisticOrderParam addLogisticOrderParam = new AddLogisticOrderParam();
         if (Objects.equals(tradeContractResDto.getConsignment(), 2)) {
-            List<AddLogisticOrderParam.LogisticInfo> collect = logisticsContractId.stream().map(d -> {
-                AddLogisticOrderParam.LogisticInfo logisticInfo = new AddLogisticOrderParam.LogisticInfo();
+            List<LogisticInfo> collect = logisticsContractId.stream().map(d -> {
+                LogisticInfo logisticInfo = new LogisticInfo();
                 logisticInfo.setContractId(d.getContractId());
                 logisticInfo.setContractNo(d.getContractNo());
                 logisticInfo.setContractName("");
@@ -2370,9 +2371,9 @@ public class KwoTradeOrderService {
         } else {
             List<KwoTradeOrderTransport> list = kwoTradeOrderTransportService.queryList(kwoTradeOrder.getId());
             if (CollUtil.isNotEmpty(list)) {
-                Map<Long, ContractCommonInfoResDto> contractMap = remoteContractService.queryContractBaseInfo(list.stream().map(KwoTradeOrderTransport::getContractId).collect(Collectors.toList()));
-                List<AddLogisticOrderParam.LogisticInfo> collect = list.stream().map(d -> {
-                            AddLogisticOrderParam.LogisticInfo logisticInfo = new AddLogisticOrderParam.LogisticInfo();
+                //Map<Long, ContractCommonInfoResDto> contractMap = remoteContractService.queryContractBaseInfo(list.stream().map(KwoTradeOrderTransport::getContractId).collect(Collectors.toList()));
+                List<LogisticInfo> collect = list.stream().map(d -> {
+                            LogisticInfo logisticInfo = new LogisticInfo();
                             logisticInfo.setContractId(d.getContractId());
                             logisticInfo.setContractNo(d.getContractNo());
                             logisticInfo.setContractName("");

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -45,6 +45,7 @@ import com.sckw.transport.api.model.vo.*;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.AddLogisticOrderDTO;
+import com.sckw.transport.model.dto.LogisticData;
 import com.sckw.transport.model.vo.OrderFinishReq;
 import com.sckw.transport.repository.*;
 import com.sckw.transport.service.KwtAcceptCarriageOrderService;
@@ -1167,11 +1168,11 @@ public class TransportServiceImpl implements TransportRemoteService {
     @NotNull
     private static AddLogisticOrderDTO getAddLogisticOrderDTO(AddLogisticOrderParam param) {
         AddLogisticOrderDTO addLogisticOrderDTO = new AddLogisticOrderDTO();
-        List<AddLogisticOrderParam.LogisticInfo> logisticInfo = param.getLogisticInfo();
+        List<LogisticInfo> logisticInfo = param.getLogisticInfo();
         if (CollectionUtils.isEmpty(logisticInfo)) {
             throw new BusinessException("物流信息不能为空");
         }
-        List<AddLogisticOrderDTO.LogisticInfo> infos = logisticInfo.stream()
+        List<LogisticData> infos = logisticInfo.stream()
                 .map(TransportServiceImpl::getLogisticInfo)
                 .collect(Collectors.toList());
         addLogisticOrderDTO.setLogisticInfo(infos);
@@ -1200,8 +1201,8 @@ public class TransportServiceImpl implements TransportRemoteService {
         return addLogisticOrderDTO;
     }
 
-    private static AddLogisticOrderDTO.LogisticInfo getLogisticInfo(AddLogisticOrderParam.LogisticInfo logistic) {
-        AddLogisticOrderDTO.LogisticInfo info = new AddLogisticOrderDTO.LogisticInfo();
+    private static LogisticData getLogisticInfo(LogisticInfo logistic) {
+        LogisticData info = new LogisticData();
         info.setContractId(logistic.getContractId());
         info.setContractNo(logistic.getContractNo());
         info.setContractName(logistic.getContractName());

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

@@ -1,13 +1,11 @@
 package com.sckw.transport.model.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.*;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.List;
 
 
@@ -19,7 +17,7 @@ public class AddLogisticOrderDTO implements Serializable {
     @Serial
     private static final long serialVersionUID = 6529826978061848338L;
     //物流信息
-    private List<LogisticInfo> logisticInfo;
+    private List<LogisticData> logisticInfo;
     /**
      * 交易订单id
      */
@@ -145,154 +143,5 @@ public class AddLogisticOrderDTO implements Serializable {
     @NotBlank(message = "卸货城市名称不能为空")
     private String unloadCityName;
 
-    @Data
-    public static class LogisticInfo {
-        /**
-         * 合同id
-         */
-        @NotNull(message = "合同id不能为空")
-        private Long contractId;
 
-        /**
-         * 合同编号
-         */
-        @NotBlank(message = "合同编号不能为空")
-        private String contractNo;
-
-        /**
-         * 合同名称
-         */
-        @NotBlank(message = "合同名称不能为空")
-        private String contractName;
-        /**
-         * 承运单位ID
-         */
-        @NotBlank(message = "承运单位ID不能为空")
-        private Long acceptCompanyId;
-
-        /**
-         * 承运联系电话
-         */
-        @NotBlank(message = "承运联系电话不能为空")
-        private String acceptContactPhone;
-
-
-        /**
-         * 承运联系人
-         */
-        @NotBlank(message = "承运联系人id不能为空")
-        private String acceptContacts;
-
-        /**
-         * 承运联系人id
-         */
-        @NotBlank(message = "承运联系人id不能为空")
-        private Long acceptContactsId;
-
-        /**
-         * 承运单位
-         */
-        @NotBlank(message = "承运单位不能为空")
-        private String acceptCompany;
-        /**
-         * 运价
-         */
-        @NotNull(message = "运价不能为空")
-        private BigDecimal price;
-
-        /**
-         * 运价方式
-         */
-        @NotNull(message = "运价方式不能为空")
-        private Long priceType;
-
-
-        /**
-         * 计划卸货时间
-         */
-        @NotNull(message = "计划卸货时间不能为空")
-        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-        private LocalDate endTime;
-
-        /**
-         * 计划发货时间
-         */
-        @NotNull(message = "计划发货时间不能为空")
-        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-        private LocalDate startTime;
-
-
-
-
-        /**
-         * 卸货联系人
-         */
-        @NotBlank(message = "卸货联系人不能为空")
-        private String unloadContacts;
-
-        /**
-         * 卸货联系电话
-         */
-        @NotBlank(message = "卸货联系电话不能为空")
-        private String unloadPhone;
-
-        /**
-         * 卸货详细地址
-         */
-        @NotBlank(message = "卸货详细地址不能为空")
-        private String unloadDetailAddress;
-
-
-        /**
-         * 总量
-         */
-        @NotNull(message = "总量不能为空")
-
-        private BigDecimal amount;
-
-        /**
-         * 总量单位
-         */
-        @NotBlank(message = "总量单位不能为空")
-        private String amountUnit;
-
-        /**
-         * 合理损耗
-         */
-
-        private BigDecimal loss;
-        /**
-         * 支付方式
-         */
-        @NotNull(message = "支付方式不能为空")
-        private Long payment;
-
-
-        /**
-         * 签约方式
-         */
-        @NotNull(message = "签约方式不能为空")
-        private Integer signingWay;
-
-        /**
-         * 合理损耗单位
-         */
-        @NotBlank(message = "合理损耗单位不能为空")
-        private String lossUnit;
-        /**
-         * 计费方式
-         */
-        @NotNull(message = "计费方式不能为空")
-        private String billingMode;
-
-        /**
-         * 备注
-         */
-        private String remark;
-        /**
-         * 订单创建类型（1.贸易订单生成，2自建订单生成）
-         */
-        private Integer type;
-
-    }
 }

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

@@ -0,0 +1,167 @@
+package com.sckw.transport.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @author PC
+ */
+@Data
+public  class LogisticData implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -4781207406119020652L;
+    /**
+         * 合同id
+         */
+        @NotNull(message = "合同id不能为空")
+        private Long contractId;
+
+        /**
+         * 合同编号
+         */
+        @NotBlank(message = "合同编号不能为空")
+        private String contractNo;
+
+        /**
+         * 合同名称
+         */
+        @NotBlank(message = "合同名称不能为空")
+        private String contractName;
+        /**
+         * 承运单位ID
+         */
+        @NotBlank(message = "承运单位ID不能为空")
+        private Long acceptCompanyId;
+
+        /**
+         * 承运联系电话
+         */
+        @NotBlank(message = "承运联系电话不能为空")
+        private String acceptContactPhone;
+
+
+        /**
+         * 承运联系人
+         */
+        @NotBlank(message = "承运联系人id不能为空")
+        private String acceptContacts;
+
+        /**
+         * 承运联系人id
+         */
+        @NotBlank(message = "承运联系人id不能为空")
+        private Long acceptContactsId;
+
+        /**
+         * 承运单位
+         */
+        @NotBlank(message = "承运单位不能为空")
+        private String acceptCompany;
+        /**
+         * 运价
+         */
+        @NotNull(message = "运价不能为空")
+        private BigDecimal price;
+
+        /**
+         * 运价方式
+         */
+        @NotNull(message = "运价方式不能为空")
+        private Long priceType;
+
+
+        /**
+         * 计划卸货时间
+         */
+        @NotNull(message = "计划卸货时间不能为空")
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private LocalDate endTime;
+
+        /**
+         * 计划发货时间
+         */
+        @NotNull(message = "计划发货时间不能为空")
+        @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+        private LocalDate startTime;
+
+
+
+
+        /**
+         * 卸货联系人
+         */
+        @NotBlank(message = "卸货联系人不能为空")
+        private String unloadContacts;
+
+        /**
+         * 卸货联系电话
+         */
+        @NotBlank(message = "卸货联系电话不能为空")
+        private String unloadPhone;
+
+        /**
+         * 卸货详细地址
+         */
+        @NotBlank(message = "卸货详细地址不能为空")
+        private String unloadDetailAddress;
+
+
+        /**
+         * 总量
+         */
+        @NotNull(message = "总量不能为空")
+
+        private BigDecimal amount;
+
+        /**
+         * 总量单位
+         */
+        @NotBlank(message = "总量单位不能为空")
+        private String amountUnit;
+
+        /**
+         * 合理损耗
+         */
+
+        private BigDecimal loss;
+        /**
+         * 支付方式
+         */
+        @NotNull(message = "支付方式不能为空")
+        private Long payment;
+
+
+        /**
+         * 签约方式
+         */
+        @NotNull(message = "签约方式不能为空")
+        private Integer signingWay;
+
+        /**
+         * 合理损耗单位
+         */
+        @NotBlank(message = "合理损耗单位不能为空")
+        private String lossUnit;
+        /**
+         * 计费方式
+         */
+        @NotNull(message = "计费方式不能为空")
+        private String billingMode;
+
+        /**
+         * 备注
+         */
+        private String remark;
+        /**
+         * 订单创建类型（1.贸易订单生成，2自建订单生成）
+         */
+        private Integer type;
+
+    }

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

@@ -3188,12 +3188,12 @@ public class KwtAcceptCarriageOrderService {
         String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "2", "0", "0");
         /**保存新建数据*/
 
-        List<AddLogisticOrderDTO.LogisticInfo> logisticInfo = orderDTO.getLogisticInfo();
+        List<LogisticData> logisticInfo = orderDTO.getLogisticInfo();
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(logisticInfo)){
             throw new BusinessException("物流信息不能为空");
         }
         List<Long> contractIds = logisticInfo.stream()
-                .map(AddLogisticOrderDTO.LogisticInfo::getContractId)
+                .map(LogisticData::getContractId)
                 .collect(Collectors.toList());
         Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = remoteContractService.queryContractBaseInfo(contractIds);
         if (MapUtils.isEmpty(longContractCommonInfoResDtoMap)) {
@@ -3233,7 +3233,7 @@ public class KwtAcceptCarriageOrderService {
         logisticsOrderUnitRepository.saveBatch(savelogOrderUnitList);
     }
 
-    private void setLogisticUnitInfo(AddLogisticOrderDTO orderDTO, AddLogisticOrderDTO.LogisticInfo x, Long lOrderId, List<KwtLogisticsOrderUnit> savelogOrderUnitList) {
+    private void setLogisticUnitInfo(AddLogisticOrderDTO orderDTO, LogisticData x, Long lOrderId, List<KwtLogisticsOrderUnit> savelogOrderUnitList) {
         KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
         consignUnit.setId(new IdWorker(NumberConstant.ONE).nextId());
         consignUnit.setLOrderId(lOrderId);
@@ -3283,7 +3283,7 @@ public class KwtAcceptCarriageOrderService {
         savelogOrderUnitList.add(unit);
     }
 
-    private static void setLogisticContractInfo(AddLogisticOrderDTO.LogisticInfo x, Long lOrderId, List<KwtLogisticsOrderContract> saveContractList) {
+    private static void setLogisticContractInfo(LogisticData x, Long lOrderId, List<KwtLogisticsOrderContract> saveContractList) {
         KwtLogisticsOrderContract contract = new KwtLogisticsOrderContract();
         contract.setId(new IdWorker(NumberConstant.ONE).nextId());
         contract.setContractId(x.getContractId());
@@ -3313,7 +3313,7 @@ public class KwtAcceptCarriageOrderService {
         savelogOrderGoodsList.add( goods);
     }
 
-    private static void setLogisticAddress(AddLogisticOrderDTO orderDTO, AddLogisticOrderDTO.LogisticInfo x, Long lOrderId, List<KwtLogisticsOrderAddress> saveAddressList) {
+    private static void setLogisticAddress(AddLogisticOrderDTO orderDTO, LogisticData x, Long lOrderId, List<KwtLogisticsOrderAddress> saveAddressList) {
         KwtLogisticsOrderAddress loadAddress = new KwtLogisticsOrderAddress();
         loadAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
         loadAddress.setLOrderId(lOrderId);
@@ -3354,7 +3354,7 @@ public class KwtAcceptCarriageOrderService {
         saveAddressList.add(unloadAddress);
     }
 
-    private static void setLogisticOrderInfo(AddLogisticOrderDTO orderDTO, AddLogisticOrderDTO.LogisticInfo x, Long lOrderId, String lOrderNo, List<KwtLogisticsOrder> saveLogisticsOrderList) {
+    private static void setLogisticOrderInfo(AddLogisticOrderDTO orderDTO, LogisticData x, Long lOrderId, String lOrderNo, List<KwtLogisticsOrder> saveLogisticsOrderList) {
         KwtLogisticsOrder kwtLogisticsOrder = new KwtLogisticsOrder();
         kwtLogisticsOrder.setId(lOrderId);
         kwtLogisticsOrder.setEntId(LoginUserHolder.getEntId());