From 6305d0c86c23e9a583e8ca798645885d167f4dc5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 10 六月 2026 17:20:58 +0800
Subject: [PATCH] feat:1.销售台账导出按照查询条件 2.导出订单和产品明细
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 651 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 630 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..e209855 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;
@@ -89,19 +78,21 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
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 +156,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 +335,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 +396,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 +481,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 +814,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 +914,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 +3351,580 @@
}
baseMapper.updateById(salesLedger);
}
-}
+
+
+ /**
+ * 澶勭悊閿�鍞彴璐﹀弽瀹￠�昏緫
+ * 1. 璁剧疆鍙嶅鐩稿叧淇℃伅锛堟椂闂淬�佷汉鍛橈級
+ * 2. 澶嶅埗鍘熼攢鍞彴璐﹀強浜у搧鏁版嵁锛岀敓鎴愭柊鐨勫彴璐�
+ * 3. 瀵瑰師鍙拌处鐨勫簱瀛樻暟鎹繘琛屽弽鍚戞搷浣�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<Long> counterReview(CounterReviewDto dto) {
+ if (dto == null || CollectionUtils.isEmpty(dto.getIds())) {
+ throw new ServiceException("璇烽�夋嫨瑕佸弽瀹℃牳鐨勮鍗�");
+ }
+ if (dto.getCounterReviewType() == null || (dto.getCounterReviewType() != 1 && dto.getCounterReviewType() != 2)) {
+ throw new ServiceException("璇烽�夋嫨鍙嶅鏍哥被鍨嬶細浣滃簾鎴栭噸鏂扮敓鎴�");
+ }
+ if (dto.getCounterReviewDesc() == null || dto.getCounterReviewDesc().trim().isEmpty()) {
+ throw new ServiceException("璇疯緭鍏ュ弽瀹℃牳鎻忚堪");
+ }
+
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ List<Long> newLedgerIds = new ArrayList<>();
+
+ for (Long id : dto.getIds()) {
+ SalesLedger originalLedger = salesLedgerMapper.selectById(id);
+ if (originalLedger == null) {
+ throw new ServiceException("璁㈠崟涓嶅瓨鍦紝鏃犳硶鍙嶅鏍�");
+ }
+ if (originalLedger.getReviewStatus() == null || originalLedger.getReviewStatus() != 1) {
+ throw new ServiceException("璁㈠崟" + originalLedger.getSalesContractNo() + "涓嶆槸宸插鏍哥姸鎬侊紝鏃犳硶鍙嶅鏍�");
+ }
+
+ // 1. 鏍囪鍘熻鍗曚负宸插弽瀹�
+ originalLedger.setReviewStatus(2);
+ originalLedger.setCounterReviewTime(LocalDateTime.now());
+ originalLedger.setCounterReviewPerson(loginUser.getUser().getNickName());
+ originalLedger.setCounterReviewPersonId(loginUser.getUserId());
+ originalLedger.setCounterReviewType(dto.getCounterReviewType());
+ originalLedger.setCounterReviewDesc(dto.getCounterReviewDesc());
+ salesLedgerMapper.updateById(originalLedger);
+
+ // 2. 浣滃簾搴撳瓨锛氬叆搴撴墸鍑忋�佸嚭搴撳鍔犮�佸垹闄よ褰�
+ processOriginalOrderStock(id);
+
+ // 3. 娓呴櫎璐ㄦ璁板綍
+ clearQualityInspectRecords(id);
+
+ // 4. 娓呴櫎鍙戣揣淇℃伅鍜屽彂璐у鎵硅褰�
+ clearShippingAndApprovalRecords(id);
+
+ // 5. 鍙栨秷瀹℃壒娴佺▼
+ cancelApproveProcesses(id, originalLedger.getSalesContractNo());
+
+ // 6. 閲嶆柊鐢熸垚锛氬垱寤烘柊鍙拌处鍓湰
+ if (dto.getCounterReviewType() == 2) {
+ SalesLedger newLedger = new SalesLedger();
+ BeanUtils.copyProperties(originalLedger, newLedger);
+ newLedger.setId(null);
+ newLedger.setSalesContractNo(generateSalesContractNo());
+ newLedger.setDeliveryStatus(1);
+ newLedger.setStockStatus(0);
+ newLedger.setReviewStatus(0);
+ newLedger.setCounterReviewTime(null);
+ newLedger.setCounterReviewPerson(null);
+ newLedger.setCounterReviewPersonId(null);
+ newLedger.setCounterReviewType(null);
+ newLedger.setCounterReviewDesc(null);
+ salesLedgerMapper.insert(newLedger);
+
+ // 澶嶅埗浜у搧鍒版柊鍙拌处
+ List<SalesLedgerProduct> originalProducts = salesLedgerProductMapper.selectList(
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .eq(SalesLedgerProduct::getSalesLedgerId, id)
+ );
+ for (SalesLedgerProduct originalProduct : originalProducts) {
+ SalesLedgerProduct newProduct = new SalesLedgerProduct();
+ BeanUtils.copyProperties(originalProduct, newProduct);
+ newProduct.setId(null);
+ newProduct.setSalesLedgerId(newLedger.getId());
+ newProduct.setStockedQuantity(BigDecimal.ZERO);
+ newProduct.setShippedQuantity(BigDecimal.ZERO);
+ newProduct.setUnqualifiedStockedQuantity(BigDecimal.ZERO);
+ newProduct.setUnqualifiedShippedQuantity(BigDecimal.ZERO);
+ newProduct.setReturnQuality(BigDecimal.ZERO);
+ newProduct.setAvailableQuality(newProduct.getQuantity().subtract(newProduct.getReturnQuality()));
+ newProduct.setProductStockStatus(0);
+ newProduct.fillRemainingQuantity();
+ salesLedgerProductMapper.insert(newProduct);
+ }
+ newLedgerIds.add(newLedger.getId());
+ }
+ }
+ return newLedgerIds;
+ }
+
+ /**
+ * 鏃х増鍙嶅澶勭悊锛堝吋瀹� addOrUpdateSalesLedger 涓� reviewStatus=2 鐨勮皟鐢級
+ */
+ 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)
+ );
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void markOrderCompleted(List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ throw new ServiceException("璇烽�夋嫨瑕佹爣璁板畬鎴愮殑璁㈠崟");
+ }
+ for (Long id : ids) {
+ SalesLedger ledger = salesLedgerMapper.selectById(id);
+ if (ledger == null) {
+ throw new ServiceException("璁㈠崟涓嶅瓨鍦紝鏃犳硶鏍囪瀹屾垚");
+ }
+ if (ledger.getReviewStatus() == null || ledger.getReviewStatus() != 1) {
+ throw new ServiceException("璁㈠崟" + ledger.getSalesContractNo() + "涓嶆槸宸插鏍哥姸鎬侊紝鏃犳硶鏍囪瀹屾垚");
+ }
+ if (ledger.getOrderStatus() != null && ledger.getOrderStatus() == 1) {
+ throw new ServiceException("璁㈠崟" + ledger.getSalesContractNo() + "宸插畬鎴愶紝鏃犻渶閲嶅鏍囪");
+ }
+ }
+ salesLedgerMapper.update(null,
+ Wrappers.<SalesLedger>lambdaUpdate()
+ .in(SalesLedger::getId, ids)
+ .set(SalesLedger::getOrderStatus, 1)
+ );
+ }
+
+ @Override
+ public void incrementPrintCount(Long id, String printType) {
+ if (id == null) {
+ throw new ServiceException("閿�鍞彴璐D涓嶈兘涓虹┖");
+ }
+ if (printType == null || (!"label".equals(printType) && !"document".equals(printType))) {
+ throw new ServiceException("鎵撳嵃绫诲瀷蹇呴』涓� label 鎴� document");
+ }
+ SalesLedger ledger = salesLedgerMapper.selectById(id);
+ if (ledger == null) {
+ throw new ServiceException("閿�鍞彴璐︿笉瀛樺湪");
+ }
+ if ("label".equals(printType)) {
+ int currentCount = ledger.getLabelPrintCount() == null ? 0 : ledger.getLabelPrintCount();
+ salesLedgerMapper.update(null,
+ Wrappers.<SalesLedger>lambdaUpdate()
+ .eq(SalesLedger::getId, id)
+ .set(SalesLedger::getLabelPrintCount, currentCount + 1)
+ );
+ } else {
+ int currentCount = ledger.getDocumentPrintCount() == null ? 0 : ledger.getDocumentPrintCount();
+ salesLedgerMapper.update(null,
+ Wrappers.<SalesLedger>lambdaUpdate()
+ .eq(SalesLedger::getId, id)
+ .set(SalesLedger::getDocumentPrintCount, currentCount + 1)
+ );
+ }
+ }
+
+ @Override
+ public void exportWithProducts(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
+ try {
+ // 1. 鏌ヨ閿�鍞彴璐﹀垪琛紙瀵煎嚭浣跨敤鍗囧簭鎺掑簭锛�
+ Page<SalesLedger> page = new Page<>(-1, -1);
+ // 浣跨敤 Wrappers 鏋勫缓鍗囧簭鏌ヨ
+ LambdaQueryWrapper<SalesLedger> queryWrapper = Wrappers.<SalesLedger>lambdaQuery()
+ .orderByAsc(SalesLedger::getEntryDate)
+ .orderByAsc(SalesLedger::getId);
+
+ // 娣诲姞鏌ヨ鏉′欢
+ if (salesLedgerDto.getCustomerName() != null && !salesLedgerDto.getCustomerName().isEmpty()) {
+ queryWrapper.like(SalesLedger::getCustomerName, salesLedgerDto.getCustomerName());
+ }
+ if (salesLedgerDto.getSalesContractNo() != null && !salesLedgerDto.getSalesContractNo().isEmpty()) {
+ queryWrapper.like(SalesLedger::getSalesContractNo, salesLedgerDto.getSalesContractNo());
+ }
+ if (salesLedgerDto.getProjectName() != null && !salesLedgerDto.getProjectName().isEmpty()) {
+ queryWrapper.like(SalesLedger::getProjectName, salesLedgerDto.getProjectName());
+ }
+ if (salesLedgerDto.getEntryDateStart() != null && !salesLedgerDto.getEntryDateStart().isEmpty()) {
+ queryWrapper.ge(SalesLedger::getEntryDate, salesLedgerDto.getEntryDateStart());
+ }
+ if (salesLedgerDto.getEntryDateEnd() != null && !salesLedgerDto.getEntryDateEnd().isEmpty()) {
+ queryWrapper.le(SalesLedger::getEntryDate, salesLedgerDto.getEntryDateEnd());
+ }
+ if (salesLedgerDto.getDeliveryStatus() != null) {
+ queryWrapper.eq(SalesLedger::getDeliveryStatus, salesLedgerDto.getDeliveryStatus());
+ }
+ if (salesLedgerDto.getStockStatus() != null) {
+ queryWrapper.eq(SalesLedger::getStockStatus, salesLedgerDto.getStockStatus());
+ }
+ if (salesLedgerDto.getReviewStatus() != null) {
+ queryWrapper.eq(SalesLedger::getReviewStatus, salesLedgerDto.getReviewStatus());
+ }
+ if (salesLedgerDto.getOrderStatus() != null) {
+ queryWrapper.eq(SalesLedger::getOrderStatus, salesLedgerDto.getOrderStatus());
+ }
+ if (salesLedgerDto.getReviewStatusList() != null && !salesLedgerDto.getReviewStatusList().isEmpty()) {
+ queryWrapper.and(w -> w.in(SalesLedger::getReviewStatus, salesLedgerDto.getReviewStatusList())
+ .or().isNull(SalesLedger::getReviewStatus));
+ }
+
+ List<SalesLedger> ledgerList = salesLedgerMapper.selectList(page, queryWrapper);
+
+ // 2. 鏀堕泦鏁版嵁
+ List<SalesLedgerExportDto> ledgerExportList = new ArrayList<>();
+ List<SalesLedgerProductExportDto> productExportList = new ArrayList<>();
+
+ for (SalesLedger ledger : ledgerList) {
+ // 杞崲鍙拌处鏁版嵁
+ SalesLedgerExportDto ledgerDto = new SalesLedgerExportDto();
+ ledgerDto.setSalesContractNo(ledger.getSalesContractNo());
+ ledgerDto.setCustomerContractNo(ledger.getCustomerContractNo());
+ ledgerDto.setProjectName(ledger.getProjectName());
+ ledgerDto.setCustomerName(ledger.getCustomerName());
+ ledgerDto.setSalesman(ledger.getSalesman());
+ ledgerDto.setEntryPersonName(ledger.getEntryPersonName());
+ ledgerDto.setEntryDate(ledger.getEntryDate());
+ ledgerDto.setExecutionDate(ledger.getExecutionDate() != null ?
+ java.sql.Date.valueOf(ledger.getExecutionDate()) : null);
+ ledgerDto.setDeliveryDate(ledger.getDeliveryDate() != null ?
+ java.sql.Date.valueOf(ledger.getDeliveryDate()) : null);
+ ledgerDto.setContractAmount(ledger.getContractAmount());
+ ledgerDto.setRemarks(ledger.getRemarks());
+ ledgerDto.setCustomerRemarks(ledger.getCustomerRemarks());
+ ledgerDto.setDeliveryStatusText(getDeliveryStatusText(ledger.getDeliveryStatus()));
+ ledgerDto.setStockStatusText(getStockStatusText(ledger.getStockStatus()));
+ ledgerDto.setReviewStatusText(getReviewStatusText(ledger.getReviewStatus()));
+ ledgerDto.setOrderStatusText(getOrderStatusText(ledger.getOrderStatus()));
+ ledgerExportList.add(ledgerDto);
+
+ // 鏌ヨ璇ュ彴璐︾殑浜у搧鍒楄〃
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId())
+ .eq(SalesLedgerProduct::getType, 1)
+ );
+
+ for (SalesLedgerProduct product : products) {
+ SalesLedgerProductExportDto productDto = new SalesLedgerProductExportDto();
+ productDto.setSalesContractNo(ledger.getSalesContractNo());
+ productDto.setProductCategory(product.getProductCategory());
+ productDto.setSpecificationModel(product.getSpecificationModel());
+ productDto.setThickness(product.getThickness());
+ productDto.setFloorCode(product.getFloorCode());
+ productDto.setWidth(product.getWidth());
+ productDto.setHeight(product.getHeight());
+ productDto.setQuantity(product.getQuantity());
+ productDto.setSettlePieceArea(product.getSettlePieceArea());
+ productDto.setSettleTotalArea(product.getSettleTotalArea());
+ productDto.setTaxInclusiveUnitPrice(product.getTaxInclusiveUnitPrice());
+ productDto.setTaxRate(product.getTaxRate());
+ productDto.setTaxInclusiveTotalPrice(product.getTaxInclusiveTotalPrice());
+ productDto.setTaxExclusiveTotalPrice(product.getTaxExclusiveTotalPrice());
+ productDto.setInvoiceType(product.getInvoiceType());
+ productDto.setProcessRequirement(product.getProcessRequirement());
+ productDto.setRemark(product.getRemark());
+ productExportList.add(productDto);
+ }
+ }
+
+ // 3. 浣跨敤ExcelUtil瀵煎嚭锛堝唴閮ㄤ細鍒涘缓Workbook骞跺啓鍏ュ搷搴旓級
+ // 鍏堝垱寤轰复鏃舵枃浠讹紝鍐嶅悎骞朵袱涓猻heet
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("閿�鍞彴璐�.xlsx", "utf-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName);
+
+ org.apache.poi.xssf.usermodel.XSSFWorkbook workbook = new org.apache.poi.xssf.usermodel.XSSFWorkbook();
+
+ // Sheet1: 閿�鍞彴璐� - 鎵嬪姩濉厖
+ fillSheetWithData(workbook, "閿�鍞彴璐�", SalesLedgerExportDto.class, ledgerExportList);
+
+ // Sheet2: 浜у搧鏄庣粏 - 鎵嬪姩濉厖
+ fillSheetWithData(workbook, "浜у搧鏄庣粏", SalesLedgerProductExportDto.class, productExportList);
+
+ workbook.write(response.getOutputStream());
+ workbook.close();
+
+ } catch (Exception e) {
+ log.error("瀵煎嚭閿�鍞彴璐﹀け璐�", e);
+ throw new ServiceException("瀵煎嚭澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ /**
+ * 鎵嬪姩濉厖Sheet鏁版嵁
+ */
+ private <T> void fillSheetWithData(org.apache.poi.xssf.usermodel.XSSFWorkbook workbook, String sheetName, Class<T> clazz, List<T> dataList) throws Exception {
+ org.apache.poi.ss.usermodel.Sheet sheet = workbook.createSheet(sheetName);
+
+ // 鑾峰彇瀛楁涓婄殑@Excel娉ㄨВ
+ java.lang.reflect.Field[] fields = clazz.getDeclaredFields();
+ List<java.lang.reflect.Field> excelFields = new ArrayList<>();
+ for (java.lang.reflect.Field field : fields) {
+ com.ruoyi.framework.aspectj.lang.annotation.Excel excel = field.getAnnotation(com.ruoyi.framework.aspectj.lang.annotation.Excel.class);
+ if (excel != null) {
+ excelFields.add(field);
+ }
+ }
+
+ // 鍒涘缓琛ㄥご
+ org.apache.poi.ss.usermodel.Row headerRow = sheet.createRow(0);
+ org.apache.poi.ss.usermodel.CellStyle headerStyle = workbook.createCellStyle();
+ headerStyle.setFillForegroundColor(org.apache.poi.ss.usermodel.IndexedColors.GREY_50_PERCENT.getIndex());
+ headerStyle.setFillPattern(org.apache.poi.ss.usermodel.FillPatternType.SOLID_FOREGROUND);
+ headerStyle.setAlignment(org.apache.poi.ss.usermodel.HorizontalAlignment.CENTER);
+ org.apache.poi.ss.usermodel.Font headerFont = workbook.createFont();
+ headerFont.setBold(true);
+ headerStyle.setFont(headerFont);
+
+ for (int i = 0; i < excelFields.size(); i++) {
+ java.lang.reflect.Field field = excelFields.get(i);
+ field.setAccessible(true);
+ com.ruoyi.framework.aspectj.lang.annotation.Excel excel = field.getAnnotation(com.ruoyi.framework.aspectj.lang.annotation.Excel.class);
+ org.apache.poi.ss.usermodel.Cell cell = headerRow.createCell(i);
+ cell.setCellValue(excel.name());
+ cell.setCellStyle(headerStyle);
+ sheet.setColumnWidth(i, 20 * 256);
+ }
+
+ // 鍒涘缓鏁版嵁琛�
+ org.apache.poi.ss.usermodel.CellStyle dataStyle = workbook.createCellStyle();
+ dataStyle.setAlignment(org.apache.poi.ss.usermodel.HorizontalAlignment.CENTER);
+
+ for (int rowIndex = 0; rowIndex < dataList.size(); rowIndex++) {
+ T data = dataList.get(rowIndex);
+ org.apache.poi.ss.usermodel.Row row = sheet.createRow(rowIndex + 1);
+ for (int colIndex = 0; colIndex < excelFields.size(); colIndex++) {
+ java.lang.reflect.Field field = excelFields.get(colIndex);
+ field.setAccessible(true);
+ Object value = field.get(data);
+ org.apache.poi.ss.usermodel.Cell cell = row.createCell(colIndex);
+ if (value == null) {
+ cell.setCellValue("");
+ } else if (value instanceof Number) {
+ cell.setCellValue(((Number) value).doubleValue());
+ } else if (value instanceof Date) {
+ cell.setCellValue(new java.text.SimpleDateFormat("yyyy-MM-dd").format((Date) value));
+ } else {
+ cell.setCellValue(value.toString());
+ }
+ cell.setCellStyle(dataStyle);
+ }
+ }
+ }
+
+ private String getDeliveryStatusText(Integer status) {
+ if (status == null) return "鏈煡";
+ switch (status) {
+ case 1: return "鏈彂璐�";
+ case 2: return "瀹℃壒涓�";
+ case 3: return "瀹℃壒涓嶉�氳繃";
+ case 4: return "瀹℃壒閫氳繃";
+ case 5: return "宸插彂璐�";
+ case 6: return "閮ㄥ垎鍙戣揣";
+ default: return "鏈煡";
+ }
+ }
+
+ private String getStockStatusText(Integer status) {
+ if (status == null) return "鏈煡";
+ switch (status) {
+ case 0: return "鏈叆搴�";
+ case 1: return "閮ㄥ垎鍏ュ簱";
+ case 2: return "宸插叆搴�";
+ case 3: return "瀹℃壒涓�";
+ default: return "鏈煡";
+ }
+ }
+
+ private String getReviewStatusText(Integer status) {
+ if (status == null) return "寰呭鏍�";
+ switch (status) {
+ case 0: return "寰呭鏍�";
+ case 1: return "宸插鏍�";
+ case 2: return "宸插弽瀹�";
+ default: return "寰呭鏍�";
+ }
+ }
+
+ private String getOrderStatusText(Integer status) {
+ if (status == null || status == 0) return "杩涜涓�";
+ switch (status) {
+ case 0: return "杩涜涓�";
+ case 1: return "宸插畬鎴�";
+ default: return "杩涜涓�";
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3