From a4112a5d31fa3a66daafdc009ff3b3047bb98f67 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 17:14:04 +0800
Subject: [PATCH] #巷道
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 86 insertions(+), 10 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 cc1dd47..e6bbb8a 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
@@ -390,14 +390,72 @@
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
//1.鍏ュ簱
complateInstock(task);
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
//53.鎷ｆ枡鍐嶅叆搴�
- pickComplateInStock(task);
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
//57.鐩樼偣鍐嶅叆搴�
pickComplateInStock(task);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ //绉诲簱
+ moveInStock(task);
}
}
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void moveInStock(Task task) {
+ if (Objects.isNull(task)) {
+ return;
+ }
+
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒");
+ }
+
+ Loc orgLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(orgLoc)) {
+ throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒");
+ }
+
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
+ }
+
+ if (!orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬R.鍑哄簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
+ }
+
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (taskItems.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ try {
+ //鏇存柊搴撲綅鏄庣粏
+ saveLocItem(taskItems, task.getId());
+ } catch (Exception e) {
+ throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+// /**瀵逛换鍔℃槑缁嗘寜缁勬嫋鏄庣粏杩涜鍒嗙粍*/
+// try {
+// //淇濆瓨搴撳瓨鏄庣粏
+// saveStockItems(taskItems, null, null, pakinItem.getWkType(), pakinItem.getType());
+// } catch (Exception e) {
+// log.error("<UNK>", e);
+// throw new CoolException(e.getMessage());
+// }
+ /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).eq(Loc::getCode, task.getTargLoc()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, task.getOrgLoc()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
}
@@ -465,12 +523,17 @@
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);
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
+ locWorking.setWorkQty(0.0);
+ locWorking.setAnfme(taskItem.getAnfme());
} else {
- continue;
+ if (locWorking.getAnfme().compareTo(taskItem.getAnfme()) >= 0) {
+ locWorking.setWorkQty(0.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);
@@ -482,7 +545,7 @@
TaskItem taskItem = taskItems.stream().findFirst().get();
//淇濆瓨鍏ュ嚭搴撴祦姘�
- saveStockItems(taskItems, null, null, taskItem.getWkType(), taskItem.getOrderType());
+ saveStockItems(taskItems, task, null, null, taskItem.getWkType(), taskItem.getOrderType());
if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) {
@@ -717,6 +780,7 @@
/**淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱*/
if (!locService.update(new LambdaUpdateWrapper<Loc>()
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .set(Loc::getBarcode, null)
.eq(Loc::getId, loc.getId()))) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -837,7 +901,7 @@
List<TaskItem> items = orderMap.get(key);
try {
//淇濆瓨搴撳瓨鏄庣粏
- saveStockItems(items, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType());
+ saveStockItems(items, task, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType());
//绉诲嚭鏀惰揣鍖哄簱瀛橈紝 淇敼缁勬墭鐘舵��
removeReceiptStock(pakinItem);
} catch (Exception e) {
@@ -901,6 +965,7 @@
if (Objects.isNull(task)) {
throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
}
+
List<LocItem> locItems = new ArrayList<>();
items.forEach(taskItem -> {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()), false);
@@ -924,7 +989,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public void saveStockItems(List<TaskItem> items, Long id, String code, Short wkType, String type) throws
+ public void saveStockItems(List<TaskItem> items, Task task, Long id, String code, Short wkType, String type) throws
Exception {
Stock stock = new Stock();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
@@ -937,7 +1002,17 @@
.setSourceCode(code)
.setAnfme(sum)
.setWkType(wkType)
+ .setBarcode(task.getBarcode())
.setType(type);
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) ||
+ task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type) ||
+ task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) ||
+ task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type) ||
+ task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) ) {
+ stock.setLocCode(task.getTargLoc());
+ } else {
+ stock.setLocCode(task.getOrgLoc());
+ }
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
}
@@ -949,6 +1024,7 @@
BeanUtils.copyProperties(item, stockItem);
stockItem.setSourceItemId(item.getOrderItemId())
.setStockCode(stock.getCode())
+ .setBarcode(task.getBarcode())
.setSourceItemId(item.getOrderItemId())
.setId(null)
.setStockId(stock.getId());
--
Gitblit v1.9.1