From f99e3966686d3891b814ff28d200b001fcdc8e1e Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 12:54:26 +0800
Subject: [PATCH] 组托优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 153 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java
index ba1f45c..1d8a278 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java
@@ -6,6 +6,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.ReviseLogParams;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.CommonExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
@@ -17,6 +18,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -40,6 +44,12 @@
@Autowired
private ReviseLogItemService reviseLogItemService;
+
+ @Autowired
+ private OutStockService outStockService;
+
+ @Autowired
+ private OutStockItemService outStockItemService;
/**
* 搴撳瓨璋冩暣鍗曟槑缁嗘坊鍔�
@@ -86,7 +96,7 @@
Double sum = locItems.stream().mapToDouble(LocItem::getAnfme).sum();
- locRevise.setAnfme(Math.round((sum + locRevise.getAnfme()) * 10000) / 10000.0);
+ locRevise.setAnfme(Math.round((sum + locRevise.getAnfme()) * 1000000) / 1000000.0);
});
locRevise.setExceStatus(CommonExceStatus.COMMON_EXCE_STATUS_UN_EXCE.val);
@@ -122,33 +132,164 @@
if (logItems.isEmpty()) {
throw new CoolException("璋冩暣鏄庣粏涓虹┖!!");
}
- Map<Long, List<ReviseLogItem>> listMap = logItems.stream().collect(Collectors.groupingBy(ReviseLogItem::getLocId));
- listMap.keySet().forEach(items -> {
- Loc loc = locService.getById(items);
+ // 鎸夊簱浣岻D鍒嗙粍锛屽鏋渓ocId涓簄ull鍒欐寜locCode鍒嗙粍
+ Map<String, List<ReviseLogItem>> listMap = logItems.stream()
+ .filter(item -> item.getLocCode() != null && !item.getLocCode().isEmpty())
+ .collect(Collectors.groupingBy(item -> {
+ // 浼樺厛浣跨敤locId锛屽鏋滀负null鍒欎娇鐢╨ocCode浣滀负key
+ return item.getLocId() != null ? String.valueOf(item.getLocId()) : item.getLocCode();
+ }));
+
+ // 浼樺寲锛氬湪寰幆澶栨煡璇㈡墍鏈夋湭瀹屾垚鐨勫嚭搴撳崟鍜屾槑缁嗭紝閬垮厤閲嶅鏌ヨ
+ // 鏌ヨ鎵�鏈夋湭瀹屾垚鐨勫嚭搴撳崟鐘舵�侊細鍒濆鍖栥�佸緟澶勭悊銆佺敓鎴愭尝娆°�佺敓鎴愬伐浣滄。銆佷綔涓氫腑
+ List<WkOrder> outOrders = outStockService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
+ .in(WkOrder::getExceStatus,
+ AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val,
+ AsnExceStatus.OUT_STOCK_STATUS_TASK_EXCE.val,
+ AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val,
+ AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val,
+ AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val));
+
+ // 棰勫厛鏌ヨ鎵�鏈夊嚭搴撳崟鐨勬槑缁嗭紝寤虹珛绱㈠紩浠ユ彁楂樻煡璇㈡晥鐜�
+ Map<Long, List<WkOrderItem>> orderItemsMap = new HashMap<>();
+ Map<Long, Boolean> orderHasItemsMap = new HashMap<>();
+ if (!outOrders.isEmpty()) {
+ Set<Long> orderIds = outOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
+ List<WkOrderItem> allOrderItems = outStockItemService.list(
+ new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getOrderId, orderIds));
+
+ // 鎸塷rderId鍒嗙粍寤虹珛绱㈠紩
+ orderItemsMap = allOrderItems.stream()
+ .collect(Collectors.groupingBy(WkOrderItem::getOrderId));
+
+ // 璁板綍姣忎釜鍑哄簱鍗曟槸鍚︽湁鏄庣粏
+ for (Long orderId : orderIds) {
+ orderHasItemsMap.put(orderId, orderItemsMap.containsKey(orderId) && !orderItemsMap.get(orderId).isEmpty());
+ }
+ }
+
+ // 浣跨敤final鍙橀噺浠ヤ究鍦╨ambda涓娇鐢�
+ final Map<Long, List<WkOrderItem>> finalOrderItemsMap = orderItemsMap;
+ final Map<Long, Boolean> finalOrderHasItemsMap = orderHasItemsMap;
+
+ // 鎵归噺鏀堕泦闇�瑕佸垱寤虹殑WkOrderItem
+ List<WkOrderItem> newOrderItems = new ArrayList<>();
+
+ listMap.keySet().forEach(key -> {
+ List<ReviseLogItem> reviseItems = listMap.get(key);
+ if (Objects.isNull(reviseItems) || reviseItems.isEmpty()) {
+ throw new CoolException("璋冩暣鏄庣粏涓虹┖锛侊紒");
+ }
+
+ // 鑾峰彇绗竴涓槑缁嗙殑搴撲綅淇℃伅
+ ReviseLogItem firstItem = reviseItems.get(0);
+ String locCode = firstItem.getLocCode();
+ Long locId = firstItem.getLocId();
+
+ // 鏌ヨ搴撲綅锛氫紭鍏堜娇鐢╨ocId锛屽鏋滀负null鍒欎娇鐢╨ocCode
+ Loc loc = null;
+ if (locId != null) {
+ loc = locService.getById(locId);
+ }
+ if (loc == null && locCode != null && !locCode.isEmpty()) {
+ loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode).eq(Loc::getDeleted, 0));
+ }
+
if (Objects.isNull(loc)) {
- throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒搴撲綅缂栫爜:" + locCode + ", 搴撲綅ID:" + locId);
}
- List<LocItem> list = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
- if (!list.isEmpty()) {
- throw new CoolException("搴撲綅:" + loc.getCode() + ", 璋冩暣淇℃伅涓虹┖锛侊紒");
- }
+
+ // 鍒犻櫎鍘熷簱浣嶇殑搴撳瓨鏄庣粏锛堝鏋滃瓨鍦級
locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
- listMap.get(items).forEach(logItem -> {
+
+ Loc finalLoc = loc;
+ reviseItems.forEach(logItem -> {
LocItem locDetl = new LocItem();
BeanUtils.copyProperties(logItem, locDetl);
- locDetl.setLocId(loc.getId())
+ locDetl.setLocId(finalLoc.getId())
.setType(OrderType.ORDER_REVISE.type)
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type))
- .setLocCode(loc.getCode())
+ .setLocCode(finalLoc.getCode())
.setAnfme(logItem.getReviseQty())
+ // 濡傛灉batch涓嶄负绌猴紝鍚屾椂璁剧疆splrBatch锛屼互渚挎煡璇㈡椂鑳藉尮閰�
+ .setSplrBatch(StringUtils.isNotBlank(logItem.getBatch()) ? logItem.getBatch() : null)
.setUpdateBy(loginUserId)
.setId(null)
.setCreateBy(loginUserId);
if (!locItemService.save(locDetl)) {
throw new CoolException("搴撳瓨鏄庣粏淇濆瓨澶辫触锛侊紒");
}
+
+ // 涓哄簱瀛樿皟鏁翠骇鐢熺殑搴撳瓨鍒涘缓瀵瑰簲鐨刉kOrderItem
+ // 閬嶅巻鎵�鏈夋湭瀹屾垚鐨勫嚭搴撳崟锛屾鏌ユ槸鍚﹂渶瑕佽繖浜涚墿鏂�
+ for (WkOrder outOrder : outOrders) {
+ // 浠庨鍔犺浇鐨勭储寮曚腑鏌ユ壘璇ュ嚭搴撳崟鐨勬槑缁�
+ List<WkOrderItem> orderItems = finalOrderItemsMap.getOrDefault(outOrder.getId(), new ArrayList<>());
+
+ // 妫�鏌ヨ鍑哄簱鍗曟槸鍚﹀凡鏈夊尮閰嶇殑鏄庣粏
+ boolean hasMatchingItem = orderItems.stream().anyMatch(item -> {
+ // 鐗╂枡ID蹇呴』鍖归厤
+ if (!Objects.equals(item.getMatnrId(), logItem.getMatnrId())) {
+ return false;
+ }
+
+ // 濡傛灉鏈夋壒娆′俊鎭紝闇�瑕佸尮閰嶆壒娆�
+ if (StringUtils.isNotBlank(logItem.getBatch())) {
+ boolean batchMatch = Objects.equals(item.getBatch(), logItem.getBatch()) ||
+ Objects.equals(item.getSplrBatch(), logItem.getBatch());
+ if (!batchMatch) {
+ return false;
+ }
+ }
+
+ // 濡傛灉鏈夊瓧娈电储寮曪紝闇�瑕佸尮閰�
+ if (StringUtils.isNotBlank(logItem.getFieldsIndex())) {
+ if (!Objects.equals(item.getFieldsIndex(), logItem.getFieldsIndex())) {
+ return false;
+ }
+ }
+
+ return true;
+ });
+
+ // 濡傛灉璇ュ嚭搴撳崟闇�瑕佽繖涓墿鏂欎絾娌℃湁瀵瑰簲鐨勬槑缁嗭紝鍒欏垱寤�
+ if (!hasMatchingItem) {
+ // 涓烘墍鏈夋湭瀹屾垚鐨勫嚭搴撳崟鍒涘缓WkOrderItem锛屽嵆浣垮嚭搴撳崟娌℃湁鍏朵粬鏄庣粏
+ // 鍥犱负搴撳瓨璋冩暣鐨勭墿鏂欏彲鑳介渶瑕佸嚭搴�
+ WkOrderItem newOrderItem = new WkOrderItem();
+ newOrderItem.setOrderId(outOrder.getId())
+ .setOrderCode(outOrder.getCode())
+ .setMatnrId(logItem.getMatnrId())
+ .setMatnrCode(logItem.getMatnrCode())
+ .setMaktx(logItem.getMaktx())
+ .setBatch(logItem.getBatch())
+ // 濡傛灉batch涓嶄负绌猴紝鍚屾椂璁剧疆splrBatch锛屼互渚挎煡璇㈡椂鑳藉尮閰�
+ .setSplrBatch(StringUtils.isNotBlank(logItem.getBatch()) ? logItem.getBatch() : null)
+ .setFieldsIndex(logItem.getFieldsIndex())
+ .setAnfme(logItem.getReviseQty())
+ .setWorkQty(0.0)
+ .setStockUnit(logItem.getUnit())
+ .setPurUnit(logItem.getUnit())
+ .setSpec(logItem.getSpec())
+ .setModel(logItem.getModel())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date());
+
+ newOrderItems.add(newOrderItem);
+ }
+ }
});
});
+
+ // 鎵归噺淇濆瓨WkOrderItem锛屽噺灏戞暟鎹簱鎿嶄綔娆℃暟
+ if (!newOrderItems.isEmpty()) {
+ if (!outStockItemService.saveBatch(newOrderItems)) {
+ throw new CoolException("搴撳瓨璋冩暣鍗曟嵁鏄庣粏鍒涘缓澶辫触锛侊紒");
+ }
+ }
revise.setExceStatus(CommonExceStatus.COMMON_EXCE_STATUS_TASK_DONE.val);
if (!locReviseService.updateById(revise)) {
throw new CoolException("璋冩暣鍗曚慨鏀瑰け璐ワ紒锛�");
--
Gitblit v1.9.1