From 343df1a8fbdbf46497f8cf5e219ace4e0b400268 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 19 一月 2026 13:15:57 +0800
Subject: [PATCH] lsh#
---
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/service/impl/InBoundServiceImpl.java | 22 +++++++++++-----------
2 files changed, 19 insertions(+), 12 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 9710717..2f42b08 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
@@ -141,10 +141,17 @@
@PostMapping("/orderOut/getOutLocView")
public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
- //鍙傛暟 param.getOrderItemId()
+ //鍙傛暟 param.getOrderItemId()//鍑哄簱棰勮
return R.ok();
}
+//
+// @PostMapping("/orderOut/getOutLocRun")
+// public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
+// //鍙傛暟 param.getOrderItemId()//鍑哄簱鎵ц
+//
+// return R.ok();
+// }
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
index 12c746f..dab9f20 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -170,11 +170,16 @@
@Transactional(rollbackFor = Exception.class)
public synchronized R generateTasks(PdaGeneralParam param, Long loginUserId) {
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,param.getTransferStationNo()).orderByDesc(DeviceSite::getId),false);
- if (Objects.isNull(deviceSite)) {
- throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+// DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,param.getTransferStationNo()).orderByDesc(DeviceSite::getId),false);
+// if (Objects.isNull(deviceSite)) {
+// throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+// }
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, param.getTransferStationNo()));
+ if (Objects.isNull(station) || !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦ㄦ垨绔欑偣涓嶅浜庣┖搴撶姸鎬侊紒锛�");
}
- DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(deviceSite.getSite()));
+ DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(station.getStationName()));
if (Cools.isEmpty(deviceBind)) {
throw new CoolException("搴撲綅瑙勫垯鏈煡");
}
@@ -206,18 +211,13 @@
.setTaskType(TaskType.TASK_TYPE_EMPITY_IN.type)
.setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)//lsh寰呬慨鏀�
.setTargLoc(targetLoc)
- .setOrgSite(deviceSite.getSite())
+ .setOrgSite(station.getStationName())
.setBarcode(param.getContainerNo())
- .setTargSite(deviceSite.getDeviceSite())
+ .setTargSite(station.getStationName())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
if (!taskService.save(task)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
- }
- BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
- .eq(BasStation::getStationName, deviceSite.getSite()));
- if (Objects.isNull(station) || !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
- throw new CoolException("绔欑偣涓嶅瓨鍦ㄦ垨绔欑偣涓嶅浜庣┖搴撶姸鎬侊紒锛�");
}
station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
--
Gitblit v1.9.1