From e2079ea034c7f6bb5fc096fd4d83ed9b2cc3ff13 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 21 六月 2026 10:38:31 +0800
Subject: [PATCH] fix: 导入销售订单汇总修改
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 328 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 188 insertions(+), 140 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 7fdb825..1b4c7fc 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -483,7 +483,7 @@
salesLedger.setIsFh(isFh);
salesLedger.setIsEdit(!isFh);
-
+
// 鏍规嵁 reviewStatus 鎺у埗鍙嶅鐩稿叧瀛楁鐨勬樉绀�
if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() != 2) {
// 褰� reviewStatus 涓嶄负 2 鏃讹紝闅愯棌鍙嶅鏃堕棿銆佸弽瀹′汉鍜屽弽瀹′汉ID
@@ -788,11 +788,11 @@
salesLedgerProcessRouteService.saveBatch(salesLedgerProcessRouteList);
List<SalesLedgerProcessRoute> savedRoutes = salesLedgerProcessRouteService.list(new LambdaQueryWrapper<SalesLedgerProcessRoute>()
- .eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedger.getId())
- .eq(SalesLedgerProcessRoute::getProcessRouteId, processRoute.getId()));
+ .eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedger.getId())
+ .eq(SalesLedgerProcessRoute::getProcessRouteId, processRoute.getId()));
Map<Long, SalesLedgerProcessRoute> routeMap = savedRoutes.stream()
- .filter(item -> item.getProcessRouteItemId() != null)
- .collect(Collectors.toMap(SalesLedgerProcessRoute::getProcessRouteItemId, item -> item, (a, b) -> a));
+ .filter(item -> item.getProcessRouteItemId() != null)
+ .collect(Collectors.toMap(SalesLedgerProcessRoute::getProcessRouteItemId, item -> item, (a, b) -> a));
Map<Long, SalesLedgerProcessRouteRecord> inputRecordMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(salesLedgerProcessRouteDto.getRecordList())) {
@@ -1212,9 +1212,9 @@
SalesLedgerProcessRouteDto dto = new SalesLedgerProcessRouteDto();
List<SalesLedgerProcessRoute> list = baseMapper.selectSalesProcess(salesLedgerId);
List<SalesLedgerProcessRouteRecord> recordList = salesLedgerProcessRouteRecordService.list(
- new LambdaQueryWrapper<SalesLedgerProcessRouteRecord>()
- .eq(SalesLedgerProcessRouteRecord::getSalesLedgerId, salesLedgerId)
- .orderByAsc(SalesLedgerProcessRouteRecord::getId)
+ new LambdaQueryWrapper<SalesLedgerProcessRouteRecord>()
+ .eq(SalesLedgerProcessRouteRecord::getSalesLedgerId, salesLedgerId)
+ .orderByAsc(SalesLedgerProcessRouteRecord::getId)
);
if (CollectionUtils.isNotEmpty(list)) {
Long processRouteId = list.get(0).getProcessRouteId();
@@ -1244,8 +1244,8 @@
dto.setList(list);
if (CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(recordList)) {
Map<Long, Long> routeItemIdMap = list.stream()
- .filter(item -> item.getId() != null && item.getProcessRouteItemId() != null)
- .collect(Collectors.toMap(SalesLedgerProcessRoute::getId, SalesLedgerProcessRoute::getProcessRouteItemId, (a, b) -> a));
+ .filter(item -> item.getId() != null && item.getProcessRouteItemId() != null)
+ .collect(Collectors.toMap(SalesLedgerProcessRoute::getId, SalesLedgerProcessRoute::getProcessRouteItemId, (a, b) -> a));
recordList.forEach(record -> {
if (record != null && record.getSalesLedgerProcessRouteId() != null) {
record.setProcessRouteItemId(routeItemIdMap.get(record.getSalesLedgerProcessRouteId()));
@@ -2465,7 +2465,8 @@
}
SalesLedger ledger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>().eq(SalesLedger::getSalesContractNo, orderNo).last("LIMIT 1"));
if (ledger == null) {
- throw new ServiceException("瀵煎叆澶辫触,璁㈠崟缂栧彿[" + orderNo + "]涓嶅瓨鍦�,鏃犳硶琛ュ綍宸插彂璐ф暟鎹�");
+// throw new ServiceException("瀵煎叆澶辫触,璁㈠崟缂栧彿[" + orderNo + "]涓嶅瓨鍦�,鏃犳硶琛ュ綍宸插彂璐ф暟鎹�");
+ continue;
}
List<SalesLedgerProduct> dbProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId()).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
if (CollectionUtils.isEmpty(dbProducts)) {
@@ -2525,8 +2526,18 @@
shippingInfo.setType("璐ц溅");
shippingInfo.setShippingCarNumber("鏃�");
shippingInfo.setShippingDate(row.getReportDate());
- long existedShippingCount = shippingInfoMapper.selectCount(new LambdaQueryWrapper<ShippingInfo>().eq(ShippingInfo::getSalesLedgerId, ledger.getId()).eq(ShippingInfo::getSalesLedgerProductId, dbProduct.getId()).eq(StringUtils.hasText(row.getShippingNo()), ShippingInfo::getShippingNo, row.getShippingNo()).eq(row.getReportDate() != null, ShippingInfo::getShippingDate, row.getReportDate()));
+ long existedShippingCount = shippingInfoMapper.selectCount(new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerId, ledger.getId())
+ .eq(ShippingInfo::getSalesLedgerProductId, dbProduct.getId())
+ .eq(StringUtils.hasText(row.getShippingNo()), ShippingInfo::getShippingNo, row.getShippingNo())
+ .eq(row.getReportDate() != null, ShippingInfo::getShippingDate, row.getReportDate()));
if (existedShippingCount > 0) {
+// continue;
+ List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerId, ledger.getId())
+ .eq(ShippingInfo::getSalesLedgerProductId, dbProduct.getId())
+ .eq(StringUtils.hasText(row.getShippingNo()), ShippingInfo::getShippingNo, row.getShippingNo())
+ .eq(row.getReportDate() != null, ShippingInfo::getShippingDate, row.getReportDate()));
throw new ServiceException("瀵煎叆澶辫触,璁㈠崟缂栧彿[" + orderNo + "]瀛樺湪閲嶅鍙戣揣璁板綍,璇峰嬁閲嶅瀵煎叆");
}
shippingInfoMapper.insert(shippingInfo);
@@ -2551,6 +2562,7 @@
}
ledger.setStockStatus(allInbound ? 2 : (anyInbound ? 1 : 0));
ledger.setDeliveryStatus(allShipped ? 5 : 1);
+// ledger.setReviewStatus(1);
salesLedgerMapper.updateById(ledger);
}
}
@@ -2596,7 +2608,7 @@
}
Map<String, ProductModel> productModelKeyMap = productModelMapper.selectList(null).stream().filter(Objects::nonNull).filter(m -> m.getProductId() != null && StringUtils.hasText(m.getModel())).collect(Collectors.toMap(m -> buildProductModelKey(m.getProductId(), m.getModel()), Function.identity(), (a, b) -> a));
- List<String> extraProcessNames = Arrays.asList("鎵撳瓟", "鎸栫己", "瀹夊叏瑙�", "纾ㄨ竟");
+ List<String> extraProcessNames = Arrays.asList("鎵撳瓟", "鎸栫己", "瀹夊叏瑙�", "纾ㄨ竟", "绮剧（杈�", "杩愯垂", "鍔犳�ヨ垂");
Map<String, SalesLedgerProductProcess> processMap = salesLedgerProductProcessService.list(new LambdaQueryWrapper<SalesLedgerProductProcess>().in(SalesLedgerProductProcess::getProcessName, extraProcessNames)).stream().filter(Objects::nonNull).filter(p -> StringUtils.hasText(p.getProcessName())).collect(Collectors.toMap(SalesLedgerProductProcess::getProcessName, Function.identity(), (a, b) -> a));
List<ProcessRoute> processRoutes = processRouteMapper.selectList(new LambdaQueryWrapper<ProcessRoute>().eq(ProcessRoute::getProductModelId, 0L));
Map<String, ProcessRoute> routeNameMap = processRoutes.stream().filter(Objects::nonNull).filter(r -> StringUtils.hasText(r.getProcessRouteName())).collect(Collectors.toMap(r -> normalizeRouteFlowKey(r.getProcessRouteName()), Function.identity(), this::chooseBetterRoute));
@@ -2640,6 +2652,7 @@
ledger.setDeliveryDate(first.getDeliveryDeadline() == null ? (first.getReportDate() == null ? LocalDate.now().plusDays(7) : DateUtils.toLocalDate(first.getReportDate()).plusDays(7)) : DateUtils.toLocalDate(first.getDeliveryDeadline()));
ledger.setDeliveryStatus(1);
ledger.setStockStatus(0);
+ ledger.setReviewStatus(0);
ledger.setCustomerId(customer.getId());
ledger.setCustomerContractNo(StringUtils.hasText(ledger.getCustomerContractNo()) ? ledger.getCustomerContractNo() : customer.getTaxpayerIdentificationNumber());
@@ -2647,6 +2660,7 @@
ledger.setContractAmount(BigDecimal.ZERO);
salesLedgerMapper.insert(ledger);
bindImportProcessRoute(ledger.getId(), rowList, routeNameMap, routeItemMap);
+ int reviewCount = 0;
BigDecimal contractAmount = BigDecimal.ZERO;
for (SalesNotShippingImportDto row : rowList) {
@@ -2695,6 +2709,9 @@
product.setPendingInvoiceTotal(lineAmount);
product.fillRemainingQuantity();
salesLedgerProductMapper.insert(product);
+ if (StringUtils.isNotEmpty(row.getAuditor())) {
+ reviewCount++;
+ }
List<SalesLedgerProductProcess> bindProcessList = buildImportProcessBinds(row, processMap);
if (CollectionUtils.isNotEmpty(bindProcessList)) {
@@ -2706,6 +2723,10 @@
}
ledger.setContractAmount(contractAmount);
+ if (reviewCount == rowList.size()) {
+ ledger.setReviewStatus(1);
+ }
+
salesLedgerMapper.updateById(ledger);
}
}
@@ -2716,6 +2737,9 @@
mergeProcessQuantity(processQuantityMap, "鎸栫己", toProcessQuantity(row.getNotching()));
mergeProcessQuantity(processQuantityMap, "瀹夊叏瑙�", toProcessQuantity(row.getSafetyCorner()));
mergeProcessQuantity(processQuantityMap, "纾ㄨ竟", toProcessQuantity(row.getGrindingIrregular()));
+ mergeProcessQuantity(processQuantityMap, "绮剧（杈�", toProcessQuantity(row.getFineGrinding()));
+ mergeProcessQuantity(processQuantityMap, "杩愯垂", toProcessQuantity(row.getFreightFee()));
+ mergeProcessQuantity(processQuantityMap, "鍔犳�ヨ垂", toProcessQuantity(row.getUrgentFee()));
List<SalesLedgerProductProcess> result = new ArrayList<>();
for (Map.Entry<String, Integer> entry : processQuantityMap.entrySet()) {
@@ -2915,6 +2939,7 @@
created.setProductId(product.getId());
created.setModel(modelName.trim());
created.setThickness(thickness);
+ created.setUnit("mm");
productModelMapper.insert(created);
productModelKeyMap.put(key, created);
return created;
@@ -3032,7 +3057,11 @@
String shippingNo = StringUtils.hasText(row.getShippingNo()) ? row.getShippingNo().trim() : "";
String dateStr = row.getReportDate() == null ? "" : String.valueOf(row.getReportDate().getTime());
String subCategory = StringUtils.hasText(row.getProductSubCategory()) ? row.getProductSubCategory().trim() : "";
- return ledgerId + "|" + subCategory + "|" + shippingNo + "|" + dateStr + "|" + defaultDecimal(row.getQuantity());
+ Long sequence = row.getSequence();
+ if (sequence == null) {
+ throw new ServiceException("鏂板澶辫触,瀵煎叆鍑哄簱鍗曠紪鍙蜂负绌�");
+ }
+ return ledgerId + "|" + subCategory + "|" + shippingNo + "|" + dateStr + "|" + defaultDecimal(row.getQuantity()) + "|" + sequence;
}
private void createShippingQualityInspect(SalesLedger ledger, SalesLedgerProduct dbProduct, SalesShippingImportDto row, BigDecimal inspectQty) {
@@ -3404,7 +3433,7 @@
baseMapper.updateById(salesLedger);
}
-
+
/**
* 澶勭悊閿�鍞彴璐﹀弽瀹￠�昏緫
* 1. 璁剧疆鍙嶅鐩稿叧淇℃伅锛堟椂闂淬�佷汉鍛橈級
@@ -3475,8 +3504,8 @@
// 澶嶅埗浜у搧鍒版柊鍙拌处
List<SalesLedgerProduct> originalProducts = salesLedgerProductMapper.selectList(
- Wrappers.<SalesLedgerProduct>lambdaQuery()
- .eq(SalesLedgerProduct::getSalesLedgerId, id)
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .eq(SalesLedgerProduct::getSalesLedgerId, id)
);
for (SalesLedgerProduct originalProduct : originalProducts) {
SalesLedgerProduct newProduct = new SalesLedgerProduct();
@@ -3509,15 +3538,15 @@
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);
@@ -3529,16 +3558,16 @@
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)
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .eq(SalesLedgerProduct::getSalesLedgerId, originalSalesLedgerId)
);
-
+
for (SalesLedgerProduct originalProduct : originalProducts) {
// 5.1 鍒涘缓鏂颁骇鍝佽褰曪紝澶嶅埗鍘熶骇鍝佹暟鎹�
SalesLedgerProduct newProduct = new SalesLedgerProduct();
@@ -3553,20 +3582,20 @@
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());
}
@@ -3577,8 +3606,8 @@
private void clearQualityInspectRecords(Long originalSalesLedgerId) {
// 鍒犻櫎涓庡師璁㈠崟鍏宠仈鐨勮川妫�璁板綍
qualityInspectMapper.delete(
- Wrappers.<QualityInspect>lambdaQuery()
- .eq(QualityInspect::getPurchaseLedgerId, originalSalesLedgerId)
+ Wrappers.<QualityInspect>lambdaQuery()
+ .eq(QualityInspect::getPurchaseLedgerId, originalSalesLedgerId)
);
}
@@ -3588,27 +3617,27 @@
private void clearShippingAndApprovalRecords(Long originalSalesLedgerId) {
// 1. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊彂璐т俊鎭�
List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(
- Wrappers.<ShippingInfo>lambdaQuery()
- .eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
+ Wrappers.<ShippingInfo>lambdaQuery()
+ .eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
);
-
+
// 2. 鍒犻櫎鍙戣揣瀹℃壒璁板綍
if (!CollectionUtils.isEmpty(shippingInfos)) {
List<Long> shippingInfoIds = shippingInfos.stream()
- .map(ShippingInfo::getId)
- .collect(Collectors.toList());
-
+ .map(ShippingInfo::getId)
+ .collect(Collectors.toList());
+
shipmentApprovalMapper.delete(
- Wrappers.<ShipmentApproval>lambdaQuery()
- .eq(ShipmentApproval::getSalesLedgerId, originalSalesLedgerId)
- .or()
- .in(ShipmentApproval::getShippingInfoId, shippingInfoIds)
+ Wrappers.<ShipmentApproval>lambdaQuery()
+ .eq(ShipmentApproval::getSalesLedgerId, originalSalesLedgerId)
+ .or()
+ .in(ShipmentApproval::getShippingInfoId, shippingInfoIds)
);
-
+
// 3. 鍒犻櫎鍙戣揣淇℃伅璁板綍
shippingInfoMapper.delete(
- Wrappers.<ShippingInfo>lambdaQuery()
- .eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
+ Wrappers.<ShippingInfo>lambdaQuery()
+ .eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
);
}
}
@@ -3619,26 +3648,26 @@
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)
+ 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)
+ 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); // 鏍囪涓哄凡鍒犻櫎
@@ -3654,10 +3683,10 @@
private void processOriginalOrderStock(Long originalSalesLedgerId) {
// 1. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊叆搴撹褰�
List<StockInRecord> stockInRecords = stockInRecordMapper.selectList(
- Wrappers.<StockInRecord>lambdaQuery()
- .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
+ Wrappers.<StockInRecord>lambdaQuery()
+ .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
);
-
+
// 2. 鍒犻櫎鍏ュ簱璁板綍骞舵墸鍑忓簱瀛�
for (StockInRecord stockInRecord : stockInRecords) {
// 浠庡簱瀛樿〃涓墸鍑忕浉搴旀暟閲�
@@ -3666,19 +3695,19 @@
stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
}
-
+
// 3. 鍒犻櫎鎵�鏈夊叆搴撹褰�
stockInRecordMapper.delete(
- Wrappers.<StockInRecord>lambdaQuery()
- .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
+ Wrappers.<StockInRecord>lambdaQuery()
+ .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
);
-
+
// 4. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊嚭搴撹褰�
List<StockOutRecord> stockOutRecords = stockOutRecordMapper.selectList(
- Wrappers.<StockOutRecord>lambdaQuery()
- .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
+ Wrappers.<StockOutRecord>lambdaQuery()
+ .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
);
-
+
// 5. 鍒犻櫎鍑哄簱璁板綍骞跺鍔犲簱瀛�
for (StockOutRecord stockOutRecord : stockOutRecords) {
// 鍚戝簱瀛樿〃涓鍔犵浉搴旀暟閲�
@@ -3687,11 +3716,11 @@
stockInventoryDto.setQualitity(stockOutRecord.getStockOutNum());
stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
}
-
+
// 6. 鍒犻櫎鎵�鏈夊嚭搴撹褰�
stockOutRecordMapper.delete(
- Wrappers.<StockOutRecord>lambdaQuery()
- .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
+ Wrappers.<StockOutRecord>lambdaQuery()
+ .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
);
}
@@ -3714,9 +3743,9 @@
}
}
salesLedgerMapper.update(null,
- Wrappers.<SalesLedger>lambdaUpdate()
- .in(SalesLedger::getId, ids)
- .set(SalesLedger::getOrderStatus, 1)
+ Wrappers.<SalesLedger>lambdaUpdate()
+ .in(SalesLedger::getId, ids)
+ .set(SalesLedger::getOrderStatus, 1)
);
}
@@ -3735,16 +3764,16 @@
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)
+ 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)
+ Wrappers.<SalesLedger>lambdaUpdate()
+ .eq(SalesLedger::getId, id)
+ .set(SalesLedger::getDocumentPrintCount, currentCount + 1)
);
}
}
@@ -3756,8 +3785,8 @@
Page<SalesLedger> page = new Page<>(-1, -1);
// 浣跨敤 Wrappers 鏋勫缓鍗囧簭鏌ヨ
LambdaQueryWrapper<SalesLedger> queryWrapper = Wrappers.<SalesLedger>lambdaQuery()
- .orderByAsc(SalesLedger::getEntryDate)
- .orderByAsc(SalesLedger::getId);
+ .orderByAsc(SalesLedger::getEntryDate)
+ .orderByAsc(SalesLedger::getId);
// 娣诲姞鏌ヨ鏉′欢
if (salesLedgerDto.getCustomerName() != null && !salesLedgerDto.getCustomerName().isEmpty()) {
@@ -3789,7 +3818,7 @@
}
if (salesLedgerDto.getReviewStatusList() != null && !salesLedgerDto.getReviewStatusList().isEmpty()) {
queryWrapper.and(w -> w.in(SalesLedger::getReviewStatus, salesLedgerDto.getReviewStatusList())
- .or().isNull(SalesLedger::getReviewStatus));
+ .or().isNull(SalesLedger::getReviewStatus));
}
IPage<SalesLedger> ledgerPage = salesLedgerMapper.selectPage(page, queryWrapper);
@@ -3810,9 +3839,9 @@
ledgerDto.setEntryPersonName(ledger.getEntryPersonName());
ledgerDto.setEntryDate(ledger.getEntryDate());
ledgerDto.setExecutionDate(ledger.getExecutionDate() != null ?
- java.sql.Date.valueOf(ledger.getExecutionDate()) : null);
+ java.sql.Date.valueOf(ledger.getExecutionDate()) : null);
ledgerDto.setDeliveryDate(ledger.getDeliveryDate() != null ?
- java.sql.Date.valueOf(ledger.getDeliveryDate()) : null);
+ java.sql.Date.valueOf(ledger.getDeliveryDate()) : null);
ledgerDto.setContractAmount(ledger.getContractAmount());
ledgerDto.setRemarks(ledger.getRemarks());
ledgerDto.setCustomerRemarks(ledger.getCustomerRemarks());
@@ -3824,9 +3853,9 @@
// 鏌ヨ璇ュ彴璐︾殑浜у搧鍒楄〃
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
- Wrappers.<SalesLedgerProduct>lambdaQuery()
- .eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId())
- .eq(SalesLedgerProduct::getType, 1)
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId())
+ .eq(SalesLedgerProduct::getType, 1)
);
for (SalesLedgerProduct product : products) {
@@ -3897,11 +3926,11 @@
}
LambdaQueryWrapper<SalesLedgerProcessRouteRecord> queryWrapper = Wrappers.<SalesLedgerProcessRouteRecord>lambdaQuery()
- .eq(SalesLedgerProcessRouteRecord::getIsCompleted, 1)
- .ge(SalesLedgerProcessRouteRecord::getCompletedTime, startTime)
- .le(SalesLedgerProcessRouteRecord::getCompletedTime, endTime)
- .orderByAsc(SalesLedgerProcessRouteRecord::getCompletedTime)
- .orderByAsc(SalesLedgerProcessRouteRecord::getId);
+ .eq(SalesLedgerProcessRouteRecord::getIsCompleted, 1)
+ .ge(SalesLedgerProcessRouteRecord::getCompletedTime, startTime)
+ .le(SalesLedgerProcessRouteRecord::getCompletedTime, endTime)
+ .orderByAsc(SalesLedgerProcessRouteRecord::getCompletedTime)
+ .orderByAsc(SalesLedgerProcessRouteRecord::getId);
if (CollectionUtils.isNotEmpty(salesLedgerIds)) {
queryWrapper.in(SalesLedgerProcessRouteRecord::getSalesLedgerId, salesLedgerIds);
@@ -3915,45 +3944,45 @@
if (CollectionUtils.isNotEmpty(completedRoutes)) {
List<Long> routeSalesLedgerIds = completedRoutes.stream()
- .map(SalesLedgerProcessRouteRecord::getSalesLedgerId)
- .filter(Objects::nonNull)
- .distinct()
- .collect(Collectors.toList());
+ .map(SalesLedgerProcessRouteRecord::getSalesLedgerId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
List<Long> salesLedgerProcessRouteIds = completedRoutes.stream()
- .map(SalesLedgerProcessRouteRecord::getSalesLedgerProcessRouteId)
- .filter(Objects::nonNull)
- .distinct()
- .collect(Collectors.toList());
+ .map(SalesLedgerProcessRouteRecord::getSalesLedgerProcessRouteId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(routeSalesLedgerIds)) {
salesLedgerMap = salesLedgerMapper.selectBatchIds(routeSalesLedgerIds).stream()
- .filter(Objects::nonNull)
- .collect(Collectors.toMap(SalesLedger::getId, item -> item, (a, b) -> a));
+ .filter(Objects::nonNull)
+ .collect(Collectors.toMap(SalesLedger::getId, item -> item, (a, b) -> a));
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
- .in(SalesLedgerProduct::getSalesLedgerId, routeSalesLedgerIds)
- .eq(SalesLedgerProduct::getType, 1)
- .orderByAsc(SalesLedgerProduct::getSalesLedgerId)
- .orderByAsc(SalesLedgerProduct::getId));
+ .in(SalesLedgerProduct::getSalesLedgerId, routeSalesLedgerIds)
+ .eq(SalesLedgerProduct::getType, 1)
+ .orderByAsc(SalesLedgerProduct::getSalesLedgerId)
+ .orderByAsc(SalesLedgerProduct::getId));
productMap = products.stream().collect(Collectors.groupingBy(
- SalesLedgerProduct::getSalesLedgerId,
- LinkedHashMap::new,
- Collectors.toList()
+ SalesLedgerProduct::getSalesLedgerId,
+ LinkedHashMap::new,
+ Collectors.toList()
));
}
if (CollectionUtils.isNotEmpty(salesLedgerProcessRouteIds)) {
routeMap = salesLedgerProcessRouteService.listByIds(salesLedgerProcessRouteIds).stream()
- .filter(Objects::nonNull)
- .collect(Collectors.toMap(SalesLedgerProcessRoute::getId, item -> item, (a, b) -> a));
+ .filter(Objects::nonNull)
+ .collect(Collectors.toMap(SalesLedgerProcessRoute::getId, item -> item, (a, b) -> a));
List<Long> processRouteItemIds = routeMap.values().stream()
- .map(SalesLedgerProcessRoute::getProcessRouteItemId)
- .filter(Objects::nonNull)
- .distinct()
- .collect(Collectors.toList());
+ .map(SalesLedgerProcessRoute::getProcessRouteItemId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(processRouteItemIds)) {
processRouteItemMap = processRouteItemMapper.selectBatchIds(processRouteItemIds).stream()
- .filter(Objects::nonNull)
- .collect(Collectors.toMap(ProcessRouteItem::getId, item -> item, (a, b) -> a));
+ .filter(Objects::nonNull)
+ .collect(Collectors.toMap(ProcessRouteItem::getId, item -> item, (a, b) -> a));
}
}
}
@@ -3970,8 +3999,8 @@
final Map<Long, ProcessRouteItem> finalProcessRouteItemMap = processRouteItemMap;
LinkedHashMap<String, List<List<Object>>> sheetMap = new LinkedHashMap<>();
List<Long> orderedProcessRouteItemIds = routeGroupMap.keySet().stream()
- .sorted((left, right) -> compareProcessRouteItem(left, right, finalProcessRouteItemMap))
- .collect(Collectors.toList());
+ .sorted((left, right) -> compareProcessRouteItem(left, right, finalProcessRouteItemMap))
+ .collect(Collectors.toList());
for (Long processRouteItemId : orderedProcessRouteItemIds) {
ProcessRouteItem processRouteItem = finalProcessRouteItemMap.get(processRouteItemId);
@@ -4082,7 +4111,7 @@
}
if (product.getWidth() != null && product.getHeight() != null) {
BigDecimal area = product.getWidth().multiply(product.getHeight())
- .divide(new BigDecimal("1000000"), 2, RoundingMode.HALF_UP);
+ .divide(new BigDecimal("1000000"), 2, RoundingMode.HALF_UP);
return area.multiply(qty).setScale(2, RoundingMode.HALF_UP);
}
return BigDecimal.ZERO;
@@ -4090,8 +4119,8 @@
private String buildUniqueSheetName(Map<String, List<List<Object>>> sheetMap, ProcessRouteItem processRouteItem, Long processRouteItemId) {
String baseName = processRouteItem != null && StringUtils.hasText(processRouteItem.getProcessName())
- ? processRouteItem.getProcessName()
- : "宸ュ簭" + processRouteItemId;
+ ? processRouteItem.getProcessName()
+ : "宸ュ簭" + processRouteItemId;
baseName = sanitizeSheetName(baseName);
String sheetName = baseName;
int suffix = 2;
@@ -4180,43 +4209,62 @@
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 "鏈煡";
+ 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 "鏈煡";
+ 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 "寰呭鏍�";
+ 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 "杩涜涓�";
+ case 0:
+ return "杩涜涓�";
+ case 1:
+ return "宸插畬鎴�";
+ default:
+ return "杩涜涓�";
}
}
}
--
Gitblit v1.9.3