From 5627248e473253b3f10615d6be8b27bb7cc7c4f7 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 10 四月 2026 14:49:48 +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 | 67 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 31 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 7ec417b..4770312 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
@@ -300,47 +300,52 @@
//濉啓濮旀墭鎶ュ叧淇℃伅
@Override
- public int customsOrder(TmsDispatchOrder tmsDispatchOrder) {
- int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
- .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
- .set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
- .set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
- );
+ public int customsOrder(List<TmsDispatchOrder> tmsDispatchOrders) {
+ int totalResult = 0;
+ for (TmsDispatchOrder tmsDispatchOrder : tmsDispatchOrders) {
+ int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
+ .set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
+ .set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
+ );
+ totalResult += result;
- if (result > 0) {
- TmsDispatchOrderLog log = new TmsDispatchOrderLog();
- log.setHeadId(tmsDispatchOrder.getId());
- log.setCreateBy(SecurityUtils.getUsername());
- log.setCreateTime(DateUtils.getNowDate());
- log.setNode("濉啓濮旀墭鎶ュ叧淇℃伅");
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("濉啓濮旀墭鎶ュ叧淇℃伅");
- tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
}
-
- return result;
+ return totalResult;
}
//濉啓濮旀墭瑁呭嵏淇℃伅
@Override
- public int loadingOrder(TmsDispatchOrder tmsDispatchOrder) {
- int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
- .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
- .set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
- .set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
- );
+ public int loadingOrder(List<TmsDispatchOrder> tmsDispatchOrders) {
+ int totalResult = 0;
+ for (TmsDispatchOrder tmsDispatchOrder : tmsDispatchOrders) {
+ int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
+ .set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
+ .set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
+ );
+ totalResult += result;
- if (result > 0) {
- TmsDispatchOrderLog log = new TmsDispatchOrderLog();
- log.setHeadId(tmsDispatchOrder.getId());
- log.setCreateBy(SecurityUtils.getUsername());
- log.setCreateTime(DateUtils.getNowDate());
- log.setNode("濉啓濮旀墭瑁呭嵏淇℃伅");
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("濉啓濮旀墭瑁呭嵏淇℃伅");
-
- tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
}
-
- return result;
+ return totalResult;
}
@Override
--
Gitblit v1.8.0