From c69781e2b78ed7a5ffe9b59c0c555f07deabe735 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 07 二月 2026 11:08:48 +0800
Subject: [PATCH] 出库完结
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 29 +++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 10 ++
4 files changed, 186 insertions(+), 10 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 4fc12ff..67775d1 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
@@ -43,6 +43,7 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.Date;
@Service
public class PdaOutStockServiceImpl implements PdaOutStockService {
@@ -356,6 +357,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涓轰笂鎶ユ暟鎹�
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index cac4b90..ea42f39 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -131,6 +131,16 @@
return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id, getLoginUserId()));
}
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鍏ㄧ増鍑哄簱瀹岀粨")
+ @PostMapping("/task/complete/fullOutStock/{id}")
+ public R completeFullOutStock(@PathVariable Long id) throws Exception {
+ if (Cools.isEmpty(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok("鍏ㄧ増鍑哄簱瀹岀粨鎴愬姛").add(taskService.completeFullOutStock(id, getLoginUserId()));
+ }
+
/**
* 鎷ｆ枡鍑哄簱锛堢敤浜庢祴璇曟嫞鏂欏嚭搴擄級
* @return
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
index bf3e2c1..4a63743 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
@@ -28,6 +28,8 @@
Task operateComplete(Long id, Long loginUserId);
+ Task completeFullOutStock(Long id, Long loginUserId);
+
void moveToDeep(Long loginUserId, String curLoc) throws Exception;
void saveOutStockItem(List<TaskItem> taskItems, WkOrderItem orderItem, WaveItem waveItem, WkOrderItem diffItem, Long loginUserId) throws Exception;
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 de53eb0..60155ef 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
@@ -583,6 +583,86 @@
}
/**
+ * 鍏ㄧ増鍑哄簱瀹岀粨锛氭墸闄ゅ簱浣嶆暟閲忥紝灏嗗簱浣嶇姸鎬佽涓虹┖
+ *
+ * @param id 浠诲姟ID
+ * @param loginUserId 鐧诲綍鐢ㄦ埛ID
+ * @return 浠诲姟瀵硅薄
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Task completeFullOutStock(Long id, Long loginUserId) {
+ // 鏌ヨ浠诲姟
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getId, id));
+
+ if (Objects.isNull(task)) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
+ }
+
+ // 妫�鏌ヤ换鍔＄被鍨嬫槸鍚︿负鍏ㄧ増鍑哄簱
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) {
+ throw new CoolException("褰撳墠浠诲姟涓嶆槸鍏ㄧ増鍑哄簱浠诲姟锛屾棤娉曟墽琛屾鎿嶄綔锛侊紒");
+ }
+
+ // 妫�鏌ヤ换鍔＄姸鎬�
+ if (task.getTaskStatus().equals(TaskStsType.COMPLETE_OUT.id)) {
+ throw new CoolException("浠诲姟宸插畬鎴愶紝鏃犻渶閲嶅瀹岀粨锛侊紒");
+ }
+
+ // 鏌ヨ搴撲綅
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+
+ // 鍒犻櫎搴撲綅鏄庣粏锛堟墸闄ゆ暟閲忥級
+ try {
+ subtractLocItem(loc);
+ } catch (Exception e) {
+ logger.error("鍒犻櫎搴撲綅鏄庣粏澶辫触", e);
+ throw new CoolException("鍒犻櫎搴撲綅鏄庣粏澶辫触锛�" + e.getMessage());
+ }
+
+ // 鍒犻櫎浣滀笟涓簱瀛樿褰曪紙LocItemWorking锛�
+ locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getTaskId, task.getId()));
+
+ // 灏嗗簱浣嶇姸鎬佽涓虹┖锛圤鐘舵�侊級
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .set(Loc::getBarcode, null)
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
+ .eq(Loc::getCode, task.getOrgLoc()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ // 鏇存柊鍑哄簱绔欑偣鐘舵�侊紙濡傛灉鏈夌洰鏍囩珯鐐癸級
+ if (StringUtils.isNotBlank(task.getTargSite())) {
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, task.getTargSite()));
+ if (Objects.nonNull(station) && station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("鍑哄簱绔欑偣鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ }
+
+ // 鏇存柊浠诲姟鐘舵�佷负鍑哄簱瀹屾垚
+ task.setTaskStatus(TaskStsType.COMPLETE_OUT.id)
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date());
+
+ if (!this.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
+ return task;
+ }
+
+ /**
* 淇敼浠诲姟浼樺厛绾�
*
* @param task
@@ -1220,14 +1300,24 @@
if (Objects.equals(taskItem.getFieldsIndex(), working.getFieldsIndex())) {
Double minQty = taskItem.getAnfme();
if (!task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
+ // 璁＄畻鍓╀綑鏁伴噺锛氫粠LocItemWorking涓噺鍘籘askItem鐨勬嫞鏂欐暟閲�
minQty = Math.round((working.getAnfme() - taskItem.getQty()) * 1000000) / 1000000.0;
}
if (minQty.compareTo(0.0) >= 0) {
+ // 鏇存柊TaskItem鐨勫墿浣欐暟閲�
taskItem.setAnfme(minQty);
if (!taskItemService.updateById(taskItem)) {
throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触锛侊紒");
}
+ // 鏇存柊LocItemWorking鐨勫墿浣欐暟閲忥紙闈炵洏鐐瑰叆搴撴椂闇�瑕佹洿鏂帮級
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
+ working.setAnfme(minQty);
+ if (!locItemWorkingService.updateById(working)) {
+ throw new CoolException("浣滀笟搴撳瓨鏁伴噺鏇存柊澶辫触锛侊紒");
+ }
+ }
} else {
+ // 鍓╀綑鏁伴噺灏忎簬0锛屽垹闄や换鍔℃槑缁�
if (!taskItemService.removeById(taskItem)) {
log.error("浠诲姟鏄庣粏淇敼澶辫触锛侊紒");
}
@@ -1338,8 +1428,14 @@
}
try {
- //鏇存柊搴撲綅鏄庣粏
- subtractLocItem(loc);
+ // 鏍规嵁浠诲姟绫诲瀷鏇存柊搴撲綅鏄庣粏
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) {
+ // 鍏ㄧ増鍑哄簱锛氬垹闄ゆ墍鏈夊簱浣嶆槑缁�
+ subtractLocItem(loc);
+ } else {
+ // 閮ㄥ垎鍑哄簱锛堝鎷ｆ枡鍑哄簱锛夛細鏍规嵁TaskItem鏁伴噺鎵ｅ噺搴撲綅鏄庣粏
+ subtractLocItemByTaskItems(loc, taskItems, loginUserId);
+ }
} catch (Exception e) {
logger.error("<UNK>", e);
throw new CoolException(e.getMessage());
@@ -1894,13 +1990,50 @@
/**
* @author Ryan
* @date 2025/5/20
- * @description: 鎵ｅ噺搴撳瓨鏄庣粏
+ * @description: 鎵ｅ噺搴撳瓨鏄庣粏锛堝叏鐗堝嚭搴擄細鍒犻櫎鎵�鏈夊簱浣嶆槑缁嗭級
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
public void subtractLocItem(Loc loc) throws Exception {
// 鍒犻櫎搴撲綅鏄庣粏锛屽鏋滄病鏈夎褰曞垯蹇界暐锛堝彲鑳藉凡缁忚鍒犻櫎杩囦簡锛�
locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
+ }
+
+ /**
+ * 鏍规嵁浠诲姟鏄庣粏鎵ｅ噺搴撲綅鏄庣粏鏁伴噺锛堥儴鍒嗗嚭搴擄級
+ *
+ * @param loc 搴撲綅
+ * @param taskItems 浠诲姟鏄庣粏鍒楄〃
+ * @param loginUserId 鐧诲綍鐢ㄦ埛ID
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void subtractLocItemByTaskItems(Loc loc, List<TaskItem> taskItems, Long loginUserId) {
+ for (TaskItem taskItem : taskItems) {
+ // 鏌ヨ瀵瑰簲鐨勫簱浣嶆槑缁�
+ LocItem locItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
+ .eq(LocItem::getLocId, loc.getId())
+ .eq(LocItem::getMatnrId, taskItem.getMatnrId())
+ .eq(StringUtils.isNotBlank(taskItem.getBatch()), LocItem::getBatch, taskItem.getBatch())
+ .eq(StringUtils.isNotBlank(taskItem.getFieldsIndex()), LocItem::getFieldsIndex, taskItem.getFieldsIndex()));
+
+ if (Objects.nonNull(locItem)) {
+ // 璁＄畻鎵ｅ噺鍚庣殑鏁伴噺
+ Double newAnfme = Math.round((locItem.getAnfme() - taskItem.getQty()) * 1000000) / 1000000.0;
+
+ if (newAnfme.compareTo(0.0) <= 0) {
+ // 鏁伴噺灏忎簬绛変簬0锛屽垹闄ゅ簱浣嶆槑缁�
+ locItemService.removeById(locItem.getId());
+ } else {
+ // 鏇存柊搴撲綅鏄庣粏鏁伴噺
+ locItem.setAnfme(newAnfme)
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date());
+ if (!locItemService.updateById(locItem)) {
+ throw new CoolException("搴撲綅鏄庣粏鏁伴噺鎵ｅ噺澶辫触锛侊紒");
+ }
+ }
+ }
+ }
}
/**
@@ -2035,6 +2168,7 @@
.eq(StringUtils.isNotBlank(taskItem.getFieldsIndex()), LocItem::getFieldsIndex, taskItem.getFieldsIndex())
);
if (Objects.isNull(locItem)) {
+ // 搴撲綅鏄庣粏涓嶅瓨鍦紝鍒涘缓鏂扮殑搴撲綅鏄庣粏
BeanUtils.copyProperties(taskItem, item);
item.setLocCode(loc.getCode())
.setId(null)
@@ -2046,13 +2180,14 @@
throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
}
} else {
-// logger.error("褰撳墠绁ㄥ彿:" + locItem.getFieldsIndex() + " 宸插湪搴撳唴锛岃妫�鏌ュ悗鍐嶆搷浣滐紒锛�");
-// throw new CoolException("褰撳墠绁ㄥ彿宸插湪搴撳唴锛岃妫�鏌ュ悗鍐嶆搷浣滐紒锛�");
-// locItem.setAnfme(Math.round((locItem.getAnfme() + taskItem.getAnfme()) * 1000000) / 1000000.0)
-// .setUpdateTime(new Date());
-// if (!locItemService.saveOrUpdate(locItem)) {
-// throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
-// }
+ // 搴撲綅鏄庣粏宸插瓨鍦紝绱姞鏁伴噺
+ Double newAnfme = Math.round((locItem.getAnfme() + taskItem.getAnfme()) * 1000000) / 1000000.0;
+ locItem.setAnfme(newAnfme)
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date());
+ if (!locItemService.updateById(locItem)) {
+ throw new CoolException("搴撲綅鏄庣粏鏁伴噺鏇存柊澶辫触锛侊紒");
+ }
}
});
--
Gitblit v1.9.1