From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
index b0c2046..19fa9ae 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
@@ -118,6 +118,9 @@
@Resource
private TmsShelfMapper tmsShelfMapper;
+ @Autowired
+ private ITmsDispatchOrderImportLogService tmsDispatchOrderImportLogService;
+
/**
* 鏌ヨ璋冨害鍗曠鐞�
@@ -442,7 +445,7 @@
TmsDispatchOrderImport tmsDispatchOrderImport = new TmsDispatchOrderImport();
tmsDispatchOrderImport.setProjectName("XXX椤圭洰");
- tmsDispatchOrderImport.setTransportLine("骞夸笢鐪�/鐝犳捣甯�/棣欐床鍖�>棣欐腐鐗瑰埆琛屾斂鍖�");
+ tmsDispatchOrderImport.setTransportLine("骞夸笢鐪�/鐝犳捣甯�/棣欐床鍖�->棣欐腐鐗瑰埆琛屾斂鍖�");
tmsDispatchOrderImport.setRequiredVehicleTypes("10T");
tmsDispatchOrderImport.setOrderType("鍩虹璁㈠崟");
tmsDispatchOrderImport.setIsCustoms("鏄�");
@@ -548,7 +551,17 @@
int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
+ StringBuilder failureDescription = new StringBuilder();
int line = 1;
+
+ // 鍒涘缓瀵煎叆鏃ュ織瀵硅薄
+ TmsDispatchOrderImportLog importLog = new TmsDispatchOrderImportLog();
+ importLog.setImportTime(DateUtils.getNowDate());
+ importLog.setFileName("璋冨害鍗曞鍏ユ枃浠�"); // 杩欓噷闇�瑕佹牴鎹疄闄呮儏鍐佃幏鍙栨枃浠跺悕
+ importLog.setOperator(SecurityUtils.getUsername());
+ importLog.setCreateBy(SecurityUtils.getUsername());
+ importLog.setCreateTime(DateUtils.getNowDate());
+
for (TmsDispatchOrderImport tmsDispatchOrderImport : list){
try
{
@@ -722,12 +735,28 @@
failureNum++;
String msg = "<br/>" + "璋冨害鍗曠"+line+"琛屽鍏ュけ璐ワ細";
failureMsg.append(msg + e.getMessage());
+
+ // 璁板綍澶辫触璇存槑锛屽寘鍚鍙峰拰澶辫触鍘熷洜
+ failureDescription.append("绗�" + line + "琛岋細" + e.getMessage()).append("\n");
+
log.error(msg, e);
}finally {
line++;
}
}
+ // 璁剧疆瀵煎叆鏃ュ織鐨勭粺璁′俊鎭�
+ importLog.setSuccessCount(list.size() - failureNum);
+ importLog.setFailureCount(failureNum);
+ importLog.setFailureDescription(failureDescription.toString());
+
+ // 淇濆瓨瀵煎叆鏃ュ織
+ try {
+ tmsDispatchOrderImportLogService.insertTmsDispatchOrderImportLog(importLog);
+ } catch (Exception e) {
+ log.error("淇濆瓨瀵煎叆鏃ュ織澶辫触锛�", e);
+ }
+
if (failureNum > 0)
{
failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
--
Gitblit v1.8.0