From b054362aaf616bfe0be0b50ae5dc2137091dbd7d Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 09 十二月 2025 14:48:07 +0800
Subject: [PATCH] 提交
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 0fb6e6b..47eecb5 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
@@ -96,7 +96,7 @@
if (tmsDispatchOrder.getVehicleId() == null){
return AjaxResult.error("璇峰厛閫夋嫨杞﹁締");
}
-
+ tmsDispatchOrder.setConfirmTime(DateUtils.getNowDate());
tmsDispatchOrder.setStatus(1);
tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
@@ -121,7 +121,7 @@
return AjaxResult.error("璇ヨ皟搴﹀崟鏁版嵁鐘舵�佸紓甯�");
}
tmsDispatchOrder.setStatus(3);
-
+ tmsDispatchOrder.setOkTime(DateUtils.getNowDate());
tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
int i = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
if (i > 0){
@@ -168,6 +168,11 @@
.eq(TmsDriverDispatch::getDriverId, tmsDispatchOrder.getMainDriverId())
.set(TmsDriverDispatch::getStatus, 1)
);
+
+ tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
+ .set(TmsDispatchOrder::getStatus, 6)
+ );
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -181,6 +186,26 @@
driverDispatch.setStatus(2);
tmsDriverDispatchService.insertTmsDriverDispatch(driverDispatch);
return AjaxResult.success();
+ }
+
+
+ @Override
+ public int customsOrder(TmsDispatchOrder tmsDispatchOrder) {
+ return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
+ .set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
+ .set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
+ );
+
+ }
+
+ @Override
+ public int loadingOrder(TmsDispatchOrder tmsDispatchOrder) {
+ return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ .eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
+ .set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
+ .set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
+ );
}
@Override
@@ -478,6 +503,16 @@
@Override
public AjaxResult generateTmsDispatchOrder(List<Integer> ids) {
List<TmsDispatchOrder> tmsDispatchOrders = initGenerate(ids);
+ List<TmsDispatchOrder> collect1 = tmsDispatchOrders.stream().filter(item -> item.getIsCustoms() == 0 && item.getCustomsServiceProviderId() == null).collect(Collectors.toList());
+ if (!collect1.isEmpty()){
+ String disNos = collect1.stream().map(TmsDispatchOrder::getDispatchNo).collect(Collectors.joining(","));
+ return AjaxResult.error("璋冨害鍗�"+disNos+"鏈ˉ鍏呭鎵樻姤鍏充俊鎭�");
+ }
+ List<TmsDispatchOrder> collect2 = tmsDispatchOrders.stream().filter(item -> item.getIsLoad() == 0 && item.getLoadingServiceProviderId() == null).collect(Collectors.toList());
+ if (!collect2.isEmpty()){
+ String disNos = collect2.stream().map(TmsDispatchOrder::getDispatchNo).collect(Collectors.joining(","));
+ return AjaxResult.error("璋冨害鍗�"+disNos+"鏈ˉ鍏呰鍗歌揣淇℃伅");
+ }
List<TmsDispatchOrder> receivableList = tmsDispatchOrders.stream().filter(item -> item.getAccountsReceivableStatus() == 0).collect(Collectors.toList());
if (!receivableList.isEmpty()){
List<TmsDispatchOrder> collect = receivableList.stream().map(item -> {
--
Gitblit v1.8.0