From d36f413965c4ef2ea35a7e0ecefd32001a1e66f8 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 04 十二月 2025 18:59:08 +0800
Subject: [PATCH] 1. 拣料出库不换库位 2. 缓存代码优化 3. 库存按批次先进先出
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 104 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 42 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 90e474e..dc0e983 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
@@ -19,6 +19,7 @@
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
+import com.vincent.rsf.server.manager.controller.params.PakinItem;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -1016,17 +1017,18 @@
.setBarcode(task.getBarcode())
.setTaskStatus(TaskStsType.GENERATE_IN.id);
- TaskInParam param = new TaskInParam();
- param.setSourceStaNo(task.getTargSite())
- .setIoType(type)
- .setLocType1(Integer.parseInt(loc.getType()));
+// TaskInParam param = new TaskInParam();
+// param.setSourceStaNo(task.getTargSite())
+// .setIoType(type)
+// .setLocType1(Integer.parseInt(loc.getType()));
//鑾峰彇鏂板簱浣�
- InTaskMsgDto locInfo = wcsService.getLocNo(param);
+// InTaskMsgDto locInfo = wcsService.getLocNo(param);
- if (Objects.isNull(locInfo)) {
- throw new CoolException("鑾峰彇搴撲綅澶辫触锛侊紒");
- }
- task.setTargLoc(locInfo.getLocNo())
+// if (Objects.isNull(locInfo)) {
+// throw new CoolException("鑾峰彇搴撲綅澶辫触锛侊紒");
+// }
+ //甯屾棩涓婃姤鐗╂湁鎯呭喌锛屼笉闇�瑕佽幏鍙栨柊搴撲綅
+ task.setTargLoc(task.getOrgLoc())
.setOrgSite(task.getTargSite());
if (!this.updateById(task)) {
@@ -1095,26 +1097,25 @@
List<LocItemWorking> workings = new ArrayList<>();
List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
items.forEach(taskItem -> {
- if (taskItem.getAnfme() > 0) {
- LocItemWorking itemWorking = new LocItemWorking();
- BeanUtils.copyProperties(taskItem, itemWorking);
- itemWorking.setTaskId(task.getId())
- .setQty(0.0)
- .setLocId(loc1.getId())
- .setLocCode(loc1.getCode());
- workings.add(itemWorking);
- }
+ LocItemWorking itemWorking = new LocItemWorking();
+ BeanUtils.copyProperties(taskItem, itemWorking);
+ itemWorking.setTaskId(task.getId())
+ .setQty(0.0)
+ .setLocId(loc1.getId())
+ .setLocCode(loc1.getCode());
+ workings.add(itemWorking);
});
- if (!locItemWorkingService.saveBatch(workings)) {
- throw new CoolException("涓存椂搴撳瓨鏇存柊澶辫触锛侊紒");
+ if (!workings.isEmpty()) {
+ if (!locItemWorkingService.saveBatch(workings)) {
+ throw new CoolException("涓存椂搴撳瓨鏇存柊澶辫触锛侊紒");
+ }
}
-
loc1.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
-
- if (!locService.updateById(loc1)) {
- throw new CoolException("搴撲綅棰勭害鍏ュ簱澶辫触锛侊紒");
- }
+ locService.updateById(loc1);
+// if (!locService.updateById(loc1)) {
+// throw new CoolException("搴撲綅棰勭害鍏ュ簱澶辫触锛侊紒");
+// }
return task;
}
@@ -1126,7 +1127,7 @@
*/
@Synchronized
@Transactional(rollbackFor = Exception.class)
- public void complateOutStock(Task task, Long loginUserId) throws Exception {
+ public void complateOutStock(Task task, Long loginUserId) {
if (Objects.isNull(task)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -1223,15 +1224,26 @@
throw new CoolException(e.getMessage());
}
}
-
- /**淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱*/
- if (!locService.update(new LambdaUpdateWrapper<Loc>()
- .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
- .set(Loc::getBarcode, null)
- .set(Loc::getUpdateBy, loginUserId)
- .set(Loc::getUpdateTime, new Date())
- .eq(Loc::getId, loc.getId()))) {
- throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+ /**淇敼涓哄簱浣嶇姸鎬佷负S.棰勭害鍏ュ簱锛屼繚鐣欏師鏈夊簱浣�*/
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type)
+ .set(Loc::getBarcode, null)
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
+ .eq(Loc::getId, loc.getId()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else {
+ /**淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱*/
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .set(Loc::getBarcode, null)
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
+ .eq(Loc::getId, loc.getId()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
if (!this.update(new LambdaUpdateWrapper<Task>()
@@ -1597,6 +1609,21 @@
//绉诲嚭鏀惰揣鍖哄簱瀛橈紝 淇敼缁勬墭鐘舵��
removeReceiptStock(pakinItem, loginUserId);
});
+
+ Set<Long> pkinItemIds = taskItems.stream().map(TaskItem::getSource).collect(Collectors.toSet());
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getId, pkinItemIds));
+ if (pakinItems.isEmpty()) {
+ throw new CoolException("缁勬墭鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ Set<Long> pakinIds = pakinItems.stream().map(WaitPakinItem::getPakinId).collect(Collectors.toSet());
+
+ if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
+ .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
+ .set(WaitPakin::getUpdateBy, loginUserId)
+ .in(WaitPakin::getId, pakinIds))) {
+ throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
/**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).eq(Loc::getCode, task.getTargLoc()))) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -1624,13 +1651,6 @@
Double workQty = Math.round((itemServiceOne.getWorkQty() - pakinItem.getAnfme()) * 1000000) / 1000000.0;
Double qty = Math.round((itemServiceOne.getQty() + pakinItem.getAnfme()) * 1000000) / 1000000.0;
itemServiceOne.setWorkQty(workQty).setQty(qty);
-
- if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
- .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
- .set(WaitPakin::getUpdateBy, loginUserId)
- .eq(WaitPakin::getId, pakinItem.getPakinId()))) {
- throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
if (qty.compareTo(itemServiceOne.getAnfme()) == 0.00) {
if (!warehouseAreasItemService.removeById(itemServiceOne.getId())) {
--
Gitblit v1.9.1