From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java | 383 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 247 insertions(+), 136 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 2728d00..655148d 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
@@ -1,7 +1,7 @@
package com.vincent.rsf.server.manager.schedules;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.constant.Constants;
@@ -9,18 +9,23 @@
import com.vincent.rsf.server.manager.constant.StaGroupConstant;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.*;
+import com.vincent.rsf.server.manager.enums.LocStsType;
+import com.vincent.rsf.server.manager.enums.TaskResouceType;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.constant.GlobalConfigCode;
+import com.vincent.rsf.server.system.entity.Config;
import com.vincent.rsf.server.system.service.ConfigService;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.stream.Collectors;
import static com.vincent.rsf.server.system.utils.SystemAuthUtils.getLoginUserId;
@@ -33,121 +38,228 @@
@Autowired
private LocService locService;
-
@Autowired
private ConfigService configService;
-
@Autowired
private BasStationService stationService;
-
@Autowired
private TaskService taskService;
-
-
@Autowired
private TaskItemService taskItemService;
-
@Autowired
private MatnrService matnrService;
-
@Autowired
private LocItemService locItemService;
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+
+ /**
+ * 鑷姩鐢熸垚搴撲綅鏄庣粏
+ */
+ @Transactional(rollbackFor = Exception.class)
+// @Scheduled(cron = "0/25 * * * * ?")
+ public void insertRandomMats() {
+ List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type));
+ for (Loc loc : list) {
+ List<LocItem> items = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
+ if (!items.isEmpty()) {
+ continue;
+ }
+ List<Matnr> matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().orderByAsc(Matnr::getBarcode).last("limit 100"));
+ Collections.shuffle(matnrs);
+ Matnr matnr = matnrs.stream().findFirst().get();
+ LocItem locItem = new LocItem();
+ BeanUtils.copyProperties(matnr, locItem);
+ locItem.setBarcode(loc.getBarcode())
+ .setLocId(loc.getId())
+ .setMatnrCode(matnr.getCode())
+ .setMaktx(matnr.getName())
+ .setMatnrId(matnr.getId())
+ .setId(null)
+ .setAnfme(45.0)
+ .setLocCode(loc.getCode());
+ locItemService.save(locItem);
+ }
+ }
+
+// /**
+// * @author Ryan
+// * @date 2025/9/1
+// * @description: 鑷姩鐢熸垚鐩樼偣璺戝簱鍗�
+// * @version 1.0
+// */
+// @Scheduled(cron = "0/25 * * * * ?")
+// public void autoCheckOrders() {
+//
+//
+// }
+
+ /**
+ * @author Ryan
+ * @date 2025/9/1
+ * @description: 鑷姩瀹屾垚鐩樼偣鍔熻兘
+ * @version 1.0
+ */
+ @Scheduled(cron = "0/25 * * * * ?")
+ @Transactional(rollbackFor = Exception.class)
+ public void autoCheckComplete() {
+ //鑾峰彇浠诲姟鍒楄〃涓紝涓虹洏鐐瑰嚭搴撶殑浠诲姟
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskType, Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type,
+ TaskType.TASK_TYPE_PICK_IN.type,
+ TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
+ TaskType.TASK_TYPE_CHECK_IN.type)));
+
+ if (!tasks.isEmpty()) {
+ tasks.forEach(task -> {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
+ if (task.getTaskStatus().equals(TaskStsType.COMPLETE_IN.id)) {
+
+ }
+ } else {
+ if (task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
+ if (!stationService.update(new LambdaUpdateWrapper<BasStation>()
+ .eq(BasStation::getStationName, task.getTargSite())
+ .set(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type))) {
+ log.error("绔欑偣鐘舵�佷慨鏀瑰畬鎴愬け璐�,褰撳墠浠诲姟鐘舵�侊細", task.getTaskStatus());
+// throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ try {
+ taskService.pickOrCheckTask(task.getId(), task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) ? Constants.TASK_TYPE_OUT_CHECK : "");
+
+ } catch (Exception e) {
+ log.error("error====>", e);
+ }
+ }
+ }
+ });
+ }
+ }
+
+
+ /**
+ * @author Ryan
+ * @date 2025/9/1
+ * @description: 鑷姩鐢熸垚浠诲姟
+ * @version 1.0
+ */
+ @Scheduled(cron = "0/15 * * * * ?")
public void genRun() {
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
+ if (!Boolean.parseBoolean(config.getVal())) {
+ return;
+ }
+
+ Integer maxThread = 30;
+ Config confNum = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_MOVE_THEAD_MAX));
+ if (!Objects.isNull(confNum)) {
+ maxThread = Integer.valueOf(confNum.getVal());
+ }
+
+
+ //鑾峰彇浠诲姟鍒楄〃涓紝涓虹洏鐐瑰嚭搴撶殑浠诲姟
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskType, Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_CHECK_IN.type)));
+ if (tasks.size() >= maxThread) {
+ return;
+ }
String autoRunArea = configService.getVal("AUTO_RUN_AREA", String.class);
if (Cools.isEmpty(autoRunArea)) {
return;
}
+ List<Integer> array = new ArrayList<>();
+ List<String> list = new ArrayList<>();
for (char c : autoRunArea.toCharArray()) {
switch (c) {
case '1':
- this.autoRun(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST, StaGroupConstant.FAR_RIGHT_STA_ROW_LIST);
+ array.addAll(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.FAR_RIGHT_STA_ROW_LIST);
break;
case '2':
- this.autoRun(LocGroupConstant.RIGHT_LOC_ROW_LIST, StaGroupConstant.RIGHT_STA_ROW_LIST);
+ array.addAll(LocGroupConstant.RIGHT_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.RIGHT_STA_ROW_LIST);
break;
case '3':
- this.autoRun(LocGroupConstant.MIDDLE_LOC_ROW_LIST, StaGroupConstant.MIDDLE_STA_ROW_LIST);
+ array.addAll(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.MIDDLE_STA_ROW_LIST);
break;
case '4':
- this.autoRun(LocGroupConstant.LEFT_LOC_ROW_LIST, StaGroupConstant.LEFT_STA_ROW_LIST);
+ array.addAll(LocGroupConstant.LEFT_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.LEFT_STA_ROW_LIST);
break;
case '5':
- this.autoRun(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST);
+ array.addAll(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.FAR_LEFT_STA_ROW_LIST);
break;
default:
break;
}
}
-
+ this.autoRun(array, list);
}
-
private void autoRun(List<Integer> locGroupList, List<String> staGroupList) {
-
List<String> staPreNos = getStaPrefixes(staGroupList);
String staTaskMemo = "DEMO_STA_" + String.join("-", staPreNos);
-
List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getMemo, staTaskMemo));
- if (!Cools.isEmpty(list) && list.size() > 30) {
+ if (!Cools.isEmpty(list) && list.size() >= 1) {
return;
}
+
+ List<Loc> locs = getAreaLocs(locGroupList, staGroupList, staTaskMemo);
+
+ for (Loc loc : locs) {
+ List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
+ if (!locItems.isEmpty()) {
+ locItems.forEach(locItem -> {
+ locItem.setOutQty(locItem.getAnfme());
+ });
+ List<BasStation> stations = stationService.list(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStatus, 1)
+ .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_O.type));
+ List<String> stationNames = stations.stream().map(BasStation::getStationName).collect(Collectors.toList());
+ if (Cools.isEmpty(stations)) {
+ throw new CoolException("鏃犲彲鐢ㄧ珯鐐癸紒锛�");
+ }
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .in(DeviceSite::getSite, stationNames)
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type).last("limit 1"));
+ if (Cools.isEmpty(deviceSite)) {
+ throw new CoolException("鏃犲彲鐢ㄨ矾寰勶紒锛�");
+ }
+ //鐢熸垚鐩樼偣浠诲姟鍙傛暟
+ LocToTaskParams locToTaskParams = new LocToTaskParams();
+ locToTaskParams.setType(Constants.TASK_TYPE_OUT_CHECK)
+ .setItems(locItems)
+ .setSiteNo(deviceSite.getSite())
+ .setOrgLoc(loc.getCode());
+
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTargSite, deviceSite.getSite()));
+ if (!tasks.isEmpty()) {
+ continue;
+ }
+ try {
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val, locToTaskParams, getLoginUserId());
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+ }
+
// 鍏ュ簱 搴旇鏍规嵁宸ヤ綔妗ｅ洖鍘�
- this.runStaToLoc(locGroupList, staGroupList, staTaskMemo);
- // 鍑哄簱,闇�瑕佹牎楠屽伐浣滄。鏄惁瀛樺湪锛屽瓨鍦ㄥ氨璇存槑绔欑偣澶勪簬蹇欑鐘舵��
- this.runLocToSta(locGroupList, staGroupList, staTaskMemo);
+// this.runStaToLoc(locGroupList, staGroupList, staTaskMemo);
- // 绉诲簱
- this.runLocToLoc(locGroupList, staTaskMemo);
+// // 鍑哄簱,闇�瑕佹牎楠屽伐浣滄。鏄惁瀛樺湪锛屽瓨鍦ㄥ氨璇存槑绔欑偣澶勪簬蹇欑鐘舵��
+// this.runLocToSta(locGroupList, staGroupList, staTaskMemo);
+// // 绉诲簱locGroupList
+// this.runLocToLoc(locGroupList, staTaskMemo);
}
- // 鍏ュ簱
- private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, String memo) {
+ 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_F.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_O.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);
-
- //鐢熸垚鍏ュ簱宸ヤ綔妗�
- 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);
@@ -159,36 +271,82 @@
}
List<Loc> stockList = locService.list(stockWrapper);
if (Cools.isEmpty(stockList)) {
- return;
+ return new ArrayList<>();
}
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);
- }
+ return stockList;
}
-
+ /**
+ * 鐢熸垚绉诲簱浠诲姟
+ *
+ * @param
+ * @param
+ */
// 绉诲簱
- private void runLocToLoc(List<Integer> locGroupList, String staTaskMemo) {
+ @Scheduled(cron = "0/23 * * * * ?")
+ @Transactional(rollbackFor = Exception.class)
+ public void runLocToLoc() {
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
+ if (!Boolean.parseBoolean(config.getVal())) {
+ return;
+ }
+
+ String autoRunArea = configService.getVal("AUTO_RUN_AREA", String.class);
+ if (Cools.isEmpty(autoRunArea)) {
+ return;
+ }
+ List<Integer> array = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ for (char c : autoRunArea.toCharArray()) {
+ switch (c) {
+ case '1':
+ array.addAll(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.FAR_RIGHT_STA_ROW_LIST);
+ break;
+ case '2':
+ array.addAll(LocGroupConstant.RIGHT_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.RIGHT_STA_ROW_LIST);
+ break;
+ case '3':
+ array.addAll(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.MIDDLE_STA_ROW_LIST);
+ break;
+ case '4':
+ array.addAll(LocGroupConstant.LEFT_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.LEFT_STA_ROW_LIST);
+ break;
+ case '5':
+ array.addAll(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
+ list.addAll(StaGroupConstant.FAR_LEFT_STA_ROW_LIST);
+ break;
+ default:
+ break;
+ }
+ }
+ xx(array);
+
+ }
+
+ private void xx(List<Integer> locGroupList) {
Integer startRow = Collections.min(locGroupList);
Integer endRow = Collections.max(locGroupList);
String memo = "DEMO_LOC_" + startRow + "-" + endRow;
+ Integer maxThread = 30;
+ Config confNum = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_MOVE_THEAD_MAX));
+ if (!Objects.isNull(confNum)) {
+ maxThread = Integer.valueOf(confNum.getVal());
+ }
+
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getMemo,memo));
+ if (!tasks.isEmpty() && tasks.size() >= maxThread) {
+ return;
+ }
// STOCK
LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type);
@@ -232,54 +390,7 @@
} catch (Exception e) {
log.info("鐢熸垚鍑哄簱浠诲姟澶辫触", e);
}
-
}
-
- 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