From 00ab993817c7cd9807052fdb643c03b4dc35b2a7 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 13 十一月 2025 22:16:49 +0800
Subject: [PATCH] #新增 1. 拣货完成后，保存历史进出入库历史
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 76 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index 37146fe..ebe1571 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -19,8 +19,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
-import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -97,6 +95,7 @@
params.add(locParams);
}
List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, null);
+ /**鐢熸垚娉㈡浠诲姟**/
generateOutTask(results, loginUserId, waves);
} catch (Exception e) {
log.error(e.getMessage());
@@ -104,9 +103,9 @@
}
List<Long> orderIds = waveItems.stream().map(WaveItem::getOrderId).collect(Collectors.toList());
/**淇敼鍑哄簱鍗曠姸鎬�*/
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
- .in(AsnOrder::getId, orderIds))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
+ .in(WkOrder::getId, orderIds))) {
throw new CoolException("鍑哄簱鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
return R.ok();
@@ -131,6 +130,10 @@
throw new CoolException("鏁版嵁閿欒锛� 娉㈡涓嶅瓨鍦紒锛�");
}
for (Wave wave : waves) {
+ if (wave.getExceStatus() > WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val) {
+ throw new CoolException("褰撳墠鐘舵�佹棤娉曚笅鍙戞墽琛岋紒锛�");
+ }
+
List<WaveItem> items = waveItemService.list(new LambdaQueryWrapper<WaveItem>().eq(WaveItem::getWaveId, wave.getId()));
if (items.isEmpty()) {
throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
@@ -205,6 +208,7 @@
.set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
.set(Wave::getWorkQty, taskItems.stream().mapToDouble(TaskItem::getAnfme).sum())
.set(Wave::getUpdateBy, loginUserId)
+ .set(Wave::getMemo, null)
.set(Wave::getUpdateTime, new Date())
.eq(Wave::getId, wave.getId()))) {
throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -227,6 +231,7 @@
if (Objects.isNull(wave)) {
throw new CoolException("娉㈡鍗曚笉瀛樺湪锛侊紒");
}
+
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
.eq(TaskItem::getSourceId, wave.getId()));
if (!taskItems.isEmpty()) {
@@ -239,7 +244,7 @@
}
List<Long> orderIds = orderRelas.stream().map(WaveOrderRela::getOrderItemId).collect(Collectors.toList());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, orderIds));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, orderIds));
orderItems.forEach(asnOrderItem -> {
asnOrderItem.setWorkQty(0.0);
if (!asnOrderItemService.updateById(asnOrderItem)) {
@@ -248,10 +253,10 @@
});
List<Long> orders = orderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getWorkQty, 0.0)
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .in(AsnOrder::getId, orders))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getWorkQty, 0.0)
+ .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .in(WkOrder::getId, orders))) {
throw new CoolException("鍗曟嵁鏇存柊澶辫触锛�!");
}
@@ -274,19 +279,48 @@
@Synchronized
@Transactional(rollbackFor = Exception.class)
public void generateOutTask(List<OrderOutItemDto> itemParams, Long loginUserId, Wave wave) throws Exception {
- for (OrderOutItemDto itemDto : itemParams) {
+ Map<Long, List<OrderOutItemDto>> listMap = itemParams.stream().collect(Collectors.groupingBy(OrderOutItemDto::getLocId));
+ listMap.keySet().forEach(id -> {
+ double sum = listMap.get(id).stream().mapToDouble(OrderOutItemDto::getAnfme).sum();
+ List<LocItem> items = new ArrayList<>();
+ //鐢熸垚鏄庣粏
+ listMap.get(id).forEach(orderOutItemDto -> {
+ items.add(orderOutItemDto.getLocItem());
+ });
+ //鑾峰彇涓嶄负绌虹珯鐐�
+ List<OrderOutItemDto> itemDtos = listMap.get(id).stream().filter(orderOutItemDto -> !Objects.isNull(orderOutItemDto.getSitesNo())).collect(Collectors.toList());
+ OrderOutItemDto itemDto = itemDtos.stream().findFirst().get();
+ itemDto.setAnfme(sum);
LocToTaskParams taskParams = new LocToTaskParams();
Loc loc = locService.getById(itemDto.getLocId());
- if (Objects.isNull(loc)) {
- continue;
- }
- taskParams.setItems(Arrays.asList(itemDto.getLocItem()))
- .setSiteNo(itemDto.getSiteNo())
+ taskParams.setItems(items)
+ .setSiteNo(itemDto.getSitesNo())
.setType(Constants.TASK_TYPE_WAVE_OUT_STOCK)
.setSourceId(wave.getId())
.setTarLoc(loc.getCode());
- locItemService.generateTask(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val, taskParams, loginUserId);
- }
+ //TODO 鐢熸垚鍑哄簱浠诲姟锛岃幏鍙栨尝娆″崟鎹俊鎭�
+ try {
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val, taskParams, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException("鍑哄簱浠诲姟鐢熸垚澶辫触锛�");
+ }
+ });
+
+// for (OrderOutItemDto itemDto : itemParams) {
+// LocToTaskParams taskParams = new LocToTaskParams();
+// Loc loc = locService.getById(itemDto.getLocId());
+// if (Objects.isNull(loc)) {
+// continue;
+// }
+// taskParams.setItems(Arrays.asList(itemDto.getLocItem()))
+// .setSiteNo(itemDto.getSitesNo())
+// .setType(Constants.TASK_TYPE_WAVE_OUT_STOCK)
+// .setSourceId(wave.getId())
+// .setTarLoc(loc.getCode());
+//
+// //TODO 鐢熸垚鍑哄簱浠诲姟锛岃幏鍙栨尝娆″崟鎹俊鎭�
+// locItemService.generateTask(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val, taskParams, loginUserId);
+// }
}
/**
@@ -346,9 +380,9 @@
.select("id", "loc_id", "loc_code", "order_id", "SUM(anfme) anfme", "SUM(qty) qty", "SUM(work_qty) work_qty", "splr_batch", "fields_index", "matnr_code")
.lambda()
.eq(LocItem::getMatnrCode, waveItem.getMatnrCode())
- .eq(LocItem::getSplrBatch, waveItem.getSplrBatch())
- .eq(StringUtils.isNotBlank(waveItem.getFieldsIndex()), LocItem::getFieldsIndex, waveItem.getFieldsIndex())
- .groupBy(LocItem::getMatnrCode, LocItem::getSplrBatch, LocItem::getFieldsIndex, LocItem::getId));
+ .eq(StringUtils.isNotEmpty(waveItem.getSplrBatch()), LocItem::getSplrBatch, waveItem.getSplrBatch())
+// .eq(StringUtils.isNotBlank(waveItem.getFieldsIndex()), LocItem::getFieldsIndex, waveItem.getFieldsIndex())
+ .groupBy(LocItem::getMatnrCode, LocItem::getSplrBatch, LocItem::getId));
List<Double> doubles1 = locItems.stream().map(LocItem::getAnfme).collect(Collectors.toList());
double[] doubles = doubles1.stream().mapToDouble(Double::doubleValue).toArray();
--
Gitblit v1.9.1