From f8f7fbf269df2bc77acc8f1c14245c759d55dab4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 11:40:19 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index 9218ce6..72bd074 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -1,8 +1,11 @@
package com.ruoyi.sales.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -21,6 +24,7 @@
import org.springframework.stereotype.Service;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
/**
@@ -42,6 +46,9 @@
private StockUtils stockUtils;
@Autowired
private CommonFileServiceImpl commonFileService;
+
+ @Autowired
+ private ApproveProcessServiceImpl approveProcessService;
@Override
public IPage<ShippingInfo> listPage(Page page, ShippingInfo req) {
@@ -73,11 +80,28 @@
@Override
public boolean delete(List<Long> ids) {
+ List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
+ .in(ShippingInfo::getId, ids));
+ if(CollectionUtils.isEmpty(shippingInfos)) return false;
+ // 鍒犻櫎闄勪欢
commonFileService.deleteByBusinessIds(ids, FileNameType.SHIP.getValue());
- for (Long id : ids) {
- stockUtils.deleteStockRecord(id, StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
+ // 鎵ｅ凡鍙戣揣搴撳瓨
+ for (ShippingInfo shippingInfo : shippingInfos) {
+ if("宸插彂璐�".equals(shippingInfo.getStatus())) {
+ stockUtils.deleteStockRecord(shippingInfo.getId(), StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
+ }
}
- boolean delete = this.removeBatchByIds(ids);
- return delete;
+ // 鍒犻櫎鍙戣揣瀹℃壒
+ if(CollectionUtils.isNotEmpty(shippingInfos)){
+ for (ShippingInfo shippingInfo : shippingInfos){
+ ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
+ .like(ApproveProcess::getApproveReason, shippingInfo.getShippingNo()));
+ if(one != null){
+ approveProcessService.delByIds(Collections.singletonList(one.getId()));
+ }
+ }
+ }
+
+ return this.removeBatchByIds(ids);
}
}
--
Gitblit v1.9.3