From 3d148c543d81d3f2d402e10033776b1e3b3cc5d6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 19:22:00 +0800
Subject: [PATCH] fix: 工艺路线导出完成日期修改
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 56 +++++++++++---------------------------------------------
1 files changed, 11 insertions(+), 45 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 e1ae53b..4f28ad7 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -27,6 +27,7 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
+import com.ruoyi.common.utils.excel.ExcelUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.other.mapper.TempFileMapper;
@@ -822,7 +823,11 @@
record.setSalesLedgerProcessRouteId(route.getId());
Integer isCompleted = inputRecord != null && inputRecord.getIsCompleted() != null ? inputRecord.getIsCompleted() : 0;
record.setIsCompleted(isCompleted);
- record.setCompletedTime(Objects.equals(isCompleted, 1) ? LocalDateTime.now() : null);
+ if (Objects.equals(isCompleted, 1)) {
+ record.setCompletedTime(inputRecord != null && inputRecord.getCompletedTime() != null ? inputRecord.getCompletedTime() : LocalDateTime.now());
+ } else {
+ record.setCompletedTime(null);
+ }
routeRecordList.add(record);
}
salesLedgerProcessRouteRecordService.saveBatch(routeRecordList);
@@ -1167,7 +1172,7 @@
@Transactional(readOnly = true)
public String generateSalesContractNo() {
LocalDate currentDate = LocalDate.now();
- String datePart = currentDate.format(DateTimeFormatter.BASIC_ISO_DATE);
+ String datePart = currentDate.format(DateTimeFormatter.ofPattern("yyMMdd"));
String lockKey = LOCK_PREFIX + datePart;
String lockValue = Thread.currentThread().getId() + "-" + System.nanoTime(); // 鍞竴鏍囪瘑閿佹寔鏈夎��
@@ -2621,7 +2626,6 @@
ledger.setStockStatus(allInbound ? 2 : (anyInbound ? 1 : 0));
ledger.setDeliveryStatus(allShipped ? 5 : 1);
// ledger.setReviewStatus(1);
- ledger.setOrderStatus(1);
Long entryUserId = StringUtils.hasText(ledger.getEntryPerson()) ? Long.parseLong(ledger.getEntryPerson()) : 1L;
Long entryDeptId = 1L;
@@ -2975,7 +2979,6 @@
}
ledger.setStockStatus(allInbound ? 2 : (anyInbound ? 1 : 0));
ledger.setDeliveryStatus(allShipped ? 5 : 1);
- ledger.setOrderStatus(1);
Long entryUserId = StringUtils.hasText(ledger.getEntryPerson()) ? Long.parseLong(ledger.getEntryPerson()) : 1L;
Long entryDeptId = 1L;
@@ -4157,30 +4160,6 @@
);
}
- @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) {
@@ -4246,9 +4225,7 @@
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));
@@ -4281,7 +4258,7 @@
ledgerDto.setDeliveryStatusText(getDeliveryStatusText(ledger.getDeliveryStatus()));
ledgerDto.setStockStatusText(getStockStatusText(ledger.getStockStatus()));
ledgerDto.setReviewStatusText(getReviewStatusText(ledger.getReviewStatus()));
- ledgerDto.setOrderStatusText(getOrderStatusText(ledger.getOrderStatus()));
+
ledgerExportList.add(ledgerDto);
// 鏌ヨ璇ュ彴璐︾殑浜у搧鍒楄〃
@@ -4469,7 +4446,7 @@
sheetMap.put("宸ヨ壓璺嚎", sheetData);
}
- com.ruoyi.common.utils.excel.ExcelUtils.exportManySheet(response, "閿�鍞彴璐﹀伐鑹鸿矾绾垮鍑�", sheetMap);
+ ExcelUtils.exportManySheet(response, "閿�鍞彴璐﹀伐鑹鸿矾绾垮鍑�", sheetMap);
} catch (Exception e) {
log.error("瀵煎嚭鍞悗鍙拌处宸ヨ壓璺嚎澶辫触", e);
throw new ServiceException("瀵煎嚭鍞悗鍙拌处宸ヨ壓璺嚎澶辫触锛�" + e.getMessage());
@@ -4515,7 +4492,7 @@
private List<Object> buildProcessRouteRow(SalesLedger salesLedger, SalesLedgerProduct product, SalesLedgerProcessRouteRecord route) {
List<Object> row = new ArrayList<>();
- row.add(salesLedger.getEntryDate() == null ? "" : DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, salesLedger.getEntryDate()));
+ row.add(route.getCompletedTime() == null ? "" : route.getCompletedTime().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd")));
row.add(salesLedger.getSalesContractNo());
row.add(salesLedger.getCustomerName());
row.add(product == null ? "" : product.getSpecificationModel());
@@ -4689,15 +4666,4 @@
}
}
- private String getOrderStatusText(Integer status) {
- if (status == null || status == 0) return "杩涜涓�";
- switch (status) {
- case 0:
- return "杩涜涓�";
- case 1:
- return "宸插畬鎴�";
- default:
- return "杩涜涓�";
- }
- }
}
--
Gitblit v1.9.3