From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +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 | 42 +++++++++++++++---------------------------
1 files changed, 15 insertions(+), 27 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 53d92c7..0b07961 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
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.mapper.WaveMapper;
import com.vincent.rsf.server.manager.service.*;
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;
@@ -118,12 +119,10 @@
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("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
+ for (int i = 0; i < items.size(); i++) {
+ List<LocItem> locItems = LocManageUtil.getEfficiencyFirstItemList(items.get(i).getMatnrCode(), items.get(i).getSplrBatch(), items.get(i).getAnfme());
+ items.get(i).setStockLocs(JSONArray.toJSONString(locItems)).setStockQty(items.get(i).getAnfme());
}
-
/**鐢熸垚鍑哄簱浠诲姟*/
try {
generateOutTask(items, loginUserId, waves);
@@ -131,6 +130,13 @@
log.error("UNK", e);
throw new CoolException(e.getMessage());
}
+
+ if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
+ .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val)
+ .in(WaveItem::getId, waveItems))) {
+ throw new CoolException("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
+ }
+
return R.ok();
}
@@ -150,31 +156,14 @@
for (WaveItem param : itemParams) {
String locs = param.getStockLocs();
List<LocItem> locItems = JSONArray.parseArray(locs, LocItem.class);
- List<Long> list = new ArrayList<>();
- if (Objects.isNull(locItems) || locItems.isEmpty()) {
- //TODO
- } else {
- list = locItems.stream().map(LocItem::getLocId).collect(Collectors.toList());
- }
-
- /**鏍规嵁渚涘簲鍟嗘壒娆★紝鐗╂枡鐮侊紝 鍔ㄦ�佸瓧娈垫煡璇㈡寚瀹氱殑鐗╂枡搴撳瓨淇℃伅*/
- //TODO 杩欓噷闇�瑕佽鏍规嵁娉㈡瑙勫垯鏌ユ壘搴撳瓨淇℃伅
- List<LocItem> items = locItemService.list(new LambdaQueryWrapper<LocItem>()
- .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("搴撳瓨淇℃伅鏈夊彉锛岃鍙栨秷褰撳墠娉㈡锛岀敓鏂扮敓鎴愭柊鐨勬尝娆★紒锛�");
- }
/***灏嗘湁璐ф湁鐨勬槑缁嗕俊鎭瓨鏀惧埌搴撲綅淇℃伅涓�*/
- for (int i = 0; i < items.size(); i++) {
- items.get(i)
+ for (int i = 0; i < locItems.size(); i++) {
+ locItems.get(i)
.setSourceId(param.getWaveId())
.setSourceCode(param.getWaveCode())
.setSource(param.getId());
}
- locItemList.addAll(items);
+ locItemList.addAll(locItems);
}
if (locItemList.isEmpty()) {
throw new CoolException("娌℃湁鍚堥�傚簱浣嶏紒锛�");
@@ -205,7 +194,6 @@
// if (!items.isEmpty()) {
// throw new CoolException("娉㈡浠诲姟宸茬敓鎴愶紝涓嶈兘閲嶅鐢熸垚锛侊紒");
// }
-
task.setTaskCode(ruleCode)
.setTaskType(TaskType.TASK_TYPE_OUT.type)
.setTaskStatus(TaskStsType.GENERATE_OUT.id)
@@ -241,7 +229,7 @@
taskItems.forEach(item -> {
boolean update = waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
.eq(WaveItem::getId, item.getSource())
- .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_SEED.val)
+ .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_SEED.val)
.set(WaveItem::getWorkQty, item.getAnfme()));
if (!update) {
throw new CoolException("娉㈡鎵ц鏁伴噺淇敼澶辫触锛侊紒");
--
Gitblit v1.9.1