From 11db152ac1ee3d47e1047fb0c96fc7e10da345ac Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期四, 22 一月 2026 10:50:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 48 +++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java | 114 +++++++++++++++++++++++++++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java | 3
3 files changed, 155 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
index 4892e43..08ee052 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
@@ -4,10 +4,12 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
+import com.vincent.rsf.server.manager.entity.BasContainer;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.WarehouseAreas;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
import com.vincent.rsf.server.manager.service.impl.WarehouseAreasServiceImpl;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.entity.Config;
@@ -45,6 +47,8 @@
private LocService locService;
@Autowired
private LocItemService locItemService;
+ @Autowired
+ private BasContainerServiceImpl basContainerService;
/**
* @author Munch D. Luffy
@@ -55,17 +59,17 @@
@Scheduled(cron = "0/15 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void startCacheInLocStock() throws Exception {
- Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS_YZ));
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_IN_YZ));
if (!Boolean.parseBoolean(config.getVal())) {
return;
}
- String autoRunAreaStartYz = configService.getVal("AUTO_RUN_AREA_START_YZ", String.class);
+ String autoRunAreaStartYz = configService.getVal("AUTO_RUN_IN_START_YZ", String.class);
if (Cools.isEmpty(autoRunAreaStartYz)) {
return;
}
- String autoRunAreaEndYz = configService.getVal("AUTO_RUN_AREA_END_YZ", String.class);
+ String autoRunAreaEndYz = configService.getVal("AUTO_RUN_IN_END_YZ", String.class);
if (Cools.isEmpty(autoRunAreaEndYz)) {
return;
}
@@ -76,7 +80,7 @@
for (String c : split) {
WarehouseAreas byId = warehouseAreasService.getById(Integer.parseInt(c));
if (!Cools.isEmpty(byId)) {
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, byId.getWarehouseId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type),false);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type),false);
if (!Objects.isNull(loc)) {
curLoc = loc.getCode();
break;
@@ -91,7 +95,7 @@
for (String c : split) {
WarehouseAreas byId = warehouseAreasService.getById(Integer.parseInt(c));
if (!Cools.isEmpty(byId)) {
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, byId.getWarehouseId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type),false);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type),false);
if (!Objects.isNull(loc)) {
deepLoc = loc.getCode();
break;
@@ -119,7 +123,103 @@
*/
@Scheduled(cron = "0/5 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
- public void complateOutStock() throws Exception {
- System.out.println("缂撳瓨鍖哄煙鑷姩鐢熸垚绌鸿揣鏋跺嚭搴撲换鍔�");
+ public void startCacheOutLocStock() throws Exception {
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_OUT_YZ));
+ if (!Boolean.parseBoolean(config.getVal())) {
+ return;
+ }
+
+ String autoRunAreaStartYz = configService.getVal("AUTO_RUN_OUT_START_YZ", String.class);
+ if (Cools.isEmpty(autoRunAreaStartYz)) {
+ return;
+ }
+
+ String autoRunAreaEndYz = configService.getVal("AUTO_RUN_OUT_END_YZ", String.class);
+ if (Cools.isEmpty(autoRunAreaEndYz)) {
+ return;
+ }
+
+ String autoRunContainerEndYz = configService.getVal("AUTO_RUN_OUT_CONTAINER_YZ", String.class);
+ if (Cools.isEmpty(autoRunContainerEndYz)) {
+ return;
+ }
+ String curLoc = null;
+ String deepLoc = null;
+ try{
+ String[] split = autoRunAreaStartYz.split(";");
+ for (String c : split) {
+ WarehouseAreas byId = warehouseAreasService.getById(Integer.parseInt(c));
+ if (!Cools.isEmpty(byId)) {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type),false);
+ if (!Objects.isNull(loc)) {
+ curLoc = loc.getCode();
+ break;
+ }
+ }
+ }
+ } catch (Exception e){
+ log.error("閰嶇疆鍙傛暟AUTO_RUN_AREA_START_YZ瑙ｆ瀽澶辫触锛岃妫�鏌ワ紒锛侊紒");
+ }
+ //瀹瑰櫒闆嗗悎
+ //姣忎釜瀹瑰櫒瀵瑰簲鐨勫鍣ㄧ爜绫诲瀷
+ //
+
+ try{
+// String[] containerList = autoRunContainerEndYz.split(";");
+// ArrayList<Long> CONTAINER_IDS = new ArrayList<>();
+// for (String c : containerList) {
+// CONTAINER_IDS.add(Long.parseLong(c));
+// }
+ BasContainer basContainer = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>()
+ .in(BasContainer::getContainerType, 1, false));
+// if (Cools.isEmpty(basContainer)){
+// throw new CoolException("鏈煡璇㈠埌鐩稿叧瀹瑰櫒瑙勫垯");
+// }
+//
+//
+ List<Long> areaList = new ArrayList<>();//鎵�鏈夊簱鍖�
+// List<Long> areaList1 = new ArrayList<>();//鎵�鏈夊鍣ㄧ被鍨�
+// List<Long> areaList2 = new ArrayList<>();//鎵�鏈夊簱鍖�
+// List<Long> areaList3 = new ArrayList<>();//鎵�鏈夊簱鍖�
+
+ boolean sign = true;
+// //瀹瑰櫒绫诲瀷鏌ヨ 璧风偣
+ String[] split = autoRunAreaEndYz.split(";");
+ for (String c : split) {
+ WarehouseAreas byId = warehouseAreasService.getById(Integer.parseInt(c));
+ if (!Cools.isEmpty(byId)) {
+ if (sign){
+ areaList.add(byId.getId());
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, byId.getId()).eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type),false);
+ if (!Objects.isNull(loc)) {
+ deepLoc = loc.getCode();
+ sign = false;
+ }
+ }
+ }
+ }
+
+
+ String barcodeType = "barcode REGEXP '"+basContainer.getCodeType()+"'";
+ List<Loc> loc1 = locService.list(new LambdaQueryWrapper<Loc>()
+ .apply(barcodeType)
+ .eq(Loc::getDeleted, 0)
+ .eq(Loc::getStatus, 1)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type)
+ .in(Loc::getAreaId, areaList)
+ .orderByDesc(Loc::getId));
+
+
+ } catch (Exception e){
+ log.error("閰嶇疆鍙傛暟AUTO_RUN_AREA_START_YZ瑙ｆ瀽澶辫触锛岃妫�鏌ワ紒锛侊紒");
+ }
+
+ if (curLoc == null || deepLoc == null) {
+ return;
+ }
+ LocToTaskParams params = new LocToTaskParams();
+ params.setOrgLoc(curLoc).setTarLoc(deepLoc);
+ //鐢熸垚绉诲簱浣嶄换鍔�
+ locItemService.genMoveTask(params, 9999L);
}
}
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 4c06ba8..235ab27 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
@@ -797,7 +797,7 @@
// if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
// task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
// } else {
- task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.AWAIT.id);
+ task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : task.getTaskType()==101? TaskStsType.COMPLETE_OUT.id:TaskStsType.AWAIT.id);
// }
if (!this.updateById(task)) {
throw new CoolException("瀹屾垚浠诲姟澶辫触");
@@ -964,7 +964,12 @@
for (Task task : tasks) {
//鍑哄簱浠诲姟
try {
- complateOutStock(task, loginUserId);
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)) {
+ //110.绌烘澘鍑哄簱
+ complateOutStockEmpty(task, loginUserId);
+ } else {
+ complateOutStock(task, loginUserId);
+ }
} catch (Exception e) {
log.error(e.getMessage(), e);
// throw new CoolException(e.getMessage());
@@ -1545,6 +1550,45 @@
/**
* @author Ryan
* @date 2025/5/20
+ * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板嚭搴撳簱瀛樹俊鎭�
+ * @version 1.0
+ */
+ @Synchronized
+ @Transactional(rollbackFor = Exception.class)
+ public void complateOutStockEmpty(Task task, Long loginUserId) throws Exception {
+ if (Objects.isNull(task)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ throw new CoolException("搴撲綅鐘舵�佷笉澶勭悊浜嶳.鍑哄簱棰勭害锛侊紒");
+ }
+
+ /**淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱*/
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .set(Loc::getBarcode, null)
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
+ .eq(Loc::getId, loc.getId()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ if (!this.update(new LambdaUpdateWrapper<Task>()
+ .eq(Task::getId, task.getId())
+ .set(Task::getUpdateBy, loginUserId)
+ .set(Task::getUpdateTime, new Date())
+ .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
+ throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/5/20
* @description: 鍑哄簱淇℃伅淇濆瓨鑷冲簱瀛樻槑缁嗚〃
* @version 1.0
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
index d801e0a..d6bcccd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
@@ -22,7 +22,8 @@
public final static String AUTO_RUN_CHECK_ORDERS = "AUTO_RUN_CHECK_ORDERS";
/*閾跺骇缂撳瓨搴撹嚜鍔ㄥ叆搴撱�佺Щ搴�*/
- public final static String AUTO_RUN_CHECK_ORDERS_YZ = "AUTO_RUN_CHECK_ORDERS_YZ";
+ public final static String AUTO_RUN_CHECK_IN_YZ = "AUTO_RUN_CHECK_IN_YZ";
+ public final static String AUTO_RUN_CHECK_OUT_YZ = "AUTO_RUN_CHECK_OUT_YZ";
public final static String AUTO_RUN_MOVE_THEAD_MAX = "AUTO_RUN_MOVE_THEAD_MAX";
--
Gitblit v1.9.1