From 766e3d9f03b6ff9c52a37d14d19304f9822d7c3d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 13:37:10 +0800
Subject: [PATCH] feat：销售台账-审核操作。新增的订单状态是未审核，审核人不能审核本人录入的订单。未审核的订单不能进行任何操作，只能修改、删除和审核
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 252 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index faceef0..0854853 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -5,18 +5,16 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.service.AccountIncomeService;
-import com.ruoyi.approve.service.IApproveProcessService;
-import com.ruoyi.approve.vo.ApproveProcessVO;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.common.enums.ApproveTypeEnum;
+import com.ruoyi.approve.service.IApproveProcessService;
+import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
@@ -25,32 +23,22 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.ICustomerRegionsService;
-import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.common.enums.SaleEnum;
-import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.*;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.EnumUtil;
-import com.ruoyi.common.utils.OrderUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProductionProductMainService;
-
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
-import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
import com.ruoyi.quality.mapper.QualityInspectMapper;
@@ -70,6 +58,7 @@
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.mapper.StockInRecordMapper;
+import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.mapper.StockOutRecordMapper;
import com.ruoyi.stock.pojo.StockInRecord;
import com.ruoyi.stock.pojo.StockOutRecord;
@@ -100,8 +89,8 @@
import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.time.ZoneId;
import java.time.YearMonth;
+import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -165,9 +154,12 @@
private final StockInventoryService stockInventoryService;
private final StockInRecordMapper stockInRecordMapper;
private final StockOutRecordMapper stockOutRecordMapper;
+ private final StockInventoryMapper stockInventoryMapper;
private final StockInRecordService stockInRecordService;
private final StockOutRecordService stockOutRecordService;
private final StockUtils stockUtils;
+ private final ShipmentApprovalMapper shipmentApprovalMapper;
+
@Autowired
private IApproveProcessService approveProcessService;
@@ -341,7 +333,9 @@
public List getTopFiveList() {
// 鏌ヨ鍘熷鏁版嵁
LambdaQueryWrapper<SalesLedger> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(SalesLedger::getCustomerId, SalesLedger::getCustomerName, SalesLedger::getContractAmount).orderByDesc(SalesLedger::getContractAmount);
+ queryWrapper.select(SalesLedger::getCustomerId, SalesLedger::getCustomerName, SalesLedger::getContractAmount)
+ .orderByDesc(SalesLedger::getContractAmount)
+ .ne(SalesLedger::getReviewStatus, 2); // 鎺掗櫎鍙嶅鏍告暟鎹�
List<SalesLedger> records = salesLedgerMapper.selectList(queryWrapper);
// 鎸夊鎴稩D鍒嗙粍骞惰仛鍚堥噾棰�
@@ -400,6 +394,7 @@
@Override
public IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
+ // 娣诲姞 reviewStatus 鐨勭瓫閫夋潯浠�
IPage<SalesLedger> iPage = salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);
if (CollectionUtils.isEmpty(iPage.getRecords())) {
@@ -484,6 +479,14 @@
salesLedger.setIsFh(isFh);
salesLedger.setIsEdit(!isFh);
+
+ // 鏍规嵁 reviewStatus 鎺у埗鍙嶅鐩稿叧瀛楁鐨勬樉绀�
+ if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() != 2) {
+ // 褰� reviewStatus 涓嶄负 2 鏃讹紝闅愯棌鍙嶅鏃堕棿銆佸弽瀹′汉鍜屽弽瀹′汉ID
+ salesLedger.setCounterReviewTime(null);
+ salesLedger.setCounterReviewPerson(null);
+ salesLedger.setCounterReviewPersonId(null);
+ }
}
if (salesLedgerDto.getStatus() != null && salesLedgerDto.getStatus()) {
@@ -809,6 +812,13 @@
if (CollectionUtils.isEmpty(idList)) {
return 0;
}
+ // 鏍￠獙锛氬凡瀹℃牳鐨勮鍗曚笉鑳藉垹闄�
+ List<SalesLedger> ledgers = salesLedgerMapper.selectBatchIds(idList);
+ for (SalesLedger ledger : ledgers) {
+ if (ledger.getReviewStatus() != null && ledger.getReviewStatus() == 1) {
+ throw new ServiceException("宸插鏍哥殑璁㈠崟涓嶈兘鍒犻櫎锛�" + ledger.getSalesContractNo());
+ }
+ }
// 鍒犻櫎閿�鍞鐞嗘暟鎹�
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList).select(SalesLedgerProduct::getId);
@@ -902,6 +912,27 @@
} else {
if (salesLedger.getDeliveryStatus() == 5) {
throw new ServiceException("璁㈠崟宸插彂璐�,绂佹缂栬緫");
+ }
+ // 鏌ヨ鏁版嵁搴撲腑鐨勫師濮嬭褰曠敤浜庢牎楠�
+ SalesLedger existingLedger = salesLedgerMapper.selectById(salesLedger.getId());
+ if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() == 1) {
+ // 瀹℃牳鎿嶄綔锛氭牎楠屽鏍镐汉涓嶈兘鏄綍鍏ヤ汉锛堜粎瀵规湭瀹℃牳鈫掑凡瀹℃牳鐨勮浆鎹級
+ if (existingLedger != null && existingLedger.getReviewStatus() != null && existingLedger.getReviewStatus() == 0) {
+ Long currentUserId = SecurityUtils.getUserId();
+ String entryPerson = existingLedger.getEntryPerson();
+ if (entryPerson != null && entryPerson.equals(String.valueOf(currentUserId))) {
+ throw new ServiceException("涓嶈兘瀹℃牳鏈汉褰曞叆鐨勮鍗�");
+ }
+ }
+ salesLedger.setReviewStatus(salesLedgerDto.getReviewStatus());
+ } else if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() == 2) {
+ handleCounterReview(salesLedger);
+ } else {
+ // 鏈鏍哥姸鎬佺殑缂栬緫鎿嶄綔锛氭牎楠屽凡瀹℃牳鐨勮鍗曚笉鑳界紪杈�
+ if (existingLedger != null && existingLedger.getReviewStatus() != null && existingLedger.getReviewStatus() == 1) {
+ throw new ServiceException("宸插鏍哥殑璁㈠崟涓嶈兘缂栬緫");
+ }
+ salesLedger.setReviewStatus(0);
}
salesLedgerMapper.updateById(salesLedger);
}
@@ -3318,4 +3349,204 @@
}
baseMapper.updateById(salesLedger);
}
-}
+
+
+ /**
+ * 澶勭悊閿�鍞彴璐﹀弽瀹￠�昏緫
+ * 1. 璁剧疆鍙嶅鐩稿叧淇℃伅锛堟椂闂淬�佷汉鍛橈級
+ * 2. 澶嶅埗鍘熼攢鍞彴璐﹀強浜у搧鏁版嵁锛岀敓鎴愭柊鐨勫彴璐�
+ * 3. 瀵瑰師鍙拌处鐨勫簱瀛樻暟鎹繘琛屽弽鍚戞搷浣�
+ */
+ private void handleCounterReview(SalesLedger salesLedger) {
+ // 1. 璁剧疆鍙嶅鐩稿叧淇℃伅
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ salesLedger.setCounterReviewTime(LocalDateTime.now());
+ salesLedger.setCounterReviewPerson(loginUser.getUser().getNickName());
+ salesLedger.setCounterReviewPersonId(loginUser.getUserId());
+ salesLedger.setReviewStatus(2);
+
+ Long originalSalesLedgerId = salesLedger.getId();
+
+ // 2. 鏌ヨ鍘熼攢鍞彴璐︽暟鎹�
+ SalesLedger originalLedger = salesLedgerMapper.selectById(originalSalesLedgerId);
+ if (originalLedger == null) {
+ throw new ServiceException("鍘熻鍗曚笉瀛樺湪锛屾棤娉曞弽瀹�");
+ }
+
+ // 3. 鍒涘缓鏂扮殑閿�鍞彴璐︼紝澶嶅埗鍘熷彴璐︽暟鎹�
+ SalesLedger newLedger = new SalesLedger();
+ BeanUtils.copyProperties(originalLedger, newLedger);
+ newLedger.setId(null); // 娓呯┖ID锛屽噯澶囨彃鍏ユ柊璁板綍
+ newLedger.setSalesContractNo(generateSalesContractNo()); // 鐢熸垚鏂板悎鍚屽彿
+ newLedger.setDeliveryStatus(1); // 璁剧疆涓烘湭鍙戣揣鐘舵��
+ newLedger.setStockStatus(0); // 璁剧疆涓烘湭鍏ュ簱鐘舵��
+ newLedger.setReviewStatus(0); // 璁剧疆涓烘湭瀹℃牳鐘舵��
+ newLedger.setCounterReviewTime(null); // 娓呯┖鍙嶅鏃堕棿
+ newLedger.setCounterReviewPerson(null); // 娓呯┖鍙嶅浜�
+ newLedger.setCounterReviewPersonId(null); // 娓呯┖鍙嶅浜篒D
+
+ // 4. 鎻掑叆鏂扮殑閿�鍞彴璐�
+ salesLedgerMapper.insert(newLedger);
+
+ // 5. 鏌ヨ骞跺鍒跺師鍙拌处鐨勬墍鏈変骇鍝佹暟鎹�
+ List<SalesLedgerProduct> originalProducts = salesLedgerProductMapper.selectList(
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .eq(SalesLedgerProduct::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ for (SalesLedgerProduct originalProduct : originalProducts) {
+ // 5.1 鍒涘缓鏂颁骇鍝佽褰曪紝澶嶅埗鍘熶骇鍝佹暟鎹�
+ SalesLedgerProduct newProduct = new SalesLedgerProduct();
+ BeanUtils.copyProperties(originalProduct, newProduct);
+ newProduct.setId(null); // 娓呯┖ID锛屽噯澶囨彃鍏ユ柊璁板綍
+ newProduct.setSalesLedgerId(newLedger.getId()); // 鍏宠仈鍒版柊鐨勫彴璐D
+ newProduct.setStockedQuantity(BigDecimal.ZERO); // 宸插叆搴撴暟閲忛噸缃负0
+ newProduct.setShippedQuantity(BigDecimal.ZERO); // 宸插嚭搴撴暟閲忛噸缃负0
+ newProduct.setUnqualifiedStockedQuantity(BigDecimal.ZERO); // 涓嶅悎鏍煎叆搴撴暟閲忛噸缃负0
+ newProduct.setUnqualifiedShippedQuantity(BigDecimal.ZERO); // 涓嶅悎鏍煎嚭搴撴暟閲忛噸缃负0
+ newProduct.setReturnQuality(BigDecimal.ZERO); // 閫�璐ф暟閲忛噸缃负0
+ newProduct.setAvailableQuality(newProduct.getQuantity().subtract(newProduct.getReturnQuality())); // 閲嶆柊璁＄畻鍙敤鏁伴噺
+ newProduct.setProductStockStatus(0); // 浜у搧搴撳瓨鐘舵�侀噸缃负0
+ newProduct.fillRemainingQuantity(); // 閲嶆柊璁＄畻鍓╀綑鏁伴噺
+
+ // 5.2 鎻掑叆鏂颁骇鍝佽褰�
+ salesLedgerProductMapper.insert(newProduct);
+ }
+
+ // 6. 澶勭悊鍘熻鍗曠殑搴撳瓨鏁版嵁锛堢敓鎴愬弽瀹″嚭鍏ュ簱璁板綍锛�
+ processOriginalOrderStock(originalSalesLedgerId);
+
+ // 7. 娓呴櫎鍘熻鍗曠殑璐ㄦ璁板綍
+ clearQualityInspectRecords(originalSalesLedgerId);
+
+ // 8. 娓呴櫎鍘熻鍗曠殑鍙戣揣淇℃伅鍜屽彂璐у鎵硅褰�
+ clearShippingAndApprovalRecords(originalSalesLedgerId);
+
+ // 9. 鍙栨秷鍘熻鍗曠浉鍏崇殑瀹℃壒娴佺▼
+ cancelApproveProcesses(originalSalesLedgerId, originalLedger.getSalesContractNo());
+ }
+
+ /**
+ * 娓呴櫎鍘熻鍗曠殑璐ㄦ璁板綍
+ */
+ private void clearQualityInspectRecords(Long originalSalesLedgerId) {
+ // 鍒犻櫎涓庡師璁㈠崟鍏宠仈鐨勮川妫�璁板綍
+ qualityInspectMapper.delete(
+ Wrappers.<QualityInspect>lambdaQuery()
+ .eq(QualityInspect::getPurchaseLedgerId, originalSalesLedgerId)
+ );
+ }
+
+ /**
+ * 娓呴櫎鍘熻鍗曠殑鍙戣揣淇℃伅鍜屽彂璐у鎵硅褰�
+ */
+ private void clearShippingAndApprovalRecords(Long originalSalesLedgerId) {
+ // 1. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊彂璐т俊鎭�
+ List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(
+ Wrappers.<ShippingInfo>lambdaQuery()
+ .eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ // 2. 鍒犻櫎鍙戣揣瀹℃壒璁板綍
+ if (!CollectionUtils.isEmpty(shippingInfos)) {
+ List<Long> shippingInfoIds = shippingInfos.stream()
+ .map(ShippingInfo::getId)
+ .collect(Collectors.toList());
+
+ shipmentApprovalMapper.delete(
+ Wrappers.<ShipmentApproval>lambdaQuery()
+ .eq(ShipmentApproval::getSalesLedgerId, originalSalesLedgerId)
+ .or()
+ .in(ShipmentApproval::getShippingInfoId, shippingInfoIds)
+ );
+
+ // 3. 鍒犻櫎鍙戣揣淇℃伅璁板綍
+ shippingInfoMapper.delete(
+ Wrappers.<ShippingInfo>lambdaQuery()
+ .eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
+ );
+ }
+ }
+
+ /**
+ * 鍙栨秷鍘熻鍗曠浉鍏崇殑瀹℃壒娴佺▼
+ */
+ private void cancelApproveProcesses(Long originalSalesLedgerId, String originalSalesContractNo) {
+ // 鍙栨秷鍏ュ簱瀹℃壒娴佺▼
+ List<ApproveProcess> stockInApproveProcesses = approveProcessService.list(
+ new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode())
+ .like(ApproveProcess::getApproveRemark, "salesStock:" + originalSalesLedgerId + ":")
+ .eq(ApproveProcess::getApproveDelete, 0)
+ );
+
+ for (ApproveProcess process : stockInApproveProcesses) {
+ process.setApproveStatus(3); // 璁剧疆涓哄鎵瑰け璐ョ姸鎬�
+ process.setApproveDelete(1); // 鏍囪涓哄凡鍒犻櫎
+ approveProcessService.updateById(process);
+ }
+
+ // 鍙栨秷鍙戣揣瀹℃壒娴佺▼
+ List<ApproveProcess> deliveryApproveProcesses = approveProcessService.list(
+ new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, 7) // 鍙戣揣瀹℃壒绫诲瀷
+ .like(ApproveProcess::getApproveReason, "鍙戣揣瀹℃壒:" + originalSalesContractNo)
+ .eq(ApproveProcess::getApproveDelete, 0)
+ );
+
+ for (ApproveProcess process : deliveryApproveProcesses) {
+ process.setApproveStatus(3); // 璁剧疆涓哄鎵瑰け璐ョ姸鎬�
+ process.setApproveDelete(1); // 鏍囪涓哄凡鍒犻櫎
+ approveProcessService.updateById(process);
+ }
+ }
+
+ /**
+ * 澶勭悊鍘熻鍗曠殑搴撳瓨鏁版嵁
+ * 1. 鍒犻櫎鍘熻鍗曠殑鎵�鏈夊叆搴撹褰曪紝骞舵墸鍑忓簱瀛�
+ * 2. 鍒犻櫎鍘熻鍗曠殑鎵�鏈夊嚭搴撹褰曪紝骞跺鍔犲簱瀛�
+ */
+ private void processOriginalOrderStock(Long originalSalesLedgerId) {
+ // 1. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊叆搴撹褰�
+ List<StockInRecord> stockInRecords = stockInRecordMapper.selectList(
+ Wrappers.<StockInRecord>lambdaQuery()
+ .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ // 2. 鍒犻櫎鍏ュ簱璁板綍骞舵墸鍑忓簱瀛�
+ for (StockInRecord stockInRecord : stockInRecords) {
+ // 浠庡簱瀛樿〃涓墸鍑忕浉搴旀暟閲�
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setProductModelId(stockInRecord.getProductModelId());
+ stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
+ stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
+ }
+
+ // 3. 鍒犻櫎鎵�鏈夊叆搴撹褰�
+ stockInRecordMapper.delete(
+ Wrappers.<StockInRecord>lambdaQuery()
+ .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ // 4. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊嚭搴撹褰�
+ List<StockOutRecord> stockOutRecords = stockOutRecordMapper.selectList(
+ Wrappers.<StockOutRecord>lambdaQuery()
+ .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ // 5. 鍒犻櫎鍑哄簱璁板綍骞跺鍔犲簱瀛�
+ for (StockOutRecord stockOutRecord : stockOutRecords) {
+ // 鍚戝簱瀛樿〃涓鍔犵浉搴旀暟閲�
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setProductModelId(stockOutRecord.getProductModelId());
+ stockInventoryDto.setQualitity(stockOutRecord.getStockOutNum());
+ stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
+ }
+
+ // 6. 鍒犻櫎鎵�鏈夊嚭搴撹褰�
+ stockOutRecordMapper.delete(
+ Wrappers.<StockOutRecord>lambdaQuery()
+ .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
+ );
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3