From 71725ae55cf54fa85be46f748528e2339643945c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 六月 2025 14:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 dc7c842..c4890eb 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
@@ -116,14 +116,21 @@
if (items.isEmpty()) {
throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
}
+
+ if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
+ .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val)
+ .in(WaveItem::getId, waveItems))) {
+ throw new CoolException("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
+ }
+
/**鐢熸垚鍑哄簱浠诲姟*/
try {
generateOutTask(items, loginUserId, waves);
} catch (Exception e) {
- log.error(e.getMessage());
- throw new CoolException("鍑哄簱浠诲姟鐢熸垚澶辫触锛侊紒锛�");
+ log.error("UNK", e);
+ throw new CoolException(e.getMessage());
}
- return null;
+ return R.ok();
}
/**
@@ -142,16 +149,19 @@
for (WaveItem param : itemParams) {
String locs = param.getStockLocs();
List<LocItem> locItems = JSONArray.parseArray(locs, LocItem.class);
- if (locItems.isEmpty()) {
- continue;
+ List<Long> list = new ArrayList<>();
+ if (Objects.isNull(locItems) || locItems.isEmpty()) {
+ //TODO
+ } else {
+ list = locItems.stream().map(LocItem::getLocId).collect(Collectors.toList());
}
- List<Long> list = locItems.stream().map(LocItem::getLocId).collect(Collectors.toList());
+
/**鏍规嵁渚涘簲鍟嗘壒娆★紝鐗╂枡鐮侊紝 鍔ㄦ�佸瓧娈垫煡璇㈡寚瀹氱殑鐗╂枡搴撳瓨淇℃伅*/
//TODO 杩欓噷闇�瑕佽鏍规嵁娉㈡瑙勫垯鏌ユ壘搴撳瓨淇℃伅
List<LocItem> items = locItemService.list(new LambdaQueryWrapper<LocItem>()
- .eq(LocItem::getSplrBatch, param.getSplrBatch())
- .in(LocItem::getLocId, list)
- .eq(StringUtils.isNotBlank(param.getFieldsIndex()), LocItem::getFieldsIndex, param.getFieldsIndex())
+ .eq(LocItem::getBatch, param.getSplrBatch())
+ .in(!list.isEmpty(), LocItem::getLocId, list)
+// .eq(StringUtils.isNotBlank(param.getFieldsIndex()), LocItem::getFieldsIndex, param.getFieldsIndex())
.eq(LocItem::getMatnrCode, param.getMatnrCode()));
if (items.isEmpty()) {
throw new CoolException("搴撳瓨淇℃伅鏈夊彉锛岃鍙栨秷褰撳墠娉㈡锛岀敓鏂扮敓鎴愭柊鐨勬尝娆★紒锛�");
@@ -190,10 +200,10 @@
throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
}
- List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, wave.getId()));
- if (items.isEmpty()) {
- throw new CoolException("娉㈡浠诲姟宸茬敓鎴愶紝涓嶈兘閲嶅鐢熸垚锛侊紒");
- }
+// List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, wave.getId()));
+// if (!items.isEmpty()) {
+// throw new CoolException("娉㈡浠诲姟宸茬敓鎴愶紝涓嶈兘閲嶅鐢熸垚锛侊紒");
+// }
task.setTaskCode(ruleCode)
.setTaskType(TaskType.TASK_TYPE_OUT.type)
@@ -214,7 +224,7 @@
TaskItem taskItem = new TaskItem();
BeanUtils.copyProperties(item, taskItem);
taskItem.setTaskId(task.getId())
- .setAnfme(waveItem.getAnfme())
+ .setAnfme(item.getAnfme())
.setId(null)
.setSourceCode(wave.getCode())
.setSourceId(wave.getId())
@@ -229,7 +239,7 @@
taskItems.forEach(item -> {
boolean update = waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
.eq(WaveItem::getId, item.getSource())
- .set(WaveItem::getExceStatus, AsnExceStatus)
+ .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_SEED.val)
.set(WaveItem::getWorkQty, item.getAnfme()));
if (!update) {
throw new CoolException("娉㈡鎵ц鏁伴噺淇敼澶辫触锛侊紒");
--
Gitblit v1.9.1