From 8fa7beb4b7d10bb6ab9f98a3c67ed041e7c94d42 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 一月 2026 15:22:03 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 9 ++++
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/CallForEmptyContainersParam.java | 25 ++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 44 ++++++++++++++++++++++
4 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index a42d090..03830d3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -79,6 +80,14 @@
return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
}
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/callForEmptyContainers")
+ @ApiOperation("鍛煎彨绌哄鍣�")
+ public R callForEmptyContainers(@RequestBody CallForEmptyContainersParam containerWaveParam) {
+
+ return pdaOutStockService.callForEmptyContainers(containerWaveParam,getLoginUserId());
+ }
+
// @PreAuthorize("hasAuthority('manager:outStock:list')")
@PostMapping("/outStockItem/page")
public R page(@RequestBody JSONObject param) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/CallForEmptyContainersParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/CallForEmptyContainersParam.java
new file mode 100644
index 0000000..9a37f0d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/CallForEmptyContainersParam.java
@@ -0,0 +1,25 @@
+package com.vincent.rsf.server.api.entity.params;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "CallForEmptyContainersParam", description = "鍛煎彨绌哄鍣�")
+public class CallForEmptyContainersParam implements Serializable {
+
+ @ApiModelProperty("绔欑偣")
+ private String staNo;
+
+ /**
+ * 瀹瑰櫒绫诲瀷鏍囪瘑
+ */
+ @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
+ private Long type;
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
index 0cb81ca..f54d3f1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
@@ -2,6 +2,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import java.util.List;
@@ -15,6 +16,6 @@
R getContainerWaveList(Map<String, String> map);
R saveWavePick(ContainerWaveParam containerWaveParam,Long loginUserId);
-
+ R callForEmptyContainers(CallForEmptyContainersParam containerWaveParam, Long loginUserId);
R saveOutTaskSts(String barcode);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index e9cee6b..69e3f30 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -5,10 +5,12 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.StationTypeEnum;
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.service.*;
import lombok.Synchronized;
@@ -37,6 +39,8 @@
private AsnOrderItemService asnOrderItemService;
@Autowired
private WaveOrderRelaService waveOrderRelaService;
+ @Autowired
+ private BasStationService basStationService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -215,6 +219,46 @@
return R.ok();
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @Synchronized
+ public R callForEmptyContainers(CallForEmptyContainersParam containerWaveParam, Long loginUserId) {
+ // 鍙傛暟鏍￠獙
+ if (Objects.isNull(containerWaveParam) || StringUtils.isEmpty(containerWaveParam.getStaNo())) {
+ throw new CoolException("鍙傛暟閿欒锛岀珯鐐瑰彿涓嶈兘涓虹┖");
+ }
+ // 1. 绔欑偣淇℃伅鍒ゆ柇 - 缁堢偣
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, containerWaveParam.getStaNo())
+ .orderByDesc(BasStation::getId)
+ .last("LIMIT 1"), false);
+
+ if (Objects.isNull(basStation)) {
+ throw new CoolException(containerWaveParam.getStaNo() + "绔欑偣涓嶅瓨鍦紒锛�");
+ }
+ if (!basStation.getUseStatus().equals("O")) {
+ throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
+ }
+ //瀹瑰櫒绫诲瀷鏌ヨ 璧风偣
+ if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
+ //鍏夌數绔欑偣锛�
+ Long area = basStation.getArea();
+ //鏄惁闇�瑕佽浆闈炲厜鐢电珯鐐�
+ //绔嬪簱鍑哄簱==銆嬬粨鏉�
+ //AGV==銆嬬珛搴�==銆嬬粨鏉�
+ } else {
+ //闈炲厜鐢电珯鐐�
+ //鏄惁闇�瑕佽浆鍏夌數绔欑偣
+ //AGV==銆嬬粨鏉�
+ //绔嬪簱鍑哄簱==銆婣GV==銆嬬粨鏉�
+
+ }
+
+ return R.ok();
+ }
+
+
+
private Boolean checkWaveComplete(TaskItem taskItem) {
Wave wave = waveService.getById(taskItem.getSourceId());
--
Gitblit v1.9.1