sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/repository/KwfTruckRepository.java

@@ -108,7 +108,9 @@ public class KwfTruckRepository extends ServiceImpl<KwfTruckMapper, KwfTruck> {
     public KwfTruck findTruckByTruckNo(String truckNo) {
         return getOne(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
-                .eq(KwfTruck::getTruckNo, truckNo));
+                .eq(KwfTruck::getTruckNo, truckNo)
+                .last("limit 1")
+        );
     }
 
     public List<KwfTruck> queryByTruckNosAndEntId(List<String> truckNoList, Long entId) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/AbstractWaybillOrderHandler.java

@@ -10,6 +10,7 @@ import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.enums.CarWaybillV1Enum;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.fleet.api.model.dto.RUpdateDriverScoreDto;
 import com.sckw.fleet.api.model.vo.DriverConductRulesVO;
@@ -24,9 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -110,6 +109,9 @@ public abstract class AbstractWaybillOrderHandler<T extends WaybillOrderProcessP
         if (param == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "参数不能为空");
         }
+        if (StringUtils.isBlank(param.getLng()) || StringUtils.isBlank(param.getLat())) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "未获取到定位，请重启app后再次操作");
+        }
         // 非接单流程必须校验运单ID
         if (!(param instanceof OrderCirculateTakingQueryParam) && param.getWaybillOrderId() == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "运单ID不能为空");

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -106,7 +106,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         List<KwtWaybillOrderAddress> addresses = createWaybillOrderAddress(param, waybillOrder, waybillOrderSubtask);
 
         //4、生成车辆运单-装卸货信息
-        createWaybillOrderTicket(param, logOrder, waybillOrder, waybillOrderSubtask, addresses);
+        createWaybillOrderTicket(logOrder, waybillOrder, waybillOrderSubtask, addresses);
 
         //5、更新上游订单：回写物流订单
         updateLogOrder(logOrder, truckLoadVolume);
@@ -431,13 +431,12 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
     /**
      * 生成车辆运单-装卸货信息
      *
-     * @param param
+     * @param logOrder
      * @param waybillOrder
      */
-    private void createWaybillOrderTicket(OrderCirculateTakingQueryParam param, KwtLogisticsOrder logOrder,
-                                          KwtWaybillOrder waybillOrder, KwtWaybillOrderSubtask waybillOrderSubtask,
+    private void createWaybillOrderTicket(KwtLogisticsOrder logOrder, KwtWaybillOrder waybillOrder, KwtWaybillOrderSubtask waybillOrderSubtask,
                                           List<KwtWaybillOrderAddress> waybillOrderAddresses) {
-        log.info("创建车辆运单-装卸货信息，入参参数：{}", JSON.toJSONString(param));
+        log.info("创建车辆运单-装卸货信息，运单id：{}", waybillOrder.getId());
 
         //装货地址
         KwtWaybillOrderAddress shipmentAddress = getWaybillOrderAddress(waybillOrderAddresses, AddressTypeEnum.SHIPMENT);

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

@@ -29,14 +29,12 @@ public class WaybillOrderProcessParam implements Serializable {
      * 经度
      */
     @Schema(description = "经度")
-    @NotBlank(message = "未获取到定位，请重启app后再次操作")
     private String lng;
 
     /**
      * 纬度
      */
     @Schema(description = "纬度")
-    @NotBlank(message = "未获取到定位，请重启app后再次操作")
     private String lat;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderCirculateRepository.java

@@ -64,6 +64,7 @@ public class KwtLogisticsOrderCirculateRepository extends ServiceImpl<KwtLogisti
                 .eq(Objects.nonNull(truckNo),KwtLogisticsOrderCirculate::getTruckNo, truckNo)
                 .eq(KwtLogisticsOrderCirculate::getEntId, entId)
                 .eq(KwtLogisticsOrderCirculate::getStatus, Global.NUMERICAL_ZERO) //0-开启，1-关闭
+                .last("limit 1")
         );
     }