From c5e50d7aefa40b95d2c474c178de8a20950247b9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 24 五月 2025 10:19:02 +0800
Subject: [PATCH] 库位初始化添加巷道
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index d07ce0b..7b7266f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -164,11 +164,11 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R gentMoveTask(Map<String, Object> map) {
- if (Objects.isNull(map.get("targetLoc")) && StringUtils.isNotBlank(map.get("targetLoc").toString())) {
- throw new CoolException("鐩爣搴撲綅涓嶈兘涓虹┖锛�1");
+ public R genMoveTask(Map<String, Object> map) {
+ if (Objects.isNull(map.get("tarLoc")) || StringUtils.isBlank(map.get("tarLoc").toString())) {
+ throw new CoolException("鐩爣搴撲綅涓嶈兘涓虹┖锛�");
}
- if (Objects.isNull(map.get("orgLoc")) && StringUtils.isNotBlank(map.get("orgLoc").toString())) {
+ if (Objects.isNull(map.get("orgLoc")) || StringUtils.isBlank(map.get("orgLoc").toString())) {
throw new CoolException("婧愬簱浣嶄笉鑳戒负绌猴紒");
}
@@ -177,12 +177,19 @@
throw new CoolException("婧愬簱浣嶄笉瀛樺湪锛侊紒");
}
- Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("targetLoc").toString()));
+ orgLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+
+ if (!locService.updateById(orgLoc)) {
+ throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
+ }
+
+
+ Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("tarLoc").toString()));
if (Objects.isNull(targetLoc)) {
throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
}
- targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
if (!locService.updateById(targetLoc)) {
throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
@@ -193,10 +200,35 @@
task.setOrgLoc(orgLoc.getCode())
.setTaskCode(ruleCode)
.setTaskType(TaskType.TASK_TYPE_LOC_MOVE.type)
+ .setTargLoc(targetLoc.getCode())
+ .setTaskStatus(TaskStsType.GENERATE_IN.id)
.setBarcode(orgLoc.getBarcode());
+ if (!taskService.save(task)) {
+ throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");
+ }
- return null;
+ List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
+ if (locItems.isEmpty()) {
+ throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ List<TaskItem> taskItems = new ArrayList<>();
+ for (LocItem item : locItems) {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+ taskItem.setTaskId(task.getId())
+ .setAnfme(item.getAnfme())
+ .setBatch(item.getBatch())
+ .setOrderType(OrderType.ORDER_IN.type)
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
+ taskItems.add(taskItem);
+ }
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
+ }
+
+ return R.ok(task);
}
}
--
Gitblit v1.9.1