From d91fae31f20fa81081fe1b0769437be66470175d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 03 三月 2026 14:38:25 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
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 893c0c6..ddfd3d0 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
@@ -10,10 +10,10 @@
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.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
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.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
import lombok.Synchronized;
@@ -48,12 +48,14 @@
private LocService locService;
@Autowired
private BasContainerServiceImpl basContainerService;
+ @Autowired
+ private LocItemService locItemService;
@Override
public R getOutStockTaskItem(String barcode) {
LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Task::getBarcode, barcode);
- Task task = taskService.getOne(lambdaQueryWrapper);
+ Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));
if (null == task) {
return R.error("鏈煡璇㈠埌鐩稿叧浠诲姟");
}
@@ -70,7 +72,7 @@
public R saveOutTaskSts(String barcode) {
LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Task::getBarcode, barcode);
- Task task = taskService.getOne(lambdaQueryWrapper);
+ Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
@@ -108,7 +110,7 @@
if (Cools.isEmpty(barcode)) {
throw new CoolException("鍙傛暟鏈夎");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode).last("limit 1"));
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
@@ -155,7 +157,7 @@
if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0) {
return R.error("鍙傛暟閿欒");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()).last("limit 1"));
if (null == task) {
return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
}
@@ -238,7 +240,7 @@
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, containerWaveParam.getStaNo())
.orderByDesc(BasStation::getId)
- .last("LIMIT 1"), false);
+ .last("LIMIT 1"));
if (Objects.isNull(basStation)) {
throw new CoolException(containerWaveParam.getStaNo() + "绔欑偣涓嶅瓨鍦紒锛�");
@@ -253,18 +255,18 @@
}
BasContainer basContainer = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>()
- .in(BasContainer::getContainerType, containerWaveParam.getType(), false));
+ .in(BasContainer::getContainerType, containerWaveParam.getType(), false).last("limit 1"));
if (Cools.isEmpty(basContainer)){
throw new CoolException("鏈煡璇㈠埌鐩稿叧瀹瑰櫒瑙勫垯");
}
- String barcodeType = "barcode REGEXP "+basContainer.getCodeType();
+ String barcodeType = "barcode REGEXP '"+basContainer.getCodeType()+"'";
//瀹瑰櫒绫诲瀷鏌ヨ 璧风偣
Loc loc = locService.getOne(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)
- .eq(Loc::getUseStatus, "O")
.orderByDesc(Loc::getId)
.last("LIMIT 1"),
false);
@@ -272,21 +274,17 @@
if (Cools.isEmpty(loc)){
throw new CoolException("鏈煡璇㈠埌绗﹀悎鏉′欢鐨勬墭鐩�");
}
-// if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
-// //鍏夌數绔欑偣锛�
-// Long area = basStation.getArea();
-// //鏄惁闇�瑕佽浆闈炲厜鐢电珯鐐�
-// //绔嬪簱鍑哄簱==銆嬬粨鏉�
-// //AGV==銆嬬珛搴�==銆嬬粨鏉�
-// } else {
-// //闈炲厜鐢电珯鐐�
-// //鏄惁闇�瑕佽浆鍏夌數绔欑偣
-// //AGV==銆嬬粨鏉�
-// //绔嬪簱鍑哄簱==銆婣GV==銆嬬粨鏉�
-//
-// }
-
- return R.ok().add(loc);
+ //鐢熸垚浠诲姟鍙傛暟
+ LocToTaskParams locToTaskParams = new LocToTaskParams();
+ locToTaskParams.setType(Constants.TASK_TYPE_OUT_STOCK_EMPTY)
+ .setSiteNo(basStation.getStationName())
+ .setOrgLoc(loc.getId().toString());
+ try{
+ locItemService.generateTaskEmpty(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val,locToTaskParams,loginUserId, containerWaveParam.getTaskNo());
+ } catch (Exception e){
+ throw new CoolException(e.getMessage());
+ }
+ return R.ok();
}
--
Gitblit v1.9.1