From 4b1c3470712263e8ff9feb7749eebab2c1c6b25a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 20 五月 2025 19:32:34 +0800
Subject: [PATCH] 添加定时任务--出库任务
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 265 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 207 insertions(+), 58 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 c8291e1..a943509 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
@@ -3,15 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
-import com.vincent.rsf.server.manager.enums.OrderType;
-import com.vincent.rsf.server.manager.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,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")
@@ -60,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -93,7 +90,8 @@
Task task = new Task();
task.setTaskCode(ruleCode)
.setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
- .setTaskType(TaskType.TASK_TYPE_AGV_IN.type.shortValue())
+ .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
+ .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.id)
.setTargLoc(targetLoc)
.setOrgSite(orgSta)
.setBarcode(pakin.getBarcode())
@@ -130,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("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -151,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -178,7 +176,8 @@
Task task = new Task();
task.setTaskCode(ruleCode)
.setTaskStatus(TaskStsType.COMPLETE_IN.id.shortValue())
- .setTaskType(TaskType.TASK_TYPE_FLAT_WAREHOUSE_IN.type.shortValue())
+ .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
+ .setWarehType(WarehType.WAREHOUSE_TYPE_PLAT.id)
.setTargLoc(targetLoc)
.setBarcode(pakin.getBarcode())
.setCreateBy(loginUserId)
@@ -214,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("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -331,6 +330,10 @@
.setOrderType(OrderType.ORDER_IN.type)
.setSource(item.getId())
.setTrackCode(item.getTrackCode())
+ .setPlatItemId(item.getPlatItemId())
+ .setPlatOrderCode(item.getPlatOrderCode())
+ .setPlatWorkCode(item.getPlatWorkCode())
+ .setProjectCode(item.getProjectCode())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId)
.setExtendFields(item.getExtendFields())
@@ -342,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("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
});
});
@@ -362,41 +365,196 @@
/**
* 瀹屾垚浠诲姟 鏇存柊搴撲綅鏄庣粏淇℃伅锛屽皢鍗曟嵁搴撳瓨鏇存柊鍒板崟鎹簱瀛樿〃
+ *
* @param tasks
* @throws Exception
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void completeTask(List<Task> tasks) throws Exception {
- if (tasks.isEmpty()) {
+ public synchronized void completeTask(List<Task> tasks) throws Exception {
+ for (Task task : tasks) {
+ if (task.getTaskType() < TaskType.TASK_TYPE_OUT.type) {
+ //鍏ュ簱浠诲姟
+ complateInstock(task);
+ } else {
+ //鍑哄簱浠诲姟
+ complateOutStock(task);
+ }
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/5/20
+ * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板嚭搴撳簱瀛樹俊鎭�
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized void complateOutStock(Task task) {
+ if (Objects.isNull(task)) {
return;
}
- List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, list));
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (taskItems.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
- List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
- 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 {
+ //鏇存柊搴撲綅鏄庣粏
+ 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("搴撳瓨淇℃伅鏇存柊澶辫触锛侊紒");
+ }
+ }
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/5/20
+ * @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>().eq(TaskItem::getTaskId, task.getId()));
+ if (taskItems.isEmpty()) {
+ 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);
-// AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
-// .eq(AsnOrder::getId, key)
-// .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
- if (null == pakinItem) {
+ if (Objects.isNull(pakinItem)) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨暟鎹笉瀛樺湪锛岃鑱旂郴绠＄悊鍛橈紒锛�");
}
List<TaskItem> items = orderMap.get(key);
@@ -410,19 +568,19 @@
}
});
/**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
- if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) {
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).eq(Loc::getCode, task.getTargLoc()))) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- if (!this.update(new LambdaUpdateWrapper<Task>().in(Task::getId, list).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
+ if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
/**
- * @author Ryan
- * @description 绉婚櫎鏀惰揣鍖哄簱瀛�
* @param
* @return
+ * @author Ryan
+ * @description 绉婚櫎鏀惰揣鍖哄簱瀛�
* @time 2025/4/30 16:32
*/
@Transactional(rollbackFor = Exception.class)
@@ -454,10 +612,10 @@
}
/**
- * @author Ryan
- * @description 鏇存柊搴撲綅鏄庣粏
* @param
* @return
+ * @author Ryan
+ * @description 鏇存柊搴撲綅鏄庣粏
* @time 2025/4/15 15:28
*/
@Transactional(rollbackFor = Exception.class)
@@ -483,19 +641,14 @@
}
/**
- * 鐢熸垚搴撳瓨鏄庣粏
+ * 鐢熸垚鍏ュ簱搴撳瓨鏄庣粏
+ *
* @param items
* @return
*/
@Transactional(rollbackFor = Exception.class)
public void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
Stock stock = new Stock();
-// if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
-// Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
-// if (!Objects.isNull(purchase)) {
-// stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
-// }
-// }
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
@@ -514,10 +667,6 @@
List<StockItem> stockItems = new ArrayList<>();
for (TaskItem item : items) {
/**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/
-// AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
-// if (Objects.isNull(orderItem)) {
-// throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
-// }
StockItem stockItem = new StockItem();
BeanUtils.copyProperties(item, stockItem);
stockItem.setSourceItemId(item.getOrderItemId())
--
Gitblit v1.9.1