From ee536f9aedaf642d64ba2681778fd4e74731d00c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 16 一月 2026 16:47:28 +0800
Subject: [PATCH] lsh#空板流程
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 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..8427aa3 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,6 +48,8 @@
private LocService locService;
@Autowired
private BasContainerServiceImpl basContainerService;
+ @Autowired
+ private LocItemService locItemService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -257,14 +259,14 @@
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);
+ } catch (Exception e){
+ throw new CoolException(e.getMessage());
+ }
+ return R.ok();
}
--
Gitblit v1.9.1