1.v4.2物流订单新建，托运，分包修改接口地址

2.修改bugfix

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

@@ -14,10 +14,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.dto.LogisticsConsignmentDto;
-import com.sckw.transport.model.dto.LogisticsOrderFinishDto;
-import com.sckw.transport.model.dto.LogisticsOrderSubcontractDto;
 import com.sckw.transport.model.dto.OrderManualCompletionDto;
-import com.sckw.transport.model.param.AddLogisticsOrderParam;
 import com.sckw.transport.model.param.LogisticsConsignmentParam;
 import com.sckw.transport.model.param.OrderQuery;
 import com.sckw.transport.model.vo.PurchaseLogisticOrderExcelVo;
@@ -387,67 +384,4 @@ public class KwtLogisticsConsignmentController {
         }
     }
 
-
-    /**
-     * 采购订单/销售订单-自建物流订单 V4.2
-     *
-     * @param addLogisticsOrderParam 页面请求参数
-     * @return  响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/addLogisticsOrder", method = RequestMethod.POST)
-    public HttpResult addLogisticsOrder(@Valid @RequestBody AddLogisticsOrderParam addLogisticsOrderParam) {
-        log.info("采购订单/销售订单-自建物流订单传递参数信息:{}", JSONObject.toJSONString(addLogisticsOrderParam));
-        try {
-            return logisticsConsignmentService.addLogisticsOrder(addLogisticsOrderParam);
-        } catch (Exception e) {
-            log.error("采购订单/销售订单-自建物流订单 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-
-    /**
-     * 物流订单-分包托运-V4.2
-     *
-     * @param logisticsOrderSubcontractDto 页面请求参数
-     * @return  响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/logisticsOrderSubcontract", method = RequestMethod.POST)
-    public HttpResult logisticsOrderSubcontract(@Valid @RequestBody LogisticsOrderSubcontractDto logisticsOrderSubcontractDto) {
-        log.info("物流订单-分包托运传递参数信息:{}", JSONObject.toJSONString(logisticsOrderSubcontractDto));
-        try {
-            return logisticsConsignmentService.logisticsOrderSubcontract(logisticsOrderSubcontractDto);
-        } catch (Exception e) {
-            log.error("物流订单-分包托运 error :{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
-
-    /**
-     * 物流订单-完结订单-V4.2
-     *
-     * @param logisticsOrderSubcontractDto 页面请求参数
-     * @return  响应结果
-     */
-    @Validated
-    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
-    @RequestMapping(value = "/logisticsOrderFinish", method = RequestMethod.POST)
-    public HttpResult logisticsOrderFinish(@Valid @RequestBody LogisticsOrderFinishDto logisticsOrderSubcontractDto) {
-        log.info("物流订单-完结订单传递参数信息:{}", JSONObject.toJSONString(logisticsOrderSubcontractDto));
-        try {
-            return transportCommonService.logisticsOrderFinish(logisticsOrderSubcontractDto);
-        } 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/controller/KwtLogisticsOrderController.java

@@ -0,0 +1,124 @@
+package com.sckw.transport.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.annotation.RepeatSubmit;
+import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.transport.model.dto.LogisticsConsignmentDto;
+import com.sckw.transport.model.dto.LogisticsOrderFinishDto;
+import com.sckw.transport.model.dto.LogisticsOrderSubcontractDto;
+import com.sckw.transport.model.param.AddLogisticsOrderParam;
+import com.sckw.transport.service.KwtLogisticsConsignmentService;
+import com.sckw.transport.service.KwtTransportCommonService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+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
+ * @desc 物流订单Controller-v4.2
+ * @date 2024-03-11 11:06:06
+ */
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/kwtLogisticsOrder")
+public class KwtLogisticsOrderController {
+
+    @Autowired
+    KwtLogisticsConsignmentService logisticsConsignmentService;
+
+    @Autowired
+    KwtTransportCommonService transportCommonService;
+
+
+    /**
+     * 采购订单/销售订单-物流托运-V4.2
+     *
+     * @param logisticsConsignmentDto 页面请求参数
+     * @return  响应结果
+     */
+    @Validated
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
+    @RequestMapping(value = "/consignment", method = RequestMethod.POST)
+    public HttpResult logisticsOrderConsignment(@Valid @RequestBody LogisticsConsignmentDto logisticsConsignmentDto) {
+        log.info("采购订单/销售订单-物流托运传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentDto));
+        try {
+            return logisticsConsignmentService.logisticsOrderConsignment(logisticsConsignmentDto);
+        } catch (Exception e) {
+            log.error("采购订单/销售订单-物流托运生成托运订单 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
+
+    /**
+     * 承运订单/托运订单-自建物流订单 V4.2
+     *
+     * @param addLogisticsOrderParam 页面请求参数
+     * @return  响应结果
+     */
+    @Validated
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
+    @RequestMapping(value = "/createOrder", method = RequestMethod.POST)
+    public HttpResult addLogisticsOrder(@Valid @RequestBody AddLogisticsOrderParam addLogisticsOrderParam) {
+        log.info("承运订单/托运订单-自建物流订单传递参数信息:{}", JSONObject.toJSONString(addLogisticsOrderParam));
+        try {
+            return logisticsConsignmentService.addLogisticsOrder(addLogisticsOrderParam);
+        } catch (Exception e) {
+            log.error("承运订单/托运订单-自建物流订单 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
+
+    /**
+     * 物流订单-分包托运-V4.2
+     *
+     * @param logisticsOrderSubcontractDto 页面请求参数
+     * @return  响应结果
+     */
+    @Validated
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
+    @RequestMapping(value = "/subcontract", method = RequestMethod.POST)
+    public HttpResult logisticsOrderSubcontract(@Valid @RequestBody LogisticsOrderSubcontractDto logisticsOrderSubcontractDto) {
+        log.info("物流订单-分包托运传递参数信息:{}", JSONObject.toJSONString(logisticsOrderSubcontractDto));
+        try {
+            return logisticsConsignmentService.logisticsOrderSubcontract(logisticsOrderSubcontractDto);
+        } catch (Exception e) {
+            log.error("物流订单-分包托运 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
+    /**
+     * 物流订单-完结订单-V4.2
+     *
+     * @param logisticsOrderSubcontractDto 页面请求参数
+     * @return  响应结果
+     */
+    @Validated
+    @RepeatSubmit(interval = 1000,message ="前方拥堵，请稍后尝试")
+    @RequestMapping(value = "/logisticsOrderFinish", method = RequestMethod.POST)
+    public HttpResult logisticsOrderFinish(@Valid @RequestBody LogisticsOrderFinishDto logisticsOrderSubcontractDto) {
+        log.info("物流订单-完结订单传递参数信息:{}", JSONObject.toJSONString(logisticsOrderSubcontractDto));
+        try {
+            return transportCommonService.logisticsOrderFinish(logisticsOrderSubcontractDto);
+        } 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/dao/KwtLogisticsOrderAddressMapper.java

@@ -2,9 +2,13 @@ package com.sckw.transport.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.transport.model.KwtLogisticsOrderAddress;
+import com.sckw.transport.model.vo.LoadAddressVo;
+import com.sckw.transport.model.vo.UnLoadAddressVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface KwtLogisticsOrderAddressMapper extends BaseMapper<KwtLogisticsOrderAddress> {
 //    int deleteByPrimaryKey(Long id);
@@ -27,4 +31,9 @@ public interface KwtLogisticsOrderAddressMapper extends BaseMapper<KwtLogisticsO
      * @date 2023/7/20
      **/
     KwtLogisticsOrderAddress findByAddress(@Param("lOrderId") Long lOrderId, @Param("addressType") Integer addressType);
+
+    List<LoadAddressVo> findByAddressAndLoadAmount(@Param("lOrderId") Long lOrderId,@Param("addressType") Integer addressType);
+
+
+    List<UnLoadAddressVo> findByAddressAndUnLoadAmount(@Param("lOrderId") Long lOrderId, @Param("addressType") Integer addressType);
 }

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

@@ -18,7 +18,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-@DubboService(group = "design", version = "1.0.0")
+@DubboService(group = "design", version = "1.0.0",timeout = 50000)
 public class TransportRemoteLineFreightRateServiceImpl implements RemoteTransportLineFreightRateService {
 
     @Autowired

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author lfdc
@@ -333,4 +334,28 @@ public class AcceptCarriageOrderVO /*extends PageRequest*/ {
      */
     private BigDecimal taxRate;
 
+    /**
+     * 多装货地4.2
+     */
+    private List<String> loadNames;
+
+    private List<String> loadAddresses;
+
+
+    /**
+     * 多卸货地4.2
+     */
+    private List<String> unloadNames;
+
+    private List<String> unloadAddresses;
+
+
+    /**
+     * 多装货地4.2
+     */
+    private List<LoadAddressVo> loading;
+
+    private List<UnLoadAddressVo> unloading;
+
+
 }

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

@@ -13,6 +13,11 @@ import java.math.BigDecimal;
 @Data
 public class LoadAddressVo implements Serializable {
 
+    /**
+     * 装货ID
+     */
+    private String addressId;
+
     /**
      * 装货地址
      */

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

@@ -12,6 +12,10 @@ import java.math.BigDecimal;
  */
 @Data
 public class UnLoadAddressVo implements Serializable {
+    /**
+     * 卸货ID
+     */
+    private String addressId;
 
     /**
      * 卸货地名

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

@@ -698,8 +698,8 @@ public class KwtAcceptCarriageOrderService {
                     return result;
                 }
                 KwtLogisticsOrder logisticsOrder = logisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                                .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
-                                .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
+                        .eq(StringUtils.isNotBlank(orderDTO.getLOrderId()), KwtLogisticsOrder::getId, orderDTO.getLOrderId())
+                        .eq(StringUtils.isNotBlank(orderDTO.getLOrderNo()), KwtLogisticsOrder::getLOrderNo, orderDTO.getLOrderNo())
                 );
                 if (logisticsOrder == null) {
                     result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
@@ -1145,7 +1145,7 @@ public class KwtAcceptCarriageOrderService {
                     driverListVo.setStatusLabel(CarWaybillEnum.PENDING_ORDER.getDestination());
                 }
                 if (!ObjectUtils.isEmpty(truck)) {
-                   if (truck.get(driverListVo.getTruckNo()) != null) {
+                    if (truck.get(driverListVo.getTruckNo()) != null) {
                         driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
                     }
                     if (driverListVo.getTransportStatus() != null) {
@@ -1153,7 +1153,7 @@ public class KwtAcceptCarriageOrderService {
                     }
                     String truckType = truck.get(driverListVo.getTruckNo()).getTruckType();
                     if (StringUtils.isNotBlank(truckType)) {
-                       driverListVo.setCarType(dictData.get(truckType));
+                        driverListVo.setCarType(dictData.get(truckType));
                     }
                 }
             }
@@ -2462,26 +2462,6 @@ public class KwtAcceptCarriageOrderService {
             vo.setLoadCityName(vo.getLoadName());
             vo.setUnitLabel(unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit())));
             vo.setUnloadCityName(vo.getUnloadName());
-            if (vo.getTOrderId() != null) {
-//                try {
-//                    OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.valueOf(vo.getTOrderId()));
-//                    if (orderDetailRes != null) {
-//                        List<UnitInfoDetailRes> unitInfo = orderDetailRes.getUnitInfo();
-//                        for (UnitInfoDetailRes detailRes : unitInfo) {
-//                            if (String.valueOf(NumberConstant.ONE).equals(detailRes.getUnitType())) {
-//                                vo.setShipmentsUnitEntId(String.valueOf(detailRes.getEntId()));
-//                                vo.setShipmentsUnit(detailRes.getFirmName());
-//                            } else {
-//                                vo.setReceiveGoodsUnitEntId(String.valueOf(detailRes.getEntId()));
-//                                vo.setReceiveGoodsUnit(detailRes.getFirmName());
-//                            }
-//                        }
-//                    }
-//                } catch (NumberFormatException e) {
-////                    throw new RuntimeException(e);
-//                    log.info("查询失败:{},信息:{}",vo.getTOrderId(),e.getMessage(),e);
-//                }
-            }
             vo.setWaitDistributionAmount(vo.getCarryingCapacity().subtract(vo.getSubcontractAmount()).subtract(vo.getEntrustAmount()));
             String tOrderId = vo.getTOrderId();
             if (StringUtils.isNotBlank(tOrderId)) {
@@ -2506,7 +2486,38 @@ public class KwtAcceptCarriageOrderService {
                     log.info("查询失败:{},信息:{}", vo.getTOrderId(), e.getMessage(), e);
                 }
             }
+            String lOrderId = vo.getLOrderId();
+            List<String> loadName = new ArrayList<String>();
+            List<String> loadAddressList = new ArrayList<String>();
+            List<KwtLogisticsOrderAddress> loadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
+                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
+                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
+            );
+            loadAddress.forEach(address -> {
+                loadName.add(address.getName());
+                loadAddressList.add(address.getDetailAddress());
+            });
 
+            List<String> unloadName = new ArrayList<String>();
+            List<String> unloadAddressList = new ArrayList<String>();
+            List<KwtLogisticsOrderAddress> unloadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
+                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
+                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
+            );
+            unloadAddress.forEach(address -> {
+                unloadName.add(address.getName());
+                unloadAddressList.add(address.getDetailAddress());
+            });
+            vo.setLoadNames(loadName);
+            vo.setLoadAddresses(loadAddressList);
+            vo.setUnloadNames(unloadName);
+            vo.setUnloadAddresses(unloadAddressList);
+            List<LoadAddressVo> loadAddressAmount = logisticsOrderAddressMapper.findByAddressAndLoadAmount(Long.parseLong(lOrderId), NumberConstant.ONE);
+            vo.setLoading(loadAddressAmount);
+            List<UnLoadAddressVo> unloadAddressAmount = logisticsOrderAddressMapper.findByAddressAndUnLoadAmount(Long.parseLong(lOrderId), NumberConstant.TWO);
+            vo.setUnloading(unloadAddressAmount);
         }
         return PageRes.build(pageInfo, list);
     }

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

@@ -883,7 +883,7 @@ public class KwtLogisticsOrderConsignmentService {
                     , "1"
             );
         }
-        return HttpResult.ok();
+        return HttpResult.ok(lOrderId);
     }
 
     private void saveCreateLogisticsOrderLineFreight(AddLogisticsOrderParam addOrderDTO, Long lOrderId) {
@@ -1172,7 +1172,7 @@ public class KwtLogisticsOrderConsignmentService {
                 long addressId = new IdWorker(NumberConstant.ONE).nextId();
                 unloadAddress.setId(addressId);
                 unloadAddress.setLOrderId(lOrderId);
-                unloadAddress.setAddressType(NumberConstant.ONE);
+                unloadAddress.setAddressType(NumberConstant.TWO);
                 unloadAddress.setName(entAddressResDtos.getName() == null ? null : entAddressResDtos.getName());
                 unloadAddress.setContacts(entAddressResDtos.getContacts());
                 unloadAddress.setPhone(entAddressResDtos.getPhone());

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

@@ -40,4 +40,36 @@
         and l_order_id = #{lOrderId, jdbcType=BIGINT}
         and address_type = #{addressType, jdbcType=INTEGER}
     </select>
+
+    <select id="findByAddressAndLoadAmount" resultType="com.sckw.transport.model.vo.LoadAddressVo">
+        SELECT a.id             AS addressId,
+               a.`name`         AS loadName,
+               a.city_name      AS loadAddress,
+               a.contacts       AS loadContacts,
+               a.phone          AS loadPhone,
+               a.detail_address AS loadAddressDetail,
+               b.load_amount    AS loadAmount
+        FROM kwt_logistics_order_address a
+                 LEFT JOIN kwt_logistics_order_amount b ON a.id = b.l_address_id
+        WHERE a.del_flag = 0
+          AND b.del_flag = 0
+          AND a.address_type = #{addressType,jdbcType=INTEGER}
+          AND a.l_order_id = #{lOrderId}
+    </select>
+
+    <select id="findByAddressAndUnLoadAmount" resultType="com.sckw.transport.model.vo.UnLoadAddressVo">
+        SELECT a.id             AS addressId,
+        a.`name`         AS unloadName,
+        a.city_name      AS unloadAddress,
+        a.contacts       AS unloadContacts,
+        a.phone          AS unloadPhone,
+        a.detail_address AS unloadAddressDetail,
+        b.load_amount    AS unloadAmount
+        FROM kwt_logistics_order_address a
+        LEFT JOIN kwt_logistics_order_amount b ON a.id = b.l_address_id
+        WHERE a.del_flag = 0
+        AND b.del_flag = 0
+        AND a.address_type = #{addressType,jdbcType=INTEGER}
+        AND a.l_order_id = #{lOrderId}
+    </select>
 </mapper>

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

@@ -1232,6 +1232,85 @@
         case when a.ent_id = e.top_ent_id then 1 ELSE 2 end as createType
     </sql>
 
+    <sql id="Query_Column_List_Accept_Carriage_v42">
+        a.id                                                AS lOrderId,
+        a.l_order_no                                        AS lOrderNo,
+        a.t_order_id                                        AS tOrderId,
+        a.t_order_no                                        AS tOrderNo,
+        a.loss                                              AS loss,
+        a.loss_unit                                         AS lossUnit,
+        a.settlement_cycle                                  AS accountsCycle,
+        a.billing_mode                                      AS billingMode,
+        a.amount                                            AS carryingCapacity,
+        a.goods_price                                       AS goodsPrice,
+        a.goods_price_unit                                  AS goodsPriceUnit,
+        a.`status`                                          AS status,
+        a.settlement_cycle                                  AS settlementCycle,
+        a.price                                             AS price,
+        a.price_type                                        AS priceType,
+        a.type                                              AS orderSource,
+        a.unit                                              AS unit,
+        a.subcontract_amount                                AS subcontractAmount,
+        a.entrust_amount                                    AS entrustAmount,
+        a.unload_amount                                     AS unloadAmount,
+        a.load_amount                                       AS loadAmount,
+        a.ignore_amount                                     AS ignoreAmount,
+        a.deficit_amount                                    AS deficitAmount,
+        a.deficit_price                                     AS deficitPrice,
+        a.total_load_amount                                 AS totalLoadAmount,
+        a.total_unload_amount                               AS totalUnloadAmount,
+        a.payment                                           AS payment,
+        a.tax_rate                                          AS taxRate,
+        a.ent_id                                            AS entId,
+        a.create_by                                         AS createBy,
+        a.create_time                                       AS createTime,
+        a.update_by                                         AS updateBy,
+        a.update_time                                       AS updateTime,
+        a.start_time                                        AS shipmentsDateTime,
+        a.end_time                                          AS receiveGoodsDateTime,
+        a.remark                                            AS remark,
+        g.goods_id                                          AS goodsId,
+        g.goods_name                                        AS goodsName,
+        g.goods_type                                        AS goodsType,
+        f.contract_id                                       AS contractId,
+        f.contract_no                                       AS contractNo,
+        f.signing_way                                       AS signing,
+        d.ent_id                                            AS consignCompanyId,
+        d.top_ent_id                                        AS consignTopEntId,
+        d.firm_name                                         AS consignCompany,
+        d.contacts                                          AS consignContacts,
+        d.contacts_id                                       AS consignContactsId,
+        e.contacts_id                                       AS carrierContactsId,
+        d.phone                                             AS consignPhone,
+        e.ent_id                                            AS carrierCompanyId,
+        e.firm_name                                         AS carrierCompany,
+        e.top_ent_id                                        AS carrierTopEntId,
+        e.contacts                                          AS carrierContacts,
+        e.phone                                             AS carrierPhone,
+<!--        b.`name`                                            AS loadName,-->
+<!--        b.address_type                                      AS loadType,-->
+<!--        b.city_name                                         AS loadCityName,-->
+<!--        b.city_code                                         AS loadCityCode,-->
+<!--        b.detail_address                                    AS loadAddress,-->
+<!--        b.contacts                                          AS shipmentsContacts,-->
+<!--        b.phone                                             AS shipmentsPhone,-->
+<!--        b.lat                                               AS loadLat,-->
+<!--        b.lng                                               AS loadLng,-->
+<!--        c.`name`                                            AS unloadName,-->
+<!--        c.address_type                                      AS unloadType,-->
+<!--        c.contacts                                          AS receiveGoodsContacts,-->
+<!--        c.phone                                             AS receiveGoodsPhone,-->
+<!--        c.city_name                                         AS unloadCityName,-->
+<!--        c.city_code                                         AS unloadCityCode,-->
+<!--        c.detail_address                                    AS unloadAddress,-->
+<!--        c.lat                                               AS unloadLat,-->
+<!--        c.lng                                               AS unloadLng,-->
+        f.contract_name                                     as contract
+                ,
+        a.del_flag                                          as delFlag,
+        case when a.ent_id = e.top_ent_id then 1 ELSE 2 end as createType
+    </sql>
+
     <sql id="Query_Column_List_Cogsign">
         a.id                                                AS lOrderId,
         a.l_order_no                                        AS lOrderNo,
@@ -1385,6 +1464,62 @@
         contract,
         createType
     </sql>
+   <sql id="New_Query_Column_List_v42">
+       lOrderId,
+       lOrderNo,
+       tOrderId,
+       tOrderNo,
+       loss,
+       lossUnit,
+       accountsCycle,
+       billingMode,
+       carryingCapacity,
+       goodsPrice,
+       goodsPriceUnit,
+       STATUS,
+       settlementCycle,
+       price,
+       priceType,
+       orderSource,
+       unit,
+       subcontractAmount,
+       entrustAmount,
+       unloadAmount,
+       loadAmount,
+       ignoreAmount,
+       deficitAmount,
+       deficitPrice,
+       totalLoadAmount,
+       totalUnloadAmount,
+       payment,
+       taxRate,
+       entId,
+       createBy,
+       createTime,
+       updateBy,
+       updateTime,
+       shipmentsDateTime,
+       receiveGoodsDateTime,
+       remark,
+       goodsId,
+       goodsName,
+       goodsType,
+       contractId,
+       contractNo,
+       signing,
+       consignCompanyId,
+       consignTopEntId,
+       consignCompany,
+       consignContacts,
+       consignPhone,
+       carrierCompanyId,
+       carrierCompany,
+       carrierTopEntId,
+       carrierContacts,
+       carrierPhone shipmentsContacts,
+       contract,
+       createType
+   </sql>
 
     <select id="selectLogisticsOrderList" resultType="com.sckw.transport.model.vo.AcceptCarriageOrderVO">
         SELECT
@@ -2273,11 +2408,15 @@
     <select id="selectLogisticsOrderListByAcceptCarriage"
             resultType="com.sckw.transport.model.vo.AcceptCarriageOrderVO">
         SELECT
-        <include refid="New_Query_Column_List">
+<!--        <include refid="New_Query_Column_List">-->
+<!--        </include>-->
+        <include refid="New_Query_Column_List_v42">
         </include>
         FROM (
         SELECT
-        <include refid="Query_Column_List_Accept_Carriage">
+<!--        <include refid="Query_Column_List_Accept_Carriage">-->
+<!--        </include>-->
+        <include refid="Query_Column_List_Accept_Carriage_v42">
         </include>
         FROM kwt_logistics_order a
                  LEFT JOIN kwt_logistics_order_address b ON a.id = b.l_order_id
@@ -2291,7 +2430,7 @@
                  LEFT JOIN kwt_logistics_order_goods g ON a.id = g.l_order_id AND g.del_flag = 0
                  LEFT JOIN kwt_logistics_order_contract f ON a.id = f.l_order_id AND f.del_flag = 0
         <where>
-            a.del_flag = 0
+            a.del_flag = 0 and  f.del_flag = 0
             <if test="query.keywords != null and query.keywords != ''">
                 and (
                             a.t_order_no like concat('%', #{query.keywords}, '%')