From 87ad37bf4d6b3b497675db2a6162481075564645 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期三, 03 十二月 2025 13:48:24 +0800
Subject: [PATCH] 提交
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
index 0f12827..b38d4d5 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsTripServiceImpl.java
@@ -1,27 +1,35 @@
package com.ruoyi.tms.service.impl;
+import java.io.File;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.*;
+
import javax.annotation.Resource;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.uuid.Seq;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.tms.domain.*;
import com.ruoyi.tms.mapper.TmsDispatchOrderMapper;
import com.ruoyi.tms.mapper.TmsDriverDispatchMapper;
import com.ruoyi.tms.mapper.TmsDriverMapper;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.scheduling.annotation.Async;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.enums.DataSourceType;
@@ -58,6 +66,8 @@
@Autowired
private TmsVehicleServiceImpl tmsVehicleServiceImpl;
+ @Autowired
+ private AsyncPdfService asyncPdfService;
/**
* 鏌ヨ琛岀▼
*
@@ -136,8 +146,7 @@
* @return 缁撴灉
*/
@Override
- public int insertTmsTrip(TmsTrip tmsTrip)
- {
+ public int insertTmsTrip(TmsTrip tmsTrip) throws Exception {
Integer dispatchOrderId = tmsTrip.getDispatchOrderId();
TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectTmsDispatchOrderById(dispatchOrderId);
if (tmsDispatchOrder == null){
@@ -146,6 +155,11 @@
if (tmsDispatchOrder.getStatus() != 1 && tmsDispatchOrder.getStatus() != 2){
throw new RuntimeException("璋冨害鍗曟暟鎹姸鎬佸紓甯�");
}
+ TmsDriver tmsDriver = tmsDriverMapper.selectTmsDriverById(tmsDispatchOrder.getMainDriverId());
+ if (tmsDriver == null){
+ throw new RuntimeException("鏈壘鍒板徃鏈烘暟鎹�");
+ }
+
tmsDispatchOrder.setStatus(2);
tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
tmsTrip.setDriverName(tmsDispatchOrder.getMainDriverName());
@@ -153,7 +167,11 @@
tmsTrip.setVehicleNumber(tmsDispatchOrder.getLicensePlate());
tmsTrip.setCreateBy(SecurityUtils.getUsername());
tmsTrip.setCreateTime(DateUtils.getNowDate());
- return tmsTripMapper.insertTmsTrip(tmsTrip);
+ tmsTripMapper.insertTmsTrip(tmsTrip);
+ if (StringUtils.isNotEmpty(tmsTrip.getSignImg())){
+ asyncPdfService.generateTripPdfAsync(tmsTrip,tmsDispatchOrder,tmsDriver);
+ }
+ return 1;
}
@Override
public AjaxResult submitDropHook(TmsTrip tmsTrip){
--
Gitblit v1.8.0