From db0da79142146cd3de6e7fcca92dceeceb6d2665 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 04 九月 2025 13:42:27 +0800
Subject: [PATCH] 添加普通站点及下发任务站点管理功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java | 104 ----------------------------------------------------
1 files changed, 0 insertions(+), 104 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
index b7c426b..acc8148 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
@@ -242,7 +242,6 @@
}
}
-
// 鍏ュ簱 搴旇鏍规嵁宸ヤ綔妗ｅ洖鍘�
// this.runStaToLoc(locGroupList, staGroupList, staTaskMemo);
@@ -256,14 +255,6 @@
private List<Loc> getAreaLocs(List<Integer> locGroupList, List<String> staGroupList, String memo) {
Integer startRow = Collections.min(locGroupList);
Integer endRow = Collections.max(locGroupList);
-
- // STA IDLE
-// LambdaQueryWrapper<BasStation> idleWrapper = new LambdaQueryWrapper<BasStation>().eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).in(BasStation::getStationName, staGroupList);
-// List<BasStation> idleList = stationService.list(idleWrapper);
-// if (Cools.isEmpty(idleList)) {
-// return new ArrayList<>();
-// }
-// Collections.shuffle(idleList);
// LOC STOCK
LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type);
@@ -280,57 +271,8 @@
Collections.shuffle(stockList);
return stockList;
- //鐢熸垚鍏ュ簱宸ヤ綔妗�
-// generateTask(idleList.get(0).getStationName(), stockList.get(0).getCode(), idleList.get(0).getBarcode());
- }
-
-
- // 鍑哄簱
- private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, String memo) {
- Integer startRow = Collections.min(locGroupList);
- Integer endRow = Collections.max(locGroupList);
-
-
- // STA IDLE
- LambdaQueryWrapper<BasStation> idleWrapper = new LambdaQueryWrapper<BasStation>().eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).in(BasStation::getStationName, staGroupList);
- List<BasStation> idleList = stationService.list(idleWrapper);
- if (Cools.isEmpty(idleList)) {
- return;
- }
- Collections.shuffle(idleList);
-
- // LOC STOCK
- LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type);
- if (null != startRow) {
- stockWrapper.ge(Loc::getRow, startRow);
- }
- if (null != endRow) {
- stockWrapper.le(Loc::getRow, endRow);
- }
- List<Loc> stockList = locService.list(stockWrapper);
- if (Cools.isEmpty(stockList)) {
- return;
- }
- Collections.shuffle(stockList);
-
-
- Loc loc = stockList.get(0);
- List<LocItem> list = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
- LocToTaskParams param = new LocToTaskParams();
- param.setType(Constants.TASK_TYPE_OUT_STOCK);
- param.setTarLoc(loc.getCode());
- param.setItems(list);
- param.setSiteNo(idleList.get(0).getStationName());
- param.setMemo(memo);
- //鐢熸垚鍑哄簱宸ヤ綔妗�
- try {
- locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
- } catch (Exception e) {
- log.info("鐢熸垚鍑哄簱浠诲姟澶辫触", e);
- }
}
-
// 绉诲簱
private void runLocToLoc(List<Integer> locGroupList, String staTaskMemo) {
@@ -384,52 +326,6 @@
}
}
-
- private void generateTask(String sourceStaNo, String locNo, String barcode) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
- if (StringUtils.isBlank(ruleCode)) {
- throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
- }
- Task task = new Task();
- task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
- .setTaskType(TaskType.TASK_TYPE_IN.type)
- .setResource(TaskResouceType.TASK_RESOUCE_PAKIN_TYPE.val)
- .setTargLoc(locNo)
- .setBarcode(barcode)
- .setOrgSite(sourceStaNo)
- .setCreateBy(6666L)
- .setUpdateBy(6666L);
-
- if (!taskService.save(task)) {
- throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
- }
- LambdaQueryWrapper<Matnr> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Matnr::getStatus, 1);
- wrapper.orderByAsc(Matnr::getUpdateTime);
- List<Matnr> list = matnrService.page(new Page<>(1, 100), wrapper).getRecords();
- Collections.shuffle(list);
- List<TaskItem> taskItems = new ArrayList<>();
- int i = 0;
- for (Matnr item : list) {
- if (i > 5) {
- break;
- }
- TaskItem taskItem = new TaskItem();
- BeanUtils.copyProperties(item, taskItem);
- taskItem.setTaskId(task.getId())
- .setOrderType(OrderType.ORDER_IN.type)
- .setCreateBy(6666L)
- .setUpdateBy(6666L)
- .setExtendFields(item.getExtendFields());
- taskItems.add(taskItem);
- item.setUpdateTime(new Date());
- matnrService.updateById(item);
- i++;
- }
- taskItemService.saveBatch(taskItems);
- }
-
public static List<String> getStaPrefixes(List<String> staGroupList) {
Set<String> rowSet = new HashSet<>();
--
Gitblit v1.9.1