From e5d2c6f2eb8cc33675308d7d33fd4029d5fd2e34 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 20 五月 2025 18:42:11 +0800
Subject: [PATCH] 添加全盘出库 修改任务列表，完成按钮显示逻辑
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 195 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 164 insertions(+), 31 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 178cf4d..0e747a6 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
@@ -22,10 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
@Service("taskService")
@@ -57,13 +54,16 @@
private DeviceBindService deviceBindService;
@Autowired
private WarehouseAreasService warehouseAreasService;
-
@Autowired
private WarehouseAreasItemService warehouseAreasItemService;
+ @Autowired
+ private WaveItemService waveItemService;
+ @Autowired
+ private WaveService waveService;
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized R generateAGVTasks(WaitPakin pakins,String locCode,String orgSta, Long loginUserId) {
+ public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta, Long loginUserId) {
if (Cools.isEmpty(pakins) || Cools.isEmpty(locCode)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -128,7 +128,7 @@
throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
}
waitPakinItems.forEach(item -> {
- if (! waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
+ if (!waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
.set(WaitPakinItem::getWorkQty, item.getAnfme())
.eq(WaitPakinItem::getId, item.getId()))) {
throw new CoolException("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -149,7 +149,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized R generateFlatWarehouseTasks(WaitPakin pakins,String locCode, Long loginUserId) {
+ public synchronized R generateFlatWarehouseTasks(WaitPakin pakins, String locCode, Long loginUserId) {
if (Cools.isEmpty(pakins) || Cools.isEmpty(locCode)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -213,7 +213,7 @@
throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
}
waitPakinItems.forEach(item -> {
- if (! waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
+ if (!waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
.set(WaitPakinItem::getWorkQty, item.getAnfme())
.eq(WaitPakinItem::getId, item.getId()))) {
throw new CoolException("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -345,11 +345,11 @@
throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
}
waitPakinItems.forEach(item -> {
- if (! waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
- .set(WaitPakinItem::getWorkQty, item.getAnfme())
- .eq(WaitPakinItem::getId, item.getId()))) {
- throw new CoolException("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
- }
+ if (!waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
+ .set(WaitPakinItem::getWorkQty, item.getAnfme())
+ .eq(WaitPakinItem::getId, item.getId()))) {
+ throw new CoolException("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
});
});
@@ -365,6 +365,7 @@
/**
* 瀹屾垚浠诲姟 鏇存柊搴撲綅鏄庣粏淇℃伅锛屽皢鍗曟嵁搴撳瓨鏇存柊鍒板崟鎹簱瀛樿〃
+ *
* @param tasks
* @throws Exception
*/
@@ -381,15 +382,150 @@
}
}
}
+
/**
* @author Ryan
* @date 2025/5/20
* @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板嚭搴撳簱瀛樹俊鎭�
* @version 1.0
*/
+ @Transactional(rollbackFor = Exception.class)
public void complateOutStock(Task task) {
+ if (Objects.isNull(task)) {
+ return;
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (taskItems.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ try {
+ //鏇存柊搴撲綅鏄庣粏
+ subtractLocItem(taskItems, task.getId());
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ //娣诲姞鍑哄叆搴撹褰曚俊鎭�
+ Map<Short, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getWkType));
+ /***鑾峰彇搴撳瓨鍑哄簱鍊硷紝濡傛灉涓虹┖琛ㄧず姝ｅ父鍗曟嵁鍑哄簱锛岄潪绌鸿〃鏄庢槸搴撳瓨鍑哄簱
+ * 1. 搴撳瓨鍑哄簱娌℃湁鍗曟嵁淇℃伅锛屽崟鎹俊鎭粯璁や负绌�
+ * 2. 鍗曟嵁搴撳瓨闇�閫氳繃娉㈡鏌ヨ鍘熷鍗曟嵁淇℃伅锛屽皢鍗曟嵁淇℃伅濉叆stock涓�
+ * */
+ List<TaskItem> list = listMap.get(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type));
+ if (Objects.isNull(list) || list.isEmpty()) {
+ Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
+ maps.keySet().forEach(key -> {
+ WaveItem waveItem = waveItemService.getById(key);
+ if (Objects.isNull(waveItem)) {
+ throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ try {
+ saveOutStockItem(maps.get(key), waveItem);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ });
+ } else {
+ try {
+ saveOutStockItem(taskItems, null);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+ /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
+ if (locs.isEmpty()) {
+ //濡傚崟鎹槑缁嗕负绌猴紝淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, task.getTargLoc()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/5/20
+ * @description: 鍑哄簱淇℃伅淇濆瓨鑷冲簱瀛樻槑缁嗚〃
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveOutStockItem(List<TaskItem> taskItems, WaveItem waveItem) throws Exception {
+ Stock stock = new Stock();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
+ }
+ Double sum = taskItems.stream().mapToDouble(TaskItem::getAnfme).sum();
+ stock.setCode(ruleCode)
+ .setAnfme(sum);
+ if (Objects.isNull(waveItem)) {
+ stock.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type))
+ .setMemo("鍑哄簱鍗曞嚭搴擄紝鏃犲崟鎹俊鎭紒锛�")
+ .setType(OrderType.ORDER_OUT.type);
+ } else {
+ //TODO 鐢熸垚娉㈡鏃堕渶瑕佸皢娉㈡鍙峰啓鍏ュ崟鎹紝閫氳繃鐗╂枡锛屾壒娆★紝鍔ㄦ�佸瓧娈电瓑鍞竴鍊煎弽鏌ュ崟鎹俊鎭�
+ stock.setSourceId(waveItem.getId()).setType(OrderType.ORDER_OUT.type);
+ }
+ if (!stockService.save(stock)) {
+ throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
+ }
+ List<StockItem> stockItems = new ArrayList<>();
+ for (TaskItem item : taskItems) {
+ /**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/
+ StockItem stockItem = new StockItem();
+ BeanUtils.copyProperties(item, stockItem);
+ stockItem.setSourceItemId(item.getOrderItemId())
+ .setStockCode(stock.getCode())
+ .setId(null)
+ .setStockId(stock.getId());
+ stockItems.add(stockItem);
+ }
+ if (!stockItemService.saveBatch(stockItems)) {
+ throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
+ }
+
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/5/20
+ * @description: 鎵ｅ噺搴撳瓨鏄庣粏
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void subtractLocItem(List<TaskItem> items, Long taskId) throws Exception {
+ Task task = this.getById(taskId);
+ if (Objects.isNull(task)) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
+ }
+ for (TaskItem item : items) {
+ LocItem locItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
+ .eq(LocItem::getBatch, item.getBatch())
+ .eq(LocItem::getFieldsIndex, item.getFieldsIndex())
+ .eq(LocItem::getMatnrId, item.getMatnrId())
+ .eq(LocItem::getLocCode, task.getTargLoc()));
+ if (Objects.isNull(locItem)) {
+ throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ //鍓╀綑搴撳瓨
+ Double minuValue = (Math.round((locItem.getAnfme() - locItem.getWorkQty() - locItem.getQty()) * 10000.0) / 10000.0);
+ if (minuValue.compareTo(item.getAnfme()) <= 0) {
+ //鍓╀綑搴撳瓨灏忎簬鍑哄簱搴撳瓨锛岀Щ闄ゅ綋鍓嶅簱瀛樹俊鎭�
+ if (!locItemService.removeById(locItem.getId())) {
+ throw new CoolException("搴撳瓨鍒犻櫎澶辫触锛侊紒");
+ }
+ } else {
+ locItem.setWorkQty((Math.round((locItem.getWorkQty() - minuValue) * 10000.0) / 10000.0));
+ locItem.setQty((Math.round((minuValue + locItem.getQty()) * 10000.0) / 10000.0));
+ if (!locItemService.updateById(locItem)) {
+ throw new CoolException("搴撳瓨淇℃伅鏇存柊澶辫触锛侊紒");
+ }
+ }
+ }
}
/**
@@ -398,27 +534,23 @@
* @description: 瀹屾垚鍏ュ簱浠诲姟
* @version 1.0
*/
+ @Transactional(rollbackFor = Exception.class)
public void complateInstock(Task task) {
if (Objects.isNull(task)) {
return;
}
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, task.getId()));
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (taskItems.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
- Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getTaskId));
- /**瀵逛换鍔℃槑缁嗘寜浠诲姟涓诲崟杩涜鍒嗙粍*/
- listMap.keySet().forEach(key -> {
- List<TaskItem> items = listMap.get(key);
- try {
- //鏇存柊搴撲綅鏄庣粏
- saveLocItem(items, key);
- } catch (Exception e) {
- throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
- }
- });
+ try {
+ //鏇存柊搴撲綅鏄庣粏
+ saveLocItem(taskItems, task.getId());
+ } catch (Exception e) {
+ throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
- /**瀵逛换鍔℃槑缁嗘寜璁㈠崟杩涜鍒嗙粍*/
+ /**瀵逛换鍔℃槑缁嗘寜缁勬嫋鏄庣粏杩涜鍒嗙粍*/
Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
orderMap.keySet().forEach(key -> {
WaitPakinItem pakinItem = waitPakinItemService.getById(key);
@@ -445,10 +577,10 @@
}
/**
- * @author Ryan
- * @description 绉婚櫎鏀惰揣鍖哄簱瀛�
* @param
* @return
+ * @author Ryan
+ * @description 绉婚櫎鏀惰揣鍖哄簱瀛�
* @time 2025/4/30 16:32
*/
@Transactional(rollbackFor = Exception.class)
@@ -480,10 +612,10 @@
}
/**
- * @author Ryan
- * @description 鏇存柊搴撲綅鏄庣粏
* @param
* @return
+ * @author Ryan
+ * @description 鏇存柊搴撲綅鏄庣粏
* @time 2025/4/15 15:28
*/
@Transactional(rollbackFor = Exception.class)
@@ -510,6 +642,7 @@
/**
* 鐢熸垚鍏ュ簱搴撳瓨鏄庣粏
+ *
* @param items
* @return
*/
--
Gitblit v1.9.1