From c67e3d0295858a61122354a15dec8835044bac0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 24 二月 2026 15:54:53 +0800
Subject: [PATCH] 库位拣料出库数量调整
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 132 +++++++++++++++++++++++++++++++++++---------
1 files changed, 105 insertions(+), 27 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index df9a7dd..69b689b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -28,6 +28,7 @@
import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import com.vincent.rsf.server.system.service.impl.FieldsServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
@@ -43,6 +44,7 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.Date;
@Service
public class PdaOutStockServiceImpl implements PdaOutStockService {
@@ -77,7 +79,9 @@
@Override
public R getOutStockTaskItem(String barcode) {
LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(Task::getBarcode, barcode);
+ lambdaQueryWrapper.eq(Task::getBarcode, barcode)
+ .orderByDesc(Task::getId)
+ .last("limit 1");
Task task = taskService.getOne(lambdaQueryWrapper);
if (null == task) {
return R.error("鏈煡璇㈠埌鐩稿叧浠诲姟");
@@ -91,30 +95,54 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ @Synchronized
public R saveOutTaskSts(String barcode) {
LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(Task::getBarcode, barcode);
+ lambdaQueryWrapper.eq(Task::getBarcode, barcode)
+ .orderByDesc(Task::getId)
+ .last("limit 1");
Task task = taskService.getOne(lambdaQueryWrapper);
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
+ // 鍏佽 199锛圵AVE_SEED 鎾涓�/寰呯‘璁わ級鎴� 196锛圓WAIT 绛夊緟纭锛夛紝涓庣洏鐐� PDA 閫昏緫涓�鑷�
+ if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)
+ && !task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
- Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
- maps.keySet().forEach(key -> {
- WkOrderItem orderItem = asnOrderItemService.getById(key);
- if (Objects.isNull(orderItem)) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
- }
- });
- task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
- if (!taskService.updateById(task)) {
- return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+
+ Long loginUserId = SystemAuthUtils.getLoginUserId();
+ if (loginUserId == null) {
+ loginUserId = 1L; // 浣跨敤榛樿鍊�
}
-
- return R.ok("纭鎴愬姛");
+
+ try {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+ // 鎷ｆ枡鍑哄簱锛氬垱寤烘嫞鏂欏叆搴撲换鍔★紙褰㈡垚闂幆锛�
+ taskService.pickOrCheckTask(task.getId(), "");
+ return R.ok("纭鎴愬姛锛屽凡鍒涘缓鎷ｆ枡鍏ュ簱浠诲姟");
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+ // 鐩樼偣鍑哄簱锛氬垱寤虹洏鐐瑰叆搴撲换鍔★紙褰㈡垚闂幆锛�
+ taskService.pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_CHECK);
+ return R.ok("纭鎴愬姛锛屽凡鍒涘缓鐩樼偣鍏ュ簱浠诲姟");
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) {
+ // 鍏ㄧ増鍑哄簱锛氭洿鏂颁负200锛堟渶缁堝畬鎴愶紝涓嶉棴鐜級
+ taskService.completeFullOutStock(task.getId(), loginUserId);
+ return R.ok("纭鎴愬姛锛屽叏鐗堝嚭搴撳凡瀹屾垚");
+ } else {
+ // 鍏朵粬鍑哄簱绫诲瀷锛氱洿鎺ユ洿鏂颁负200
+ task.setTaskStatus(TaskStsType.UPDATED_OUT.id)
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date());
+ if (!taskService.updateById(task)) {
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok("纭鎴愬姛");
+ }
+ } catch (Exception e) {
+ throw new CoolException("蹇�熸嫞璐х‘璁ゅけ璐ワ細" + e.getMessage());
+ }
}
@Override
@@ -131,7 +159,9 @@
if (Cools.isEmpty(barcode)) {
throw new CoolException("鍙傛暟鏈夎");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode)
+ .orderByDesc(Task::getId)
+ .last("limit 1"));
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
@@ -210,7 +240,9 @@
if (Objects.isNull(param.get("orderId"))) {
return R.error("璁㈠崟ID涓嶈兘涓虹┖锛侊紒");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, param.get("barcode").toString()));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, param.get("barcode").toString())
+ .orderByDesc(Task::getId)
+ .last("limit 1"));
if (Objects.isNull(task)) {
throw new CoolException("鏁版嵁閿欒锛屼换鍔℃。宸蹭笉瀛樺湪锛侊紒");
}
@@ -248,7 +280,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R wavePickItems(WavePickItemsParams params) {
+ public synchronized R wavePickItems(WavePickItemsParams params) {
if (Objects.isNull(params.getBarcode())) {
return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -258,7 +290,9 @@
if (Objects.isNull(params.getTaskItems()) || params.getTaskItems().isEmpty()) {
return R.error("鎷ｈ揣鏄庣粏涓嶈兘涓虹┖锛�");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode())
+ .orderByDesc(Task::getId)
+ .last("limit 1"));
if (null == task) {
return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
}
@@ -326,19 +360,26 @@
TaskItem item = taskItemService.getById(taskItem.getId());
//鍒ゆ柇鏄惁鍏佽瓒呮敹锛屼笉鍏佽瓒呮敹娣诲姞鎷掓敹鍒ゆ柇
if (!Objects.isNull(config)) {
- LocItemWorking serviceOne = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getFieldsIndex, item.getFieldsIndex()));
+ TaskItem serviceOne = taskItemService.getOne(new LambdaQueryWrapper<TaskItem>()
+ .eq(TaskItem::getTaskId, task.getId())
+ .eq(TaskItem::getFieldsIndex, item.getFieldsIndex()));
if (Objects.isNull(serviceOne)) {
throw new CoolException("缂撳瓨鏁版嵁涓㈠け锛侊紒");
}
+ LocItemWorking workItem = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getTaskId, task.getId())
+ .eq(LocItemWorking::getFieldsIndex, item.getFieldsIndex()));
+ if (Objects.isNull(workItem)) {
+ throw new CoolException("缂撳瓨鏁版嵁涓㈠け锛侊紒");
+ }
+ Double v1 = Math.round((workItem.getAnfme() - serviceOne.getQty()) * 1000000) / 1000000.0;
//涓嶇鏄惁鍏佽瓒呮敹锛岄兘闇�鍒ゆ柇鏄惁瓒呭嚭搴撳瓨鑼冨洿
- if (taskItem.getAnfme().compareTo(serviceOne.getAnfme()) > 0) {
+ if (taskItem.getAnfme().compareTo(v1) > 0) {
throw new CoolException("鎷ｈ揣鏁伴噺瓒呭嚭褰撳墠绁ㄥ彿搴撳瓨鏁伴噺锛侊紒");
}
-
if (!Boolean.parseBoolean(config.getVal())) {
Double v = Math.round((item.getQty() + taskItem.getAnfme()) * 1000000) / 1000000.0;
if (item.getAnfme().compareTo(v) < 0.0) {
-
throw new CoolException("鍓嶅綋鐗╂枡宸茶秴鍑哄彲鎷ｈ寖鍥达紝璇锋牳瀵瑰悗鍐嶆搷浣滐紒锛�");
}
}
@@ -349,6 +390,34 @@
if (!taskItemService.updateById(item)) {
throw new CoolException("鐘舵�佸畬鎴愬け璐ワ紒锛�");
}
+
+ // 鎵ｅ噺搴撲綅鏄庣粏搴撳瓨锛堜笌鍑哄簱瀹屾垚閫昏緫淇濇寔涓�鑷达級
+ if (StringUtils.isNotBlank(task.getOrgLoc())) {
+ LocItem locItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
+ .eq(LocItem::getLocCode, task.getOrgLoc())
+ .eq(LocItem::getMatnrId, item.getMatnrId())
+ .eq(StringUtils.isNotBlank(item.getBatch()), LocItem::getBatch, item.getBatch())
+ .eq(StringUtils.isNotBlank(item.getFieldsIndex()), LocItem::getFieldsIndex, item.getFieldsIndex()));
+
+ if (Objects.nonNull(locItem)) {
+ // 浣跨敤瀹為檯鎷ｈ揣鏁伴噺锛坱askItem.getAnfme()锛夋墸鍑忓簱浣嶆槑缁�
+ Double newAnfme = Math.round((locItem.getAnfme() - taskItem.getAnfme()) * 1000000) / 1000000.0;
+
+ if (newAnfme.compareTo(0.0) <= 0) {
+ // 鏁伴噺灏忎簬绛変簬0锛屽垹闄ゅ簱浣嶆槑缁�
+ locItemService.removeById(locItem.getId());
+ } else {
+ // 鏇存柊搴撲綅鏄庣粏鏁伴噺
+ locItem.setAnfme(newAnfme)
+ .setUpdateBy(SystemAuthUtils.getLoginUserId())
+ .setUpdateTime(new Date());
+ if (!locItemService.updateById(locItem)) {
+ throw new CoolException("搴撲綅鏄庣粏鏁伴噺鎵ｅ噺澶辫触锛侊紒");
+ }
+ }
+ }
+ }
+
StockItem stockItem = new StockItem();
BeanUtils.copyProperties(item, stockItem);
//taskItem涓轰笂鎶ユ暟鎹�
@@ -442,13 +511,15 @@
throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触");
}
LocItemWorking oldOne = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getTaskId, byId.getTaskId())
.eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
.eq(LocItemWorking::getFieldsIndex, byId.getFieldsIndex()));
if (Objects.isNull(oldOne)) {
throw new CoolException("鏄庣粏涓嶅瓨鍦ㄦ垨宸插嚭搴擄紒锛�");
}
LocItemWorking one = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
- .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
+ .eq(LocItemWorking::getTaskId, byId.getTaskId())
+ .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
.eq(LocItemWorking::getFieldsIndex, uuid));
if (Objects.isNull(one)) {
throw new CoolException("鏄庣粏涓嶅瓨鍦ㄦ垨宸插嚭搴擄紒锛�");
@@ -483,7 +554,9 @@
return R.error("鏁版嵁閿欒锛侊紒");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer())
+ .orderByDesc(Task::getId)
+ .last("limit 1"));
if (null == task) {
return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
}
@@ -506,9 +579,14 @@
try {
- if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+ // 鎷ｆ枡鍑哄簱锛氬垱寤烘嫞鏂欏叆搴撲换鍔�
taskService.pickOrCheckTask(task.getId(), "");
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+ // 鐩樼偣鍑哄簱锛氬垱寤虹洏鐐瑰叆搴撲换鍔�
+ taskService.pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_CHECK);
} else {
+ // 鍏朵粬鍑哄簱绫诲瀷锛氱洿鎺ユ洿鏂颁负200
task.setTaskStatus(TaskStsType.UPDATED_OUT.id);
if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
--
Gitblit v1.9.1