From 48b875f66aa0b9346b698e600f03361e972028e8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 19 六月 2025 18:33:22 +0800
Subject: [PATCH] 波次出库任务失败
---
rsf-admin/src/page/orders/wave/WaveItemList.jsx | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 3 ++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 31 +++++++++++++++++--------------
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java | 5 ++---
rsf-server/src/main/resources/application.yml | 2 +-
5 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/orders/wave/WaveItemList.jsx b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
index ea1c70f..961de23 100644
--- a/rsf-admin/src/page/orders/wave/WaveItemList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
@@ -43,6 +43,7 @@
import { styled } from '@mui/material/styles';
import WaveItemCreate from "./WaveItemCreate";
import WaveItemEdit from "./WaveItemEdit";
+import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -189,6 +190,7 @@
const BulkStartButton = () => {
const { data, selectedIds, onUnselectItems } = useListContext();
const waveId = useGetRecordId();
+ const notify = useNotify();
const startClick = async () => {
onUnselectItems();
const { data: { code, data, msg } } = await request.post('/wave/selects/task', { wave: waveId, waveItem: selectedIds });
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java
index eeff475..518112b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveItemExceStatus.java
@@ -14,15 +14,14 @@
WAVE_ITEM_EXCE_STATUS_UN("0", "鏈墽琛�"),
WAVE_EXCE_STATUS_ING("1", "鎵ц涓�"),
WAVE_EXCE_STATUS_SEED("2", "宸蹭笅鍙�"),
- WAVE_EXCE_STATUS_DONE("3", "瀹屾垚"),
+ WAVE_EXCE_STATUS_DONE("3", "涓嬪彂瀹屾垚"),
;
- WaveExceStatus(String val, String desc) {
+ WaveItemExceStatus(String val, String desc) {
this.val = Short.parseShort(val);
this.desc = desc;
}
public Short val;
-
public String desc;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 7043713..8ef2ecf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.utils.LocUtils;
+import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.TaskStsType;
@@ -122,7 +123,7 @@
params.setOrgLoc(shallowLoc).setType(TaskType.TASK_TYPE_LOC_MOVE.type + "");
//鐢熸垚绉诲簱浠诲姟
Task moveTask = locItemService.genMoveTask(params, loginUserId);
- moveTask.setSort(task.getSort() + 1);
+ moveTask.setSort(!Objects.isNull(task.getSort()) ? task.getSort() + 1 : Constants.TASK_SORT_DEFAULT_VALUE + 1);
if (!taskService.updateById(moveTask)) {
throw new Exception("浠诲姟浼樺厛绾ф洿鏂板け璐ワ紒锛�");
}
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..4b61f5d 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
@@ -120,8 +120,8 @@
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;
}
@@ -142,16 +142,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 +193,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 +217,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 +232,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("娉㈡鎵ц鏁伴噺淇敼澶辫触锛侊紒");
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index db51329..ac31a5b 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -25,7 +25,7 @@
# global-config:
# field-strategy: 0
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
--
Gitblit v1.9.1