From cfe049492f81d2c650a2b17348593edbc5054498 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 18 三月 2026 07:52:44 +0800
Subject: [PATCH] #3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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 11d03b4..b3ad570 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
@@ -41,17 +41,11 @@
@Autowired
private WaveItemService waveItemService;
@Autowired
- private TaskService taskService;
- @Autowired
private TaskItemService taskItemService;
@Autowired
private LocItemService locItemService;
@Autowired
private LocService locService;
- @Autowired
- private OutStockService outStockService;
- @Autowired
- private WaveService waveService;
@Autowired
private WaveRuleServiceImpl waveRuleService;
@Autowired
@@ -94,7 +88,7 @@
.setWaveId(item.getWaveId());
params.add(locParams);
}
- List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, null);
+ List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, null,waves.getStationId(),waves.getLocCode());
generateOutTask(results, loginUserId, waves);
} catch (Exception e) {
log.error(e.getMessage());
@@ -124,7 +118,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
List<Long> WaveIds = JSONArray.parseArray(JSON.toJSONString(map.get("ids")), Long.class);
- List<Wave> waves = waveService.listByIds(WaveIds);
+ List<Wave> waves = this.listByIds(WaveIds);
if (Objects.isNull(waves)) {
throw new CoolException("鏁版嵁閿欒锛� 娉㈡涓嶅瓨鍦紒锛�");
}
@@ -161,7 +155,7 @@
.setWaveId(item.getWaveId());
params.add(locParams);
}
- List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule);
+ List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule,wave.getStationId(),wave.getLocCode());
if (results.isEmpty()) {
wave.setUpdateBy(loginUserId).setUpdateTime(new Date());
if (wave.getAnfme().compareTo(wave.getWorkQty()) == 0) {
@@ -170,7 +164,7 @@
wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
}
wave.setMemo("-->搴撳瓨涓嶈冻");
- waveService.updateById(wave);
+ this.updateById(wave);
return R.ok();
}
try {
@@ -209,7 +203,7 @@
Double sum = taskItems.stream().mapToDouble(TaskItem::getAnfme).sum();
Double v = Math.round((wave.getWorkQty() + sum) * 1000000) / 1000000.0;
if (wave.getAnfme().compareTo(v) == 0) {
- if (!waveService.update(new LambdaUpdateWrapper<Wave>()
+ if (!this.update(new LambdaUpdateWrapper<Wave>()
.set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
.set(Wave::getWorkQty, v)
.set(Wave::getUpdateBy, loginUserId)
@@ -219,7 +213,7 @@
throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
} else {
- if (!waveService.update(new LambdaUpdateWrapper<Wave>()
+ if (!this.update(new LambdaUpdateWrapper<Wave>()
.set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
.set(Wave::getWorkQty, v)
.set(Wave::getUpdateBy, loginUserId)
@@ -304,6 +298,7 @@
taskParams.setItems(itemDto.getLocItemList())
.setSiteNo(itemDto.getSiteNo())
.setTargSiteAreaList(itemDto.getTargSiteAreaList())
+ .setTargSiteAreaNow(itemDto.getTargSiteAreaNow())
.setType(Constants.TASK_TYPE_WAVE_OUT_STOCK)
.setSourceId(wave.getId())
.setTarLoc(loc.getCode());
--
Gitblit v1.9.1