From 701542ac0a90cf0e3a0a81ec2bb8066b5de68e75 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 11:21:17 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 23fbfff..a3b3454 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.mapper.CanFinMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -42,6 +43,8 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private CanFinMapper canFinMapper;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -375,6 +378,27 @@
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
public R delete(@RequestParam Long orderId){
+ OrderPakout orderPakout = orderService.selectOne(new EntityWrapper<OrderPakout>()
+ .eq("id", orderId));
+ CanFin deleteCanFin = new CanFin();
+ deleteCanFin.setOutNo(orderPakout.getOrderNo());
+ List<CanFin> canFinList = canFinMapper.selectList(new EntityWrapper<CanFin>()
+ .orderBy("apply_time", true)
+ .isNotNull("out_no"));
+ if (!canFinList.isEmpty()){
+ for (CanFin canFin : canFinList){
+ if (canFin.getOutNo().equals(deleteCanFin.getOutNo())){
+ canFinMapper.deleteById(canFin.getId());
+ }
+ }
+ }
+ List<CanFin> newCanFinList = canFinMapper.selectList(new EntityWrapper<CanFin>()
+ .orderBy("apply_time", true));
+ if (!newCanFinList.isEmpty()){
+ CanFin firstCanFin = newCanFinList.get(0);
+ firstCanFin.setTaskStatus("canout");
+ canFinMapper.updateById(firstCanFin);
+ }
orderService.remove(orderId);
// Order order = orderService.selectById(orderId);
// if (order != null) {
--
Gitblit v1.9.1