From 5c0ac8adccb4d895148ee32ca7afc9a07d50e635 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 18:47:13 +0800
Subject: [PATCH] 添加作业临时库存表 优化拣料出库作业
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 103 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index baf1895..7f4972a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -9,6 +9,7 @@
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.mapper.TaskItemMapper;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -65,6 +66,8 @@
private BasStationService basStationService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private LocItemWorkingService locItemWorkingService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -386,7 +389,7 @@
complateInstock(task);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
//53.鎷ｆ枡鍐嶅叆搴�
-
+ pickComplateInStock(task);
}
} else {
//鍑哄簱浠诲姟
@@ -394,11 +397,75 @@
//鍏ㄦ墭鍑哄簱
complateOutStock(task);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) {
- //鎷ｆ枡鍑哄簱,
- taskService.pickTask(task.getId());
+ //鎷ｆ枡鍑哄簱
+ //
+ pickTask(task.getId());
+ //绉婚櫎鍘熷搴撳瓨
+ complateOutStock(task);
}
}
}
+ }
+
+ /**
+ * 鎷ｆ枡鍐嶅叆搴�
+ *
+ * @param task
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void pickComplateInStock(Task task) throws Exception {
+ if (Objects.isNull(task)) {
+ return;
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撳瓨涓嶅瓨鍦紒锛�");
+ }
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
+ }
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type).setBarcode(task.getBarcode());
+
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅淇℃伅鏇存柊澶辫触锛侊紒");
+ }
+
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (taskItems.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ List<LocItem> items = new ArrayList<>();
+ for (TaskItem taskItem : taskItems) {
+ LocItem locItem = new LocItem();
+ LocItemWorking locWorking = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getTaskId, taskItem.getTaskId())
+ .eq(LocItemWorking::getLocCode, task.getTargLoc())
+ .eq(LocItemWorking::getMatnrId, taskItem.getMatnrId())
+ .eq(StringUtils.isNoneBlank(taskItem.getFieldsIndex()), LocItemWorking::getFieldsIndex, taskItem.getFieldsIndex())
+ .eq(StringUtils.isNotBlank(taskItem.getBatch()), LocItemWorking::getBatch, taskItem.getBatch()));
+ if (Objects.isNull(locWorking)) {
+ throw new CoolException("鏁版嵁閿欒锛屼綔涓氫腑搴撳瓨鏁版嵁涓㈠け锛侊紒");
+ }
+ if (locWorking.getAnfme().compareTo(taskItem.getAnfme()) >= 0) {
+ locWorking.setAnfme(Math.round((locWorking.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0);
+ } else {
+ continue;
+ }
+
+ BeanUtils.copyProperties(locWorking, locItem);
+ locItem.setLocCode(loc.getCode()).setLocId(loc.getId()).setId(null);
+ items.add(locItem);
+ }
+
+ if (!locItemService.saveBatch(items)) {
+ throw new CoolException("浣滀笟搴撳瓨鍥炲啓澶辫触锛侊紒");
+ }
+
+ if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) {
+ throw new CoolException("浣滀笟涓簱瀛樺垹闄ゅけ璐ワ紒锛�");
+ }
+
}
/**
@@ -476,7 +543,8 @@
* @return
*/
@Override
- public R pickTask(Long id) {
+ @Transactional(rollbackFor = Exception.class)
+ public R pickTask(Long id) throws Exception {
Task task = this.getById(id);
if (Objects.isNull(task)) {
throw new CoolException("褰撳墠浠诲姟涓嶅瓨鍦紒锛�");
@@ -491,22 +559,32 @@
throw new CoolException("娌℃湁绌哄簱浣嶏紒锛�");
}
+ List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
+ if (locItems.isEmpty()) {
+ throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, task);
//鏇存柊浠诲姟涓诲崟
task.setTaskCode(ruleCode)
.setTaskType(TaskType.TASK_TYPE_PICK_IN.type)
- .setTargLoc(task.getOrgLoc()) //鍑哄簱婧愬簱浣嶅彉鍏ュ簱鐩爣搴撲綅
+ .setBarcode(task.getBarcode())
.setTaskStatus(TaskStsType.GENERATE_IN.id);
-
if (!this.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
}
- //淇敼搴撲綅鐘舵�� 棰勭害鍑哄簱.R==>棰勭害鍏ュ簱.S
- loc.setUseStatus(StaUseStatusType.TYPE_S.type);
+ //TODO 鍚庣画闇�鏍规嵁浠撳簱绫诲瀷鏌ユ壘鏂板簱浣嶏紝鍘熷搴撲綅缃┖闂茬姸鎬�
+ List<LocItemWorking> workings = new ArrayList<>();
+ for (LocItem item : locItems) {
+ LocItemWorking working = new LocItemWorking();
+ BeanUtils.copyProperties(item, working);
+ working.setId(null).setTaskId(task.getId());
+ workings.add(working);
+ }
- if (!locService.updateById(loc)) {
- throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
+ if (!locItemWorkingService.saveBatch(workings)) {
+ throw new CoolException("涓存椂搴撳瓨淇濆瓨澶辫触锛侊紒");
}
return R.ok("鎷ｈ揣鎴愬姛锛侊紒");
@@ -518,8 +596,9 @@
* @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板嚭搴撳簱瀛樹俊鎭�
* @version 1.0
*/
+ @Synchronized
@Transactional(rollbackFor = Exception.class)
- public synchronized void complateOutStock(Task task) {
+ public void complateOutStock(Task task) throws Exception {
if (Objects.isNull(task)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -537,9 +616,9 @@
}
try {
//鏇存柊搴撲綅鏄庣粏
- subtractLocItem(taskItems, loc);
+ subtractLocItem(loc);
} catch (Exception e) {
- throw new RuntimeException(e.getMessage());
+ throw new CoolException(e.getMessage());
}
//娣诲姞鍑哄叆搴撹褰曚俊鎭�
@@ -630,7 +709,7 @@
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
- public void subtractLocItem(List<TaskItem> items, Loc loc) throws Exception {
+ public void subtractLocItem(Loc loc) throws Exception {
if (!locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()))) {
throw new CoolException("搴撳瓨鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
@@ -647,6 +726,16 @@
if (Objects.isNull(task)) {
return;
}
+
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒");
+ }
+
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
+ }
+
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (taskItems.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
--
Gitblit v1.9.1